diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/by-name/om/omegat/package.nix
similarity index 100%
rename from pkgs/applications/misc/omegat.nix
rename to pkgs/by-name/om/omegat/package.nix
diff --git a/pkgs/development/libraries/java/rhino/deps.json b/pkgs/by-name/rh/rhino/deps.json
similarity index 100%
rename from pkgs/development/libraries/java/rhino/deps.json
rename to pkgs/by-name/rh/rhino/deps.json
diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/by-name/rh/rhino/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/rhino/default.nix
rename to pkgs/by-name/rh/rhino/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4145cf484ce2..dd117b575af0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8695,8 +8695,6 @@ with pkgs;
 
   reposilitePlugins = recurseIntoAttrs (callPackage ../by-name/re/reposilite/plugins.nix { });
 
-  rhino = callPackage ../development/libraries/java/rhino { };
-
   rocksdb_9_10 = rocksdb.overrideAttrs rec {
     pname = "rocksdb";
     version = "9.10.0";
@@ -12297,8 +12295,6 @@ with pkgs;
   obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins { });
   wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { };
 
-  omegat = callPackage ../applications/misc/omegat.nix { };
-
   openambit = qt5.callPackage ../applications/misc/openambit { };
 
   openbox-menu = callPackage ../applications/misc/openbox-menu {