diff --git a/README.md b/README.md
index ededd36..e59bdcf 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1 @@
-# BINARLY Research Tools and PoCs
-
-Build Rust tools:
-
-```
-cd {tool}
-cargo build --release --target aarch64-unknown-uefi
-```
-
-Build `DumpMem`:
-
-```
-cp -r DumpMem {edk2}/ShellPkg/Application/
-# add ShellPkg/Application/DumpMem/DumpMem.inf to ShellPkg.dsc under [Componenents]
-. ./edksetup.sh
-build -p ShellPkg/ShellPkg.dsc -b DEBUG -a AARCH64 -t GCC5
-```
-
-Dump UEFI firmware on Windows Dev Kit:
-
-```
-DumpMem.efi 0x9f000000 0x5d0000 uefi.bin
-```
+# BINARLY Research Tools and PoCs
\ No newline at end of file
diff --git a/DumpMem/DumpMem.c b/UEFI/DumpMem/DumpMem.c
similarity index 100%
rename from DumpMem/DumpMem.c
rename to UEFI/DumpMem/DumpMem.c
diff --git a/DumpMem/DumpMem.inf b/UEFI/DumpMem/DumpMem.inf
similarity index 100%
rename from DumpMem/DumpMem.inf
rename to UEFI/DumpMem/DumpMem.inf
diff --git a/DxeSmmHook/DxeSmmHook.dec b/UEFI/DxeSmmHook/DxeSmmHook.dec
similarity index 100%
rename from DxeSmmHook/DxeSmmHook.dec
rename to UEFI/DxeSmmHook/DxeSmmHook.dec
diff --git a/DxeSmmHook/DxeSmmHook.dsc b/UEFI/DxeSmmHook/DxeSmmHook.dsc
similarity index 100%
rename from DxeSmmHook/DxeSmmHook.dsc
rename to UEFI/DxeSmmHook/DxeSmmHook.dsc
diff --git a/DxeSmmHook/DxeSmmHookSrc/DxeSmmHook.c b/UEFI/DxeSmmHook/DxeSmmHookSrc/DxeSmmHook.c
similarity index 100%
rename from DxeSmmHook/DxeSmmHookSrc/DxeSmmHook.c
rename to UEFI/DxeSmmHook/DxeSmmHookSrc/DxeSmmHook.c
diff --git a/DxeSmmHook/DxeSmmHookSrc/DxeSmmHook.inf b/UEFI/DxeSmmHook/DxeSmmHookSrc/DxeSmmHook.inf
similarity index 100%
rename from DxeSmmHook/DxeSmmHookSrc/DxeSmmHook.inf
rename to UEFI/DxeSmmHook/DxeSmmHookSrc/DxeSmmHook.inf
diff --git a/DxeSmmHook/build.sh b/UEFI/DxeSmmHook/build.sh
similarity index 100%
rename from DxeSmmHook/build.sh
rename to UEFI/DxeSmmHook/build.sh
diff --git a/GetSetVariableLogger/GetSetVariableLogger.c b/UEFI/GetSetVariableLogger/GetSetVariableLogger.c
similarity index 100%
rename from GetSetVariableLogger/GetSetVariableLogger.c
rename to UEFI/GetSetVariableLogger/GetSetVariableLogger.c
diff --git a/GetSetVariableLogger/GetSetVariableLogger.inf b/UEFI/GetSetVariableLogger/GetSetVariableLogger.inf
similarity index 100%
rename from GetSetVariableLogger/GetSetVariableLogger.inf
rename to UEFI/GetSetVariableLogger/GetSetVariableLogger.inf
diff --git a/UEFI/README.md b/UEFI/README.md
new file mode 100644
index 0000000..4b324fd
--- /dev/null
+++ b/UEFI/README.md
@@ -0,0 +1,23 @@
+# BINARLY Research Tools and PoCs (UEFI)
+
+Build Rust tools:
+
+```
+cd {tool}
+cargo build --release --target aarch64-unknown-uefi
+```
+
+Build `DumpMem`:
+
+```
+cp -r DumpMem {edk2}/ShellPkg/Application/
+# add ShellPkg/Application/DumpMem/DumpMem.inf to ShellPkg.dsc under [Componenents]
+. ./edksetup.sh
+build -p ShellPkg/ShellPkg.dsc -b DEBUG -a AARCH64 -t GCC5
+```
+
+Dump UEFI firmware on Windows Dev Kit:
+
+```
+DumpMem.efi 0x9f000000 0x5d0000 uefi.bin
+```
diff --git a/UsbConfigStartUsbLoopbackEvent/UsbConfigStartUsbLoopbackEvent.c b/UEFI/UsbConfigStartUsbLoopbackEvent/UsbConfigStartUsbLoopbackEvent.c
similarity index 100%
rename from UsbConfigStartUsbLoopbackEvent/UsbConfigStartUsbLoopbackEvent.c
rename to UEFI/UsbConfigStartUsbLoopbackEvent/UsbConfigStartUsbLoopbackEvent.c
diff --git a/UsbConfigStartUsbLoopbackEvent/UsbConfigStartUsbLoopbackEvent.inf b/UEFI/UsbConfigStartUsbLoopbackEvent/UsbConfigStartUsbLoopbackEvent.inf
similarity index 100%
rename from UsbConfigStartUsbLoopbackEvent/UsbConfigStartUsbLoopbackEvent.inf
rename to UEFI/UsbConfigStartUsbLoopbackEvent/UsbConfigStartUsbLoopbackEvent.inf
diff --git a/usb-config-dxe-poc/.gitignore b/UEFI/usb-config-dxe-poc/.gitignore
similarity index 100%
rename from usb-config-dxe-poc/.gitignore
rename to UEFI/usb-config-dxe-poc/.gitignore
diff --git a/usb-config-dxe-poc/Cargo.toml b/UEFI/usb-config-dxe-poc/Cargo.toml
similarity index 100%
rename from usb-config-dxe-poc/Cargo.toml
rename to UEFI/usb-config-dxe-poc/Cargo.toml
diff --git a/usb-config-dxe-poc/rust-toolchain.toml b/UEFI/usb-config-dxe-poc/rust-toolchain.toml
similarity index 100%
rename from usb-config-dxe-poc/rust-toolchain.toml
rename to UEFI/usb-config-dxe-poc/rust-toolchain.toml
diff --git a/usb-config-dxe-poc/src/main.rs b/UEFI/usb-config-dxe-poc/src/main.rs
similarity index 100%
rename from usb-config-dxe-poc/src/main.rs
rename to UEFI/usb-config-dxe-poc/src/main.rs