diff --git a/11_virtual_memory_part1_identity_mapping/.vscode/settings.json b/11_virtual_mem_part1_identity_mapping/.vscode/settings.json
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/.vscode/settings.json
rename to 11_virtual_mem_part1_identity_mapping/.vscode/settings.json
diff --git a/11_virtual_memory_part1_identity_mapping/Cargo.lock b/11_virtual_mem_part1_identity_mapping/Cargo.lock
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/Cargo.lock
rename to 11_virtual_mem_part1_identity_mapping/Cargo.lock
diff --git a/11_virtual_memory_part1_identity_mapping/Cargo.toml b/11_virtual_mem_part1_identity_mapping/Cargo.toml
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/Cargo.toml
rename to 11_virtual_mem_part1_identity_mapping/Cargo.toml
diff --git a/11_virtual_memory_part1_identity_mapping/Makefile b/11_virtual_mem_part1_identity_mapping/Makefile
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/Makefile
rename to 11_virtual_mem_part1_identity_mapping/Makefile
diff --git a/11_virtual_memory_part1_identity_mapping/README.md b/11_virtual_mem_part1_identity_mapping/README.md
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/README.md
rename to 11_virtual_mem_part1_identity_mapping/README.md
diff --git a/11_virtual_memory_part1_identity_mapping/build.rs b/11_virtual_mem_part1_identity_mapping/build.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/build.rs
rename to 11_virtual_mem_part1_identity_mapping/build.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/_arch/aarch64/cpu.rs b/11_virtual_mem_part1_identity_mapping/src/_arch/aarch64/cpu.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/_arch/aarch64/cpu.rs
rename to 11_virtual_mem_part1_identity_mapping/src/_arch/aarch64/cpu.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/_arch/aarch64/cpu/smp.rs b/11_virtual_mem_part1_identity_mapping/src/_arch/aarch64/cpu/smp.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/_arch/aarch64/cpu/smp.rs
rename to 11_virtual_mem_part1_identity_mapping/src/_arch/aarch64/cpu/smp.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/_arch/aarch64/exception.rs b/11_virtual_mem_part1_identity_mapping/src/_arch/aarch64/exception.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/_arch/aarch64/exception.rs
rename to 11_virtual_mem_part1_identity_mapping/src/_arch/aarch64/exception.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/_arch/aarch64/exception/asynchronous.rs b/11_virtual_mem_part1_identity_mapping/src/_arch/aarch64/exception/asynchronous.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/_arch/aarch64/exception/asynchronous.rs
rename to 11_virtual_mem_part1_identity_mapping/src/_arch/aarch64/exception/asynchronous.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/_arch/aarch64/memory/mmu.rs b/11_virtual_mem_part1_identity_mapping/src/_arch/aarch64/memory/mmu.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/_arch/aarch64/memory/mmu.rs
rename to 11_virtual_mem_part1_identity_mapping/src/_arch/aarch64/memory/mmu.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/_arch/aarch64/time.rs b/11_virtual_mem_part1_identity_mapping/src/_arch/aarch64/time.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/_arch/aarch64/time.rs
rename to 11_virtual_mem_part1_identity_mapping/src/_arch/aarch64/time.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/bsp.rs b/11_virtual_mem_part1_identity_mapping/src/bsp.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/bsp.rs
rename to 11_virtual_mem_part1_identity_mapping/src/bsp.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/bsp/device_driver.rs b/11_virtual_mem_part1_identity_mapping/src/bsp/device_driver.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/bsp/device_driver.rs
rename to 11_virtual_mem_part1_identity_mapping/src/bsp/device_driver.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/bsp/device_driver/bcm.rs b/11_virtual_mem_part1_identity_mapping/src/bsp/device_driver/bcm.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/bsp/device_driver/bcm.rs
rename to 11_virtual_mem_part1_identity_mapping/src/bsp/device_driver/bcm.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/bsp/device_driver/bcm/bcm2xxx_gpio.rs b/11_virtual_mem_part1_identity_mapping/src/bsp/device_driver/bcm/bcm2xxx_gpio.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/bsp/device_driver/bcm/bcm2xxx_gpio.rs
rename to 11_virtual_mem_part1_identity_mapping/src/bsp/device_driver/bcm/bcm2xxx_gpio.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/bsp/device_driver/bcm/bcm2xxx_pl011_uart.rs b/11_virtual_mem_part1_identity_mapping/src/bsp/device_driver/bcm/bcm2xxx_pl011_uart.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/bsp/device_driver/bcm/bcm2xxx_pl011_uart.rs
rename to 11_virtual_mem_part1_identity_mapping/src/bsp/device_driver/bcm/bcm2xxx_pl011_uart.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/bsp/device_driver/common.rs b/11_virtual_mem_part1_identity_mapping/src/bsp/device_driver/common.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/bsp/device_driver/common.rs
rename to 11_virtual_mem_part1_identity_mapping/src/bsp/device_driver/common.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/bsp/raspberrypi.rs b/11_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/bsp/raspberrypi.rs
rename to 11_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/bsp/raspberrypi/console.rs b/11_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/console.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/bsp/raspberrypi/console.rs
rename to 11_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/console.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/bsp/raspberrypi/cpu.rs b/11_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/cpu.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/bsp/raspberrypi/cpu.rs
rename to 11_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/cpu.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/bsp/raspberrypi/driver.rs b/11_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/driver.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/bsp/raspberrypi/driver.rs
rename to 11_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/driver.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/bsp/raspberrypi/link.ld b/11_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/link.ld
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/bsp/raspberrypi/link.ld
rename to 11_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/link.ld
diff --git a/11_virtual_memory_part1_identity_mapping/src/bsp/raspberrypi/memory.rs b/11_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/memory.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/bsp/raspberrypi/memory.rs
rename to 11_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/memory.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/bsp/raspberrypi/memory/mmu.rs b/11_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/memory/mmu.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/bsp/raspberrypi/memory/mmu.rs
rename to 11_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/memory/mmu.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/console.rs b/11_virtual_mem_part1_identity_mapping/src/console.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/console.rs
rename to 11_virtual_mem_part1_identity_mapping/src/console.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/cpu.rs b/11_virtual_mem_part1_identity_mapping/src/cpu.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/cpu.rs
rename to 11_virtual_mem_part1_identity_mapping/src/cpu.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/cpu/smp.rs b/11_virtual_mem_part1_identity_mapping/src/cpu/smp.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/cpu/smp.rs
rename to 11_virtual_mem_part1_identity_mapping/src/cpu/smp.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/driver.rs b/11_virtual_mem_part1_identity_mapping/src/driver.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/driver.rs
rename to 11_virtual_mem_part1_identity_mapping/src/driver.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/exception.rs b/11_virtual_mem_part1_identity_mapping/src/exception.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/exception.rs
rename to 11_virtual_mem_part1_identity_mapping/src/exception.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/exception/asynchronous.rs b/11_virtual_mem_part1_identity_mapping/src/exception/asynchronous.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/exception/asynchronous.rs
rename to 11_virtual_mem_part1_identity_mapping/src/exception/asynchronous.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/main.rs b/11_virtual_mem_part1_identity_mapping/src/main.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/main.rs
rename to 11_virtual_mem_part1_identity_mapping/src/main.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/memory.rs b/11_virtual_mem_part1_identity_mapping/src/memory.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/memory.rs
rename to 11_virtual_mem_part1_identity_mapping/src/memory.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/memory/mmu.rs b/11_virtual_mem_part1_identity_mapping/src/memory/mmu.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/memory/mmu.rs
rename to 11_virtual_mem_part1_identity_mapping/src/memory/mmu.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/panic_wait.rs b/11_virtual_mem_part1_identity_mapping/src/panic_wait.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/panic_wait.rs
rename to 11_virtual_mem_part1_identity_mapping/src/panic_wait.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/print.rs b/11_virtual_mem_part1_identity_mapping/src/print.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/print.rs
rename to 11_virtual_mem_part1_identity_mapping/src/print.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/runtime_init.rs b/11_virtual_mem_part1_identity_mapping/src/runtime_init.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/runtime_init.rs
rename to 11_virtual_mem_part1_identity_mapping/src/runtime_init.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/synchronization.rs b/11_virtual_mem_part1_identity_mapping/src/synchronization.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/synchronization.rs
rename to 11_virtual_mem_part1_identity_mapping/src/synchronization.rs
diff --git a/11_virtual_memory_part1_identity_mapping/src/time.rs b/11_virtual_mem_part1_identity_mapping/src/time.rs
similarity index 100%
rename from 11_virtual_memory_part1_identity_mapping/src/time.rs
rename to 11_virtual_mem_part1_identity_mapping/src/time.rs
diff --git a/15_virtual_memory_part2_mmio_remap/.cargo/config b/15_virtual_mem_part2_mmio_remap/.cargo/config
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/.cargo/config
rename to 15_virtual_mem_part2_mmio_remap/.cargo/config
diff --git a/15_virtual_memory_part2_mmio_remap/.vscode/settings.json b/15_virtual_mem_part2_mmio_remap/.vscode/settings.json
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/.vscode/settings.json
rename to 15_virtual_mem_part2_mmio_remap/.vscode/settings.json
diff --git a/15_virtual_memory_part2_mmio_remap/Cargo.lock b/15_virtual_mem_part2_mmio_remap/Cargo.lock
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/Cargo.lock
rename to 15_virtual_mem_part2_mmio_remap/Cargo.lock
diff --git a/15_virtual_memory_part2_mmio_remap/Cargo.toml b/15_virtual_mem_part2_mmio_remap/Cargo.toml
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/Cargo.toml
rename to 15_virtual_mem_part2_mmio_remap/Cargo.toml
diff --git a/15_virtual_memory_part2_mmio_remap/Makefile b/15_virtual_mem_part2_mmio_remap/Makefile
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/Makefile
rename to 15_virtual_mem_part2_mmio_remap/Makefile
diff --git a/15_virtual_memory_part2_mmio_remap/README.md b/15_virtual_mem_part2_mmio_remap/README.md
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/README.md
rename to 15_virtual_mem_part2_mmio_remap/README.md
diff --git a/15_virtual_memory_part2_mmio_remap/build.rs b/15_virtual_mem_part2_mmio_remap/build.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/build.rs
rename to 15_virtual_mem_part2_mmio_remap/build.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/_arch/aarch64/cpu.rs b/15_virtual_mem_part2_mmio_remap/src/_arch/aarch64/cpu.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/_arch/aarch64/cpu.rs
rename to 15_virtual_mem_part2_mmio_remap/src/_arch/aarch64/cpu.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/_arch/aarch64/cpu/smp.rs b/15_virtual_mem_part2_mmio_remap/src/_arch/aarch64/cpu/smp.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/_arch/aarch64/cpu/smp.rs
rename to 15_virtual_mem_part2_mmio_remap/src/_arch/aarch64/cpu/smp.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/_arch/aarch64/exception.S b/15_virtual_mem_part2_mmio_remap/src/_arch/aarch64/exception.S
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/_arch/aarch64/exception.S
rename to 15_virtual_mem_part2_mmio_remap/src/_arch/aarch64/exception.S
diff --git a/15_virtual_memory_part2_mmio_remap/src/_arch/aarch64/exception.rs b/15_virtual_mem_part2_mmio_remap/src/_arch/aarch64/exception.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/_arch/aarch64/exception.rs
rename to 15_virtual_mem_part2_mmio_remap/src/_arch/aarch64/exception.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/_arch/aarch64/exception/asynchronous.rs b/15_virtual_mem_part2_mmio_remap/src/_arch/aarch64/exception/asynchronous.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/_arch/aarch64/exception/asynchronous.rs
rename to 15_virtual_mem_part2_mmio_remap/src/_arch/aarch64/exception/asynchronous.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/_arch/aarch64/memory/mmu.rs b/15_virtual_mem_part2_mmio_remap/src/_arch/aarch64/memory/mmu.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/_arch/aarch64/memory/mmu.rs
rename to 15_virtual_mem_part2_mmio_remap/src/_arch/aarch64/memory/mmu.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/_arch/aarch64/time.rs b/15_virtual_mem_part2_mmio_remap/src/_arch/aarch64/time.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/_arch/aarch64/time.rs
rename to 15_virtual_mem_part2_mmio_remap/src/_arch/aarch64/time.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/bsp.rs b/15_virtual_mem_part2_mmio_remap/src/bsp.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/bsp.rs
rename to 15_virtual_mem_part2_mmio_remap/src/bsp.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/bsp/device_driver.rs b/15_virtual_mem_part2_mmio_remap/src/bsp/device_driver.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/bsp/device_driver.rs
rename to 15_virtual_mem_part2_mmio_remap/src/bsp/device_driver.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/bsp/device_driver/arm.rs b/15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/arm.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/bsp/device_driver/arm.rs
rename to 15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/arm.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/bsp/device_driver/arm/gicv2.rs b/15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/arm/gicv2.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/bsp/device_driver/arm/gicv2.rs
rename to 15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/arm/gicv2.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/bsp/device_driver/arm/gicv2/gicc.rs b/15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/arm/gicv2/gicc.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/bsp/device_driver/arm/gicv2/gicc.rs
rename to 15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/arm/gicv2/gicc.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/bsp/device_driver/arm/gicv2/gicd.rs b/15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/arm/gicv2/gicd.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/bsp/device_driver/arm/gicv2/gicd.rs
rename to 15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/arm/gicv2/gicd.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/bsp/device_driver/bcm.rs b/15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/bcm.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/bsp/device_driver/bcm.rs
rename to 15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/bcm.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_gpio.rs b/15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_gpio.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_gpio.rs
rename to 15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_gpio.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_interrupt_controller.rs b/15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_interrupt_controller.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_interrupt_controller.rs
rename to 15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_interrupt_controller.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_interrupt_controller/peripheral_ic.rs b/15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_interrupt_controller/peripheral_ic.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_interrupt_controller/peripheral_ic.rs
rename to 15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_interrupt_controller/peripheral_ic.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_pl011_uart.rs b/15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_pl011_uart.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_pl011_uart.rs
rename to 15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/bcm/bcm2xxx_pl011_uart.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/bsp/device_driver/common.rs b/15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/common.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/bsp/device_driver/common.rs
rename to 15_virtual_mem_part2_mmio_remap/src/bsp/device_driver/common.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/bsp/raspberrypi.rs b/15_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/bsp/raspberrypi.rs
rename to 15_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/bsp/raspberrypi/console.rs b/15_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/console.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/bsp/raspberrypi/console.rs
rename to 15_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/console.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/bsp/raspberrypi/cpu.rs b/15_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/cpu.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/bsp/raspberrypi/cpu.rs
rename to 15_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/cpu.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/bsp/raspberrypi/driver.rs b/15_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/driver.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/bsp/raspberrypi/driver.rs
rename to 15_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/driver.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/bsp/raspberrypi/exception.rs b/15_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/exception.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/bsp/raspberrypi/exception.rs
rename to 15_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/exception.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/bsp/raspberrypi/exception/asynchronous.rs b/15_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/exception/asynchronous.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/bsp/raspberrypi/exception/asynchronous.rs
rename to 15_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/exception/asynchronous.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/bsp/raspberrypi/link.ld b/15_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/link.ld
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/bsp/raspberrypi/link.ld
rename to 15_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/link.ld
diff --git a/15_virtual_memory_part2_mmio_remap/src/bsp/raspberrypi/memory.rs b/15_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/memory.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/bsp/raspberrypi/memory.rs
rename to 15_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/memory.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/bsp/raspberrypi/memory/mmu.rs b/15_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/memory/mmu.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/bsp/raspberrypi/memory/mmu.rs
rename to 15_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/memory/mmu.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/common.rs b/15_virtual_mem_part2_mmio_remap/src/common.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/common.rs
rename to 15_virtual_mem_part2_mmio_remap/src/common.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/console.rs b/15_virtual_mem_part2_mmio_remap/src/console.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/console.rs
rename to 15_virtual_mem_part2_mmio_remap/src/console.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/cpu.rs b/15_virtual_mem_part2_mmio_remap/src/cpu.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/cpu.rs
rename to 15_virtual_mem_part2_mmio_remap/src/cpu.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/cpu/smp.rs b/15_virtual_mem_part2_mmio_remap/src/cpu/smp.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/cpu/smp.rs
rename to 15_virtual_mem_part2_mmio_remap/src/cpu/smp.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/driver.rs b/15_virtual_mem_part2_mmio_remap/src/driver.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/driver.rs
rename to 15_virtual_mem_part2_mmio_remap/src/driver.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/exception.rs b/15_virtual_mem_part2_mmio_remap/src/exception.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/exception.rs
rename to 15_virtual_mem_part2_mmio_remap/src/exception.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/exception/asynchronous.rs b/15_virtual_mem_part2_mmio_remap/src/exception/asynchronous.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/exception/asynchronous.rs
rename to 15_virtual_mem_part2_mmio_remap/src/exception/asynchronous.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/lib.rs b/15_virtual_mem_part2_mmio_remap/src/lib.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/lib.rs
rename to 15_virtual_mem_part2_mmio_remap/src/lib.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/main.rs b/15_virtual_mem_part2_mmio_remap/src/main.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/main.rs
rename to 15_virtual_mem_part2_mmio_remap/src/main.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/memory.rs b/15_virtual_mem_part2_mmio_remap/src/memory.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/memory.rs
rename to 15_virtual_mem_part2_mmio_remap/src/memory.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/memory/mmu.rs b/15_virtual_mem_part2_mmio_remap/src/memory/mmu.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/memory/mmu.rs
rename to 15_virtual_mem_part2_mmio_remap/src/memory/mmu.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/memory/mmu/mapping_record.rs b/15_virtual_mem_part2_mmio_remap/src/memory/mmu/mapping_record.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/memory/mmu/mapping_record.rs
rename to 15_virtual_mem_part2_mmio_remap/src/memory/mmu/mapping_record.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/memory/mmu/types.rs b/15_virtual_mem_part2_mmio_remap/src/memory/mmu/types.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/memory/mmu/types.rs
rename to 15_virtual_mem_part2_mmio_remap/src/memory/mmu/types.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/panic_wait.rs b/15_virtual_mem_part2_mmio_remap/src/panic_wait.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/panic_wait.rs
rename to 15_virtual_mem_part2_mmio_remap/src/panic_wait.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/print.rs b/15_virtual_mem_part2_mmio_remap/src/print.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/print.rs
rename to 15_virtual_mem_part2_mmio_remap/src/print.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/runtime_init.rs b/15_virtual_mem_part2_mmio_remap/src/runtime_init.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/runtime_init.rs
rename to 15_virtual_mem_part2_mmio_remap/src/runtime_init.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/state.rs b/15_virtual_mem_part2_mmio_remap/src/state.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/state.rs
rename to 15_virtual_mem_part2_mmio_remap/src/state.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/synchronization.rs b/15_virtual_mem_part2_mmio_remap/src/synchronization.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/synchronization.rs
rename to 15_virtual_mem_part2_mmio_remap/src/synchronization.rs
diff --git a/15_virtual_memory_part2_mmio_remap/src/time.rs b/15_virtual_mem_part2_mmio_remap/src/time.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/src/time.rs
rename to 15_virtual_mem_part2_mmio_remap/src/time.rs
diff --git a/15_virtual_memory_part2_mmio_remap/test-macros/Cargo.toml b/15_virtual_mem_part2_mmio_remap/test-macros/Cargo.toml
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/test-macros/Cargo.toml
rename to 15_virtual_mem_part2_mmio_remap/test-macros/Cargo.toml
diff --git a/15_virtual_memory_part2_mmio_remap/test-macros/src/lib.rs b/15_virtual_mem_part2_mmio_remap/test-macros/src/lib.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/test-macros/src/lib.rs
rename to 15_virtual_mem_part2_mmio_remap/test-macros/src/lib.rs
diff --git a/15_virtual_memory_part2_mmio_remap/test-types/Cargo.toml b/15_virtual_mem_part2_mmio_remap/test-types/Cargo.toml
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/test-types/Cargo.toml
rename to 15_virtual_mem_part2_mmio_remap/test-types/Cargo.toml
diff --git a/15_virtual_memory_part2_mmio_remap/test-types/src/lib.rs b/15_virtual_mem_part2_mmio_remap/test-types/src/lib.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/test-types/src/lib.rs
rename to 15_virtual_mem_part2_mmio_remap/test-types/src/lib.rs
diff --git a/15_virtual_memory_part2_mmio_remap/tests/00_console_sanity.rb b/15_virtual_mem_part2_mmio_remap/tests/00_console_sanity.rb
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/tests/00_console_sanity.rb
rename to 15_virtual_mem_part2_mmio_remap/tests/00_console_sanity.rb
diff --git a/15_virtual_memory_part2_mmio_remap/tests/00_console_sanity.rs b/15_virtual_mem_part2_mmio_remap/tests/00_console_sanity.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/tests/00_console_sanity.rs
rename to 15_virtual_mem_part2_mmio_remap/tests/00_console_sanity.rs
diff --git a/15_virtual_memory_part2_mmio_remap/tests/01_timer_sanity.rs b/15_virtual_mem_part2_mmio_remap/tests/01_timer_sanity.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/tests/01_timer_sanity.rs
rename to 15_virtual_mem_part2_mmio_remap/tests/01_timer_sanity.rs
diff --git a/15_virtual_memory_part2_mmio_remap/tests/02_exception_sync_page_fault.rs b/15_virtual_mem_part2_mmio_remap/tests/02_exception_sync_page_fault.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/tests/02_exception_sync_page_fault.rs
rename to 15_virtual_mem_part2_mmio_remap/tests/02_exception_sync_page_fault.rs
diff --git a/15_virtual_memory_part2_mmio_remap/tests/03_exception_irq_sanity.rs b/15_virtual_mem_part2_mmio_remap/tests/03_exception_irq_sanity.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/tests/03_exception_irq_sanity.rs
rename to 15_virtual_mem_part2_mmio_remap/tests/03_exception_irq_sanity.rs
diff --git a/15_virtual_memory_part2_mmio_remap/tests/panic_exit_failure/mod.rs b/15_virtual_mem_part2_mmio_remap/tests/panic_exit_failure/mod.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/tests/panic_exit_failure/mod.rs
rename to 15_virtual_mem_part2_mmio_remap/tests/panic_exit_failure/mod.rs
diff --git a/15_virtual_memory_part2_mmio_remap/tests/panic_exit_success/mod.rs b/15_virtual_mem_part2_mmio_remap/tests/panic_exit_success/mod.rs
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/tests/panic_exit_success/mod.rs
rename to 15_virtual_mem_part2_mmio_remap/tests/panic_exit_success/mod.rs
diff --git a/15_virtual_memory_part2_mmio_remap/tests/runner.rb b/15_virtual_mem_part2_mmio_remap/tests/runner.rb
similarity index 100%
rename from 15_virtual_memory_part2_mmio_remap/tests/runner.rb
rename to 15_virtual_mem_part2_mmio_remap/tests/runner.rb