diff --git a/.cargo/config.toml b/.cargo/config.toml
new file mode 100644
index 00000000..ef68f6a5
--- /dev/null
+++ b/.cargo/config.toml
@@ -0,0 +1,2 @@
+[alias]
+docs = "doc --workspace --no-deps --open"
\ No newline at end of file
diff --git a/Cargo.toml b/Cargo.toml
index 9b0da1b3..2e9493ef 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,25 @@
+[workspace.package]
+version = "0.1.0"
+edition = "2021"
+license = "Apache-2.0 OR MIT"
+
 [workspace]
 members = [
-    "did-endpoint", "generic-server", "mediator-coordination", "mediator-server", "oob-messages", "server-plugin",
+    "did-utils",
+    "did-endpoint",
+    "generic-server",
+    "mediator-coordination",
+    "mediator-server",
+    "oob-messages",
+    "server-plugin"
 ]
+resolver = "2"
+
+[workspace.dependencies]
+did-utils = { path = "./did-utils" }
+did-endpoint = { path = "./did-endpoint" }
+generic-server = { path = "./generic-server" }
+mediator-coordination = { path = "./mediator-coordination" }
+mediator-server = { path = "./mediator-server" }
+oob-messages = { path = "./oob-messages" }
+server-plugin = { path = "./server-plugin" }
diff --git a/mediator-server/Cargo.toml b/mediator-server/Cargo.toml
index b8b862a1..92972915 100644
--- a/mediator-server/Cargo.toml
+++ b/mediator-server/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "didcomm-mediator-rs2"
+name = "mediator-server"
 version = "0.1.0"
 edition = "2021"
 authors = ["Francis Pouatcha"]