diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock
index 6c2215d66..2ca62774c 100644
--- a/src/agent/Cargo.lock
+++ b/src/agent/Cargo.lock
@@ -1104,8 +1104,6 @@ version = "0.1.0"
 dependencies = [
  "async-trait",
  "protobuf",
- "serde",
- "serde_json",
  "ttrpc",
  "ttrpc-codegen",
 ]
diff --git a/src/agent/Cargo.toml b/src/agent/Cargo.toml
index 492666023..9a79263ac 100644
--- a/src/agent/Cargo.toml
+++ b/src/agent/Cargo.toml
@@ -5,9 +5,9 @@ authors = ["The Kata Containers community <kata-dev@lists.katacontainers.io>"]
 edition = "2018"
 
 [dependencies]
-oci = { path = "oci" }
+oci = { path = "../libs/oci" }
 rustjail = { path = "rustjail" }
-protocols = { path = "protocols" }
+protocols = { path = "../libs/protocols" }
 lazy_static = "1.3.0"
 ttrpc = { version = "0.5.0", features = ["async", "protobuf-codec"], default-features = false }
 protobuf = "=2.14.0"
@@ -66,8 +66,6 @@ tempfile = "3.1.0"
 
 [workspace]
 members = [
-    "oci",
-    "protocols",
     "rustjail",
 ]
 
diff --git a/src/agent/rustjail/Cargo.toml b/src/agent/rustjail/Cargo.toml
index 715152572..9e0624649 100644
--- a/src/agent/rustjail/Cargo.toml
+++ b/src/agent/rustjail/Cargo.toml
@@ -8,8 +8,8 @@ edition = "2018"
 serde = "1.0.91"
 serde_json = "1.0.39"
 serde_derive = "1.0.91"
-oci = { path = "../oci" }
-protocols = { path ="../protocols" }
+oci = { path = "../../libs/oci" }
+protocols = { path ="../../libs/protocols" }
 caps = "0.5.0"
 nix = "0.23.0"
 scopeguard = "1.0.0"
diff --git a/src/agent/oci/Cargo.toml b/src/libs/oci/Cargo.toml
similarity index 100%
rename from src/agent/oci/Cargo.toml
rename to src/libs/oci/Cargo.toml
diff --git a/src/agent/oci/src/lib.rs b/src/libs/oci/src/lib.rs
similarity index 100%
rename from src/agent/oci/src/lib.rs
rename to src/libs/oci/src/lib.rs
diff --git a/src/agent/oci/src/serialize.rs b/src/libs/oci/src/serialize.rs
similarity index 100%
rename from src/agent/oci/src/serialize.rs
rename to src/libs/oci/src/serialize.rs
diff --git a/src/agent/protocols/Cargo.toml b/src/libs/protocols/Cargo.toml
similarity index 100%
rename from src/agent/protocols/Cargo.toml
rename to src/libs/protocols/Cargo.toml
diff --git a/src/agent/protocols/build.rs b/src/libs/protocols/build.rs
similarity index 100%
rename from src/agent/protocols/build.rs
rename to src/libs/protocols/build.rs
diff --git a/src/agent/protocols/hack/update-generated-proto.sh b/src/libs/protocols/hack/update-generated-proto.sh
similarity index 100%
rename from src/agent/protocols/hack/update-generated-proto.sh
rename to src/libs/protocols/hack/update-generated-proto.sh
diff --git a/src/agent/protocols/protos/agent.proto b/src/libs/protocols/protos/agent.proto
similarity index 100%
rename from src/agent/protocols/protos/agent.proto
rename to src/libs/protocols/protos/agent.proto
diff --git a/src/agent/protocols/protos/gogo/protobuf/gogoproto/gogo.proto b/src/libs/protocols/protos/gogo/protobuf/gogoproto/gogo.proto
similarity index 100%
rename from src/agent/protocols/protos/gogo/protobuf/gogoproto/gogo.proto
rename to src/libs/protocols/protos/gogo/protobuf/gogoproto/gogo.proto
diff --git a/src/agent/protocols/protos/google/protobuf/descriptor.proto b/src/libs/protocols/protos/google/protobuf/descriptor.proto
similarity index 100%
rename from src/agent/protocols/protos/google/protobuf/descriptor.proto
rename to src/libs/protocols/protos/google/protobuf/descriptor.proto
diff --git a/src/agent/protocols/protos/google/protobuf/empty.proto b/src/libs/protocols/protos/google/protobuf/empty.proto
similarity index 100%
rename from src/agent/protocols/protos/google/protobuf/empty.proto
rename to src/libs/protocols/protos/google/protobuf/empty.proto
diff --git a/src/agent/protocols/protos/google/protobuf/wrappers.proto b/src/libs/protocols/protos/google/protobuf/wrappers.proto
similarity index 100%
rename from src/agent/protocols/protos/google/protobuf/wrappers.proto
rename to src/libs/protocols/protos/google/protobuf/wrappers.proto
diff --git a/src/agent/protocols/protos/health.proto b/src/libs/protocols/protos/health.proto
similarity index 100%
rename from src/agent/protocols/protos/health.proto
rename to src/libs/protocols/protos/health.proto
diff --git a/src/agent/protocols/protos/oci.proto b/src/libs/protocols/protos/oci.proto
similarity index 100%
rename from src/agent/protocols/protos/oci.proto
rename to src/libs/protocols/protos/oci.proto
diff --git a/src/agent/protocols/protos/types.proto b/src/libs/protocols/protos/types.proto
similarity index 100%
rename from src/agent/protocols/protos/types.proto
rename to src/libs/protocols/protos/types.proto
diff --git a/src/agent/protocols/src/lib.rs b/src/libs/protocols/src/lib.rs
similarity index 100%
rename from src/agent/protocols/src/lib.rs
rename to src/libs/protocols/src/lib.rs
diff --git a/src/tools/agent-ctl/Cargo.toml b/src/tools/agent-ctl/Cargo.toml
index 8fc30dbb8..8847f734f 100644
--- a/src/tools/agent-ctl/Cargo.toml
+++ b/src/tools/agent-ctl/Cargo.toml
@@ -10,9 +10,9 @@ authors = ["The Kata Containers community <kata-dev@lists.katacontainers.io>"]
 edition = "2018"
 
 [dependencies]
-protocols = { path = "../../agent/protocols", features = ["with-serde"] }
+protocols = { path = "../../libs/protocols", features = ["with-serde"] }
 rustjail = { path = "../../agent/rustjail" }
-oci = { path = "../../agent/oci" }
+oci = { path = "../../libs/oci" }
 
 clap = "2.33.0"
 lazy_static = "1.4.0"