diff --git a/README.md b/README.md
index 3a06972..c5c9746 100644
--- a/README.md
+++ b/README.md
@@ -44,4 +44,10 @@ In order to use the project manager you have to execute it once
 
 ## Configure your project
 
-![](.images/configure-your-project.png)
\ No newline at end of file
+![](.images/configure-your-project.png)
+
+## Add a new Subdomain
+
+![](.images/adding-subdomain-project.png)
+
+
diff --git a/bin/commands/remove-project b/bin/commands/remove-project
index 15bbbc5..2cf0760 100644
--- a/bin/commands/remove-project
+++ b/bin/commands/remove-project
@@ -104,13 +104,24 @@ EOF
 echo
 echo "Moving files to trash"
 
+customer_dir_list="$(ls -t "$project_manager_dir/data/$customer")"
+has_more_dirs=$(if [ "${#customer_dir_list[*]}" -gt 1 ]; then echo true; else echo false; fi)
+
 rand=$(cat /proc/sys/kernel/random/uuid)
 trash_path="$project_manager_dir/.trash/$rand"
 mkdir "$trash_path"
 mkdir "$trash_path/data"
 mkdir "$trash_path/workspace"
-mv "$project_manager_dir/data/$customer" "$trash_path/data/$customer"
-mv "$workspaces_dir/$customer" "$trash_path/workspace/$customer"
+mkdir "$trash_path/data/$customer"
+mkdir "$trash_path/workspace/$customer"
+mv "$project_manager_dir/data/$customer/$project" "$trash_path/data/$customer/$project"
+mv "$workspaces_dir/$customer/$project" "$trash_path/workspace/$customer/$project"
+
+if [ "$has_more_dirs" == false ]
+then
+  rmdir "$project_manager_dir/data/$customer"
+  rmdir "$workspaces_dir/$customer"
+fi
 
 echo
 echoSubTitle "Running postscripts ..."