diff --git a/libs/test/README.md b/test/README.md
similarity index 100%
rename from libs/test/README.md
rename to test/README.md
diff --git a/libs/test/app/clean.sh b/test/app/clean.sh
similarity index 100%
rename from libs/test/app/clean.sh
rename to test/app/clean.sh
diff --git a/libs/test/app/counter_test.sh b/test/app/counter_test.sh
similarity index 100%
rename from libs/test/app/counter_test.sh
rename to test/app/counter_test.sh
diff --git a/libs/test/app/grpc_client.go b/test/app/grpc_client.go
similarity index 100%
rename from libs/test/app/grpc_client.go
rename to test/app/grpc_client.go
diff --git a/libs/test/app/kvstore_test.sh b/test/app/kvstore_test.sh
similarity index 100%
rename from libs/test/app/kvstore_test.sh
rename to test/app/kvstore_test.sh
diff --git a/libs/test/app/test.sh b/test/app/test.sh
similarity index 100%
rename from libs/test/app/test.sh
rename to test/app/test.sh
diff --git a/libs/test/docker/Dockerfile b/test/docker/Dockerfile
similarity index 100%
rename from libs/test/docker/Dockerfile
rename to test/docker/Dockerfile
diff --git a/libs/test/docker/build.sh b/test/docker/build.sh
similarity index 100%
rename from libs/test/docker/build.sh
rename to test/docker/build.sh
diff --git a/libs/test/p2p/README.md b/test/p2p/README.md
similarity index 100%
rename from libs/test/p2p/README.md
rename to test/p2p/README.md
diff --git a/libs/test/p2p/atomic_broadcast/test.sh b/test/p2p/atomic_broadcast/test.sh
similarity index 100%
rename from libs/test/p2p/atomic_broadcast/test.sh
rename to test/p2p/atomic_broadcast/test.sh
diff --git a/libs/test/p2p/basic/test.sh b/test/p2p/basic/test.sh
similarity index 100%
rename from libs/test/p2p/basic/test.sh
rename to test/p2p/basic/test.sh
diff --git a/libs/test/p2p/circleci.sh b/test/p2p/circleci.sh
similarity index 100%
rename from libs/test/p2p/circleci.sh
rename to test/p2p/circleci.sh
diff --git a/libs/test/p2p/client.sh b/test/p2p/client.sh
similarity index 100%
rename from libs/test/p2p/client.sh
rename to test/p2p/client.sh
diff --git a/libs/test/p2p/data/mach1/core/config/genesis.json b/test/p2p/data/mach1/core/config/genesis.json
similarity index 100%
rename from libs/test/p2p/data/mach1/core/config/genesis.json
rename to test/p2p/data/mach1/core/config/genesis.json
diff --git a/libs/test/p2p/data/mach1/core/config/node_key.json b/test/p2p/data/mach1/core/config/node_key.json
similarity index 100%
rename from libs/test/p2p/data/mach1/core/config/node_key.json
rename to test/p2p/data/mach1/core/config/node_key.json
diff --git a/libs/test/p2p/data/mach1/core/config/priv_validator.json b/test/p2p/data/mach1/core/config/priv_validator.json
similarity index 100%
rename from libs/test/p2p/data/mach1/core/config/priv_validator.json
rename to test/p2p/data/mach1/core/config/priv_validator.json
diff --git a/libs/test/p2p/data/mach2/core/config/genesis.json b/test/p2p/data/mach2/core/config/genesis.json
similarity index 100%
rename from libs/test/p2p/data/mach2/core/config/genesis.json
rename to test/p2p/data/mach2/core/config/genesis.json
diff --git a/libs/test/p2p/data/mach2/core/config/node_key.json b/test/p2p/data/mach2/core/config/node_key.json
similarity index 100%
rename from libs/test/p2p/data/mach2/core/config/node_key.json
rename to test/p2p/data/mach2/core/config/node_key.json
diff --git a/libs/test/p2p/data/mach2/core/config/priv_validator.json b/test/p2p/data/mach2/core/config/priv_validator.json
similarity index 100%
rename from libs/test/p2p/data/mach2/core/config/priv_validator.json
rename to test/p2p/data/mach2/core/config/priv_validator.json
diff --git a/libs/test/p2p/data/mach3/core/config/genesis.json b/test/p2p/data/mach3/core/config/genesis.json
similarity index 100%
rename from libs/test/p2p/data/mach3/core/config/genesis.json
rename to test/p2p/data/mach3/core/config/genesis.json
diff --git a/libs/test/p2p/data/mach3/core/config/node_key.json b/test/p2p/data/mach3/core/config/node_key.json
similarity index 100%
rename from libs/test/p2p/data/mach3/core/config/node_key.json
rename to test/p2p/data/mach3/core/config/node_key.json
diff --git a/libs/test/p2p/data/mach3/core/config/priv_validator.json b/test/p2p/data/mach3/core/config/priv_validator.json
similarity index 100%
rename from libs/test/p2p/data/mach3/core/config/priv_validator.json
rename to test/p2p/data/mach3/core/config/priv_validator.json
diff --git a/libs/test/p2p/data/mach4/core/config/genesis.json b/test/p2p/data/mach4/core/config/genesis.json
similarity index 100%
rename from libs/test/p2p/data/mach4/core/config/genesis.json
rename to test/p2p/data/mach4/core/config/genesis.json
diff --git a/libs/test/p2p/data/mach4/core/config/node_key.json b/test/p2p/data/mach4/core/config/node_key.json
similarity index 100%
rename from libs/test/p2p/data/mach4/core/config/node_key.json
rename to test/p2p/data/mach4/core/config/node_key.json
diff --git a/libs/test/p2p/data/mach4/core/config/priv_validator.json b/test/p2p/data/mach4/core/config/priv_validator.json
similarity index 100%
rename from libs/test/p2p/data/mach4/core/config/priv_validator.json
rename to test/p2p/data/mach4/core/config/priv_validator.json
diff --git a/libs/test/p2p/fast_sync/check_peer.sh b/test/p2p/fast_sync/check_peer.sh
similarity index 100%
rename from libs/test/p2p/fast_sync/check_peer.sh
rename to test/p2p/fast_sync/check_peer.sh
diff --git a/libs/test/p2p/fast_sync/test.sh b/test/p2p/fast_sync/test.sh
similarity index 100%
rename from libs/test/p2p/fast_sync/test.sh
rename to test/p2p/fast_sync/test.sh
diff --git a/libs/test/p2p/fast_sync/test_peer.sh b/test/p2p/fast_sync/test_peer.sh
similarity index 100%
rename from libs/test/p2p/fast_sync/test_peer.sh
rename to test/p2p/fast_sync/test_peer.sh
diff --git a/libs/test/p2p/ip.sh b/test/p2p/ip.sh
similarity index 100%
rename from libs/test/p2p/ip.sh
rename to test/p2p/ip.sh
diff --git a/libs/test/p2p/ip_plus_id.sh b/test/p2p/ip_plus_id.sh
similarity index 100%
rename from libs/test/p2p/ip_plus_id.sh
rename to test/p2p/ip_plus_id.sh
diff --git a/libs/test/p2p/kill_all/check_peers.sh b/test/p2p/kill_all/check_peers.sh
similarity index 100%
rename from libs/test/p2p/kill_all/check_peers.sh
rename to test/p2p/kill_all/check_peers.sh
diff --git a/libs/test/p2p/kill_all/test.sh b/test/p2p/kill_all/test.sh
similarity index 100%
rename from libs/test/p2p/kill_all/test.sh
rename to test/p2p/kill_all/test.sh
diff --git a/libs/test/p2p/local_testnet_start.sh b/test/p2p/local_testnet_start.sh
similarity index 100%
rename from libs/test/p2p/local_testnet_start.sh
rename to test/p2p/local_testnet_start.sh
diff --git a/libs/test/p2p/local_testnet_stop.sh b/test/p2p/local_testnet_stop.sh
similarity index 100%
rename from libs/test/p2p/local_testnet_stop.sh
rename to test/p2p/local_testnet_stop.sh
diff --git a/libs/test/p2p/peer.sh b/test/p2p/peer.sh
similarity index 100%
rename from libs/test/p2p/peer.sh
rename to test/p2p/peer.sh
diff --git a/libs/test/p2p/persistent_peers.sh b/test/p2p/persistent_peers.sh
similarity index 100%
rename from libs/test/p2p/persistent_peers.sh
rename to test/p2p/persistent_peers.sh
diff --git a/libs/test/p2p/pex/check_peer.sh b/test/p2p/pex/check_peer.sh
similarity index 100%
rename from libs/test/p2p/pex/check_peer.sh
rename to test/p2p/pex/check_peer.sh
diff --git a/libs/test/p2p/pex/dial_peers.sh b/test/p2p/pex/dial_peers.sh
similarity index 100%
rename from libs/test/p2p/pex/dial_peers.sh
rename to test/p2p/pex/dial_peers.sh
diff --git a/libs/test/p2p/pex/test.sh b/test/p2p/pex/test.sh
similarity index 100%
rename from libs/test/p2p/pex/test.sh
rename to test/p2p/pex/test.sh
diff --git a/libs/test/p2p/pex/test_addrbook.sh b/test/p2p/pex/test_addrbook.sh
similarity index 100%
rename from libs/test/p2p/pex/test_addrbook.sh
rename to test/p2p/pex/test_addrbook.sh
diff --git a/libs/test/p2p/pex/test_dial_peers.sh b/test/p2p/pex/test_dial_peers.sh
similarity index 100%
rename from libs/test/p2p/pex/test_dial_peers.sh
rename to test/p2p/pex/test_dial_peers.sh
diff --git a/libs/test/p2p/test.sh b/test/p2p/test.sh
similarity index 100%
rename from libs/test/p2p/test.sh
rename to test/p2p/test.sh
diff --git a/libs/test/persist/test_failure_indices.sh b/test/persist/test_failure_indices.sh
similarity index 100%
rename from libs/test/persist/test_failure_indices.sh
rename to test/persist/test_failure_indices.sh
diff --git a/libs/test/persist/test_simple.sh b/test/persist/test_simple.sh
similarity index 100%
rename from libs/test/persist/test_simple.sh
rename to test/persist/test_simple.sh
diff --git a/libs/test/persist/txs.sh b/test/persist/txs.sh
similarity index 100%
rename from libs/test/persist/txs.sh
rename to test/persist/txs.sh
diff --git a/libs/test/test_cover.sh b/test/test_cover.sh
similarity index 100%
rename from libs/test/test_cover.sh
rename to test/test_cover.sh