diff --git a/pkgs/servers/geospatial/geoserver/data-dir.patch b/pkgs/by-name/ge/geoserver/data-dir.patch
similarity index 100%
rename from pkgs/servers/geospatial/geoserver/data-dir.patch
rename to pkgs/by-name/ge/geoserver/data-dir.patch
diff --git a/pkgs/servers/geospatial/geoserver/extensions.nix b/pkgs/by-name/ge/geoserver/extensions.nix
similarity index 100%
rename from pkgs/servers/geospatial/geoserver/extensions.nix
rename to pkgs/by-name/ge/geoserver/extensions.nix
diff --git a/pkgs/servers/geospatial/geoserver/default.nix b/pkgs/by-name/ge/geoserver/package.nix
similarity index 100%
rename from pkgs/servers/geospatial/geoserver/default.nix
rename to pkgs/by-name/ge/geoserver/package.nix
diff --git a/pkgs/servers/geospatial/geoserver/update.sh b/pkgs/by-name/ge/geoserver/update.sh
similarity index 100%
rename from pkgs/servers/geospatial/geoserver/update.sh
rename to pkgs/by-name/ge/geoserver/update.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 965fa97f3885..9d63666ef42a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26409,8 +26409,6 @@ with pkgs;
 
   fit-trackee = callPackage ../servers/geospatial/fit-trackee { };
 
-  geoserver = callPackage ../servers/geospatial/geoserver { };
-
   mapcache = callPackage ../servers/geospatial/mapcache { };
 
   mapproxy = callPackage ../servers/geospatial/mapproxy { };