diff --git a/core/src/wlan_p2p_main.c b/components/p2p/core/src/wlan_p2p_main.c
similarity index 100%
rename from core/src/wlan_p2p_main.c
rename to components/p2p/core/src/wlan_p2p_main.c
diff --git a/core/src/wlan_p2p_main.h b/components/p2p/core/src/wlan_p2p_main.h
similarity index 100%
rename from core/src/wlan_p2p_main.h
rename to components/p2p/core/src/wlan_p2p_main.h
diff --git a/core/src/wlan_p2p_off_chan_tx.c b/components/p2p/core/src/wlan_p2p_off_chan_tx.c
similarity index 100%
rename from core/src/wlan_p2p_off_chan_tx.c
rename to components/p2p/core/src/wlan_p2p_off_chan_tx.c
diff --git a/core/src/wlan_p2p_off_chan_tx.h b/components/p2p/core/src/wlan_p2p_off_chan_tx.h
similarity index 100%
rename from core/src/wlan_p2p_off_chan_tx.h
rename to components/p2p/core/src/wlan_p2p_off_chan_tx.h
diff --git a/core/src/wlan_p2p_roc.c b/components/p2p/core/src/wlan_p2p_roc.c
similarity index 100%
rename from core/src/wlan_p2p_roc.c
rename to components/p2p/core/src/wlan_p2p_roc.c
diff --git a/core/src/wlan_p2p_roc.h b/components/p2p/core/src/wlan_p2p_roc.h
similarity index 100%
rename from core/src/wlan_p2p_roc.h
rename to components/p2p/core/src/wlan_p2p_roc.h
diff --git a/dispatcher/inc/wlan_p2p_cfg.h b/components/p2p/dispatcher/inc/wlan_p2p_cfg.h
similarity index 100%
rename from dispatcher/inc/wlan_p2p_cfg.h
rename to components/p2p/dispatcher/inc/wlan_p2p_cfg.h
diff --git a/dispatcher/inc/wlan_p2p_cfg_api.h b/components/p2p/dispatcher/inc/wlan_p2p_cfg_api.h
similarity index 100%
rename from dispatcher/inc/wlan_p2p_cfg_api.h
rename to components/p2p/dispatcher/inc/wlan_p2p_cfg_api.h
diff --git a/dispatcher/inc/wlan_p2p_public_struct.h b/components/p2p/dispatcher/inc/wlan_p2p_public_struct.h
similarity index 100%
rename from dispatcher/inc/wlan_p2p_public_struct.h
rename to components/p2p/dispatcher/inc/wlan_p2p_public_struct.h
diff --git a/dispatcher/inc/wlan_p2p_tgt_api.h b/components/p2p/dispatcher/inc/wlan_p2p_tgt_api.h
similarity index 100%
rename from dispatcher/inc/wlan_p2p_tgt_api.h
rename to components/p2p/dispatcher/inc/wlan_p2p_tgt_api.h
diff --git a/dispatcher/inc/wlan_p2p_ucfg_api.h b/components/p2p/dispatcher/inc/wlan_p2p_ucfg_api.h
similarity index 100%
rename from dispatcher/inc/wlan_p2p_ucfg_api.h
rename to components/p2p/dispatcher/inc/wlan_p2p_ucfg_api.h
diff --git a/dispatcher/src/wlan_p2p_cfg.c b/components/p2p/dispatcher/src/wlan_p2p_cfg.c
similarity index 100%
rename from dispatcher/src/wlan_p2p_cfg.c
rename to components/p2p/dispatcher/src/wlan_p2p_cfg.c
diff --git a/dispatcher/src/wlan_p2p_tgt_api.c b/components/p2p/dispatcher/src/wlan_p2p_tgt_api.c
similarity index 100%
rename from dispatcher/src/wlan_p2p_tgt_api.c
rename to components/p2p/dispatcher/src/wlan_p2p_tgt_api.c
diff --git a/dispatcher/src/wlan_p2p_ucfg_api.c b/components/p2p/dispatcher/src/wlan_p2p_ucfg_api.c
similarity index 100%
rename from dispatcher/src/wlan_p2p_ucfg_api.c
rename to components/p2p/dispatcher/src/wlan_p2p_ucfg_api.c