diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 65ebad7b8..5f338df62 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -303,11 +303,11 @@ let
     };
     users = addNames {
       lass = {
-        pubkey = readFile ../../Zpubkeys/lass.ssh.pub;
+        pubkey = readFile ../Zpubkeys/lass.ssh.pub;
         mail = "lass@mors.retiolum";
       };
       uriel = {
-        pubkey = readFile ../../Zpubkeys/uriel.ssh.pub;
+        pubkey = readFile ../Zpubkeys/uriel.ssh.pub;
         mail = "lass@uriel.retiolum";
       };
     };
@@ -514,7 +514,7 @@ let
     users = addNames {
       makefu = {
         mail = "makefu@pornocauster.retiolum";
-        pubkey = readFile ../../Zpubkeys/makefu_arch.ssh.pub;
+        pubkey = readFile ../Zpubkeys/makefu_arch.ssh.pub;
       };
     };
   };
@@ -685,11 +685,11 @@ let
     users = addNames {
       mv = {
         mail = "mv@cd.retiolum";
-        pubkey = readFile ../../Zpubkeys/mv_vod.ssh.pub;
+        pubkey = readFile ../Zpubkeys/mv_vod.ssh.pub;
       };
       tv = {
         mail = "tv@wu.retiolum";
-        pubkey = readFile ../../Zpubkeys/tv_wu.ssh.pub;
+        pubkey = readFile ../Zpubkeys/tv_wu.ssh.pub;
       };
     };
   };
