diff --git a/general/package/sigmastar-osdrv-infinity6/files/script/load_sigmastar b/general/package/sigmastar-osdrv-infinity6/files/script/load_sigmastar
index 7ee4701d..d334fc5d 100755
--- a/general/package/sigmastar-osdrv-infinity6/files/script/load_sigmastar
+++ b/general/package/sigmastar-osdrv-infinity6/files/script/load_sigmastar
@@ -3,12 +3,11 @@
 # OpenIPC.org | 2024
 #
 
-PATH_MODULE=/lib/modules/4.9.84/sigmastar
-PATH_SENSOR=$PATH_MODULE/sensor
+MODULE=/lib/modules/4.9.84/sigmastar
 SENSOR=$(fw_printenv -n sensor)
 
 detect_sensor() {
-	insmod $PATH_SENSOR/sensor_config.ko
+	insmod $MODULE/sensor_config.ko
 	if [ -e /dev/srcfg ]; then
 		echo srcfg 0 1 0 0 0 0 > /dev/srcfg
 		rmmod sensor_config
@@ -20,11 +19,11 @@ detect_sensor() {
 set_sensor() {
 	case $SENSOR in
 		gc2053|imx307)
-			insmod $PATH_SENSOR/sensor_${SENSOR}_mipi.ko chmap=1
+			insmod $MODULE/sensor_${SENSOR}_mipi.ko chmap=1
 			;;
 		sc2239|sc2335)
 			[ "$(fw_printenv -n soc)" = "ssc325de" ] && IFACE=parl
-			insmod $PATH_SENSOR/sensor_${SENSOR}_${IFACE:-mipi}.ko chmap=1
+			insmod $MODULE/sensor_${SENSOR}_${IFACE:-mipi}.ko chmap=1
 			;;
 		*)
 			echo -e "\n\e[1;31mUNSUPPORTED sensor - $SENSOR\e[0m\n" | logger -s -t OpenIPC
@@ -33,18 +32,18 @@ set_sensor() {
 }
 
 insert_ko() {
-	insmod $PATH_MODULE/mhal.ko
-	insmod $PATH_MODULE/mi_common.ko
-	insmod $PATH_MODULE/mi_sys.ko logBufSize=256 default_config_path=/usr/bin
-	insmod $PATH_MODULE/mi_rgn.ko
-	insmod $PATH_MODULE/mi_ai.ko
-	insmod $PATH_MODULE/mi_ao.ko
-	insmod $PATH_MODULE/mi_sensor.ko
-	insmod $PATH_MODULE/mi_shadow.ko
-	insmod $PATH_MODULE/mi_divp.ko
-	insmod $PATH_MODULE/mi_vif.ko
-	insmod $PATH_MODULE/mi_vpe.ko
-	insmod $PATH_MODULE/mi_venc.ko
+	insmod $MODULE/mhal.ko
+	insmod $MODULE/mi_common.ko
+	insmod $MODULE/mi_sys.ko logBufSize=256 default_config_path=/usr/bin
+	insmod $MODULE/mi_rgn.ko
+	insmod $MODULE/mi_ai.ko
+	insmod $MODULE/mi_ao.ko
+	insmod $MODULE/mi_sensor.ko
+	insmod $MODULE/mi_shadow.ko
+	insmod $MODULE/mi_divp.ko
+	insmod $MODULE/mi_vif.ko
+	insmod $MODULE/mi_vpe.ko
+	insmod $MODULE/mi_venc.ko
 }
 
 if [ ! -e /sys/module/mhal ]; then
@@ -61,9 +60,9 @@ if [ -z "$SENSOR" ]; then
 	exit 1
 else
 	echo -e "\n\e[1;32mSensor assigned - $SENSOR\e[0m\n" | logger -s -t OpenIPC
-	SENSOR_MODULE=$(ls /sys/module | grep $SENSOR)
-	if [ -n "$SENSOR_MODULE" ]; then
-		rmmod $SENSOR_MODULE
+	DRIVER=$(ls /sys/module | grep $SENSOR)
+	if [ -n "$DRIVER" ]; then
+		rmmod $DRIVER
 	fi
 	set_sensor
 fi
diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar b/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar
index 155a3d53..b50dd5c1 100755
--- a/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar
+++ b/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar
@@ -3,12 +3,11 @@
 # OpenIPC.org | 2024
 #
 
-PATH_MODULE=/lib/modules/4.9.84/sigmastar
-PATH_SENSOR=$PATH_MODULE/sensor
+MODULE=/lib/modules/4.9.84/sigmastar
 SENSOR=$(fw_printenv -n sensor)
 
 detect_sensor() {
-	insmod $PATH_SENSOR/sensor_config.ko
+	insmod $MODULE/sensor_config.ko
 	if [ -e /dev/srcfg ]; then
 		echo srcfg 0 1 0 0 0 0 > /dev/srcfg
 		rmmod sensor_config
@@ -20,10 +19,10 @@ detect_sensor() {
 set_sensor() {
 	case $SENSOR in
 		gc2053|gc2083|gc4023|gc4653|imx307|imx335|jxf37|jxq03|os02g10)
-			insmod $PATH_SENSOR/sensor_${SENSOR}_mipi.ko chmap=1
+			insmod $MODULE/sensor_${SENSOR}_mipi.ko chmap=1
 			;;
 		sc200ai|sc401ai|sc2239|sc223a|sc2335|sc2336|sc3335|sc3338)
-			insmod $PATH_SENSOR/sensor_${SENSOR}_mipi.ko chmap=1
+			insmod $MODULE/sensor_${SENSOR}_mipi.ko chmap=1
 			;;
 		*)
 			echo -e "\n\e[1;31mUNSUPPORTED sensor - $SENSOR\e[0m\n" | logger -s -t OpenIPC
