diff --git a/inc/wlan_policy_mgr_api.h b/components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h
similarity index 100%
rename from inc/wlan_policy_mgr_api.h
rename to components/cmn_services/policy_mgr/inc/wlan_policy_mgr_api.h
diff --git a/inc/wlan_policy_mgr_cfg.h b/components/cmn_services/policy_mgr/inc/wlan_policy_mgr_cfg.h
similarity index 100%
rename from inc/wlan_policy_mgr_cfg.h
rename to components/cmn_services/policy_mgr/inc/wlan_policy_mgr_cfg.h
diff --git a/inc/wlan_policy_mgr_public_struct.h b/components/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h
similarity index 100%
rename from inc/wlan_policy_mgr_public_struct.h
rename to components/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h
diff --git a/inc/wlan_policy_mgr_ucfg.h b/components/cmn_services/policy_mgr/inc/wlan_policy_mgr_ucfg.h
similarity index 100%
rename from inc/wlan_policy_mgr_ucfg.h
rename to components/cmn_services/policy_mgr/inc/wlan_policy_mgr_ucfg.h
diff --git a/src/wlan_policy_mgr_action.c b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c
similarity index 100%
rename from src/wlan_policy_mgr_action.c
rename to components/cmn_services/policy_mgr/src/wlan_policy_mgr_action.c
diff --git a/src/wlan_policy_mgr_core.c b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_core.c
similarity index 100%
rename from src/wlan_policy_mgr_core.c
rename to components/cmn_services/policy_mgr/src/wlan_policy_mgr_core.c
diff --git a/src/wlan_policy_mgr_get_set_utils.c b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c
similarity index 100%
rename from src/wlan_policy_mgr_get_set_utils.c
rename to components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c
diff --git a/src/wlan_policy_mgr_i.h b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_i.h
similarity index 100%
rename from src/wlan_policy_mgr_i.h
rename to components/cmn_services/policy_mgr/src/wlan_policy_mgr_i.h
diff --git a/src/wlan_policy_mgr_init_deinit.c b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_init_deinit.c
similarity index 100%
rename from src/wlan_policy_mgr_init_deinit.c
rename to components/cmn_services/policy_mgr/src/wlan_policy_mgr_init_deinit.c
diff --git a/src/wlan_policy_mgr_pcl.c b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c
similarity index 100%
rename from src/wlan_policy_mgr_pcl.c
rename to components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c
diff --git a/src/wlan_policy_mgr_tables_1x1_dbs_i.h b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_tables_1x1_dbs_i.h
similarity index 100%
rename from src/wlan_policy_mgr_tables_1x1_dbs_i.h
rename to components/cmn_services/policy_mgr/src/wlan_policy_mgr_tables_1x1_dbs_i.h
diff --git a/src/wlan_policy_mgr_tables_2x2_2g_1x1_5g.h b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_tables_2x2_2g_1x1_5g.h
similarity index 100%
rename from src/wlan_policy_mgr_tables_2x2_2g_1x1_5g.h
rename to components/cmn_services/policy_mgr/src/wlan_policy_mgr_tables_2x2_2g_1x1_5g.h
diff --git a/src/wlan_policy_mgr_tables_2x2_5g_1x1_2g.h b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_tables_2x2_5g_1x1_2g.h
similarity index 100%
rename from src/wlan_policy_mgr_tables_2x2_5g_1x1_2g.h
rename to components/cmn_services/policy_mgr/src/wlan_policy_mgr_tables_2x2_5g_1x1_2g.h
diff --git a/src/wlan_policy_mgr_tables_2x2_dbs_i.h b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_tables_2x2_dbs_i.h
similarity index 100%
rename from src/wlan_policy_mgr_tables_2x2_dbs_i.h
rename to components/cmn_services/policy_mgr/src/wlan_policy_mgr_tables_2x2_dbs_i.h
diff --git a/src/wlan_policy_mgr_tables_no_dbs_i.h b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_tables_no_dbs_i.h
similarity index 100%
rename from src/wlan_policy_mgr_tables_no_dbs_i.h
rename to components/cmn_services/policy_mgr/src/wlan_policy_mgr_tables_no_dbs_i.h
diff --git a/src/wlan_policy_mgr_ucfg.c b/components/cmn_services/policy_mgr/src/wlan_policy_mgr_ucfg.c
similarity index 100%
rename from src/wlan_policy_mgr_ucfg.c
rename to components/cmn_services/policy_mgr/src/wlan_policy_mgr_ucfg.c