diff --git a/roles/sugarizer/tasks/main.yml b/roles/sugarizer/tasks/main.yml
index 2c7dfe45c..13937dfa1 100644
--- a/roles/sugarizer/tasks/main.yml
+++ b/roles/sugarizer/tasks/main.yml
@@ -6,7 +6,7 @@
 
 # 1. DOWNLOAD /opt/iiab/sugarizer
 
-# July 2018: instead let's "git clone" IIAB's specified/preferred version (2 steps below)
+# July 2018: instead let's "git clone" IIAB's specified/preferred version
 #- name: D/L latest stable Sugarizer from location we control to /opt/iiab/downloads/
 #  get_url:
 #    url: "{{ iiab_download_url }}/{{ sugarizer_version }}.tar.gz"
@@ -25,14 +25,14 @@
 - name: Clone llaske/sugarizer ({{ sugarizer_git_version }}) from GitHub to /opt/iiab
   git:
     repo: https://github.com/llaske/sugarizer
-    dest: "{{ sugarizer_location }}"
+    dest: "{{ sugarizer_location }}/{{ sugarizer_version }}"
     version: "{{ sugarizer_git_version }}"
   when: internet_available
 
-- name: Move /opt/iiab/sugarizer to /opt/iiab/{{ sugarizer_version }}
-  command: mv "{{ sugarizer_location }}/sugarizer" "{{ sugarizer_location }}/{{ sugarizer_version }}"
-  args:
-    creates: "{{ sugarizer_location }}/{{ sugarizer_version }}"
+#- name: Move /opt/iiab/sugarizer to /opt/iiab/{{ sugarizer_version }}
+#  command: mv "{{ sugarizer_location }}/sugarizer" "{{ sugarizer_location }}/{{ sugarizer_version }}"
+#  args:
+#    creates: "{{ sugarizer_location }}/{{ sugarizer_version }}"
 
 - name: Create symbolic link /opt/iiab/sugarizer -> /opt/iiab/{{ sugarizer_version }}
   file:
@@ -42,7 +42,7 @@
 
 # 2. DOWNLOAD /opt/iiab/sugarizer-server
 
-# July 2018: instead let's "git clone" IIAB's specified/preferred version (2 steps below)
+# July 2018: instead let's "git clone" IIAB's specified/preferred version
 # Tarfile below was not working, as documented at:
 #    https://github.com/iiab/iiab/issues/798
 #    https://github.com/iiab/iiab/issues/814
@@ -62,14 +62,14 @@
 - name: Clone llaske/sugarizer-server ({{ sugarizer_server_git_version }}) from GitHub to /opt/iiab
   git:
     repo: https://github.com/llaske/sugarizer-server
-    dest: "{{ sugarizer_location }}"
+    dest: "{{ sugarizer_location }}/{{ sugarizer_server_version }}"
     version: "{{ sugarizer_server_git_version }}"
   when: internet_available
 
-- name: Move /opt/iiab/sugarizer-server to /opt/iiab/{{ sugarizer_server_version }}
-  command: mv "{{ sugarizer_location }}/sugarizer-server" "{{ sugarizer_location }}/{{ sugarizer_server_version }}"
-  args:
-    creates: "{{ sugarizer_location }}/{{ sugarizer_server_version }}"
+#- name: Move /opt/iiab/sugarizer-server to /opt/iiab/{{ sugarizer_server_version }}
+#  command: mv "{{ sugarizer_location }}/sugarizer-server" "{{ sugarizer_location }}/{{ sugarizer_server_version }}"
+#  args:
+#    creates: "{{ sugarizer_location }}/{{ sugarizer_server_version }}"
 
 - name: Create symbolic link /opt/iiab/sugarizer-server -> /opt/iiab/{ sugarizer_server_version }}
   file: