diff --git a/soc/qemu_malta/CMakeLists.txt b/soc/qemu/malta/CMakeLists.txt
similarity index 100%
rename from soc/qemu_malta/CMakeLists.txt
rename to soc/qemu/malta/CMakeLists.txt
diff --git a/soc/qemu_malta/Kconfig b/soc/qemu/malta/Kconfig
similarity index 100%
rename from soc/qemu_malta/Kconfig
rename to soc/qemu/malta/Kconfig
diff --git a/soc/qemu_malta/Kconfig.defconfig b/soc/qemu/malta/Kconfig.defconfig
similarity index 100%
rename from soc/qemu_malta/Kconfig.defconfig
rename to soc/qemu/malta/Kconfig.defconfig
diff --git a/soc/qemu_malta/Kconfig.soc b/soc/qemu/malta/Kconfig.soc
similarity index 100%
rename from soc/qemu_malta/Kconfig.soc
rename to soc/qemu/malta/Kconfig.soc
diff --git a/soc/qemu_malta/soc.h b/soc/qemu/malta/soc.h
similarity index 100%
rename from soc/qemu_malta/soc.h
rename to soc/qemu/malta/soc.h
diff --git a/soc/qemu_malta/soc.yml b/soc/qemu/malta/soc.yml
similarity index 100%
rename from soc/qemu_malta/soc.yml
rename to soc/qemu/malta/soc.yml
diff --git a/soc/qemu_malta/vector.S b/soc/qemu/malta/vector.S
similarity index 100%
rename from soc/qemu_malta/vector.S
rename to soc/qemu/malta/vector.S
diff --git a/soc/riscv/qemu_virt_riscv/CMakeLists.txt b/soc/qemu/virt_riscv/CMakeLists.txt
similarity index 100%
rename from soc/riscv/qemu_virt_riscv/CMakeLists.txt
rename to soc/qemu/virt_riscv/CMakeLists.txt
diff --git a/soc/riscv/qemu_virt_riscv/Kconfig b/soc/qemu/virt_riscv/Kconfig
similarity index 100%
rename from soc/riscv/qemu_virt_riscv/Kconfig
rename to soc/qemu/virt_riscv/Kconfig
diff --git a/soc/riscv/qemu_virt_riscv/Kconfig.defconfig b/soc/qemu/virt_riscv/Kconfig.defconfig
similarity index 100%
rename from soc/riscv/qemu_virt_riscv/Kconfig.defconfig
rename to soc/qemu/virt_riscv/Kconfig.defconfig
diff --git a/soc/riscv/qemu_virt_riscv/Kconfig.soc b/soc/qemu/virt_riscv/Kconfig.soc
similarity index 100%
rename from soc/riscv/qemu_virt_riscv/Kconfig.soc
rename to soc/qemu/virt_riscv/Kconfig.soc
diff --git a/soc/riscv/qemu_virt_riscv/common/CMakeLists.txt b/soc/qemu/virt_riscv/common/CMakeLists.txt
similarity index 100%
rename from soc/riscv/qemu_virt_riscv/common/CMakeLists.txt
rename to soc/qemu/virt_riscv/common/CMakeLists.txt
diff --git a/soc/riscv/qemu_virt_riscv/common/soc.c b/soc/qemu/virt_riscv/common/soc.c
similarity index 100%
rename from soc/riscv/qemu_virt_riscv/common/soc.c
rename to soc/qemu/virt_riscv/common/soc.c
diff --git a/soc/riscv/qemu_virt_riscv/qemu_virt_riscv32/Kconfig b/soc/qemu/virt_riscv/qemu_virt_riscv32/Kconfig
similarity index 100%
rename from soc/riscv/qemu_virt_riscv/qemu_virt_riscv32/Kconfig
rename to soc/qemu/virt_riscv/qemu_virt_riscv32/Kconfig
diff --git a/soc/riscv/qemu_virt_riscv/qemu_virt_riscv32/Kconfig.soc b/soc/qemu/virt_riscv/qemu_virt_riscv32/Kconfig.soc
similarity index 100%
rename from soc/riscv/qemu_virt_riscv/qemu_virt_riscv32/Kconfig.soc
rename to soc/qemu/virt_riscv/qemu_virt_riscv32/Kconfig.soc
diff --git a/soc/riscv/qemu_virt_riscv/qemu_virt_riscv32e/Kconfig b/soc/qemu/virt_riscv/qemu_virt_riscv32e/Kconfig
similarity index 100%
rename from soc/riscv/qemu_virt_riscv/qemu_virt_riscv32e/Kconfig
rename to soc/qemu/virt_riscv/qemu_virt_riscv32e/Kconfig
diff --git a/soc/riscv/qemu_virt_riscv/qemu_virt_riscv32e/Kconfig.soc b/soc/qemu/virt_riscv/qemu_virt_riscv32e/Kconfig.soc
similarity index 100%
rename from soc/riscv/qemu_virt_riscv/qemu_virt_riscv32e/Kconfig.soc
rename to soc/qemu/virt_riscv/qemu_virt_riscv32e/Kconfig.soc
diff --git a/soc/riscv/qemu_virt_riscv/qemu_virt_riscv64/Kconfig b/soc/qemu/virt_riscv/qemu_virt_riscv64/Kconfig
similarity index 100%
rename from soc/riscv/qemu_virt_riscv/qemu_virt_riscv64/Kconfig
rename to soc/qemu/virt_riscv/qemu_virt_riscv64/Kconfig
diff --git a/soc/riscv/qemu_virt_riscv/qemu_virt_riscv64/Kconfig.soc b/soc/qemu/virt_riscv/qemu_virt_riscv64/Kconfig.soc
similarity index 100%
rename from soc/riscv/qemu_virt_riscv/qemu_virt_riscv64/Kconfig.soc
rename to soc/qemu/virt_riscv/qemu_virt_riscv64/Kconfig.soc
diff --git a/soc/riscv/qemu_virt_riscv/soc.yml b/soc/qemu/virt_riscv/soc.yml
similarity index 100%
rename from soc/riscv/qemu_virt_riscv/soc.yml
rename to soc/qemu/virt_riscv/soc.yml