diff --git a/deployment-apps/ms_windows_ad_objects 3/app.manifest b/deployment-apps/ms_windows_ad_objects/app.manifest
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/app.manifest
rename to deployment-apps/ms_windows_ad_objects/app.manifest
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/addons/Indexes_conf_ex.zip b/deployment-apps/ms_windows_ad_objects/appserver/addons/Indexes_conf_ex.zip
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/addons/Indexes_conf_ex.zip
rename to deployment-apps/ms_windows_ad_objects/appserver/addons/Indexes_conf_ex.zip
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/addons/splunk_apps_cfg_winfra_exch.zip b/deployment-apps/ms_windows_ad_objects/appserver/addons/splunk_apps_cfg_winfra_exch.zip
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/addons/splunk_apps_cfg_winfra_exch.zip
rename to deployment-apps/ms_windows_ad_objects/appserver/addons/splunk_apps_cfg_winfra_exch.zip
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/app_arch_base_lookups.png b/deployment-apps/ms_windows_ad_objects/appserver/static/app_arch_base_lookups.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/app_arch_base_lookups.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/app_arch_base_lookups.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/app_arch_option_a_admon.png b/deployment-apps/ms_windows_ad_objects/appserver/static/app_arch_option_a_admon.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/app_arch_option_a_admon.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/app_arch_option_a_admon.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/audit_report.js b/deployment-apps/ms_windows_ad_objects/appserver/static/audit_report.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/audit_report.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/audit_report.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/basic_winfra_arch.png b/deployment-apps/ms_windows_ad_objects/appserver/static/basic_winfra_arch.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/basic_winfra_arch.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/basic_winfra_arch.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/basic_winfra_dc_arch.png b/deployment-apps/ms_windows_ad_objects/appserver/static/basic_winfra_dc_arch.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/basic_winfra_dc_arch.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/basic_winfra_dc_arch.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/coming-soon-icon.jpg b/deployment-apps/ms_windows_ad_objects/appserver/static/coming-soon-icon.jpg
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/coming-soon-icon.jpg
rename to deployment-apps/ms_windows_ad_objects/appserver/static/coming-soon-icon.jpg
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/coming_soon_icon.png b/deployment-apps/ms_windows_ad_objects/appserver/static/coming_soon_icon.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/coming_soon_icon.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/coming_soon_icon.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/components/ms_ad_obj_modal/ms_ad_obj_modal_popup.js b/deployment-apps/ms_windows_ad_objects/appserver/static/components/ms_ad_obj_modal/ms_ad_obj_modal_popup.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/components/ms_ad_obj_modal/ms_ad_obj_modal_popup.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/components/ms_ad_obj_modal/ms_ad_obj_modal_popup.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/customized_chart_preload.js b/deployment-apps/ms_windows_ad_objects/appserver/static/customized_chart_preload.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/customized_chart_preload.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/customized_chart_preload.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/dashboard.css b/deployment-apps/ms_windows_ad_objects/appserver/static/dashboard.css
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/dashboard.css
rename to deployment-apps/ms_windows_ad_objects/appserver/static/dashboard.css
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/dashboard.js b/deployment-apps/ms_windows_ad_objects/appserver/static/dashboard.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/dashboard.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/dashboard.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ex_win_ta/ms_ad_obj_ta_acl.zip b/deployment-apps/ms_windows_ad_objects/appserver/static/ex_win_ta/ms_ad_obj_ta_acl.zip
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ex_win_ta/ms_ad_obj_ta_acl.zip
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ex_win_ta/ms_ad_obj_ta_acl.zip
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ex_win_ta/ms_ad_obj_ta_examples.zip b/deployment-apps/ms_windows_ad_objects/appserver/static/ex_win_ta/ms_ad_obj_ta_examples.zip
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ex_win_ta/ms_ad_obj_ta_examples.zip
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ex_win_ta/ms_ad_obj_ta_examples.zip
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_activedirectory.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_activedirectory.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_activedirectory.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_activedirectory.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_app_download.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_app_download.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_app_download.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_app_download.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_check.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_check.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_check.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_check.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_cloud_warning.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_cloud_warning.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_cloud_warning.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_cloud_warning.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_consolidate.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_consolidate.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_consolidate.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_consolidate.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_custom_input.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_custom_input.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_custom_input.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_custom_input.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_desktop.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_desktop.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_desktop.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_desktop.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_edit_input.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_edit_input.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_edit_input.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_edit_input.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_folder.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_folder.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_folder.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_folder.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_folder_src.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_folder_src.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_folder_src.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_folder_src.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_folder_tgt.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_folder_tgt.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_folder_tgt.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_folder_tgt.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_gear.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_gear.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_gear.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_gear.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_inputs_conf_src.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_inputs_conf_src.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_inputs_conf_src.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_inputs_conf_src.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_inputs_conf_tgt.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_inputs_conf_tgt.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_inputs_conf_tgt.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_inputs_conf_tgt.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_log_mgmt.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_log_mgmt.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_log_mgmt.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_log_mgmt.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_op_inteligent.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_op_inteligent.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_op_inteligent.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_op_inteligent.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_os_app.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_os_app.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_os_app.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_os_app.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_os_folder.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_os_folder.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_os_folder.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_os_folder.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_pre_check.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_pre_check.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_pre_check.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_pre_check.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_priority_list.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_priority_list.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_priority_list.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_priority_list.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_priority_sec_list.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_priority_sec_list.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_priority_sec_list.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_priority_sec_list.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_script.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_script.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_script.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_script.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_security_compliance.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_security_compliance.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_security_compliance.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_security_compliance.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_server_db.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_server_db.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_server_db.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_server_db.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_splk_app_addons.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_splk_app_addons.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_splk_app_addons.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_splk_app_addons.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_splk_app_mgmt.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_splk_app_mgmt.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_splk_app_mgmt.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_splk_app_mgmt.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_splk_cloud.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_splk_cloud.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_splk_cloud.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_splk_cloud.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_splk_cloud_hybrid.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_splk_cloud_hybrid.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_splk_cloud_hybrid.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_splk_cloud_hybrid.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_splk_data_model.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_splk_data_model.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_splk_data_model.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_splk_data_model.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_splk_enterprise.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_splk_enterprise.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_splk_enterprise.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_splk_enterprise.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_splk_forwarder.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_splk_forwarder.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_splk_forwarder.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_splk_forwarder.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_splk_indexer.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_splk_indexer.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_splk_indexer.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_splk_indexer.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_splk_sbase.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_splk_sbase.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_splk_sbase.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_splk_sbase.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_splk_search_head.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_splk_search_head.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_splk_search_head.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_splk_search_head.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_stop.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_stop.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_stop.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_stop.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_user_check.png b/deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_user_check.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/icons/icon_user_check.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/icons/icon_user_check.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_apple-icon.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_apple-icon.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_apple-icon.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_apple-icon.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_audit_cantvalidate.gif b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_audit_cantvalidate.gif
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_audit_cantvalidate.gif
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_audit_cantvalidate.gif
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_audit_gap.gif b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_audit_gap.gif
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_audit_gap.gif
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_audit_gap.gif
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_audit_tampered.gif b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_audit_tampered.gif
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_audit_tampered.gif
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_audit_tampered.gif
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_audit_valid.gif b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_audit_valid.gif
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_audit_valid.gif
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_audit_valid.gif
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_cloud_idx_wineventlog.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_cloud_idx_wineventlog.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_cloud_idx_wineventlog.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_cloud_idx_wineventlog.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_ent_idx_wineventlog.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_ent_idx_wineventlog.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_ent_idx_wineventlog.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_ent_idx_wineventlog.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_icon-link-sm.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_icon-link-sm.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_icon-link-sm.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_icon-link-sm.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_icon-success-sm.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_icon-success-sm.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_icon-success-sm.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_icon-success-sm.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_iosicon.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_iosicon.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_iosicon.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_iosicon.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_1.jpg b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_1.jpg
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_1.jpg
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_1.jpg
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_1.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_1.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_1.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_1.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_2.jpg b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_2.jpg
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_2.jpg
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_2.jpg
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_2.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_2.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_2.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_2.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_3.jpg b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_3.jpg
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_3.jpg
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_3.jpg
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_3.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_3.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_3.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_3.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_4.jpg b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_4.jpg
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_4.jpg
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_4.jpg
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_4.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_4.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_4.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_4.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_5.jpg b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_5.jpg
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_5.jpg
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_5.jpg
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_5.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_5.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_5.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_5.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_6.jpg b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_6.jpg
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_6.jpg
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_6.jpg
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_6.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_6.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_6.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_6.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_7.jpg b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_7.jpg
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_7.jpg
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_7.jpg
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_7.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_7.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_ent_inst_7.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_ent_inst_7.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_inst_1.jpg b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_inst_1.jpg
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_inst_1.jpg
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_inst_1.jpg
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_inst_1.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_inst_1.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_inst_1.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_inst_1.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_inst_2_cloud.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_inst_2_cloud.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_inst_2_cloud.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_inst_2_cloud.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_inst_3_cloud.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_inst_3_cloud.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_inst_3_cloud.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_inst_3_cloud.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_inst_4_cloud.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_inst_4_cloud.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_ds_inst_4_cloud.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_ds_inst_4_cloud.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_cloud_0.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_cloud_0.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_cloud_0.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_cloud_0.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_cust_1_both.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_cust_1_both.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_cust_1_both.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_cust_1_both.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_cust_2_ent.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_cust_2_ent.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_cust_2_ent.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_cust_2_ent.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_cust_3_both.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_cust_3_both.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_cust_3_both.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_cust_3_both.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_cust_4_both.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_cust_4_both.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_cust_4_both.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_cust_4_both.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_cust_5_both.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_cust_5_both.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_cust_5_both.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_cust_5_both.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_cust_6_both.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_cust_6_both.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_cust_6_both.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_cust_6_both.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_cust_7_both.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_cust_7_both.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_cust_7_both.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_cust_7_both.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_cust_8_both.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_cust_8_both.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_cust_8_both.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_cust_8_both.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_cust_9_both.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_cust_9_both.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_cust_9_both.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_cust_9_both.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_ent_0.png b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_ent_0.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_ad_obj_win_uf_ent_0.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_ad_obj_win_uf_ent_0.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_windows_ad_objects_icon.jpg b/deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_windows_ad_objects_icon.jpg
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/img/ms_windows_ad_objects_icon.jpg
rename to deployment-apps/ms_windows_ad_objects/appserver/static/img/ms_windows_ad_objects_icon.jpg
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/info_pages/init_build/init_build_dom_warn.html b/deployment-apps/ms_windows_ad_objects/appserver/static/info_pages/init_build/init_build_dom_warn.html
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/info_pages/init_build/init_build_dom_warn.html
rename to deployment-apps/ms_windows_ad_objects/appserver/static/info_pages/init_build/init_build_dom_warn.html
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/Class.js b/deployment-apps/ms_windows_ad_objects/appserver/static/js/common/Class.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/Class.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/js/common/Class.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/PageMessagesView.js b/deployment-apps/ms_windows_ad_objects/appserver/static/js/common/PageMessagesView.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/PageMessagesView.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/js/common/PageMessagesView.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/PropertyBag.js b/deployment-apps/ms_windows_ad_objects/appserver/static/js/common/PropertyBag.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/PropertyBag.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/js/common/PropertyBag.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/SearchDataHelpers.js b/deployment-apps/ms_windows_ad_objects/appserver/static/js/common/SearchDataHelpers.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/SearchDataHelpers.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/js/common/SearchDataHelpers.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/SearchIconRenderer.js b/deployment-apps/ms_windows_ad_objects/appserver/static/js/common/SearchIconRenderer.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/SearchIconRenderer.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/js/common/SearchIconRenderer.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/SearchRunner.js b/deployment-apps/ms_windows_ad_objects/appserver/static/js/common/SearchRunner.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/SearchRunner.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/js/common/SearchRunner.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/ShareButton.js b/deployment-apps/ms_windows_ad_objects/appserver/static/js/common/ShareButton.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/ShareButton.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/js/common/ShareButton.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/SyncTaskQueue.js b/deployment-apps/ms_windows_ad_objects/appserver/static/js/common/SyncTaskQueue.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/SyncTaskQueue.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/js/common/SyncTaskQueue.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/SyncTaskRunner.js b/deployment-apps/ms_windows_ad_objects/appserver/static/js/common/SyncTaskRunner.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/SyncTaskRunner.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/js/common/SyncTaskRunner.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/TimeShifter.js b/deployment-apps/ms_windows_ad_objects/appserver/static/js/common/TimeShifter.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/TimeShifter.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/js/common/TimeShifter.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/UserPreferences.js b/deployment-apps/ms_windows_ad_objects/appserver/static/js/common/UserPreferences.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/UserPreferences.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/js/common/UserPreferences.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/Utilities.js b/deployment-apps/ms_windows_ad_objects/appserver/static/js/common/Utilities.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/Utilities.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/js/common/Utilities.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/common_less_imports.less b/deployment-apps/ms_windows_ad_objects/appserver/static/js/common/common_less_imports.less
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/common_less_imports.less
rename to deployment-apps/ms_windows_ad_objects/appserver/static/js/common/common_less_imports.less
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/statestore/statestorewrapper.js b/deployment-apps/ms_windows_ad_objects/appserver/static/js/common/statestore/statestorewrapper.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/js/common/statestore/statestorewrapper.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/js/common/statestore/statestorewrapper.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/js/ms_windows_ad_objects/components/ldaprecordview.css b/deployment-apps/ms_windows_ad_objects/appserver/static/js/ms_windows_ad_objects/components/ldaprecordview.css
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/js/ms_windows_ad_objects/components/ldaprecordview.css
rename to deployment-apps/ms_windows_ad_objects/appserver/static/js/ms_windows_ad_objects/components/ldaprecordview.css
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/js/ms_windows_ad_objects/components/ldaprecordview.js b/deployment-apps/ms_windows_ad_objects/appserver/static/js/ms_windows_ad_objects/components/ldaprecordview.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/js/ms_windows_ad_objects/components/ldaprecordview.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/js/ms_windows_ad_objects/components/ldaprecordview.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/js/ms_windows_ad_objects/components/ms_ad_obj_ldaprecordview.css b/deployment-apps/ms_windows_ad_objects/appserver/static/js/ms_windows_ad_objects/components/ms_ad_obj_ldaprecordview.css
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/js/ms_windows_ad_objects/components/ms_ad_obj_ldaprecordview.css
rename to deployment-apps/ms_windows_ad_objects/appserver/static/js/ms_windows_ad_objects/components/ms_ad_obj_ldaprecordview.css
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/js/ms_windows_ad_objects/components/ms_ad_obj_ldaprecordview.js b/deployment-apps/ms_windows_ad_objects/appserver/static/js/ms_windows_ad_objects/components/ms_ad_obj_ldaprecordview.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/js/ms_windows_ad_objects/components/ms_ad_obj_ldaprecordview.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/js/ms_windows_ad_objects/components/ms_ad_obj_ldaprecordview.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/js/ms_windows_ad_objects/contrib/text.js b/deployment-apps/ms_windows_ad_objects/appserver/static/js/ms_windows_ad_objects/contrib/text.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/js/ms_windows_ad_objects/contrib/text.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/js/ms_windows_ad_objects/contrib/text.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/js/ms_windows_ad_objects/custom.css b/deployment-apps/ms_windows_ad_objects/appserver/static/js/ms_windows_ad_objects/custom.css
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/js/ms_windows_ad_objects/custom.css
rename to deployment-apps/ms_windows_ad_objects/appserver/static/js/ms_windows_ad_objects/custom.css
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/loader_green_on_grey.gif b/deployment-apps/ms_windows_ad_objects/appserver/static/loader_green_on_grey.gif
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/loader_green_on_grey.gif
rename to deployment-apps/ms_windows_ad_objects/appserver/static/loader_green_on_grey.gif
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/lookup_field_lists.csv b/deployment-apps/ms_windows_ad_objects/appserver/static/lookup_field_lists.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/lookup_field_lists.csv
rename to deployment-apps/ms_windows_ad_objects/appserver/static/lookup_field_lists.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_audit_report.js b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_audit_report.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_audit_report.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_audit_report.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_changes.css b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_changes.css
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_changes.css
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_changes.css
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_config_h.js b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_config_h.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_config_h.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_config_h.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_config_prep.js b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_config_prep.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_config_prep.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_config_prep.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_file_acl.css b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_file_acl.css
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_file_acl.css
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_file_acl.css
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_gbl_tabs.css b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_gbl_tabs.css
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_gbl_tabs.css
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_gbl_tabs.css
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_gs_cfg.css b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_gs_cfg.css
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_gs_cfg.css
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_gs_cfg.css
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_html_token_setter.js b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_html_token_setter.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_html_token_setter.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_html_token_setter.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_input_status.js b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_input_status.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_input_status.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_input_status.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_lkp_v.js b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_lkp_v.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_lkp_v.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_lkp_v.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_lkp_view.css b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_lkp_view.css
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_lkp_view.css
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_lkp_view.css
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_login_by.css b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_login_by.css
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_login_by.css
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_login_by.css
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_login_by.js b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_login_by.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_login_by.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_login_by.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_md_cfg.js b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_md_cfg.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_md_cfg.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_md_cfg.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_overview.css b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_overview.css
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_overview.css
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_overview.css
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_quick_nav.js b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_quick_nav.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_quick_nav.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_quick_nav.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_reports.css b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_reports.css
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_reports.css
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_reports.css
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_table_status.js b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_table_status.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_table_status.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_table_status.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_table_toggle.js b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_table_toggle.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_table_toggle.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_table_toggle.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_upd_domain.js b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_upd_domain.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_upd_domain.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_upd_domain.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_update_input.js b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_update_input.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_update_input.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_update_input.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_wiz_flow.js b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_wiz_flow.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_ad_obj_wiz_flow.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_ad_obj_wiz_flow.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_windows_ad_objects_icon.png b/deployment-apps/ms_windows_ad_objects/appserver/static/ms_windows_ad_objects_icon.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/ms_windows_ad_objects_icon.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/ms_windows_ad_objects_icon.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/number_icon_1.png b/deployment-apps/ms_windows_ad_objects/appserver/static/number_icon_1.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/number_icon_1.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/number_icon_1.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/number_icon_2.png b/deployment-apps/ms_windows_ad_objects/appserver/static/number_icon_2.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/number_icon_2.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/number_icon_2.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/number_icon_3.png b/deployment-apps/ms_windows_ad_objects/appserver/static/number_icon_3.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/number_icon_3.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/number_icon_3.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/number_icon_4.png b/deployment-apps/ms_windows_ad_objects/appserver/static/number_icon_4.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/number_icon_4.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/number_icon_4.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/number_icon_5.png b/deployment-apps/ms_windows_ad_objects/appserver/static/number_icon_5.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/number_icon_5.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/number_icon_5.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/number_icon_6.png b/deployment-apps/ms_windows_ad_objects/appserver/static/number_icon_6.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/number_icon_6.png
rename to deployment-apps/ms_windows_ad_objects/appserver/static/number_icon_6.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/showtokens.css b/deployment-apps/ms_windows_ad_objects/appserver/static/showtokens.css
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/showtokens.css
rename to deployment-apps/ms_windows_ad_objects/appserver/static/showtokens.css
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/showtokens.js b/deployment-apps/ms_windows_ad_objects/appserver/static/showtokens.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/showtokens.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/showtokens.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/table_decoration.css b/deployment-apps/ms_windows_ad_objects/appserver/static/table_decoration.css
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/table_decoration.css
rename to deployment-apps/ms_windows_ad_objects/appserver/static/table_decoration.css
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/table_decoration.js b/deployment-apps/ms_windows_ad_objects/appserver/static/table_decoration.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/table_decoration.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/table_decoration.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/temp_custom_icons.js b/deployment-apps/ms_windows_ad_objects/appserver/static/temp_custom_icons.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/temp_custom_icons.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/temp_custom_icons.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/temp_example_customtables.css b/deployment-apps/ms_windows_ad_objects/appserver/static/temp_example_customtables.css
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/temp_example_customtables.css
rename to deployment-apps/ms_windows_ad_objects/appserver/static/temp_example_customtables.css
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/temp_example_customtables.js b/deployment-apps/ms_windows_ad_objects/appserver/static/temp_example_customtables.js
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/temp_example_customtables.js
rename to deployment-apps/ms_windows_ad_objects/appserver/static/temp_example_customtables.js
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_compl.html b/deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_compl.html
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_compl.html
rename to deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_compl.html
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_depl_task_det.html b/deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_depl_task_det.html
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_depl_task_det.html
rename to deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_depl_task_det.html
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_depl_task_hold.html b/deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_depl_task_hold.html
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_depl_task_hold.html
rename to deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_depl_task_hold.html
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_depl_task_src.html b/deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_depl_task_src.html
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_depl_task_src.html
rename to deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_depl_task_src.html
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_intro.html b/deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_intro.html
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_intro.html
rename to deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_intro.html
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_pop.html b/deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_pop.html
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_pop.html
rename to deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_pop.html
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_prep_task_det.html b/deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_prep_task_det.html
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_prep_task_det.html
rename to deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_prep_task_det.html
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_prep_task_hold.html b/deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_prep_task_hold.html
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_prep_task_hold.html
rename to deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_prep_task_hold.html
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_prep_task_src.html b/deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_prep_task_src.html
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_prep_task_src.html
rename to deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_prep_task_src.html
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_scope_tasks.html b/deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_scope_tasks.html
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_scope_tasks.html
rename to deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_scope_tasks.html
diff --git a/deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_scope_tasks_hold.html b/deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_scope_tasks_hold.html
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_scope_tasks_hold.html
rename to deployment-apps/ms_windows_ad_objects/appserver/static/wiz_content/getting_started/ms_ad_obj_gs_scope_tasks_hold.html
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/app.conf b/deployment-apps/ms_windows_ad_objects/default/app.conf
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/app.conf
rename to deployment-apps/ms_windows_ad_objects/default/app.conf
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/collections.conf b/deployment-apps/ms_windows_ad_objects/default/collections.conf
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/collections.conf
rename to deployment-apps/ms_windows_ad_objects/default/collections.conf
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/models/MS_Windows_AD_Changes.json b/deployment-apps/ms_windows_ad_objects/default/data/models/MS_Windows_AD_Changes.json
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/models/MS_Windows_AD_Changes.json
rename to deployment-apps/ms_windows_ad_objects/default/data/models/MS_Windows_AD_Changes.json
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/nav/default.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/nav/default.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/nav/default.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/nav/default.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ad_objects__configuration__getting_data_in.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ad_objects__configuration__getting_data_in.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ad_objects__configuration__getting_data_in.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ad_objects__configuration__getting_data_in.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/dev_custom_icons.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/dev_custom_icons.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/dev_custom_icons.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/dev_custom_icons.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_audit_computer.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_audit_computer.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_audit_computer.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_audit_computer.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_audit_gpo.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_audit_gpo.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_audit_gpo.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_audit_gpo.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_audit_group.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_audit_group.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_audit_group.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_audit_group.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_audit_ou.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_audit_ou.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_audit_ou.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_audit_ou.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_audit_user.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_audit_user.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_audit_user.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_audit_user.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_chg_gpo.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_chg_gpo.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_chg_gpo.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_chg_gpo.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_computer_chg.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_computer_chg.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_computer_chg.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_computer_chg.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_computer_reports.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_computer_reports.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_computer_reports.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_computer_reports.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_gpo_reports.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_gpo_reports.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_gpo_reports.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_gpo_reports.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_group_reports.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_group_reports.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_group_reports.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_group_reports.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_ou_chg.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_ou_chg.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_ou_chg.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_ou_chg.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_ou_reports.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_ou_reports.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_ou_reports.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_ou_reports.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_user_by_group_logons.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_user_by_group_logons.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_user_by_group_logons.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_user_by_group_logons.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_user_by_ou_logons.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_user_by_ou_logons.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_user_by_ou_logons.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_user_by_ou_logons.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_user_chg.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_user_chg.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_user_chg.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_user_chg.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_user_reports.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_user_reports.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ad_user_reports.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ad_user_reports.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_admin_audit_change_overview.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_admin_audit_change_overview.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_admin_audit_change_overview.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_admin_audit_change_overview.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_admin_audit_changes.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_admin_audit_changes.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_admin_audit_changes.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_admin_audit_changes.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_admin_audit_changes_lookup.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_admin_audit_changes_lookup.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_admin_audit_changes_lookup.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_admin_audit_changes_lookup.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_admin_login_ratio.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_admin_login_ratio.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_admin_login_ratio.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_admin_login_ratio.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_admin_login_sessions.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_admin_login_sessions.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_admin_login_sessions.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_admin_login_sessions.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_admin_login_user.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_admin_login_user.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_admin_login_user.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_admin_login_user.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_admin_splunk_index_compression.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_admin_splunk_index_compression.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_admin_splunk_index_compression.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_admin_splunk_index_compression.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_admin_user_tracking.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_admin_user_tracking.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_admin_user_tracking.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_admin_user_tracking.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_analyze_fields.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_analyze_fields.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_analyze_fields.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_analyze_fields.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_app_health_overview.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_app_health_overview.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_app_health_overview.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_app_health_overview.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_app_health_sched_searches.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_app_health_sched_searches.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_app_health_sched_searches.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_app_health_sched_searches.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_app_knowledge_browser.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_app_knowledge_browser.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_app_knowledge_browser.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_app_knowledge_browser.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_build_ad_lookup_lists__main.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_build_ad_lookup_lists__main.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_build_ad_lookup_lists__main.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_build_ad_lookup_lists__main.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_cfg_split_kvs.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_cfg_split_kvs.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_cfg_split_kvs.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_cfg_split_kvs.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_change_history__analysis.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_change_history__analysis.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_change_history__analysis.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_change_history__analysis.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_computers_active.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_computers_active.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_computers_active.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_computers_active.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_conf_analysis.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_conf_analysis.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_conf_analysis.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_conf_analysis.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_file_acl_analysis.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_file_acl_analysis.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_file_acl_analysis.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_file_acl_analysis.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_file_audit_analysis.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_file_audit_analysis.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_file_audit_analysis.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_file_audit_analysis.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_group_changes.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_group_changes.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_group_changes.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_group_changes.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_group_member_dashboard.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_group_member_dashboard.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_group_member_dashboard.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_group_member_dashboard.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_group_sub_search__builder.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_group_sub_search__builder.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_group_sub_search__builder.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_group_sub_search__builder.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_lookup_computer.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_lookup_computer.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_lookup_computer.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_lookup_computer.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_lookup_computer_new.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_lookup_computer_new.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_lookup_computer_new.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_lookup_computer_new.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_lookup_fields_reference.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_lookup_fields_reference.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_lookup_fields_reference.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_lookup_fields_reference.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_lookup_gpo.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_lookup_gpo.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_lookup_gpo.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_lookup_gpo.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_lookup_group.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_lookup_group.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_lookup_group.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_lookup_group.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_lookup_ou.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_lookup_ou.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_lookup_ou.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_lookup_ou.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_lookup_users.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_lookup_users.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_lookup_users.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_lookup_users.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ou_sub_search__builder.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ou_sub_search__builder.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_ou_sub_search__builder.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_ou_sub_search__builder.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_overview.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_overview.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_overview.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_overview.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_user_settings_dashboard.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_user_settings_dashboard.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_user_settings_dashboard.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_user_settings_dashboard.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_win_app_crashes.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_win_app_crashes.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_win_app_crashes.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_win_app_crashes.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_win_app_installs.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_win_app_installs.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_win_app_installs.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_win_app_installs.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_win_hostmon_disk.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_win_hostmon_disk.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_win_hostmon_disk.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_win_hostmon_disk.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_win_hostmon_process.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_win_hostmon_process.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_win_hostmon_process.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_win_hostmon_process.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_win_hostmon_service.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_win_hostmon_service.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_win_hostmon_service.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_win_hostmon_service.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_win_netmon_activity.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_win_netmon_activity.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_win_netmon_activity.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_win_netmon_activity.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_win_netmon_tops.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_win_netmon_tops.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_win_netmon_tops.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_win_netmon_tops.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_win_printmon_oview.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_win_printmon_oview.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_win_printmon_oview.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_win_printmon_oview.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_windows_app_perf.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_windows_app_perf.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_windows_app_perf.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_windows_app_perf.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_windows_events_analysis.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_windows_events_analysis.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_windows_events_analysis.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_windows_events_analysis.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_windows_input_builder.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_windows_input_builder.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_windows_input_builder.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_windows_input_builder.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_windows_performance.xml b/deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_windows_performance.xml
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/data/ui/views/ms_ad_obj_windows_performance.xml
rename to deployment-apps/ms_windows_ad_objects/default/data/ui/views/ms_ad_obj_windows_performance.xml
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/datamodels.conf b/deployment-apps/ms_windows_ad_objects/default/datamodels.conf
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/datamodels.conf
rename to deployment-apps/ms_windows_ad_objects/default/datamodels.conf
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/eventtypes.conf b/deployment-apps/ms_windows_ad_objects/default/eventtypes.conf
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/eventtypes.conf
rename to deployment-apps/ms_windows_ad_objects/default/eventtypes.conf
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/macros.conf b/deployment-apps/ms_windows_ad_objects/default/macros.conf
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/macros.conf
rename to deployment-apps/ms_windows_ad_objects/default/macros.conf
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/props.conf b/deployment-apps/ms_windows_ad_objects/default/props.conf
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/props.conf
rename to deployment-apps/ms_windows_ad_objects/default/props.conf
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/savedsearches.conf b/deployment-apps/ms_windows_ad_objects/default/savedsearches.conf
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/savedsearches.conf
rename to deployment-apps/ms_windows_ad_objects/default/savedsearches.conf
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/tags.conf b/deployment-apps/ms_windows_ad_objects/default/tags.conf
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/tags.conf
rename to deployment-apps/ms_windows_ad_objects/default/tags.conf
diff --git a/deployment-apps/ms_windows_ad_objects 3/default/transforms.conf b/deployment-apps/ms_windows_ad_objects/default/transforms.conf
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/default/transforms.conf
rename to deployment-apps/ms_windows_ad_objects/default/transforms.conf
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_app_eventcodes.csv b/deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_app_eventcodes.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_app_eventcodes.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_app_eventcodes.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_cfg_gs.csv b/deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_cfg_gs.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_cfg_gs.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_cfg_gs.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_cfg_wiz_nav.csv b/deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_cfg_wiz_nav.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_cfg_wiz_nav.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_cfg_wiz_nav.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_change_eventcodes.csv b/deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_change_eventcodes.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_change_eventcodes.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_change_eventcodes.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_change_eventcodes_adv.csv b/deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_change_eventcodes_adv.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_change_eventcodes_adv.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_change_eventcodes_adv.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_change_eventcodes_std.csv b/deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_change_eventcodes_std.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_change_eventcodes_std.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_change_eventcodes_std.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_default_critical_objects.csv b/deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_default_critical_objects.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_default_critical_objects.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_default_critical_objects.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_error_codes.csv b/deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_error_codes.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_error_codes.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_error_codes.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_evt_code_desc.csv b/deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_evt_code_desc.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_evt_code_desc.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_evt_code_desc.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_evt_code_logons.csv b/deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_evt_code_logons.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_evt_code_logons.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_evt_code_logons.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_field_AD_Obj_Computer.csv b/deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_field_AD_Obj_Computer.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_field_AD_Obj_Computer.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_field_AD_Obj_Computer.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_field_AD_Obj_Group.csv b/deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_field_AD_Obj_Group.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_field_AD_Obj_Group.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_field_AD_Obj_Group.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_field_AD_Obj_User.csv b/deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_field_AD_Obj_User.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_field_AD_Obj_User.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_field_AD_Obj_User.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_group_details.csv b/deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_group_details.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_group_details.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_group_details.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_group_types.csv b/deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_group_types.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_group_types.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_group_types.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_inputs_vals.csv b/deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_inputs_vals.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_inputs_vals.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_inputs_vals.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_logon_types.csv b/deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_logon_types.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_logon_types.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_logon_types.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_lookup_field_lists.csv b/deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_lookup_field_lists.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_lookup_field_lists.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_lookup_field_lists.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_status_icons.csv b/deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_status_icons.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_status_icons.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_status_icons.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_uac_temp.csv b/deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_uac_temp.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_uac_temp.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_uac_temp.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_user_rights_map.csv b/deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_user_rights_map.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/ms_ad_obj_user_rights_map.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/ms_ad_obj_user_rights_map.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/lookups/tmp_ms_obj_md_cfg.csv b/deployment-apps/ms_windows_ad_objects/lookups/tmp_ms_obj_md_cfg.csv
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/lookups/tmp_ms_obj_md_cfg.csv
rename to deployment-apps/ms_windows_ad_objects/lookups/tmp_ms_obj_md_cfg.csv
diff --git a/deployment-apps/ms_windows_ad_objects 3/metadata/default.meta b/deployment-apps/ms_windows_ad_objects/metadata/default.meta
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/metadata/default.meta
rename to deployment-apps/ms_windows_ad_objects/metadata/default.meta
diff --git a/deployment-apps/ms_windows_ad_objects 3/samples/AD.Audit.Admin.list_csv_backup b/deployment-apps/ms_windows_ad_objects/samples/AD.Audit.Admin.list_csv_backup
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/samples/AD.Audit.Admin.list_csv_backup
rename to deployment-apps/ms_windows_ad_objects/samples/AD.Audit.Admin.list_csv_backup
diff --git a/deployment-apps/ms_windows_ad_objects 3/samples/AD.Computer.LDAP.list_csv_backup b/deployment-apps/ms_windows_ad_objects/samples/AD.Computer.LDAP.list_csv_backup
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/samples/AD.Computer.LDAP.list_csv_backup
rename to deployment-apps/ms_windows_ad_objects/samples/AD.Computer.LDAP.list_csv_backup
diff --git a/deployment-apps/ms_windows_ad_objects 3/samples/AD.Distribution.Lists.LDAP.list_csv_backup b/deployment-apps/ms_windows_ad_objects/samples/AD.Distribution.Lists.LDAP.list_csv_backup
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/samples/AD.Distribution.Lists.LDAP.list_csv_backup
rename to deployment-apps/ms_windows_ad_objects/samples/AD.Distribution.Lists.LDAP.list_csv_backup
diff --git a/deployment-apps/ms_windows_ad_objects 3/samples/AD.Domain.Selector.list_csv_backup b/deployment-apps/ms_windows_ad_objects/samples/AD.Domain.Selector.list_csv_backup
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/samples/AD.Domain.Selector.list_csv_backup
rename to deployment-apps/ms_windows_ad_objects/samples/AD.Domain.Selector.list_csv_backup
diff --git a/deployment-apps/ms_windows_ad_objects 3/samples/AD.GroupPolicies.LDAP.list_csv_backup b/deployment-apps/ms_windows_ad_objects/samples/AD.GroupPolicies.LDAP.list_csv_backup
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/samples/AD.GroupPolicies.LDAP.list_csv_backup
rename to deployment-apps/ms_windows_ad_objects/samples/AD.GroupPolicies.LDAP.list_csv_backup
diff --git a/deployment-apps/ms_windows_ad_objects 3/samples/AD.Groups.LDAP.list_csv_backup b/deployment-apps/ms_windows_ad_objects/samples/AD.Groups.LDAP.list_csv_backup
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/samples/AD.Groups.LDAP.list_csv_backup
rename to deployment-apps/ms_windows_ad_objects/samples/AD.Groups.LDAP.list_csv_backup
diff --git a/deployment-apps/ms_windows_ad_objects 3/samples/AD.OU.LDAP.list_csv_backup b/deployment-apps/ms_windows_ad_objects/samples/AD.OU.LDAP.list_csv_backup
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/samples/AD.OU.LDAP.list_csv_backup
rename to deployment-apps/ms_windows_ad_objects/samples/AD.OU.LDAP.list_csv_backup
diff --git a/deployment-apps/ms_windows_ad_objects 3/samples/AD.Users.LDAP.userAccountControl.desc_csv_backup b/deployment-apps/ms_windows_ad_objects/samples/AD.Users.LDAP.userAccountControl.desc_csv_backup
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/samples/AD.Users.LDAP.userAccountControl.desc_csv_backup
rename to deployment-apps/ms_windows_ad_objects/samples/AD.Users.LDAP.userAccountControl.desc_csv_backup
diff --git a/deployment-apps/ms_windows_ad_objects 3/samples/AD.Users.LDAP_csv_backup b/deployment-apps/ms_windows_ad_objects/samples/AD.Users.LDAP_csv_backup
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/samples/AD.Users.LDAP_csv_backup
rename to deployment-apps/ms_windows_ad_objects/samples/AD.Users.LDAP_csv_backup
diff --git a/deployment-apps/ms_windows_ad_objects 3/samples/sample_windows_inputs.log b/deployment-apps/ms_windows_ad_objects/samples/sample_windows_inputs.log
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/samples/sample_windows_inputs.log
rename to deployment-apps/ms_windows_ad_objects/samples/sample_windows_inputs.log
diff --git a/deployment-apps/ms_windows_ad_objects 3/splunkbase.manifest b/deployment-apps/ms_windows_ad_objects/splunkbase.manifest
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/splunkbase.manifest
rename to deployment-apps/ms_windows_ad_objects/splunkbase.manifest
diff --git a/deployment-apps/ms_windows_ad_objects 3/static/appIcon.png b/deployment-apps/ms_windows_ad_objects/static/appIcon.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/static/appIcon.png
rename to deployment-apps/ms_windows_ad_objects/static/appIcon.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/static/appIconAlt.png b/deployment-apps/ms_windows_ad_objects/static/appIconAlt.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/static/appIconAlt.png
rename to deployment-apps/ms_windows_ad_objects/static/appIconAlt.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/static/appIconAlt_2x.png b/deployment-apps/ms_windows_ad_objects/static/appIconAlt_2x.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/static/appIconAlt_2x.png
rename to deployment-apps/ms_windows_ad_objects/static/appIconAlt_2x.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/static/appIcon_2x.png b/deployment-apps/ms_windows_ad_objects/static/appIcon_2x.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/static/appIcon_2x.png
rename to deployment-apps/ms_windows_ad_objects/static/appIcon_2x.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/static/appLogo.png b/deployment-apps/ms_windows_ad_objects/static/appLogo.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/static/appLogo.png
rename to deployment-apps/ms_windows_ad_objects/static/appLogo.png
diff --git a/deployment-apps/ms_windows_ad_objects 3/static/appLogo_2x.png b/deployment-apps/ms_windows_ad_objects/static/appLogo_2x.png
similarity index 100%
rename from deployment-apps/ms_windows_ad_objects 3/static/appLogo_2x.png
rename to deployment-apps/ms_windows_ad_objects/static/appLogo_2x.png