diff --git a/WHENCE b/WHENCE
index f5aa93c..f3f9a7a 100644
--- a/WHENCE
+++ b/WHENCE
@@ -5595,7 +5595,7 @@ File: qcom/a660_gmu.bin
 File: qcom/a660_sqe.fw
 File: qcom/leia_pfp_470.fw
 File: qcom/leia_pm4_470.fw
-File: qcom/LENOVO/21BX/qcdxkmsuc8280.mbn
+File: qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn
 
 Licence: Redistributable. See LICENSE.qcom and qcom/NOTICE.txt for details
 
@@ -5622,13 +5622,14 @@ File: qcom/sm8250/adspr.jsn
 File: qcom/sm8250/adspua.jsn
 File: qcom/sm8250/cdsp.mbn
 File: qcom/sm8250/cdspr.jsn
-File: qcom/LENOVO/21BX/adspr.jsn
-File: qcom/LENOVO/21BX/adspua.jsn
-File: qcom/LENOVO/21BX/battmgr.jsn
-File: qcom/LENOVO/21BX/cdspr.jsn
-File: qcom/LENOVO/21BX/qcadsp8280.mbn
-File: qcom/LENOVO/21BX/qccdsp8280.mbn
-File: qcom/LENOVO/21BX/qcslpi8280.mbn
+File: qcom/sc8280xp/LENOVO/21BX/adspr.jsn
+File: qcom/sc8280xp/LENOVO/21BX/adspua.jsn
+File: qcom/sc8280xp/LENOVO/21BX/battmgr.jsn
+File: qcom/sc8280xp/LENOVO/21BX/cdspr.jsn
+File: qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn
+File: qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn
+File: qcom/sc8280xp/LENOVO/21BX/qcslpi8280.mbn
+Link: qcom/LENOVO/21BX -> ../sc8280xp/LENOVO/21BX
 
 Licence: Redistributable. See LICENSE.qcom and qcom/NOTICE.txt for details
 
diff --git a/qcom/LENOVO/21BX/adspr.jsn b/qcom/sc8280xp/LENOVO/21BX/adspr.jsn
similarity index 100%
rename from qcom/LENOVO/21BX/adspr.jsn
rename to qcom/sc8280xp/LENOVO/21BX/adspr.jsn
diff --git a/qcom/LENOVO/21BX/adspua.jsn b/qcom/sc8280xp/LENOVO/21BX/adspua.jsn
similarity index 100%
rename from qcom/LENOVO/21BX/adspua.jsn
rename to qcom/sc8280xp/LENOVO/21BX/adspua.jsn
diff --git a/qcom/LENOVO/21BX/battmgr.jsn b/qcom/sc8280xp/LENOVO/21BX/battmgr.jsn
similarity index 100%
rename from qcom/LENOVO/21BX/battmgr.jsn
rename to qcom/sc8280xp/LENOVO/21BX/battmgr.jsn
diff --git a/qcom/LENOVO/21BX/cdspr.jsn b/qcom/sc8280xp/LENOVO/21BX/cdspr.jsn
similarity index 100%
rename from qcom/LENOVO/21BX/cdspr.jsn
rename to qcom/sc8280xp/LENOVO/21BX/cdspr.jsn
diff --git a/qcom/LENOVO/21BX/qcadsp8280.mbn b/qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn
similarity index 100%
rename from qcom/LENOVO/21BX/qcadsp8280.mbn
rename to qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn
diff --git a/qcom/LENOVO/21BX/qccdsp8280.mbn b/qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn
similarity index 100%
rename from qcom/LENOVO/21BX/qccdsp8280.mbn
rename to qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn
diff --git a/qcom/LENOVO/21BX/qcdxkmsuc8280.mbn b/qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn
similarity index 100%
rename from qcom/LENOVO/21BX/qcdxkmsuc8280.mbn
rename to qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn
diff --git a/qcom/LENOVO/21BX/qcslpi8280.mbn b/qcom/sc8280xp/LENOVO/21BX/qcslpi8280.mbn
similarity index 100%
rename from qcom/LENOVO/21BX/qcslpi8280.mbn
rename to qcom/sc8280xp/LENOVO/21BX/qcslpi8280.mbn