diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar b/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar
index 490efb27..5c442789 100755
--- a/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar
+++ b/general/package/sigmastar-osdrv-infinity6b0/files/script/load_sigmastar
@@ -4,7 +4,6 @@
 #
 
 PATH_MODULE=/lib/modules/4.9.84/sigmastar
-PATH_FIRMWARE=/etc/sensors/venc_fw/chagall.bin
 SENSOR=$(fw_printenv -n sensor)
 
 detect_sensor() {
@@ -45,12 +44,12 @@ insert_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=${PATH_FIRMWARE}
+  insmod ${PATH_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
 
-  echo isproot /etc/sensors/iqfile > /dev/ispmid
+  echo isproot /etc/firmware/iqfile > /dev/ispmid
   mdev -s
 }
 
diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/sensors/configs/gc4653.bin b/general/package/sigmastar-osdrv-infinity6b0/files/sensors/configs/gc4653.bin
new file mode 100644
index 00000000..c54a2a18
Binary files /dev/null and b/general/package/sigmastar-osdrv-infinity6b0/files/sensors/configs/gc4653.bin differ
diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/sensor/venc_fw/chagall.bin b/general/package/sigmastar-osdrv-infinity6b0/files/sensors/firmware/chagall.bin
similarity index 100%
rename from general/package/sigmastar-osdrv-infinity6b0/files/sensor/venc_fw/chagall.bin
rename to general/package/sigmastar-osdrv-infinity6b0/files/sensors/firmware/chagall.bin
diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/sensor/iqfile/iqfile0.bin b/general/package/sigmastar-osdrv-infinity6b0/files/sensors/firmware/iqfile0.bin
similarity index 100%
rename from general/package/sigmastar-osdrv-infinity6b0/files/sensor/iqfile/iqfile0.bin
rename to general/package/sigmastar-osdrv-infinity6b0/files/sensors/firmware/iqfile0.bin
diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_gc2053_mipi.ko b/general/package/sigmastar-osdrv-infinity6b0/files/sensors/kmod/sensor_gc2053_mipi.ko
similarity index 100%
rename from general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_gc2053_mipi.ko
rename to general/package/sigmastar-osdrv-infinity6b0/files/sensors/kmod/sensor_gc2053_mipi.ko
diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_gc4653_mipi.ko b/general/package/sigmastar-osdrv-infinity6b0/files/sensors/kmod/sensor_gc4653_mipi.ko
similarity index 100%
rename from general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_gc4653_mipi.ko
rename to general/package/sigmastar-osdrv-infinity6b0/files/sensors/kmod/sensor_gc4653_mipi.ko
diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_imx307_mipi.ko b/general/package/sigmastar-osdrv-infinity6b0/files/sensors/kmod/sensor_imx307_mipi.ko
similarity index 100%
rename from general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_imx307_mipi.ko
rename to general/package/sigmastar-osdrv-infinity6b0/files/sensors/kmod/sensor_imx307_mipi.ko
diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_imx335_mipi.ko b/general/package/sigmastar-osdrv-infinity6b0/files/sensors/kmod/sensor_imx335_mipi.ko
similarity index 100%
rename from general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_imx335_mipi.ko
rename to general/package/sigmastar-osdrv-infinity6b0/files/sensors/kmod/sensor_imx335_mipi.ko
diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_rx_mipi.ko b/general/package/sigmastar-osdrv-infinity6b0/files/sensors/kmod/sensor_rx_mipi.ko
similarity index 100%
rename from general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_rx_mipi.ko
rename to general/package/sigmastar-osdrv-infinity6b0/files/sensors/kmod/sensor_rx_mipi.ko
diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_sc2239_mipi.ko b/general/package/sigmastar-osdrv-infinity6b0/files/sensors/kmod/sensor_sc2239_mipi.ko
similarity index 100%
rename from general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_sc2239_mipi.ko
rename to general/package/sigmastar-osdrv-infinity6b0/files/sensors/kmod/sensor_sc2239_mipi.ko
diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_sc2335_mipi.ko b/general/package/sigmastar-osdrv-infinity6b0/files/sensors/kmod/sensor_sc2335_mipi.ko
similarity index 100%
rename from general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_sc2335_mipi.ko
rename to general/package/sigmastar-osdrv-infinity6b0/files/sensors/kmod/sensor_sc2335_mipi.ko
diff --git a/general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_sc3335_mipi.ko b/general/package/sigmastar-osdrv-infinity6b0/files/sensors/kmod/sensor_sc3335_mipi.ko
similarity index 100%
rename from general/package/sigmastar-osdrv-infinity6b0/files/sensor/kmod/sensor_sc3335_mipi.ko
rename to general/package/sigmastar-osdrv-infinity6b0/files/sensors/kmod/sensor_sc3335_mipi.ko
diff --git a/general/package/sigmastar-osdrv-infinity6b0/sigmastar-osdrv-infinity6b0.mk b/general/package/sigmastar-osdrv-infinity6b0/sigmastar-osdrv-infinity6b0.mk
index 9fe999d9..9c37cb43 100644
--- a/general/package/sigmastar-osdrv-infinity6b0/sigmastar-osdrv-infinity6b0.mk
+++ b/general/package/sigmastar-osdrv-infinity6b0/sigmastar-osdrv-infinity6b0.mk
@@ -11,14 +11,14 @@ SIGMASTAR_OSDRV_INFINITY6B0_LICENSE_FILES = LICENSE
 
 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/*.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.84/sigmastar $(SIGMASTAR_OSDRV_INFINITY6B0_PKGDIR)/files/sensor/kmod/*.ko
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.84/sigmastar $(SIGMASTAR_OSDRV_INFINITY6B0_PKGDIR)/files/kmod/*
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.84/sigmastar $(SIGMASTAR_OSDRV_INFINITY6B0_PKGDIR)/files/sensors/kmod/*
 
-	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors/iqfile
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors/iqfile $(SIGMASTAR_OSDRV_INFINITY6B0_PKGDIR)/files/sensor/iqfile/iqfile0.bin
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/firmware
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/firmware $(SIGMASTAR_OSDRV_INFINITY6B0_PKGDIR)/files/sensors/firmware/*
 
-	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors/venc_fw
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors/venc_fw $(SIGMASTAR_OSDRV_INFINITY6B0_PKGDIR)/files/sensor/venc_fw/chagall.bin
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(SIGMASTAR_OSDRV_INFINITY6B0_PKGDIR)/files/sensors/configs/*
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(SIGMASTAR_OSDRV_INFINITY6B0_PKGDIR)/files/script/*
diff --git a/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar b/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar
index 24b38e3b..b90ecaa5 100755
--- a/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar
+++ b/general/package/sigmastar-osdrv-infinity6e/files/script/load_sigmastar
@@ -4,7 +4,6 @@
 #
 
 PATH_MODULE=/lib/modules/4.9.84/sigmastar
-PATH_FIRMWARE=/etc/sensors/venc_fw/chagall.bin
 SENSOR=$(fw_printenv -n sensor)
 
 detect_sensor() {
@@ -41,12 +40,12 @@ insert_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=${PATH_FIRMWARE}
+  insmod ${PATH_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
 
-  echo isproot /etc/sensors/iqfile > /dev/ispmid
+  echo isproot /etc/firmware/iqfile > /dev/ispmid
   mdev -s
 }
 
diff --git a/general/package/sigmastar-osdrv-infinity6e/files/sensors/configs/imx415.bin b/general/package/sigmastar-osdrv-infinity6e/files/sensors/configs/imx415.bin
new file mode 100644
index 00000000..add4dc01
Binary files /dev/null and b/general/package/sigmastar-osdrv-infinity6e/files/sensors/configs/imx415.bin differ
diff --git a/general/package/sigmastar-osdrv-infinity6e/files/sensor/venc_fw/chagall.bin b/general/package/sigmastar-osdrv-infinity6e/files/sensors/firmware/chagall.bin
similarity index 100%
rename from general/package/sigmastar-osdrv-infinity6e/files/sensor/venc_fw/chagall.bin
rename to general/package/sigmastar-osdrv-infinity6e/files/sensors/firmware/chagall.bin
diff --git a/general/package/sigmastar-osdrv-infinity6e/files/sensor/iqfile/iqfile0.bin b/general/package/sigmastar-osdrv-infinity6e/files/sensors/firmware/iqfile0.bin
similarity index 100%
rename from general/package/sigmastar-osdrv-infinity6e/files/sensor/iqfile/iqfile0.bin
rename to general/package/sigmastar-osdrv-infinity6e/files/sensors/firmware/iqfile0.bin
diff --git a/general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_imx274_mipi.ko b/general/package/sigmastar-osdrv-infinity6e/files/sensors/kmod/sensor_imx274_mipi.ko
similarity index 100%
rename from general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_imx274_mipi.ko
rename to general/package/sigmastar-osdrv-infinity6e/files/sensors/kmod/sensor_imx274_mipi.ko
diff --git a/general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_imx335_mipi.ko b/general/package/sigmastar-osdrv-infinity6e/files/sensors/kmod/sensor_imx335_mipi.ko
similarity index 100%
rename from general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_imx335_mipi.ko
rename to general/package/sigmastar-osdrv-infinity6e/files/sensors/kmod/sensor_imx335_mipi.ko
diff --git a/general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_imx347_mipi.ko b/general/package/sigmastar-osdrv-infinity6e/files/sensors/kmod/sensor_imx347_mipi.ko
similarity index 100%
rename from general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_imx347_mipi.ko
rename to general/package/sigmastar-osdrv-infinity6e/files/sensors/kmod/sensor_imx347_mipi.ko
diff --git a/general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_imx415_mipi.ko b/general/package/sigmastar-osdrv-infinity6e/files/sensors/kmod/sensor_imx415_mipi.ko
similarity index 100%
rename from general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_imx415_mipi.ko
rename to general/package/sigmastar-osdrv-infinity6e/files/sensors/kmod/sensor_imx415_mipi.ko
diff --git a/general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_rx_mipi.ko b/general/package/sigmastar-osdrv-infinity6e/files/sensors/kmod/sensor_rx_mipi.ko
similarity index 100%
rename from general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_rx_mipi.ko
rename to general/package/sigmastar-osdrv-infinity6e/files/sensors/kmod/sensor_rx_mipi.ko
diff --git a/general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_sc8235_mipi.ko b/general/package/sigmastar-osdrv-infinity6e/files/sensors/kmod/sensor_sc8235_mipi.ko
similarity index 100%
rename from general/package/sigmastar-osdrv-infinity6e/files/sensor/kmod/sensor_sc8235_mipi.ko
rename to general/package/sigmastar-osdrv-infinity6e/files/sensors/kmod/sensor_sc8235_mipi.ko
diff --git a/general/package/sigmastar-osdrv-infinity6e/sigmastar-osdrv-infinity6e.mk b/general/package/sigmastar-osdrv-infinity6e/sigmastar-osdrv-infinity6e.mk
index 2bf7057e..d4e30b3f 100644
--- a/general/package/sigmastar-osdrv-infinity6e/sigmastar-osdrv-infinity6e.mk
+++ b/general/package/sigmastar-osdrv-infinity6e/sigmastar-osdrv-infinity6e.mk
@@ -11,14 +11,14 @@ SIGMASTAR_OSDRV_INFINITY6E_LICENSE_FILES = LICENSE
 
 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/*.ko
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.84/sigmastar $(SIGMASTAR_OSDRV_INFINITY6E_PKGDIR)/files/sensor/kmod/*.ko
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.84/sigmastar $(SIGMASTAR_OSDRV_INFINITY6E_PKGDIR)/files/kmod/*
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.84/sigmastar $(SIGMASTAR_OSDRV_INFINITY6E_PKGDIR)/files/sensors/kmod/*
 
-	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors/iqfile
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors/iqfile $(SIGMASTAR_OSDRV_INFINITY6E_PKGDIR)/files/sensor/iqfile/iqfile0.bin
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/firmware
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/firmware $(SIGMASTAR_OSDRV_INFINITY6E_PKGDIR)/files/sensors/firmware/*
 
-	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors/venc_fw
-	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors/venc_fw $(SIGMASTAR_OSDRV_INFINITY6E_PKGDIR)/files/sensor/venc_fw/chagall.bin
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(SIGMASTAR_OSDRV_INFINITY6E_PKGDIR)/files/sensors/configs/*
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(SIGMASTAR_OSDRV_INFINITY6E_PKGDIR)/files/script/*