diff --git a/keys/bennofs.asc b/keys/pgp/bennofs.asc
similarity index 100%
rename from keys/bennofs.asc
rename to keys/pgp/bennofs.asc
diff --git a/keys/feliix42.asc b/keys/pgp/feliix42.asc
similarity index 100%
rename from keys/feliix42.asc
rename to keys/pgp/feliix42.asc
diff --git a/keys/tassilo.asc b/keys/pgp/tassilo.asc
similarity index 100%
rename from keys/tassilo.asc
rename to keys/pgp/tassilo.asc
diff --git a/modules/keys/jannusch b/keys/ssh/jannusch
similarity index 100%
rename from modules/keys/jannusch
rename to keys/ssh/jannusch
diff --git a/modules/keys/jannusch-arch b/keys/ssh/jannusch-arch
similarity index 100%
rename from modules/keys/jannusch-arch
rename to keys/ssh/jannusch-arch
diff --git a/modules/keys/jonasga b/keys/ssh/jonasga
similarity index 100%
rename from modules/keys/jonasga
rename to keys/ssh/jonasga
diff --git a/modules/keys/marcus-sapphire b/keys/ssh/marcus-sapphire
similarity index 100%
rename from modules/keys/marcus-sapphire
rename to keys/ssh/marcus-sapphire
diff --git a/modules/keys/schrader b/keys/ssh/schrader
similarity index 100%
rename from modules/keys/schrader
rename to keys/ssh/schrader
diff --git a/modules/keys/sebastian b/keys/ssh/sebastian
similarity index 100%
rename from modules/keys/sebastian
rename to keys/ssh/sebastian
diff --git a/modules/keys/tassilo b/keys/ssh/tassilo
similarity index 100%
rename from modules/keys/tassilo
rename to keys/ssh/tassilo
diff --git a/modules/base.nix b/modules/base.nix
index bd98178..b8fde65 100755
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -29,12 +29,12 @@
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAmb1kv+7HU1QKE53+gNxUhrggbwomC40Xjxd9hACkoo bennofs@d-cube"
     ];
     keyFiles = [
-      ./keys/marcus-sapphire
-      ./keys/schrader
-      ./keys/jannusch
-      ./keys/jannusch-arch
-      ./keys/tassilo
-      ./keys/jonasga
+      ../keys/ssh/marcus-sapphire
+      ../keys/ssh/schrader
+      ../keys/ssh/jannusch
+      ../keys/ssh/jannusch-arch
+      ../keys/ssh/tassilo
+      ../keys/ssh/jonasga
     ];
   };
 
diff --git a/modules/hedgedoc.nix b/modules/hedgedoc.nix
index a5db8e0..501b0d9 100644
--- a/modules/hedgedoc.nix
+++ b/modules/hedgedoc.nix
@@ -44,7 +44,7 @@ in
           enableACME = true;
           forceSSL = true;
           locations."/" = {
-            proxyPass = "http://127.0.0.1:3002";
+            proxyPass = "http://127.0.0.1:${toString config.services.hedgedoc.configuration.port}";
             proxyWebsockets = true;
           };
         };