diff --git a/repos/base-hw/include/spec/riscv/cpu/atomic.h b/repos/base/include/spec/riscv/cpu/atomic.h
similarity index 100%
rename from repos/base-hw/include/spec/riscv/cpu/atomic.h
rename to repos/base/include/spec/riscv/cpu/atomic.h
diff --git a/repos/base-hw/include/spec/riscv/cpu/consts.h b/repos/base/include/spec/riscv/cpu/consts.h
similarity index 100%
rename from repos/base-hw/include/spec/riscv/cpu/consts.h
rename to repos/base/include/spec/riscv/cpu/consts.h
diff --git a/repos/base-hw/include/spec/riscv/cpu/cpu_state.h b/repos/base/include/spec/riscv/cpu/cpu_state.h
similarity index 100%
rename from repos/base-hw/include/spec/riscv/cpu/cpu_state.h
rename to repos/base/include/spec/riscv/cpu/cpu_state.h
diff --git a/repos/base-hw/include/spec/riscv/cpu/memory_barrier.h b/repos/base/include/spec/riscv/cpu/memory_barrier.h
similarity index 100%
rename from repos/base-hw/include/spec/riscv/cpu/memory_barrier.h
rename to repos/base/include/spec/riscv/cpu/memory_barrier.h
diff --git a/repos/base-hw/include/spec/riscv/cpu/string.h b/repos/base/include/spec/riscv/cpu/string.h
similarity index 100%
rename from repos/base-hw/include/spec/riscv/cpu/string.h
rename to repos/base/include/spec/riscv/cpu/string.h