diff --git a/README.md b/README.md
index ca926ff..02723bb 100644
--- a/README.md
+++ b/README.md
@@ -459,14 +459,14 @@ to the jurisdiction in which the machine is located, for example `"US"`.
 
 ## packages documentation
 
-### [`ghidra`](./pkgs/ghidra-xenia/build.nix)
+### [`ghidra`](./pkgs/reverse-engineering/ghidra/build.nix)
 
 a version of ghidra that uses a split derivation, `lib` contains the core ghidra distribution, `doc`
 contains all the documentation elements, and `out` contains the bin folder, icons, and desktop file.
 only `out` has a dependency on the build jdk, so `lib` and `doc` can be used with reduced closure
 size
 
-### [`ghidra_headless`](./pkgs/ghidra-xenia/build.nix)
+### [`ghidra_headless`](./pkgs/reverse-engineering/ghidra/build.nix)
 
 a variant of ghidra which does not have a dependency on any jdk, intended to reduce closure size for
 server operation with a headless jdk (in particular, the ghidra-server nixos module uses
diff --git a/overlay.nix b/overlay.nix
index e5e5588..615bf23 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -10,10 +10,10 @@ final: prev: {
   ghidra_headless = final.ghidra.lib;
 
   # stuff that tracks upstream
-  ghidra = final.callPackage ./pkgs/ghidra-xenia-v2/build.nix {
+  ghidra = final.callPackage ./pkgs/reverse-enginering/ghidra/build.nix {
     protobuf = final.protobuf_21;
   };
-  ghidra-extensions = final.lib.recurseIntoAttrs (final.callPackage ./pkgs/ghidra-xenia-v2/extensions.nix { });
+  ghidra-extensions = final.lib.recurseIntoAttrs (final.callPackage ./pkgs/reverse-engineering/ghidra/extensions.nix { });
   # end stuff that tracks upstream
 
 
diff --git a/pkgs/ghidra-xenia-v2/0001-Use-protobuf-gradle-plugin.patch b/pkgs/reverse-engineering/ghidra/0001-Use-protobuf-gradle-plugin.patch
similarity index 100%
rename from pkgs/ghidra-xenia-v2/0001-Use-protobuf-gradle-plugin.patch
rename to pkgs/reverse-engineering/ghidra/0001-Use-protobuf-gradle-plugin.patch
diff --git a/pkgs/ghidra-xenia-v2/0002-Load-nix-extensions.patch b/pkgs/reverse-engineering/ghidra/0002-Load-nix-extensions.patch
similarity index 100%
rename from pkgs/ghidra-xenia-v2/0002-Load-nix-extensions.patch
rename to pkgs/reverse-engineering/ghidra/0002-Load-nix-extensions.patch
diff --git a/pkgs/ghidra-xenia-v2/0003-Remove-build-datestamp.patch b/pkgs/reverse-engineering/ghidra/0003-Remove-build-datestamp.patch
similarity index 100%
rename from pkgs/ghidra-xenia-v2/0003-Remove-build-datestamp.patch
rename to pkgs/reverse-engineering/ghidra/0003-Remove-build-datestamp.patch
diff --git a/pkgs/ghidra-xenia-v2/build-extension.nix b/pkgs/reverse-engineering/ghidra/build-extension.nix
similarity index 100%
rename from pkgs/ghidra-xenia-v2/build-extension.nix
rename to pkgs/reverse-engineering/ghidra/build-extension.nix
diff --git a/pkgs/ghidra-xenia-v2/build.nix b/pkgs/reverse-engineering/ghidra/build.nix
similarity index 100%
rename from pkgs/ghidra-xenia-v2/build.nix
rename to pkgs/reverse-engineering/ghidra/build.nix
diff --git a/pkgs/ghidra-xenia-v2/deps.json b/pkgs/reverse-engineering/ghidra/deps.json
similarity index 100%
rename from pkgs/ghidra-xenia-v2/deps.json
rename to pkgs/reverse-engineering/ghidra/deps.json
diff --git a/pkgs/ghidra-xenia-v2/extensions.nix b/pkgs/reverse-engineering/ghidra/extensions.nix
similarity index 100%
rename from pkgs/ghidra-xenia-v2/extensions.nix
rename to pkgs/reverse-engineering/ghidra/extensions.nix
diff --git a/pkgs/ghidra-xenia-v2/extensions/findcrypt/default.nix b/pkgs/reverse-engineering/ghidra/extensions/findcrypt/default.nix
similarity index 100%
rename from pkgs/ghidra-xenia-v2/extensions/findcrypt/default.nix
rename to pkgs/reverse-engineering/ghidra/extensions/findcrypt/default.nix
diff --git a/pkgs/ghidra-xenia-v2/extensions/ghidra-delinker-extension/default.nix b/pkgs/reverse-engineering/ghidra/extensions/ghidra-delinker-extension/default.nix
similarity index 100%
rename from pkgs/ghidra-xenia-v2/extensions/ghidra-delinker-extension/default.nix
rename to pkgs/reverse-engineering/ghidra/extensions/ghidra-delinker-extension/default.nix
diff --git a/pkgs/ghidra-xenia-v2/extensions/ghidra-delinker-extension/deps.json b/pkgs/reverse-engineering/ghidra/extensions/ghidra-delinker-extension/deps.json
similarity index 100%
rename from pkgs/ghidra-xenia-v2/extensions/ghidra-delinker-extension/deps.json
rename to pkgs/reverse-engineering/ghidra/extensions/ghidra-delinker-extension/deps.json
diff --git a/pkgs/ghidra-xenia-v2/extensions/ghidra-golanganalyzerextension/default.nix b/pkgs/reverse-engineering/ghidra/extensions/ghidra-golanganalyzerextension/default.nix
similarity index 100%
rename from pkgs/ghidra-xenia-v2/extensions/ghidra-golanganalyzerextension/default.nix
rename to pkgs/reverse-engineering/ghidra/extensions/ghidra-golanganalyzerextension/default.nix
diff --git a/pkgs/ghidra-xenia-v2/extensions/ghidraninja-ghidra-scripts/default.nix b/pkgs/reverse-engineering/ghidra/extensions/ghidraninja-ghidra-scripts/default.nix
similarity index 100%
rename from pkgs/ghidra-xenia-v2/extensions/ghidraninja-ghidra-scripts/default.nix
rename to pkgs/reverse-engineering/ghidra/extensions/ghidraninja-ghidra-scripts/default.nix
diff --git a/pkgs/ghidra-xenia-v2/extensions/gnudisassembler/default.nix b/pkgs/reverse-engineering/ghidra/extensions/gnudisassembler/default.nix
similarity index 100%
rename from pkgs/ghidra-xenia-v2/extensions/gnudisassembler/default.nix
rename to pkgs/reverse-engineering/ghidra/extensions/gnudisassembler/default.nix
diff --git a/pkgs/ghidra-xenia-v2/extensions/kaiju/default.nix b/pkgs/reverse-engineering/ghidra/extensions/kaiju/default.nix
similarity index 100%
rename from pkgs/ghidra-xenia-v2/extensions/kaiju/default.nix
rename to pkgs/reverse-engineering/ghidra/extensions/kaiju/default.nix
diff --git a/pkgs/ghidra-xenia-v2/extensions/kaiju/deps.json b/pkgs/reverse-engineering/ghidra/extensions/kaiju/deps.json
similarity index 100%
rename from pkgs/ghidra-xenia-v2/extensions/kaiju/deps.json
rename to pkgs/reverse-engineering/ghidra/extensions/kaiju/deps.json
diff --git a/pkgs/ghidra-xenia-v2/extensions/lightkeeper/default.nix b/pkgs/reverse-engineering/ghidra/extensions/lightkeeper/default.nix
similarity index 100%
rename from pkgs/ghidra-xenia-v2/extensions/lightkeeper/default.nix
rename to pkgs/reverse-engineering/ghidra/extensions/lightkeeper/default.nix
diff --git a/pkgs/ghidra-xenia-v2/extensions/machinelearning/default.nix b/pkgs/reverse-engineering/ghidra/extensions/machinelearning/default.nix
similarity index 100%
rename from pkgs/ghidra-xenia-v2/extensions/machinelearning/default.nix
rename to pkgs/reverse-engineering/ghidra/extensions/machinelearning/default.nix
diff --git a/pkgs/ghidra-xenia-v2/extensions/ret-sync/default.nix b/pkgs/reverse-engineering/ghidra/extensions/ret-sync/default.nix
similarity index 100%
rename from pkgs/ghidra-xenia-v2/extensions/ret-sync/default.nix
rename to pkgs/reverse-engineering/ghidra/extensions/ret-sync/default.nix
diff --git a/pkgs/ghidra-xenia-v2/extensions/sleighdevtools/default.nix b/pkgs/reverse-engineering/ghidra/extensions/sleighdevtools/default.nix
similarity index 100%
rename from pkgs/ghidra-xenia-v2/extensions/sleighdevtools/default.nix
rename to pkgs/reverse-engineering/ghidra/extensions/sleighdevtools/default.nix
diff --git a/pkgs/ghidra-xenia-v2/extensions/wasm/default.nix b/pkgs/reverse-engineering/ghidra/extensions/wasm/default.nix
similarity index 100%
rename from pkgs/ghidra-xenia-v2/extensions/wasm/default.nix
rename to pkgs/reverse-engineering/ghidra/extensions/wasm/default.nix
diff --git a/pkgs/ghidra-xenia-v2/with-extensions.nix b/pkgs/reverse-engineering/ghidra/with-extensions.nix
similarity index 100%
rename from pkgs/ghidra-xenia-v2/with-extensions.nix
rename to pkgs/reverse-engineering/ghidra/with-extensions.nix