diff --git a/local.yml b/local.yml
index 746ec6e..2f68fb9 100644
--- a/local.yml
+++ b/local.yml
@@ -45,22 +45,22 @@
 
   tasks:
     # Set up any systems that do not come with Desktop Environments
-    - include: tasks/freebsd/software/gui.yml
+    - include: tasks/workstation/freebsd/software/gui.yml
       when: ansible_system == "FreeBSD"
 
     # Additional tasks to configure systems with Desktop Environments
-    - include: tasks/linux/software/flatpaks.yml
+    - include: tasks/workstation/linux/software/flatpaks.yml
       when: ansible_system == "Linux" and flatpak_distro
 
     - name: Workstation | Linux | Packages | Not Implemented
       shell: echo "Not implemented yet. :("
       when: ansible_system == "Linux" and not flatpak_distro
 
-    - include: tasks/linux/cron/ansible.yml
+    - include: tasks/workstation/linux/cron/ansible.yml
       when: ansible_system == "Linux"
   
   post_tasks:
-    - include: tasks/general/software/gnome.yml
+    - include: tasks/workstation/settings/gnome.yml
 
 
 # Create reports to analyze security.
diff --git a/tasks/miner/cpu/xmr.yml b/tasks/miner/cpu/xmr.yml
new file mode 100644
index 0000000..24b1282
--- /dev/null
+++ b/tasks/miner/cpu/xmr.yml
@@ -0,0 +1,2 @@
+---
+# Mine monero with CPUs!
diff --git a/tasks/miner/gpu/eth.yml b/tasks/miner/gpu/eth.yml
new file mode 100644
index 0000000..8c34fd3
--- /dev/null
+++ b/tasks/miner/gpu/eth.yml
@@ -0,0 +1,2 @@
+---
+# Mine Ethereum with GPU!
diff --git a/tasks/freebsd/cron/ansible.yml b/tasks/workstation/freebsd/cron/ansible.yml
similarity index 100%
rename from tasks/freebsd/cron/ansible.yml
rename to tasks/workstation/freebsd/cron/ansible.yml
diff --git a/tasks/freebsd/software/gui.yml b/tasks/workstation/freebsd/software/gui.yml
similarity index 100%
rename from tasks/freebsd/software/gui.yml
rename to tasks/workstation/freebsd/software/gui.yml
diff --git a/tasks/linux/cron/ansible.yml b/tasks/workstation/linux/cron/ansible.yml
similarity index 100%
rename from tasks/linux/cron/ansible.yml
rename to tasks/workstation/linux/cron/ansible.yml
diff --git a/tasks/linux/software/flatpaks.yml b/tasks/workstation/linux/software/flatpaks.yml
similarity index 100%
rename from tasks/linux/software/flatpaks.yml
rename to tasks/workstation/linux/software/flatpaks.yml
diff --git a/tasks/general/software/gnome.yml b/tasks/workstation/settings/gnome.yml
similarity index 100%
rename from tasks/general/software/gnome.yml
rename to tasks/workstation/settings/gnome.yml