diff --git a/CMakeLists.txt b/CMakeLists.txt
index afc306e..0eb1581 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
 # The following five lines of boilerplate have to be in your project's
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
+#set(COMPONENT_DIRS "${IDF_PATH}/components ${PROJECT_PATH}/components")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(esp8266_dap)
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/components/DAP/CMakeLists.txt b/components/DAP/CMakeLists.txt
new file mode 100644
index 0000000..83bea91
--- /dev/null
+++ b/components/DAP/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(COMPONENT_ADD_INCLUDEDIRS "config include")
+set(COMPONENT_SRCS "./source/DAP.c ./source/DAP_vendor.c ./source/JTAG_DP.c ./source/SW_DP.c ./source/SWO.c")
+
+register_component()
\ No newline at end of file
diff --git a/components/USBIP/CMakeLists.txt b/components/USBIP/CMakeLists.txt
new file mode 100644
index 0000000..d8f96b0
--- /dev/null
+++ b/components/USBIP/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(COMPONENT_ADD_INCLUDEDIRS ".")
+set(COMPONENT_SRCS "MSOS20Descriptors.c USB_handle.c USBd_config.c")
+
+register_component()
\ No newline at end of file
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index b961c72..d6ae4a1 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(COMPONENT_SRCS "main.c timer.c tcp_server.c usbip_server.c DAP_handle.c")
 set(COMPONENT_ADD_INCLUDEDIRS ". $ENV{IDF_PATH}/components/esp8266/include/esp8266/ ../components/USBIP")
+set(COMPONENT_SRCS "main.c timer.c tcp_server.c usbip_server.c DAP_handle.c")
 
 register_component()