diff --git a/Misc/.config/i3/config b/Desktop/Home/.config/i3/config
similarity index 100%
rename from Misc/.config/i3/config
rename to Desktop/Home/.config/i3/config
diff --git a/Misc/.config/i3status/config b/Desktop/Home/.config/i3status/config
similarity index 100%
rename from Misc/.config/i3status/config
rename to Desktop/Home/.config/i3status/config
diff --git a/Install.sh b/Install.sh
new file mode 100755
index 0000000..c093c43
--- /dev/null
+++ b/Install.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+cd "$( dirname "$( realpath "$0" )" )"
+
+CopyCfg() {
+	for Type in "" "."
+	do
+		#[ "$(whoami)" = "root" ] && cp -r $1/Root/$Type* /
+		#cp -r $1/Home/$Type* ~/
+		[ "$(whoami)" = "root" ] && [ -d "$1/Root" ] && cp $(find "$1/Root" -maxdepth 1 -mindepth 1 -name "$Type*") /
+		[ -d "$1/Home" ] && cp $(find "$1/Home" -maxdepth 1 -mindepth 1 -name "$Type*") ~/
+	done
+}
+
+Cur="$1"
+while [ ! -z "$Cur" ]
+do
+	if [ -d "$Cur" ]
+	then
+		echo "$Cur"
+		CopyCfg "$Cur"
+	fi
+	shift > /dev/null 2>&1 || Cur=""
+	Cur="$1"
+done
diff --git a/Makefile b/Makefile
deleted file mode 100644
index e69de29..0000000
diff --git a/Misc/.bashrc.part b/Misc/Home/.bashrc.part
similarity index 100%
rename from Misc/.bashrc.part
rename to Misc/Home/.bashrc.part
diff --git a/Misc/.config/micro/settings.json b/Misc/Home/.config/micro/settings.json
similarity index 100%
rename from Misc/.config/micro/settings.json
rename to Misc/Home/.config/micro/settings.json
diff --git a/Misc/.dotfiles/aliasrc b/Misc/Home/.dotfiles/aliasrc
similarity index 100%
rename from Misc/.dotfiles/aliasrc
rename to Misc/Home/.dotfiles/aliasrc
diff --git a/Misc/.dotfiles/exportrc b/Misc/Home/.dotfiles/exportrc
similarity index 100%
rename from Misc/.dotfiles/exportrc
rename to Misc/Home/.dotfiles/exportrc
diff --git a/Misc/.dotfiles/functrc b/Misc/Home/.dotfiles/functrc
similarity index 100%
rename from Misc/.dotfiles/functrc
rename to Misc/Home/.dotfiles/functrc
diff --git a/Misc/.tmux.conf b/Misc/Home/.tmux.conf
similarity index 100%
rename from Misc/.tmux.conf
rename to Misc/Home/.tmux.conf
diff --git a/Server/.Repo.Update.sh b/Server/.Repo.Update.sh
deleted file mode 100755
index f0a351e..0000000
--- a/Server/.Repo.Update.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-cd "$( dirname "$( realpath "$0" )" )"
-
-cp -v /etc/diycron ./diycron
-cp -v /Server/Scripts/Backup/*.sh ./Scripts/Backup/
-cp -v /Server/Scripts/Backup/*.cfg ./Scripts/Backup/
-# nginx was done manually
diff --git a/Server/Repo.Update.sh b/Server/Repo.Update.sh
new file mode 100755
index 0000000..60028a6
--- /dev/null
+++ b/Server/Repo.Update.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+cd "$( dirname "$( realpath "$0" )" )"
+cd ./Root
+
+cp -v /etc/diycron ./etc/diycron
+# nginx was done manually
+
+cp -v /Server/Scripts/Backup/*.sh ./Server/Scripts/Backup/
+cp -v /Server/Scripts/Backup/*.cfg ./Server/Scripts/Backup/
diff --git a/Server/Scripts/Backup/BackupGlobals.cfg b/Server/Root/Server/Scripts/Backup/BackupGlobals.cfg
similarity index 100%
rename from Server/Scripts/Backup/BackupGlobals.cfg
rename to Server/Root/Server/Scripts/Backup/BackupGlobals.cfg
diff --git a/Server/Scripts/Backup/CloudBackup.sh b/Server/Root/Server/Scripts/Backup/CloudBackup.sh
similarity index 100%
rename from Server/Scripts/Backup/CloudBackup.sh
rename to Server/Root/Server/Scripts/Backup/CloudBackup.sh
diff --git a/Server/Scripts/Backup/ExternalDataBackup.sh b/Server/Root/Server/Scripts/Backup/ExternalDataBackup.sh
similarity index 100%
rename from Server/Scripts/Backup/ExternalDataBackup.sh
rename to Server/Root/Server/Scripts/Backup/ExternalDataBackup.sh
diff --git a/Server/Scripts/Backup/ServerDataBackup.sh b/Server/Root/Server/Scripts/Backup/ServerDataBackup.sh
similarity index 100%
rename from Server/Scripts/Backup/ServerDataBackup.sh
rename to Server/Root/Server/Scripts/Backup/ServerDataBackup.sh
diff --git a/Server/diycron b/Server/Root/etc/diycron
similarity index 100%
rename from Server/diycron
rename to Server/Root/etc/diycron
diff --git a/Server/nginx/sites-available/articles b/Server/Root/etc/nginx/sites-available/articles
similarity index 100%
rename from Server/nginx/sites-available/articles
rename to Server/Root/etc/nginx/sites-available/articles
diff --git a/Server/nginx/sites-available/epic.octt.eu.org.conf b/Server/Root/etc/nginx/sites-available/epic.octt.eu.org.conf
similarity index 100%
rename from Server/nginx/sites-available/epic.octt.eu.org.conf
rename to Server/Root/etc/nginx/sites-available/epic.octt.eu.org.conf
diff --git a/Server/nginx/sites-available/feeds b/Server/Root/etc/nginx/sites-available/feeds
similarity index 100%
rename from Server/nginx/sites-available/feeds
rename to Server/Root/etc/nginx/sites-available/feeds
diff --git a/Server/nginx/sites-available/godo.octt.eu.org.conf b/Server/Root/etc/nginx/sites-available/godo.octt.eu.org.conf
similarity index 100%
rename from Server/nginx/sites-available/godo.octt.eu.org.conf
rename to Server/Root/etc/nginx/sites-available/godo.octt.eu.org.conf
diff --git a/Server/nginx/sites-available/librex b/Server/Root/etc/nginx/sites-available/librex
similarity index 100%
rename from Server/nginx/sites-available/librex
rename to Server/Root/etc/nginx/sites-available/librex
diff --git a/Server/nginx/sites-available/miss.octt.eu.org.conf b/Server/Root/etc/nginx/sites-available/miss.octt.eu.org.conf
similarity index 100%
rename from Server/nginx/sites-available/miss.octt.eu.org.conf
rename to Server/Root/etc/nginx/sites-available/miss.octt.eu.org.conf
diff --git a/Server/nginx/sites-available/root b/Server/Root/etc/nginx/sites-available/root
similarity index 100%
rename from Server/nginx/sites-available/root
rename to Server/Root/etc/nginx/sites-available/root
diff --git a/Tests/Home/.Configs.Test b/Tests/Home/.Configs.Test
new file mode 100644
index 0000000..2a02d41
--- /dev/null
+++ b/Tests/Home/.Configs.Test
@@ -0,0 +1 @@
+TEST
diff --git a/Tests/Root/.Configs.Test b/Tests/Root/.Configs.Test
new file mode 100644
index 0000000..2a02d41
--- /dev/null
+++ b/Tests/Root/.Configs.Test
@@ -0,0 +1 @@
+TEST