diff --git a/ansible/roles/tsg-os-provision/files/provision_config_sample_files/provision.yml.sample.7400MCN0P01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01
similarity index 100%
rename from ansible/roles/tsg-os-provision/files/provision_config_sample_files/provision.yml.sample.7400MCN0P01R01
rename to ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01
diff --git a/ansible/roles/tsg-os-provision/files/provision_config_sample_files/provision.yml.sample.7400MCN123P01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN123P01R01
similarity index 100%
rename from ansible/roles/tsg-os-provision/files/provision_config_sample_files/provision.yml.sample.7400MCN123P01R01
rename to ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN123P01R01
diff --git a/ansible/roles/tsg-os-provision/files/provision_config_sample_files/provision.yml.sample.9000NPBP01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01
similarity index 100%
rename from ansible/roles/tsg-os-provision/files/provision_config_sample_files/provision.yml.sample.9000NPBP01R01
rename to ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01
diff --git a/ansible/roles/tsg-os-provision/files/tsg-os-provision-convertor.service b/ansible/roles/tsg-os-provision/files/service/tsg-os-provision-convertor.service
similarity index 100%
rename from ansible/roles/tsg-os-provision/files/tsg-os-provision-convertor.service
rename to ansible/roles/tsg-os-provision/files/service/tsg-os-provision-convertor.service
diff --git a/ansible/roles/tsg-os-provision/files/tsg-os-provision.service b/ansible/roles/tsg-os-provision/files/service/tsg-os-provision.service
similarity index 100%
rename from ansible/roles/tsg-os-provision/files/tsg-os-provision.service
rename to ansible/roles/tsg-os-provision/files/service/tsg-os-provision.service
diff --git a/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN0P01R01 b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN0P01R01
similarity index 100%
rename from ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN0P01R01
rename to ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN0P01R01
diff --git a/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN123P01R01 b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN123P01R01
similarity index 100%
rename from ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.7400MCN123P01R01
rename to ansible/roles/tsg-os-provision/files/tasks/provision.yml.7400MCN123P01R01
diff --git a/ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.9000NPBP01R01 b/ansible/roles/tsg-os-provision/files/tasks/provision.yml.9000NPBP01R01
similarity index 100%
rename from ansible/roles/tsg-os-provision/files/provision_tasks_files/provision.yml.9000NPBP01R01
rename to ansible/roles/tsg-os-provision/files/tasks/provision.yml.9000NPBP01R01
diff --git a/ansible/roles/tsg-os-provision/tasks/main.yml b/ansible/roles/tsg-os-provision/tasks/main.yml
index 56ed4991..4dbad285 100644
--- a/ansible/roles/tsg-os-provision/tasks/main.yml
+++ b/ansible/roles/tsg-os-provision/tasks/main.yml
@@ -6,55 +6,55 @@
 
 - name: "tsg-os-provision: copy tasks file that excutes provision to dest  - tsg9140"
   copy:
-    src: "{{ role_path }}/files/provision_tasks_files/provision.yml.9000NPBP01R01"
+    src: "{{ role_path }}/files/tasks/provision.yml.9000NPBP01R01"
     dest: /opt/tsg/tsg-os-provision/tasks/provision.yml
     mode: 0644
   when: PROFILE_ID == '9000-NPB-P01R01'
 
 - name: "tsg-os-provision: copy tasks file that excutes provision to dest - tsg7400 mcn0"
   copy:
-    src: "{{ role_path }}/files/provision_tasks_files/provision.yml.7400MCN0P01R01"
+    src: "{{ role_path }}/files/tasks/provision.yml.7400MCN0P01R01"
     dest: /opt/tsg/tsg-os-provision/tasks/provision.yml
     mode: 0644
   when: PROFILE_ID == '7400-MCN0-P01R01'
 
 - name: "tsg-os-provision: copy tasks file that excutes provision to dest - tsg7400 mcn1 mcn2 mcn3"
   copy:
-    src: "{{ role_path }}/files/provision_tasks_files/provision.yml.7400MCN123P01R01"
+    src: "{{ role_path }}/files/tasks/provision.yml.7400MCN123P01R01"
     dest: /opt/tsg/tsg-os-provision/tasks/provision.yml
     mode: 0644
   when: PROFILE_ID == '7400-MCN123-P01R01'
 
 - name: "tsg-os-provision: copy provision.yml.sample file to dest - tsg9140"
   copy:
-    src: "{{ role_path }}/files/provision_config_sample_files/provision.yml.sample.9000NPBP01R01"
+    src: "{{ role_path }}/files/config_sample/provision.yml.sample.9000NPBP01R01"
     dest: /opt/tsg/tsg-os-provision/provision.yml.sample
     mode: 0644
   when: PROFILE_ID == '9000-NPB-P01R01'
 
 - name: "tsg-os-provision: copy provision.yml.sample to dest - tsg7400 mcn0"
   copy:
-    src: "{{ role_path }}/files/provision_config_sample_files/provision.yml.sample.7400MCN0P01R01"
+    src: "{{ role_path }}/files/config_sample/provision.yml.sample.7400MCN0P01R01"
     dest: /opt/tsg/tsg-os-provision/provision.yml.sample
     mode: 0644
   when: PROFILE_ID == '7400-MCN0-P01R01'
 
 - name: "tsg-os-provision: copy provision.yml.sample to dest - tsg7400 mcn1 mcn2 mcn3"
   copy:
-    src: "{{ role_path }}/files/provision_config_sample_files/provision.yml.sample.7400MCN123P01R01"
+    src: "{{ role_path }}/files/config_sample/provision.yml.sample.7400MCN123P01R01"
     dest: /opt/tsg/tsg-os-provision/provision.yml.sample
     mode: 0644
   when: PROFILE_ID == '7400-MCN123-P01R01'
 
 - name: "tsg-os-provision: copy tsg-os-provision-convertor.service file to dest"
   copy:
-    src: "{{ role_path }}/files/tsg-os-provision-convertor.service"
+    src: "{{ role_path }}/files/service/tsg-os-provision-convertor.service"
     dest: /usr/lib/systemd/system/tsg-os-provision-convertor.service
     mode: 0644
 
 - name: "tsg-os-provision: copy tsg-os-provision.service file to dest"
   copy:
-    src: "{{ role_path }}/files/tsg-os-provision.service"
+    src: "{{ role_path }}/files/service/tsg-os-provision.service"
     dest: /usr/lib/systemd/system/tsg-os-provision.service
     mode: 0644