diff --git a/playbookconfig/centos/build_srpm.data b/playbookconfig/centos/build_srpm.data
index a9e6da284..2a099a15f 100644
--- a/playbookconfig/centos/build_srpm.data
+++ b/playbookconfig/centos/build_srpm.data
@@ -1,2 +1,2 @@
-SRC_DIR="playbookconfig"
-TIS_PATCH_VER=3
+SRC_DIR="src"
+TIS_PATCH_VER=4
diff --git a/playbookconfig/playbookconfig/LICENSE b/playbookconfig/src/LICENSE
similarity index 100%
rename from playbookconfig/playbookconfig/LICENSE
rename to playbookconfig/src/LICENSE
diff --git a/playbookconfig/playbookconfig/Makefile b/playbookconfig/src/Makefile
similarity index 100%
rename from playbookconfig/playbookconfig/Makefile
rename to playbookconfig/src/Makefile
diff --git a/playbookconfig/playbookconfig/playbooks/ansible.cfg b/playbookconfig/src/playbooks/ansible.cfg
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/ansible.cfg
rename to playbookconfig/src/playbooks/ansible.cfg
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/bootstrap.yml b/playbookconfig/src/playbooks/bootstrap/bootstrap.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/bootstrap.yml
rename to playbookconfig/src/playbooks/bootstrap/bootstrap.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/host_vars/default.yml b/playbookconfig/src/playbooks/bootstrap/host_vars/default.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/host_vars/default.yml
rename to playbookconfig/src/playbooks/bootstrap/host_vars/default.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/apply-bootstrap-manifest/defaults/main.yml b/playbookconfig/src/playbooks/bootstrap/roles/apply-bootstrap-manifest/defaults/main.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/apply-bootstrap-manifest/defaults/main.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/apply-bootstrap-manifest/defaults/main.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/apply-bootstrap-manifest/tasks/main.yml b/playbookconfig/src/playbooks/bootstrap/roles/apply-bootstrap-manifest/tasks/main.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/apply-bootstrap-manifest/tasks/main.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/apply-bootstrap-manifest/tasks/main.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/tasks/bringup_flock_services.yml b/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/bringup_flock_services.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/tasks/bringup_flock_services.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/bringup_flock_services.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/tasks/bringup_helm.yml b/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/bringup_helm.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/tasks/bringup_helm.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/bringup_helm.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/tasks/bringup_kubemaster.yml b/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/bringup_kubemaster.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/tasks/bringup_kubemaster.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/bringup_kubemaster.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/tasks/load_images_from_archive.yml b/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/load_images_from_archive.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/tasks/load_images_from_archive.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/load_images_from_archive.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/tasks/main.yml b/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/main.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/tasks/main.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/main.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/tasks/refresh_local_dns.yml b/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/refresh_local_dns.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/tasks/refresh_local_dns.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/refresh_local_dns.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/tasks/setup_registry_certificate_and_keys.yml b/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/setup_registry_certificate_and_keys.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/tasks/setup_registry_certificate_and_keys.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/setup_registry_certificate_and_keys.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/templates/calico-cni.yaml.j2 b/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/templates/calico-cni.yaml.j2
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/templates/calico-cni.yaml.j2
rename to playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/templates/calico-cni.yaml.j2
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/templates/kubelet.conf.j2 b/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/templates/kubelet.conf.j2
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/templates/kubelet.conf.j2
rename to playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/templates/kubelet.conf.j2
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/templates/multus-cni.yaml.j2 b/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/templates/multus-cni.yaml.j2
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/templates/multus-cni.yaml.j2
rename to playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/templates/multus-cni.yaml.j2
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/templates/sriov-cni.yaml.j2 b/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/templates/sriov-cni.yaml.j2
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/templates/sriov-cni.yaml.j2
rename to playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/templates/sriov-cni.yaml.j2
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/templates/sriov-plugin.yaml.j2 b/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/templates/sriov-plugin.yaml.j2
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/templates/sriov-plugin.yaml.j2
rename to playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/templates/sriov-plugin.yaml.j2
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/vars/main.yml b/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/vars/main.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/vars/main.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/vars/main.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/persist-config/files/populate_initial_config.py b/playbookconfig/src/playbooks/bootstrap/roles/persist-config/files/populate_initial_config.py
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/persist-config/files/populate_initial_config.py
rename to playbookconfig/src/playbooks/bootstrap/roles/persist-config/files/populate_initial_config.py
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/persist-config/tasks/main.yml b/playbookconfig/src/playbooks/bootstrap/roles/persist-config/tasks/main.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/persist-config/tasks/main.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/persist-config/tasks/main.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/persist-config/tasks/one_time_config_tasks.yml b/playbookconfig/src/playbooks/bootstrap/roles/persist-config/tasks/one_time_config_tasks.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/persist-config/tasks/one_time_config_tasks.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/persist-config/tasks/one_time_config_tasks.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/persist-config/tasks/shutdown_services.yml b/playbookconfig/src/playbooks/bootstrap/roles/persist-config/tasks/shutdown_services.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/persist-config/tasks/shutdown_services.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/persist-config/tasks/shutdown_services.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/persist-config/vars/main.yml b/playbookconfig/src/playbooks/bootstrap/roles/persist-config/vars/main.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/persist-config/vars/main.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/persist-config/vars/main.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/prepare-env/files/check_root_disk_size.py b/playbookconfig/src/playbooks/bootstrap/roles/prepare-env/files/check_root_disk_size.py
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/prepare-env/files/check_root_disk_size.py
rename to playbookconfig/src/playbooks/bootstrap/roles/prepare-env/files/check_root_disk_size.py
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/prepare-env/handlers/main.yml b/playbookconfig/src/playbooks/bootstrap/roles/prepare-env/handlers/main.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/prepare-env/handlers/main.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/prepare-env/handlers/main.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/prepare-env/tasks/main.yml b/playbookconfig/src/playbooks/bootstrap/roles/prepare-env/tasks/main.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/prepare-env/tasks/main.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/prepare-env/tasks/main.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/prepare-env/vars/main.yml b/playbookconfig/src/playbooks/bootstrap/roles/prepare-env/vars/main.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/prepare-env/vars/main.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/prepare-env/vars/main.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/store-passwd/tasks/main.yml b/playbookconfig/src/playbooks/bootstrap/roles/store-passwd/tasks/main.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/store-passwd/tasks/main.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/store-passwd/tasks/main.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/store-passwd/vars/main.yml b/playbookconfig/src/playbooks/bootstrap/roles/store-passwd/vars/main.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/store-passwd/vars/main.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/store-passwd/vars/main.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/validate-config/meta/main.yml b/playbookconfig/src/playbooks/bootstrap/roles/validate-config/meta/main.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/validate-config/meta/main.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/validate-config/meta/main.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/validate-config/tasks/main.yml b/playbookconfig/src/playbooks/bootstrap/roles/validate-config/tasks/main.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/validate-config/tasks/main.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/validate-config/tasks/main.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/validate-config/tasks/validate_address.yml b/playbookconfig/src/playbooks/bootstrap/roles/validate-config/tasks/validate_address.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/validate-config/tasks/validate_address.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/validate-config/tasks/validate_address.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/validate-config/tasks/validate_address_range.yml b/playbookconfig/src/playbooks/bootstrap/roles/validate-config/tasks/validate_address_range.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/validate-config/tasks/validate_address_range.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/validate-config/tasks/validate_address_range.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/validate-config/tasks/validate_url.yml b/playbookconfig/src/playbooks/bootstrap/roles/validate-config/tasks/validate_url.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/validate-config/tasks/validate_url.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/validate-config/tasks/validate_url.yml
diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/validate-config/vars/main.yml b/playbookconfig/src/playbooks/bootstrap/roles/validate-config/vars/main.yml
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/bootstrap/roles/validate-config/vars/main.yml
rename to playbookconfig/src/playbooks/bootstrap/roles/validate-config/vars/main.yml
diff --git a/playbookconfig/playbookconfig/playbooks/hosts b/playbookconfig/src/playbooks/hosts
similarity index 100%
rename from playbookconfig/playbookconfig/playbooks/hosts
rename to playbookconfig/src/playbooks/hosts