diff --git a/Cargo.toml b/Cargo.toml
index 1ca11dcbb..c73e9f22d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,19 +1,19 @@
 [workspace]
 members = [
-	"beacon_chain/attestation_validation",
-	"beacon_chain/genesis",
-	"beacon_chain/naive_fork_choice",
-	"beacon_chain/spec",
-	"beacon_chain/types",
-	"beacon_chain/utils/bls",
-	"beacon_chain/utils/boolean-bitfield",
-	"beacon_chain/utils/hashing",
-	"beacon_chain/utils/honey-badger-split",
-	"beacon_chain/utils/slot_clock",
-	"beacon_chain/utils/ssz",
-	"beacon_chain/utils/vec_shuffle",
-	"beacon_chain/validator_induction",
-	"beacon_chain/validator_shuffling",
+	"eth2/attestation_validation",
+	"eth2/genesis",
+	"eth2/naive_fork_choice",
+	"eth2/spec",
+	"eth2/types",
+	"eth2/utils/bls",
+	"eth2/utils/boolean-bitfield",
+	"eth2/utils/hashing",
+	"eth2/utils/honey-badger-split",
+	"eth2/utils/slot_clock",
+	"eth2/utils/ssz",
+	"eth2/utils/vec_shuffle",
+	"eth2/validator_induction",
+	"eth2/validator_shuffling",
 	"beacon_node",
 	"beacon_node/db",
 	"protos",
diff --git a/beacon_node/Cargo.toml b/beacon_node/Cargo.toml
index ca78a4767..44e6cda01 100644
--- a/beacon_node/Cargo.toml
+++ b/beacon_node/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 
 [dependencies]
-bls = { path = "../beacon_chain/utils/bls" }
+bls = { path = "../eth2/utils/bls" }
 grpcio = { version = "0.4", default-features = false, features = ["protobuf-codec"] }
 protobuf = "2.0.2"
 protos = { path = "../protos" }
@@ -16,5 +16,5 @@ futures = "0.1.23"
 slog = "^2.2.3"
 slog-term = "^2.4.0"
 slog-async = "^2.3.0"
-ssz = { path = "../beacon_chain/utils/ssz" }
+ssz = { path = "../eth2/utils/ssz" }
 tokio = "0.1"
diff --git a/beacon_node/db/Cargo.toml b/beacon_node/db/Cargo.toml
index cdad7a9d8..122aaa34d 100644
--- a/beacon_node/db/Cargo.toml
+++ b/beacon_node/db/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2018"
 
 [dependencies]
 blake2-rfc = "0.2.18"
-bls = { path = "../../beacon_chain/utils/bls" }
+bls = { path = "../../eth2/utils/bls" }
 bytes = "0.4.10"
 rocksdb = "0.10.1"
-ssz = { path = "../../beacon_chain/utils/ssz" }
-types = { path = "../../beacon_chain/types" }
+ssz = { path = "../../eth2/utils/ssz" }
+types = { path = "../../eth2/types" }
diff --git a/beacon_chain/attestation_validation/Cargo.toml b/eth2/attestation_validation/Cargo.toml
similarity index 100%
rename from beacon_chain/attestation_validation/Cargo.toml
rename to eth2/attestation_validation/Cargo.toml
diff --git a/beacon_chain/attestation_validation/src/block_inclusion.rs b/eth2/attestation_validation/src/block_inclusion.rs
similarity index 100%
rename from beacon_chain/attestation_validation/src/block_inclusion.rs
rename to eth2/attestation_validation/src/block_inclusion.rs
diff --git a/beacon_chain/attestation_validation/src/enums.rs b/eth2/attestation_validation/src/enums.rs
similarity index 100%
rename from beacon_chain/attestation_validation/src/enums.rs
rename to eth2/attestation_validation/src/enums.rs
diff --git a/beacon_chain/attestation_validation/src/justified_block.rs b/eth2/attestation_validation/src/justified_block.rs
similarity index 100%
rename from beacon_chain/attestation_validation/src/justified_block.rs
rename to eth2/attestation_validation/src/justified_block.rs
diff --git a/beacon_chain/attestation_validation/src/justified_slot.rs b/eth2/attestation_validation/src/justified_slot.rs
similarity index 100%
rename from beacon_chain/attestation_validation/src/justified_slot.rs
rename to eth2/attestation_validation/src/justified_slot.rs
diff --git a/beacon_chain/attestation_validation/src/lib.rs b/eth2/attestation_validation/src/lib.rs
similarity index 100%
rename from beacon_chain/attestation_validation/src/lib.rs
rename to eth2/attestation_validation/src/lib.rs
diff --git a/beacon_chain/attestation_validation/src/macros.rs b/eth2/attestation_validation/src/macros.rs
similarity index 100%
rename from beacon_chain/attestation_validation/src/macros.rs
rename to eth2/attestation_validation/src/macros.rs
diff --git a/beacon_chain/attestation_validation/src/shard_block.rs b/eth2/attestation_validation/src/shard_block.rs
similarity index 100%
rename from beacon_chain/attestation_validation/src/shard_block.rs
rename to eth2/attestation_validation/src/shard_block.rs
diff --git a/beacon_chain/attestation_validation/src/signature.rs b/eth2/attestation_validation/src/signature.rs
similarity index 100%
rename from beacon_chain/attestation_validation/src/signature.rs
rename to eth2/attestation_validation/src/signature.rs
diff --git a/beacon_chain/genesis/Cargo.toml b/eth2/genesis/Cargo.toml
similarity index 100%
rename from beacon_chain/genesis/Cargo.toml
rename to eth2/genesis/Cargo.toml
diff --git a/beacon_chain/genesis/src/beacon_block.rs b/eth2/genesis/src/beacon_block.rs
similarity index 100%
rename from beacon_chain/genesis/src/beacon_block.rs
rename to eth2/genesis/src/beacon_block.rs
diff --git a/beacon_chain/genesis/src/beacon_state.rs b/eth2/genesis/src/beacon_state.rs
similarity index 100%
rename from beacon_chain/genesis/src/beacon_state.rs
rename to eth2/genesis/src/beacon_state.rs
diff --git a/beacon_chain/genesis/src/lib.rs b/eth2/genesis/src/lib.rs
similarity index 100%
rename from beacon_chain/genesis/src/lib.rs
rename to eth2/genesis/src/lib.rs
diff --git a/beacon_chain/naive_fork_choice/Cargo.toml b/eth2/naive_fork_choice/Cargo.toml
similarity index 100%
rename from beacon_chain/naive_fork_choice/Cargo.toml
rename to eth2/naive_fork_choice/Cargo.toml
diff --git a/beacon_chain/naive_fork_choice/src/lib.rs b/eth2/naive_fork_choice/src/lib.rs
similarity index 100%
rename from beacon_chain/naive_fork_choice/src/lib.rs
rename to eth2/naive_fork_choice/src/lib.rs
diff --git a/beacon_chain/spec/Cargo.toml b/eth2/spec/Cargo.toml
similarity index 100%
rename from beacon_chain/spec/Cargo.toml
rename to eth2/spec/Cargo.toml
diff --git a/beacon_chain/spec/src/foundation.rs b/eth2/spec/src/foundation.rs
similarity index 100%
rename from beacon_chain/spec/src/foundation.rs
rename to eth2/spec/src/foundation.rs
diff --git a/beacon_chain/spec/src/lib.rs b/eth2/spec/src/lib.rs
similarity index 100%
rename from beacon_chain/spec/src/lib.rs
rename to eth2/spec/src/lib.rs
diff --git a/beacon_chain/types/Cargo.toml b/eth2/types/Cargo.toml
similarity index 100%
rename from beacon_chain/types/Cargo.toml
rename to eth2/types/Cargo.toml
diff --git a/beacon_chain/types/src/attestation.rs b/eth2/types/src/attestation.rs
similarity index 100%
rename from beacon_chain/types/src/attestation.rs
rename to eth2/types/src/attestation.rs
diff --git a/beacon_chain/types/src/attestation_data.rs b/eth2/types/src/attestation_data.rs
similarity index 100%
rename from beacon_chain/types/src/attestation_data.rs
rename to eth2/types/src/attestation_data.rs
diff --git a/beacon_chain/types/src/attestation_data_and_custody_bit.rs b/eth2/types/src/attestation_data_and_custody_bit.rs
similarity index 100%
rename from beacon_chain/types/src/attestation_data_and_custody_bit.rs
rename to eth2/types/src/attestation_data_and_custody_bit.rs
diff --git a/beacon_chain/types/src/beacon_block.rs b/eth2/types/src/beacon_block.rs
similarity index 100%
rename from beacon_chain/types/src/beacon_block.rs
rename to eth2/types/src/beacon_block.rs
diff --git a/beacon_chain/types/src/beacon_block_body.rs b/eth2/types/src/beacon_block_body.rs
similarity index 100%
rename from beacon_chain/types/src/beacon_block_body.rs
rename to eth2/types/src/beacon_block_body.rs
diff --git a/beacon_chain/types/src/beacon_state.rs b/eth2/types/src/beacon_state.rs
similarity index 100%
rename from beacon_chain/types/src/beacon_state.rs
rename to eth2/types/src/beacon_state.rs
diff --git a/beacon_chain/types/src/candidate_pow_receipt_root_record.rs b/eth2/types/src/candidate_pow_receipt_root_record.rs
similarity index 100%
rename from beacon_chain/types/src/candidate_pow_receipt_root_record.rs
rename to eth2/types/src/candidate_pow_receipt_root_record.rs
diff --git a/beacon_chain/types/src/casper_slashing.rs b/eth2/types/src/casper_slashing.rs
similarity index 100%
rename from beacon_chain/types/src/casper_slashing.rs
rename to eth2/types/src/casper_slashing.rs
diff --git a/beacon_chain/types/src/crosslink_record.rs b/eth2/types/src/crosslink_record.rs
similarity index 100%
rename from beacon_chain/types/src/crosslink_record.rs
rename to eth2/types/src/crosslink_record.rs
diff --git a/beacon_chain/types/src/deposit.rs b/eth2/types/src/deposit.rs
similarity index 100%
rename from beacon_chain/types/src/deposit.rs
rename to eth2/types/src/deposit.rs
diff --git a/beacon_chain/types/src/deposit_data.rs b/eth2/types/src/deposit_data.rs
similarity index 100%
rename from beacon_chain/types/src/deposit_data.rs
rename to eth2/types/src/deposit_data.rs
diff --git a/beacon_chain/types/src/deposit_input.rs b/eth2/types/src/deposit_input.rs
similarity index 100%
rename from beacon_chain/types/src/deposit_input.rs
rename to eth2/types/src/deposit_input.rs
diff --git a/beacon_chain/types/src/exit.rs b/eth2/types/src/exit.rs
similarity index 100%
rename from beacon_chain/types/src/exit.rs
rename to eth2/types/src/exit.rs
diff --git a/beacon_chain/types/src/fork_data.rs b/eth2/types/src/fork_data.rs
similarity index 100%
rename from beacon_chain/types/src/fork_data.rs
rename to eth2/types/src/fork_data.rs
diff --git a/beacon_chain/types/src/lib.rs b/eth2/types/src/lib.rs
similarity index 100%
rename from beacon_chain/types/src/lib.rs
rename to eth2/types/src/lib.rs
diff --git a/beacon_chain/types/src/pending_attestation_record.rs b/eth2/types/src/pending_attestation_record.rs
similarity index 100%
rename from beacon_chain/types/src/pending_attestation_record.rs
rename to eth2/types/src/pending_attestation_record.rs
diff --git a/beacon_chain/types/src/proposal_signed_data.rs b/eth2/types/src/proposal_signed_data.rs
similarity index 100%
rename from beacon_chain/types/src/proposal_signed_data.rs
rename to eth2/types/src/proposal_signed_data.rs
diff --git a/beacon_chain/types/src/proposer_slashing.rs b/eth2/types/src/proposer_slashing.rs
similarity index 100%
rename from beacon_chain/types/src/proposer_slashing.rs
rename to eth2/types/src/proposer_slashing.rs
diff --git a/beacon_chain/types/src/readers/block_reader.rs b/eth2/types/src/readers/block_reader.rs
similarity index 100%
rename from beacon_chain/types/src/readers/block_reader.rs
rename to eth2/types/src/readers/block_reader.rs
diff --git a/beacon_chain/types/src/readers/mod.rs b/eth2/types/src/readers/mod.rs
similarity index 100%
rename from beacon_chain/types/src/readers/mod.rs
rename to eth2/types/src/readers/mod.rs
diff --git a/beacon_chain/types/src/readers/state_reader.rs b/eth2/types/src/readers/state_reader.rs
similarity index 100%
rename from beacon_chain/types/src/readers/state_reader.rs
rename to eth2/types/src/readers/state_reader.rs
diff --git a/beacon_chain/types/src/shard_committee.rs b/eth2/types/src/shard_committee.rs
similarity index 100%
rename from beacon_chain/types/src/shard_committee.rs
rename to eth2/types/src/shard_committee.rs
diff --git a/beacon_chain/types/src/shard_reassignment_record.rs b/eth2/types/src/shard_reassignment_record.rs
similarity index 100%
rename from beacon_chain/types/src/shard_reassignment_record.rs
rename to eth2/types/src/shard_reassignment_record.rs
diff --git a/beacon_chain/types/src/slashable_vote_data.rs b/eth2/types/src/slashable_vote_data.rs
similarity index 100%
rename from beacon_chain/types/src/slashable_vote_data.rs
rename to eth2/types/src/slashable_vote_data.rs
diff --git a/beacon_chain/types/src/special_record.rs b/eth2/types/src/special_record.rs
similarity index 100%
rename from beacon_chain/types/src/special_record.rs
rename to eth2/types/src/special_record.rs
diff --git a/beacon_chain/types/src/test_utils/address.rs b/eth2/types/src/test_utils/address.rs
similarity index 100%
rename from beacon_chain/types/src/test_utils/address.rs
rename to eth2/types/src/test_utils/address.rs
diff --git a/beacon_chain/types/src/test_utils/aggregate_signature.rs b/eth2/types/src/test_utils/aggregate_signature.rs
similarity index 100%
rename from beacon_chain/types/src/test_utils/aggregate_signature.rs
rename to eth2/types/src/test_utils/aggregate_signature.rs
diff --git a/beacon_chain/types/src/test_utils/bitfield.rs b/eth2/types/src/test_utils/bitfield.rs
similarity index 100%
rename from beacon_chain/types/src/test_utils/bitfield.rs
rename to eth2/types/src/test_utils/bitfield.rs
diff --git a/beacon_chain/types/src/test_utils/hash256.rs b/eth2/types/src/test_utils/hash256.rs
similarity index 100%
rename from beacon_chain/types/src/test_utils/hash256.rs
rename to eth2/types/src/test_utils/hash256.rs
diff --git a/beacon_chain/types/src/test_utils/mod.rs b/eth2/types/src/test_utils/mod.rs
similarity index 100%
rename from beacon_chain/types/src/test_utils/mod.rs
rename to eth2/types/src/test_utils/mod.rs
diff --git a/beacon_chain/types/src/test_utils/public_key.rs b/eth2/types/src/test_utils/public_key.rs
similarity index 100%
rename from beacon_chain/types/src/test_utils/public_key.rs
rename to eth2/types/src/test_utils/public_key.rs
diff --git a/beacon_chain/types/src/test_utils/secret_key.rs b/eth2/types/src/test_utils/secret_key.rs
similarity index 100%
rename from beacon_chain/types/src/test_utils/secret_key.rs
rename to eth2/types/src/test_utils/secret_key.rs
diff --git a/beacon_chain/types/src/test_utils/signature.rs b/eth2/types/src/test_utils/signature.rs
similarity index 100%
rename from beacon_chain/types/src/test_utils/signature.rs
rename to eth2/types/src/test_utils/signature.rs
diff --git a/beacon_chain/types/src/validator_record.rs b/eth2/types/src/validator_record.rs
similarity index 100%
rename from beacon_chain/types/src/validator_record.rs
rename to eth2/types/src/validator_record.rs
diff --git a/beacon_chain/types/src/validator_registration.rs b/eth2/types/src/validator_registration.rs
similarity index 100%
rename from beacon_chain/types/src/validator_registration.rs
rename to eth2/types/src/validator_registration.rs
diff --git a/beacon_chain/types/src/validator_registry.rs b/eth2/types/src/validator_registry.rs
similarity index 100%
rename from beacon_chain/types/src/validator_registry.rs
rename to eth2/types/src/validator_registry.rs
diff --git a/beacon_chain/utils/bls/Cargo.toml b/eth2/utils/bls/Cargo.toml
similarity index 100%
rename from beacon_chain/utils/bls/Cargo.toml
rename to eth2/utils/bls/Cargo.toml
diff --git a/beacon_chain/utils/bls/src/aggregate_signature.rs b/eth2/utils/bls/src/aggregate_signature.rs
similarity index 100%
rename from beacon_chain/utils/bls/src/aggregate_signature.rs
rename to eth2/utils/bls/src/aggregate_signature.rs
diff --git a/beacon_chain/utils/bls/src/keypair.rs b/eth2/utils/bls/src/keypair.rs
similarity index 100%
rename from beacon_chain/utils/bls/src/keypair.rs
rename to eth2/utils/bls/src/keypair.rs
diff --git a/beacon_chain/utils/bls/src/lib.rs b/eth2/utils/bls/src/lib.rs
similarity index 100%
rename from beacon_chain/utils/bls/src/lib.rs
rename to eth2/utils/bls/src/lib.rs
diff --git a/beacon_chain/utils/bls/src/public_key.rs b/eth2/utils/bls/src/public_key.rs
similarity index 100%
rename from beacon_chain/utils/bls/src/public_key.rs
rename to eth2/utils/bls/src/public_key.rs
diff --git a/beacon_chain/utils/bls/src/secret_key.rs b/eth2/utils/bls/src/secret_key.rs
similarity index 100%
rename from beacon_chain/utils/bls/src/secret_key.rs
rename to eth2/utils/bls/src/secret_key.rs
diff --git a/beacon_chain/utils/bls/src/signature.rs b/eth2/utils/bls/src/signature.rs
similarity index 100%
rename from beacon_chain/utils/bls/src/signature.rs
rename to eth2/utils/bls/src/signature.rs
diff --git a/beacon_chain/utils/boolean-bitfield/Cargo.toml b/eth2/utils/boolean-bitfield/Cargo.toml
similarity index 100%
rename from beacon_chain/utils/boolean-bitfield/Cargo.toml
rename to eth2/utils/boolean-bitfield/Cargo.toml
diff --git a/beacon_chain/utils/boolean-bitfield/README.md b/eth2/utils/boolean-bitfield/README.md
similarity index 100%
rename from beacon_chain/utils/boolean-bitfield/README.md
rename to eth2/utils/boolean-bitfield/README.md
diff --git a/beacon_chain/utils/boolean-bitfield/src/lib.rs b/eth2/utils/boolean-bitfield/src/lib.rs
similarity index 100%
rename from beacon_chain/utils/boolean-bitfield/src/lib.rs
rename to eth2/utils/boolean-bitfield/src/lib.rs
diff --git a/beacon_chain/utils/hashing/Cargo.toml b/eth2/utils/hashing/Cargo.toml
similarity index 100%
rename from beacon_chain/utils/hashing/Cargo.toml
rename to eth2/utils/hashing/Cargo.toml
diff --git a/beacon_chain/utils/hashing/src/lib.rs b/eth2/utils/hashing/src/lib.rs
similarity index 100%
rename from beacon_chain/utils/hashing/src/lib.rs
rename to eth2/utils/hashing/src/lib.rs
diff --git a/beacon_chain/utils/honey-badger-split/Cargo.toml b/eth2/utils/honey-badger-split/Cargo.toml
similarity index 100%
rename from beacon_chain/utils/honey-badger-split/Cargo.toml
rename to eth2/utils/honey-badger-split/Cargo.toml
diff --git a/beacon_chain/utils/honey-badger-split/src/lib.rs b/eth2/utils/honey-badger-split/src/lib.rs
similarity index 100%
rename from beacon_chain/utils/honey-badger-split/src/lib.rs
rename to eth2/utils/honey-badger-split/src/lib.rs
diff --git a/beacon_chain/utils/slot_clock/Cargo.toml b/eth2/utils/slot_clock/Cargo.toml
similarity index 100%
rename from beacon_chain/utils/slot_clock/Cargo.toml
rename to eth2/utils/slot_clock/Cargo.toml
diff --git a/beacon_chain/utils/slot_clock/src/lib.rs b/eth2/utils/slot_clock/src/lib.rs
similarity index 100%
rename from beacon_chain/utils/slot_clock/src/lib.rs
rename to eth2/utils/slot_clock/src/lib.rs
diff --git a/beacon_chain/utils/slot_clock/src/system_time_slot_clock.rs b/eth2/utils/slot_clock/src/system_time_slot_clock.rs
similarity index 100%
rename from beacon_chain/utils/slot_clock/src/system_time_slot_clock.rs
rename to eth2/utils/slot_clock/src/system_time_slot_clock.rs
diff --git a/beacon_chain/utils/slot_clock/src/testing_slot_clock.rs b/eth2/utils/slot_clock/src/testing_slot_clock.rs
similarity index 100%
rename from beacon_chain/utils/slot_clock/src/testing_slot_clock.rs
rename to eth2/utils/slot_clock/src/testing_slot_clock.rs
diff --git a/beacon_chain/utils/ssz/Cargo.toml b/eth2/utils/ssz/Cargo.toml
similarity index 100%
rename from beacon_chain/utils/ssz/Cargo.toml
rename to eth2/utils/ssz/Cargo.toml
diff --git a/beacon_chain/utils/ssz/README.md b/eth2/utils/ssz/README.md
similarity index 100%
rename from beacon_chain/utils/ssz/README.md
rename to eth2/utils/ssz/README.md
diff --git a/beacon_chain/utils/ssz/src/decode.rs b/eth2/utils/ssz/src/decode.rs
similarity index 100%
rename from beacon_chain/utils/ssz/src/decode.rs
rename to eth2/utils/ssz/src/decode.rs
diff --git a/beacon_chain/utils/ssz/src/encode.rs b/eth2/utils/ssz/src/encode.rs
similarity index 100%
rename from beacon_chain/utils/ssz/src/encode.rs
rename to eth2/utils/ssz/src/encode.rs
diff --git a/beacon_chain/utils/ssz/src/impl_decode.rs b/eth2/utils/ssz/src/impl_decode.rs
similarity index 100%
rename from beacon_chain/utils/ssz/src/impl_decode.rs
rename to eth2/utils/ssz/src/impl_decode.rs
diff --git a/beacon_chain/utils/ssz/src/impl_encode.rs b/eth2/utils/ssz/src/impl_encode.rs
similarity index 100%
rename from beacon_chain/utils/ssz/src/impl_encode.rs
rename to eth2/utils/ssz/src/impl_encode.rs
diff --git a/beacon_chain/utils/ssz/src/lib.rs b/eth2/utils/ssz/src/lib.rs
similarity index 100%
rename from beacon_chain/utils/ssz/src/lib.rs
rename to eth2/utils/ssz/src/lib.rs
diff --git a/beacon_chain/utils/vec_shuffle/Cargo.toml b/eth2/utils/vec_shuffle/Cargo.toml
similarity index 100%
rename from beacon_chain/utils/vec_shuffle/Cargo.toml
rename to eth2/utils/vec_shuffle/Cargo.toml
diff --git a/beacon_chain/utils/vec_shuffle/src/lib.rs b/eth2/utils/vec_shuffle/src/lib.rs
similarity index 100%
rename from beacon_chain/utils/vec_shuffle/src/lib.rs
rename to eth2/utils/vec_shuffle/src/lib.rs
diff --git a/beacon_chain/utils/vec_shuffle/src/rng.rs b/eth2/utils/vec_shuffle/src/rng.rs
similarity index 100%
rename from beacon_chain/utils/vec_shuffle/src/rng.rs
rename to eth2/utils/vec_shuffle/src/rng.rs
diff --git a/beacon_chain/utils/vec_shuffle/src/specs/shuffle_test_vectors.yaml b/eth2/utils/vec_shuffle/src/specs/shuffle_test_vectors.yaml
similarity index 100%
rename from beacon_chain/utils/vec_shuffle/src/specs/shuffle_test_vectors.yaml
rename to eth2/utils/vec_shuffle/src/specs/shuffle_test_vectors.yaml
diff --git a/beacon_chain/validator_change/Cargo.toml b/eth2/validator_change/Cargo.toml
similarity index 100%
rename from beacon_chain/validator_change/Cargo.toml
rename to eth2/validator_change/Cargo.toml
diff --git a/beacon_chain/validator_change/src/lib.rs b/eth2/validator_change/src/lib.rs
similarity index 100%
rename from beacon_chain/validator_change/src/lib.rs
rename to eth2/validator_change/src/lib.rs
diff --git a/beacon_chain/validator_induction/Cargo.toml b/eth2/validator_induction/Cargo.toml
similarity index 100%
rename from beacon_chain/validator_induction/Cargo.toml
rename to eth2/validator_induction/Cargo.toml
diff --git a/beacon_chain/validator_induction/src/inductor.rs b/eth2/validator_induction/src/inductor.rs
similarity index 100%
rename from beacon_chain/validator_induction/src/inductor.rs
rename to eth2/validator_induction/src/inductor.rs
diff --git a/beacon_chain/validator_induction/src/lib.rs b/eth2/validator_induction/src/lib.rs
similarity index 100%
rename from beacon_chain/validator_induction/src/lib.rs
rename to eth2/validator_induction/src/lib.rs
diff --git a/beacon_chain/validator_shuffling/Cargo.toml b/eth2/validator_shuffling/Cargo.toml
similarity index 100%
rename from beacon_chain/validator_shuffling/Cargo.toml
rename to eth2/validator_shuffling/Cargo.toml
diff --git a/beacon_chain/validator_shuffling/src/lib.rs b/eth2/validator_shuffling/src/lib.rs
similarity index 100%
rename from beacon_chain/validator_shuffling/src/lib.rs
rename to eth2/validator_shuffling/src/lib.rs
diff --git a/beacon_chain/validator_shuffling/src/shuffle.rs b/eth2/validator_shuffling/src/shuffle.rs
similarity index 100%
rename from beacon_chain/validator_shuffling/src/shuffle.rs
rename to eth2/validator_shuffling/src/shuffle.rs
diff --git a/validator_client/Cargo.toml b/validator_client/Cargo.toml
index 05a9a640f..c23e6607a 100644
--- a/validator_client/Cargo.toml
+++ b/validator_client/Cargo.toml
@@ -5,16 +5,16 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 
 [dependencies]
-bls = { path = "../beacon_chain/utils/bls" }
+bls = { path = "../eth2/utils/bls" }
 clap = "2.32.0"
 dirs = "1.0.3"
 grpcio = { version = "0.4", default-features = false, features = ["protobuf-codec"] }
 protobuf = "2.0.2"
 protos = { path = "../protos" }
-slot_clock = { path = "../beacon_chain/utils/slot_clock" }
-spec = { path = "../beacon_chain/spec" }
-types = { path = "../beacon_chain/types" }
+slot_clock = { path = "../eth2/utils/slot_clock" }
+spec = { path = "../eth2/spec" }
+types = { path = "../eth2/types" }
 slog = "^2.2.3"
 slog-term = "^2.4.0"
 slog-async = "^2.3.0"
-ssz = { path = "../beacon_chain/utils/ssz" }
+ssz = { path = "../eth2/utils/ssz" }