diff --git a/pkgs/applications/graphics/gscan2pdf/image-utf8-fix.patch b/pkgs/by-name/gs/gscan2pdf/image-utf8-fix.patch
similarity index 100%
rename from pkgs/applications/graphics/gscan2pdf/image-utf8-fix.patch
rename to pkgs/by-name/gs/gscan2pdf/image-utf8-fix.patch
diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/by-name/gs/gscan2pdf/package.nix
similarity index 100%
rename from pkgs/applications/graphics/gscan2pdf/default.nix
rename to pkgs/by-name/gs/gscan2pdf/package.nix
diff --git a/pkgs/servers/hylafaxplus/config.site b/pkgs/by-name/hy/hylafaxplus/config.site
similarity index 100%
rename from pkgs/servers/hylafaxplus/config.site
rename to pkgs/by-name/hy/hylafaxplus/config.site
diff --git a/pkgs/servers/hylafaxplus/libtiff-4.patch b/pkgs/by-name/hy/hylafaxplus/libtiff-4.patch
similarity index 100%
rename from pkgs/servers/hylafaxplus/libtiff-4.patch
rename to pkgs/by-name/hy/hylafaxplus/libtiff-4.patch
diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/by-name/hy/hylafaxplus/package.nix
similarity index 100%
rename from pkgs/servers/hylafaxplus/default.nix
rename to pkgs/by-name/hy/hylafaxplus/package.nix
diff --git a/pkgs/servers/hylafaxplus/post-install-check.sh b/pkgs/by-name/hy/hylafaxplus/post-install-check.sh
similarity index 100%
rename from pkgs/servers/hylafaxplus/post-install-check.sh
rename to pkgs/by-name/hy/hylafaxplus/post-install-check.sh
diff --git a/pkgs/servers/hylafaxplus/post-install.sh b/pkgs/by-name/hy/hylafaxplus/post-install.sh
similarity index 100%
rename from pkgs/servers/hylafaxplus/post-install.sh
rename to pkgs/by-name/hy/hylafaxplus/post-install.sh
diff --git a/pkgs/servers/hylafaxplus/post-patch.sh b/pkgs/by-name/hy/hylafaxplus/post-patch.sh
similarity index 100%
rename from pkgs/servers/hylafaxplus/post-patch.sh
rename to pkgs/by-name/hy/hylafaxplus/post-patch.sh
diff --git a/pkgs/development/libraries/libtiff/headers.patch b/pkgs/by-name/li/libtiff/headers.patch
similarity index 100%
rename from pkgs/development/libraries/libtiff/headers.patch
rename to pkgs/by-name/li/libtiff/headers.patch
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/by-name/li/libtiff/package.nix
similarity index 78%
rename from pkgs/development/libraries/libtiff/default.nix
rename to pkgs/by-name/li/libtiff/package.nix
index b66c8c288bc8..99fb5e644cfb 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/by-name/li/libtiff/package.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libtiff";
-  version = "4.6.0";
+  version = "4.7.0";
 
   src = fetchFromGitLab {
     owner = "libtiff";
     repo = "libtiff";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-qCg5qjsPPynCHIg0JsPJldwVdcYkI68zYmyNAKUCoyw=";
+    hash = "sha256-SuK9/a6OUAumEe1kz1itFJGKxJzbmHkBVLMnyXhIwmQ=";
   };
 
   patches = [
@@ -44,15 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
     # libc++abi 11 has an `#include <version>`, this picks up files name
     # `version` in the project's include paths
     ./rename-version.patch
-    # Fix static linking of `libtiff` via `pkg-config` not working
-    # because `libtiff` does not declare `Lerc` dependency.
-    # nixpkgs has `lerc` >= 4 which provides a `.pc` file.
-    # TODO: Close when https://gitlab.com/libtiff/libtiff/-/merge_requests/633 is merged and available
-    (fetchpatch {
-      name = "libtiff-4.pc-Fix-Requires.private-missing-Lerc.patch";
-      url = "https://gitlab.com/libtiff/libtiff/-/commit/ea882c3c240c14a897b9be38d815cc1893aafa59.patch";
-      hash = "sha256-C0xA3k1sgKmGJjEnyG9UxhXqYBYShKUDQsyjhbEDJbQ=";
-    })
   ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/libtiff/rename-version.patch b/pkgs/by-name/li/libtiff/rename-version.patch
similarity index 100%
rename from pkgs/development/libraries/libtiff/rename-version.patch
rename to pkgs/by-name/li/libtiff/rename-version.patch
diff --git a/pkgs/development/libraries/libtiff/libtiff_t.nix b/pkgs/development/libraries/libtiff/libtiff_t.nix
deleted file mode 100644
index 37e48f6ea14f..000000000000
--- a/pkgs/development/libraries/libtiff/libtiff_t.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ lib
-, stdenv
-, fetchzip
-
-, autoreconfHook
-, pkg-config
-, sphinx
-
-, libdeflate
-, libjpeg
-, xz
-, zlib
-}:
-
-# This is a fork created by the hylafaxplus developer to
-# restore tools dropped by original libtiff in version 4.6.0.
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "libtiff_t";
-  version = "4.6.0t";
-
-  src = fetchzip {
-    url = "http://www.libtiff.org/downloads/tiff-${finalAttrs.version}.tar.xz";
-    hash = "sha256-9ov4w2jw4LtKr82/4jWMAGhc5GEdviJ7bT+y0+U/Ac4=";
-  };
-
-  patches = [
-    # FreeImage needs this patch
-    ./headers.patch
-    # libc++abi 11 has an `#include <version>`, this picks up files name
-    # `version` in the project's include paths
-    ./rename-version.patch
-  ];
-
-  postPatch = ''
-    mv VERSION VERSION.txt
-  '';
-
-  outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ];
-
-  postFixup = ''
-    moveToOutput include/tif_config.h $dev_private
-    moveToOutput include/tif_dir.h $dev_private
-    moveToOutput include/tif_hash_set.h $dev_private
-    moveToOutput include/tiffiop.h $dev_private
-  '';
-
-  # If you want to change to a different build system, please make
-  # sure cross-compilation works first!
-  nativeBuildInputs = [ autoreconfHook pkg-config sphinx ];
-
-  # TODO: opengl support (bogus configure detection)
-  propagatedBuildInputs = [
-    libdeflate
-    libjpeg
-    xz
-    zlib
-  ];
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
-
-  meta = with lib; {
-    description = "Library and utilities for working with the TIFF image file format (fork containing tools dropped in original libtiff version)";
-    homepage = "http://www.libtiff.org";
-    changelog = "http://www.libtiff.org/releases/v${finalAttrs.version}.html";
-    maintainers = with maintainers; [ yarny ];
-    license = licenses.libtiff;
-    platforms = platforms.unix ++ platforms.windows;
-    pkgConfigModules = [ "libtiff-4" ];
-  };
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1fd5e2112f6..2b0f4de6e1b5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5211,12 +5211,6 @@ with pkgs;
 
   grobi = callPackage ../tools/X11/grobi { };
 
