diff --git a/ansible-product_demos-1.0.8.tar.gz b/ansible-product_demos-1.0.8.tar.gz
new file mode 100644
index 0000000..bfe52bb
Binary files /dev/null and b/ansible-product_demos-1.0.8.tar.gz differ
diff --git a/galaxy.yml b/galaxy.yml
index 6b413bd..bdff537 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -1,7 +1,7 @@
 ---
 namespace: ansible
 name: product_demos
-version: 1.0.7
+version: 1.0.8
 readme: README.md
 
 authors:
diff --git a/roles/install_demo/tasks/main.yml b/roles/install_demo/tasks/main.yml
index f09a786..e7a954a 100644
--- a/roles/install_demo/tasks/main.yml
+++ b/roles/install_demo/tasks/main.yml
@@ -2,6 +2,7 @@
 - name: set facts from role vars
   set_fact:
     demo_list: "{{ (dict(vars|dictsort|rejectattr('0', 'match', 'ansible_')|selectattr('1.name', 'defined')|selectattr('1.workshop_type', 'defined'))|dict2items)|map(attribute='key')|list }}"
+    full_demo_info: "{{ (dict(vars|dictsort|rejectattr('0', 'match', 'ansible_')|selectattr('1.name', 'defined')|selectattr('1.workshop_type', 'defined'))|dict2items) }}"
 
 - name: provide info to terminal window
   debug:
@@ -21,7 +22,7 @@
 
 - name: install all job templates
   include_tasks: job_template_loop.yml
-  loop: "{{ dict(vars|dictsort|rejectattr('0', 'match', 'ansible_')|selectattr('1.name', 'defined'))|dict2items }}"
+  loop: "{{ full_demo_info }}"
   when: demo == "all"
 
 - name: install single job template
diff --git a/roles/install_demo/vars/main/11_developer_report.yml b/roles/install_demo/vars/main/developer/developer_report.yml
similarity index 94%
rename from roles/install_demo/vars/main/11_developer_report.yml
rename to roles/install_demo/vars/main/developer/developer_report.yml
index 2506214..addcaed 100644
--- a/roles/install_demo/vars/main/11_developer_report.yml
+++ b/roles/install_demo/vars/main/developer/developer_report.yml
@@ -2,7 +2,7 @@
 developer_report:
   author: "Sean Cavanaugh"
   category: developer
-  name: "Create Developer Report"
+  name: "SERVER / Create Developer Report"
   description: >
     'Create HTML report using
     <a href="https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#variables-discovered-from-systems-facts">Ansible facts</a>'
diff --git a/roles/install_demo/vars/main/06_debug_info.yml b/roles/install_demo/vars/main/infrastructure/debug_info.yml
similarity index 94%
rename from roles/install_demo/vars/main/06_debug_info.yml
rename to roles/install_demo/vars/main/infrastructure/debug_info.yml
index 1231bf0..e252cb5 100644
--- a/roles/install_demo/vars/main/06_debug_info.yml
+++ b/roles/install_demo/vars/main/infrastructure/debug_info.yml
@@ -2,7 +2,7 @@
 debug_info:
   author: "Will Tome"
   category: infrastructure
-  name: "SERVER / Gather Debug Info"
+  name: "INFRASTRUCTURE / Gather Debug Info"
   description: "provide info for memory and CPU usage for specified systems"
   job_type: "run"
   inventory: "Workshop Inventory"
diff --git a/roles/install_demo/vars/main/01_deploy_application.yml b/roles/install_demo/vars/main/infrastructure/deploy_application.yml
similarity index 95%
rename from roles/install_demo/vars/main/01_deploy_application.yml
rename to roles/install_demo/vars/main/infrastructure/deploy_application.yml
index a1d8ff7..83aeb28 100644
--- a/roles/install_demo/vars/main/01_deploy_application.yml
+++ b/roles/install_demo/vars/main/infrastructure/deploy_application.yml
@@ -2,7 +2,7 @@
 deploy_application:
   author: "Sean Cavanaugh"
   category: infrastructure
