diff --git a/scripts/export-data-to-system.sh b/scripts/export-data-to-system.sh
index d27630b..b9bf25a 100644
--- a/scripts/export-data-to-system.sh
+++ b/scripts/export-data-to-system.sh
@@ -1,2 +1,4 @@
 #!/bin/bash
-bash ./import-data-from-system.sh reverse
+# Executes the import script in reverse mode
+# @author Kevin Veen-Birkenbach [aka. Frantz]
+bash "$(dirname "$(readlink -f "${0}")")/import-data-from-system.sh" reverse
diff --git a/scripts/import-data-from-system.sh b/scripts/import-data-from-system.sh
index 89f048a..db69f32 100644
--- a/scripts/import-data-from-system.sh
+++ b/scripts/import-data-from-system.sh
@@ -2,8 +2,8 @@
 # Imports data from the system
 # @author Kevin Veen-Birkenbach [aka. Frantz]
 # @param $1 If the first parameter is "reverse" the data will be exported to the system
-DATA_FOLDER="./data";
-BACKUP_LIST=("$HOME/.gitconfig");
+DATA_FOLDER="$(dirname "$(readlink -f "${0}")")/../data";
+BACKUP_LIST=("$HOME/.ssh/") #,"$HOME/.gitconfig");
 for system_item_path in "${BACKUP_LIST[@]}";
 do
     data_item_path="$DATA_FOLDER$BACKUP_LIST"
@@ -15,7 +15,7 @@ do
         source="$system_item_path"
         destination="$data_item_path"
     fi
-    echo "Data will be copied from $source to $destination..."
+    echo "Trying to copy data from $source to $destination..."
     if [ -f "$destination" ]
       then
         echo "The destination file allready exists!";
@@ -24,5 +24,17 @@ do
     fi
     destination_dir=$(dirname $destination)
     mkdir -p "$destination_dir"
-    cp -vi "$source" "$destination"
+    if [ -f "$source" ]
+      then
+        echo "Copy data from $source to $destination..."
+        cp -vi "$source" "$destination"
+      else
+        if [ -d "$source" ]
+        then
+          echo "Copy data from directory $source to directory $destination_dir..."
+          cp -vir "$source" "$destination_dir"
+        else
+          echo "$source doesn't exist. Copying data is not possible."
+      fi
+    fi
 done
diff --git a/scripts/system-setup.sh b/scripts/system-setup.sh
index 240032c..6f84ece 100644
--- a/scripts/system-setup.sh
+++ b/scripts/system-setup.sh
@@ -8,6 +8,17 @@ echo "Synchronizing programing languages..."
 sudo pacman --needed -S jdk11-openjdk python php
 echo "Synchronizing administration tools..."
 sudo pacman --needed -S htop tree git base-devel yay make gcc cmake
+ssh_key_path="$HOME/.ssh/id_rsa"
+if [ ! -f "$ssh_key_path" ]; then
+	echo "SSH key $ssh_key_path doesn't exists!"
+	if [ ! -f "./data$ssh_key_path" ]; then
+		echo "Importing ssh key from data..."
+		bash ./scripts/export-data-to-system.sh
+	else
+		echo "Generating ssh key"
+		ssh-keygen -t rsa -b 4096 -C "$USER@$HOSTNAME"
+	fi
+fi
 echo "Synchronizing gui tools..."
 sudo pacman --needed -S gnome-shell-extensions
 echo "Install NASA picture of the day GNOME extension..."