diff --git a/.editorconfig b/libs/.editorconfig
similarity index 100%
rename from .editorconfig
rename to libs/.editorconfig
diff --git a/.gitignore b/libs/.gitignore
similarity index 100%
rename from .gitignore
rename to libs/.gitignore
diff --git a/CHANGELOG.md b/libs/CHANGELOG.md
similarity index 100%
rename from CHANGELOG.md
rename to libs/CHANGELOG.md
diff --git a/CODEOWNERS b/libs/CODEOWNERS
similarity index 100%
rename from CODEOWNERS
rename to libs/CODEOWNERS
diff --git a/Gopkg.lock b/libs/Gopkg.lock
similarity index 100%
rename from Gopkg.lock
rename to libs/Gopkg.lock
diff --git a/Gopkg.toml b/libs/Gopkg.toml
similarity index 100%
rename from Gopkg.toml
rename to libs/Gopkg.toml
diff --git a/LICENSE b/libs/LICENSE
similarity index 100%
rename from LICENSE
rename to libs/LICENSE
diff --git a/Makefile b/libs/Makefile
similarity index 100%
rename from Makefile
rename to libs/Makefile
diff --git a/README.md b/libs/README.md
similarity index 100%
rename from README.md
rename to libs/README.md
diff --git a/autofile/README.md b/libs/autofile/README.md
similarity index 100%
rename from autofile/README.md
rename to libs/autofile/README.md
diff --git a/autofile/autofile.go b/libs/autofile/autofile.go
similarity index 100%
rename from autofile/autofile.go
rename to libs/autofile/autofile.go
diff --git a/autofile/autofile_test.go b/libs/autofile/autofile_test.go
similarity index 100%
rename from autofile/autofile_test.go
rename to libs/autofile/autofile_test.go
diff --git a/autofile/cmd/logjack.go b/libs/autofile/cmd/logjack.go
similarity index 100%
rename from autofile/cmd/logjack.go
rename to libs/autofile/cmd/logjack.go
diff --git a/autofile/group.go b/libs/autofile/group.go
similarity index 100%
rename from autofile/group.go
rename to libs/autofile/group.go
diff --git a/autofile/group_test.go b/libs/autofile/group_test.go
similarity index 100%
rename from autofile/group_test.go
rename to libs/autofile/group_test.go
diff --git a/autofile/sighup_watcher.go b/libs/autofile/sighup_watcher.go
similarity index 100%
rename from autofile/sighup_watcher.go
rename to libs/autofile/sighup_watcher.go
diff --git a/bech32/bech32.go b/libs/bech32/bech32.go
similarity index 100%
rename from bech32/bech32.go
rename to libs/bech32/bech32.go
diff --git a/bech32/bech32_test.go b/libs/bech32/bech32_test.go
similarity index 100%
rename from bech32/bech32_test.go
rename to libs/bech32/bech32_test.go
diff --git a/circle.yml b/libs/circle.yml
similarity index 100%
rename from circle.yml
rename to libs/circle.yml
diff --git a/cli/flags/log_level.go b/libs/cli/flags/log_level.go
similarity index 100%
rename from cli/flags/log_level.go
rename to libs/cli/flags/log_level.go
diff --git a/cli/flags/log_level_test.go b/libs/cli/flags/log_level_test.go
similarity index 100%
rename from cli/flags/log_level_test.go
rename to libs/cli/flags/log_level_test.go
diff --git a/cli/helper.go b/libs/cli/helper.go
similarity index 100%
rename from cli/helper.go
rename to libs/cli/helper.go
diff --git a/cli/setup.go b/libs/cli/setup.go
similarity index 100%
rename from cli/setup.go
rename to libs/cli/setup.go
diff --git a/cli/setup_test.go b/libs/cli/setup_test.go
similarity index 100%
rename from cli/setup_test.go
rename to libs/cli/setup_test.go
diff --git a/clist/clist.go b/libs/clist/clist.go
similarity index 100%
rename from clist/clist.go
rename to libs/clist/clist.go
diff --git a/clist/clist_test.go b/libs/clist/clist_test.go
similarity index 100%
rename from clist/clist_test.go
rename to libs/clist/clist_test.go
diff --git a/common/LICENSE b/libs/common/LICENSE
similarity index 100%
rename from common/LICENSE
rename to libs/common/LICENSE
diff --git a/common/array.go b/libs/common/array.go
similarity index 100%
rename from common/array.go
rename to libs/common/array.go
diff --git a/common/async.go b/libs/common/async.go
similarity index 100%
rename from common/async.go
rename to libs/common/async.go
diff --git a/common/async_test.go b/libs/common/async_test.go
similarity index 100%
rename from common/async_test.go
rename to libs/common/async_test.go
diff --git a/common/bit_array.go b/libs/common/bit_array.go
similarity index 100%
rename from common/bit_array.go
rename to libs/common/bit_array.go
diff --git a/common/bit_array_test.go b/libs/common/bit_array_test.go
similarity index 100%
rename from common/bit_array_test.go
rename to libs/common/bit_array_test.go
diff --git a/common/bytes.go b/libs/common/bytes.go
similarity index 100%
rename from common/bytes.go
rename to libs/common/bytes.go
diff --git a/common/bytes_test.go b/libs/common/bytes_test.go
similarity index 100%
rename from common/bytes_test.go
rename to libs/common/bytes_test.go
diff --git a/common/byteslice.go b/libs/common/byteslice.go
similarity index 100%
rename from common/byteslice.go
rename to libs/common/byteslice.go
diff --git a/common/byteslice_test.go b/libs/common/byteslice_test.go
similarity index 100%
rename from common/byteslice_test.go
rename to libs/common/byteslice_test.go
diff --git a/common/cmap.go b/libs/common/cmap.go
similarity index 100%
rename from common/cmap.go
rename to libs/common/cmap.go
diff --git a/common/cmap_test.go b/libs/common/cmap_test.go
similarity index 100%
rename from common/cmap_test.go
rename to libs/common/cmap_test.go
diff --git a/common/colors.go b/libs/common/colors.go
similarity index 100%
rename from common/colors.go
rename to libs/common/colors.go
diff --git a/common/date.go b/libs/common/date.go
similarity index 100%
rename from common/date.go
rename to libs/common/date.go
diff --git a/common/date_test.go b/libs/common/date_test.go
similarity index 100%
rename from common/date_test.go
rename to libs/common/date_test.go
diff --git a/common/errors.go b/libs/common/errors.go
similarity index 100%
rename from common/errors.go
rename to libs/common/errors.go
diff --git a/common/errors_test.go b/libs/common/errors_test.go
similarity index 100%
rename from common/errors_test.go
rename to libs/common/errors_test.go
diff --git a/common/heap.go b/libs/common/heap.go
similarity index 100%
rename from common/heap.go
rename to libs/common/heap.go
diff --git a/common/int.go b/libs/common/int.go
similarity index 100%
rename from common/int.go
rename to libs/common/int.go
diff --git a/common/int_test.go b/libs/common/int_test.go
similarity index 100%
rename from common/int_test.go
rename to libs/common/int_test.go
diff --git a/common/io.go b/libs/common/io.go
similarity index 100%
rename from common/io.go
rename to libs/common/io.go
diff --git a/common/kvpair.go b/libs/common/kvpair.go
similarity index 100%
rename from common/kvpair.go
rename to libs/common/kvpair.go
diff --git a/common/math.go b/libs/common/math.go
similarity index 100%
rename from common/math.go
rename to libs/common/math.go
diff --git a/common/net.go b/libs/common/net.go
similarity index 100%
rename from common/net.go
rename to libs/common/net.go
diff --git a/common/net_test.go b/libs/common/net_test.go
similarity index 100%
rename from common/net_test.go
rename to libs/common/net_test.go
diff --git a/common/nil.go b/libs/common/nil.go
similarity index 100%
rename from common/nil.go
rename to libs/common/nil.go
diff --git a/common/os.go b/libs/common/os.go
similarity index 100%
rename from common/os.go
rename to libs/common/os.go
diff --git a/common/os_test.go b/libs/common/os_test.go
similarity index 100%
rename from common/os_test.go
rename to libs/common/os_test.go
diff --git a/common/random.go b/libs/common/random.go
similarity index 100%
rename from common/random.go
rename to libs/common/random.go
diff --git a/common/random_test.go b/libs/common/random_test.go
similarity index 100%
rename from common/random_test.go
rename to libs/common/random_test.go
diff --git a/common/repeat_timer.go b/libs/common/repeat_timer.go
similarity index 100%
rename from common/repeat_timer.go
rename to libs/common/repeat_timer.go
diff --git a/common/repeat_timer_test.go b/libs/common/repeat_timer_test.go
similarity index 100%
rename from common/repeat_timer_test.go
rename to libs/common/repeat_timer_test.go
diff --git a/common/service.go b/libs/common/service.go
similarity index 100%
rename from common/service.go
rename to libs/common/service.go
diff --git a/common/service_test.go b/libs/common/service_test.go
similarity index 100%
rename from common/service_test.go
rename to libs/common/service_test.go
diff --git a/common/string.go b/libs/common/string.go
similarity index 100%
rename from common/string.go
rename to libs/common/string.go
diff --git a/common/string_test.go b/libs/common/string_test.go
similarity index 100%
rename from common/string_test.go
rename to libs/common/string_test.go
diff --git a/common/throttle_timer.go b/libs/common/throttle_timer.go
similarity index 100%
rename from common/throttle_timer.go
rename to libs/common/throttle_timer.go
diff --git a/common/throttle_timer_test.go b/libs/common/throttle_timer_test.go
similarity index 100%
rename from common/throttle_timer_test.go
rename to libs/common/throttle_timer_test.go
diff --git a/common/types.pb.go b/libs/common/types.pb.go
similarity index 100%
rename from common/types.pb.go
rename to libs/common/types.pb.go
diff --git a/common/types.proto b/libs/common/types.proto
similarity index 100%
rename from common/types.proto
rename to libs/common/types.proto
diff --git a/common/word.go b/libs/common/word.go
similarity index 100%
rename from common/word.go
rename to libs/common/word.go
diff --git a/db/LICENSE.md b/libs/db/LICENSE.md
similarity index 100%
rename from db/LICENSE.md
rename to libs/db/LICENSE.md
diff --git a/db/README.md b/libs/db/README.md
similarity index 100%
rename from db/README.md
rename to libs/db/README.md
diff --git a/db/backend_test.go b/libs/db/backend_test.go
similarity index 100%
rename from db/backend_test.go
rename to libs/db/backend_test.go
diff --git a/db/c_level_db.go b/libs/db/c_level_db.go
similarity index 100%
rename from db/c_level_db.go
rename to libs/db/c_level_db.go
diff --git a/db/c_level_db_test.go b/libs/db/c_level_db_test.go
similarity index 100%
rename from db/c_level_db_test.go
rename to libs/db/c_level_db_test.go
diff --git a/db/common_test.go b/libs/db/common_test.go
similarity index 100%
rename from db/common_test.go
rename to libs/db/common_test.go
diff --git a/db/db.go b/libs/db/db.go
similarity index 100%
rename from db/db.go
rename to libs/db/db.go
diff --git a/db/db_test.go b/libs/db/db_test.go
similarity index 100%
rename from db/db_test.go
rename to libs/db/db_test.go
diff --git a/db/debug_db.go b/libs/db/debug_db.go
similarity index 100%
rename from db/debug_db.go
rename to libs/db/debug_db.go
diff --git a/db/fsdb.go b/libs/db/fsdb.go
similarity index 100%
rename from db/fsdb.go
rename to libs/db/fsdb.go
diff --git a/db/go_level_db.go b/libs/db/go_level_db.go
similarity index 100%
rename from db/go_level_db.go
rename to libs/db/go_level_db.go
diff --git a/db/go_level_db_test.go b/libs/db/go_level_db_test.go
similarity index 100%
rename from db/go_level_db_test.go
rename to libs/db/go_level_db_test.go
diff --git a/db/mem_batch.go b/libs/db/mem_batch.go
similarity index 100%
rename from db/mem_batch.go
rename to libs/db/mem_batch.go
diff --git a/db/mem_db.go b/libs/db/mem_db.go
similarity index 100%
rename from db/mem_db.go
rename to libs/db/mem_db.go
diff --git a/db/prefix_db.go b/libs/db/prefix_db.go
similarity index 100%
rename from db/prefix_db.go
rename to libs/db/prefix_db.go
diff --git a/db/prefix_db_test.go b/libs/db/prefix_db_test.go
similarity index 100%
rename from db/prefix_db_test.go
rename to libs/db/prefix_db_test.go
diff --git a/db/remotedb/doc.go b/libs/db/remotedb/doc.go
similarity index 100%
rename from db/remotedb/doc.go
rename to libs/db/remotedb/doc.go
diff --git a/db/remotedb/grpcdb/client.go b/libs/db/remotedb/grpcdb/client.go
similarity index 100%
rename from db/remotedb/grpcdb/client.go
rename to libs/db/remotedb/grpcdb/client.go
diff --git a/db/remotedb/grpcdb/doc.go b/libs/db/remotedb/grpcdb/doc.go
similarity index 100%
rename from db/remotedb/grpcdb/doc.go
rename to libs/db/remotedb/grpcdb/doc.go
diff --git a/db/remotedb/grpcdb/example_test.go b/libs/db/remotedb/grpcdb/example_test.go
similarity index 100%
rename from db/remotedb/grpcdb/example_test.go
rename to libs/db/remotedb/grpcdb/example_test.go
diff --git a/db/remotedb/grpcdb/server.go b/libs/db/remotedb/grpcdb/server.go
similarity index 100%
rename from db/remotedb/grpcdb/server.go
rename to libs/db/remotedb/grpcdb/server.go
diff --git a/db/remotedb/proto/defs.pb.go b/libs/db/remotedb/proto/defs.pb.go
similarity index 100%
rename from db/remotedb/proto/defs.pb.go
rename to libs/db/remotedb/proto/defs.pb.go
diff --git a/db/remotedb/proto/defs.proto b/libs/db/remotedb/proto/defs.proto
similarity index 100%
rename from db/remotedb/proto/defs.proto
rename to libs/db/remotedb/proto/defs.proto
diff --git a/db/remotedb/remotedb.go b/libs/db/remotedb/remotedb.go
similarity index 100%
rename from db/remotedb/remotedb.go
rename to libs/db/remotedb/remotedb.go
diff --git a/db/remotedb/remotedb_test.go b/libs/db/remotedb/remotedb_test.go
similarity index 100%
rename from db/remotedb/remotedb_test.go
rename to libs/db/remotedb/remotedb_test.go
diff --git a/db/types.go b/libs/db/types.go
similarity index 100%
rename from db/types.go
rename to libs/db/types.go
diff --git a/db/util.go b/libs/db/util.go
similarity index 100%
rename from db/util.go
rename to libs/db/util.go
diff --git a/db/util_test.go b/libs/db/util_test.go
similarity index 100%
rename from db/util_test.go
rename to libs/db/util_test.go
diff --git a/flowrate/README.md b/libs/flowrate/README.md
similarity index 100%
rename from flowrate/README.md
rename to libs/flowrate/README.md
diff --git a/flowrate/flowrate.go b/libs/flowrate/flowrate.go
similarity index 100%
rename from flowrate/flowrate.go
rename to libs/flowrate/flowrate.go
diff --git a/flowrate/io.go b/libs/flowrate/io.go
similarity index 100%
rename from flowrate/io.go
rename to libs/flowrate/io.go
diff --git a/flowrate/io_test.go b/libs/flowrate/io_test.go
similarity index 100%
rename from flowrate/io_test.go
rename to libs/flowrate/io_test.go
diff --git a/flowrate/util.go b/libs/flowrate/util.go
similarity index 100%
rename from flowrate/util.go
rename to libs/flowrate/util.go
diff --git a/glide.lock b/libs/glide.lock
similarity index 100%
rename from glide.lock
rename to libs/glide.lock
diff --git a/glide.yaml b/libs/glide.yaml
similarity index 100%
rename from glide.yaml
rename to libs/glide.yaml
diff --git a/log/filter.go b/libs/log/filter.go
similarity index 100%
rename from log/filter.go
rename to libs/log/filter.go
diff --git a/log/filter_test.go b/libs/log/filter_test.go
similarity index 100%
rename from log/filter_test.go
rename to libs/log/filter_test.go
diff --git a/log/logger.go b/libs/log/logger.go
similarity index 100%
rename from log/logger.go
rename to libs/log/logger.go
diff --git a/log/nop_logger.go b/libs/log/nop_logger.go
similarity index 100%
rename from log/nop_logger.go
rename to libs/log/nop_logger.go
diff --git a/log/testing_logger.go b/libs/log/testing_logger.go
similarity index 100%
rename from log/testing_logger.go
rename to libs/log/testing_logger.go
diff --git a/log/tm_json_logger.go b/libs/log/tm_json_logger.go
similarity index 100%
rename from log/tm_json_logger.go
rename to libs/log/tm_json_logger.go
diff --git a/log/tm_logger.go b/libs/log/tm_logger.go
similarity index 100%
rename from log/tm_logger.go
rename to libs/log/tm_logger.go
diff --git a/log/tm_logger_test.go b/libs/log/tm_logger_test.go
similarity index 100%
rename from log/tm_logger_test.go
rename to libs/log/tm_logger_test.go
diff --git a/log/tmfmt_logger.go b/libs/log/tmfmt_logger.go
similarity index 100%
rename from log/tmfmt_logger.go
rename to libs/log/tmfmt_logger.go
diff --git a/log/tmfmt_logger_test.go b/libs/log/tmfmt_logger_test.go
similarity index 100%
rename from log/tmfmt_logger_test.go
rename to libs/log/tmfmt_logger_test.go
diff --git a/log/tracing_logger.go b/libs/log/tracing_logger.go
similarity index 100%
rename from log/tracing_logger.go
rename to libs/log/tracing_logger.go
diff --git a/log/tracing_logger_test.go b/libs/log/tracing_logger_test.go
similarity index 100%
rename from log/tracing_logger_test.go
rename to libs/log/tracing_logger_test.go
diff --git a/merge.sh b/libs/merge.sh
similarity index 100%
rename from merge.sh
rename to libs/merge.sh
diff --git a/merkle/README.md b/libs/merkle/README.md
similarity index 100%
rename from merkle/README.md
rename to libs/merkle/README.md
diff --git a/merkle/simple_map.go b/libs/merkle/simple_map.go
similarity index 100%
rename from merkle/simple_map.go
rename to libs/merkle/simple_map.go
diff --git a/merkle/simple_map_test.go b/libs/merkle/simple_map_test.go
similarity index 100%
rename from merkle/simple_map_test.go
rename to libs/merkle/simple_map_test.go
diff --git a/merkle/simple_proof.go b/libs/merkle/simple_proof.go
similarity index 100%
rename from merkle/simple_proof.go
rename to libs/merkle/simple_proof.go
diff --git a/merkle/simple_tree.go b/libs/merkle/simple_tree.go
similarity index 100%
rename from merkle/simple_tree.go
rename to libs/merkle/simple_tree.go
diff --git a/merkle/simple_tree_test.go b/libs/merkle/simple_tree_test.go
similarity index 100%
rename from merkle/simple_tree_test.go
rename to libs/merkle/simple_tree_test.go
diff --git a/merkle/tmhash/hash.go b/libs/merkle/tmhash/hash.go
similarity index 100%
rename from merkle/tmhash/hash.go
rename to libs/merkle/tmhash/hash.go
diff --git a/merkle/tmhash/hash_test.go b/libs/merkle/tmhash/hash_test.go
similarity index 100%
rename from merkle/tmhash/hash_test.go
rename to libs/merkle/tmhash/hash_test.go
diff --git a/merkle/types.go b/libs/merkle/types.go
similarity index 100%
rename from merkle/types.go
rename to libs/merkle/types.go
diff --git a/test.sh b/libs/test.sh
similarity index 100%
rename from test.sh
rename to libs/test.sh
diff --git a/test/README.md b/libs/test/README.md
similarity index 100%
rename from test/README.md
rename to libs/test/README.md
diff --git a/test/app/clean.sh b/libs/test/app/clean.sh
similarity index 100%
rename from test/app/clean.sh
rename to libs/test/app/clean.sh
diff --git a/test/app/counter_test.sh b/libs/test/app/counter_test.sh
similarity index 100%
rename from test/app/counter_test.sh
rename to libs/test/app/counter_test.sh
diff --git a/test/app/grpc_client.go b/libs/test/app/grpc_client.go
similarity index 100%
rename from test/app/grpc_client.go
rename to libs/test/app/grpc_client.go
diff --git a/test/app/kvstore_test.sh b/libs/test/app/kvstore_test.sh
similarity index 100%
rename from test/app/kvstore_test.sh
rename to libs/test/app/kvstore_test.sh
diff --git a/test/app/test.sh b/libs/test/app/test.sh
similarity index 100%
rename from test/app/test.sh
rename to libs/test/app/test.sh
diff --git a/test/assert.go b/libs/test/assert.go
similarity index 100%
rename from test/assert.go
rename to libs/test/assert.go
diff --git a/test/docker/Dockerfile b/libs/test/docker/Dockerfile
similarity index 100%
rename from test/docker/Dockerfile
rename to libs/test/docker/Dockerfile
diff --git a/test/docker/build.sh b/libs/test/docker/build.sh
similarity index 100%
rename from test/docker/build.sh
rename to libs/test/docker/build.sh
diff --git a/test/mutate.go b/libs/test/mutate.go
similarity index 100%
rename from test/mutate.go
rename to libs/test/mutate.go
diff --git a/test/p2p/README.md b/libs/test/p2p/README.md
similarity index 100%
rename from test/p2p/README.md
rename to libs/test/p2p/README.md
diff --git a/test/p2p/atomic_broadcast/test.sh b/libs/test/p2p/atomic_broadcast/test.sh
similarity index 100%
rename from test/p2p/atomic_broadcast/test.sh
rename to libs/test/p2p/atomic_broadcast/test.sh
diff --git a/test/p2p/basic/test.sh b/libs/test/p2p/basic/test.sh
similarity index 100%
rename from test/p2p/basic/test.sh
rename to libs/test/p2p/basic/test.sh
diff --git a/test/p2p/circleci.sh b/libs/test/p2p/circleci.sh
similarity index 100%
rename from test/p2p/circleci.sh
rename to libs/test/p2p/circleci.sh
diff --git a/test/p2p/client.sh b/libs/test/p2p/client.sh
similarity index 100%
rename from test/p2p/client.sh
rename to libs/test/p2p/client.sh
diff --git a/test/p2p/data/mach1/core/config/genesis.json b/libs/test/p2p/data/mach1/core/config/genesis.json
similarity index 100%
rename from test/p2p/data/mach1/core/config/genesis.json
rename to libs/test/p2p/data/mach1/core/config/genesis.json
diff --git a/test/p2p/data/mach1/core/config/node_key.json b/libs/test/p2p/data/mach1/core/config/node_key.json
similarity index 100%
rename from test/p2p/data/mach1/core/config/node_key.json
rename to libs/test/p2p/data/mach1/core/config/node_key.json
diff --git a/test/p2p/data/mach1/core/config/priv_validator.json b/libs/test/p2p/data/mach1/core/config/priv_validator.json
similarity index 100%
rename from test/p2p/data/mach1/core/config/priv_validator.json
rename to libs/test/p2p/data/mach1/core/config/priv_validator.json
diff --git a/test/p2p/data/mach2/core/config/genesis.json b/libs/test/p2p/data/mach2/core/config/genesis.json
similarity index 100%
rename from test/p2p/data/mach2/core/config/genesis.json
rename to libs/test/p2p/data/mach2/core/config/genesis.json
diff --git a/test/p2p/data/mach2/core/config/node_key.json b/libs/test/p2p/data/mach2/core/config/node_key.json
similarity index 100%
rename from test/p2p/data/mach2/core/config/node_key.json
rename to libs/test/p2p/data/mach2/core/config/node_key.json
diff --git a/test/p2p/data/mach2/core/config/priv_validator.json b/libs/test/p2p/data/mach2/core/config/priv_validator.json
similarity index 100%
rename from test/p2p/data/mach2/core/config/priv_validator.json
rename to libs/test/p2p/data/mach2/core/config/priv_validator.json
diff --git a/test/p2p/data/mach3/core/config/genesis.json b/libs/test/p2p/data/mach3/core/config/genesis.json
similarity index 100%
rename from test/p2p/data/mach3/core/config/genesis.json
rename to libs/test/p2p/data/mach3/core/config/genesis.json
diff --git a/test/p2p/data/mach3/core/config/node_key.json b/libs/test/p2p/data/mach3/core/config/node_key.json
similarity index 100%
rename from test/p2p/data/mach3/core/config/node_key.json
rename to libs/test/p2p/data/mach3/core/config/node_key.json
diff --git a/test/p2p/data/mach3/core/config/priv_validator.json b/libs/test/p2p/data/mach3/core/config/priv_validator.json
similarity index 100%
rename from test/p2p/data/mach3/core/config/priv_validator.json
rename to libs/test/p2p/data/mach3/core/config/priv_validator.json
diff --git a/test/p2p/data/mach4/core/config/genesis.json b/libs/test/p2p/data/mach4/core/config/genesis.json
similarity index 100%
rename from test/p2p/data/mach4/core/config/genesis.json
rename to libs/test/p2p/data/mach4/core/config/genesis.json
diff --git a/test/p2p/data/mach4/core/config/node_key.json b/libs/test/p2p/data/mach4/core/config/node_key.json
similarity index 100%
rename from test/p2p/data/mach4/core/config/node_key.json
rename to libs/test/p2p/data/mach4/core/config/node_key.json
diff --git a/test/p2p/data/mach4/core/config/priv_validator.json b/libs/test/p2p/data/mach4/core/config/priv_validator.json
similarity index 100%
rename from test/p2p/data/mach4/core/config/priv_validator.json
rename to libs/test/p2p/data/mach4/core/config/priv_validator.json
diff --git a/test/p2p/fast_sync/check_peer.sh b/libs/test/p2p/fast_sync/check_peer.sh
similarity index 100%
rename from test/p2p/fast_sync/check_peer.sh
rename to libs/test/p2p/fast_sync/check_peer.sh
diff --git a/test/p2p/fast_sync/test.sh b/libs/test/p2p/fast_sync/test.sh
similarity index 100%
rename from test/p2p/fast_sync/test.sh
rename to libs/test/p2p/fast_sync/test.sh
diff --git a/test/p2p/fast_sync/test_peer.sh b/libs/test/p2p/fast_sync/test_peer.sh
similarity index 100%
rename from test/p2p/fast_sync/test_peer.sh
rename to libs/test/p2p/fast_sync/test_peer.sh
diff --git a/test/p2p/ip.sh b/libs/test/p2p/ip.sh
similarity index 100%
rename from test/p2p/ip.sh
rename to libs/test/p2p/ip.sh
diff --git a/test/p2p/ip_plus_id.sh b/libs/test/p2p/ip_plus_id.sh
similarity index 100%
rename from test/p2p/ip_plus_id.sh
rename to libs/test/p2p/ip_plus_id.sh
diff --git a/test/p2p/kill_all/check_peers.sh b/libs/test/p2p/kill_all/check_peers.sh
similarity index 100%
rename from test/p2p/kill_all/check_peers.sh
rename to libs/test/p2p/kill_all/check_peers.sh
diff --git a/test/p2p/kill_all/test.sh b/libs/test/p2p/kill_all/test.sh
similarity index 100%
rename from test/p2p/kill_all/test.sh
rename to libs/test/p2p/kill_all/test.sh
diff --git a/test/p2p/local_testnet_start.sh b/libs/test/p2p/local_testnet_start.sh
similarity index 100%
rename from test/p2p/local_testnet_start.sh
rename to libs/test/p2p/local_testnet_start.sh
diff --git a/test/p2p/local_testnet_stop.sh b/libs/test/p2p/local_testnet_stop.sh
similarity index 100%
rename from test/p2p/local_testnet_stop.sh
rename to libs/test/p2p/local_testnet_stop.sh
diff --git a/test/p2p/peer.sh b/libs/test/p2p/peer.sh
similarity index 100%
rename from test/p2p/peer.sh
rename to libs/test/p2p/peer.sh
diff --git a/test/p2p/persistent_peers.sh b/libs/test/p2p/persistent_peers.sh
similarity index 100%
rename from test/p2p/persistent_peers.sh
rename to libs/test/p2p/persistent_peers.sh
diff --git a/test/p2p/pex/check_peer.sh b/libs/test/p2p/pex/check_peer.sh
similarity index 100%
rename from test/p2p/pex/check_peer.sh
rename to libs/test/p2p/pex/check_peer.sh
diff --git a/test/p2p/pex/dial_peers.sh b/libs/test/p2p/pex/dial_peers.sh
similarity index 100%
rename from test/p2p/pex/dial_peers.sh
rename to libs/test/p2p/pex/dial_peers.sh
diff --git a/test/p2p/pex/test.sh b/libs/test/p2p/pex/test.sh
similarity index 100%
rename from test/p2p/pex/test.sh
rename to libs/test/p2p/pex/test.sh
diff --git a/test/p2p/pex/test_addrbook.sh b/libs/test/p2p/pex/test_addrbook.sh
similarity index 100%
rename from test/p2p/pex/test_addrbook.sh
rename to libs/test/p2p/pex/test_addrbook.sh
diff --git a/test/p2p/pex/test_dial_peers.sh b/libs/test/p2p/pex/test_dial_peers.sh
similarity index 100%
rename from test/p2p/pex/test_dial_peers.sh
rename to libs/test/p2p/pex/test_dial_peers.sh
diff --git a/test/p2p/test.sh b/libs/test/p2p/test.sh
similarity index 100%
rename from test/p2p/test.sh
rename to libs/test/p2p/test.sh
diff --git a/test/persist/test_failure_indices.sh b/libs/test/persist/test_failure_indices.sh
similarity index 100%
rename from test/persist/test_failure_indices.sh
rename to libs/test/persist/test_failure_indices.sh
diff --git a/test/persist/test_simple.sh b/libs/test/persist/test_simple.sh
similarity index 100%
rename from test/persist/test_simple.sh
rename to libs/test/persist/test_simple.sh
diff --git a/test/persist/txs.sh b/libs/test/persist/txs.sh
similarity index 100%
rename from test/persist/txs.sh
rename to libs/test/persist/txs.sh
diff --git a/test/test_cover.sh b/libs/test/test_cover.sh
similarity index 100%
rename from test/test_cover.sh
rename to libs/test/test_cover.sh
diff --git a/version/version.go b/libs/version/version.go
similarity index 100%
rename from version/version.go
rename to libs/version/version.go