diff --git a/lib_jtag_core/CMakeLists.txt b/lib_jtag_core/CMakeLists.txt
index 36512a4..e3a025b 100644
--- a/lib_jtag_core/CMakeLists.txt
+++ b/lib_jtag_core/CMakeLists.txt
@@ -1,7 +1,7 @@
-set(SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
+set(SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(LIB_FTD2XXX "${CMAKE_CURRENT_SOURCE_DIR}/../libs/libftd2xx.a")
 
-file(GLOB_RECURSE ALL_SOURCES "src/*.c")
+file(GLOB_RECURSE ALL_SOURCES "*.c")
 
 # Custom command to be executed before the build
 add_custom_command(
@@ -20,6 +20,7 @@ add_custom_target(
 add_compile_definitions(FTD2XX_STATIC)
 add_compile_definitions(FTDILIB)
 
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../libs)
 
 add_library(jtag_core ${ALL_SOURCES})
 add_dependencies(jtag_core prebuild)
diff --git a/lib_jtag_core/src/COPYING.LESSER b/lib_jtag_core/COPYING.LESSER
similarity index 100%
rename from lib_jtag_core/src/COPYING.LESSER
rename to lib_jtag_core/COPYING.LESSER
diff --git a/lib_jtag_core/src/bsdl_parser/bsdl_loader.c b/lib_jtag_core/bsdl_parser/bsdl_loader.c
similarity index 100%
rename from lib_jtag_core/src/bsdl_parser/bsdl_loader.c
rename to lib_jtag_core/bsdl_parser/bsdl_loader.c
diff --git a/lib_jtag_core/src/bsdl_parser/bsdl_loader.h b/lib_jtag_core/bsdl_parser/bsdl_loader.h
similarity index 100%
rename from lib_jtag_core/src/bsdl_parser/bsdl_loader.h
rename to lib_jtag_core/bsdl_parser/bsdl_loader.h
diff --git a/lib_jtag_core/src/bsdl_parser/bsdl_strings.c b/lib_jtag_core/bsdl_parser/bsdl_strings.c
similarity index 100%
rename from lib_jtag_core/src/bsdl_parser/bsdl_strings.c
rename to lib_jtag_core/bsdl_parser/bsdl_strings.c
diff --git a/lib_jtag_core/src/bsdl_parser/bsdl_strings.h b/lib_jtag_core/bsdl_parser/bsdl_strings.h
similarity index 100%
rename from lib_jtag_core/src/bsdl_parser/bsdl_strings.h
rename to lib_jtag_core/bsdl_parser/bsdl_strings.h
diff --git a/lib_jtag_core/src/bus_over_jtag/i2c_over_jtag.c b/lib_jtag_core/bus_over_jtag/i2c_over_jtag.c
similarity index 100%
rename from lib_jtag_core/src/bus_over_jtag/i2c_over_jtag.c
rename to lib_jtag_core/bus_over_jtag/i2c_over_jtag.c
diff --git a/lib_jtag_core/src/bus_over_jtag/mdio_over_jtag.c b/lib_jtag_core/bus_over_jtag/mdio_over_jtag.c
similarity index 100%
rename from lib_jtag_core/src/bus_over_jtag/mdio_over_jtag.c
rename to lib_jtag_core/bus_over_jtag/mdio_over_jtag.c
diff --git a/lib_jtag_core/src/bus_over_jtag/memory_over_jtag.c b/lib_jtag_core/bus_over_jtag/memory_over_jtag.c
similarity index 100%
rename from lib_jtag_core/src/bus_over_jtag/memory_over_jtag.c
rename to lib_jtag_core/bus_over_jtag/memory_over_jtag.c
diff --git a/lib_jtag_core/src/bus_over_jtag/spi_over_jtag.c b/lib_jtag_core/bus_over_jtag/spi_over_jtag.c
similarity index 100%
rename from lib_jtag_core/src/bus_over_jtag/spi_over_jtag.c
rename to lib_jtag_core/bus_over_jtag/spi_over_jtag.c
diff --git a/lib_jtag_core/src/config.script b/lib_jtag_core/config.script
similarity index 100%
rename from lib_jtag_core/src/config.script
rename to lib_jtag_core/config.script
diff --git a/lib_jtag_core/src/config_script.h b/lib_jtag_core/config_script.h
similarity index 100%
rename from lib_jtag_core/src/config_script.h
rename to lib_jtag_core/config_script.h
diff --git a/lib_jtag_core/src/dbg_logs.c b/lib_jtag_core/dbg_logs.c
similarity index 100%
rename from lib_jtag_core/src/dbg_logs.c
rename to lib_jtag_core/dbg_logs.c
diff --git a/lib_jtag_core/src/dbg_logs.h b/lib_jtag_core/dbg_logs.h
similarity index 100%
rename from lib_jtag_core/src/dbg_logs.h
rename to lib_jtag_core/dbg_logs.h
diff --git a/lib_jtag_core/src/drivers/drivers_list.c b/lib_jtag_core/drivers/drivers_list.c
similarity index 100%
rename from lib_jtag_core/src/drivers/drivers_list.c
rename to lib_jtag_core/drivers/drivers_list.c
diff --git a/lib_jtag_core/src/drivers/drivers_list.h b/lib_jtag_core/drivers/drivers_list.h
similarity index 100%
rename from lib_jtag_core/src/drivers/drivers_list.h
rename to lib_jtag_core/drivers/drivers_list.h
diff --git a/lib_jtag_core/src/drivers/drv_loader.c b/lib_jtag_core/drivers/drv_loader.c
similarity index 100%
rename from lib_jtag_core/src/drivers/drv_loader.c
rename to lib_jtag_core/drivers/drv_loader.c
diff --git a/lib_jtag_core/src/drivers/drv_loader.h b/lib_jtag_core/drivers/drv_loader.h
similarity index 100%
rename from lib_jtag_core/src/drivers/drv_loader.h
rename to lib_jtag_core/drivers/drv_loader.h
diff --git a/lib_jtag_core/src/drivers/ftdi_jtag/ftdi_jtag_drv.c b/lib_jtag_core/drivers/ftdi_jtag/ftdi_jtag_drv.c
similarity index 96%
rename from lib_jtag_core/src/drivers/ftdi_jtag/ftdi_jtag_drv.c
rename to lib_jtag_core/drivers/ftdi_jtag/ftdi_jtag_drv.c
index 3ea432a..c4468c1 100644
--- a/lib_jtag_core/src/drivers/ftdi_jtag/ftdi_jtag_drv.c
+++ b/lib_jtag_core/drivers/ftdi_jtag/ftdi_jtag_drv.c
@@ -42,7 +42,7 @@
 extern "C" {
 #endif
 
-#include "ftdi/ftd2xx.h"
+#include "ftd2xx.h"
 
 #ifdef __cplusplus
 }
diff --git a/lib_jtag_core/src/drivers/ftdi_jtag/ftdi_jtag_drv.h b/lib_jtag_core/drivers/ftdi_jtag/ftdi_jtag_drv.h
similarity index 100%
rename from lib_jtag_core/src/drivers/ftdi_jtag/ftdi_jtag_drv.h
rename to lib_jtag_core/drivers/ftdi_jtag/ftdi_jtag_drv.h
diff --git a/lib_jtag_core/src/drivers/jlink_jtag/jlink_jtag_drv.c b/lib_jtag_core/drivers/jlink_jtag/jlink_jtag_drv.c
similarity index 100%
rename from lib_jtag_core/src/drivers/jlink_jtag/jlink_jtag_drv.c
rename to lib_jtag_core/drivers/jlink_jtag/jlink_jtag_drv.c
diff --git a/lib_jtag_core/src/drivers/jlink_jtag/jlink_jtag_drv.h b/lib_jtag_core/drivers/jlink_jtag/jlink_jtag_drv.h
similarity index 100%
rename from lib_jtag_core/src/drivers/jlink_jtag/jlink_jtag_drv.h
rename to lib_jtag_core/drivers/jlink_jtag/jlink_jtag_drv.h
diff --git a/lib_jtag_core/src/drivers/linux_gpio_jtag/linux_gpio_jtag_drv.c b/lib_jtag_core/drivers/linux_gpio_jtag/linux_gpio_jtag_drv.c
similarity index 100%
rename from lib_jtag_core/src/drivers/linux_gpio_jtag/linux_gpio_jtag_drv.c
rename to lib_jtag_core/drivers/linux_gpio_jtag/linux_gpio_jtag_drv.c
diff --git a/lib_jtag_core/src/drivers/linux_gpio_jtag/linux_gpio_jtag_drv.h b/lib_jtag_core/drivers/linux_gpio_jtag/linux_gpio_jtag_drv.h
similarity index 100%
rename from lib_jtag_core/src/drivers/linux_gpio_jtag/linux_gpio_jtag_drv.h
rename to lib_jtag_core/drivers/linux_gpio_jtag/linux_gpio_jtag_drv.h
diff --git a/lib_jtag_core/src/drivers/lpt_jtag/lpt_jtag_drv.c b/lib_jtag_core/drivers/lpt_jtag/lpt_jtag_drv.c
similarity index 100%
rename from lib_jtag_core/src/drivers/lpt_jtag/lpt_jtag_drv.c
rename to lib_jtag_core/drivers/lpt_jtag/lpt_jtag_drv.c
diff --git a/lib_jtag_core/src/drivers/lpt_jtag/lpt_jtag_drv.h b/lib_jtag_core/drivers/lpt_jtag/lpt_jtag_drv.h
similarity index 100%
rename from lib_jtag_core/src/drivers/lpt_jtag/lpt_jtag_drv.h
rename to lib_jtag_core/drivers/lpt_jtag/lpt_jtag_drv.h
diff --git a/lib_jtag_core/src/jtag_core.c b/lib_jtag_core/jtag_core.c
similarity index 100%
rename from lib_jtag_core/src/jtag_core.c
rename to lib_jtag_core/jtag_core.c
diff --git a/lib_jtag_core/src/jtag_core.h b/lib_jtag_core/jtag_core.h
similarity index 100%
rename from lib_jtag_core/src/jtag_core.h
rename to lib_jtag_core/jtag_core.h
diff --git a/lib_jtag_core/src/jtag_core_internal.h b/lib_jtag_core/jtag_core_internal.h
similarity index 100%
rename from lib_jtag_core/src/jtag_core_internal.h
rename to lib_jtag_core/jtag_core_internal.h
diff --git a/lib_jtag_core/src/natsort/strnatcmp.c b/lib_jtag_core/natsort/strnatcmp.c
similarity index 100%
rename from lib_jtag_core/src/natsort/strnatcmp.c
rename to lib_jtag_core/natsort/strnatcmp.c
diff --git a/lib_jtag_core/src/natsort/strnatcmp.h b/lib_jtag_core/natsort/strnatcmp.h
similarity index 100%
rename from lib_jtag_core/src/natsort/strnatcmp.h
rename to lib_jtag_core/natsort/strnatcmp.h
diff --git a/lib_jtag_core/src/os_interface/fs.c b/lib_jtag_core/os_interface/fs.c
similarity index 100%
rename from lib_jtag_core/src/os_interface/fs.c
rename to lib_jtag_core/os_interface/fs.c
diff --git a/lib_jtag_core/src/os_interface/network.c b/lib_jtag_core/os_interface/network.c
similarity index 100%
rename from lib_jtag_core/src/os_interface/network.c
rename to lib_jtag_core/os_interface/network.c
diff --git a/lib_jtag_core/src/os_interface/network.h b/lib_jtag_core/os_interface/network.h
similarity index 100%
rename from lib_jtag_core/src/os_interface/network.h
rename to lib_jtag_core/os_interface/network.h
diff --git a/lib_jtag_core/src/os_interface/os_interface.c b/lib_jtag_core/os_interface/os_interface.c
similarity index 100%
rename from lib_jtag_core/src/os_interface/os_interface.c
rename to lib_jtag_core/os_interface/os_interface.c
diff --git a/lib_jtag_core/src/os_interface/os_interface.h b/lib_jtag_core/os_interface/os_interface.h
similarity index 100%
rename from lib_jtag_core/src/os_interface/os_interface.h
rename to lib_jtag_core/os_interface/os_interface.h
diff --git a/lib_jtag_core/src/os_interface/win32/libjtagcore.def b/lib_jtag_core/os_interface/win32/libjtagcore.def
similarity index 100%
rename from lib_jtag_core/src/os_interface/win32/libjtagcore.def
rename to lib_jtag_core/os_interface/win32/libjtagcore.def
diff --git a/lib_jtag_core/src/os_interface/win32/libjtagcore.rc b/lib_jtag_core/os_interface/win32/libjtagcore.rc
similarity index 100%
rename from lib_jtag_core/src/os_interface/win32/libjtagcore.rc
rename to lib_jtag_core/os_interface/win32/libjtagcore.rc
diff --git a/lib_jtag_core/src/os_interface/win32/stdint.h b/lib_jtag_core/os_interface/win32/stdint.h
similarity index 100%
rename from lib_jtag_core/src/os_interface/win32/stdint.h
rename to lib_jtag_core/os_interface/win32/stdint.h
diff --git a/lib_jtag_core/src/script/env.c b/lib_jtag_core/script/env.c
similarity index 100%
rename from lib_jtag_core/src/script/env.c
rename to lib_jtag_core/script/env.c
diff --git a/lib_jtag_core/src/script/env.h b/lib_jtag_core/script/env.h
similarity index 100%
rename from lib_jtag_core/src/script/env.h
rename to lib_jtag_core/script/env.h
diff --git a/lib_jtag_core/src/script/script.c b/lib_jtag_core/script/script.c
similarity index 100%
rename from lib_jtag_core/src/script/script.c
rename to lib_jtag_core/script/script.c
diff --git a/lib_jtag_core/src/script/script.h b/lib_jtag_core/script/script.h
similarity index 100%
rename from lib_jtag_core/src/script/script.h
rename to lib_jtag_core/script/script.h
diff --git a/lib_jtag_core/src/version.h b/lib_jtag_core/version.h
similarity index 100%
rename from lib_jtag_core/src/version.h
rename to lib_jtag_core/version.h
diff --git a/lib_jtag_core/src/drivers/ftdi_jtag/ftdi/WinTypes.h b/libs/WinTypes.h
similarity index 100%
rename from lib_jtag_core/src/drivers/ftdi_jtag/ftdi/WinTypes.h
rename to libs/WinTypes.h
diff --git a/lib_jtag_core/src/drivers/ftdi_jtag/ftdi/ftd2xx.h b/libs/ftd2xx.h
similarity index 100%
rename from lib_jtag_core/src/drivers/ftdi_jtag/ftdi/ftd2xx.h
rename to libs/ftd2xx.h