diff --git a/.gitignore b/.gitignore
index d0cf767..1fcf523 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
-/target
 /.vscode
-/qemu/metaverse.img
+/test/metaverse.img
 *.o
 *.map
 *.elf
diff --git a/Makefile b/Makefile
index dbe6d92..1fd9e44 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ clear:
 	@make -C src clear --no-print-directory
 
 run:
-	@make -C qemu run --no-print-directory
+	@make -C test run --no-print-directory
 
 debug:
-	@make -C qemu debug --no-print-directory
+	@make -C test debug --no-print-directory
diff --git a/qemu/Makefile b/test/Makefile
similarity index 100%
rename from qemu/Makefile
rename to test/Makefile
diff --git a/qemu/bios/x86_64.uefi b/test/bios/x86_64.uefi
similarity index 100%
rename from qemu/bios/x86_64.uefi
rename to test/bios/x86_64.uefi
diff --git a/qemu/bios/x86_64/OVMF.4m.fd b/test/bios/x86_64/OVMF.4m.fd
similarity index 100%
rename from qemu/bios/x86_64/OVMF.4m.fd
rename to test/bios/x86_64/OVMF.4m.fd
diff --git a/qemu/bios/x86_64/OVMF.fd b/test/bios/x86_64/OVMF.fd
similarity index 100%
rename from qemu/bios/x86_64/OVMF.fd
rename to test/bios/x86_64/OVMF.fd
diff --git a/qemu/bios/x86_64/OVMF_CODE.4m.fd b/test/bios/x86_64/OVMF_CODE.4m.fd
similarity index 100%
rename from qemu/bios/x86_64/OVMF_CODE.4m.fd
rename to test/bios/x86_64/OVMF_CODE.4m.fd
diff --git a/qemu/bios/x86_64/OVMF_CODE.csm.4m.fd b/test/bios/x86_64/OVMF_CODE.csm.4m.fd
similarity index 100%
rename from qemu/bios/x86_64/OVMF_CODE.csm.4m.fd
rename to test/bios/x86_64/OVMF_CODE.csm.4m.fd
diff --git a/qemu/bios/x86_64/OVMF_CODE.csm.fd b/test/bios/x86_64/OVMF_CODE.csm.fd
similarity index 100%
rename from qemu/bios/x86_64/OVMF_CODE.csm.fd
rename to test/bios/x86_64/OVMF_CODE.csm.fd
diff --git a/qemu/bios/x86_64/OVMF_CODE.fd b/test/bios/x86_64/OVMF_CODE.fd
similarity index 100%
rename from qemu/bios/x86_64/OVMF_CODE.fd
rename to test/bios/x86_64/OVMF_CODE.fd
diff --git a/qemu/bios/x86_64/OVMF_CODE.secboot.4m.fd b/test/bios/x86_64/OVMF_CODE.secboot.4m.fd
similarity index 100%
rename from qemu/bios/x86_64/OVMF_CODE.secboot.4m.fd
rename to test/bios/x86_64/OVMF_CODE.secboot.4m.fd
diff --git a/qemu/bios/x86_64/OVMF_CODE.secboot.fd b/test/bios/x86_64/OVMF_CODE.secboot.fd
similarity index 100%
rename from qemu/bios/x86_64/OVMF_CODE.secboot.fd
rename to test/bios/x86_64/OVMF_CODE.secboot.fd
diff --git a/qemu/bios/x86_64/OVMF_VARS.4m.fd b/test/bios/x86_64/OVMF_VARS.4m.fd
similarity index 100%
rename from qemu/bios/x86_64/OVMF_VARS.4m.fd
rename to test/bios/x86_64/OVMF_VARS.4m.fd
diff --git a/qemu/bios/x86_64/OVMF_VARS.fd b/test/bios/x86_64/OVMF_VARS.fd
similarity index 100%
rename from qemu/bios/x86_64/OVMF_VARS.fd
rename to test/bios/x86_64/OVMF_VARS.fd