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

index 14cd016c025670dcb4b1f9f6befb66abdeb407be..e42d8039668314942bb9655af1d4b187c3863f82 100644

--- a/pkgs/default.nix

+++ b/pkgs/default.nix

@@ -125,16 +125,12 @@ cheetah3 = callPackage ./development/python-modules/cheetah3 { };

 click-6-7 = callPackage ./development/python-modules/click { };

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

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

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

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

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

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

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

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

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

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

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

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

 ### TOOLS

@@ -154,7 +150,6 @@ };

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

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

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

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

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

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

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

@@ -249,6 +244,16 @@ supload = callPackage ./misc/supload { };

 taskcoach = callPackage ./misc/taskcoach { };

 xfractint = callPackage ./misc/xfractint { };

• NAKARTE

• elevation_server = callPackage ./nakarte/elevation_server { };

• map-tiler = callPackage ./nakarte/map-tiler { };

• maprec = callPackage ./nakarte/maprec { };

• nakarte = callPackage ./nakarte/nakarte { };

• ozi_map = callPackage ./nakarte/ozi_map { };

• pyimagequant = callPackage ./nakarte/pyimagequant { };

• thinplatespline = callPackage ./nakarte/thinplatespline { };

 ### OSM

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

@@ -261,9 +266,7 @@ taginfo-tools = callPackage ./osm/taginfo-tools { };

 ### SERVERS

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

 glauth = callPackage ./servers/glauth { };

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

 ### SUCKLESS

diff --git a/pkgs/development/python-modules/maprec/default.nix b/pkgs/nakarte/maprec/default.nix

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

rename to pkgs/nakarte/maprec/default.nix

diff --git a/pkgs/development/python-modules/maprec/python3.patch b/pkgs/nakarte/maprec/python3.patch

rename from pkgs/development/python-modules/maprec/python3.patch

rename to pkgs/nakarte/maprec/python3.patch

diff --git a/pkgs/development/python-modules/ozi_map/default.nix b/pkgs/nakarte/ozi_map/default.nix

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

rename to pkgs/nakarte/ozi_map/default.nix

diff --git a/pkgs/development/python-modules/pyimagequant/default.nix b/pkgs/nakarte/pyimagequant/default.nix

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

rename to pkgs/nakarte/pyimagequant/default.nix

diff --git a/pkgs/development/python-modules/thinplatespline/default.nix b/pkgs/nakarte/thinplatespline/default.nix

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

rename to pkgs/nakarte/thinplatespline/default.nix

diff --git a/pkgs/servers/elevation_server/default.nix b/pkgs/nakarte/elevation_server/default.nix

rename from pkgs/servers/elevation_server/default.nix

rename to pkgs/nakarte/elevation_server/default.nix

diff --git a/pkgs/servers/elevation_server/deps.nix b/pkgs/nakarte/elevation_server/deps.nix

rename from pkgs/servers/elevation_server/deps.nix

rename to pkgs/nakarte/elevation_server/deps.nix

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

rename from pkgs/servers/nakarte/default.nix

rename to pkgs/nakarte/nakarte/default.nix

diff --git a/pkgs/tools/geo/map-tiler/default.nix b/pkgs/nakarte/map-tiler/default.nix

rename from pkgs/tools/geo/map-tiler/default.nix

rename to pkgs/nakarte/map-tiler/default.nix

diff --git a/pkgs/tools/geo/map-tiler/gobject.patch b/pkgs/nakarte/map-tiler/gobject.patch

rename from pkgs/tools/geo/map-tiler/gobject.patch

rename to pkgs/nakarte/map-tiler/gobject.patch

diff --git a/pkgs/tools/geo/map-tiler/python3.patch b/pkgs/nakarte/map-tiler/python3.patch

rename from pkgs/tools/geo/map-tiler/python3.patch

rename to pkgs/nakarte/map-tiler/python3.patch