diff --git a/premerge/CHANGELOG.md b/CHANGELOG.md
similarity index 100%
rename from premerge/CHANGELOG.md
rename to CHANGELOG.md
diff --git a/premerge/CONTRIBUTING.md b/CONTRIBUTING.md
similarity index 100%
rename from premerge/CONTRIBUTING.md
rename to CONTRIBUTING.md
diff --git a/premerge/INSTALL.md b/INSTALL.md
similarity index 100%
rename from premerge/INSTALL.md
rename to INSTALL.md
diff --git a/premerge/LICENSE b/LICENSE
similarity index 100%
rename from premerge/LICENSE
rename to LICENSE
diff --git a/premerge/Makefile b/Makefile
similarity index 100%
rename from premerge/Makefile
rename to Makefile
diff --git a/premerge/README.md b/README.md
similarity index 100%
rename from premerge/README.md
rename to README.md
diff --git a/premerge/Vagrantfile b/Vagrantfile
similarity index 100%
rename from premerge/Vagrantfile
rename to Vagrantfile
diff --git a/premerge/circle.yml b/circle.yml
similarity index 100%
rename from premerge/circle.yml
rename to circle.yml
diff --git a/premerge/glide.lock b/glide.lock
similarity index 100%
rename from premerge/glide.lock
rename to glide.lock
diff --git a/premerge/glide.yaml b/glide.yaml
similarity index 100%
rename from premerge/glide.yaml
rename to glide.yaml
diff --git a/premerge/test/README.md b/test/README.md
similarity index 100%
rename from premerge/test/README.md
rename to test/README.md
diff --git a/premerge/test/app/clean.sh b/test/app/clean.sh
similarity index 100%
rename from premerge/test/app/clean.sh
rename to test/app/clean.sh
diff --git a/premerge/test/app/counter_test.sh b/test/app/counter_test.sh
similarity index 100%
rename from premerge/test/app/counter_test.sh
rename to test/app/counter_test.sh
diff --git a/premerge/test/app/dummy_test.sh b/test/app/dummy_test.sh
similarity index 100%
rename from premerge/test/app/dummy_test.sh
rename to test/app/dummy_test.sh
diff --git a/premerge/test/app/grpc_client.go b/test/app/grpc_client.go
similarity index 100%
rename from premerge/test/app/grpc_client.go
rename to test/app/grpc_client.go
diff --git a/premerge/test/app/test.sh b/test/app/test.sh
similarity index 100%
rename from premerge/test/app/test.sh
rename to test/app/test.sh
diff --git a/premerge/test/docker/Dockerfile b/test/docker/Dockerfile
similarity index 100%
rename from premerge/test/docker/Dockerfile
rename to test/docker/Dockerfile
diff --git a/premerge/test/docker/build.sh b/test/docker/build.sh
similarity index 100%
rename from premerge/test/docker/build.sh
rename to test/docker/build.sh
diff --git a/premerge/test/docker/update.sh b/test/docker/update.sh
similarity index 100%
rename from premerge/test/docker/update.sh
rename to test/docker/update.sh
diff --git a/premerge/test/net/setup.sh b/test/net/setup.sh
similarity index 100%
rename from premerge/test/net/setup.sh
rename to test/net/setup.sh
diff --git a/premerge/test/net/start.sh b/test/net/start.sh
similarity index 100%
rename from premerge/test/net/start.sh
rename to test/net/start.sh
diff --git a/premerge/test/net/test.sh b/test/net/test.sh
similarity index 100%
rename from premerge/test/net/test.sh
rename to test/net/test.sh
diff --git a/premerge/test/p2p/README.md b/test/p2p/README.md
similarity index 100%
rename from premerge/test/p2p/README.md
rename to test/p2p/README.md
diff --git a/premerge/test/p2p/atomic_broadcast/test.sh b/test/p2p/atomic_broadcast/test.sh
similarity index 100%
rename from premerge/test/p2p/atomic_broadcast/test.sh
rename to test/p2p/atomic_broadcast/test.sh
diff --git a/premerge/test/p2p/basic/test.sh b/test/p2p/basic/test.sh
similarity index 100%
rename from premerge/test/p2p/basic/test.sh
rename to test/p2p/basic/test.sh
diff --git a/premerge/test/p2p/clean.sh b/test/p2p/clean.sh
similarity index 100%
rename from premerge/test/p2p/clean.sh
rename to test/p2p/clean.sh
diff --git a/premerge/test/p2p/client.sh b/test/p2p/client.sh
similarity index 100%
rename from premerge/test/p2p/client.sh
rename to test/p2p/client.sh
diff --git a/premerge/test/p2p/data/app/init.sh b/test/p2p/data/app/init.sh
similarity index 100%
rename from premerge/test/p2p/data/app/init.sh
rename to test/p2p/data/app/init.sh
diff --git a/premerge/test/p2p/data/chain_config.json b/test/p2p/data/chain_config.json
similarity index 100%
rename from premerge/test/p2p/data/chain_config.json
rename to test/p2p/data/chain_config.json
diff --git a/premerge/test/p2p/data/core/init.sh b/test/p2p/data/core/init.sh
similarity index 100%
rename from premerge/test/p2p/data/core/init.sh
rename to test/p2p/data/core/init.sh
diff --git a/premerge/test/p2p/data/data/init.sh b/test/p2p/data/data/init.sh
similarity index 100%
rename from premerge/test/p2p/data/data/init.sh
rename to test/p2p/data/data/init.sh
diff --git a/premerge/test/p2p/data/mach1/core/genesis.json b/test/p2p/data/mach1/core/genesis.json
similarity index 100%
rename from premerge/test/p2p/data/mach1/core/genesis.json
rename to test/p2p/data/mach1/core/genesis.json
diff --git a/premerge/test/p2p/data/mach1/core/priv_validator.json b/test/p2p/data/mach1/core/priv_validator.json
similarity index 100%
rename from premerge/test/p2p/data/mach1/core/priv_validator.json
rename to test/p2p/data/mach1/core/priv_validator.json
diff --git a/premerge/test/p2p/data/mach2/core/genesis.json b/test/p2p/data/mach2/core/genesis.json
similarity index 100%
rename from premerge/test/p2p/data/mach2/core/genesis.json
rename to test/p2p/data/mach2/core/genesis.json
diff --git a/premerge/test/p2p/data/mach2/core/priv_validator.json b/test/p2p/data/mach2/core/priv_validator.json
similarity index 100%
rename from premerge/test/p2p/data/mach2/core/priv_validator.json
rename to test/p2p/data/mach2/core/priv_validator.json
diff --git a/premerge/test/p2p/data/mach3/core/genesis.json b/test/p2p/data/mach3/core/genesis.json
similarity index 100%
rename from premerge/test/p2p/data/mach3/core/genesis.json
rename to test/p2p/data/mach3/core/genesis.json
diff --git a/premerge/test/p2p/data/mach3/core/priv_validator.json b/test/p2p/data/mach3/core/priv_validator.json
similarity index 100%
rename from premerge/test/p2p/data/mach3/core/priv_validator.json
rename to test/p2p/data/mach3/core/priv_validator.json
diff --git a/premerge/test/p2p/data/mach4/core/genesis.json b/test/p2p/data/mach4/core/genesis.json
similarity index 100%
rename from premerge/test/p2p/data/mach4/core/genesis.json
rename to test/p2p/data/mach4/core/genesis.json
diff --git a/premerge/test/p2p/data/mach4/core/priv_validator.json b/test/p2p/data/mach4/core/priv_validator.json
similarity index 100%
rename from premerge/test/p2p/data/mach4/core/priv_validator.json
rename to test/p2p/data/mach4/core/priv_validator.json
diff --git a/premerge/test/p2p/fast_sync/check_peer.sh b/test/p2p/fast_sync/check_peer.sh
similarity index 100%
rename from premerge/test/p2p/fast_sync/check_peer.sh
rename to test/p2p/fast_sync/check_peer.sh
diff --git a/premerge/test/p2p/fast_sync/test.sh b/test/p2p/fast_sync/test.sh
similarity index 100%
rename from premerge/test/p2p/fast_sync/test.sh
rename to test/p2p/fast_sync/test.sh
diff --git a/premerge/test/p2p/fast_sync/test_peer.sh b/test/p2p/fast_sync/test_peer.sh
similarity index 100%
rename from premerge/test/p2p/fast_sync/test_peer.sh
rename to test/p2p/fast_sync/test_peer.sh
diff --git a/premerge/test/p2p/ip.sh b/test/p2p/ip.sh
similarity index 100%
rename from premerge/test/p2p/ip.sh
rename to test/p2p/ip.sh
diff --git a/premerge/test/p2p/kill_all/check_peers.sh b/test/p2p/kill_all/check_peers.sh
similarity index 100%
rename from premerge/test/p2p/kill_all/check_peers.sh
rename to test/p2p/kill_all/check_peers.sh
diff --git a/premerge/test/p2p/kill_all/test.sh b/test/p2p/kill_all/test.sh
similarity index 100%
rename from premerge/test/p2p/kill_all/test.sh
rename to test/p2p/kill_all/test.sh
diff --git a/premerge/test/p2p/local_testnet_start.sh b/test/p2p/local_testnet_start.sh
similarity index 100%
rename from premerge/test/p2p/local_testnet_start.sh
rename to test/p2p/local_testnet_start.sh
diff --git a/premerge/test/p2p/local_testnet_stop.sh b/test/p2p/local_testnet_stop.sh
similarity index 100%
rename from premerge/test/p2p/local_testnet_stop.sh
rename to test/p2p/local_testnet_stop.sh
diff --git a/premerge/test/p2p/peer.sh b/test/p2p/peer.sh
similarity index 100%
rename from premerge/test/p2p/peer.sh
rename to test/p2p/peer.sh
diff --git a/premerge/test/p2p/pex/check_peer.sh b/test/p2p/pex/check_peer.sh
similarity index 100%
rename from premerge/test/p2p/pex/check_peer.sh
rename to test/p2p/pex/check_peer.sh
diff --git a/premerge/test/p2p/pex/dial_seeds.sh b/test/p2p/pex/dial_seeds.sh
similarity index 100%
rename from premerge/test/p2p/pex/dial_seeds.sh
rename to test/p2p/pex/dial_seeds.sh
diff --git a/premerge/test/p2p/pex/test.sh b/test/p2p/pex/test.sh
similarity index 100%
rename from premerge/test/p2p/pex/test.sh
rename to test/p2p/pex/test.sh
diff --git a/premerge/test/p2p/pex/test_addrbook.sh b/test/p2p/pex/test_addrbook.sh
similarity index 100%
rename from premerge/test/p2p/pex/test_addrbook.sh
rename to test/p2p/pex/test_addrbook.sh
diff --git a/premerge/test/p2p/pex/test_dial_seeds.sh b/test/p2p/pex/test_dial_seeds.sh
similarity index 100%
rename from premerge/test/p2p/pex/test_dial_seeds.sh
rename to test/p2p/pex/test_dial_seeds.sh
diff --git a/premerge/test/p2p/seeds.sh b/test/p2p/seeds.sh
similarity index 100%
rename from premerge/test/p2p/seeds.sh
rename to test/p2p/seeds.sh
diff --git a/premerge/test/p2p/test.sh b/test/p2p/test.sh
similarity index 100%
rename from premerge/test/p2p/test.sh
rename to test/p2p/test.sh
diff --git a/premerge/test/persist/test.sh b/test/persist/test.sh
similarity index 100%
rename from premerge/test/persist/test.sh
rename to test/persist/test.sh
diff --git a/premerge/test/persist/test_failure_indices.sh b/test/persist/test_failure_indices.sh
similarity index 100%
rename from premerge/test/persist/test_failure_indices.sh
rename to test/persist/test_failure_indices.sh
diff --git a/premerge/test/persist/test_simple.sh b/test/persist/test_simple.sh
similarity index 100%
rename from premerge/test/persist/test_simple.sh
rename to test/persist/test_simple.sh
diff --git a/premerge/test/run_test.sh b/test/run_test.sh
similarity index 100%
rename from premerge/test/run_test.sh
rename to test/run_test.sh
diff --git a/premerge/test/test.sh b/test/test.sh
similarity index 100%
rename from premerge/test/test.sh
rename to test/test.sh
diff --git a/premerge/test/test_cover.sh b/test/test_cover.sh
similarity index 100%
rename from premerge/test/test_cover.sh
rename to test/test_cover.sh
diff --git a/premerge/test/test_libs.sh b/test/test_libs.sh
similarity index 100%
rename from premerge/test/test_libs.sh
rename to test/test_libs.sh
diff --git a/premerge/test/utils/txs.sh b/test/utils/txs.sh
similarity index 100%
rename from premerge/test/utils/txs.sh
rename to test/utils/txs.sh
diff --git a/premerge/types/block.go b/types/block.go
similarity index 100%
rename from premerge/types/block.go
rename to types/block.go
diff --git a/premerge/types/block_meta.go b/types/block_meta.go
similarity index 100%
rename from premerge/types/block_meta.go
rename to types/block_meta.go
diff --git a/premerge/types/canonical_json.go b/types/canonical_json.go
similarity index 100%
rename from premerge/types/canonical_json.go
rename to types/canonical_json.go
diff --git a/premerge/types/events.go b/types/events.go
similarity index 100%
rename from premerge/types/events.go
rename to types/events.go
diff --git a/premerge/types/genesis.go b/types/genesis.go
similarity index 100%
rename from premerge/types/genesis.go
rename to types/genesis.go
diff --git a/premerge/types/keys.go b/types/keys.go
similarity index 100%
rename from premerge/types/keys.go
rename to types/keys.go
diff --git a/premerge/types/log.go b/types/log.go
similarity index 100%
rename from premerge/types/log.go
rename to types/log.go
diff --git a/premerge/types/part_set.go b/types/part_set.go
similarity index 100%
rename from premerge/types/part_set.go
rename to types/part_set.go
diff --git a/premerge/types/part_set_test.go b/types/part_set_test.go
similarity index 100%
rename from premerge/types/part_set_test.go
rename to types/part_set_test.go
diff --git a/premerge/types/priv_validator.go b/types/priv_validator.go
similarity index 100%
rename from premerge/types/priv_validator.go
rename to types/priv_validator.go
diff --git a/premerge/types/priv_validator_test.go b/types/priv_validator_test.go
similarity index 100%
rename from premerge/types/priv_validator_test.go
rename to types/priv_validator_test.go
diff --git a/premerge/types/proposal.go b/types/proposal.go
similarity index 100%
rename from premerge/types/proposal.go
rename to types/proposal.go
diff --git a/premerge/types/proposal_test.go b/types/proposal_test.go
similarity index 100%
rename from premerge/types/proposal_test.go
rename to types/proposal_test.go
diff --git a/premerge/types/protobuf.go b/types/protobuf.go
similarity index 100%
rename from premerge/types/protobuf.go
rename to types/protobuf.go
diff --git a/premerge/types/services.go b/types/services.go
similarity index 100%
rename from premerge/types/services.go
rename to types/services.go
diff --git a/premerge/types/signable.go b/types/signable.go
similarity index 100%
rename from premerge/types/signable.go
rename to types/signable.go
diff --git a/premerge/types/tx.go b/types/tx.go
similarity index 100%
rename from premerge/types/tx.go
rename to types/tx.go
diff --git a/premerge/types/tx_test.go b/types/tx_test.go
similarity index 100%
rename from premerge/types/tx_test.go
rename to types/tx_test.go
diff --git a/premerge/types/validator.go b/types/validator.go
similarity index 100%
rename from premerge/types/validator.go
rename to types/validator.go
diff --git a/premerge/types/validator_set.go b/types/validator_set.go
similarity index 100%
rename from premerge/types/validator_set.go
rename to types/validator_set.go
diff --git a/premerge/types/validator_set_test.go b/types/validator_set_test.go
similarity index 100%
rename from premerge/types/validator_set_test.go
rename to types/validator_set_test.go
diff --git a/premerge/types/vote.go b/types/vote.go
similarity index 100%
rename from premerge/types/vote.go
rename to types/vote.go
diff --git a/premerge/types/vote_set.go b/types/vote_set.go
similarity index 100%
rename from premerge/types/vote_set.go
rename to types/vote_set.go
diff --git a/premerge/types/vote_set_test.go b/types/vote_set_test.go
similarity index 100%
rename from premerge/types/vote_set_test.go
rename to types/vote_set_test.go
diff --git a/premerge/types/vote_test.go b/types/vote_test.go
similarity index 100%
rename from premerge/types/vote_test.go
rename to types/vote_test.go