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

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

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

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

index dfccfa01ce8cc408bfc9210b9c30c61520b87ecb..cc3fccf5689d71d19d8e8789a559ee485a9377fe 100644

--- a/pkgs/default.nix

+++ b/pkgs/default.nix

@@ -8,7 +8,6 @@

 ### APPLICATIONS

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

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

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

 klogg = libsForQt5.callPackage ./applications/misc/klogg { };

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

@@ -67,10 +66,6 @@ qtpbfimageplugin-styles = callPackage ./data/themes/qtpbfimageplugin-styles { };

 ### DEVELOPMENT / LIBRARIES

• foma = callPackage ./development/libraries/foma {

•  libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
  

• };

• hfst = callPackage ./development/libraries/hfst { };

 libshell = callPackage ./development/libraries/libshell { };

 microjson = callPackage ./development/libraries/microjson { };

 qt6 = callPackage ./development/libraries/qt-6 { };

@@ -94,30 +89,10 @@ geotiler = callPackage ./development/python-modules/geotiler { };

 gpxelevations = callPackage ./development/python-modules/gpxelevations { };

 jsonseq = callPackage ./development/python-modules/jsonseq { };

 lru-dict = callPackage ./development/python-modules/lru-dict { };

• mikatools = callPackage ./development/python-modules/mikatools { };

 morecantile = callPackage ./development/python-modules/morecantile { };

 portolan = callPackage ./development/python-modules/portolan { };

 pymbtiles = callPackage ./development/python-modules/pymbtiles { };

• python-hfst = callPackage ./development/python-modules/python-hfst { };

 s2sphere = callPackage ./development/python-modules/s2sphere { };

• wikitextprocessor = callPackage ./development/python-modules/wikitextprocessor { };

• wiktfinnish = callPackage ./development/python-modules/wiktfinnish { };

• 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 { };

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

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

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

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

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

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

 ### EMBOX

@@ -188,6 +163,7 @@ go-staticmaps = callPackage ./geospatial/go-staticmaps { };

 mapsoft = callPackage ./geospatial/mapsoft { };

 mapsoft2 = callPackage ./geospatial/mapsoft/2.nix { };

 mbtiles2osmand = callPackage ./geospatial/mbtiles2osmand { };

• polyvectorization = libsForQt5.callPackage ./geospatial/polyvectorization { };

 py-staticmaps = callPackage ./geospatial/py-staticmaps { };

 qgis-bin = callPackage ./geospatial/qgis/bin.nix { };

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

@@ -243,6 +219,31 @@ quark = callPackage ./images/quark { };

   wekan = callPackage ./images/wekan { };

 };

• LINGUISTICS

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

• foma = callPackage ./linguistics/foma {

•  libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
  

• };

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

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

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

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

• hfst = callPackage ./linguistics/hfst { };

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

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

• mikatools = callPackage ./linguistics/mikatools { };

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

• opendict = callPackage ./linguistics/opendict { };

• python-hfst = callPackage ./linguistics/python-hfst { };

• redict = libsForQt5.callPackage ./linguistics/redict { };

• stardict-tools = callPackage ./linguistics/stardict-tools { };

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

• wikitextprocessor = callPackage ./linguistics/wikitextprocessor { };

• wiktextract = callPackage ./linguistics/wiktextract { };

• wiktfinnish = callPackage ./linguistics/wiktfinnish { };

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

 ### MISC

 aamath = callPackage ./misc/aamath { };

@@ -263,7 +264,6 @@ lazyscraper = callPackage ./misc/lazyscraper { };

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

 musig = callPackage ./misc/musig { };

 playonmac = callPackage ./misc/playonmac { };

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

 ptunnel = callPackage ./misc/ptunnel { };

 pvs-studio = callPackage ./misc/pvs-studio { };

 repolocli = callPackage ./misc/repolocli { };

diff --git a/pkgs/development/libraries/foma/default.nix b/pkgs/linguistics/foma/default.nix

rename from pkgs/development/libraries/foma/default.nix

rename to pkgs/linguistics/foma/default.nix

diff --git a/pkgs/development/libraries/hfst/default.nix b/pkgs/linguistics/hfst/default.nix

rename from pkgs/development/libraries/hfst/default.nix

rename to pkgs/linguistics/hfst/default.nix

diff --git a/pkgs/development/python-modules/mikatools/default.nix b/pkgs/linguistics/mikatools/default.nix

rename from pkgs/development/python-modules/mikatools/default.nix

rename to pkgs/linguistics/mikatools/default.nix

diff --git a/pkgs/development/python-modules/python-hfst/default.nix b/pkgs/linguistics/python-hfst/default.nix

rename from pkgs/development/python-modules/python-hfst/default.nix

rename to pkgs/linguistics/python-hfst/default.nix

diff --git a/pkgs/development/python-modules/wikitextprocessor/default.nix b/pkgs/linguistics/wikitextprocessor/default.nix

rename from pkgs/development/python-modules/wikitextprocessor/default.nix

rename to pkgs/linguistics/wikitextprocessor/default.nix

diff --git a/pkgs/development/python-modules/wiktfinnish/default.nix b/pkgs/linguistics/wiktfinnish/default.nix

rename from pkgs/development/python-modules/wiktfinnish/default.nix

rename to pkgs/linguistics/wiktfinnish/default.nix

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

rename from pkgs/dict/dict2rest/default.nix

rename to pkgs/linguistics/dict2rest/default.nix

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

rename from pkgs/dict/gdcv/default.nix

rename to pkgs/linguistics/gdcv/default.nix

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

rename from pkgs/dict/goldendict/bin.nix

rename to pkgs/linguistics/goldendict/bin.nix

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

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

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

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

rename from pkgs/dict/gt4gd/default.nix

rename to pkgs/linguistics/gt4gd/default.nix

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

rename from pkgs/dict/lsdreader/default.nix

rename to pkgs/linguistics/lsdreader/default.nix

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

rename from pkgs/dict/odict/default.nix

rename to pkgs/linguistics/odict/default.nix

diff --git a/pkgs/dict/opendict/0001-fix-makefile.patch b/pkgs/linguistics/opendict/0001-fix-makefile.patch

rename from pkgs/dict/opendict/0001-fix-makefile.patch

rename to pkgs/linguistics/opendict/0001-fix-makefile.patch

diff --git a/pkgs/dict/opendict/default.nix b/pkgs/linguistics/opendict/default.nix

rename from pkgs/dict/opendict/default.nix

rename to pkgs/linguistics/opendict/default.nix

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

rename from pkgs/dict/redict/default.nix

rename to pkgs/linguistics/redict/default.nix

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

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

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

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

rename from pkgs/dict/tatoebatools/cli.patch

rename to pkgs/linguistics/tatoebatools/cli.patch

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

rename from pkgs/dict/tatoebatools/default.nix

rename to pkgs/linguistics/tatoebatools/default.nix

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

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

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

diff --git a/pkgs/dict/wiktextract/default.nix b/pkgs/linguistics/wiktextract/default.nix

rename from pkgs/dict/wiktextract/default.nix

rename to pkgs/linguistics/wiktextract/default.nix

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

rename from pkgs/dict/zdict/default.nix

rename to pkgs/linguistics/zdict/default.nix

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

rename from pkgs/misc/polyvectorization/default.nix

rename to pkgs/geospatial/polyvectorization/default.nix

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

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

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