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/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" }