diff --git a/Makefile b/Makefile
index 2b6f6a748..0ca42a509 100644
--- a/Makefile
+++ b/Makefile
@@ -21,10 +21,10 @@ STANDARD_TARGETS = build check clean install test vendor
 
 default: all
 
-all: logging-crate-tests build
+all: libs-crate-tests build
 
-logging-crate-tests:
-	make -C src/libs/logging
+libs-crate-tests:
+	make -C src/libs
 
 include utils.mk
 include ./tools/packaging/kata-deploy/local-build/Makefile
@@ -49,7 +49,7 @@ docs-url-alive-check:
 	binary-tarball \
 	default \
 	install-binary-tarball \
-	logging-crate-tests \
+	libs-crate-tests \
 	static-checks \
 	docs-url-alive-check
 
diff --git a/README.md b/README.md
index 90a5c9209..b8fa30996 100644
--- a/README.md
+++ b/README.md
@@ -117,6 +117,8 @@ The table below lists the core parts of the project:
 |-|-|-|
 | [runtime](src/runtime) | core | Main component run by a container manager and providing a containerd shimv2 runtime implementation. |
 | [agent](src/agent) | core | Management process running inside the virtual machine / POD that sets up the container environment. |
+| [libraries](src/libs) | core | Library crates shared by multiple Kata Container components or published to [`crates.io`](https://crates.io/index.ht
+ml) |
 | [documentation](docs) | documentation | Documentation common to all components (such as design and install documentation). |
 | [libraries](src/libs) | core | Library crates shared by multiple Kata Container components or published to [`crates.io`](https://crates.io/index.html) |
 | [tests](https://github.com/kata-containers/tests) | tests | Excludes unit tests which live with the main code. |
diff --git a/src/agent/Makefile b/src/agent/Makefile
index 9d1327c00..6c09b5dfa 100644
--- a/src/agent/Makefile
+++ b/src/agent/Makefile
@@ -107,10 +107,10 @@ endef
 ##TARGET default: build code
 default: $(TARGET) show-header
 
-$(TARGET): $(GENERATED_CODE) logging-crate-tests $(TARGET_PATH)
+$(TARGET): $(GENERATED_CODE) libs-crate-tests $(TARGET_PATH)
 
-logging-crate-tests:
-	make -C $(CWD)/../libs/logging
+libs-crate-tests:
+	make -C $(CWD)/../libs
 
 $(TARGET_PATH): show-summary
 	@RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES)
@@ -203,7 +203,7 @@ codecov-html: check_tarpaulin
 
 .PHONY: \
 	help \
-	logging-crate-tests \
+	libs-crate-tests \
 	optimize \
 	show-header \
 	show-summary \
diff --git a/src/libs/logging/Makefile b/src/libs/Makefile
similarity index 100%
rename from src/libs/logging/Makefile
rename to src/libs/Makefile
diff --git a/src/tools/agent-ctl/Makefile b/src/tools/agent-ctl/Makefile
index df3eacf24..b020563db 100644
--- a/src/tools/agent-ctl/Makefile
+++ b/src/tools/agent-ctl/Makefile
@@ -8,11 +8,11 @@ include ../../../utils.mk
 .DEFAULT_GOAL := default
 default: build
 
-build: logging-crate-tests
+build: libs-crate-tests
 	@RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE)
 
-logging-crate-tests:
-	make -C $(CWD)/../../libs/logging
+libs-crate-tests:
+	make -C $(CWD)/../../libs
 
 clean:
 	cargo clean
@@ -32,6 +32,6 @@ check: standard_rust_check
 	check \
 	clean \
 	install \
-	logging-crate-tests \
+	libs-crate-tests \
 	test \
 	vendor
diff --git a/src/tools/trace-forwarder/Makefile b/src/tools/trace-forwarder/Makefile
index 5b1c53849..f597f891f 100644
--- a/src/tools/trace-forwarder/Makefile
+++ b/src/tools/trace-forwarder/Makefile
@@ -8,11 +8,11 @@ include ../../../utils.mk
 .DEFAULT_GOAL := default
 default: build
 
-build: logging-crate-tests
+build: libs-crate-tests
 	@RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE)
 
-logging-crate-tests:
-	make -C $(CWD)/../../libs/logging
+libs-crate-tests:
+	make -C $(CWD)/../../libs
 
 clean:
 	cargo clean
@@ -32,6 +32,6 @@ check: standard_rust_check
 	check \
 	clean \
 	install \
-	logging-crate-tests \
+	libs-crate-tests \
 	test \
 	vendor