diff --git a/power_management_offloads/core/inc/wlan_pmo_arp.h b/pmo/core/inc/wlan_pmo_arp.h
similarity index 100%
rename from power_management_offloads/core/inc/wlan_pmo_arp.h
rename to pmo/core/inc/wlan_pmo_arp.h
diff --git a/power_management_offloads/core/inc/wlan_pmo_gtk.h b/pmo/core/inc/wlan_pmo_gtk.h
similarity index 100%
rename from power_management_offloads/core/inc/wlan_pmo_gtk.h
rename to pmo/core/inc/wlan_pmo_gtk.h
diff --git a/power_management_offloads/core/inc/wlan_pmo_hw_bcast_fltr.h b/pmo/core/inc/wlan_pmo_hw_bcast_fltr.h
similarity index 100%
rename from power_management_offloads/core/inc/wlan_pmo_hw_bcast_fltr.h
rename to pmo/core/inc/wlan_pmo_hw_bcast_fltr.h
diff --git a/power_management_offloads/core/inc/wlan_pmo_lphb.h b/pmo/core/inc/wlan_pmo_lphb.h
similarity index 100%
rename from power_management_offloads/core/inc/wlan_pmo_lphb.h
rename to pmo/core/inc/wlan_pmo_lphb.h
diff --git a/power_management_offloads/core/inc/wlan_pmo_main.h b/pmo/core/inc/wlan_pmo_main.h
similarity index 100%
rename from power_management_offloads/core/inc/wlan_pmo_main.h
rename to pmo/core/inc/wlan_pmo_main.h
diff --git a/power_management_offloads/core/inc/wlan_pmo_mc_addr_filtering.h b/pmo/core/inc/wlan_pmo_mc_addr_filtering.h
similarity index 100%
rename from power_management_offloads/core/inc/wlan_pmo_mc_addr_filtering.h
rename to pmo/core/inc/wlan_pmo_mc_addr_filtering.h
diff --git a/power_management_offloads/core/inc/wlan_pmo_ns.h b/pmo/core/inc/wlan_pmo_ns.h
similarity index 100%
rename from power_management_offloads/core/inc/wlan_pmo_ns.h
rename to pmo/core/inc/wlan_pmo_ns.h
diff --git a/power_management_offloads/core/inc/wlan_pmo_static_config.h b/pmo/core/inc/wlan_pmo_static_config.h
similarity index 100%
rename from power_management_offloads/core/inc/wlan_pmo_static_config.h
rename to pmo/core/inc/wlan_pmo_static_config.h
diff --git a/power_management_offloads/core/inc/wlan_pmo_suspend_resume.h b/pmo/core/inc/wlan_pmo_suspend_resume.h
similarity index 100%
rename from power_management_offloads/core/inc/wlan_pmo_suspend_resume.h
rename to pmo/core/inc/wlan_pmo_suspend_resume.h
diff --git a/power_management_offloads/core/inc/wlan_pmo_wow.h b/pmo/core/inc/wlan_pmo_wow.h
similarity index 100%
rename from power_management_offloads/core/inc/wlan_pmo_wow.h
rename to pmo/core/inc/wlan_pmo_wow.h
diff --git a/power_management_offloads/core/src/wlan_pmo_arp.c b/pmo/core/src/wlan_pmo_arp.c
similarity index 100%
rename from power_management_offloads/core/src/wlan_pmo_arp.c
rename to pmo/core/src/wlan_pmo_arp.c
diff --git a/power_management_offloads/core/src/wlan_pmo_gtk.c b/pmo/core/src/wlan_pmo_gtk.c
similarity index 100%
rename from power_management_offloads/core/src/wlan_pmo_gtk.c
rename to pmo/core/src/wlan_pmo_gtk.c
diff --git a/power_management_offloads/core/src/wlan_pmo_hw_bcast_fltr.c b/pmo/core/src/wlan_pmo_hw_bcast_fltr.c
similarity index 100%
rename from power_management_offloads/core/src/wlan_pmo_hw_bcast_fltr.c
rename to pmo/core/src/wlan_pmo_hw_bcast_fltr.c
diff --git a/power_management_offloads/core/src/wlan_pmo_lphb.c b/pmo/core/src/wlan_pmo_lphb.c
similarity index 100%
rename from power_management_offloads/core/src/wlan_pmo_lphb.c
rename to pmo/core/src/wlan_pmo_lphb.c
diff --git a/power_management_offloads/core/src/wlan_pmo_main.c b/pmo/core/src/wlan_pmo_main.c
similarity index 100%
rename from power_management_offloads/core/src/wlan_pmo_main.c
rename to pmo/core/src/wlan_pmo_main.c
diff --git a/power_management_offloads/core/src/wlan_pmo_mc_addr_filtering.c b/pmo/core/src/wlan_pmo_mc_addr_filtering.c
similarity index 100%
rename from power_management_offloads/core/src/wlan_pmo_mc_addr_filtering.c
rename to pmo/core/src/wlan_pmo_mc_addr_filtering.c
diff --git a/power_management_offloads/core/src/wlan_pmo_ns.c b/pmo/core/src/wlan_pmo_ns.c
similarity index 100%
rename from power_management_offloads/core/src/wlan_pmo_ns.c
rename to pmo/core/src/wlan_pmo_ns.c
diff --git a/power_management_offloads/core/src/wlan_pmo_static_config.c b/pmo/core/src/wlan_pmo_static_config.c
similarity index 100%
rename from power_management_offloads/core/src/wlan_pmo_static_config.c
rename to pmo/core/src/wlan_pmo_static_config.c
diff --git a/power_management_offloads/core/src/wlan_pmo_suspend_resume.c b/pmo/core/src/wlan_pmo_suspend_resume.c
similarity index 100%
rename from power_management_offloads/core/src/wlan_pmo_suspend_resume.c
rename to pmo/core/src/wlan_pmo_suspend_resume.c
diff --git a/power_management_offloads/core/src/wlan_pmo_wow.c b/pmo/core/src/wlan_pmo_wow.c
similarity index 100%
rename from power_management_offloads/core/src/wlan_pmo_wow.c
rename to pmo/core/src/wlan_pmo_wow.c
diff --git a/power_management_offloads/dispatcher/inc/wlan_pmo_arp_public_struct.h b/pmo/dispatcher/inc/wlan_pmo_arp_public_struct.h
similarity index 100%
rename from power_management_offloads/dispatcher/inc/wlan_pmo_arp_public_struct.h
rename to pmo/dispatcher/inc/wlan_pmo_arp_public_struct.h
diff --git a/power_management_offloads/dispatcher/inc/wlan_pmo_common_public_struct.h b/pmo/dispatcher/inc/wlan_pmo_common_public_struct.h
similarity index 100%
rename from power_management_offloads/dispatcher/inc/wlan_pmo_common_public_struct.h
rename to pmo/dispatcher/inc/wlan_pmo_common_public_struct.h
diff --git a/power_management_offloads/dispatcher/inc/wlan_pmo_gtk_public_struct.h b/pmo/dispatcher/inc/wlan_pmo_gtk_public_struct.h
similarity index 100%
rename from power_management_offloads/dispatcher/inc/wlan_pmo_gtk_public_struct.h
rename to pmo/dispatcher/inc/wlan_pmo_gtk_public_struct.h
diff --git a/power_management_offloads/dispatcher/inc/wlan_pmo_lphb_public_struct.h b/pmo/dispatcher/inc/wlan_pmo_lphb_public_struct.h
similarity index 100%
rename from power_management_offloads/dispatcher/inc/wlan_pmo_lphb_public_struct.h
rename to pmo/dispatcher/inc/wlan_pmo_lphb_public_struct.h
diff --git a/power_management_offloads/dispatcher/inc/wlan_pmo_mc_addr_filtering_public_struct.h b/pmo/dispatcher/inc/wlan_pmo_mc_addr_filtering_public_struct.h
similarity index 100%
rename from power_management_offloads/dispatcher/inc/wlan_pmo_mc_addr_filtering_public_struct.h
rename to pmo/dispatcher/inc/wlan_pmo_mc_addr_filtering_public_struct.h
diff --git a/power_management_offloads/dispatcher/inc/wlan_pmo_non_arp_hwbcast_public_struct.h b/pmo/dispatcher/inc/wlan_pmo_non_arp_hwbcast_public_struct.h
similarity index 100%
rename from power_management_offloads/dispatcher/inc/wlan_pmo_non_arp_hwbcast_public_struct.h
rename to pmo/dispatcher/inc/wlan_pmo_non_arp_hwbcast_public_struct.h
diff --git a/power_management_offloads/dispatcher/inc/wlan_pmo_ns_public_struct.h b/pmo/dispatcher/inc/wlan_pmo_ns_public_struct.h
similarity index 100%
rename from power_management_offloads/dispatcher/inc/wlan_pmo_ns_public_struct.h
rename to pmo/dispatcher/inc/wlan_pmo_ns_public_struct.h
diff --git a/power_management_offloads/dispatcher/inc/wlan_pmo_obj_mgmt_api.h b/pmo/dispatcher/inc/wlan_pmo_obj_mgmt_api.h
similarity index 100%
rename from power_management_offloads/dispatcher/inc/wlan_pmo_obj_mgmt_api.h
rename to pmo/dispatcher/inc/wlan_pmo_obj_mgmt_api.h
diff --git a/power_management_offloads/dispatcher/inc/wlan_pmo_obj_mgmt_public_struct.h b/pmo/dispatcher/inc/wlan_pmo_obj_mgmt_public_struct.h
similarity index 100%
rename from power_management_offloads/dispatcher/inc/wlan_pmo_obj_mgmt_public_struct.h
rename to pmo/dispatcher/inc/wlan_pmo_obj_mgmt_public_struct.h
diff --git a/power_management_offloads/dispatcher/inc/wlan_pmo_tgt_api.h b/pmo/dispatcher/inc/wlan_pmo_tgt_api.h
similarity index 100%
rename from power_management_offloads/dispatcher/inc/wlan_pmo_tgt_api.h
rename to pmo/dispatcher/inc/wlan_pmo_tgt_api.h
diff --git a/power_management_offloads/dispatcher/inc/wlan_pmo_ucfg_api.h b/pmo/dispatcher/inc/wlan_pmo_ucfg_api.h
similarity index 100%
rename from power_management_offloads/dispatcher/inc/wlan_pmo_ucfg_api.h
rename to pmo/dispatcher/inc/wlan_pmo_ucfg_api.h
diff --git a/power_management_offloads/dispatcher/inc/wlan_pmo_wow_public_struct.h b/pmo/dispatcher/inc/wlan_pmo_wow_public_struct.h
similarity index 100%
rename from power_management_offloads/dispatcher/inc/wlan_pmo_wow_public_struct.h
rename to pmo/dispatcher/inc/wlan_pmo_wow_public_struct.h
diff --git a/power_management_offloads/dispatcher/src/wlan_pmo_obj_mgmt_api.c b/pmo/dispatcher/src/wlan_pmo_obj_mgmt_api.c
similarity index 100%
rename from power_management_offloads/dispatcher/src/wlan_pmo_obj_mgmt_api.c
rename to pmo/dispatcher/src/wlan_pmo_obj_mgmt_api.c
diff --git a/power_management_offloads/dispatcher/src/wlan_pmo_tgt_arp.c b/pmo/dispatcher/src/wlan_pmo_tgt_arp.c
similarity index 100%
rename from power_management_offloads/dispatcher/src/wlan_pmo_tgt_arp.c
rename to pmo/dispatcher/src/wlan_pmo_tgt_arp.c
diff --git a/power_management_offloads/dispatcher/src/wlan_pmo_tgt_gtk.c b/pmo/dispatcher/src/wlan_pmo_tgt_gtk.c
similarity index 100%
rename from power_management_offloads/dispatcher/src/wlan_pmo_tgt_gtk.c
rename to pmo/dispatcher/src/wlan_pmo_tgt_gtk.c
diff --git a/power_management_offloads/dispatcher/src/wlan_pmo_tgt_lphb.c b/pmo/dispatcher/src/wlan_pmo_tgt_lphb.c
similarity index 100%
rename from power_management_offloads/dispatcher/src/wlan_pmo_tgt_lphb.c
rename to pmo/dispatcher/src/wlan_pmo_tgt_lphb.c
diff --git a/power_management_offloads/dispatcher/src/wlan_pmo_tgt_mc_addr_filtering.c b/pmo/dispatcher/src/wlan_pmo_tgt_mc_addr_filtering.c
similarity index 100%
rename from power_management_offloads/dispatcher/src/wlan_pmo_tgt_mc_addr_filtering.c
rename to pmo/dispatcher/src/wlan_pmo_tgt_mc_addr_filtering.c
diff --git a/power_management_offloads/dispatcher/src/wlan_pmo_tgt_non_arp_bcast_fltr.c b/pmo/dispatcher/src/wlan_pmo_tgt_non_arp_bcast_fltr.c
similarity index 100%
rename from power_management_offloads/dispatcher/src/wlan_pmo_tgt_non_arp_bcast_fltr.c
rename to pmo/dispatcher/src/wlan_pmo_tgt_non_arp_bcast_fltr.c
diff --git a/power_management_offloads/dispatcher/src/wlan_pmo_tgt_ns.c b/pmo/dispatcher/src/wlan_pmo_tgt_ns.c
similarity index 100%
rename from power_management_offloads/dispatcher/src/wlan_pmo_tgt_ns.c
rename to pmo/dispatcher/src/wlan_pmo_tgt_ns.c
diff --git a/power_management_offloads/dispatcher/src/wlan_pmo_tgt_static_config.c b/pmo/dispatcher/src/wlan_pmo_tgt_static_config.c
similarity index 100%
rename from power_management_offloads/dispatcher/src/wlan_pmo_tgt_static_config.c
rename to pmo/dispatcher/src/wlan_pmo_tgt_static_config.c
diff --git a/power_management_offloads/dispatcher/src/wlan_pmo_tgt_suspend_resume.c b/pmo/dispatcher/src/wlan_pmo_tgt_suspend_resume.c
similarity index 100%
rename from power_management_offloads/dispatcher/src/wlan_pmo_tgt_suspend_resume.c
rename to pmo/dispatcher/src/wlan_pmo_tgt_suspend_resume.c
diff --git a/power_management_offloads/dispatcher/src/wlan_pmo_tgt_wow.c b/pmo/dispatcher/src/wlan_pmo_tgt_wow.c
similarity index 100%
rename from power_management_offloads/dispatcher/src/wlan_pmo_tgt_wow.c
rename to pmo/dispatcher/src/wlan_pmo_tgt_wow.c
diff --git a/power_management_offloads/dispatcher/src/wlan_pmo_ucfg_api.c b/pmo/dispatcher/src/wlan_pmo_ucfg_api.c
similarity index 100%
rename from power_management_offloads/dispatcher/src/wlan_pmo_ucfg_api.c
rename to pmo/dispatcher/src/wlan_pmo_ucfg_api.c