@@ -32,18 +31,18 @@ set_sensor() {
 }
 
 insert_ko() {
-	insmod $PATH_MODULE/mhal.ko
-	insmod $PATH_MODULE/mi_common.ko
-	insmod $PATH_MODULE/mi_sys.ko cmdQBufSize=256 logBufSize=256
-	insmod $PATH_MODULE/mi_rgn.ko
-	insmod $PATH_MODULE/mi_ai.ko
-	insmod $PATH_MODULE/mi_ao.ko
-	insmod $PATH_MODULE/mi_sensor.ko
-	insmod $PATH_MODULE/mi_shadow.ko
-	insmod $PATH_MODULE/mi_divp.ko
-	insmod $PATH_MODULE/mi_vif.ko
-	insmod $PATH_MODULE/mi_vpe.ko
-	insmod $PATH_MODULE/mi_venc.ko fw_path=/etc/firmware/chagall.bin
+	insmod $MODULE/mhal.ko
+	insmod $MODULE/mi_common.ko
+	insmod $MODULE/mi_sys.ko cmdQBufSize=256 logBufSize=256
+	insmod $MODULE/mi_rgn.ko
+	insmod $MODULE/mi_ai.ko
+	insmod $MODULE/mi_ao.ko
+	insmod $MODULE/mi_sensor.ko
+	insmod $MODULE/mi_shadow.ko
+	insmod $MODULE/mi_divp.ko
+	insmod $MODULE/mi_vif.ko
+	insmod $MODULE/mi_vpe.ko
+	insmod $MODULE/mi_venc.ko fw_path=/etc/firmware/chagall.bin
 
 	MAJOR=$(awk '$2=="mi_poll" {print $1}' /proc/devices)
 	mknod /dev/mi_poll c "$MAJOR" 0
@@ -64,9 +63,9 @@ if [ -z "$SENSOR" ]; then
 	exit 1
 else
 	echo -e "\n\e[1;32mSensor assigned - $SENSOR\e[0m\n" | logger -s -t OpenIPC
-	SENSOR_MODULE=$(ls /sys/module | grep $SENSOR)
-	if [ -n "$SENSOR_MODULE" ]; then
-		rmmod $SENSOR_MODULE
+	DRIVER=$(ls /sys/module | grep $SENSOR)
+	if [ -n "$DRIVER" ]; then
+		rmmod $DRIVER
 	fi
 	set_sensor
 fi
diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_gc4023_mipi.ko b/general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_gc4023_mipi.ko
deleted file mode 100644
index c1fc50fe..00000000
Binary files a/general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_gc4023_mipi.ko and /dev/null differ
diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_jxq03_mipi.ko b/general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_jxq03_mipi.ko
deleted file mode 100644
index 0a490fa7..00000000
Binary files a/general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_jxq03_mipi.ko and /dev/null differ
diff --git a/general/package/sigmastar-osdrv-infinity6b0/sigmastar-osdrv-infinity6b0.mk b/general/package/sigmastar-osdrv-infinity6b0/sigmastar-osdrv-infinity6b0.mk
index 473d3b55..72d53929 100644
--- a/general/package/sigmastar-osdrv-infinity6b0/sigmastar-osdrv-infinity6b0.mk
+++ b/general/package/sigmastar-osdrv-infinity6b0/sigmastar-osdrv-infinity6b0.mk
@@ -15,9 +15,6 @@ define SIGMASTAR_OSDRV_INFINITY6B0_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/4.9.84/sigmastar
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.84/sigmastar $(SIGMASTAR_OSDRV_INFINITY6B0_PKGDIR)/files/kmod/*
 
-	$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/4.9.84/sigmastar/sensor
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.84/sigmastar/sensor $(SIGMASTAR_OSDRV_INFINITY6B0_PKGDIR)/files/sensor/kmod/*
-
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/firmware
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/firmware $(SIGMASTAR_OSDRV_INFINITY6B0_PKGDIR)/files/sensor/firmware/*
 
diff --git a/general/package/sigmastar-osdrv-infinity6c/files/script/load_sigmastar b/general/package/sigmastar-osdrv-infinity6c/files/script/load_sigmastar
index 2c964337..6f282306 100755
--- a/general/package/sigmastar-osdrv-infinity6c/files/script/load_sigmastar
+++ b/general/package/sigmastar-osdrv-infinity6c/files/script/load_sigmastar
@@ -3,12 +3,11 @@
 # OpenIPC.org | 2024
 #
 
-PATH_MODULE=/lib/modules/5.10.61/sigmastar
-PATH_SENSOR=$PATH_MODULE/sensor
+MODULE=/lib/modules/5.10.61/sigmastar
 SENSOR=$(fw_printenv -n sensor)
 
 detect_sensor() {
-	insmod $PATH_SENSOR/sensor_config.ko
+	insmod $MODULE/sensor_config.ko
 	if [ -e /dev/srcfg ]; then
 		echo srcfg 0 1 0 0 0 0 > /dev/srcfg
 		rmmod sensor_config
@@ -20,7 +19,7 @@ detect_sensor() {
 set_sensor() {
 	case $SENSOR in
 		sc401ai|sc501ai)
-			insmod $PATH_SENSOR/sensor_${SENSOR}_mipi.ko chmap=1
+			insmod $MODULE/sensor_${SENSOR}_mipi.ko chmap=1
 			;;
 		*)
 			echo -e "\n\e[1;31mUNSUPPORTED sensor - $SENSOR\e[0m\n" | logger -s -t OpenIPC
@@ -29,15 +28,15 @@ set_sensor() {
 }
 
 insert_ko() {
-	insmod $PATH_MODULE/mi_common.ko g_ModParamPath=$PATH_MODULE/param.json config_json_path=$PATH_MODULE/config.json
-	insmod $PATH_MODULE/mi_sys.ko
-	insmod $PATH_MODULE/mi_vif.ko
-	insmod $PATH_MODULE/mi_sensor.ko
-	insmod $PATH_MODULE/mi_isp.ko
-	insmod $PATH_MODULE/mi_rgn.ko
-	insmod $PATH_MODULE/mi_scl.ko
-	insmod $PATH_MODULE/mi_vcodec.ko drv_codec40_common.fw_load_path=/etc/firmware/chagall.bin
-	insmod $PATH_MODULE/mi_venc.ko
+	insmod $MODULE/mi_common.ko g_ModParamPath=$MODULE/param.json config_json_path=$MODULE/config.json
+	insmod $MODULE/mi_sys.ko
+	insmod $MODULE/mi_vif.ko
+	insmod $MODULE/mi_sensor.ko
+	insmod $MODULE/mi_isp.ko
+	insmod $MODULE/mi_rgn.ko
+	insmod $MODULE/mi_scl.ko
+	insmod $MODULE/mi_vcodec.ko drv_codec40_common.fw_load_path=/etc/firmware/chagall.bin
+	insmod $MODULE/mi_venc.ko
 
 	echo isproot /etc/firmware > /dev/ispmid
 }
@@ -56,9 +55,9 @@ if [ -z "$SENSOR" ]; then
 	exit 1
 else
 	echo -e "\n\e[1;32mSensor assigned - $SENSOR\e[0m\n" | logger -s -t OpenIPC
-	SENSOR_MODULE=$(ls /sys/module | grep $SENSOR)
-	if [ -n "$SENSOR_MODULE" ]; then
-		rmmod $SENSOR_MODULE
+	DRIVER=$(ls /sys/module | grep $SENSOR)
+	if [ -n "$DRIVER" ]; then
+		rmmod $DRIVER
 	fi
 	set_sensor
 fi
diff --git a/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar b/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar
index 99520ca9..97b8c68f 100755
--- a/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar
+++ b/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar
@@ -3,12 +3,11 @@
 # OpenIPC.org | 2024
 #
 
-PATH_MODULE=/lib/modules/4.9.84/sigmastar
-PATH_SENSOR=$PATH_MODULE/sensor
+MODULE=/lib/modules/4.9.84/sigmastar
 SENSOR=$(fw_printenv -n sensor)
 
 detect_sensor() {
-	insmod $PATH_SENSOR/sensor_config.ko
+	insmod $MODULE/sensor_config.ko
 	if [ -e /dev/srcfg ]; then
 		echo srcfg 0 1 0 0 0 0 > /dev/srcfg
 		rmmod sensor_config
@@ -20,7 +19,7 @@ detect_sensor() {
 set_sensor() {
 	case $SENSOR in
 		gc2053|gc4653|imx274|imx307|imx335|imx347|imx415|sc501ai|sc8235)
-			insmod $PATH_SENSOR/sensor_${SENSOR}_mipi.ko chmap=1
+			insmod $MODULE/sensor_${SENSOR}_mipi.ko chmap=1
 			;;
 		*)
 			echo -e "\n\e[1;31mUNSUPPORTED sensor - $SENSOR\e[0m\n" | logger -s -t OpenIPC
@@ -29,20 +28,20 @@ set_sensor() {
 }
 
 insert_ko() {
-	insmod $PATH_MODULE/mhal.ko
-	insmod $PATH_MODULE/mi_common.ko
-	insmod $PATH_MODULE/mi_sys.ko cmdQBufSize=768 logBufSize=256
-	insmod $PATH_MODULE/mi_rgn.ko
-	insmod $PATH_MODULE/mi_ldc.ko
-	insmod $PATH_MODULE/mi_ai.ko
-	insmod $PATH_MODULE/mi_ao.ko
-	insmod $PATH_MODULE/mi_mipitx.ko
-	insmod $PATH_MODULE/mi_sensor.ko
-	insmod $PATH_MODULE/mi_shadow.ko
-	insmod $PATH_MODULE/mi_divp.ko
-	insmod $PATH_MODULE/mi_vif.ko
-	insmod $PATH_MODULE/mi_vpe.ko
-	insmod $PATH_MODULE/mi_venc.ko fw_path=/etc/firmware/chagall.bin
+	insmod $MODULE/mhal.ko
+	insmod $MODULE/mi_common.ko
+	insmod $MODULE/mi_sys.ko cmdQBufSize=768 logBufSize=256
+	insmod $MODULE/mi_rgn.ko
+	insmod $MODULE/mi_ldc.ko
+	insmod $MODULE/mi_ai.ko
+	insmod $MODULE/mi_ao.ko
+	insmod $MODULE/mi_mipitx.ko
+	insmod $MODULE/mi_sensor.ko
+	insmod $MODULE/mi_shadow.ko
+	insmod $MODULE/mi_divp.ko
+	insmod $MODULE/mi_vif.ko
+	insmod $MODULE/mi_vpe.ko
+	insmod $MODULE/mi_venc.ko fw_path=/etc/firmware/chagall.bin
 
 	MAJOR=$(awk '$2=="mi_poll" {print $1}' /proc/devices)
 	mknod /dev/mi_poll c "$MAJOR" 0
@@ -63,9 +62,9 @@ if [ -z "$SENSOR" ]; then
 	exit 1
 else
 	echo -e "\n\e[1;32mSensor assigned - $SENSOR\e[0m\n" | logger -s -t OpenIPC
-	SENSOR_MODULE=$(ls /sys/module | grep $SENSOR)
-	if [ -n "$SENSOR_MODULE" ]; then
-		rmmod $SENSOR_MODULE
+	DRIVER=$(ls /sys/module | grep $SENSOR)
+	if [ -n "$DRIVER" ]; then
+		rmmod $DRIVER
 	fi
 	set_sensor
 fi
diff --git a/general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_imx335_mipi.ko b/general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_imx335_mipi.ko
deleted file mode 100644
index 5e71ed64..00000000
Binary files a/general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_imx335_mipi.ko and /dev/null differ
diff --git a/general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_imx415_mipi.ko b/general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_imx415_mipi.ko
deleted file mode 100644
index 937e90d5..00000000
Binary files a/general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_imx415_mipi.ko and /dev/null differ
diff --git a/general/package/sigmastar-osdrv-infinity6e/sigmastar-osdrv-infinity6e.mk b/general/package/sigmastar-osdrv-infinity6e/sigmastar-osdrv-infinity6e.mk
index 9413c023..23e101b9 100644
--- a/general/package/sigmastar-osdrv-infinity6e/sigmastar-osdrv-infinity6e.mk
+++ b/general/package/sigmastar-osdrv-infinity6e/sigmastar-osdrv-infinity6e.mk
@@ -15,9 +15,6 @@ define SIGMASTAR_OSDRV_INFINITY6E_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/4.9.84/sigmastar
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.84/sigmastar $(SIGMASTAR_OSDRV_INFINITY6E_PKGDIR)/files/kmod/*
 
-	$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/4.9.84/sigmastar/sensor
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.84/sigmastar/sensor $(SIGMASTAR_OSDRV_INFINITY6E_PKGDIR)/files/sensor/kmod/*
-
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/firmware
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/firmware $(SIGMASTAR_OSDRV_INFINITY6E_PKGDIR)/files/sensor/firmware/*
 
diff --git a/general/package/sigmastar-osdrv-sensors/sigmastar-osdrv-sensors.mk b/general/package/sigmastar-osdrv-sensors/sigmastar-osdrv-sensors.mk
index e2c33165..4267fff4 100644
--- a/general/package/sigmastar-osdrv-sensors/sigmastar-osdrv-sensors.mk
+++ b/general/package/sigmastar-osdrv-sensors/sigmastar-osdrv-sensors.mk
@@ -7,14 +7,9 @@
 SIGMASTAR_OSDRV_SENSORS_SITE = $(call github,openipc,sensors,$(SIGMASTAR_OSDRV_SENSORS_VERSION))
 SIGMASTAR_OSDRV_SENSORS_VERSION = HEAD
 
-SIGMASTAR_OSDRV_SENSORS_LICENSE = MIT
-SIGMASTAR_OSDRV_SENSORS_LICENSE_FILES = LICENSE
+define SIGMASTAR_OSDRV_SENSORS_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/4.9.84/sigmastar
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.84/sigmastar $(@D)/sigmastar/$(OPENIPC_SOC_FAMILY)/*
+endef
 
-SIGMASTAR_OSDRV_SENSORS_MODULE_SUBDIRS = $(OPENIPC_SOC_VENDOR)/sources/$(OPENIPC_SOC_FAMILY)
-SIGMASTAR_OSDRV_SENSORS_MODULE_MAKE_OPTS = \
-	SENSOR_VERSION=$(OPENIPC_SOC_FAMILY) \
-	INSTALL_MOD_DIR=$(OPENIPC_SOC_VENDOR) \
-	KSRC=$(LINUX_DIR)
-
-$(eval $(kernel-module))
 $(eval $(generic-package))