diff --git a/core/src/wlan_tdls_cmds_process.c b/components/tdls/core/src/wlan_tdls_cmds_process.c
similarity index 100%
rename from core/src/wlan_tdls_cmds_process.c
rename to components/tdls/core/src/wlan_tdls_cmds_process.c
diff --git a/core/src/wlan_tdls_cmds_process.h b/components/tdls/core/src/wlan_tdls_cmds_process.h
similarity index 100%
rename from core/src/wlan_tdls_cmds_process.h
rename to components/tdls/core/src/wlan_tdls_cmds_process.h
diff --git a/core/src/wlan_tdls_ct.c b/components/tdls/core/src/wlan_tdls_ct.c
similarity index 100%
rename from core/src/wlan_tdls_ct.c
rename to components/tdls/core/src/wlan_tdls_ct.c
diff --git a/core/src/wlan_tdls_ct.h b/components/tdls/core/src/wlan_tdls_ct.h
similarity index 100%
rename from core/src/wlan_tdls_ct.h
rename to components/tdls/core/src/wlan_tdls_ct.h
diff --git a/core/src/wlan_tdls_main.c b/components/tdls/core/src/wlan_tdls_main.c
similarity index 100%
rename from core/src/wlan_tdls_main.c
rename to components/tdls/core/src/wlan_tdls_main.c
diff --git a/core/src/wlan_tdls_main.h b/components/tdls/core/src/wlan_tdls_main.h
similarity index 100%
rename from core/src/wlan_tdls_main.h
rename to components/tdls/core/src/wlan_tdls_main.h
diff --git a/core/src/wlan_tdls_mgmt.c b/components/tdls/core/src/wlan_tdls_mgmt.c
similarity index 100%
rename from core/src/wlan_tdls_mgmt.c
rename to components/tdls/core/src/wlan_tdls_mgmt.c
diff --git a/core/src/wlan_tdls_mgmt.h b/components/tdls/core/src/wlan_tdls_mgmt.h
similarity index 100%
rename from core/src/wlan_tdls_mgmt.h
rename to components/tdls/core/src/wlan_tdls_mgmt.h
diff --git a/core/src/wlan_tdls_peer.c b/components/tdls/core/src/wlan_tdls_peer.c
similarity index 100%
rename from core/src/wlan_tdls_peer.c
rename to components/tdls/core/src/wlan_tdls_peer.c
diff --git a/core/src/wlan_tdls_peer.h b/components/tdls/core/src/wlan_tdls_peer.h
similarity index 100%
rename from core/src/wlan_tdls_peer.h
rename to components/tdls/core/src/wlan_tdls_peer.h
diff --git a/core/src/wlan_tdls_txrx.c b/components/tdls/core/src/wlan_tdls_txrx.c
similarity index 100%
rename from core/src/wlan_tdls_txrx.c
rename to components/tdls/core/src/wlan_tdls_txrx.c
diff --git a/core/src/wlan_tdls_txrx.h b/components/tdls/core/src/wlan_tdls_txrx.h
similarity index 100%
rename from core/src/wlan_tdls_txrx.h
rename to components/tdls/core/src/wlan_tdls_txrx.h
diff --git a/dispatcher/inc/wlan_tdls_cfg.h b/components/tdls/dispatcher/inc/wlan_tdls_cfg.h
similarity index 100%
rename from dispatcher/inc/wlan_tdls_cfg.h
rename to components/tdls/dispatcher/inc/wlan_tdls_cfg.h
diff --git a/dispatcher/inc/wlan_tdls_cfg_api.h b/components/tdls/dispatcher/inc/wlan_tdls_cfg_api.h
similarity index 100%
rename from dispatcher/inc/wlan_tdls_cfg_api.h
rename to components/tdls/dispatcher/inc/wlan_tdls_cfg_api.h
diff --git a/dispatcher/inc/wlan_tdls_public_structs.h b/components/tdls/dispatcher/inc/wlan_tdls_public_structs.h
similarity index 100%
rename from dispatcher/inc/wlan_tdls_public_structs.h
rename to components/tdls/dispatcher/inc/wlan_tdls_public_structs.h
diff --git a/dispatcher/inc/wlan_tdls_tgt_api.h b/components/tdls/dispatcher/inc/wlan_tdls_tgt_api.h
similarity index 100%
rename from dispatcher/inc/wlan_tdls_tgt_api.h
rename to components/tdls/dispatcher/inc/wlan_tdls_tgt_api.h
diff --git a/dispatcher/inc/wlan_tdls_ucfg_api.h b/components/tdls/dispatcher/inc/wlan_tdls_ucfg_api.h
similarity index 100%
rename from dispatcher/inc/wlan_tdls_ucfg_api.h
rename to components/tdls/dispatcher/inc/wlan_tdls_ucfg_api.h
diff --git a/dispatcher/src/wlan_tdls_cfg.c b/components/tdls/dispatcher/src/wlan_tdls_cfg.c
similarity index 100%
rename from dispatcher/src/wlan_tdls_cfg.c
rename to components/tdls/dispatcher/src/wlan_tdls_cfg.c
diff --git a/dispatcher/src/wlan_tdls_tgt_api.c b/components/tdls/dispatcher/src/wlan_tdls_tgt_api.c
similarity index 100%
rename from dispatcher/src/wlan_tdls_tgt_api.c
rename to components/tdls/dispatcher/src/wlan_tdls_tgt_api.c
diff --git a/dispatcher/src/wlan_tdls_ucfg_api.c b/components/tdls/dispatcher/src/wlan_tdls_ucfg_api.c
similarity index 100%
rename from dispatcher/src/wlan_tdls_ucfg_api.c
rename to components/tdls/dispatcher/src/wlan_tdls_ucfg_api.c
diff --git a/dispatcher/src/wlan_tdls_utils_api.c b/components/tdls/dispatcher/src/wlan_tdls_utils_api.c
similarity index 100%
rename from dispatcher/src/wlan_tdls_utils_api.c
rename to components/tdls/dispatcher/src/wlan_tdls_utils_api.c