diff --git a/Kbuild b/Kbuild
index ee372fd4b9c6..d439762d7a48 100644
--- a/Kbuild
+++ b/Kbuild
@@ -883,7 +883,7 @@ UMAC_MGMT_TXRX_OBJS := $(UMAC_MGMT_TXRX_DIR)/core/src/wlan_mgmt_txrx_main.o \
 	$(UMAC_MGMT_TXRX_DIR)/dispatcher/src/wlan_mgmt_txrx_tgt_api.o
 
 ########## POWER MANAGEMENT OFFLOADS (PMO) ##########
-PMO_DIR :=	core/components/pmo
+PMO_DIR :=	components/pmo
 PMO_INC :=	-I$(WLAN_ROOT)/$(PMO_DIR)/core/inc \
 			-I$(WLAN_ROOT)/$(PMO_DIR)/core/src \
 			-I$(WLAN_ROOT)/$(PMO_DIR)/dispatcher/inc \
@@ -914,7 +914,7 @@ PMO_OBJS :=     $(PMO_DIR)/core/src/wlan_pmo_main.o \
 		$(PMO_DIR)/dispatcher/src/wlan_pmo_tgt_pkt_filter.o
 
 ########## CLD TARGET_IF #######
-CLD_TARGET_IF_DIR := core/components/target_if
+CLD_TARGET_IF_DIR := components/target_if
 
 CLD_TARGET_IF_INC := -I$(WLAN_ROOT)/$(CLD_TARGET_IF_DIR)/pmo/inc \
 					 -I$(WLAN_ROOT)/$(CLD_TARGET_IF_DIR)/pmo/src \
