diff --git a/overlay/etc/passwd b/overlay/etc/passwd
index 4449afa..29b4d0c 100644
--- a/overlay/etc/passwd
+++ b/overlay/etc/passwd
@@ -12,7 +12,6 @@ haldaemon:x:68:68:hald:/:/bin/sh
 dbus:x:81:81:dbus:/var/run/dbus:/bin/sh
 ftp:x:83:83:ftp:/home/ftp:/bin/sh
 nobody:x:99:99:nobody:/home:/bin/sh
-sshd:x:103:99:Operator:/var:/bin/sh
 default:x:1000:1000:Default non-root user:/home/default:/bin/sh
 matthias:x:1001:100:Matthias Blankertz:/home/matthias:/bin/bash
 pan:x:1002:100:Jan Olbrich:/home/pan:/bin/bash
diff --git a/overlay/etc/ssh_host_dsa_key b/overlay/etc/ssh/ssh_host_dsa_key
similarity index 100%
rename from overlay/etc/ssh_host_dsa_key
rename to overlay/etc/ssh/ssh_host_dsa_key
diff --git a/overlay/etc/ssh_host_dsa_key.pub b/overlay/etc/ssh/ssh_host_dsa_key.pub
similarity index 100%
rename from overlay/etc/ssh_host_dsa_key.pub
rename to overlay/etc/ssh/ssh_host_dsa_key.pub
diff --git a/overlay/etc/ssh_host_ecdsa_key b/overlay/etc/ssh/ssh_host_ecdsa_key
similarity index 100%
rename from overlay/etc/ssh_host_ecdsa_key
rename to overlay/etc/ssh/ssh_host_ecdsa_key
diff --git a/overlay/etc/ssh_host_ecdsa_key.pub b/overlay/etc/ssh/ssh_host_ecdsa_key.pub
similarity index 100%
rename from overlay/etc/ssh_host_ecdsa_key.pub
rename to overlay/etc/ssh/ssh_host_ecdsa_key.pub
diff --git a/overlay/etc/ssh_host_ed25519_key b/overlay/etc/ssh/ssh_host_ed25519_key
similarity index 100%
rename from overlay/etc/ssh_host_ed25519_key
rename to overlay/etc/ssh/ssh_host_ed25519_key
diff --git a/overlay/etc/ssh_host_ed25519_key.pub b/overlay/etc/ssh/ssh_host_ed25519_key.pub
similarity index 100%
rename from overlay/etc/ssh_host_ed25519_key.pub
rename to overlay/etc/ssh/ssh_host_ed25519_key.pub
diff --git a/overlay/etc/ssh_host_key b/overlay/etc/ssh/ssh_host_key
similarity index 100%
rename from overlay/etc/ssh_host_key
rename to overlay/etc/ssh/ssh_host_key
diff --git a/overlay/etc/ssh_host_key.pub b/overlay/etc/ssh/ssh_host_key.pub
similarity index 100%
rename from overlay/etc/ssh_host_key.pub
rename to overlay/etc/ssh/ssh_host_key.pub
diff --git a/overlay/etc/ssh_host_rsa_key b/overlay/etc/ssh/ssh_host_rsa_key
similarity index 100%
rename from overlay/etc/ssh_host_rsa_key
rename to overlay/etc/ssh/ssh_host_rsa_key
diff --git a/overlay/etc/ssh_host_rsa_key.pub b/overlay/etc/ssh/ssh_host_rsa_key.pub
similarity index 100%
rename from overlay/etc/ssh_host_rsa_key.pub
rename to overlay/etc/ssh/ssh_host_rsa_key.pub