diff --git a/axolotl/Android.bp b/axolotl/Android.bp
new file mode 100644
index 0000000..d8f3ad7
--- /dev/null
+++ b/axolotl/Android.bp
@@ -0,0 +1,7 @@
+// Automatically generated file. DO NOT MODIFY
+//
+// This file is generated by device/shift/axolotl/setup-makefiles.sh
+
+soong_namespace {
+}
+
diff --git a/axolotl/Android.mk b/axolotl/Android.mk
new file mode 100644
index 0000000..52cc538
--- /dev/null
+++ b/axolotl/Android.mk
@@ -0,0 +1,9 @@
+# Automatically generated file. DO NOT MODIFY
+#
+# This file is generated by device/shift/axolotl/setup-makefiles.sh
+
+LOCAL_PATH := $(call my-dir)
+
+ifeq ($(TARGET_DEVICE),axolotl)
+
+endif
diff --git a/axolotl/BoardConfigVendor.mk b/axolotl/BoardConfigVendor.mk
new file mode 100644
index 0000000..6063a0d
--- /dev/null
+++ b/axolotl/BoardConfigVendor.mk
@@ -0,0 +1,4 @@
+# Automatically generated file. DO NOT MODIFY
+#
+# This file is generated by device/shift/axolotl/setup-makefiles.sh
+
diff --git a/axolotl/axolotl-vendor.mk b/axolotl/axolotl-vendor.mk
new file mode 100644
index 0000000..65d32aa
--- /dev/null
+++ b/axolotl/axolotl-vendor.mk
@@ -0,0 +1,30 @@
+# Automatically generated file. DO NOT MODIFY
+#
+# This file is generated by device/shift/axolotl/setup-makefiles.sh
+
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/shift/axolotl
+
+PRODUCT_COPY_FILES += \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/ath10k/WCN3990/hw1.0/board-2.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/ath10k/WCN3990/hw1.0/board-2.bin \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/ath10k/WCN3990/hw1.0/firmware-5.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/ath10k/WCN3990/hw1.0/firmware-5.bin \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/qca/axolotl/crnv21.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/qca/axolotl/crnv21.bin \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/qca/crbtfw21.tlv:$(TARGET_COPY_OUT_VENDOR)/firmware/qca/crbtfw21.tlv \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/qcom/a630_gmu.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/a630_gmu.bin \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/qcom/a630_sqe.fw:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/a630_sqe.fw \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/a630_zap.mbn:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/sdm845/axolotl/a630_zap.mbn \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/adsp.mbn:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/sdm845/axolotl/adsp.mbn \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/adspr.jsn:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/sdm845/axolotl/adspr.jsn \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/adspua.jsn:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/sdm845/axolotl/adspua.jsn \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/cdsp.mbn:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/sdm845/axolotl/cdsp.mbn \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/cdspr.jsn:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/sdm845/axolotl/cdspr.jsn \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/ipa_fws.mbn:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/sdm845/axolotl/ipa_fws.mbn \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/mba.mbn:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/sdm845/axolotl/mba.mbn \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/modem.mbn:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/sdm845/axolotl/modem.mbn \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/modemr.jsn:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/sdm845/axolotl/modemr.jsn \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/modemuw.jsn:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/sdm845/axolotl/modemuw.jsn \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/slpi.mbn:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/sdm845/axolotl/slpi.mbn \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/slpir.jsn:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/sdm845/axolotl/slpir.jsn \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/slpius.jsn:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/sdm845/axolotl/slpius.jsn \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/venus.mbn:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/sdm845/axolotl/venus.mbn \
+    vendor/shift/proprietary/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/wlanmdsp.mbn:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/sdm845/axolotl/wlanmdsp.mbn
diff --git a/axolotl/proprietary/vendor/firmware/ath10k/WCN3990/hw1.0/board-2.bin b/axolotl/proprietary/vendor/firmware/ath10k/WCN3990/hw1.0/board-2.bin
new file mode 100644
index 0000000..ca92f95
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/ath10k/WCN3990/hw1.0/board-2.bin
Binary files differ
diff --git a/axolotl/proprietary/vendor/firmware/ath10k/WCN3990/hw1.0/firmware-5.bin b/axolotl/proprietary/vendor/firmware/ath10k/WCN3990/hw1.0/firmware-5.bin
new file mode 100644
index 0000000..69b4cae
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/ath10k/WCN3990/hw1.0/firmware-5.bin
Binary files differ
diff --git a/axolotl/proprietary/vendor/firmware/qca/axolotl/crnv21.bin b/axolotl/proprietary/vendor/firmware/qca/axolotl/crnv21.bin
new file mode 100644
index 0000000..b18e93b
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/qca/axolotl/crnv21.bin
Binary files differ
diff --git a/axolotl/proprietary/vendor/firmware/qca/crbtfw21.tlv b/axolotl/proprietary/vendor/firmware/qca/crbtfw21.tlv
new file mode 100644
index 0000000..273021d
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/qca/crbtfw21.tlv
Binary files differ
diff --git a/axolotl/proprietary/vendor/firmware/qcom/a630_gmu.bin b/axolotl/proprietary/vendor/firmware/qcom/a630_gmu.bin
new file mode 100644
index 0000000..4e44b36
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/qcom/a630_gmu.bin
Binary files differ
diff --git a/axolotl/proprietary/vendor/firmware/qcom/a630_sqe.fw b/axolotl/proprietary/vendor/firmware/qcom/a630_sqe.fw
new file mode 100644
index 0000000..b131c52
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/qcom/a630_sqe.fw
Binary files differ
diff --git a/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/a630_zap.mbn b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/a630_zap.mbn
new file mode 100644
index 0000000..dcdfb27
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/a630_zap.mbn
Binary files differ
diff --git a/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/adsp.mbn b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/adsp.mbn
new file mode 100644
index 0000000..d27d418
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/adsp.mbn
Binary files differ
diff --git a/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/adspr.jsn b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/adspr.jsn
new file mode 100644
index 0000000..0964c15
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/adspr.jsn
@@ -0,0 +1,21 @@
+{
+    "sr_version": {
+        "major": 1,
+        "minor": 1,
+        "patch": 1
+    },
+    "sr_domain": {
+        "soc": "msm",
+        "domain": "adsp",
+        "subdomain": "root_pd",
+        "qmi_instance_id": 74
+    },
+    "sr_service": [
+        {
+            "provider": "tms",
+            "service": "servreg",
+            "service_data_valid": 0,
+            "service_data": 0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/adspua.jsn b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/adspua.jsn
new file mode 100644
index 0000000..2d6824e
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/adspua.jsn
@@ -0,0 +1,27 @@
+{
+    "sr_version": {
+        "major": 1,
+        "minor": 1,
+        "patch": 1
+    },
+    "sr_domain": {
+        "soc": "msm",
+        "domain": "adsp",
+        "subdomain": "audio_pd",
+        "qmi_instance_id": 74
+    },
+    "sr_service": [
+        {
+            "provider": "tms",
+            "service": "servreg",
+            "service_data_valid": 0,
+            "service_data": 0
+        },
+        {
+            "provider": "avs",
+            "service": "audio",
+            "service_data_valid": 0,
+            "service_data": 0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/cdsp.mbn b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/cdsp.mbn
new file mode 100644
index 0000000..479c90e
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/cdsp.mbn
Binary files differ
diff --git a/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/cdspr.jsn b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/cdspr.jsn
new file mode 100644
index 0000000..5d976a6
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/cdspr.jsn
@@ -0,0 +1,21 @@
+{
+    "sr_version": {
+        "major": 1,
+        "minor": 1,
+        "patch": 1
+    },
+    "sr_domain": {
+        "soc": "msm",
+        "domain": "cdsp",
+        "subdomain": "root_pd",
+        "qmi_instance_id": 76
+    },
+    "sr_service": [
+        {
+            "provider": "tms",
+            "service": "servreg",
+            "service_data_valid": 0,
+            "service_data": 0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/ipa_fws.mbn b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/ipa_fws.mbn
new file mode 100644
index 0000000..30a3ac6
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/ipa_fws.mbn
Binary files differ
diff --git a/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/mba.mbn b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/mba.mbn
new file mode 100644
index 0000000..78d9138
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/mba.mbn
Binary files differ
diff --git a/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/modem.mbn b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/modem.mbn
new file mode 100644
index 0000000..5090078
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/modem.mbn
Binary files differ
diff --git a/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/modemr.jsn b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/modemr.jsn
new file mode 100644
index 0000000..cc7cd9d
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/modemr.jsn
@@ -0,0 +1,21 @@
+{
+    "sr_version": {
+        "major": 1,
+        "minor": 1,
+        "patch": 1
+    },
+    "sr_domain": {
+        "soc": "msm",
+        "domain": "modem",
+        "subdomain": "root_pd",
+        "qmi_instance_id": 180
+    },
+    "sr_service": [
+        {
+            "provider": "tms",
+            "service": "servreg",
+            "service_data_valid": 0,
+            "service_data": 0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/modemuw.jsn b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/modemuw.jsn
new file mode 100644
index 0000000..88a400e
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/modemuw.jsn
@@ -0,0 +1,33 @@
+{
+    "sr_version": {
+        "major": 1,
+        "minor": 1,
+        "patch": 1
+    },
+    "sr_domain": {
+        "soc": "msm",
+        "domain": "modem",
+        "subdomain": "wlan_pd",
+        "qmi_instance_id": 180
+    },
+    "sr_service": [
+        {
+            "provider": "kernel",
+            "service": "elf_loader",
+            "service_data_valid": 0,
+            "service_data": 0
+        },
+        {
+            "provider": "tms",
+            "service": "servreg",
+            "service_data_valid": 0,
+            "service_data": 0
+        },
+        {
+            "provider": "wlan",
+            "service": "fw",
+            "service_data_valid": 0,
+            "service_data": 0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/slpi.mbn b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/slpi.mbn
new file mode 100644
index 0000000..fa2a2ae
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/slpi.mbn
Binary files differ
diff --git a/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/slpir.jsn b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/slpir.jsn
new file mode 100644
index 0000000..1264d4c
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/slpir.jsn
@@ -0,0 +1,21 @@
+{
+    "sr_version": {
+        "major": 1,
+        "minor": 1,
+        "patch": 1
+    },
+    "sr_domain": {
+        "soc": "msm",
+        "domain": "slpi",
+        "subdomain": "root_pd",
+        "qmi_instance_id": 90
+    },
+    "sr_service": [
+        {
+            "provider": "tms",
+            "service": "servreg",
+            "service_data_valid": 0,
+            "service_data": 0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/slpius.jsn b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/slpius.jsn
new file mode 100644
index 0000000..9da70bd
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/slpius.jsn
@@ -0,0 +1,21 @@
+{
+    "sr_version": {
+        "major": 1,
+        "minor": 1,
+        "patch": 1
+    },
+    "sr_domain": {
+        "soc": "msm",
+        "domain": "slpi",
+        "subdomain": "sensor_pd",
+        "qmi_instance_id": 90
+    },
+    "sr_service": [
+        {
+            "provider": "tms",
+            "service": "servreg",
+            "service_data_valid": 0,
+            "service_data": 0
+        }
+    ]
+}
\ No newline at end of file
diff --git a/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/venus.mbn b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/venus.mbn
new file mode 100644
index 0000000..f6ec6f7
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/venus.mbn
Binary files differ
diff --git a/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/wlanmdsp.mbn b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/wlanmdsp.mbn
new file mode 100644
index 0000000..3168815
--- /dev/null
+++ b/axolotl/proprietary/vendor/firmware/qcom/sdm845/axolotl/wlanmdsp.mbn
Binary files differ