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

rename from pkgs/applications/gis/maperitive/bin.nix

rename to pkgs/osm/maperitive/bin.nix

diff --git a/pkgs/applications/goldendict/bin.nix b/pkgs/dict/goldendict/bin.nix

rename from pkgs/applications/goldendict/bin.nix

rename to pkgs/dict/goldendict/bin.nix

diff --git a/pkgs/applications/misc/taskcoach/default.nix b/pkgs/misc/taskcoach/default.nix

rename from pkgs/applications/misc/taskcoach/default.nix

rename to pkgs/misc/taskcoach/default.nix

diff --git a/pkgs/applications/redict/default.nix b/pkgs/dict/redict/default.nix

rename from pkgs/applications/redict/default.nix

rename to pkgs/dict/redict/default.nix

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

index 20f6188a1253a65347d13240c9cdc3ee58b9a806..cb3f4f10747edaf2b9a82d646e5a7dbf04060f98 100644

--- a/pkgs/default.nix

+++ b/pkgs/default.nix

@@ -11,7 +11,6 @@

 amethyst-bin = callPackage ./applications/window-managers/amethyst/bin.nix { };

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

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

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

 gpxlab = libsForQt5.callPackage ./applications/gpxlab {

   inherit sources;

 };

@@ -27,7 +26,6 @@ };

 klogg-bin = callPackage ./applications/misc/klogg/bin.nix { };

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

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

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

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

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

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

@@ -39,11 +37,7 @@ qgis-bin = callPackage ./applications/gis/qgis/bin.nix { };

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

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

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

• redict = libsForQt5.callPackage ./applications/redict {

•  inherit sources;
  

• };

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

• taskcoach = callPackage ./applications/misc/taskcoach { };

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

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

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

@@ -145,55 +139,53 @@

 ### TOOLS

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

• cfiles = callPackage ./tools/cfiles { };

 csvquote = callPackage ./tools/text/csvquote { };

 csvtools = callPackage ./tools/text/csvtools { };

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

• docker-reg-tool = callPackage ./tools/docker-reg-tool { };

 docx2csv = callPackage ./tools/text/docx2csv { };

 elevation = callPackage ./tools/geo/elevation {

   click = click-6-7;

 };

 fx-bin = callPackage ./tools/text/fx/bin.nix { };

• gdcv = callPackage ./tools/dict/gdcv { };

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

 gpx-layer = perlPackages.callPackage ./tools/geo/gpx-layer {

   inherit sources;

 };

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

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

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

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

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

 lazyscraper = callPackage ./tools/text/lazyscraper { };

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

 map-tiler = callPackage ./tools/geo/map-tiler { };

• morse-talk = callPackage ./tools/morse-talk { };

• musig = callPackage ./tools/audio/musig { };

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

• polyvectorization = libsForQt5.callPackage ./tools/graphics/polyvectorization {

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

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

• tilesets-cli = callPackage ./tools/geo/tilesets-cli { };

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

• DICT

• dict2rest = callPackage ./dict/dict2rest { };

• gdcv = callPackage ./dict/gdcv { };

• goldendict-bin = callPackage ./dict/goldendict/bin.nix { };

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

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

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

• odict = callPackage ./dict/odict { };

• redict = libsForQt5.callPackage ./dict/redict {

   inherit sources;

 };

• ptunnel = callPackage ./tools/networking/ptunnel { };

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

 stardict-tools =

   # Needed for nixos-19.09

   if pkgs ? libmysql

•  then callPackage ./tools/dict/stardict-tools {
  

•  then callPackage ./dict/stardict-tools {
  

     libmysqlclient = libmysql;

   }

•  else callPackage ./tools/dict/stardict-tools { };
  

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

• supload = callPackage ./tools/misc/supload { };

• tatoebatools = callPackage ./tools/dict/tatoebatools { };

• tilesets-cli = callPackage ./tools/geo/tilesets-cli { };

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

• xfractint = callPackage ./tools/xfractint { };

• zdict = callPackage ./tools/dict/zdict { };

•  else callPackage ./dict/stardict-tools { };
  

• tatoebatools = callPackage ./dict/tatoebatools { };

• zdict = callPackage ./dict/zdict { };

• GAMES

• EMBOX

• ascii-dash = callPackage ./games/ascii-dash { };

• embox = callPackage ./embox { };

 ### GARMIN

@@ -228,9 +220,26 @@ kiln = callPackage ./gemini/kiln { };

 md2gemini = callPackage ./gemini/md2gemini { };

 shavit = callPackage ./gemini/shavit { };

• MISC

• ascii-dash = callPackage ./misc/ascii-dash { };

• cfiles = callPackage ./misc/cfiles { };

• docker-reg-tool = callPackage ./misc/docker-reg-tool { };

• ish = callPackage ./misc/ish { };

• morse-talk = callPackage ./misc/morse-talk { };

• musig = callPackage ./misc/musig { };

• polyvectorization = libsForQt5.callPackage ./misc/polyvectorization {

•  inherit sources;
  

• };

• ptunnel = callPackage ./misc/ptunnel { };

• supload = callPackage ./misc/supload { };

• taskcoach = callPackage ./misc/taskcoach { };

• xfractint = callPackage ./misc/xfractint { };

 ### OSM

 map-stylizer = callPackage ./osm/map-stylizer { };

• maperitive-bin = callPackage ./osm/maperitive/bin.nix { };

 osm-area-tools = callPackage ./osm/osm-area-tools { };

 osmcoastline = callPackage ./osm/osmcoastline { };

 phyghtmap = callPackage ./osm/phyghtmap { };

@@ -239,7 +248,6 @@ taginfo-tools = callPackage ./osm/taginfo-tools { };

 ### SERVERS

• dict2rest = callPackage ./servers/dict2rest { };

 elevation_server = callPackage ./servers/elevation_server { };

 glauth = callPackage ./servers/glauth { };

 nakarte = callPackage ./servers/nakarte { };

@@ -258,9 +266,5 @@ sbase = callPackage ./suckless/sbase { };

 scroll = callPackage ./suckless/scroll { };

 sfeed = callPackage ./suckless/sfeed { };

 stagit = callPackage ./suckless/stagit { };

• MISC

• embox = callPackage ./embox { };

}

)

