diff --git a/common/cpu-cycle/Cargo.toml b/common/cpu-cycles/Cargo.toml
similarity index 90%
rename from common/cpu-cycle/Cargo.toml
rename to common/cpu-cycles/Cargo.toml
index 66ac8ed632..7f24f60730 100644
--- a/common/cpu-cycle/Cargo.toml
+++ b/common/cpu-cycles/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "cpu-cycle"
+name = "cpu-cycles"
 version = "0.1.0"
 edition = "2021"
 build = "build.rs"
diff --git a/common/cpu-cycle/build.rs b/common/cpu-cycles/build.rs
similarity index 100%
rename from common/cpu-cycle/build.rs
rename to common/cpu-cycles/build.rs
diff --git a/common/cpu-cycle/cpucycles/amd64-pmc.c b/common/cpu-cycles/cpucycles/amd64-pmc.c
similarity index 100%
rename from common/cpu-cycle/cpucycles/amd64-pmc.c
rename to common/cpu-cycles/cpucycles/amd64-pmc.c
diff --git a/common/cpu-cycle/cpucycles/amd64-tsc.c b/common/cpu-cycles/cpucycles/amd64-tsc.c
similarity index 100%
rename from common/cpu-cycle/cpucycles/amd64-tsc.c
rename to common/cpu-cycles/cpucycles/amd64-tsc.c
diff --git a/common/cpu-cycle/cpucycles/amd64-tscasm.c b/common/cpu-cycles/cpucycles/amd64-tscasm.c
similarity index 100%
rename from common/cpu-cycle/cpucycles/amd64-tscasm.c
rename to common/cpu-cycles/cpucycles/amd64-tscasm.c
diff --git a/common/cpu-cycle/cpucycles/arm32-cortex.c b/common/cpu-cycles/cpucycles/arm32-cortex.c
similarity index 100%
rename from common/cpu-cycle/cpucycles/arm32-cortex.c
rename to common/cpu-cycles/cpucycles/arm32-cortex.c
diff --git a/common/cpu-cycle/cpucycles/arm64-pmc.c b/common/cpu-cycles/cpucycles/arm64-pmc.c
similarity index 100%
rename from common/cpu-cycle/cpucycles/arm64-pmc.c
rename to common/cpu-cycles/cpucycles/arm64-pmc.c
diff --git a/common/cpu-cycle/cpucycles/arm64-vct.c b/common/cpu-cycles/cpucycles/arm64-vct.c
similarity index 100%
rename from common/cpu-cycle/cpucycles/arm64-vct.c
rename to common/cpu-cycles/cpucycles/arm64-vct.c
diff --git a/common/cpu-cycle/cpucycles/cpucycles.h b/common/cpu-cycles/cpucycles/cpucycles.h
similarity index 100%
rename from common/cpu-cycle/cpucycles/cpucycles.h
rename to common/cpu-cycles/cpucycles/cpucycles.h
diff --git a/common/cpu-cycle/cpucycles/cpucycles.o b/common/cpu-cycles/cpucycles/cpucycles.o
similarity index 100%
rename from common/cpu-cycle/cpucycles/cpucycles.o
rename to common/cpu-cycles/cpucycles/cpucycles.o
diff --git a/common/cpu-cycle/cpucycles/cpucycles_internal.h b/common/cpu-cycles/cpucycles/cpucycles_internal.h
similarity index 100%
rename from common/cpu-cycle/cpucycles/cpucycles_internal.h
rename to common/cpu-cycles/cpucycles/cpucycles_internal.h
diff --git a/common/cpu-cycle/cpucycles/default-gettimeofday.c b/common/cpu-cycles/cpucycles/default-gettimeofday.c
similarity index 100%
rename from common/cpu-cycle/cpucycles/default-gettimeofday.c
rename to common/cpu-cycles/cpucycles/default-gettimeofday.c
diff --git a/common/cpu-cycle/cpucycles/default-mach.c b/common/cpu-cycles/cpucycles/default-mach.c
similarity index 100%
rename from common/cpu-cycle/cpucycles/default-mach.c
rename to common/cpu-cycles/cpucycles/default-mach.c
diff --git a/common/cpu-cycle/cpucycles/default-monotonic.c b/common/cpu-cycles/cpucycles/default-monotonic.c
similarity index 100%
rename from common/cpu-cycle/cpucycles/default-monotonic.c
rename to common/cpu-cycles/cpucycles/default-monotonic.c
diff --git a/common/cpu-cycle/cpucycles/default-perfevent.c b/common/cpu-cycles/cpucycles/default-perfevent.c
similarity index 100%
rename from common/cpu-cycle/cpucycles/default-perfevent.c
rename to common/cpu-cycles/cpucycles/default-perfevent.c
diff --git a/common/cpu-cycle/cpucycles/default-zero.c b/common/cpu-cycles/cpucycles/default-zero.c
similarity index 100%
rename from common/cpu-cycle/cpucycles/default-zero.c
rename to common/cpu-cycles/cpucycles/default-zero.c
diff --git a/common/cpu-cycle/cpucycles/libcpucycles.a b/common/cpu-cycles/cpucycles/libcpucycles.a
similarity index 100%
rename from common/cpu-cycle/cpucycles/libcpucycles.a
rename to common/cpu-cycles/cpucycles/libcpucycles.a
diff --git a/common/cpu-cycle/cpucycles/mips64-cc.c b/common/cpu-cycles/cpucycles/mips64-cc.c
similarity index 100%
rename from common/cpu-cycle/cpucycles/mips64-cc.c
rename to common/cpu-cycles/cpucycles/mips64-cc.c
diff --git a/common/cpu-cycle/cpucycles/options b/common/cpu-cycles/cpucycles/options
similarity index 100%
rename from common/cpu-cycle/cpucycles/options
rename to common/cpu-cycles/cpucycles/options
diff --git a/common/cpu-cycle/cpucycles/ppc32-mftb.c b/common/cpu-cycles/cpucycles/ppc32-mftb.c
similarity index 100%
rename from common/cpu-cycle/cpucycles/ppc32-mftb.c
rename to common/cpu-cycles/cpucycles/ppc32-mftb.c
diff --git a/common/cpu-cycle/cpucycles/ppc64-mftb.c b/common/cpu-cycles/cpucycles/ppc64-mftb.c
similarity index 100%
rename from common/cpu-cycle/cpucycles/ppc64-mftb.c
rename to common/cpu-cycles/cpucycles/ppc64-mftb.c
diff --git a/common/cpu-cycle/cpucycles/riscv32-rdcycle.c b/common/cpu-cycles/cpucycles/riscv32-rdcycle.c
similarity index 100%
rename from common/cpu-cycle/cpucycles/riscv32-rdcycle.c
rename to common/cpu-cycles/cpucycles/riscv32-rdcycle.c
diff --git a/common/cpu-cycle/cpucycles/riscv64-rdcycle.c b/common/cpu-cycles/cpucycles/riscv64-rdcycle.c
similarity index 100%
rename from common/cpu-cycle/cpucycles/riscv64-rdcycle.c
rename to common/cpu-cycles/cpucycles/riscv64-rdcycle.c
diff --git a/common/cpu-cycle/cpucycles/s390x-stckf.c b/common/cpu-cycles/cpucycles/s390x-stckf.c
similarity index 100%
rename from common/cpu-cycle/cpucycles/s390x-stckf.c
rename to common/cpu-cycles/cpucycles/s390x-stckf.c
diff --git a/common/cpu-cycle/cpucycles/sparc64-rdtick.c b/common/cpu-cycles/cpucycles/sparc64-rdtick.c
similarity index 100%
rename from common/cpu-cycle/cpucycles/sparc64-rdtick.c
rename to common/cpu-cycles/cpucycles/sparc64-rdtick.c
diff --git a/common/cpu-cycle/cpucycles/wrapper.c b/common/cpu-cycles/cpucycles/wrapper.c
similarity index 100%
rename from common/cpu-cycle/cpucycles/wrapper.c
rename to common/cpu-cycles/cpucycles/wrapper.c
diff --git a/common/cpu-cycle/cpucycles/x86-tsc.c b/common/cpu-cycles/cpucycles/x86-tsc.c
similarity index 100%
rename from common/cpu-cycle/cpucycles/x86-tsc.c
rename to common/cpu-cycles/cpucycles/x86-tsc.c
diff --git a/common/cpu-cycle/cpucycles/x86-tscasm.c b/common/cpu-cycles/cpucycles/x86-tscasm.c
similarity index 100%
rename from common/cpu-cycle/cpucycles/x86-tscasm.c
rename to common/cpu-cycles/cpucycles/x86-tscasm.c
diff --git a/common/cpu-cycle/src/bindings.rs b/common/cpu-cycles/src/bindings.rs
similarity index 100%
rename from common/cpu-cycle/src/bindings.rs
rename to common/cpu-cycles/src/bindings.rs
diff --git a/common/cpu-cycle/src/lib.rs b/common/cpu-cycles/src/lib.rs
similarity index 100%
rename from common/cpu-cycle/src/lib.rs
rename to common/cpu-cycles/src/lib.rs