diff --git a/chaindata/chaindata.go b/chains/chaindata.go
similarity index 100%
rename from chaindata/chaindata.go
rename to chains/chaindata.go
diff --git a/chaindata/chaindata_test.go b/chains/chaindata_test.go
similarity index 100%
rename from chaindata/chaindata_test.go
rename to chains/chaindata_test.go
diff --git a/chaindata/_data/.gitignore b/chains/data/.gitignore
similarity index 100%
rename from chaindata/_data/.gitignore
rename to chains/data/.gitignore
diff --git a/chaindata/_data/small/000002.ldb b/chains/data/small/geth/000002.ldb
similarity index 100%
rename from chaindata/_data/small/000002.ldb
rename to chains/data/small/geth/000002.ldb
diff --git a/chaindata/_data/small/000004.ldb b/chains/data/small/geth/000004.ldb
similarity index 100%
rename from chaindata/_data/small/000004.ldb
rename to chains/data/small/geth/000004.ldb
diff --git a/chaindata/_data/small/ancient/bodies.0000.cdat b/chains/data/small/geth/ancient/bodies.0000.cdat
similarity index 100%
rename from chaindata/_data/small/ancient/bodies.0000.cdat
rename to chains/data/small/geth/ancient/bodies.0000.cdat
diff --git a/chaindata/_data/small/ancient/bodies.cidx b/chains/data/small/geth/ancient/bodies.cidx
similarity index 100%
rename from chaindata/_data/small/ancient/bodies.cidx
rename to chains/data/small/geth/ancient/bodies.cidx
diff --git a/chaindata/_data/small/ancient/bodies.meta b/chains/data/small/geth/ancient/bodies.meta
similarity index 100%
rename from chaindata/_data/small/ancient/bodies.meta
rename to chains/data/small/geth/ancient/bodies.meta
diff --git a/chaindata/_data/small/ancient/diffs.0000.rdat b/chains/data/small/geth/ancient/diffs.0000.rdat
similarity index 100%
rename from chaindata/_data/small/ancient/diffs.0000.rdat
rename to chains/data/small/geth/ancient/diffs.0000.rdat
diff --git a/chaindata/_data/small/ancient/diffs.meta b/chains/data/small/geth/ancient/diffs.meta
similarity index 100%
rename from chaindata/_data/small/ancient/diffs.meta
rename to chains/data/small/geth/ancient/diffs.meta
diff --git a/chaindata/_data/small/ancient/diffs.ridx b/chains/data/small/geth/ancient/diffs.ridx
similarity index 100%
rename from chaindata/_data/small/ancient/diffs.ridx
rename to chains/data/small/geth/ancient/diffs.ridx
diff --git a/chaindata/_data/small/ancient/hashes.0000.rdat b/chains/data/small/geth/ancient/hashes.0000.rdat
similarity index 100%
rename from chaindata/_data/small/ancient/hashes.0000.rdat
rename to chains/data/small/geth/ancient/hashes.0000.rdat
diff --git a/chaindata/_data/small/ancient/hashes.meta b/chains/data/small/geth/ancient/hashes.meta
similarity index 100%
rename from chaindata/_data/small/ancient/hashes.meta
rename to chains/data/small/geth/ancient/hashes.meta
diff --git a/chaindata/_data/small/ancient/hashes.ridx b/chains/data/small/geth/ancient/hashes.ridx
similarity index 100%
rename from chaindata/_data/small/ancient/hashes.ridx
rename to chains/data/small/geth/ancient/hashes.ridx
diff --git a/chaindata/_data/small/ancient/headers.0000.cdat b/chains/data/small/geth/ancient/headers.0000.cdat
similarity index 100%
rename from chaindata/_data/small/ancient/headers.0000.cdat
rename to chains/data/small/geth/ancient/headers.0000.cdat
diff --git a/chaindata/_data/small/ancient/headers.cidx b/chains/data/small/geth/ancient/headers.cidx
similarity index 100%
rename from chaindata/_data/small/ancient/headers.cidx
rename to chains/data/small/geth/ancient/headers.cidx
diff --git a/chaindata/_data/small/ancient/headers.meta b/chains/data/small/geth/ancient/headers.meta
similarity index 100%
rename from chaindata/_data/small/ancient/headers.meta
rename to chains/data/small/geth/ancient/headers.meta
diff --git a/chaindata/_data/small/ancient/receipts.0000.cdat b/chains/data/small/geth/ancient/receipts.0000.cdat
similarity index 100%
rename from chaindata/_data/small/ancient/receipts.0000.cdat
rename to chains/data/small/geth/ancient/receipts.0000.cdat
diff --git a/chaindata/_data/small/ancient/receipts.cidx b/chains/data/small/geth/ancient/receipts.cidx
similarity index 100%
rename from chaindata/_data/small/ancient/receipts.cidx
rename to chains/data/small/geth/ancient/receipts.cidx
diff --git a/chaindata/_data/small/ancient/receipts.meta b/chains/data/small/geth/ancient/receipts.meta
similarity index 100%
rename from chaindata/_data/small/ancient/receipts.meta
rename to chains/data/small/geth/ancient/receipts.meta
diff --git a/chaindata/_data/small2/000002.ldb b/chains/data/small2/geth/000002.ldb
similarity index 100%
rename from chaindata/_data/small2/000002.ldb
rename to chains/data/small2/geth/000002.ldb
diff --git a/chaindata/_data/small2/000003.ldb b/chains/data/small2/geth/000003.ldb
similarity index 100%
rename from chaindata/_data/small2/000003.ldb
rename to chains/data/small2/geth/000003.ldb
diff --git a/chaindata/_data/small2/ancient/chain/bodies.0000.cdat b/chains/data/small2/geth/ancient/chain/bodies.0000.cdat
similarity index 100%
rename from chaindata/_data/small2/ancient/chain/bodies.0000.cdat
rename to chains/data/small2/geth/ancient/chain/bodies.0000.cdat
diff --git a/chaindata/_data/small2/ancient/chain/bodies.cidx b/chains/data/small2/geth/ancient/chain/bodies.cidx
similarity index 100%
rename from chaindata/_data/small2/ancient/chain/bodies.cidx
rename to chains/data/small2/geth/ancient/chain/bodies.cidx
diff --git a/chaindata/_data/small2/ancient/chain/bodies.meta b/chains/data/small2/geth/ancient/chain/bodies.meta
similarity index 100%
rename from chaindata/_data/small2/ancient/chain/bodies.meta
rename to chains/data/small2/geth/ancient/chain/bodies.meta
diff --git a/chaindata/_data/small2/ancient/chain/diffs.0000.rdat b/chains/data/small2/geth/ancient/chain/diffs.0000.rdat
similarity index 100%
rename from chaindata/_data/small2/ancient/chain/diffs.0000.rdat
rename to chains/data/small2/geth/ancient/chain/diffs.0000.rdat
diff --git a/chaindata/_data/small2/ancient/chain/diffs.meta b/chains/data/small2/geth/ancient/chain/diffs.meta
similarity index 100%
rename from chaindata/_data/small2/ancient/chain/diffs.meta
rename to chains/data/small2/geth/ancient/chain/diffs.meta
diff --git a/chaindata/_data/small2/ancient/chain/diffs.ridx b/chains/data/small2/geth/ancient/chain/diffs.ridx
similarity index 100%
rename from chaindata/_data/small2/ancient/chain/diffs.ridx
rename to chains/data/small2/geth/ancient/chain/diffs.ridx
diff --git a/chaindata/_data/small2/ancient/chain/hashes.0000.rdat b/chains/data/small2/geth/ancient/chain/hashes.0000.rdat
similarity index 100%
rename from chaindata/_data/small2/ancient/chain/hashes.0000.rdat
rename to chains/data/small2/geth/ancient/chain/hashes.0000.rdat
diff --git a/chaindata/_data/small2/ancient/chain/hashes.meta b/chains/data/small2/geth/ancient/chain/hashes.meta
similarity index 100%
rename from chaindata/_data/small2/ancient/chain/hashes.meta
rename to chains/data/small2/geth/ancient/chain/hashes.meta
diff --git a/chaindata/_data/small2/ancient/chain/hashes.ridx b/chains/data/small2/geth/ancient/chain/hashes.ridx
similarity index 100%
rename from chaindata/_data/small2/ancient/chain/hashes.ridx
rename to chains/data/small2/geth/ancient/chain/hashes.ridx
diff --git a/chaindata/_data/small2/ancient/chain/headers.0000.cdat b/chains/data/small2/geth/ancient/chain/headers.0000.cdat
similarity index 100%
rename from chaindata/_data/small2/ancient/chain/headers.0000.cdat
rename to chains/data/small2/geth/ancient/chain/headers.0000.cdat
diff --git a/chaindata/_data/small2/ancient/chain/headers.cidx b/chains/data/small2/geth/ancient/chain/headers.cidx
similarity index 100%
rename from chaindata/_data/small2/ancient/chain/headers.cidx
rename to chains/data/small2/geth/ancient/chain/headers.cidx
diff --git a/chaindata/_data/small2/ancient/chain/headers.meta b/chains/data/small2/geth/ancient/chain/headers.meta
similarity index 100%
rename from chaindata/_data/small2/ancient/chain/headers.meta
rename to chains/data/small2/geth/ancient/chain/headers.meta
diff --git a/chaindata/_data/small2/ancient/chain/receipts.0000.cdat b/chains/data/small2/geth/ancient/chain/receipts.0000.cdat
similarity index 100%
rename from chaindata/_data/small2/ancient/chain/receipts.0000.cdat
rename to chains/data/small2/geth/ancient/chain/receipts.0000.cdat
diff --git a/chaindata/_data/small2/ancient/chain/receipts.cidx b/chains/data/small2/geth/ancient/chain/receipts.cidx
similarity index 100%
rename from chaindata/_data/small2/ancient/chain/receipts.cidx
rename to chains/data/small2/geth/ancient/chain/receipts.cidx
diff --git a/chaindata/_data/small2/ancient/chain/receipts.meta b/chains/data/small2/geth/ancient/chain/receipts.meta
similarity index 100%
rename from chaindata/_data/small2/ancient/chain/receipts.meta
rename to chains/data/small2/geth/ancient/chain/receipts.meta
diff --git a/chaindata/mainnet/block0_rlp b/chains/mainnet/block0_rlp
similarity index 100%
rename from chaindata/mainnet/block0_rlp
rename to chains/mainnet/block0_rlp
diff --git a/chaindata/mainnet/block1_rlp b/chains/mainnet/block1_rlp
similarity index 100%
rename from chaindata/mainnet/block1_rlp
rename to chains/mainnet/block1_rlp
diff --git a/chaindata/mainnet/block2_rlp b/chains/mainnet/block2_rlp
similarity index 100%
rename from chaindata/mainnet/block2_rlp
rename to chains/mainnet/block2_rlp
diff --git a/chaindata/mainnet/block3_rlp b/chains/mainnet/block3_rlp
similarity index 100%
rename from chaindata/mainnet/block3_rlp
rename to chains/mainnet/block3_rlp
diff --git a/chaindata/mainnet/chain.go b/chains/mainnet/chain.go
similarity index 100%
rename from chaindata/mainnet/chain.go
rename to chains/mainnet/chain.go
diff --git a/chaindata/mainnet/chain_test.go b/chains/mainnet/chain_test.go
similarity index 100%
rename from chaindata/mainnet/chain_test.go
rename to chains/mainnet/chain_test.go
diff --git a/chaindata/small/chain.go b/chains/small/chain.go
similarity index 100%
rename from chaindata/small/chain.go
rename to chains/small/chain.go
diff --git a/chaindata/small2/chain.go b/chains/small2/chain.go
similarity index 100%
rename from chaindata/small2/chain.go
rename to chains/small2/chain.go
diff --git a/chaindata/small2/paths.go b/chains/small2/paths.go
similarity index 100%
rename from chaindata/small2/paths.go
rename to chains/small2/paths.go