diff --git a/apps/assets/playbooks/platform/change_password/database/change_password_mysql/main.yml b/apps/assets/playbooks/change_password/database/change_password_mysql/main.yml
similarity index 100%
rename from apps/assets/playbooks/platform/change_password/database/change_password_mysql/main.yml
rename to apps/assets/playbooks/change_password/database/change_password_mysql/main.yml
diff --git a/apps/assets/playbooks/platform/change_password/database/change_password_mysql/manifest.yml b/apps/assets/playbooks/change_password/database/change_password_mysql/manifest.yml
similarity index 100%
rename from apps/assets/playbooks/platform/change_password/database/change_password_mysql/manifest.yml
rename to apps/assets/playbooks/change_password/database/change_password_mysql/manifest.yml
diff --git a/apps/assets/playbooks/platform/change_password/database/change_password_mysql/roles/change_password/tasks/main.yml b/apps/assets/playbooks/change_password/database/change_password_mysql/roles/change_password/tasks/main.yml
similarity index 100%
rename from apps/assets/playbooks/platform/change_password/database/change_password_mysql/roles/change_password/tasks/main.yml
rename to apps/assets/playbooks/change_password/database/change_password_mysql/roles/change_password/tasks/main.yml
diff --git a/apps/assets/playbooks/platform/change_password/database/change_password_oracle/main.yml b/apps/assets/playbooks/change_password/database/change_password_oracle/main.yml
similarity index 100%
rename from apps/assets/playbooks/platform/change_password/database/change_password_oracle/main.yml
rename to apps/assets/playbooks/change_password/database/change_password_oracle/main.yml
diff --git a/apps/assets/playbooks/platform/change_password/database/change_password_oracle/manifest.yml b/apps/assets/playbooks/change_password/database/change_password_oracle/manifest.yml
similarity index 100%
rename from apps/assets/playbooks/platform/change_password/database/change_password_oracle/manifest.yml
rename to apps/assets/playbooks/change_password/database/change_password_oracle/manifest.yml
diff --git a/apps/assets/playbooks/platform/change_password/database/change_password_oracle/roles/change_password/tasks/main.yml b/apps/assets/playbooks/change_password/database/change_password_oracle/roles/change_password/tasks/main.yml
similarity index 100%
rename from apps/assets/playbooks/platform/change_password/database/change_password_oracle/roles/change_password/tasks/main.yml
rename to apps/assets/playbooks/change_password/database/change_password_oracle/roles/change_password/tasks/main.yml
diff --git a/apps/assets/playbooks/platform/change_password/database/change_password_postgresql/main.yml b/apps/assets/playbooks/change_password/database/change_password_postgresql/main.yml
similarity index 100%
rename from apps/assets/playbooks/platform/change_password/database/change_password_postgresql/main.yml
rename to apps/assets/playbooks/change_password/database/change_password_postgresql/main.yml
diff --git a/apps/assets/playbooks/platform/change_password/database/change_password_postgresql/manifest.yml b/apps/assets/playbooks/change_password/database/change_password_postgresql/manifest.yml
similarity index 100%
rename from apps/assets/playbooks/platform/change_password/database/change_password_postgresql/manifest.yml
rename to apps/assets/playbooks/change_password/database/change_password_postgresql/manifest.yml
diff --git a/apps/assets/playbooks/platform/change_password/database/change_password_postgresql/roles/change_password/tasks/main.yml b/apps/assets/playbooks/change_password/database/change_password_postgresql/roles/change_password/tasks/main.yml
similarity index 100%
rename from apps/assets/playbooks/platform/change_password/database/change_password_postgresql/roles/change_password/tasks/main.yml
rename to apps/assets/playbooks/change_password/database/change_password_postgresql/roles/change_password/tasks/main.yml
diff --git a/apps/assets/playbooks/platform/change_password/database/change_password_sqlserver/main.yml b/apps/assets/playbooks/change_password/database/change_password_sqlserver/main.yml
similarity index 100%
rename from apps/assets/playbooks/platform/change_password/database/change_password_sqlserver/main.yml
rename to apps/assets/playbooks/change_password/database/change_password_sqlserver/main.yml
diff --git a/apps/assets/playbooks/platform/change_password/database/change_password_sqlserver/manifest.yml b/apps/assets/playbooks/change_password/database/change_password_sqlserver/manifest.yml
similarity index 100%
rename from apps/assets/playbooks/platform/change_password/database/change_password_sqlserver/manifest.yml
rename to apps/assets/playbooks/change_password/database/change_password_sqlserver/manifest.yml
diff --git a/apps/assets/playbooks/platform/change_password/database/change_password_sqlserver/roles/change_password/tasks/main.yml b/apps/assets/playbooks/change_password/database/change_password_sqlserver/roles/change_password/tasks/main.yml
similarity index 100%
rename from apps/assets/playbooks/platform/change_password/database/change_password_sqlserver/roles/change_password/tasks/main.yml
rename to apps/assets/playbooks/change_password/database/change_password_sqlserver/roles/change_password/tasks/main.yml
diff --git a/apps/assets/playbooks/platform/change_password/host/change_password_aix/main.yml b/apps/assets/playbooks/change_password/host/change_password_aix/main.yml
similarity index 100%
rename from apps/assets/playbooks/platform/change_password/host/change_password_aix/main.yml
rename to apps/assets/playbooks/change_password/host/change_password_aix/main.yml
diff --git a/apps/assets/playbooks/platform/change_password/host/change_password_aix/manifest.yml b/apps/assets/playbooks/change_password/host/change_password_aix/manifest.yml
similarity index 100%
rename from apps/assets/playbooks/platform/change_password/host/change_password_aix/manifest.yml
rename to apps/assets/playbooks/change_password/host/change_password_aix/manifest.yml
diff --git a/apps/assets/playbooks/platform/change_password/host/change_password_aix/roles/change_password/tasks/main.yml b/apps/assets/playbooks/change_password/host/change_password_aix/roles/change_password/tasks/main.yml
similarity index 100%
rename from apps/assets/playbooks/platform/change_password/host/change_password_aix/roles/change_password/tasks/main.yml
rename to apps/assets/playbooks/change_password/host/change_password_aix/roles/change_password/tasks/main.yml
diff --git a/apps/assets/playbooks/platform/change_password/host/change_password_linux/main.yml b/apps/assets/playbooks/change_password/host/change_password_linux/main.yml
similarity index 100%
rename from apps/assets/playbooks/platform/change_password/host/change_password_linux/main.yml
rename to apps/assets/playbooks/change_password/host/change_password_linux/main.yml
diff --git a/apps/assets/playbooks/platform/change_password/host/change_password_linux/manifest.yml b/apps/assets/playbooks/change_password/host/change_password_linux/manifest.yml
similarity index 100%
rename from apps/assets/playbooks/platform/change_password/host/change_password_linux/manifest.yml
rename to apps/assets/playbooks/change_password/host/change_password_linux/manifest.yml
diff --git a/apps/assets/playbooks/platform/change_password/host/change_password_linux/roles/change_password/tasks/main.yml b/apps/assets/playbooks/change_password/host/change_password_linux/roles/change_password/tasks/main.yml
similarity index 100%
rename from apps/assets/playbooks/platform/change_password/host/change_password_linux/roles/change_password/tasks/main.yml
rename to apps/assets/playbooks/change_password/host/change_password_linux/roles/change_password/tasks/main.yml
diff --git a/apps/assets/playbooks/platform/change_password/host/change_password_local_windows/main.yml b/apps/assets/playbooks/change_password/host/change_password_local_windows/main.yml
similarity index 100%
rename from apps/assets/playbooks/platform/change_password/host/change_password_local_windows/main.yml
rename to apps/assets/playbooks/change_password/host/change_password_local_windows/main.yml
diff --git a/apps/assets/playbooks/platform/change_password/host/change_password_local_windows/manifest.yml b/apps/assets/playbooks/change_password/host/change_password_local_windows/manifest.yml
similarity index 100%
rename from apps/assets/playbooks/platform/change_password/host/change_password_local_windows/manifest.yml
rename to apps/assets/playbooks/change_password/host/change_password_local_windows/manifest.yml
diff --git a/apps/assets/playbooks/platform/change_password/host/change_password_local_windows/roles/change_password/tasks/main.yml b/apps/assets/playbooks/change_password/host/change_password_local_windows/roles/change_password/tasks/main.yml
similarity index 100%
rename from apps/assets/playbooks/platform/change_password/host/change_password_local_windows/roles/change_password/tasks/main.yml
rename to apps/assets/playbooks/change_password/host/change_password_local_windows/roles/change_password/tasks/main.yml
diff --git a/apps/assets/playbooks/platform/verify_account/host/ansible_posix_ping/main.yml b/apps/assets/playbooks/verify_account/host/ansible_posix_ping/main.yml
similarity index 100%
rename from apps/assets/playbooks/platform/verify_account/host/ansible_posix_ping/main.yml
rename to apps/assets/playbooks/verify_account/host/ansible_posix_ping/main.yml
diff --git a/apps/assets/playbooks/platform/verify_account/host/ansible_posix_ping/manifest.yml b/apps/assets/playbooks/verify_account/host/ansible_posix_ping/manifest.yml
similarity index 100%
rename from apps/assets/playbooks/platform/verify_account/host/ansible_posix_ping/manifest.yml
rename to apps/assets/playbooks/verify_account/host/ansible_posix_ping/manifest.yml
diff --git a/apps/assets/playbooks/platform/verify_account/host/ansible_win_ping/main.yml b/apps/assets/playbooks/verify_account/host/ansible_win_ping/main.yml
similarity index 100%
rename from apps/assets/playbooks/platform/verify_account/host/ansible_win_ping/main.yml
rename to apps/assets/playbooks/verify_account/host/ansible_win_ping/main.yml
diff --git a/apps/assets/playbooks/platform/verify_account/host/ansible_win_ping/manifest.yml b/apps/assets/playbooks/verify_account/host/ansible_win_ping/manifest.yml
similarity index 100%
rename from apps/assets/playbooks/platform/verify_account/host/ansible_win_ping/manifest.yml
rename to apps/assets/playbooks/verify_account/host/ansible_win_ping/manifest.yml