diff --git a/configs/fstab b/contrib/fstab
similarity index 100%
rename from configs/fstab
rename to contrib/fstab
diff --git a/configs/sshd_config b/contrib/sshd_config
similarity index 99%
rename from configs/sshd_config
rename to contrib/sshd_config
index e433ce4..a2fc460 100644
--- a/configs/sshd_config
+++ b/contrib/sshd_config
@@ -3,7 +3,7 @@
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
 
-Port 2222
+Port 22
 #AddressFamily any
 #ListenAddress 0.0.0.0
 #ListenAddress ::
diff --git a/scripts/config.sh b/scripts/config.sh
index 506e9b4..103142a 100644
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -5,6 +5,8 @@ source "$GENTOO_INSTALL_REPO_DIR/scripts/internal_config.sh" || exit 1
 ################################################
 # Disk configuration
 
+# TODO us layout maybe config
+# TODO better explanation for normal password
 # This function will be called when the key for a luks device is needed.
 # Parameters:
 #	$1 will be the id of the luks device as given in `create_luks new_id=<id> ...`.
diff --git a/scripts/main.sh b/scripts/main.sh
index cb5f01a..2e06cc6 100755
--- a/scripts/main.sh
+++ b/scripts/main.sh
@@ -133,7 +133,7 @@ configure_portage() {
 
 install_sshd() {
 	einfo "Installing sshd"
-	install -m0600 -o root -g root "$GENTOO_INSTALL_REPO_DIR/configs/sshd_config" /etc/ssh/sshd_config \
+	install -m0600 -o root -g root "$GENTOO_INSTALL_REPO_DIR/contrib/sshd_config" /etc/ssh/sshd_config \
 		|| die "Could not install /etc/ssh/sshd_config"
 	enable_service sshd
 	groupadd -r sshusers \
@@ -259,7 +259,7 @@ add_fstab_entry() {
 
 generate_fstab() {
 	einfo "Generating fstab"
-	install -m0644 -o root -g root "$GENTOO_INSTALL_REPO_DIR/configs/fstab" /etc/fstab \
+	install -m0644 -o root -g root "$GENTOO_INSTALL_REPO_DIR/contrib/fstab" /etc/fstab \
 		|| die "Could not overwrite /etc/fstab"
 	add_fstab_entry "UUID=$(get_blkid_uuid_for_id "$DISK_ID_ROOT")" "/" "$DISK_ID_ROOT_TYPE" "$DISK_ID_ROOT_MOUNT_OPTS" "0 1"
 	if [[ $IS_EFI == "true" ]]; then