diff --git a/applications/ldap/ldap_backend.nix b/applications/ldap/backend.nix
similarity index 100%
rename from applications/ldap/ldap_backend.nix
rename to applications/ldap/backend.nix
diff --git a/applications/ldap_client.nix b/applications/ldap/client.nix
similarity index 100%
rename from applications/ldap_client.nix
rename to applications/ldap/client.nix
diff --git a/applications/ldap.nix b/applications/ldap/server.nix
similarity index 97%
rename from applications/ldap.nix
rename to applications/ldap/server.nix
index 98554d8..b63861f 100644
--- a/applications/ldap.nix
+++ b/applications/ldap/server.nix
@@ -10,10 +10,10 @@ Gonna use a priper nixos module for this
 
   # these are needed for teh program in question
   imports = [
-    ./acme.nix
-    ./dns.nix
-    ./nginx.nix
-    ./ldap/ldap_backend.nix
+    ../acme.nix
+    ../dns.nix
+    ../nginx.nix
+    ./backend.nix
   ];
 
 
@@ -71,7 +71,7 @@ Gonna use a priper nixos module for this
 
     # after changing teh password openldap.service has to be restarted
     age.secrets.ldap_pw = {
-      file = ../secrets/ldap/pw.age;
+      file = ../../secrets/ldap/pw.age;
       mode = "440";
       owner = "openldap";
       group = "openldap";
@@ -150,8 +150,8 @@ Gonna use a priper nixos module for this
             "${pkgs.openldap}/etc/schema/cosine.ldif"
             "${pkgs.openldap}/etc/schema/inetorgperson.ldif"
             "${pkgs.openldap}/etc/schema/nis.ldif"
-            ./ldap/openssh-lpk.ldif
-            ./ldap/skMemberOf.ldif
+            ./openssh-lpk.ldif
+            ./skMemberOf.ldif
           ];
 
 
diff --git a/machines/_base.nix b/machines/_base.nix
index a38b191..2a14cfc 100644
--- a/machines/_base.nix
+++ b/machines/_base.nix
@@ -14,7 +14,7 @@
     ../applications/dns.nix
 
     # every server needs teh ldap client for admins
-    ../applications/ldap_client.nix
+    ../applications/ldap/client.nix
 
     # every server will need the config to backup to
     ../applications/restic.nix
diff --git a/machines/kitt.nix b/machines/kitt.nix
index 7eb6bf5..00aae01 100644
--- a/machines/kitt.nix
+++ b/machines/kitt.nix
@@ -21,7 +21,7 @@ let
 
 in {
   imports = [
-    ../applications/ldap.nix
+    ../applications/ldap/server.nix
   ];
 
   deployment = {