diff --git a/Cargo.toml b/Cargo.toml
index d87c0570..2f0ffb06 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,14 +10,7 @@ keywords = ["pki", "did", "vc", "vp"]
 edition = "2021"
 
 [workspace]
-members = [
-    "trustchain-api",
-    "trustchain-cli",
-    "trustchain-core",
-    "trustchain-ffi",
-    "trustchain-http",
-    "trustchain-ion",
-]
+members = ["crates/*"]
 resolver = "2"
 
 [workspace.dependencies]
@@ -73,8 +66,8 @@ tracing = "0.1"
 tracing-subscriber = "0.3"
 
 [dependencies]
-trustchain-api = { path = "./trustchain-api", version = "0.1.0" }
-trustchain-core = { path = "./trustchain-core", version = "0.2.0" }
-trustchain-ffi = { path = "./trustchain-ffi", version = "0.1.0" }
-trustchain-http = { path = "./trustchain-http", version = "0.1.0" }
-trustchain-ion = { path = "./trustchain-ion", version = "0.2.0" }
+trustchain-api = { path = "crates/trustchain-api", version = "0.1.0" }
+trustchain-core = { path = "crates/trustchain-core", version = "0.2.0" }
+trustchain-ffi = { path = "crates/trustchain-ffi", version = "0.1.0" }
+trustchain-http = { path = "crates/trustchain-http", version = "0.1.0" }
+trustchain-ion = { path = "crates/trustchain-ion", version = "0.2.0" }
diff --git a/trustchain-api/Cargo.toml b/crates/trustchain-api/Cargo.toml
similarity index 100%
rename from trustchain-api/Cargo.toml
rename to crates/trustchain-api/Cargo.toml
diff --git a/trustchain-api/src/api.rs b/crates/trustchain-api/src/api.rs
similarity index 100%
rename from trustchain-api/src/api.rs
rename to crates/trustchain-api/src/api.rs
diff --git a/trustchain-api/src/lib.rs b/crates/trustchain-api/src/lib.rs
similarity index 100%
rename from trustchain-api/src/lib.rs
rename to crates/trustchain-api/src/lib.rs
diff --git a/trustchain-cli/Cargo.toml b/crates/trustchain-cli/Cargo.toml
similarity index 100%
rename from trustchain-cli/Cargo.toml
rename to crates/trustchain-cli/Cargo.toml
diff --git a/trustchain-cli/src/bin/main.rs b/crates/trustchain-cli/src/bin/main.rs
similarity index 100%
rename from trustchain-cli/src/bin/main.rs
rename to crates/trustchain-cli/src/bin/main.rs
diff --git a/trustchain-cli/src/config.rs b/crates/trustchain-cli/src/config.rs
similarity index 100%
rename from trustchain-cli/src/config.rs
rename to crates/trustchain-cli/src/config.rs
diff --git a/trustchain-cli/src/lib.rs b/crates/trustchain-cli/src/lib.rs
similarity index 100%
rename from trustchain-cli/src/lib.rs
rename to crates/trustchain-cli/src/lib.rs
diff --git a/trustchain-core/Cargo.toml b/crates/trustchain-core/Cargo.toml
similarity index 100%
rename from trustchain-core/Cargo.toml
rename to crates/trustchain-core/Cargo.toml
diff --git a/trustchain-core/src/attestor.rs b/crates/trustchain-core/src/attestor.rs
similarity index 100%
rename from trustchain-core/src/attestor.rs
rename to crates/trustchain-core/src/attestor.rs
diff --git a/trustchain-core/src/chain.rs b/crates/trustchain-core/src/chain.rs
similarity index 100%
rename from trustchain-core/src/chain.rs
rename to crates/trustchain-core/src/chain.rs
diff --git a/trustchain-core/src/commitment.rs b/crates/trustchain-core/src/commitment.rs
similarity index 100%
rename from trustchain-core/src/commitment.rs
rename to crates/trustchain-core/src/commitment.rs
diff --git a/trustchain-core/src/controller.rs b/crates/trustchain-core/src/controller.rs
similarity index 100%
rename from trustchain-core/src/controller.rs
rename to crates/trustchain-core/src/controller.rs
diff --git a/trustchain-core/src/data.rs b/crates/trustchain-core/src/data.rs
similarity index 100%
rename from trustchain-core/src/data.rs
rename to crates/trustchain-core/src/data.rs
diff --git a/trustchain-core/src/display.rs b/crates/trustchain-core/src/display.rs
similarity index 100%
rename from trustchain-core/src/display.rs
rename to crates/trustchain-core/src/display.rs
diff --git a/trustchain-core/src/graph.rs b/crates/trustchain-core/src/graph.rs
similarity index 100%
rename from trustchain-core/src/graph.rs
rename to crates/trustchain-core/src/graph.rs
diff --git a/trustchain-core/src/holder.rs b/crates/trustchain-core/src/holder.rs
similarity index 100%
rename from trustchain-core/src/holder.rs
rename to crates/trustchain-core/src/holder.rs
diff --git a/trustchain-core/src/issuer.rs b/crates/trustchain-core/src/issuer.rs
similarity index 100%
rename from trustchain-core/src/issuer.rs
rename to crates/trustchain-core/src/issuer.rs
diff --git a/trustchain-core/src/key_manager.rs b/crates/trustchain-core/src/key_manager.rs
similarity index 100%
rename from trustchain-core/src/key_manager.rs
rename to crates/trustchain-core/src/key_manager.rs
diff --git a/trustchain-core/src/lib.rs b/crates/trustchain-core/src/lib.rs
similarity index 100%
rename from trustchain-core/src/lib.rs
rename to crates/trustchain-core/src/lib.rs
diff --git a/trustchain-core/src/resolver.rs b/crates/trustchain-core/src/resolver.rs
similarity index 100%
rename from trustchain-core/src/resolver.rs
rename to crates/trustchain-core/src/resolver.rs
diff --git a/trustchain-core/src/subject.rs b/crates/trustchain-core/src/subject.rs
similarity index 100%
rename from trustchain-core/src/subject.rs
rename to crates/trustchain-core/src/subject.rs
diff --git a/trustchain-core/src/utils.rs b/crates/trustchain-core/src/utils.rs
similarity index 100%
rename from trustchain-core/src/utils.rs
rename to crates/trustchain-core/src/utils.rs
diff --git a/trustchain-core/src/vc.rs b/crates/trustchain-core/src/vc.rs
similarity index 100%
rename from trustchain-core/src/vc.rs
rename to crates/trustchain-core/src/vc.rs
diff --git a/trustchain-core/src/verifier.rs b/crates/trustchain-core/src/verifier.rs
similarity index 100%
rename from trustchain-core/src/verifier.rs
rename to crates/trustchain-core/src/verifier.rs
diff --git a/trustchain-core/src/vp.rs b/crates/trustchain-core/src/vp.rs
similarity index 100%
rename from trustchain-core/src/vp.rs
rename to crates/trustchain-core/src/vp.rs
diff --git a/trustchain-ffi/Cargo.toml b/crates/trustchain-ffi/Cargo.toml
similarity index 100%
rename from trustchain-ffi/Cargo.toml
rename to crates/trustchain-ffi/Cargo.toml
diff --git a/trustchain-ffi/README.md b/crates/trustchain-ffi/README.md
similarity index 100%
rename from trustchain-ffi/README.md
rename to crates/trustchain-ffi/README.md
diff --git a/trustchain-ffi/src/config.rs b/crates/trustchain-ffi/src/config.rs
similarity index 100%
rename from trustchain-ffi/src/config.rs
rename to crates/trustchain-ffi/src/config.rs
diff --git a/trustchain-ffi/src/gui.rs b/crates/trustchain-ffi/src/gui.rs
similarity index 100%
rename from trustchain-ffi/src/gui.rs
rename to crates/trustchain-ffi/src/gui.rs
diff --git a/trustchain-ffi/src/lib.rs b/crates/trustchain-ffi/src/lib.rs
similarity index 100%
rename from trustchain-ffi/src/lib.rs
rename to crates/trustchain-ffi/src/lib.rs
diff --git a/trustchain-ffi/src/mobile.rs b/crates/trustchain-ffi/src/mobile.rs
similarity index 100%
rename from trustchain-ffi/src/mobile.rs
rename to crates/trustchain-ffi/src/mobile.rs
diff --git a/trustchain-ffi/src/mobile_bridge.io.rs b/crates/trustchain-ffi/src/mobile_bridge.io.rs
similarity index 100%
rename from trustchain-ffi/src/mobile_bridge.io.rs
rename to crates/trustchain-ffi/src/mobile_bridge.io.rs
diff --git a/trustchain-ffi/src/mobile_bridge.rs b/crates/trustchain-ffi/src/mobile_bridge.rs
similarity index 100%
rename from trustchain-ffi/src/mobile_bridge.rs
rename to crates/trustchain-ffi/src/mobile_bridge.rs
diff --git a/trustchain-http/Cargo.toml b/crates/trustchain-http/Cargo.toml
similarity index 100%
rename from trustchain-http/Cargo.toml
rename to crates/trustchain-http/Cargo.toml
diff --git a/trustchain-http/src/attestation_encryption_utils.rs b/crates/trustchain-http/src/attestation_encryption_utils.rs
similarity index 100%
rename from trustchain-http/src/attestation_encryption_utils.rs
rename to crates/trustchain-http/src/attestation_encryption_utils.rs
diff --git a/trustchain-http/src/attestation_utils.rs b/crates/trustchain-http/src/attestation_utils.rs
similarity index 100%
rename from trustchain-http/src/attestation_utils.rs
rename to crates/trustchain-http/src/attestation_utils.rs
diff --git a/trustchain-http/src/attestor.rs b/crates/trustchain-http/src/attestor.rs
similarity index 100%
rename from trustchain-http/src/attestor.rs
rename to crates/trustchain-http/src/attestor.rs
diff --git a/trustchain-http/src/bin/main.rs b/crates/trustchain-http/src/bin/main.rs
similarity index 100%
rename from trustchain-http/src/bin/main.rs
rename to crates/trustchain-http/src/bin/main.rs
diff --git a/trustchain-http/src/config.rs b/crates/trustchain-http/src/config.rs
similarity index 100%
rename from trustchain-http/src/config.rs
rename to crates/trustchain-http/src/config.rs
diff --git a/trustchain-http/src/data.rs b/crates/trustchain-http/src/data.rs
similarity index 100%
rename from trustchain-http/src/data.rs
rename to crates/trustchain-http/src/data.rs
diff --git a/trustchain-http/src/errors.rs b/crates/trustchain-http/src/errors.rs
similarity index 100%
rename from trustchain-http/src/errors.rs
rename to crates/trustchain-http/src/errors.rs
diff --git a/trustchain-http/src/ion.rs b/crates/trustchain-http/src/ion.rs
similarity index 100%
rename from trustchain-http/src/ion.rs
rename to crates/trustchain-http/src/ion.rs
diff --git a/trustchain-http/src/issuer.rs b/crates/trustchain-http/src/issuer.rs
similarity index 100%
rename from trustchain-http/src/issuer.rs
rename to crates/trustchain-http/src/issuer.rs
diff --git a/trustchain-http/src/lib.rs b/crates/trustchain-http/src/lib.rs
similarity index 100%
rename from trustchain-http/src/lib.rs
rename to crates/trustchain-http/src/lib.rs
diff --git a/trustchain-http/src/middleware.rs b/crates/trustchain-http/src/middleware.rs
similarity index 100%
rename from trustchain-http/src/middleware.rs
rename to crates/trustchain-http/src/middleware.rs
diff --git a/trustchain-http/src/qrcode.rs b/crates/trustchain-http/src/qrcode.rs
similarity index 100%
rename from trustchain-http/src/qrcode.rs
rename to crates/trustchain-http/src/qrcode.rs
diff --git a/trustchain-http/src/requester.rs b/crates/trustchain-http/src/requester.rs
similarity index 100%
rename from trustchain-http/src/requester.rs
rename to crates/trustchain-http/src/requester.rs
diff --git a/trustchain-http/src/resolver.rs b/crates/trustchain-http/src/resolver.rs
similarity index 100%
rename from trustchain-http/src/resolver.rs
rename to crates/trustchain-http/src/resolver.rs
diff --git a/trustchain-http/src/root.rs b/crates/trustchain-http/src/root.rs
similarity index 100%
rename from trustchain-http/src/root.rs
rename to crates/trustchain-http/src/root.rs
diff --git a/trustchain-http/src/server.rs b/crates/trustchain-http/src/server.rs
similarity index 100%
rename from trustchain-http/src/server.rs
rename to crates/trustchain-http/src/server.rs
diff --git a/trustchain-http/src/state.rs b/crates/trustchain-http/src/state.rs
similarity index 100%
rename from trustchain-http/src/state.rs
rename to crates/trustchain-http/src/state.rs
diff --git a/trustchain-http/src/static_handlers.rs b/crates/trustchain-http/src/static_handlers.rs
similarity index 100%
rename from trustchain-http/src/static_handlers.rs
rename to crates/trustchain-http/src/static_handlers.rs
diff --git a/trustchain-http/src/store.rs b/crates/trustchain-http/src/store.rs
similarity index 100%
rename from trustchain-http/src/store.rs
rename to crates/trustchain-http/src/store.rs
diff --git a/trustchain-http/src/temp_s_key.json b/crates/trustchain-http/src/temp_s_key.json
similarity index 99%
rename from trustchain-http/src/temp_s_key.json
rename to crates/trustchain-http/src/temp_s_key.json
index 79927b1a..6ea30505 100644
--- a/trustchain-http/src/temp_s_key.json
+++ b/crates/trustchain-http/src/temp_s_key.json
@@ -6,4 +6,4 @@
         "y": "z737jJY7kxW_lpE1eZur-9n9_HUEGFyBGsTdChzI4Kg",
         "d": "CfdUwQ-CcBQkWpIDPjhSJAq2SCg6hAGdcvLmCj0aA-c"
     }
