diff --git a/pkgs/default.nix b/pkgs/default.nix

index 7c6e3855880b8c5905a70f2b46742e534cf60ae7..f7cd3417d3bd77223ce4d33d9d63a19121a41a73 100644

--- a/pkgs/default.nix

+++ b/pkgs/default.nix

@@ -107,16 +107,11 @@ wikitextprocessor = callPackage ./development/python-modules/wikitextprocessor { };

 ### TOOLS

• cmpgpx = callPackage ./tools/geo/cmpgpx { };

 datamaps = callPackage ./tools/geo/datamaps { };

 elevation = callPackage ./tools/geo/elevation {

   click = click-6-7;

 };

 go-staticmaps = callPackage ./tools/geo/go-staticmaps { };

• gpx-interpolate = callPackage ./tools/geo/gpx-interpolate { };

• gpx-layer = perlPackages.callPackage ./tools/geo/gpx-layer { };

• gpxtools = callPackage ./tools/geo/gpxtools { };

• gpxtrackposter = callPackage ./tools/geo/gpxtrackposter { };

 py-staticmaps = callPackage ./tools/geo/py-staticmaps { };

 render_geojson = callPackage ./tools/geo/render_geojson { };

 supermercado = callPackage ./tools/geo/supermercado { };

@@ -196,7 +191,12 @@ tdh = callPackage ./gis/tdh { };

 ### GPX

• cmpgpx = callPackage ./gpx/cmpgpx { };

 gpx-animator = callPackage ./gpx/gpx-animator { };

• gpx-interpolate = callPackage ./gpx/gpx-interpolate { };

• gpx-layer = perlPackages.callPackage ./gpx/gpx-layer { };

• gpxtools = callPackage ./gpx/gpxtools { };

• gpxtrackposter = callPackage ./gpx/gpxtrackposter { };

 ### IMAGES

diff --git a/pkgs/tools/geo/cmpgpx/default.nix b/pkgs/gpx/cmpgpx/default.nix

rename from pkgs/tools/geo/cmpgpx/default.nix

rename to pkgs/gpx/cmpgpx/default.nix

diff --git a/pkgs/tools/geo/gpx-interpolate/default.nix b/pkgs/gpx/gpx-interpolate/default.nix

rename from pkgs/tools/geo/gpx-interpolate/default.nix

rename to pkgs/gpx/gpx-interpolate/default.nix

diff --git a/pkgs/tools/geo/gpx-layer/default.nix b/pkgs/gpx/gpx-layer/default.nix

rename from pkgs/tools/geo/gpx-layer/default.nix

rename to pkgs/gpx/gpx-layer/default.nix

diff --git a/pkgs/tools/geo/gpxtools/default.nix b/pkgs/gpx/gpxtools/default.nix

rename from pkgs/tools/geo/gpxtools/default.nix

rename to pkgs/gpx/gpxtools/default.nix

diff --git a/pkgs/tools/geo/gpxtrackposter/default.nix b/pkgs/gpx/gpxtrackposter/default.nix

rename from pkgs/tools/geo/gpxtrackposter/default.nix

rename to pkgs/gpx/gpxtrackposter/default.nix

diff --git a/pkgs/tools/geo/gpxtrackposter/fix-localedir.patch b/pkgs/gpx/gpxtrackposter/fix-localedir.patch

rename from pkgs/tools/geo/gpxtrackposter/fix-localedir.patch

rename to pkgs/gpx/gpxtrackposter/fix-localedir.patch