diff --git a/Buildscripts/TactilitySDK/CMakeLists.txt b/Buildscripts/TactilitySDK/CMakeLists.txt
index 6118eb0d..bd6825ee 100644
--- a/Buildscripts/TactilitySDK/CMakeLists.txt
+++ b/Buildscripts/TactilitySDK/CMakeLists.txt
@@ -5,29 +5,3 @@ idf_component_register(
         "Libraries/lvgl/include"
     REQUIRES esp_timer
 )
-
-set(EXTRA_COMPONENT_DIRS
-    "Libraries/TactilityFreeRtos"
-    "Modules"
-    "Drivers"
-)
-
-set(COMPONENTS
-    TactilityFreeRtos
-    bm8563-module
-    bm8563-module
-    bmi270-module
-    mpu6886-module
-    pi4ioe5v6408-module
-    qmi8658-module
-    rx8130ce-module
-)
-
-# Regular and core features
-add_prebuilt_library(TactilityC Libraries/TactilityC/binary/libTactilityC.a)
-add_prebuilt_library(TactilityKernel Libraries/TactilityKernel/binary/libTactilityKernel.a)
-add_prebuilt_library(lvgl Libraries/lvgl/binary/liblvgl.a)
-
-target_link_libraries(${COMPONENT_LIB} INTERFACE TactilityC)
-target_link_libraries(${COMPONENT_LIB} INTERFACE TactilityKernel)
-target_link_libraries(${COMPONENT_LIB} INTERFACE lvgl)
diff --git a/Buildscripts/TactilitySDK/TactilitySDK.cmake b/Buildscripts/TactilitySDK/TactilitySDK.cmake
index 71afdc00..9a427ef8 100644
--- a/Buildscripts/TactilitySDK/TactilitySDK.cmake
+++ b/Buildscripts/TactilitySDK/TactilitySDK.cmake
@@ -14,4 +14,31 @@ macro(tactility_project project_name)
     if (NOT "$ENV{ESP_IDF_VERSION}" STREQUAL "${TACTILITY_SDK_IDF_VERSION}")
         message(FATAL_ERROR "ESP-IDF version of Tactility SDK (${TACTILITY_SDK_IDF_VERSION}) does not match current ESP-IDF version ($ENV{ESP_IDF_VERSION})")
     endif()
+
+    set(EXTRA_COMPONENT_DIRS
+        "Libraries/TactilityFreeRtos"
+        "Modules"
+        "Drivers"
+    )
+
+    set(COMPONENTS
+        TactilityFreeRtos
+        bm8563-module
+        bm8563-module
+        bmi270-module
+        mpu6886-module
+        pi4ioe5v6408-module
+        qmi8658-module
+        rx8130ce-module
+    )
+
+    # Regular and core features
+    add_prebuilt_library(TactilityC Libraries/TactilityC/binary/libTactilityC.a)
+    add_prebuilt_library(TactilityKernel Libraries/TactilityKernel/binary/libTactilityKernel.a)
+    add_prebuilt_library(lvgl Libraries/lvgl/binary/liblvgl.a)
+
+    target_link_libraries(${COMPONENT_LIB} INTERFACE TactilityC)
+    target_link_libraries(${COMPONENT_LIB} INTERFACE TactilityKernel)
+    target_link_libraries(${COMPONENT_LIB} INTERFACE lvgl)
+
 endmacro()
diff --git a/Buildscripts/release-sdk.py b/Buildscripts/release-sdk.py
index 8fa7d1e7..b2a8b0e5 100644
--- a/Buildscripts/release-sdk.py
+++ b/Buildscripts/release-sdk.py
@@ -72,7 +72,7 @@ def get_module_mappings(module_name):
     return [
         {'src': f'Modules/{module_name}/include/**', 'dst': f'Modules/{module_name}/include/'},
         {'src': f'Modules/{module_name}/*.md', 'dst': f'Modules/{module_name}/'},
-        {'src': f'build/esp-idf/{module_name}/lib{module_name}.a', 'dst': f'Drivers/{module_name}/binary/lib{module_name}.a'},
+        {'src': f'build/esp-idf/{module_name}/lib{module_name}.a', 'dst': f'Modules/{module_name}/binary/lib{module_name}.a'},
     ]
 
 def create_module_cmakelists(module_name):
diff --git a/Tests/SdkIntegration/CMakeLists.txt b/Tests/SdkIntegration/CMakeLists.txt
index 046853f6..980270d3 100644
--- a/Tests/SdkIntegration/CMakeLists.txt
+++ b/Tests/SdkIntegration/CMakeLists.txt
@@ -5,12 +5,12 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 if (DEFINED ENV{TACTILITY_SDK_PATH})
     set(TACTILITY_SDK_PATH $ENV{TACTILITY_SDK_PATH})
 else()
-    set(TACTILITY_SDK_PATH "../../release/TactilitySDK")
-    message(WARNING "⚠️ TACTILITY_SDK_PATH environment variable is not set, defaulting to ${TACTILITY_SDK_PATH}")
+    set(TACTILITY_SDK_PATH ../../release/TactilitySDK)
+    message(WARNING "TACTILITY_SDK_PATH environment variable is not set, defaulting to ${TACTILITY_SDK_PATH}")
 endif()
 
 include("${TACTILITY_SDK_PATH}/TactilitySDK.cmake")
-set(EXTRA_COMPONENT_DIRS ${TACTILITY_SDK_PATH})
+set(EXTRA_COMPONENT_DIRS ${TACTILITY_SDK_PATH} ${TACTILITY_SDK_PATH}/Modules ${TACTILITY_SDK_PATH}/Drivers)
 
 project(SdkTest)
 tactility_project(SdkTest)
diff --git a/Tests/SdkIntegration/main/CMakeLists.txt b/Tests/SdkIntegration/main/CMakeLists.txt
index db2068e9..3e247cf3 100644
--- a/Tests/SdkIntegration/main/CMakeLists.txt
+++ b/Tests/SdkIntegration/main/CMakeLists.txt
@@ -3,4 +3,11 @@ file(GLOB_RECURSE SOURCE_FILES Source/*.c)
 idf_component_register(
     SRCS ${SOURCE_FILES}
     REQUIRES TactilitySDK
+        lvgl-module
+        bm8563-module
+        bmi270-module
+        mpu6886-module
+        pi4ioe5v6408-module
+        qmi8658-module
+        rx8130ce-module
 )
diff --git a/Tests/SdkIntegration/main/Source/main.c b/Tests/SdkIntegration/main/Source/main.c
index 13c02959..23058774 100644
--- a/Tests/SdkIntegration/main/Source/main.c
+++ b/Tests/SdkIntegration/main/Source/main.c
@@ -24,6 +24,14 @@
 
 #include <tactility/lvgl_module.h>
 
+#include <drivers/bm8563.h>
+#include <drivers/bmi270.h>
+#include <drivers/mpu6886.h>
+#include <drivers/mpu6886.h>
+#include <drivers/pi4ioe5v6408.h>
+#include <drivers/qmi8658.h>
+#include <drivers/rx8130ce.h>
+
 static void onShowApp(AppHandle app, void* data, lv_obj_t* parent) {
     lv_obj_t* toolbar = tt_lvgl_toolbar_create_for_app(parent, app);
     lv_obj_align(toolbar, LV_ALIGN_TOP_MID, 0, 0);