diff --git a/sys/fabian.pub b/pki/fabian.pub
similarity index 100%
rename from sys/fabian.pub
rename to pki/fabian.pub
diff --git a/sys/srv/gatekeeper_ca.pem b/pki/gatekeeper_ca.pem
similarity index 100%
rename from sys/srv/gatekeeper_ca.pem
rename to pki/gatekeeper_ca.pem
diff --git a/sys/default.nix b/sys/default.nix
index ab1d182..ff416ed 100644
--- a/sys/default.nix
+++ b/sys/default.nix
@@ -57,7 +57,7 @@ with lib;
       group = "fabian";
       shell = pkgs.zsh;
       extraGroups = [ "users" "wheel" "networkmanager" "dialout" "libvirtd" ];
-      openssh.authorizedKeys.keyFiles = [ ./fabian.pub ];
+      openssh.authorizedKeys.keyFiles = [ "${flakes.self}/pki/fabian.pub" ];
     };
     groups.fabian.gid = 1000;
   };
diff --git a/sys/home/lib/cli.nix b/sys/home/cli.nix
similarity index 93%
rename from sys/home/lib/cli.nix
rename to sys/home/cli.nix
index e57942a..b44cdbd 100644
--- a/sys/home/lib/cli.nix
+++ b/sys/home/cli.nix
@@ -9,7 +9,7 @@ with lib;
     git = {
       enable = true;
       userEmail = "fabian@posixlycorrect.com";
-      userName = "fabianmv";
+      userName = "fabian";
     };
     neovim.enable = true;
   };
diff --git a/sys/home/default.nix b/sys/home/default.nix
index 3e21063..df9a4bb 100644
--- a/sys/home/default.nix
+++ b/sys/home/default.nix
@@ -3,7 +3,7 @@ with lib;
 {
 
   imports = [
-    ./lib
+    ./cli.nix
   ];
 
   home = {
diff --git a/sys/home/lib/default.nix b/sys/home/lib/default.nix
deleted file mode 100644
index 200e1cd..0000000
--- a/sys/home/lib/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./cli.nix
-  ];
-}
diff --git a/sys/srv/lib/bepasty.nix b/sys/srv/bepasty.nix
similarity index 100%
rename from sys/srv/lib/bepasty.nix
rename to sys/srv/bepasty.nix
diff --git a/sys/srv/default.nix b/sys/srv/default.nix
index c3d905a..84d22e7 100644
--- a/sys/srv/default.nix
+++ b/sys/srv/default.nix
@@ -2,6 +2,15 @@
 with lib;
 {
   imports = [
-    ./lib
+    ./net.nix
+    ./mediawiki.nix
+    ./jitsi.nix
+    ./matrix.nix
+    ./forgejo.nix
+    ./vaultwarden.nix
+    ./bepasty.nix
+    ./jellyfin.nix
+    ./msmtp.nix
+    ./kuma.nix
   ];
 }
diff --git a/sys/srv/lib/forgejo.nix b/sys/srv/forgejo.nix
similarity index 100%
rename from sys/srv/lib/forgejo.nix
rename to sys/srv/forgejo.nix
diff --git a/sys/srv/lib/jellyfin.nix b/sys/srv/jellyfin.nix
similarity index 100%
rename from sys/srv/lib/jellyfin.nix
rename to sys/srv/jellyfin.nix
diff --git a/sys/srv/lib/jitsi.nix b/sys/srv/jitsi.nix
similarity index 89%
rename from sys/srv/lib/jitsi.nix
rename to sys/srv/jitsi.nix
index db756b1..8a1b5ac 100644
--- a/sys/srv/lib/jitsi.nix
+++ b/sys/srv/jitsi.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, pkgs, flakes, ... }:
 with lib;
 {
 
@@ -14,8 +14,7 @@ with lib;
         
             ssl_verify_depth 1;
             ssl_verify_client on;
-            ssl_client_certificate ${../gatekeeper_ca.pem};
-
+            ssl_client_certificate ${flakes.self}/pki/gatekeeper_ca.pem;
             if ($ssl_client_verify != "SUCCESS") {
               return 403;
             }
diff --git a/sys/srv/lib/kuma.nix b/sys/srv/kuma.nix
similarity index 100%
rename from sys/srv/lib/kuma.nix
rename to sys/srv/kuma.nix
diff --git a/sys/srv/lib/default.nix b/sys/srv/lib/default.nix
deleted file mode 100644
index 6fce58d..0000000
--- a/sys/srv/lib/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  imports = [
-    ./net.nix
-    ./mediawiki.nix
-    ./jitsi.nix
-    ./matrix.nix
-    ./forgejo.nix
-    ./vaultwarden.nix
-    ./bepasty.nix
-    ./jellyfin.nix
-    ./msmtp.nix
-    ./kuma.nix
-  ];
-}
diff --git a/sys/srv/lib/matrix.nix b/sys/srv/matrix.nix
similarity index 100%
rename from sys/srv/lib/matrix.nix
rename to sys/srv/matrix.nix
diff --git a/sys/srv/lib/mediawiki.nix b/sys/srv/mediawiki.nix
similarity index 100%
rename from sys/srv/lib/mediawiki.nix
rename to sys/srv/mediawiki.nix
diff --git a/sys/srv/lib/msmtp.nix b/sys/srv/msmtp.nix
similarity index 100%
rename from sys/srv/lib/msmtp.nix
rename to sys/srv/msmtp.nix
diff --git a/sys/srv/lib/net.nix b/sys/srv/net.nix
similarity index 100%
rename from sys/srv/lib/net.nix
rename to sys/srv/net.nix
diff --git a/sys/srv/lib/vaultwarden.nix b/sys/srv/vaultwarden.nix
similarity index 100%
rename from sys/srv/lib/vaultwarden.nix
rename to sys/srv/vaultwarden.nix