diff --git a/dotfiles/.config/conky/conky.service b/dotfiles/.config/conky/conky.service
new file mode 100644
index 00000000..6cf5d5dc
--- /dev/null
+++ b/dotfiles/.config/conky/conky.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Conky Setup
+
+[Service]
+ExecStart=/home/csa/.config/conky/conky.sh
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dotfiles/.config/conky/conky.sh b/dotfiles/.config/conky/conky.sh
new file mode 100644
index 00000000..a166f565
--- /dev/null
+++ b/dotfiles/.config/conky/conky.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+while true
+do
+  running=$(ps -a | grep conky | wc -l)
+  if [ $running -lt 3 ];
+  then
+    echo "Starting..."
+    conky -c ~/.config/conky/main.conf &
+  fi
+  sleep 10
+done
diff --git a/Ubuntu-Server/Scripts/install-docker.sh b/systems/Ubuntu-Server/Scripts/install-docker.sh
similarity index 100%
rename from Ubuntu-Server/Scripts/install-docker.sh
rename to systems/Ubuntu-Server/Scripts/install-docker.sh
diff --git a/archDaily/001deploy.sh b/systems/archDaily/001deploy.sh
similarity index 94%
rename from archDaily/001deploy.sh
rename to systems/archDaily/001deploy.sh
index 1e1ddc97..4aa18c93 100644
--- a/archDaily/001deploy.sh
+++ b/systems/archDaily/001deploy.sh
@@ -17,12 +17,15 @@ echo ":: Enter disk to be used "
 echo ":: Eg: /dev/vda"
 read disk
 
-echo "Enter hostname "
+echo "New Hostname? "
 echo "Eg: bsa200arch"
 read newhostname
-echo "Enter domain "
+echo "Local Domain?"
 echo "Eg: local"
 read newdomain
+echo "Main User?"
+echo "Eg: csa"
+read newuserid
 
 #echo "set a password for root "
 #passwd
diff --git a/archDaily/002installBasics.sh b/systems/archDaily/002installBasics.sh
similarity index 50%
rename from archDaily/002installBasics.sh
rename to systems/archDaily/002installBasics.sh
index 1ff0e556..ad8d4b0c 100644
--- a/archDaily/002installBasics.sh
+++ b/systems/archDaily/002installBasics.sh
@@ -3,4 +3,8 @@
 arch-chroot /mnt pacman -Sy curl \
                             htop \
                             tmux \
+                            xfce4 \
+                            xfwm4 \
+                            xfce4-panel \
+                            xfce4-terminal \
                             --noconfirm -q