diff --git a/pkgs/games/ascii-dash/default.nix b/pkgs/misc/ascii-dash/default.nix

rename from pkgs/games/ascii-dash/default.nix

rename to pkgs/misc/ascii-dash/default.nix

diff --git a/pkgs/servers/dict2rest/default.nix b/pkgs/dict/dict2rest/default.nix

rename from pkgs/servers/dict2rest/default.nix

rename to pkgs/dict/dict2rest/default.nix

diff --git a/pkgs/tools/audio/musig/default.nix b/pkgs/misc/musig/default.nix

rename from pkgs/tools/audio/musig/default.nix

rename to pkgs/misc/musig/default.nix

diff --git a/pkgs/tools/cfiles/default.nix b/pkgs/misc/cfiles/default.nix

rename from pkgs/tools/cfiles/default.nix

rename to pkgs/misc/cfiles/default.nix

diff --git a/pkgs/tools/dict/gdcv/default.nix b/pkgs/dict/gdcv/default.nix

rename from pkgs/tools/dict/gdcv/default.nix

rename to pkgs/dict/gdcv/default.nix

diff --git a/pkgs/tools/dict/gt-bash-client/default.nix b/pkgs/dict/gt-bash-client/default.nix

rename from pkgs/tools/dict/gt-bash-client/default.nix

rename to pkgs/dict/gt-bash-client/default.nix

diff --git a/pkgs/tools/dict/gt4gd/default.nix b/pkgs/dict/gt4gd/default.nix

rename from pkgs/tools/dict/gt4gd/default.nix

rename to pkgs/dict/gt4gd/default.nix

diff --git a/pkgs/tools/dict/lsdreader/default.nix b/pkgs/dict/lsdreader/default.nix

rename from pkgs/tools/dict/lsdreader/default.nix

rename to pkgs/dict/lsdreader/default.nix

diff --git a/pkgs/tools/dict/odict/default.nix b/pkgs/dict/odict/default.nix

rename from pkgs/tools/dict/odict/default.nix

rename to pkgs/dict/odict/default.nix

diff --git a/pkgs/tools/dict/stardict-tools/default.nix b/pkgs/dict/stardict-tools/default.nix

rename from pkgs/tools/dict/stardict-tools/default.nix

rename to pkgs/dict/stardict-tools/default.nix

diff --git a/pkgs/tools/dict/tatoebatools/cli.patch b/pkgs/dict/tatoebatools/cli.patch

rename from pkgs/tools/dict/tatoebatools/cli.patch

rename to pkgs/dict/tatoebatools/cli.patch

diff --git a/pkgs/tools/dict/tatoebatools/default.nix b/pkgs/dict/tatoebatools/default.nix

rename from pkgs/tools/dict/tatoebatools/default.nix

rename to pkgs/dict/tatoebatools/default.nix

diff --git a/pkgs/tools/dict/tatoebatools/dont-check-lang-validity.patch b/pkgs/dict/tatoebatools/dont-check-lang-validity.patch

rename from pkgs/tools/dict/tatoebatools/dont-check-lang-validity.patch

rename to pkgs/dict/tatoebatools/dont-check-lang-validity.patch

diff --git a/pkgs/tools/dict/zdict/default.nix b/pkgs/dict/zdict/default.nix

rename from pkgs/tools/dict/zdict/default.nix

rename to pkgs/dict/zdict/default.nix

diff --git a/pkgs/tools/docker-reg-tool/default.nix b/pkgs/misc/docker-reg-tool/default.nix

rename from pkgs/tools/docker-reg-tool/default.nix

rename to pkgs/misc/docker-reg-tool/default.nix

diff --git a/pkgs/tools/graphics/polyvectorization/default.nix b/pkgs/misc/polyvectorization/default.nix

rename from pkgs/tools/graphics/polyvectorization/default.nix

rename to pkgs/misc/polyvectorization/default.nix

diff --git a/pkgs/tools/graphics/polyvectorization/with-gui.patch b/pkgs/misc/polyvectorization/with-gui.patch

rename from pkgs/tools/graphics/polyvectorization/with-gui.patch

rename to pkgs/misc/polyvectorization/with-gui.patch

diff --git a/pkgs/tools/misc/supload/default.nix b/pkgs/misc/supload/default.nix

rename from pkgs/tools/misc/supload/default.nix

rename to pkgs/misc/supload/default.nix

diff --git a/pkgs/tools/morse-talk/default.nix b/pkgs/misc/morse-talk/default.nix

rename from pkgs/tools/morse-talk/default.nix

rename to pkgs/misc/morse-talk/default.nix

diff --git a/pkgs/tools/networking/ish/default.nix b/pkgs/misc/ish/default.nix

rename from pkgs/tools/networking/ish/default.nix

rename to pkgs/misc/ish/default.nix

diff --git a/pkgs/tools/networking/ptunnel/default.nix b/pkgs/misc/ptunnel/default.nix

rename from pkgs/tools/networking/ptunnel/default.nix

rename to pkgs/misc/ptunnel/default.nix

diff --git a/pkgs/tools/xfractint/default.nix b/pkgs/misc/xfractint/default.nix

rename from pkgs/tools/xfractint/default.nix

rename to pkgs/misc/xfractint/default.nix