diff --git a/pkgs/applications/basecamp/default.nix b/pkgs/applications/gis/basecamp/default.nix

rename from pkgs/applications/basecamp/default.nix

rename to pkgs/applications/gis/basecamp/default.nix

diff --git a/pkgs/applications/librewolf/default.nix b/pkgs/applications/networking/librewolf/default.nix

rename from pkgs/applications/librewolf/default.nix

rename to pkgs/applications/networking/librewolf/default.nix

diff --git a/pkgs/applications/mapsoft/0001-fix-build.patch b/pkgs/applications/gis/mapsoft/0001-fix-build.patch

rename from pkgs/applications/mapsoft/0001-fix-build.patch

rename to pkgs/applications/gis/mapsoft/0001-fix-build.patch

diff --git a/pkgs/applications/mapsoft/0002-fix-build.patch b/pkgs/applications/gis/mapsoft/0002-fix-build.patch

rename from pkgs/applications/mapsoft/0002-fix-build.patch

rename to pkgs/applications/gis/mapsoft/0002-fix-build.patch

diff --git a/pkgs/applications/mapsoft/2.nix b/pkgs/applications/gis/mapsoft/2.nix

rename from pkgs/applications/mapsoft/2.nix

rename to pkgs/applications/gis/mapsoft/2.nix

diff --git a/pkgs/applications/mapsoft/default.nix b/pkgs/applications/gis/mapsoft/default.nix

rename from pkgs/applications/mapsoft/default.nix

rename to pkgs/applications/gis/mapsoft/default.nix

diff --git a/pkgs/applications/qgis/bin.nix b/pkgs/applications/gis/qgis/bin.nix

rename from pkgs/applications/qgis/bin.nix

rename to pkgs/applications/gis/qgis/bin.nix

diff --git a/pkgs/applications/qmapshack/bin.nix b/pkgs/applications/gis/qmapshack/bin.nix

rename from pkgs/applications/qmapshack/bin.nix

rename to pkgs/applications/gis/qmapshack/bin.nix

diff --git a/pkgs/applications/qutebrowser/bin.nix b/pkgs/applications/networking/qutebrowser/bin.nix

rename from pkgs/applications/qutebrowser/bin.nix

rename to pkgs/applications/networking/qutebrowser/bin.nix

diff --git a/pkgs/applications/sasplanet/default.nix b/pkgs/applications/gis/sasplanet/default.nix

rename from pkgs/applications/sasplanet/default.nix

rename to pkgs/applications/gis/sasplanet/default.nix

diff --git a/pkgs/applications/tdh/base.nix b/pkgs/applications/gis/tdh/base.nix

rename from pkgs/applications/tdh/base.nix

rename to pkgs/applications/gis/tdh/base.nix

diff --git a/pkgs/applications/tdh/default.nix b/pkgs/applications/gis/tdh/default.nix

rename from pkgs/applications/tdh/default.nix

rename to pkgs/applications/gis/tdh/default.nix

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

index da34f76370952695eba8b56e2eeb228aed2b70cd..0e4cc89c691459d6eb2833f9742c904915f63f02 100644

--- a/pkgs/default.nix

+++ b/pkgs/default.nix

@@ -9,7 +9,7 @@

 ### APPLICATIONS

 anki-bin = callPackage ./applications/anki/bin.nix { };

• basecamp = callPackage ./applications/basecamp { };

• basecamp = callPackage ./applications/gis/basecamp { };

 goldencheetah-bin = callPackage ./applications/goldencheetah/bin.nix { };

 goldendict-bin = callPackage ./applications/goldendict/bin.nix { };

 gpxlab = libsForQt5.callPackage ./applications/gpxlab {

@@ -19,28 +19,29 @@ gpxsee = libsForQt5.callPackage ./applications/gpxsee {

   inherit sources;

 };

 gpxsee-bin = callPackage ./applications/gpxsee/bin.nix { };

• i18n-editor = callPackage ./applications/i18n-editor { jre = pkgs.jdk11; };

 iterm2-bin = callPackage ./applications/iterm2/bin.nix { };

• librewolf = callPackage ./applications/librewolf { };

• librewolf = callPackage ./applications/networking/librewolf { };

 macpass-bin = callPackage ./applications/macpass/bin.nix { };

• mapsoft = callPackage ./applications/mapsoft { };

• mapsoft2 = callPackage ./applications/mapsoft/2.nix { };

• mapsoft = callPackage ./applications/gis/mapsoft { };

• mapsoft2 = callPackage ./applications/gis/mapsoft/2.nix { };

 nnn-plugins = callPackage ./applications/nnn-plugins { };

 openorienteering-mapper = libsForQt5.callPackage ./applications/openorienteering-mapper {

   inherit sources;

 };

 openorienteering-mapper-bin = callPackage ./applications/openorienteering-mapper/bin.nix { };

• qgis-bin = callPackage ./applications/qgis/bin.nix { };

• qgis-bin = callPackage ./applications/gis/qgis/bin.nix { };

 qgis-ltr-bin = qgis-bin.override { releaseType = "ltr"; };

• qmapshack-bin = callPackage ./applications/qmapshack/bin.nix { };

• qutebrowser-bin = callPackage ./applications/qutebrowser/bin.nix { };

• qmapshack-bin = callPackage ./applications/gis/qmapshack/bin.nix { };

• qutebrowser-bin = callPackage ./applications/networking/qutebrowser/bin.nix { };

 qvge = libsForQt5.callPackage ./applications/qvge {

   inherit sources;

 };

 redict = libsForQt5.callPackage ./applications/redict {

   inherit sources;

 };

• sasplanet = callPackage ./applications/sasplanet { };

• tdh = callPackage ./applications/tdh { };

• sasplanet = callPackage ./applications/gis/sasplanet { };

• tdh = callPackage ./applications/gis/tdh { };

 visualgps = libsForQt5.callPackage ./applications/visualgps { };

 wireguard-statusbar = callPackage ./applications/wireguard-statusbar { };

@@ -143,7 +144,6 @@ gpxtools = callPackage ./tools/geo/gpxtools { };

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

 gt-bash-client = callPackage ./tools/dict/gt-bash-client { };

 gt4gd = callPackage ./tools/dict/gt4gd { };

• i18n-editor = callPackage ./tools/i18n-editor { jre = pkgs.jdk11; };

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

 ish = callPackage ./tools/networking/ish { };

 lsdreader = callPackage ./tools/dict/lsdreader { };

diff --git a/pkgs/tools/i18n-editor/default.nix b/pkgs/applications/i18n-editor/default.nix

rename from pkgs/tools/i18n-editor/default.nix

rename to pkgs/applications/i18n-editor/default.nix