diff --git a/krebs/3modules/retiolum.nix b/krebs/3modules/retiolum.nix
index 481d6565c..4e70b78aa 100644
--- a/krebs/3modules/retiolum.nix
+++ b/krebs/3modules/retiolum.nix
@@ -58,7 +58,7 @@ let
 
     hosts = mkOption {
       type = with types; either package path;
-      default = ../../Zhosts;
+      default = ../Zhosts;
       description = ''
         If a path is given, then it will be used to generate an ad-hoc package.
       '';
diff --git a/Zhosts/Styx b/krebs/Zhosts/Styx
similarity index 100%
rename from Zhosts/Styx
rename to krebs/Zhosts/Styx
diff --git a/Zhosts/ThinkArmageddon b/krebs/Zhosts/ThinkArmageddon
similarity index 100%
rename from Zhosts/ThinkArmageddon
rename to krebs/Zhosts/ThinkArmageddon
diff --git a/Zhosts/TriBot b/krebs/Zhosts/TriBot
similarity index 100%
rename from Zhosts/TriBot
rename to krebs/Zhosts/TriBot
diff --git a/Zhosts/ach b/krebs/Zhosts/ach
similarity index 100%
rename from Zhosts/ach
rename to krebs/Zhosts/ach
diff --git a/Zhosts/air b/krebs/Zhosts/air
similarity index 100%
rename from Zhosts/air
rename to krebs/Zhosts/air
diff --git a/Zhosts/alarmpi b/krebs/Zhosts/alarmpi
similarity index 100%
rename from Zhosts/alarmpi
rename to krebs/Zhosts/alarmpi
diff --git a/Zhosts/albi10 b/krebs/Zhosts/albi10
similarity index 100%
rename from Zhosts/albi10
rename to krebs/Zhosts/albi10
diff --git a/Zhosts/albi7 b/krebs/Zhosts/albi7
similarity index 100%
rename from Zhosts/albi7
rename to krebs/Zhosts/albi7
diff --git a/Zhosts/almoehi b/krebs/Zhosts/almoehi
similarity index 100%
rename from Zhosts/almoehi
rename to krebs/Zhosts/almoehi
diff --git a/Zhosts/alphalabs b/krebs/Zhosts/alphalabs
similarity index 100%
rename from Zhosts/alphalabs
rename to krebs/Zhosts/alphalabs
diff --git a/Zhosts/apfull b/krebs/Zhosts/apfull
similarity index 100%
rename from Zhosts/apfull
rename to krebs/Zhosts/apfull
diff --git a/Zhosts/bitchctl b/krebs/Zhosts/bitchctl
similarity index 100%
rename from Zhosts/bitchctl
rename to krebs/Zhosts/bitchctl
diff --git a/Zhosts/bitchextend b/krebs/Zhosts/bitchextend
similarity index 100%
rename from Zhosts/bitchextend
rename to krebs/Zhosts/bitchextend
diff --git a/Zhosts/bitchtop b/krebs/Zhosts/bitchtop
similarity index 100%
rename from Zhosts/bitchtop
rename to krebs/Zhosts/bitchtop
diff --git a/Zhosts/box b/krebs/Zhosts/box
similarity index 100%
rename from Zhosts/box
rename to krebs/Zhosts/box
diff --git a/Zhosts/bridge b/krebs/Zhosts/bridge
similarity index 100%
rename from Zhosts/bridge
rename to krebs/Zhosts/bridge
diff --git a/Zhosts/c2ft b/krebs/Zhosts/c2ft
similarity index 100%
rename from Zhosts/c2ft
rename to krebs/Zhosts/c2ft
diff --git a/Zhosts/c2fthome b/krebs/Zhosts/c2fthome
similarity index 100%
rename from Zhosts/c2fthome
rename to krebs/Zhosts/c2fthome
diff --git a/Zhosts/casino b/krebs/Zhosts/casino
similarity index 100%
rename from Zhosts/casino
rename to krebs/Zhosts/casino
diff --git a/Zhosts/cat1 b/krebs/Zhosts/cat1
similarity index 100%
rename from Zhosts/cat1
rename to krebs/Zhosts/cat1
diff --git a/Zhosts/cband b/krebs/Zhosts/cband
similarity index 100%
rename from Zhosts/cband
rename to krebs/Zhosts/cband
diff --git a/Zhosts/cd b/krebs/Zhosts/cd
similarity index 100%
rename from Zhosts/cd
rename to krebs/Zhosts/cd
diff --git a/Zhosts/cloudkrebs b/krebs/Zhosts/cloudkrebs
similarity index 100%
rename from Zhosts/cloudkrebs
rename to krebs/Zhosts/cloudkrebs
diff --git a/Zhosts/darth b/krebs/Zhosts/darth
similarity index 100%
rename from Zhosts/darth
rename to krebs/Zhosts/darth
diff --git a/Zhosts/dei b/krebs/Zhosts/dei
similarity index 100%
rename from Zhosts/dei
rename to krebs/Zhosts/dei
diff --git a/Zhosts/destroy b/krebs/Zhosts/destroy
similarity index 100%
rename from Zhosts/destroy
rename to krebs/Zhosts/destroy
diff --git a/Zhosts/devstar b/krebs/Zhosts/devstar
similarity index 100%
rename from Zhosts/devstar
rename to krebs/Zhosts/devstar
diff --git a/Zhosts/eigenserv b/krebs/Zhosts/eigenserv
similarity index 100%
rename from Zhosts/eigenserv
rename to krebs/Zhosts/eigenserv
diff --git a/Zhosts/elvis b/krebs/Zhosts/elvis
similarity index 100%
rename from Zhosts/elvis
rename to krebs/Zhosts/elvis
diff --git a/Zhosts/eulerwalk b/krebs/Zhosts/eulerwalk
similarity index 100%
rename from Zhosts/eulerwalk
rename to krebs/Zhosts/eulerwalk
diff --git a/Zhosts/exile b/krebs/Zhosts/exile
similarity index 100%
rename from Zhosts/exile
rename to krebs/Zhosts/exile
diff --git a/Zhosts/exitium_mobilis b/krebs/Zhosts/exitium_mobilis
similarity index 100%
rename from Zhosts/exitium_mobilis
rename to krebs/Zhosts/exitium_mobilis
diff --git a/Zhosts/falk b/krebs/Zhosts/falk
similarity index 100%
rename from Zhosts/falk
rename to krebs/Zhosts/falk
diff --git a/Zhosts/fastpoke b/krebs/Zhosts/fastpoke
similarity index 100%
rename from Zhosts/fastpoke
rename to krebs/Zhosts/fastpoke
diff --git a/Zhosts/filebitch b/krebs/Zhosts/filebitch
similarity index 100%
rename from Zhosts/filebitch
rename to krebs/Zhosts/filebitch
diff --git a/Zhosts/filepimp b/krebs/Zhosts/filepimp
similarity index 100%
rename from Zhosts/filepimp
rename to krebs/Zhosts/filepimp
diff --git a/Zhosts/flap b/krebs/Zhosts/flap
similarity index 100%
rename from Zhosts/flap
rename to krebs/Zhosts/flap
diff --git a/Zhosts/foobar b/krebs/Zhosts/foobar
similarity index 100%
rename from Zhosts/foobar
rename to krebs/Zhosts/foobar
diff --git a/Zhosts/fuerkrebs b/krebs/Zhosts/fuerkrebs
similarity index 100%
rename from Zhosts/fuerkrebs
rename to krebs/Zhosts/fuerkrebs
diff --git a/Zhosts/go b/krebs/Zhosts/go
similarity index 100%
rename from Zhosts/go
rename to krebs/Zhosts/go
diff --git a/Zhosts/gum b/krebs/Zhosts/gum
similarity index 100%
rename from Zhosts/gum
rename to krebs/Zhosts/gum
diff --git a/Zhosts/heidi b/krebs/Zhosts/heidi
similarity index 100%
rename from Zhosts/heidi
rename to krebs/Zhosts/heidi
diff --git a/Zhosts/horisa b/krebs/Zhosts/horisa
similarity index 100%
rename from Zhosts/horisa
rename to krebs/Zhosts/horisa
diff --git a/Zhosts/horreum_magnus b/krebs/Zhosts/horreum_magnus
similarity index 100%
rename from Zhosts/horreum_magnus
rename to krebs/Zhosts/horreum_magnus
diff --git a/Zhosts/incept b/krebs/Zhosts/incept
similarity index 100%
rename from Zhosts/incept
rename to krebs/Zhosts/incept
diff --git a/Zhosts/ire b/krebs/Zhosts/ire
similarity index 100%
rename from Zhosts/ire
rename to krebs/Zhosts/ire
diff --git a/Zhosts/ire2 b/krebs/Zhosts/ire2
similarity index 100%
rename from Zhosts/ire2
rename to krebs/Zhosts/ire2
diff --git a/Zhosts/irkel b/krebs/Zhosts/irkel
similarity index 100%
rename from Zhosts/irkel
rename to krebs/Zhosts/irkel
diff --git a/Zhosts/juhulian b/krebs/Zhosts/juhulian
similarity index 100%
rename from Zhosts/juhulian
rename to krebs/Zhosts/juhulian
diff --git a/Zhosts/k2 b/krebs/Zhosts/k2
similarity index 100%
rename from Zhosts/k2
rename to krebs/Zhosts/k2
diff --git a/Zhosts/kabinett b/krebs/Zhosts/kabinett
similarity index 100%
rename from Zhosts/kabinett
rename to krebs/Zhosts/kabinett
diff --git a/Zhosts/kaepsele b/krebs/Zhosts/kaepsele
similarity index 100%
rename from Zhosts/kaepsele
rename to krebs/Zhosts/kaepsele
diff --git a/Zhosts/kalle b/krebs/Zhosts/kalle
similarity index 100%
rename from Zhosts/kalle
rename to krebs/Zhosts/kalle
diff --git a/Zhosts/karthus b/krebs/Zhosts/karthus
similarity index 100%
rename from Zhosts/karthus
rename to krebs/Zhosts/karthus
diff --git a/Zhosts/khackplug b/krebs/Zhosts/khackplug
similarity index 100%
rename from Zhosts/khackplug
rename to krebs/Zhosts/khackplug
diff --git a/Zhosts/kheurop b/krebs/Zhosts/kheurop
similarity index 100%
rename from Zhosts/kheurop
rename to krebs/Zhosts/kheurop
diff --git a/Zhosts/kiosk b/krebs/Zhosts/kiosk
similarity index 100%
rename from Zhosts/kiosk
rename to krebs/Zhosts/kiosk
diff --git a/Zhosts/krebsplug b/krebs/Zhosts/krebsplug
similarity index 100%
rename from Zhosts/krebsplug
rename to krebs/Zhosts/krebsplug
diff --git a/Zhosts/kvasir b/krebs/Zhosts/kvasir
similarity index 100%
rename from Zhosts/kvasir
rename to krebs/Zhosts/kvasir
diff --git a/Zhosts/laqueus b/krebs/Zhosts/laqueus
similarity index 100%
rename from Zhosts/laqueus
rename to krebs/Zhosts/laqueus
diff --git a/Zhosts/linuxatom b/krebs/Zhosts/linuxatom
similarity index 100%
rename from Zhosts/linuxatom
rename to krebs/Zhosts/linuxatom
diff --git a/Zhosts/luminos b/krebs/Zhosts/luminos
similarity index 100%
rename from Zhosts/luminos
rename to krebs/Zhosts/luminos
diff --git a/Zhosts/machine b/krebs/Zhosts/machine
similarity index 100%
rename from Zhosts/machine
rename to krebs/Zhosts/machine
diff --git a/Zhosts/makalu b/krebs/Zhosts/makalu
similarity index 100%
rename from Zhosts/makalu
rename to krebs/Zhosts/makalu
diff --git a/Zhosts/mako b/krebs/Zhosts/mako
similarity index 100%
rename from Zhosts/mako
rename to krebs/Zhosts/mako
diff --git a/Zhosts/miefda0 b/krebs/Zhosts/miefda0
similarity index 100%
rename from Zhosts/miefda0
rename to krebs/Zhosts/miefda0
diff --git a/Zhosts/minikrebs b/krebs/Zhosts/minikrebs
similarity index 100%
rename from Zhosts/minikrebs
rename to krebs/Zhosts/minikrebs
diff --git a/Zhosts/mkdir b/krebs/Zhosts/mkdir
similarity index 100%
rename from Zhosts/mkdir
rename to krebs/Zhosts/mkdir
diff --git a/Zhosts/monitor b/krebs/Zhosts/monitor
similarity index 100%
rename from Zhosts/monitor
rename to krebs/Zhosts/monitor
diff --git a/Zhosts/mors b/krebs/Zhosts/mors
similarity index 100%
rename from Zhosts/mors
rename to krebs/Zhosts/mors
diff --git a/Zhosts/motor b/krebs/Zhosts/motor
similarity index 100%
rename from Zhosts/motor
rename to krebs/Zhosts/motor
diff --git a/Zhosts/mu b/krebs/Zhosts/mu
similarity index 100%
rename from Zhosts/mu
rename to krebs/Zhosts/mu
diff --git a/Zhosts/muhbaasu b/krebs/Zhosts/muhbaasu
similarity index 100%
rename from Zhosts/muhbaasu
rename to krebs/Zhosts/muhbaasu
diff --git a/Zhosts/nomic b/krebs/Zhosts/nomic
similarity index 100%
rename from Zhosts/nomic
rename to krebs/Zhosts/nomic
diff --git a/Zhosts/nomic2 b/krebs/Zhosts/nomic2
similarity index 100%
rename from Zhosts/nomic2
rename to krebs/Zhosts/nomic2
diff --git a/Zhosts/nukular b/krebs/Zhosts/nukular
similarity index 100%
rename from Zhosts/nukular
rename to krebs/Zhosts/nukular
diff --git a/Zhosts/omo b/krebs/Zhosts/omo
similarity index 100%
rename from Zhosts/omo
rename to krebs/Zhosts/omo
diff --git a/Zhosts/pic b/krebs/Zhosts/pic
similarity index 100%
rename from Zhosts/pic
rename to krebs/Zhosts/pic
diff --git a/Zhosts/pigstarter b/krebs/Zhosts/pigstarter
similarity index 100%
rename from Zhosts/pigstarter
rename to krebs/Zhosts/pigstarter
diff --git a/Zhosts/pike b/krebs/Zhosts/pike
similarity index 100%
rename from Zhosts/pike
rename to krebs/Zhosts/pike
diff --git a/Zhosts/pnp b/krebs/Zhosts/pnp
similarity index 100%
rename from Zhosts/pnp
rename to krebs/Zhosts/pnp
diff --git a/Zhosts/pornocauster b/krebs/Zhosts/pornocauster
similarity index 100%
rename from Zhosts/pornocauster
rename to krebs/Zhosts/pornocauster
diff --git a/Zhosts/radiotuxmini b/krebs/Zhosts/radiotuxmini
similarity index 100%
rename from Zhosts/radiotuxmini
rename to krebs/Zhosts/radiotuxmini
diff --git a/Zhosts/random b/krebs/Zhosts/random
similarity index 100%
rename from Zhosts/random
rename to krebs/Zhosts/random
diff --git a/Zhosts/raspafari b/krebs/Zhosts/raspafari
similarity index 100%
rename from Zhosts/raspafari
rename to krebs/Zhosts/raspafari
diff --git a/Zhosts/reimae b/krebs/Zhosts/reimae
similarity index 100%
rename from Zhosts/reimae
rename to krebs/Zhosts/reimae
diff --git a/Zhosts/rmdir b/krebs/Zhosts/rmdir
similarity index 100%
rename from Zhosts/rmdir
rename to krebs/Zhosts/rmdir
diff --git a/Zhosts/robchina b/krebs/Zhosts/robchina
similarity index 100%
rename from Zhosts/robchina
rename to krebs/Zhosts/robchina
diff --git a/Zhosts/rockit b/krebs/Zhosts/rockit
similarity index 100%
rename from Zhosts/rockit
rename to krebs/Zhosts/rockit
diff --git a/Zhosts/rtjure_debian_oder_so b/krebs/Zhosts/rtjure_debian_oder_so
similarity index 100%
rename from Zhosts/rtjure_debian_oder_so
rename to krebs/Zhosts/rtjure_debian_oder_so
diff --git a/Zhosts/rtjure_ras b/krebs/Zhosts/rtjure_ras
similarity index 100%
rename from Zhosts/rtjure_ras
rename to krebs/Zhosts/rtjure_ras
diff --git a/Zhosts/rtjure_rdrlab_linkstation b/krebs/Zhosts/rtjure_rdrlab_linkstation
similarity index 100%
rename from Zhosts/rtjure_rdrlab_linkstation
rename to krebs/Zhosts/rtjure_rdrlab_linkstation
diff --git a/Zhosts/rubus b/krebs/Zhosts/rubus
similarity index 100%
rename from Zhosts/rubus
rename to krebs/Zhosts/rubus
diff --git a/Zhosts/senderechner b/krebs/Zhosts/senderechner
similarity index 100%
rename from Zhosts/senderechner
rename to krebs/Zhosts/senderechner
diff --git a/Zhosts/serenity b/krebs/Zhosts/serenity
similarity index 100%
rename from Zhosts/serenity
rename to krebs/Zhosts/serenity
diff --git a/Zhosts/seruundroid b/krebs/Zhosts/seruundroid
similarity index 100%
rename from Zhosts/seruundroid
rename to krebs/Zhosts/seruundroid
diff --git a/Zhosts/sir_krebs_a_lot b/krebs/Zhosts/sir_krebs_a_lot
similarity index 100%
rename from Zhosts/sir_krebs_a_lot
rename to krebs/Zhosts/sir_krebs_a_lot
diff --git a/Zhosts/skirfir b/krebs/Zhosts/skirfir
similarity index 100%
rename from Zhosts/skirfir
rename to krebs/Zhosts/skirfir
diff --git a/Zhosts/sleipnir b/krebs/Zhosts/sleipnir
similarity index 100%
rename from Zhosts/sleipnir
rename to krebs/Zhosts/sleipnir
diff --git a/Zhosts/smove b/krebs/Zhosts/smove
similarity index 100%
rename from Zhosts/smove
rename to krebs/Zhosts/smove
diff --git a/Zhosts/sokrates b/krebs/Zhosts/sokrates
similarity index 100%
rename from Zhosts/sokrates
rename to krebs/Zhosts/sokrates
diff --git a/Zhosts/sokrateslaptop b/krebs/Zhosts/sokrateslaptop
similarity index 100%
rename from Zhosts/sokrateslaptop
rename to krebs/Zhosts/sokrateslaptop
diff --git a/Zhosts/soundflower b/krebs/Zhosts/soundflower
similarity index 100%
rename from Zhosts/soundflower
rename to krebs/Zhosts/soundflower
diff --git a/Zhosts/steve b/krebs/Zhosts/steve
similarity index 100%
rename from Zhosts/steve
rename to krebs/Zhosts/steve
diff --git a/Zhosts/tahoe b/krebs/Zhosts/tahoe
similarity index 100%
rename from Zhosts/tahoe
rename to krebs/Zhosts/tahoe
diff --git a/Zhosts/taschenkrebs b/krebs/Zhosts/taschenkrebs
similarity index 100%
rename from Zhosts/taschenkrebs
rename to krebs/Zhosts/taschenkrebs
diff --git a/Zhosts/terrapi b/krebs/Zhosts/terrapi
similarity index 100%
rename from Zhosts/terrapi
rename to krebs/Zhosts/terrapi
diff --git a/Zhosts/thomasDOTde b/krebs/Zhosts/thomasDOTde
similarity index 100%
rename from Zhosts/thomasDOTde
rename to krebs/Zhosts/thomasDOTde
diff --git a/Zhosts/tincdroid b/krebs/Zhosts/tincdroid
similarity index 100%
rename from Zhosts/tincdroid
rename to krebs/Zhosts/tincdroid
diff --git a/Zhosts/tmpd b/krebs/Zhosts/tmpd
similarity index 100%
rename from Zhosts/tmpd
rename to krebs/Zhosts/tmpd
diff --git a/Zhosts/tpsw b/krebs/Zhosts/tpsw
similarity index 100%
rename from Zhosts/tpsw
rename to krebs/Zhosts/tpsw
diff --git a/Zhosts/tsp b/krebs/Zhosts/tsp
similarity index 100%
rename from Zhosts/tsp
rename to krebs/Zhosts/tsp
diff --git a/Zhosts/ufo b/krebs/Zhosts/ufo
similarity index 100%
rename from Zhosts/ufo
rename to krebs/Zhosts/ufo
diff --git a/Zhosts/uriel b/krebs/Zhosts/uriel
similarity index 100%
rename from Zhosts/uriel
rename to krebs/Zhosts/uriel
diff --git a/Zhosts/vault b/krebs/Zhosts/vault
similarity index 100%
rename from Zhosts/vault
rename to krebs/Zhosts/vault
diff --git a/Zhosts/voyager b/krebs/Zhosts/voyager
similarity index 100%
rename from Zhosts/voyager
rename to krebs/Zhosts/voyager
diff --git a/Zhosts/wooktop b/krebs/Zhosts/wooktop
similarity index 100%
rename from Zhosts/wooktop
rename to krebs/Zhosts/wooktop
diff --git a/Zhosts/wu b/krebs/Zhosts/wu
similarity index 100%
rename from Zhosts/wu
rename to krebs/Zhosts/wu
diff --git a/Zhosts/ytart b/krebs/Zhosts/ytart
similarity index 100%
rename from Zhosts/ytart
rename to krebs/Zhosts/ytart
diff --git a/Zhosts/zombiecancer b/krebs/Zhosts/zombiecancer
similarity index 100%
rename from Zhosts/zombiecancer
rename to krebs/Zhosts/zombiecancer
diff --git a/Zpubkeys/deploy_wu.ssh.pub b/krebs/Zpubkeys/deploy_wu.ssh.pub
similarity index 100%
rename from Zpubkeys/deploy_wu.ssh.pub
rename to krebs/Zpubkeys/deploy_wu.ssh.pub
diff --git a/Zpubkeys/lass.ssh.pub b/krebs/Zpubkeys/lass.ssh.pub
similarity index 100%
rename from Zpubkeys/lass.ssh.pub
rename to krebs/Zpubkeys/lass.ssh.pub
diff --git a/Zpubkeys/makefu_arch.ssh.pub b/krebs/Zpubkeys/makefu_arch.ssh.pub
similarity index 100%
rename from Zpubkeys/makefu_arch.ssh.pub
rename to krebs/Zpubkeys/makefu_arch.ssh.pub
diff --git a/Zpubkeys/makefu_omo.ssh.pub b/krebs/Zpubkeys/makefu_omo.ssh.pub
similarity index 100%
rename from Zpubkeys/makefu_omo.ssh.pub
rename to krebs/Zpubkeys/makefu_omo.ssh.pub
diff --git a/Zpubkeys/makefu_tsp.ssh.pub b/krebs/Zpubkeys/makefu_tsp.ssh.pub
similarity index 100%
rename from Zpubkeys/makefu_tsp.ssh.pub
rename to krebs/Zpubkeys/makefu_tsp.ssh.pub
diff --git a/Zpubkeys/mv_vod.ssh.pub b/krebs/Zpubkeys/mv_vod.ssh.pub
similarity index 100%
rename from Zpubkeys/mv_vod.ssh.pub
rename to krebs/Zpubkeys/mv_vod.ssh.pub
diff --git a/Zpubkeys/tv_wu.ssh.pub b/krebs/Zpubkeys/tv_wu.ssh.pub
similarity index 100%
rename from Zpubkeys/tv_wu.ssh.pub
rename to krebs/Zpubkeys/tv_wu.ssh.pub
diff --git a/Zpubkeys/uriel.ssh.pub b/krebs/Zpubkeys/uriel.ssh.pub
similarity index 100%
rename from Zpubkeys/uriel.ssh.pub
rename to krebs/Zpubkeys/uriel.ssh.pub
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 0049387be..03c375b9b 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -31,7 +31,7 @@ with lib;
       imports = [ ../2configs/charybdis.nix ];
       tv.charybdis = {
         enable = true;
-        sslCert = ../../Zcerts/charybdis_cd.crt.pem;
+        sslCert = ../Zcerts/charybdis_cd.crt.pem;
       };
     }
     {
diff --git a/Zcerts/charybdis_cd.crt.pem b/tv/Zcerts/charybdis_cd.crt.pem
similarity index 100%
rename from Zcerts/charybdis_cd.crt.pem
rename to tv/Zcerts/charybdis_cd.crt.pem