-}
\ No newline at end of file
+}
diff --git a/trustchain-http/src/test.json b/crates/trustchain-http/src/test.json
similarity index 99%
rename from trustchain-http/src/test.json
rename to crates/trustchain-http/src/test.json
index 0aa0af02..fbdc1a12 100644
--- a/trustchain-http/src/test.json
+++ b/crates/trustchain-http/src/test.json
@@ -10,4 +10,4 @@
         "requester_org": "myTrustworthyEntity",
         "operator_name": "trustworthyOperator"
     }
-}
\ No newline at end of file
+}
diff --git a/trustchain-http/src/test_p_key.json b/crates/trustchain-http/src/test_p_key.json
similarity index 99%
rename from trustchain-http/src/test_p_key.json
rename to crates/trustchain-http/src/test_p_key.json
index 97bb895b..6f6c1c15 100644
--- a/trustchain-http/src/test_p_key.json
+++ b/crates/trustchain-http/src/test_p_key.json
@@ -9,4 +9,4 @@
         "requester_org": "myTrustworthyEntity",
         "operator_name": "trustworthyOperator"
     }
-}
\ No newline at end of file
+}
diff --git a/trustchain-http/src/utils.rs b/crates/trustchain-http/src/utils.rs
similarity index 100%
rename from trustchain-http/src/utils.rs
rename to crates/trustchain-http/src/utils.rs
diff --git a/trustchain-http/src/verifier.rs b/crates/trustchain-http/src/verifier.rs
similarity index 100%
rename from trustchain-http/src/verifier.rs
rename to crates/trustchain-http/src/verifier.rs
diff --git a/trustchain-http/static/index.html b/crates/trustchain-http/static/index.html
similarity index 100%
rename from trustchain-http/static/index.html
rename to crates/trustchain-http/static/index.html
diff --git a/trustchain-http/static/issuer.html b/crates/trustchain-http/static/issuer.html
similarity index 100%
rename from trustchain-http/static/issuer.html
rename to crates/trustchain-http/static/issuer.html
diff --git a/trustchain-http/tests/attestation.rs b/crates/trustchain-http/tests/attestation.rs
similarity index 100%
rename from trustchain-http/tests/attestation.rs
rename to crates/trustchain-http/tests/attestation.rs
diff --git a/trustchain-ion/Cargo.toml b/crates/trustchain-ion/Cargo.toml
similarity index 100%
rename from trustchain-ion/Cargo.toml
rename to crates/trustchain-ion/Cargo.toml
diff --git a/trustchain-ion/src/attest.rs b/crates/trustchain-ion/src/attest.rs
similarity index 100%
rename from trustchain-ion/src/attest.rs
rename to crates/trustchain-ion/src/attest.rs
diff --git a/trustchain-ion/src/attestor.rs b/crates/trustchain-ion/src/attestor.rs
similarity index 100%
rename from trustchain-ion/src/attestor.rs
rename to crates/trustchain-ion/src/attestor.rs
diff --git a/trustchain-ion/src/commitment.rs b/crates/trustchain-ion/src/commitment.rs
similarity index 100%
rename from trustchain-ion/src/commitment.rs
rename to crates/trustchain-ion/src/commitment.rs
diff --git a/trustchain-ion/src/config.rs b/crates/trustchain-ion/src/config.rs
similarity index 100%
rename from trustchain-ion/src/config.rs
rename to crates/trustchain-ion/src/config.rs
diff --git a/trustchain-ion/src/controller.rs b/crates/trustchain-ion/src/controller.rs
similarity index 100%
rename from trustchain-ion/src/controller.rs
rename to crates/trustchain-ion/src/controller.rs
diff --git a/trustchain-ion/src/create.rs b/crates/trustchain-ion/src/create.rs
similarity index 100%
rename from trustchain-ion/src/create.rs
rename to crates/trustchain-ion/src/create.rs
diff --git a/trustchain-ion/src/data.rs b/crates/trustchain-ion/src/data.rs
similarity index 100%
rename from trustchain-ion/src/data.rs
rename to crates/trustchain-ion/src/data.rs
diff --git a/trustchain-ion/src/ion.rs b/crates/trustchain-ion/src/ion.rs
similarity index 100%
rename from trustchain-ion/src/ion.rs
rename to crates/trustchain-ion/src/ion.rs
diff --git a/trustchain-ion/src/lib.rs b/crates/trustchain-ion/src/lib.rs
similarity index 100%
rename from trustchain-ion/src/lib.rs
rename to crates/trustchain-ion/src/lib.rs
diff --git a/trustchain-ion/src/mnemonic.rs b/crates/trustchain-ion/src/mnemonic.rs
similarity index 100%
rename from trustchain-ion/src/mnemonic.rs
rename to crates/trustchain-ion/src/mnemonic.rs
diff --git a/trustchain-ion/src/resolver.rs b/crates/trustchain-ion/src/resolver.rs
similarity index 100%
rename from trustchain-ion/src/resolver.rs
rename to crates/trustchain-ion/src/resolver.rs
diff --git a/trustchain-ion/src/root.rs b/crates/trustchain-ion/src/root.rs
similarity index 100%
rename from trustchain-ion/src/root.rs
rename to crates/trustchain-ion/src/root.rs
diff --git a/trustchain-ion/src/sidetree.rs b/crates/trustchain-ion/src/sidetree.rs
similarity index 100%
rename from trustchain-ion/src/sidetree.rs
rename to crates/trustchain-ion/src/sidetree.rs
diff --git a/trustchain-ion/src/utils.rs b/crates/trustchain-ion/src/utils.rs
similarity index 100%
rename from trustchain-ion/src/utils.rs
rename to crates/trustchain-ion/src/utils.rs
diff --git a/trustchain-ion/src/verifier.rs b/crates/trustchain-ion/src/verifier.rs
similarity index 100%
rename from trustchain-ion/src/verifier.rs
rename to crates/trustchain-ion/src/verifier.rs
diff --git a/trustchain-ion/tests/config.rs b/crates/trustchain-ion/tests/config.rs
similarity index 100%
rename from trustchain-ion/tests/config.rs
rename to crates/trustchain-ion/tests/config.rs
diff --git a/trustchain-ion/tests/display.rs b/crates/trustchain-ion/tests/display.rs
similarity index 100%
rename from trustchain-ion/tests/display.rs
rename to crates/trustchain-ion/tests/display.rs
diff --git a/trustchain-ion/tests/resolver.rs b/crates/trustchain-ion/tests/resolver.rs
similarity index 100%
rename from trustchain-ion/tests/resolver.rs
rename to crates/trustchain-ion/tests/resolver.rs
diff --git a/trustchain-ion/tests/verifier.rs b/crates/trustchain-ion/tests/verifier.rs
similarity index 100%
rename from trustchain-ion/tests/verifier.rs
rename to crates/trustchain-ion/tests/verifier.rs
diff --git a/trustchain-ion/tests/web.rs b/crates/trustchain-ion/tests/web.rs
similarity index 100%
rename from trustchain-ion/tests/web.rs
rename to crates/trustchain-ion/tests/web.rs