diff --git a/scripts/base.sh b/scripts/base.sh
index 4a55239..d682cbf 100644
--- a/scripts/base.sh
+++ b/scripts/base.sh
@@ -12,6 +12,7 @@ DATA_PATH="$DECRYPTED_PATH/data";
 BACKUP_PATH="$DECRYPTED_PATH/backup";
 TEMPLATE_PATH="$REPOSITORY_PATH/templates";
 LOCAL_REPOSITORIES_PATH="$HOME/Documents/repositories";
+
 declare -a BACKUP_LIST=("$HOME/.ssh/" \
   "$HOME/.gitconfig" \
   "$HOME/.atom/config.cson" \
diff --git a/scripts/system-setup.sh b/scripts/client/setup.sh
similarity index 100%
rename from scripts/system-setup.sh
rename to scripts/client/setup.sh
diff --git a/scripts/backup.sh b/scripts/data/data-backup.sh
similarity index 100%
rename from scripts/backup.sh
rename to scripts/data/data-backup.sh
diff --git a/scripts/export-data-to-system.sh b/scripts/data/export-to-system.sh
similarity index 100%
rename from scripts/export-data-to-system.sh
rename to scripts/data/export-to-system.sh
diff --git a/scripts/import-data-from-system.sh b/scripts/data/import-from-system.sh
similarity index 100%
rename from scripts/import-data-from-system.sh
rename to scripts/data/import-from-system.sh
diff --git a/scripts/lock.sh b/scripts/encryption/lock.sh
similarity index 100%
rename from scripts/lock.sh
rename to scripts/encryption/lock.sh
diff --git a/scripts/unlock.sh b/scripts/encryption/unlock.sh
similarity index 100%
rename from scripts/unlock.sh
rename to scripts/encryption/unlock.sh
diff --git a/scripts/sd_backup.sh b/scripts/image/backup.sh
similarity index 100%
rename from scripts/sd_backup.sh
rename to scripts/image/backup.sh
diff --git a/scripts/chroot-to-pi.sh b/scripts/image/chroot-to-pi.sh
similarity index 100%
rename from scripts/chroot-to-pi.sh
rename to scripts/image/chroot-to-pi.sh
diff --git a/scripts/sd_setup.sh b/scripts/image/create.sh
similarity index 100%
rename from scripts/sd_setup.sh
rename to scripts/image/create.sh
diff --git a/scripts/pull-local-repositories.sh b/scripts/repositories/pull.sh
similarity index 100%
rename from scripts/pull-local-repositories.sh
rename to scripts/repositories/pull.sh
diff --git a/scripts/push-local-repositories.sh b/scripts/repositories/push.sh
similarity index 100%
rename from scripts/push-local-repositories.sh
rename to scripts/repositories/push.sh