diff --git a/core/components/pmo/core/inc/wlan_pmo_arp.h b/components/pmo/core/inc/wlan_pmo_arp.h
similarity index 100%
rename from core/components/pmo/core/inc/wlan_pmo_arp.h
rename to components/pmo/core/inc/wlan_pmo_arp.h
diff --git a/core/components/pmo/core/inc/wlan_pmo_gtk.h b/components/pmo/core/inc/wlan_pmo_gtk.h
similarity index 100%
rename from core/components/pmo/core/inc/wlan_pmo_gtk.h
rename to components/pmo/core/inc/wlan_pmo_gtk.h
diff --git a/core/components/pmo/core/inc/wlan_pmo_hw_filter.h b/components/pmo/core/inc/wlan_pmo_hw_filter.h
similarity index 100%
rename from core/components/pmo/core/inc/wlan_pmo_hw_filter.h
rename to components/pmo/core/inc/wlan_pmo_hw_filter.h
diff --git a/core/components/pmo/core/inc/wlan_pmo_lphb.h b/components/pmo/core/inc/wlan_pmo_lphb.h
similarity index 100%
rename from core/components/pmo/core/inc/wlan_pmo_lphb.h
rename to components/pmo/core/inc/wlan_pmo_lphb.h
diff --git a/core/components/pmo/core/inc/wlan_pmo_main.h b/components/pmo/core/inc/wlan_pmo_main.h
similarity index 100%
rename from core/components/pmo/core/inc/wlan_pmo_main.h
rename to components/pmo/core/inc/wlan_pmo_main.h
diff --git a/core/components/pmo/core/inc/wlan_pmo_mc_addr_filtering.h b/components/pmo/core/inc/wlan_pmo_mc_addr_filtering.h
similarity index 100%
rename from core/components/pmo/core/inc/wlan_pmo_mc_addr_filtering.h
rename to components/pmo/core/inc/wlan_pmo_mc_addr_filtering.h
diff --git a/core/components/pmo/core/inc/wlan_pmo_ns.h b/components/pmo/core/inc/wlan_pmo_ns.h
similarity index 100%
rename from core/components/pmo/core/inc/wlan_pmo_ns.h
rename to components/pmo/core/inc/wlan_pmo_ns.h
diff --git a/core/components/pmo/core/inc/wlan_pmo_objmgr.h b/components/pmo/core/inc/wlan_pmo_objmgr.h
similarity index 100%
rename from core/components/pmo/core/inc/wlan_pmo_objmgr.h
rename to components/pmo/core/inc/wlan_pmo_objmgr.h
diff --git a/core/components/pmo/core/inc/wlan_pmo_pkt_filter.h b/components/pmo/core/inc/wlan_pmo_pkt_filter.h
similarity index 100%
rename from core/components/pmo/core/inc/wlan_pmo_pkt_filter.h
rename to components/pmo/core/inc/wlan_pmo_pkt_filter.h
diff --git a/core/components/pmo/core/inc/wlan_pmo_priv.h b/components/pmo/core/inc/wlan_pmo_priv.h
similarity index 100%
rename from core/components/pmo/core/inc/wlan_pmo_priv.h
rename to components/pmo/core/inc/wlan_pmo_priv.h
diff --git a/core/components/pmo/core/inc/wlan_pmo_static_config.h b/components/pmo/core/inc/wlan_pmo_static_config.h
similarity index 100%
rename from core/components/pmo/core/inc/wlan_pmo_static_config.h
rename to components/pmo/core/inc/wlan_pmo_static_config.h
diff --git a/core/components/pmo/core/inc/wlan_pmo_suspend_resume.h b/components/pmo/core/inc/wlan_pmo_suspend_resume.h
similarity index 100%
rename from core/components/pmo/core/inc/wlan_pmo_suspend_resume.h
rename to components/pmo/core/inc/wlan_pmo_suspend_resume.h
diff --git a/core/components/pmo/core/inc/wlan_pmo_wow.h b/components/pmo/core/inc/wlan_pmo_wow.h
similarity index 100%
rename from core/components/pmo/core/inc/wlan_pmo_wow.h
rename to components/pmo/core/inc/wlan_pmo_wow.h
diff --git a/core/components/pmo/core/src/wlan_pmo_arp.c b/components/pmo/core/src/wlan_pmo_arp.c
similarity index 100%
rename from core/components/pmo/core/src/wlan_pmo_arp.c
rename to components/pmo/core/src/wlan_pmo_arp.c
diff --git a/core/components/pmo/core/src/wlan_pmo_gtk.c b/components/pmo/core/src/wlan_pmo_gtk.c
similarity index 100%
rename from core/components/pmo/core/src/wlan_pmo_gtk.c
rename to components/pmo/core/src/wlan_pmo_gtk.c
diff --git a/core/components/pmo/core/src/wlan_pmo_hw_filter.c b/components/pmo/core/src/wlan_pmo_hw_filter.c
similarity index 100%
rename from core/components/pmo/core/src/wlan_pmo_hw_filter.c
rename to components/pmo/core/src/wlan_pmo_hw_filter.c
diff --git a/core/components/pmo/core/src/wlan_pmo_lphb.c b/components/pmo/core/src/wlan_pmo_lphb.c
similarity index 100%
rename from core/components/pmo/core/src/wlan_pmo_lphb.c
rename to components/pmo/core/src/wlan_pmo_lphb.c
diff --git a/core/components/pmo/core/src/wlan_pmo_main.c b/components/pmo/core/src/wlan_pmo_main.c
similarity index 100%
rename from core/components/pmo/core/src/wlan_pmo_main.c
rename to components/pmo/core/src/wlan_pmo_main.c
diff --git a/core/components/pmo/core/src/wlan_pmo_mc_addr_filtering.c b/components/pmo/core/src/wlan_pmo_mc_addr_filtering.c
similarity index 100%
rename from core/components/pmo/core/src/wlan_pmo_mc_addr_filtering.c
rename to components/pmo/core/src/wlan_pmo_mc_addr_filtering.c
diff --git a/core/components/pmo/core/src/wlan_pmo_ns.c b/components/pmo/core/src/wlan_pmo_ns.c
similarity index 100%
rename from core/components/pmo/core/src/wlan_pmo_ns.c
rename to components/pmo/core/src/wlan_pmo_ns.c
diff --git a/core/components/pmo/core/src/wlan_pmo_pkt_filter.c b/components/pmo/core/src/wlan_pmo_pkt_filter.c
similarity index 100%
rename from core/components/pmo/core/src/wlan_pmo_pkt_filter.c
rename to components/pmo/core/src/wlan_pmo_pkt_filter.c
diff --git a/core/components/pmo/core/src/wlan_pmo_static_config.c b/components/pmo/core/src/wlan_pmo_static_config.c
similarity index 100%
rename from core/components/pmo/core/src/wlan_pmo_static_config.c
rename to components/pmo/core/src/wlan_pmo_static_config.c
diff --git a/core/components/pmo/core/src/wlan_pmo_suspend_resume.c b/components/pmo/core/src/wlan_pmo_suspend_resume.c
similarity index 100%
rename from core/components/pmo/core/src/wlan_pmo_suspend_resume.c
rename to components/pmo/core/src/wlan_pmo_suspend_resume.c
diff --git a/core/components/pmo/core/src/wlan_pmo_wow.c b/components/pmo/core/src/wlan_pmo_wow.c
similarity index 100%
rename from core/components/pmo/core/src/wlan_pmo_wow.c
rename to components/pmo/core/src/wlan_pmo_wow.c
diff --git a/core/components/pmo/dispatcher/inc/wlan_pmo_arp_public_struct.h b/components/pmo/dispatcher/inc/wlan_pmo_arp_public_struct.h
similarity index 100%
rename from core/components/pmo/dispatcher/inc/wlan_pmo_arp_public_struct.h
rename to components/pmo/dispatcher/inc/wlan_pmo_arp_public_struct.h
diff --git a/core/components/pmo/dispatcher/inc/wlan_pmo_common_public_struct.h b/components/pmo/dispatcher/inc/wlan_pmo_common_public_struct.h
similarity index 100%
rename from core/components/pmo/dispatcher/inc/wlan_pmo_common_public_struct.h
rename to components/pmo/dispatcher/inc/wlan_pmo_common_public_struct.h
diff --git a/core/components/pmo/dispatcher/inc/wlan_pmo_gtk_public_struct.h b/components/pmo/dispatcher/inc/wlan_pmo_gtk_public_struct.h
similarity index 100%
rename from core/components/pmo/dispatcher/inc/wlan_pmo_gtk_public_struct.h
rename to components/pmo/dispatcher/inc/wlan_pmo_gtk_public_struct.h
diff --git a/core/components/pmo/dispatcher/inc/wlan_pmo_hw_filter_public_struct.h b/components/pmo/dispatcher/inc/wlan_pmo_hw_filter_public_struct.h
similarity index 100%
rename from core/components/pmo/dispatcher/inc/wlan_pmo_hw_filter_public_struct.h
rename to components/pmo/dispatcher/inc/wlan_pmo_hw_filter_public_struct.h
diff --git a/core/components/pmo/dispatcher/inc/wlan_pmo_lphb_public_struct.h b/components/pmo/dispatcher/inc/wlan_pmo_lphb_public_struct.h
similarity index 100%
rename from core/components/pmo/dispatcher/inc/wlan_pmo_lphb_public_struct.h
rename to components/pmo/dispatcher/inc/wlan_pmo_lphb_public_struct.h
diff --git a/core/components/pmo/dispatcher/inc/wlan_pmo_mc_addr_filtering_public_struct.h b/components/pmo/dispatcher/inc/wlan_pmo_mc_addr_filtering_public_struct.h
similarity index 100%
rename from core/components/pmo/dispatcher/inc/wlan_pmo_mc_addr_filtering_public_struct.h
rename to components/pmo/dispatcher/inc/wlan_pmo_mc_addr_filtering_public_struct.h
diff --git a/core/components/pmo/dispatcher/inc/wlan_pmo_ns_public_struct.h b/components/pmo/dispatcher/inc/wlan_pmo_ns_public_struct.h
similarity index 100%
rename from core/components/pmo/dispatcher/inc/wlan_pmo_ns_public_struct.h
rename to components/pmo/dispatcher/inc/wlan_pmo_ns_public_struct.h
diff --git a/core/components/pmo/dispatcher/inc/wlan_pmo_obj_mgmt_api.h b/components/pmo/dispatcher/inc/wlan_pmo_obj_mgmt_api.h
similarity index 100%
rename from core/components/pmo/dispatcher/inc/wlan_pmo_obj_mgmt_api.h
rename to components/pmo/dispatcher/inc/wlan_pmo_obj_mgmt_api.h
diff --git a/core/components/pmo/dispatcher/inc/wlan_pmo_obj_mgmt_public_struct.h b/components/pmo/dispatcher/inc/wlan_pmo_obj_mgmt_public_struct.h
similarity index 100%
rename from core/components/pmo/dispatcher/inc/wlan_pmo_obj_mgmt_public_struct.h
rename to components/pmo/dispatcher/inc/wlan_pmo_obj_mgmt_public_struct.h
diff --git a/core/components/pmo/dispatcher/inc/wlan_pmo_pkt_filter_public_struct.h b/components/pmo/dispatcher/inc/wlan_pmo_pkt_filter_public_struct.h
similarity index 100%
rename from core/components/pmo/dispatcher/inc/wlan_pmo_pkt_filter_public_struct.h
rename to components/pmo/dispatcher/inc/wlan_pmo_pkt_filter_public_struct.h
diff --git a/core/components/pmo/dispatcher/inc/wlan_pmo_tgt_api.h b/components/pmo/dispatcher/inc/wlan_pmo_tgt_api.h
similarity index 100%
rename from core/components/pmo/dispatcher/inc/wlan_pmo_tgt_api.h
rename to components/pmo/dispatcher/inc/wlan_pmo_tgt_api.h
diff --git a/core/components/pmo/dispatcher/inc/wlan_pmo_ucfg_api.h b/components/pmo/dispatcher/inc/wlan_pmo_ucfg_api.h
similarity index 100%
rename from core/components/pmo/dispatcher/inc/wlan_pmo_ucfg_api.h
rename to components/pmo/dispatcher/inc/wlan_pmo_ucfg_api.h
diff --git a/core/components/pmo/dispatcher/inc/wlan_pmo_wow_public_struct.h b/components/pmo/dispatcher/inc/wlan_pmo_wow_public_struct.h
similarity index 100%
rename from core/components/pmo/dispatcher/inc/wlan_pmo_wow_public_struct.h
rename to components/pmo/dispatcher/inc/wlan_pmo_wow_public_struct.h
diff --git a/core/components/pmo/dispatcher/src/wlan_pmo_obj_mgmt_api.c b/components/pmo/dispatcher/src/wlan_pmo_obj_mgmt_api.c
similarity index 100%
rename from core/components/pmo/dispatcher/src/wlan_pmo_obj_mgmt_api.c
rename to components/pmo/dispatcher/src/wlan_pmo_obj_mgmt_api.c
diff --git a/core/components/pmo/dispatcher/src/wlan_pmo_tgt_arp.c b/components/pmo/dispatcher/src/wlan_pmo_tgt_arp.c
similarity index 100%
rename from core/components/pmo/dispatcher/src/wlan_pmo_tgt_arp.c
rename to components/pmo/dispatcher/src/wlan_pmo_tgt_arp.c
diff --git a/core/components/pmo/dispatcher/src/wlan_pmo_tgt_gtk.c b/components/pmo/dispatcher/src/wlan_pmo_tgt_gtk.c
similarity index 100%
rename from core/components/pmo/dispatcher/src/wlan_pmo_tgt_gtk.c
rename to components/pmo/dispatcher/src/wlan_pmo_tgt_gtk.c
diff --git a/core/components/pmo/dispatcher/src/wlan_pmo_tgt_hw_filter.c b/components/pmo/dispatcher/src/wlan_pmo_tgt_hw_filter.c
similarity index 100%
rename from core/components/pmo/dispatcher/src/wlan_pmo_tgt_hw_filter.c
rename to components/pmo/dispatcher/src/wlan_pmo_tgt_hw_filter.c
diff --git a/core/components/pmo/dispatcher/src/wlan_pmo_tgt_lphb.c b/components/pmo/dispatcher/src/wlan_pmo_tgt_lphb.c
similarity index 100%
rename from core/components/pmo/dispatcher/src/wlan_pmo_tgt_lphb.c
rename to components/pmo/dispatcher/src/wlan_pmo_tgt_lphb.c
diff --git a/core/components/pmo/dispatcher/src/wlan_pmo_tgt_mc_addr_filtering.c b/components/pmo/dispatcher/src/wlan_pmo_tgt_mc_addr_filtering.c
similarity index 100%
rename from core/components/pmo/dispatcher/src/wlan_pmo_tgt_mc_addr_filtering.c
rename to components/pmo/dispatcher/src/wlan_pmo_tgt_mc_addr_filtering.c
diff --git a/core/components/pmo/dispatcher/src/wlan_pmo_tgt_ns.c b/components/pmo/dispatcher/src/wlan_pmo_tgt_ns.c
similarity index 100%
rename from core/components/pmo/dispatcher/src/wlan_pmo_tgt_ns.c
rename to components/pmo/dispatcher/src/wlan_pmo_tgt_ns.c
diff --git a/core/components/pmo/dispatcher/src/wlan_pmo_tgt_pkt_filter.c b/components/pmo/dispatcher/src/wlan_pmo_tgt_pkt_filter.c
similarity index 100%
rename from core/components/pmo/dispatcher/src/wlan_pmo_tgt_pkt_filter.c
rename to components/pmo/dispatcher/src/wlan_pmo_tgt_pkt_filter.c
diff --git a/core/components/pmo/dispatcher/src/wlan_pmo_tgt_static_config.c b/components/pmo/dispatcher/src/wlan_pmo_tgt_static_config.c
similarity index 100%
rename from core/components/pmo/dispatcher/src/wlan_pmo_tgt_static_config.c
rename to components/pmo/dispatcher/src/wlan_pmo_tgt_static_config.c
diff --git a/core/components/pmo/dispatcher/src/wlan_pmo_tgt_suspend_resume.c b/components/pmo/dispatcher/src/wlan_pmo_tgt_suspend_resume.c
similarity index 100%
rename from core/components/pmo/dispatcher/src/wlan_pmo_tgt_suspend_resume.c
rename to components/pmo/dispatcher/src/wlan_pmo_tgt_suspend_resume.c
diff --git a/core/components/pmo/dispatcher/src/wlan_pmo_tgt_wow.c b/components/pmo/dispatcher/src/wlan_pmo_tgt_wow.c
similarity index 100%
rename from core/components/pmo/dispatcher/src/wlan_pmo_tgt_wow.c
rename to components/pmo/dispatcher/src/wlan_pmo_tgt_wow.c
diff --git a/core/components/pmo/dispatcher/src/wlan_pmo_ucfg_api.c b/components/pmo/dispatcher/src/wlan_pmo_ucfg_api.c
similarity index 100%
rename from core/components/pmo/dispatcher/src/wlan_pmo_ucfg_api.c
rename to components/pmo/dispatcher/src/wlan_pmo_ucfg_api.c
diff --git a/core/components/target_if/pmo/inc/target_if_pmo.h b/components/target_if/pmo/inc/target_if_pmo.h
similarity index 100%
rename from core/components/target_if/pmo/inc/target_if_pmo.h
rename to components/target_if/pmo/inc/target_if_pmo.h
diff --git a/core/components/target_if/pmo/src/target_if_pmo_arp.c b/components/target_if/pmo/src/target_if_pmo_arp.c
similarity index 100%
rename from core/components/target_if/pmo/src/target_if_pmo_arp.c
rename to components/target_if/pmo/src/target_if_pmo_arp.c
diff --git a/core/components/target_if/pmo/src/target_if_pmo_gtk.c b/components/target_if/pmo/src/target_if_pmo_gtk.c
similarity index 100%
rename from core/components/target_if/pmo/src/target_if_pmo_gtk.c
rename to components/target_if/pmo/src/target_if_pmo_gtk.c
diff --git a/core/components/target_if/pmo/src/target_if_pmo_hw_filter.c b/components/target_if/pmo/src/target_if_pmo_hw_filter.c
similarity index 100%
rename from core/components/target_if/pmo/src/target_if_pmo_hw_filter.c
rename to components/target_if/pmo/src/target_if_pmo_hw_filter.c
diff --git a/core/components/target_if/pmo/src/target_if_pmo_lphb.c b/components/target_if/pmo/src/target_if_pmo_lphb.c
similarity index 100%
rename from core/components/target_if/pmo/src/target_if_pmo_lphb.c
rename to components/target_if/pmo/src/target_if_pmo_lphb.c
diff --git a/core/components/target_if/pmo/src/target_if_pmo_main.c b/components/target_if/pmo/src/target_if_pmo_main.c
similarity index 100%
rename from core/components/target_if/pmo/src/target_if_pmo_main.c
rename to components/target_if/pmo/src/target_if_pmo_main.c
diff --git a/core/components/target_if/pmo/src/target_if_pmo_mc_addr_filtering.c b/components/target_if/pmo/src/target_if_pmo_mc_addr_filtering.c
similarity index 100%
rename from core/components/target_if/pmo/src/target_if_pmo_mc_addr_filtering.c
rename to components/target_if/pmo/src/target_if_pmo_mc_addr_filtering.c
diff --git a/core/components/target_if/pmo/src/target_if_pmo_ns.c b/components/target_if/pmo/src/target_if_pmo_ns.c
similarity index 100%
rename from core/components/target_if/pmo/src/target_if_pmo_ns.c
rename to components/target_if/pmo/src/target_if_pmo_ns.c
diff --git a/core/components/target_if/pmo/src/target_if_pmo_pkt_filter.c b/components/target_if/pmo/src/target_if_pmo_pkt_filter.c
similarity index 100%
rename from core/components/target_if/pmo/src/target_if_pmo_pkt_filter.c
rename to components/target_if/pmo/src/target_if_pmo_pkt_filter.c
diff --git a/core/components/target_if/pmo/src/target_if_pmo_static_config.c b/components/target_if/pmo/src/target_if_pmo_static_config.c
similarity index 100%
rename from core/components/target_if/pmo/src/target_if_pmo_static_config.c
rename to components/target_if/pmo/src/target_if_pmo_static_config.c
diff --git a/core/components/target_if/pmo/src/target_if_pmo_suspend_resume.c b/components/target_if/pmo/src/target_if_pmo_suspend_resume.c
similarity index 100%
rename from core/components/target_if/pmo/src/target_if_pmo_suspend_resume.c
rename to components/target_if/pmo/src/target_if_pmo_suspend_resume.c
diff --git a/core/components/target_if/pmo/src/target_if_pmo_wow.c b/components/target_if/pmo/src/target_if_pmo_wow.c
similarity index 100%
rename from core/components/target_if/pmo/src/target_if_pmo_wow.c
rename to components/target_if/pmo/src/target_if_pmo_wow.c