-  gscan2pdf = callPackage ../applications/graphics/gscan2pdf {
-    # needs this fork of libtiff, because original libtiff
-    # stopped packaging required tools with version 4.6
-    libtiff = libtiff_t;
-  };
-
   gsctl = callPackage ../applications/misc/gsctl { };
 
   gsocket = callPackage ../tools/networking/gsocket { };
@@ -8621,12 +8615,6 @@ with pkgs;
 
   hybridreverb2 = callPackage ../applications/audio/hybridreverb2 { };
 
-  hylafaxplus = callPackage ../servers/hylafaxplus {
-    # needs this fork of libtiff, because original libtiff
-    # stopped packaging required tools with version 4.6
-    libtiff = libtiff_t;
-  };
-
   hyphen = callPackage ../development/libraries/hyphen { };
 
   hyphenDicts = recurseIntoAttrs (callPackages ../development/libraries/hyphen/dictionaries.nix {});
@@ -21842,15 +21830,6 @@ with pkgs;
 
   libtifiles2 = callPackage ../development/libraries/libtifiles2 { };
 
-  inherit
-    ({
-      libtiff = callPackage ../development/libraries/libtiff { };
-      libtiff_t = callPackage ../development/libraries/libtiff/libtiff_t.nix { };
-    })
-    libtiff
-    libtiff_t
-    ;
-
   libtiger = callPackage ../development/libraries/libtiger { };
 
   libtommath = callPackage ../development/libraries/libtommath { };