-  name: "Deploy Application (survey)"
+  name: "INFRASTRUCTURE / Deploy Application (survey)"
   description: "install yum applications on Linux with a survey"
   job_type: "run"
   inventory: "Workshop Inventory"
diff --git a/roles/install_demo/vars/main/05_grant_sudo.yml b/roles/install_demo/vars/main/infrastructure/grant_sudo.yml
similarity index 96%
rename from roles/install_demo/vars/main/05_grant_sudo.yml
rename to roles/install_demo/vars/main/infrastructure/grant_sudo.yml
index 851cece..dc21779 100644
--- a/roles/install_demo/vars/main/05_grant_sudo.yml
+++ b/roles/install_demo/vars/main/infrastructure/grant_sudo.yml
@@ -2,7 +2,7 @@
 grant_sudo:
   author: "Will Tome"
   category: infrastructure
-  name: "SERVER / Grant Sudo"
+  name: "INFRASTRUCTURE / Grant Sudo"
   description: "grant sudo privledges for specified time via survey"
   job_type: "run"
   inventory: "Workshop Inventory"
diff --git a/roles/install_demo/vars/main/08_insights.yml b/roles/install_demo/vars/main/infrastructure/insights.yml
similarity index 95%
rename from roles/install_demo/vars/main/08_insights.yml
rename to roles/install_demo/vars/main/infrastructure/insights.yml
index 43d9889..81dee34 100644
--- a/roles/install_demo/vars/main/08_insights.yml
+++ b/roles/install_demo/vars/main/infrastructure/insights.yml
@@ -2,7 +2,7 @@
 insights:
   author: "Sean Cavanaugh"
   category: infrastructure
-  name: "SERVER / Red Hat Insights"
+  name: "INFRASTRUCTURE / Red Hat Insights"
   description: "install and configure Red Hat Insights"
   job_type: "run"
   inventory: "Workshop Inventory"
diff --git a/roles/install_demo/vars/main/02_patching.yml b/roles/install_demo/vars/main/infrastructure/patching.yml
similarity index 95%
rename from roles/install_demo/vars/main/02_patching.yml
rename to roles/install_demo/vars/main/infrastructure/patching.yml
index 12948d3..a5ab8c4 100644
--- a/roles/install_demo/vars/main/02_patching.yml
+++ b/roles/install_demo/vars/main/infrastructure/patching.yml
@@ -2,7 +2,7 @@
 patching:
   author: "Will Tome"
   category: infrastructure
-  name: "SERVER / Patching"
+  name: "INFRASTRUCTURE / Patching"
   description: "patching for Linux servers"
   job_type: "run"
   inventory: "Workshop Inventory"
diff --git a/roles/install_demo/vars/main/04_scan_facts.yml b/roles/install_demo/vars/main/infrastructure/scan_facts.yml
similarity index 94%
rename from roles/install_demo/vars/main/04_scan_facts.yml
rename to roles/install_demo/vars/main/infrastructure/scan_facts.yml
index 64e0dad..276aa75 100644
--- a/roles/install_demo/vars/main/04_scan_facts.yml
+++ b/roles/install_demo/vars/main/infrastructure/scan_facts.yml
@@ -2,7 +2,7 @@
 fact_scan:
   author: "Will Tome"
   category: infrastructure
-  name: "SERVER / Fact Scan"
+  name: "INFRASTRUCTURE / Fact Scan"
   description: "scan facts for Linux and Windows systems"
   job_type: "run"
   inventory: "Workshop Inventory"