diff --git a/archDaily/fdisk_cmds b/systems/archDaily/fdisk_cmds
similarity index 100%
rename from archDaily/fdisk_cmds
rename to systems/archDaily/fdisk_cmds
diff --git a/curiosity/README.md b/systems/curiosity/README.md
similarity index 100%
rename from curiosity/README.md
rename to systems/curiosity/README.md
diff --git a/curiosity/docker-user/.ssh/authorized_keys-sample b/systems/curiosity/docker-user/.ssh/authorized_keys-sample
similarity index 100%
rename from curiosity/docker-user/.ssh/authorized_keys-sample
rename to systems/curiosity/docker-user/.ssh/authorized_keys-sample
diff --git a/curiosity/docker-user/backupOpportunity.sh b/systems/curiosity/docker-user/backupOpportunity.sh
similarity index 100%
rename from curiosity/docker-user/backupOpportunity.sh
rename to systems/curiosity/docker-user/backupOpportunity.sh
diff --git a/curiosity/docker-user/backupRotation.sh b/systems/curiosity/docker-user/backupRotation.sh
similarity index 100%
rename from curiosity/docker-user/backupRotation.sh
rename to systems/curiosity/docker-user/backupRotation.sh
diff --git a/curiosity/docker-user/compose/.env-fireflyiii-sample b/systems/curiosity/docker-user/compose/.env-fireflyiii-sample
similarity index 100%
rename from curiosity/docker-user/compose/.env-fireflyiii-sample
rename to systems/curiosity/docker-user/compose/.env-fireflyiii-sample
diff --git a/curiosity/docker-user/compose/.env-sample b/systems/curiosity/docker-user/compose/.env-sample
similarity index 100%
rename from curiosity/docker-user/compose/.env-sample
rename to systems/curiosity/docker-user/compose/.env-sample
diff --git a/curiosity/docker-user/compose/create-storage.sh b/systems/curiosity/docker-user/compose/create-storage.sh
similarity index 100%
rename from curiosity/docker-user/compose/create-storage.sh
rename to systems/curiosity/docker-user/compose/create-storage.sh
diff --git a/curiosity/docker-user/compose/heimdal.yml b/systems/curiosity/docker-user/compose/heimdal.yml
similarity index 100%
rename from curiosity/docker-user/compose/heimdal.yml
rename to systems/curiosity/docker-user/compose/heimdal.yml
diff --git a/curiosity/docker-user/config.sh-sample b/systems/curiosity/docker-user/config.sh-sample
similarity index 100%
rename from curiosity/docker-user/config.sh-sample
rename to systems/curiosity/docker-user/config.sh-sample
diff --git a/curiosity/rsync/.ssh/config-sample b/systems/curiosity/rsync/.ssh/config-sample
similarity index 100%
rename from curiosity/rsync/.ssh/config-sample
rename to systems/curiosity/rsync/.ssh/config-sample
diff --git a/curiosity/rsync/config.sh-sample b/systems/curiosity/rsync/config.sh-sample
similarity index 100%
rename from curiosity/rsync/config.sh-sample
rename to systems/curiosity/rsync/config.sh-sample
diff --git a/curiosity/rsync/syncFromOpportunity.sh b/systems/curiosity/rsync/syncFromOpportunity.sh
similarity index 100%
rename from curiosity/rsync/syncFromOpportunity.sh
rename to systems/curiosity/rsync/syncFromOpportunity.sh
diff --git a/xubuntuDaily/ansible/README.md b/systems/xubuntuDaily/ansible/README.md
similarity index 100%
rename from xubuntuDaily/ansible/README.md
rename to systems/xubuntuDaily/ansible/README.md
diff --git a/xubuntuDaily/ansible/ansible.cfg b/systems/xubuntuDaily/ansible/ansible.cfg
similarity index 100%
rename from xubuntuDaily/ansible/ansible.cfg
rename to systems/xubuntuDaily/ansible/ansible.cfg
diff --git a/xubuntuDaily/ansible/deploy.yml b/systems/xubuntuDaily/ansible/deploy.yml
similarity index 100%
rename from xubuntuDaily/ansible/deploy.yml
rename to systems/xubuntuDaily/ansible/deploy.yml
diff --git a/xubuntuDaily/bash/001deploy.sh b/systems/xubuntuDaily/bash/001deploy.sh
similarity index 100%
rename from xubuntuDaily/bash/001deploy.sh
rename to systems/xubuntuDaily/bash/001deploy.sh
diff --git a/xubuntuDaily/bash/002extras.sh b/systems/xubuntuDaily/bash/002extras.sh
similarity index 100%
rename from xubuntuDaily/bash/002extras.sh
rename to systems/xubuntuDaily/bash/002extras.sh
diff --git a/xubuntuDaily/bash/010update.sh b/systems/xubuntuDaily/bash/010update.sh
similarity index 100%
rename from xubuntuDaily/bash/010update.sh
rename to systems/xubuntuDaily/bash/010update.sh
diff --git a/xubuntuDaily/bash/README.md b/systems/xubuntuDaily/bash/README.md
similarity index 100%
rename from xubuntuDaily/bash/README.md
rename to systems/xubuntuDaily/bash/README.md
diff --git a/xubuntuDaily/bash/clearLogs.sh b/systems/xubuntuDaily/bash/clearLogs.sh
similarity index 100%
rename from xubuntuDaily/bash/clearLogs.sh
rename to systems/xubuntuDaily/bash/clearLogs.sh
diff --git a/xubuntuDaily/screenshots/AtomFullScreen.png b/systems/xubuntuDaily/screenshots/AtomFullScreen.png
similarity index 100%
rename from xubuntuDaily/screenshots/AtomFullScreen.png
rename to systems/xubuntuDaily/screenshots/AtomFullScreen.png