diff --git a/hosts/by-name/servo/services/export/default.nix b/hosts/by-name/servo/services/export/default.nix
index f7f07e73..057fe1fc 100644
--- a/hosts/by-name/servo/services/export/default.nix
+++ b/hosts/by-name/servo/services/export/default.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     ./nfs.nix
-    ./sftpgo.nix
+    ./sftpgo
   ];
 
   users.groups.export = {};
diff --git a/hosts/by-name/servo/services/export/sftpgo.nix b/hosts/by-name/servo/services/export/sftpgo/default.nix
similarity index 95%
rename from hosts/by-name/servo/services/export/sftpgo.nix
rename to hosts/by-name/servo/services/export/sftpgo/default.nix
index e49550f0..f7375008 100644
--- a/hosts/by-name/servo/services/export/sftpgo.nix
+++ b/hosts/by-name/servo/services/export/sftpgo/default.nix
@@ -9,8 +9,8 @@
 
 { config, lib, pkgs, sane-lib, ... }:
 let
-  sftpgo_external_auth_hook = pkgs.static-nix-shell.mkPython3Bin {
-    pname = "sftpgo_external_auth_hook";
+  external_auth_hook = pkgs.static-nix-shell.mkPython3Bin {
+    pname = "external_auth_hook";
     srcRoot = ./.;
   };
 in
@@ -75,7 +75,7 @@ in
         # however not all clients understand all mode bits (like that `g`, indicating SGID / group sticky bit).
         # instead, only send mode bits which are well-understood.
         # the full set of bits, from which i filter, is found here: <https://pkg.go.dev/io/fs#FileMode>
-        ./sftpgo_safe_fileinfo.patch
+        ./safe_fileinfo.patch
       ];
     };
 
@@ -135,7 +135,7 @@ in
       };
       data_provider = {
         driver = "memory";
-        external_auth_hook = "${sftpgo_external_auth_hook}/bin/sftpgo_external_auth_hook";
+        external_auth_hook = "${external_auth_hook}/bin/external_auth_hook";
         # track_quota:
         # - 0: disable quota tracking
         # - 1: quota is updated on every upload/delete, even if user has no quota restriction
diff --git a/hosts/by-name/servo/services/export/sftpgo_external_auth_hook b/hosts/by-name/servo/services/export/sftpgo/external_auth_hook
similarity index 100%
rename from hosts/by-name/servo/services/export/sftpgo_external_auth_hook
rename to hosts/by-name/servo/services/export/sftpgo/external_auth_hook
diff --git a/hosts/by-name/servo/services/export/sftpgo_safe_fileinfo.patch b/hosts/by-name/servo/services/export/sftpgo/safe_fileinfo.patch
similarity index 100%
rename from hosts/by-name/servo/services/export/sftpgo_safe_fileinfo.patch
rename to hosts/by-name/servo/services/export/sftpgo/safe_fileinfo.patch