diff --git a/roles/install_demo/vars/main/07_security_patching.yml b/roles/install_demo/vars/main/infrastructure/security_patching.yml
similarity index 94%
rename from roles/install_demo/vars/main/07_security_patching.yml
rename to roles/install_demo/vars/main/infrastructure/security_patching.yml
index 806ee42..582d316 100644
--- a/roles/install_demo/vars/main/07_security_patching.yml
+++ b/roles/install_demo/vars/main/infrastructure/security_patching.yml
@@ -2,7 +2,7 @@
 security_patching:
   author: "Will Tome"
   category: infrastructure
-  name: "SERVER / Security Patching"
+  name: "INFRASTRUCTURE / Security Patching"
   description: "upgrade all yum packages for security related except kernel"
   job_type: "run"
   inventory: "Workshop Inventory"
diff --git a/roles/install_demo/vars/main/30_windows_iss.yml b/roles/install_demo/vars/main/infrastructure/windows_iss.yml
similarity index 93%
rename from roles/install_demo/vars/main/30_windows_iss.yml
rename to roles/install_demo/vars/main/infrastructure/windows_iss.yml
index 56ab51d..09414d6 100644
--- a/roles/install_demo/vars/main/30_windows_iss.yml
+++ b/roles/install_demo/vars/main/infrastructure/windows_iss.yml
@@ -2,7 +2,7 @@
 windows_iis:
   author: "Colin McNaughton"
   category: infrastructure
-  name: "Windows IIS Server"
+  name: "SERVER / Windows IIS Server"
   description: "install webserver on Windows Server with a survey"
   job_type: "run"
   inventory: "Workshop Inventory"
diff --git a/roles/install_demo/vars/main/20_f5_bigip_workflow.yml b/roles/install_demo/vars/main/network/f5_bigip_workflow.yml
similarity index 98%
rename from roles/install_demo/vars/main/20_f5_bigip_workflow.yml
rename to roles/install_demo/vars/main/network/f5_bigip_workflow.yml
index d72381f..74997e2 100644
--- a/roles/install_demo/vars/main/20_f5_bigip_workflow.yml
+++ b/roles/install_demo/vars/main/network/f5_bigip_workflow.yml
@@ -3,7 +3,7 @@ f5_bigip_workflow:
   workflow: true
   author: 'Sean Cavanaugh'
   category: network
-  name: 'WORKFLOW - F5 BIG-IP'
+  name: 'NETWORK / WORKFLOW - F5 BIG-IP'
   description: 'Workflow for F5 BIG-IP to setup a VIP (Virtual IP) load balancer between two RHEL webservers'
   organization: 'Default'
   workshop_type:
diff --git a/roles/install_demo/vars/main/03_hardening.yml b/roles/install_demo/vars/main/security/hardening.yml
similarity index 97%
rename from roles/install_demo/vars/main/03_hardening.yml
rename to roles/install_demo/vars/main/security/hardening.yml
index 06db684..e523546 100644
--- a/roles/install_demo/vars/main/03_hardening.yml
+++ b/roles/install_demo/vars/main/security/hardening.yml
@@ -2,7 +2,7 @@
 hardening:
   author: "Will Tome"
   category: security
-  name: "SERVER / Hardening"
+  name: "SECURITY / Hardening"
   description: "hardening for Linux servers"
   job_type: "run"
   inventory: "Workshop Inventory"
diff --git a/roles/install_demo/vars/main/10_openscap.yml b/roles/install_demo/vars/main/security/openscap.yml
similarity index 92%
rename from roles/install_demo/vars/main/10_openscap.yml
rename to roles/install_demo/vars/main/security/openscap.yml
index ad56f51..69b16da 100644
--- a/roles/install_demo/vars/main/10_openscap.yml
+++ b/roles/install_demo/vars/main/security/openscap.yml
@@ -2,7 +2,7 @@
 openscap:
   author: "Sean Cavanaugh"
   category: security
-  name: "Create Openscap Report"
+  name: "SECURITY / Create Openscap Report"
   description: "Create HTML report using SCAP Security Guide (SSG)"
   job_type: "run"
   inventory: "Workshop Inventory"