diff --git a/CMakeLists.txt b/CMakeLists.txt
index 472b489..901d3d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,25 @@
 cmake_minimum_required(VERSION 3.10)
+
 project(BoundaryScanExplorer)
 
-add_subdirectory(libs/lib_jtag_core)
-add_subdirectory(libs/os_interface)
-add_subdirectory(libs/natsort)
-add_subdirectory(libs/script)
-add_subdirectory(libs/drivers)
-add_subdirectory(libs/bus_over_jtag)
-add_subdirectory(libs/bsdl_parser)
-add_subdirectory(app)
\ No newline at end of file
+# jtag_core must be the last linked archive for the application to compile
+set(BS_MODULES jtag_core)
+
+# We dive into submodules
+file(GLOB MODULES_DIRS RELATIVE ${CMAKE_SOURCE_DIR}/modules ${CMAKE_SOURCE_DIR}/modules/*)
+foreach(module ${MODULES_DIRS})
+    set(module_path "${CMAKE_SOURCE_DIR}/modules/${module}")
+
+    # checks if it is a sub-directory and if it contains a cmake file
+    if(IS_DIRECTORY ${module_path} AND EXISTS "${module_path}/CMakeLists.txt")
+        message(STATUS "Submodule : ${module}")
+        if(NOT ${module} STREQUAL jtag_core)
+            list(APPEND BS_MODULES ${module})
+        endif()
+        add_subdirectory(modules/${module})
+    else()
+        message(STATUS "Ignored   : ${module}")
+    endif()
+endforeach()
+
+add_subdirectory(app)
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index feb8d15..5bd02b0 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -8,9 +8,9 @@ add_executable(
 )
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../libs)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../modules)
 
 # linking configuration
 target_link_libraries(
-    bs PRIVATE script jtag_core bsdl_parser bus_over_jtag drivers os_interface natsort readline ncurses
+    bs PRIVATE ${BS_MODULES} readline ncurses
 )
\ No newline at end of file
diff --git a/app/src/cmds/exit.h b/app/src/cmds/exit.h
index b4cebe3..e9c09d5 100644
--- a/app/src/cmds/exit.h
+++ b/app/src/cmds/exit.h
@@ -1,7 +1,7 @@
 #ifndef _CMD_EXIT_H
 #define _CMD_EXIT_H
 
-#include "lib_jtag_core/jtag_core.h"
+#include "jtag_core/jtag_core.h"
 
 extern const char cmd_exit_help[];
 
diff --git a/app/src/cmds/help.h b/app/src/cmds/help.h
index f9fc311..ae679db 100644
--- a/app/src/cmds/help.h
+++ b/app/src/cmds/help.h
@@ -1,7 +1,7 @@
 #ifndef _CMD_HELP_H
 #define _CMD_HELP_H
 
-#include "lib_jtag_core/jtag_core.h"
+#include "jtag_core/jtag_core.h"
 
 int cmd_help(jtag_core *jc, int argc, char *argv[]);
 
diff --git a/app/src/cmds/list_probes.h b/app/src/cmds/list_probes.h
index f2cd276..9e3afa7 100644
--- a/app/src/cmds/list_probes.h
+++ b/app/src/cmds/list_probes.h
@@ -1,7 +1,7 @@
 #ifndef _LIST_PROBES_H
 #define _LIST_PROBES_H
 
-#include "lib_jtag_core/jtag_core.h"
+#include "jtag_core/jtag_core.h"
 
 extern const char cmd_list_probes_help[];
 
diff --git a/app/src/cmds/scan.h b/app/src/cmds/scan.h
index 50d6dbc..1c6b03a 100644
--- a/app/src/cmds/scan.h
+++ b/app/src/cmds/scan.h
@@ -1,7 +1,7 @@
 #ifndef _CMDS_SCAN_H
 #define _CMDS_SCAN_H
 
-#include "lib_jtag_core/jtag_core.h"
+#include "jtag_core/jtag_core.h"
 
 extern const char cmd_scan_help[];
 
diff --git a/app/src/cmds/select_probe.h b/app/src/cmds/select_probe.h
index ca2f755..a045a63 100644
--- a/app/src/cmds/select_probe.h
+++ b/app/src/cmds/select_probe.h
@@ -1,7 +1,7 @@
 #ifndef _SELECT_PROBE_H
 #define _SELECT_PROBE_H
 
-#include "lib_jtag_core/jtag_core.h"
+#include "jtag_core/jtag_core.h"
 
 extern const char cmd_select_probe_help[];
 
diff --git a/app/src/common.h b/app/src/common.h
index 91546ff..cf390b0 100644
--- a/app/src/common.h
+++ b/app/src/common.h
@@ -1,7 +1,7 @@
 #ifndef _UTILS_H
 #define _UTILS_H
 
-#include "lib_jtag_core/jtag_core.h"
+#include "jtag_core/jtag_core.h"
 
 #define MAX_LINE                1024
 #define MAX_ARGS                16
diff --git a/app/src/main.c b/app/src/main.c
index 220eb0d..2a27016 100644
--- a/app/src/main.c
+++ b/app/src/main.c
@@ -5,7 +5,7 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include "lib_jtag_core/jtag_core.h"
+#include "jtag_core/jtag_core.h"
 #include "common.h"
 #include "args.h"
 
diff --git a/libs/lib_jtag_core/config_script.h b/libs/lib_jtag_core/config_script.h
deleted file mode 100644
index e69de29..0000000
diff --git a/libs/bsdl_parser/CMakeLists.txt b/modules/bsdl_parser/CMakeLists.txt
similarity index 100%
rename from libs/bsdl_parser/CMakeLists.txt
rename to modules/bsdl_parser/CMakeLists.txt
diff --git a/libs/bsdl_parser/bsdl_loader.c b/modules/bsdl_parser/bsdl_loader.c
similarity index 94%
rename from libs/bsdl_parser/bsdl_loader.c
rename to modules/bsdl_parser/bsdl_loader.c
index 46f966c..91dbb95 100644
--- a/libs/bsdl_parser/bsdl_loader.c
+++ b/modules/bsdl_parser/bsdl_loader.c
@@ -30,8 +30,8 @@
 #include <string.h>
 
 #include "drivers/drv_loader.h"
-#include "lib_jtag_core/jtag_core_internal.h"
-#include "lib_jtag_core/jtag_core.h"
+#include "jtag_core/jtag_core_internal.h"
+#include "jtag_core/jtag_core.h"
 
 #include "bsdl_loader.h"
 #include "bsdl_strings.h"
@@ -40,7 +40,7 @@
 
 #include "os_interface/os_interface.h"
 
-#include "lib_jtag_core/dbg_logs.h"
+#include "jtag_core/dbg_logs.h"
 #define DEBUG 1
 
 char *string_upper(char *str)
diff --git a/libs/bsdl_parser/bsdl_loader.h b/modules/bsdl_parser/bsdl_loader.h
similarity index 100%
rename from libs/bsdl_parser/bsdl_loader.h
rename to modules/bsdl_parser/bsdl_loader.h
diff --git a/libs/bsdl_parser/bsdl_strings.c b/modules/bsdl_parser/bsdl_strings.c
similarity index 92%
rename from libs/bsdl_parser/bsdl_strings.c
rename to modules/bsdl_parser/bsdl_strings.c
index 9a09e75..dfc39de 100644
--- a/libs/bsdl_parser/bsdl_strings.c
+++ b/modules/bsdl_parser/bsdl_strings.c
@@ -26,8 +26,8 @@
 #include <string.h>
 
 #include "drivers/drv_loader.h"
-#include "lib_jtag_core/jtag_core_internal.h"
-#include "lib_jtag_core/jtag_core.h"
+#include "jtag_core/jtag_core_internal.h"
+#include "jtag_core/jtag_core.h"
 
 #include "bsdl_loader.h"
 #include "bsdl_strings.h"
diff --git a/libs/bsdl_parser/bsdl_strings.h b/modules/bsdl_parser/bsdl_strings.h
similarity index 100%
rename from libs/bsdl_parser/bsdl_strings.h
rename to modules/bsdl_parser/bsdl_strings.h
diff --git a/libs/bus_over_jtag/CMakeLists.txt b/modules/bus_over_jtag/CMakeLists.txt
similarity index 100%
rename from libs/bus_over_jtag/CMakeLists.txt
rename to modules/bus_over_jtag/CMakeLists.txt
diff --git a/libs/bus_over_jtag/i2c_over_jtag.c b/modules/bus_over_jtag/i2c_over_jtag.c
similarity index 94%
rename from libs/bus_over_jtag/i2c_over_jtag.c
rename to modules/bus_over_jtag/i2c_over_jtag.c
index b0aadd3..84a72b1 100644
--- a/libs/bus_over_jtag/i2c_over_jtag.c
+++ b/modules/bus_over_jtag/i2c_over_jtag.c
@@ -28,14 +28,14 @@
 #include <stdlib.h>
 
 #include "drivers/drv_loader.h"
-#include "lib_jtag_core/jtag_core_internal.h"
-#include "lib_jtag_core/jtag_core.h"
+#include "jtag_core/jtag_core_internal.h"
+#include "jtag_core/jtag_core.h"
 
 #include "bsdl_parser/bsdl_loader.h"
 
 #include "drivers/drivers_list.h"
 
-#include "lib_jtag_core/dbg_logs.h"
+#include "jtag_core/dbg_logs.h"
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // I2C Over JTAG API
diff --git a/libs/bus_over_jtag/mdio_over_jtag.c b/modules/bus_over_jtag/mdio_over_jtag.c
similarity index 94%
rename from libs/bus_over_jtag/mdio_over_jtag.c
rename to modules/bus_over_jtag/mdio_over_jtag.c
index b20e091..a22e420 100644
--- a/libs/bus_over_jtag/mdio_over_jtag.c
+++ b/modules/bus_over_jtag/mdio_over_jtag.c
@@ -29,8 +29,8 @@
 
 #include "drivers/drv_loader.h"
 
-#include "lib_jtag_core/jtag_core_internal.h"
-#include "lib_jtag_core/jtag_core.h"
+#include "jtag_core/jtag_core_internal.h"
+#include "jtag_core/jtag_core.h"
 
 #include "bsdl_parser/bsdl_loader.h"
 
diff --git a/libs/bus_over_jtag/memory_over_jtag.c b/modules/bus_over_jtag/memory_over_jtag.c
similarity index 95%
rename from libs/bus_over_jtag/memory_over_jtag.c
rename to modules/bus_over_jtag/memory_over_jtag.c
index 1593399..6a5485c 100644
--- a/libs/bus_over_jtag/memory_over_jtag.c
+++ b/modules/bus_over_jtag/memory_over_jtag.c
@@ -29,8 +29,8 @@
 
 #include "drivers/drv_loader.h"
 
-#include "lib_jtag_core/jtag_core_internal.h"
-#include "lib_jtag_core/jtag_core.h"
+#include "jtag_core/jtag_core_internal.h"
+#include "jtag_core/jtag_core.h"
 
 #include "bsdl_parser/bsdl_loader.h"
 
diff --git a/libs/bus_over_jtag/spi_over_jtag.c b/modules/bus_over_jtag/spi_over_jtag.c
similarity index 95%
rename from libs/bus_over_jtag/spi_over_jtag.c
rename to modules/bus_over_jtag/spi_over_jtag.c
index 077086d..2afc88f 100644
--- a/libs/bus_over_jtag/spi_over_jtag.c
+++ b/modules/bus_over_jtag/spi_over_jtag.c
@@ -29,8 +29,8 @@
 
 #include "drivers/drv_loader.h"
 
-#include "lib_jtag_core/jtag_core_internal.h"
-#include "lib_jtag_core/jtag_core.h"
+#include "jtag_core/jtag_core_internal.h"
+#include "jtag_core/jtag_core.h"
 
 #include "bsdl_parser/bsdl_loader.h"
 
diff --git a/libs/config/config.script b/modules/config/config.script
similarity index 100%
rename from libs/config/config.script
rename to modules/config/config.script
diff --git a/libs/config/config_script.h b/modules/config/config_script.h
similarity index 100%
rename from libs/config/config_script.h
rename to modules/config/config_script.h
diff --git a/libs/drivers/CMakeLists.txt b/modules/drivers/CMakeLists.txt
similarity index 100%
rename from libs/drivers/CMakeLists.txt
rename to modules/drivers/CMakeLists.txt
diff --git a/libs/drivers/drivers_list.c b/modules/drivers/drivers_list.c
similarity index 92%
rename from libs/drivers/drivers_list.c
rename to modules/drivers/drivers_list.c
index 5fbd223..501fb26 100644
--- a/libs/drivers/drivers_list.c
+++ b/modules/drivers/drivers_list.c
@@ -25,8 +25,8 @@
 
 #include "drv_loader.h"
 
-#include "lib_jtag_core/jtag_core_internal.h"
-#include "lib_jtag_core/jtag_core.h"
+#include "jtag_core/jtag_core_internal.h"
+#include "jtag_core/jtag_core.h"
 
 #include "bsdl_parser/bsdl_loader.h"
 
diff --git a/libs/drivers/drivers_list.h b/modules/drivers/drivers_list.h
similarity index 100%
rename from libs/drivers/drivers_list.h
rename to modules/drivers/drivers_list.h
diff --git a/libs/drivers/drv_loader.c b/modules/drivers/drv_loader.c
similarity index 92%
rename from libs/drivers/drv_loader.c
rename to modules/drivers/drv_loader.c
index 82a0d40..45aa2b3 100644
--- a/libs/drivers/drv_loader.c
+++ b/modules/drivers/drv_loader.c
@@ -28,14 +28,14 @@
 
 #include "drv_loader.h"
 
-#include "lib_jtag_core/jtag_core_internal.h"
-#include "lib_jtag_core/jtag_core.h"
+#include "jtag_core/jtag_core_internal.h"
+#include "jtag_core/jtag_core.h"
 
 #include "bsdl_parser/bsdl_loader.h"
 
 #include "drivers_list.h"
 
-#include "lib_jtag_core/dbg_logs.h"
+#include "jtag_core/dbg_logs.h"
 
 int GetDrvInfo(void * jc_ctx,unsigned long infotype,void * returnvalue,const char * drv_id,const char * drv_desc,drv_ptr * drv_func)
 {
diff --git a/libs/drivers/drv_loader.h b/modules/drivers/drv_loader.h
similarity index 100%
rename from libs/drivers/drv_loader.h
rename to modules/drivers/drv_loader.h
diff --git a/libs/drivers/ftdi_jtag/ftdi_jtag_drv.c b/modules/drivers/ftdi_jtag/ftdi_jtag_drv.c
similarity index 95%
rename from libs/drivers/ftdi_jtag/ftdi_jtag_drv.c
rename to modules/drivers/ftdi_jtag/ftdi_jtag_drv.c
index 03640a6..07c416e 100644
--- a/libs/drivers/ftdi_jtag/ftdi_jtag_drv.c
+++ b/modules/drivers/ftdi_jtag/ftdi_jtag_drv.c
@@ -32,10 +32,10 @@
 #endif
 
 #include "../drv_loader.h"
-#include "lib_jtag_core/jtag_core_internal.h"
-#include "lib_jtag_core/jtag_core.h"
+#include "jtag_core/jtag_core_internal.h"
+#include "jtag_core/jtag_core.h"
 #include "bsdl_parser/bsdl_loader.h"
-#include "lib_jtag_core/dbg_logs.h"
+#include "jtag_core/dbg_logs.h"
 #include "os_interface/os_interface.h"
 
 #ifdef __cplusplus
diff --git a/libs/drivers/ftdi_jtag/ftdi_jtag_drv.h b/modules/drivers/ftdi_jtag/ftdi_jtag_drv.h
similarity index 100%
rename from libs/drivers/ftdi_jtag/ftdi_jtag_drv.h
rename to modules/drivers/ftdi_jtag/ftdi_jtag_drv.h
diff --git a/libs/drivers/jlink_jtag/jlink_jtag_drv.c b/modules/drivers/jlink_jtag/jlink_jtag_drv.c
similarity index 95%
rename from libs/drivers/jlink_jtag/jlink_jtag_drv.c
rename to modules/drivers/jlink_jtag/jlink_jtag_drv.c
index b4c6144..ff793cc 100644
--- a/libs/drivers/jlink_jtag/jlink_jtag_drv.c
+++ b/modules/drivers/jlink_jtag/jlink_jtag_drv.c
@@ -26,12 +26,12 @@
 #include <stdio.h>
 #include <string.h>
 #include "../drv_loader.h"
-#include "lib_jtag_core/jtag_core_internal.h"
-#include "lib_jtag_core/jtag_core.h"
+#include "jtag_core/jtag_core_internal.h"
+#include "jtag_core/jtag_core.h"
 
 #include "bsdl_parser/bsdl_loader.h"
 
-#include "lib_jtag_core/dbg_logs.h"
+#include "jtag_core/dbg_logs.h"
 
 #if defined(WIN32)
 // Compiling on Windows
diff --git a/libs/drivers/jlink_jtag/jlink_jtag_drv.h b/modules/drivers/jlink_jtag/jlink_jtag_drv.h
similarity index 100%
rename from libs/drivers/jlink_jtag/jlink_jtag_drv.h
rename to modules/drivers/jlink_jtag/jlink_jtag_drv.h
diff --git a/libs/drivers/linux_gpio_jtag/linux_gpio_jtag_drv.c b/modules/drivers/linux_gpio_jtag/linux_gpio_jtag_drv.c
similarity index 94%
rename from libs/drivers/linux_gpio_jtag/linux_gpio_jtag_drv.c
rename to modules/drivers/linux_gpio_jtag/linux_gpio_jtag_drv.c
index b9d14de..e5ec762 100644
--- a/libs/drivers/linux_gpio_jtag/linux_gpio_jtag_drv.c
+++ b/modules/drivers/linux_gpio_jtag/linux_gpio_jtag_drv.c
@@ -35,14 +35,14 @@
 #endif
 
 #include "../drv_loader.h"
-#include "lib_jtag_core/jtag_core_internal.h"
-#include "lib_jtag_core/jtag_core.h"
+#include "jtag_core/jtag_core_internal.h"
+#include "jtag_core/jtag_core.h"
 
 #include "bsdl_parser/bsdl_loader.h"
 
 #include "os_interface/os_interface.h"
 
-#include "lib_jtag_core/dbg_logs.h"
+#include "jtag_core/dbg_logs.h"
 
 char linux_gpio_base[512];
 
diff --git a/libs/drivers/linux_gpio_jtag/linux_gpio_jtag_drv.h b/modules/drivers/linux_gpio_jtag/linux_gpio_jtag_drv.h
similarity index 100%
rename from libs/drivers/linux_gpio_jtag/linux_gpio_jtag_drv.h
rename to modules/drivers/linux_gpio_jtag/linux_gpio_jtag_drv.h
diff --git a/libs/drivers/lpt_jtag/lpt_jtag_drv.c b/modules/drivers/lpt_jtag/lpt_jtag_drv.c
similarity index 93%
rename from libs/drivers/lpt_jtag/lpt_jtag_drv.c
rename to modules/drivers/lpt_jtag/lpt_jtag_drv.c
index d2c5d4c..1b0989e 100644
--- a/libs/drivers/lpt_jtag/lpt_jtag_drv.c
+++ b/modules/drivers/lpt_jtag/lpt_jtag_drv.c
@@ -33,12 +33,12 @@
 #endif
 
 #include "../drv_loader.h"
-#include "lib_jtag_core/jtag_core_internal.h"
-#include "lib_jtag_core/jtag_core.h"
+#include "jtag_core/jtag_core_internal.h"
+#include "jtag_core/jtag_core.h"
 
 #include "bsdl_parser/bsdl_loader.h"
 
-#include "lib_jtag_core/dbg_logs.h"
+#include "jtag_core/dbg_logs.h"
 
 #if defined(WIN32)
 
diff --git a/libs/drivers/lpt_jtag/lpt_jtag_drv.h b/modules/drivers/lpt_jtag/lpt_jtag_drv.h
similarity index 100%
rename from libs/drivers/lpt_jtag/lpt_jtag_drv.h
rename to modules/drivers/lpt_jtag/lpt_jtag_drv.h
diff --git a/libs/lib_jtag_core/CMakeLists.txt b/modules/jtag_core/CMakeLists.txt
similarity index 90%
rename from libs/lib_jtag_core/CMakeLists.txt
rename to modules/jtag_core/CMakeLists.txt
index ca3eb2f..71b3e27 100644
--- a/libs/lib_jtag_core/CMakeLists.txt
+++ b/modules/jtag_core/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(CONFIG_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../config/")
-set(LIB_FTD2XXX "${CMAKE_CURRENT_SOURCE_DIR}/../libftd2xx/libftd2xx.a")
+set(LIB_FTD2XXX "${CMAKE_CURRENT_SOURCE_DIR}/../../libs/libftd2xx/libftd2xx.a")
 
 file(GLOB_RECURSE ALL_SOURCES "*.c")
 
diff --git a/libs/lib_jtag_core/COPYING.LESSER b/modules/jtag_core/COPYING.LESSER
similarity index 100%
rename from libs/lib_jtag_core/COPYING.LESSER
rename to modules/jtag_core/COPYING.LESSER
diff --git a/libs/lib_jtag_core/dbg_logs.c b/modules/jtag_core/dbg_logs.c
similarity index 100%
rename from libs/lib_jtag_core/dbg_logs.c
rename to modules/jtag_core/dbg_logs.c
diff --git a/libs/lib_jtag_core/dbg_logs.h b/modules/jtag_core/dbg_logs.h
similarity index 100%
rename from libs/lib_jtag_core/dbg_logs.h
rename to modules/jtag_core/dbg_logs.h
diff --git a/libs/lib_jtag_core/jtag_core.c b/modules/jtag_core/jtag_core.c
similarity index 95%
rename from libs/lib_jtag_core/jtag_core.c
rename to modules/jtag_core/jtag_core.c
index f511357..0e7640f 100644
--- a/libs/lib_jtag_core/jtag_core.c
+++ b/modules/jtag_core/jtag_core.c
@@ -54,7 +54,7 @@ jtag_core * jtagcore_init()
 /*
 		jc->envvar = (void*)initEnv(NULL, NULL);
 
-		jtagcore_setEnvVar( jc, "LIBVERSION", "v"LIB_JTAG_CORE_VERSION);
+		jtagcore_setEnvVar( jc, "LIBVERSION", "v"jtag_core_VERSION);
 
 		sctx = jtagcore_initScript(jc);
 
diff --git a/libs/lib_jtag_core/jtag_core.h b/modules/jtag_core/jtag_core.h
similarity index 100%
rename from libs/lib_jtag_core/jtag_core.h
rename to modules/jtag_core/jtag_core.h
diff --git a/libs/lib_jtag_core/jtag_core_internal.h b/modules/jtag_core/jtag_core_internal.h
similarity index 100%
rename from libs/lib_jtag_core/jtag_core_internal.h
rename to modules/jtag_core/jtag_core_internal.h
diff --git a/libs/lib_jtag_core/version.h b/modules/jtag_core/version.h
similarity index 100%
rename from libs/lib_jtag_core/version.h
rename to modules/jtag_core/version.h
diff --git a/libs/libftd2xx/WinTypes.h b/modules/libftd2xx/WinTypes.h
similarity index 100%
rename from libs/libftd2xx/WinTypes.h
rename to modules/libftd2xx/WinTypes.h
diff --git a/libs/libftd2xx/ftd2xx.h b/modules/libftd2xx/ftd2xx.h
similarity index 100%
rename from libs/libftd2xx/ftd2xx.h
rename to modules/libftd2xx/ftd2xx.h
diff --git a/libs/libftd2xx/libftd2xx.a b/modules/libftd2xx/libftd2xx.a
similarity index 100%
rename from libs/libftd2xx/libftd2xx.a
rename to modules/libftd2xx/libftd2xx.a
diff --git a/libs/natsort/CMakeLists.txt b/modules/natsort/CMakeLists.txt
similarity index 100%
rename from libs/natsort/CMakeLists.txt
rename to modules/natsort/CMakeLists.txt
diff --git a/libs/natsort/strnatcmp.c b/modules/natsort/strnatcmp.c
similarity index 100%
rename from libs/natsort/strnatcmp.c
rename to modules/natsort/strnatcmp.c
diff --git a/libs/natsort/strnatcmp.h b/modules/natsort/strnatcmp.h
similarity index 100%
rename from libs/natsort/strnatcmp.h
rename to modules/natsort/strnatcmp.h
diff --git a/libs/os_interface/CMakeLists.txt b/modules/os_interface/CMakeLists.txt
similarity index 100%
rename from libs/os_interface/CMakeLists.txt
rename to modules/os_interface/CMakeLists.txt
diff --git a/libs/os_interface/fs.c b/modules/os_interface/fs.c
similarity index 100%
rename from libs/os_interface/fs.c
rename to modules/os_interface/fs.c
diff --git a/libs/os_interface/network.c b/modules/os_interface/network.c
similarity index 100%
rename from libs/os_interface/network.c
rename to modules/os_interface/network.c
diff --git a/libs/os_interface/network.h b/modules/os_interface/network.h
similarity index 100%
rename from libs/os_interface/network.h
rename to modules/os_interface/network.h
diff --git a/libs/os_interface/os_interface.c b/modules/os_interface/os_interface.c
similarity index 100%
rename from libs/os_interface/os_interface.c
rename to modules/os_interface/os_interface.c
diff --git a/libs/os_interface/os_interface.h b/modules/os_interface/os_interface.h
similarity index 100%
rename from libs/os_interface/os_interface.h
rename to modules/os_interface/os_interface.h
diff --git a/libs/script/CMakeLists.txt b/modules/script/CMakeLists.txt
similarity index 100%
rename from libs/script/CMakeLists.txt
rename to modules/script/CMakeLists.txt
diff --git a/libs/script/env.c b/modules/script/env.c
similarity index 100%
rename from libs/script/env.c
rename to modules/script/env.c
diff --git a/libs/script/env.h b/modules/script/env.h
similarity index 100%
rename from libs/script/env.h
rename to modules/script/env.h
diff --git a/libs/script/script.c b/modules/script/script.c
similarity index 95%
rename from libs/script/script.c
rename to modules/script/script.c
index 34b672b..7774d6f 100644
--- a/libs/script/script.c
+++ b/modules/script/script.c
@@ -32,10 +32,10 @@
 #define MAX_PATH 256
 
 #include "drivers/drv_loader.h"
-#include "lib_jtag_core/jtag_core_internal.h"
+#include "jtag_core/jtag_core_internal.h"
 #include "script.h"
-#include "lib_jtag_core/jtag_core.h"
-#include "lib_jtag_core/version.h"
+#include "jtag_core/jtag_core.h"
+#include "jtag_core/version.h"
 
 #include "bsdl_parser/bsdl_loader.h"
 #include "os_interface/os_interface.h"
diff --git a/libs/script/script.h b/modules/script/script.h
similarity index 100%
rename from libs/script/script.h
rename to modules/script/script.h