diff --git a/AcpiTables/8992/builtin/CSRT.aml b/AcpiTables/8992/builtin/CSRT.aml
deleted file mode 100644
index 60f43459..00000000
Binary files a/AcpiTables/8992/builtin/CSRT.aml and /dev/null differ
diff --git a/AcpiTables/8992/builtin/DBG2.aml b/AcpiTables/8992/builtin/DBG2.aml
deleted file mode 100644
index 42d9defe..00000000
Binary files a/AcpiTables/8992/builtin/DBG2.aml and /dev/null differ
diff --git a/AcpiTables/8992/builtin/DSDT.aml b/AcpiTables/8992/builtin/DSDT.aml
index c1f460a7..fc170765 100644
Binary files a/AcpiTables/8992/builtin/DSDT.aml and b/AcpiTables/8992/builtin/DSDT.aml differ
diff --git a/AcpiTables/8992/builtin/GTDT.aml b/AcpiTables/8992/builtin/GTDT.aml
deleted file mode 100644
index c76bb1bb..00000000
Binary files a/AcpiTables/8992/builtin/GTDT.aml and /dev/null differ
diff --git a/AcpiTables/8992/builtin/MCFG.aml b/AcpiTables/8992/builtin/MCFG.aml
index f81b397e..83db5da8 100644
Binary files a/AcpiTables/8992/builtin/MCFG.aml and b/AcpiTables/8992/builtin/MCFG.aml differ
diff --git a/AcpiTables/8992/builtin/SSDT.aml b/AcpiTables/8992/builtin/SSDT.aml
new file mode 100644
index 00000000..60b1e1d3
Binary files /dev/null and b/AcpiTables/8992/builtin/SSDT.aml differ
diff --git a/AcpiTables/8992/builtin/TPM2.aml b/AcpiTables/8992/builtin/TPM2.aml
deleted file mode 100644
index 3cc37f99..00000000
Binary files a/AcpiTables/8992/builtin/TPM2.aml and /dev/null differ
diff --git a/AcpiTables/8992/src/TPM2.asl b/AcpiTables/8992/src/TPM2.asl
deleted file mode 100644
index 2afded7c..00000000
--- a/AcpiTables/8992/src/TPM2.asl
+++ /dev/null
@@ -1,13 +0,0 @@
-[000h 0000   4]                    Signature : "TPM2"    [Trusted Platform Module hardware interface table]
-[004h 0004   4]                 Table Length : 00000054
-[008h 0008   1]                     Revision : 03
-[009h 0009   1]                     Checksum : 89
-[00Ah 0010   6]                       Oem ID : "QCOM  "
-[010h 0016   8]                 Oem Table ID : "QCOMEDK2"
-[018h 0024   4]                 Oem Revision : 00008994
-[01Ch 0028   4]              Asl Compiler ID : "QCOM"
-[020h 0032   4]        Asl Compiler Revision : 00000001
-
-[024h 0036   4]                     Reserved : 00000000
-[028h 0040   8]              Control Address : 0000000000386000
-[030h 0048   4]                 Start Method : 00000009
\ No newline at end of file
diff --git a/AcpiTables/8994/builtin/CSRT.aml b/AcpiTables/8994/builtin/CSRT.aml
deleted file mode 100644
index f71eb75b..00000000
Binary files a/AcpiTables/8994/builtin/CSRT.aml and /dev/null differ
diff --git a/AcpiTables/8994/builtin/DBG2.aml b/AcpiTables/8994/builtin/DBG2.aml
deleted file mode 100644
index 4a07d417..00000000
Binary files a/AcpiTables/8994/builtin/DBG2.aml and /dev/null differ
diff --git a/AcpiTables/8994/builtin/DSDT.aml b/AcpiTables/8994/builtin/DSDT.aml
index abc51003..9d9aeaa3 100644
Binary files a/AcpiTables/8994/builtin/DSDT.aml and b/AcpiTables/8994/builtin/DSDT.aml differ
diff --git a/AcpiTables/8994/builtin/FACS.aml b/AcpiTables/8994/builtin/FACS.aml
deleted file mode 100644
index 1e024967..00000000
Binary files a/AcpiTables/8994/builtin/FACS.aml and /dev/null differ
diff --git a/AcpiTables/8994/builtin/FADT.NoPsci.acpi b/AcpiTables/8994/builtin/FADT.NoPsci.acpi
deleted file mode 100644
index 5715852c..00000000
Binary files a/AcpiTables/8994/builtin/FADT.NoPsci.acpi and /dev/null differ
diff --git a/AcpiTables/8994/builtin/FADT.PsciSmc.acpi b/AcpiTables/8994/builtin/FADT.PsciSmc.acpi
deleted file mode 100644
index b1c10847..00000000
Binary files a/AcpiTables/8994/builtin/FADT.PsciSmc.acpi and /dev/null differ
diff --git a/AcpiTables/8994/builtin/FADT.acpi b/AcpiTables/8994/builtin/FADT.acpi
deleted file mode 100644
index a61abcc4..00000000
Binary files a/AcpiTables/8994/builtin/FADT.acpi and /dev/null differ
diff --git a/AcpiTables/8994/builtin/FPDT.aml b/AcpiTables/8994/builtin/FPDT.aml
deleted file mode 100644
index 0e0c84df..00000000
Binary files a/AcpiTables/8994/builtin/FPDT.aml and /dev/null differ
diff --git a/AcpiTables/8994/builtin/MCFG.aml b/AcpiTables/8994/builtin/MCFG.aml
index ce93eab3..7e1f8c2b 100644
Binary files a/AcpiTables/8994/builtin/MCFG.aml and b/AcpiTables/8994/builtin/MCFG.aml differ
diff --git a/AcpiTables/8994/builtin/SSDT.aml b/AcpiTables/8994/builtin/SSDT.aml
new file mode 100644
index 00000000..e37e8564
Binary files /dev/null and b/AcpiTables/8994/builtin/SSDT.aml differ
diff --git a/AcpiTables/8994/builtin/TPM2.aml b/AcpiTables/8994/builtin/TPM2.aml
deleted file mode 100644
index 3cc37f99..00000000
Binary files a/AcpiTables/8994/builtin/TPM2.aml and /dev/null differ
diff --git a/AcpiTables/8994/src/CSRT.asl b/AcpiTables/8994/src/CSRT.asl
deleted file mode 100644
index 1e2610c6..00000000
--- a/AcpiTables/8994/src/CSRT.asl
+++ /dev/null
@@ -1,40 +0,0 @@
-[000h 0000   4]                    Signature : "CSRT"    [Core System Resource Table]
-[004h 0004   4]                 Table Length : 0000005C
-[008h 0008   1]                     Revision : 00
-[009h 0009   1]                     Checksum : C3
-[00Ah 0010   6]                       Oem ID : "QCOM  "
-[010h 0016   8]                 Oem Table ID : "QCOMEDK2"
-[018h 0024   4]                 Oem Revision : 00008994
-[01Ch 0028   4]              Asl Compiler ID : "QCOM"
-[020h 0032   4]        Asl Compiler Revision : 00000001
-
-
-[024h 0036   4]                       Length : 00000038
-[028h 0040   4]                    Vendor ID : 4D4F4351
-[02Ch 0044   4]                 Subvendor ID : 00000000
-[030h 0048   2]                    Device ID : 100B
-[032h 0050   2]                 Subdevice ID : 0000
-[034h 0052   2]                     Revision : 0000
-[036h 0054   2]                     Reserved : 0000
-[038h 0056   4]           Shared Info Length : 00000000
-
-[03Ch 0060   2]                Major Version : 0020
-[03Eh 0062   2]                Minor Version : 0000
-[040h 0064   4]        MMIO Base Address Low : 00000002
-[044h 0068   4]       MMIO Base Address High : 00000001
-[048h 0072   4]                GSI Interrupt : 00000002
-[04Ch 0076   1]           Interrupt Polarity : 00
-[04Dh 0077   1]               Interrupt Mode : 70
-[04Eh 0078   1]                 Num Channels : 01
-[04Fh 0079   1]            DMA Address Width : F9
-[050h 0080   2]            Base Request Line : 0000
-[052h 0082   2]        Num Handshake Signals : 0000
-[054h 0084   4]               Max Block Size : 00007FFD
-
-[03Ch 0060   4]                       Length : 00000020
-[040h 0064   2]                         Type : 0002
-[042h 0066   2]                      Subtype : 0000
-[044h 0068   4]                          UID : 00000001
-[048h 0072  20]                 ResourceInfo : \
-    02 00 00 00 00 70 01 F9 00 00 00 00 FD 7F 00 00 \
-    23 00 00 00 
\ No newline at end of file
diff --git a/AcpiTables/8994/src/DBG2.asl b/AcpiTables/8994/src/DBG2.asl
deleted file mode 100644
index d3429f38..00000000
--- a/AcpiTables/8994/src/DBG2.asl
+++ /dev/null
@@ -1,184 +0,0 @@
-[000h 0000   4]                    Signature : "DBG2"    [Debug Port table type 2]
-[004h 0004   4]                 Table Length : 0000036A
-[008h 0008   1]                     Revision : 01
-[009h 0009   1]                     Checksum : 85
-[00Ah 0010   6]                       Oem ID : "QCOM  "
-[010h 0016   8]                 Oem Table ID : "QCOMEDK2"
-[018h 0024   4]                 Oem Revision : 00008994
-[01Ch 0028   4]              Asl Compiler ID : "QCOM"
-[020h 0032   4]        Asl Compiler Revision : 00000001
-
-[024h 0036   4]                  Info Offset : 0000002C
-[028h 0040   4]                   Info Count : 00000005
-
-[02Ch 0044   1]                     Revision : 01
-[02Dh 0045   2]                       Length : 0046
-[02Fh 0047   1]               Register Count : 01
-[030h 0048   2]              Namepath Length : 000A
-[032h 0050   2]              Namepath Offset : 0026
-[034h 0052   2]              OEM Data Length : 0000 [Optional field not present]
-[036h 0054   2]              OEM Data Offset : 0000 [Optional field not present]
-[038h 0056   2]                    Port Type : 8000
-[03Ah 0058   2]                 Port Subtype : 0004
-[03Ch 0060   2]                     Reserved : 0000
-[03Eh 0062   2]          Base Address Offset : 0016
-[040h 0064   2]          Address Size Offset : 0022
-
-[042h 0066  12]        Base Address Register : [Generic Address Structure]
-[042h 0066   1]                     Space ID : 00 [SystemMemory]
-[043h 0067   1]                    Bit Width : 20
-[044h 0068   1]                   Bit Offset : 00
-[045h 0069   1]         Encoded Access Width : 20 [Unknown Width Encoding]
-[046h 0070   8]                      Address : 00000000F991E000
-
-[04Eh 0078   4]                 Address Size : 00001000
-
-[052h 0082  10]                     Namepath : "\_SB.UAR1"
-
-[072h 0114   1]                     Revision : 01
-[073h 0115   2]                       Length : 00C2
-[075h 0117   1]               Register Count : 02
-[076h 0118   2]              Namepath Length : 000A
-[078h 0120   2]              Namepath Offset : 0036
-[07Ah 0122   2]              OEM Data Length : 006C
-[07Ch 0124   2]              OEM Data Offset : 0056
-[07Eh 0126   2]                    Port Type : 8003
-[080h 0128   2]                 Port Subtype : 5143
-[082h 0130   2]                     Reserved : 0000
-[084h 0132   2]          Base Address Offset : 0016
-[086h 0134   2]          Address Size Offset : 002E
-
-[088h 0136  12]        Base Address Register : [Generic Address Structure]
-[088h 0136   1]                     Space ID : 00 [SystemMemory]
-[089h 0137   1]                    Bit Width : 20
-[08Ah 0138   1]                   Bit Offset : 00
-[08Bh 0139   1]         Encoded Access Width : 20 [Unknown Width Encoding]
-[08Ch 0140   8]                      Address : 00000000F9A55000
-
-
-[094h 0148  12]        Base Address Register : [Generic Address Structure]
-[094h 0148   1]                     Space ID : 00 [SystemMemory]
-[095h 0149   1]                    Bit Width : 20
-[096h 0150   1]                   Bit Offset : 00
-[097h 0151   1]         Encoded Access Width : 20 [Unknown Width Encoding]
-[098h 0152   8]                      Address : 00000000FD4AB000
-
-[0A0h 0160   4]                 Address Size : 00001000
-[0A4h 0164   4]                 Address Size : 00001000
-
-[0A8h 0168  10]                     Namepath : "\_SB.URS0"
-[0C8h 0200 108]                     OEM Data : \
-    03 00 00 00 31 58 49 46 08 00 00 00 01 00 00 00 \
-    00 00 00 00 00 00 00 00 00 00 40 00 00 00 00 00 \
-    4E 45 54 31 00 00 90 00 00 00 00 00 00 00 00 00 \
-    00 00 98 00 00 00 00 00 08 00 00 00 00 00 9C 00 \
-    00 00 00 00 B0 0C 00 00 00 00 70 01 00 00 00 00 \
-    03 00 96 60 00 00 A0 00 00 00 00 00 E0 FF 00 00 \
-    00 00 40 01 00 00 00 00 00 00 08 02 
-
-[134h 0308   1]                     Revision : 01
-[135h 0309   2]                       Length : 00C2
-[137h 0311   1]               Register Count : 02
-[138h 0312   2]              Namepath Length : 000A
-[13Ah 0314   2]              Namepath Offset : 0036
-[13Ch 0316   2]              OEM Data Length : 006C
-[13Eh 0318   2]              OEM Data Offset : 0056
-[140h 0320   2]                    Port Type : 8003
-[142h 0322   2]                 Port Subtype : 5143
-[144h 0324   2]                     Reserved : 0000
-[146h 0326   2]          Base Address Offset : 0016
-[148h 0328   2]          Address Size Offset : 002E
-
-[14Ah 0330  12]        Base Address Register : [Generic Address Structure]
-[14Ah 0330   1]                     Space ID : 00 [SystemMemory]
-[14Bh 0331   1]                    Bit Width : 20
-[14Ch 0332   1]                   Bit Offset : 00
-[14Dh 0333   1]         Encoded Access Width : 20 [Unknown Width Encoding]
-[14Eh 0334   8]                      Address : 00000000F9A55000
-
-
-[156h 0342  12]        Base Address Register : [Generic Address Structure]
-[156h 0342   1]                     Space ID : 00 [SystemMemory]
-[157h 0343   1]                    Bit Width : 20
-[158h 0344   1]                   Bit Offset : 00
-[159h 0345   1]         Encoded Access Width : 20 [Unknown Width Encoding]
-[15Ah 0346   8]                      Address : 00000000FD4AB000
-
-[162h 0354   4]                 Address Size : 00001000
-[166h 0358   4]                 Address Size : 00001000
-
-[16Ah 0362  10]                     Namepath : "\_SB.UFN1"
-[18Ah 0394 108]                     OEM Data : \
-    03 00 00 00 31 58 49 46 08 00 00 00 01 00 00 00 \
-    00 00 00 00 01 00 00 00 00 00 90 00 00 00 00 00 \
-    00 00 00 00 00 00 40 00 00 00 00 00 4E 45 54 32 \
-    00 00 98 00 00 00 00 00 08 00 00 00 00 00 9C 00 \
-    00 00 00 00 B0 0C 00 00 00 00 70 01 00 00 00 00 \
-    03 00 96 60 00 00 A0 00 00 00 00 00 E0 FF 00 00 \
-    00 00 40 01 00 00 00 00 00 00 08 02 
-
-[1F6h 0502   1]                     Revision : 01
-[1F7h 0503   2]                       Length : 00BA
-[1F9h 0505   1]               Register Count : 01
-[1FAh 0506   2]              Namepath Length : 000A
-[1FCh 0508   2]              Namepath Offset : 0026
-[1FEh 0510   2]              OEM Data Length : 0074
-[200h 0512   2]              OEM Data Offset : 0046
-[202h 0514   2]                    Port Type : 8002
-[204h 0516   2]                 Port Subtype : 0004
-[206h 0518   2]                     Reserved : 0000
-[208h 0520   2]          Base Address Offset : 0016
-[20Ah 0522   2]          Address Size Offset : 0022
-
-[20Ch 0524  12]        Base Address Register : [Generic Address Structure]
-[20Ch 0524   1]                     Space ID : 00 [SystemMemory]
-[20Dh 0525   1]                    Bit Width : 20
-[20Eh 0526   1]                   Bit Offset : 00
-[20Fh 0527   1]         Encoded Access Width : 20 [Unknown Width Encoding]
-[210h 0528   8]                      Address : 00000000F9A55000
-
-[218h 0536   4]                 Address Size : 000001AF
-
-[21Ch 0540  10]                     Namepath : "\_SB.URS0"
-[23Ch 0572 116]                     OEM Data : \
-    74 00 00 00 00 50 A5 F9 00 00 00 00 00 10 00 00 \
-    07 00 00 00 40 00 00 00 90 00 00 00 98 00 00 00 \
-    9C 00 00 00 70 01 00 00 A0 00 00 00 40 01 00 00 \
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
-    00 00 00 00 55 53 42 31 00 00 00 00 08 00 00 00 \
-    B0 0C 00 00 03 00 96 60 E0 FF 00 00 00 00 08 02 \
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
-    00 00 00 00 
-
-[2B0h 0688   1]                     Revision : 00
-[2B1h 0689   2]                       Length : 00BA
-[2B3h 0691   1]               Register Count : 01
-[2B4h 0692   2]              Namepath Length : 000A
-[2B6h 0694   2]              Namepath Offset : 0026
-[2B8h 0696   2]              OEM Data Length : 0074
-[2BAh 0698   2]              OEM Data Offset : 0046
-[2BCh 0700   2]                    Port Type : 8002
-[2BEh 0702   2]                 Port Subtype : 0000
-[2C0h 0704   2]                     Reserved : 0000
-[2C2h 0706   2]          Base Address Offset : 0016
-[2C4h 0708   2]          Address Size Offset : 0022
-
-[2C6h 0710  12]        Base Address Register : [Generic Address Structure]
-[2C6h 0710   1]                     Space ID : 00 [SystemMemory]
-[2C7h 0711   1]                    Bit Width : 20
-[2C8h 0712   1]                   Bit Offset : 00
-[2C9h 0713   1]         Encoded Access Width : 20 [Unknown Width Encoding]
-[2CAh 0714   8]                      Address : 00000000F9200000
-
-[2D2h 0722   4]                 Address Size : 000FFFFF
-
-[2D6h 0726  10]                     Namepath : "\_SB.URS0"
-[2F6h 0758 116]                     OEM Data : \
-    74 00 00 00 00 B0 4A FD 00 00 00 00 00 10 00 00 \
-    01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
-    00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 \
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
-    00 00 00 00 
\ No newline at end of file
diff --git a/AcpiTables/8994/src/FACS.asl b/AcpiTables/8994/src/FACS.asl
deleted file mode 100644
index 574c0953..00000000
--- a/AcpiTables/8994/src/FACS.asl
+++ /dev/null
@@ -1,13 +0,0 @@
-[000h 0000   4]                    Signature : "FACS"
-[004h 0004   4]                       Length : 00000040
-[008h 0008   4]           Hardware Signature : 00000000
-[00Ch 0012   4]    32 Firmware Waking Vector : 00000000
-[010h 0016   4]                  Global Lock : 00000000
-[014h 0020   4]        Flags (decoded below) : 00000000
-                      S4BIOS Support Present : 0
-                  64-bit Wake Supported (V2) : 0
-[018h 0024   8]    64 Firmware Waking Vector : 0000000000000000
-[020h 0032   1]                      Version : 02
-[021h 0033   3]                     Reserved : 000000
-[024h 0036   4]    OspmFlags (decoded below) : 00000000
-               64-bit Wake Env Required (V2) : 0
\ No newline at end of file
diff --git a/AcpiTables/8994/src/FPDT.asl b/AcpiTables/8994/src/FPDT.asl
deleted file mode 100644
index 369f49d7..00000000
--- a/AcpiTables/8994/src/FPDT.asl
+++ /dev/null
@@ -1,16 +0,0 @@
-[000h 0000   4]                    Signature : "FPDT"    [Firmware Performance Data Table]
-[004h 0004   4]                 Table Length : 00000034
-[008h 0008   1]                     Revision : 01
-[009h 0009   1]                     Checksum : 60
-[00Ah 0010   6]                       Oem ID : "QCOM  "
-[010h 0016   8]                 Oem Table ID : "QCOMEDK2"
-[018h 0024   4]                 Oem Revision : 00008994
-[01Ch 0028   4]              Asl Compiler ID : "QCOM"
-[020h 0032   4]        Asl Compiler Revision : 00000001
-
-
-[024h 0036   2]                Subtable Type : 0000
-[026h 0038   1]                       Length : 10
-[027h 0039   1]                     Revision : 01
-[028h 0040   4]                     Reserved : 00000000
-[02Ch 0044   8]     FPDT Boot Record Address : 0000000000380000
\ No newline at end of file
diff --git a/AcpiTables/8994/src/GTDT.asl b/AcpiTables/8994/src/GTDT.asl
deleted file mode 100644
index 85e54c85..00000000
--- a/AcpiTables/8994/src/GTDT.asl
+++ /dev/null
@@ -1,63 +0,0 @@
-[000h 0000   4]                    Signature : "GTDT"    [Generic Timer Description Table]
-[004h 0004   4]                 Table Length : 0000009C
-[008h 0008   1]                     Revision : 02
-[009h 0009   1]                     Checksum : 8F
-[00Ah 0010   6]                       Oem ID : "QCOM  "
-[010h 0016   8]                 Oem Table ID : "QCOMEDK2"
-[018h 0024   4]                 Oem Revision : 00008994
-[01Ch 0028   4]              Asl Compiler ID : "QCOM"
-[020h 0032   4]        Asl Compiler Revision : 00000001
-
-[024h 0036   8]        Counter Block Address : 00000000F9020000
-[02Ch 0044   4]                     Reserved : 00000000
-
-[030h 0048   4]         Secure EL1 Interrupt : 00000012
-[034h 0052   4]    EL1 Flags (decoded below) : 00000000
-                                Trigger Mode : 0
-                                    Polarity : 0
-                                   Always On : 0
-
-[038h 0056   4]     Non-Secure EL1 Interrupt : 00000013
-[03Ch 0060   4]   NEL1 Flags (decoded below) : 00000000
-                                Trigger Mode : 0
-                                    Polarity : 0
-                                   Always On : 0
-
-[040h 0064   4]      Virtual Timer Interrupt : 00000014
-[044h 0068   4]     VT Flags (decoded below) : 00000000
-                                Trigger Mode : 0
-                                    Polarity : 0
-                                   Always On : 0
-
-[048h 0072   4]     Non-Secure EL2 Interrupt : 00000011
-[04Ch 0076   4]   NEL2 Flags (decoded below) : 00000000
-                                Trigger Mode : 0
-                                    Polarity : 0
-                                   Always On : 0
-[050h 0080   8]   Counter Read Block Address : FFFFFFFFFFFFFFFF
-
-[058h 0088   4]         Platform Timer Count : 00000001
-[05Ch 0092   4]        Platform Timer Offset : 00000060
-
-[060h 0096   1]                Subtable Type : 00 [Generic Timer Block]
-[061h 0097   2]                       Length : 003C
-[063h 0099   1]                     Reserved : 00
-[064h 0100   8]                Block Address : 00000000F9020000
-[06Ch 0108   4]                  Timer Count : 00000001
-[070h 0112   4]                 Timer Offset : 00000014
-
-[074h 0116   1]                 Frame Number : 00
-[075h 0117   3]                     Reserved : 000000
-[078h 0120   8]                 Base Address : 00000000F9021000
-[080h 0128   8]             EL0 Base Address : 00000000F9022000
-[088h 0136   4]              Timer Interrupt : 00000029
-[08Ch 0140   4]  Timer Flags (decoded below) : 00000000
-                                Trigger Mode : 0
-                                    Polarity : 0
-[090h 0144   4]      Virtual Timer Interrupt : 00000028
-[094h 0148   4] Virtual Timer Flags (decoded below) : 00000000
-                                Trigger Mode : 0
-                                    Polarity : 0
-[098h 0152   4] Common Flags (decoded below) : 00000002
-                                      Secure : 0
-                                   Always On : 1
\ No newline at end of file
diff --git a/AcpiTables/Hapanero/builtin/CSRT.aml b/AcpiTables/Hapanero/builtin/CSRT.aml
deleted file mode 100644
index f3a320d9..00000000
Binary files a/AcpiTables/Hapanero/builtin/CSRT.aml and /dev/null differ
diff --git a/AcpiTables/Hapanero/builtin/DBG2.aml b/AcpiTables/Hapanero/builtin/DBG2.aml
deleted file mode 100644
index 1b287667..00000000
Binary files a/AcpiTables/Hapanero/builtin/DBG2.aml and /dev/null differ
diff --git a/AcpiTables/Hapanero/builtin/DSDT.aml b/AcpiTables/Hapanero/builtin/DSDT.aml
index f0637d74..a9b42646 100644
Binary files a/AcpiTables/Hapanero/builtin/DSDT.aml and b/AcpiTables/Hapanero/builtin/DSDT.aml differ
diff --git a/AcpiTables/Hapanero/builtin/FACS.aml b/AcpiTables/Hapanero/builtin/FACS.aml
deleted file mode 100644
index 1e024967..00000000
Binary files a/AcpiTables/Hapanero/builtin/FACS.aml and /dev/null differ
diff --git a/AcpiTables/Hapanero/builtin/FADT.NoPsci.acpi b/AcpiTables/Hapanero/builtin/FADT.NoPsci.acpi
deleted file mode 100644
index 5715852c..00000000
Binary files a/AcpiTables/Hapanero/builtin/FADT.NoPsci.acpi and /dev/null differ
diff --git a/AcpiTables/Hapanero/builtin/FADT.PsciSmc.acpi b/AcpiTables/Hapanero/builtin/FADT.PsciSmc.acpi
deleted file mode 100644
index b1c10847..00000000
Binary files a/AcpiTables/Hapanero/builtin/FADT.PsciSmc.acpi and /dev/null differ
diff --git a/AcpiTables/Hapanero/builtin/FADT.acpi b/AcpiTables/Hapanero/builtin/FADT.acpi
deleted file mode 100644
index a61abcc4..00000000
Binary files a/AcpiTables/Hapanero/builtin/FADT.acpi and /dev/null differ
diff --git a/AcpiTables/Hapanero/builtin/FPDT.aml b/AcpiTables/Hapanero/builtin/FPDT.aml
deleted file mode 100644
index 0e0c84df..00000000
Binary files a/AcpiTables/Hapanero/builtin/FPDT.aml and /dev/null differ
diff --git a/AcpiTables/Hapanero/builtin/GTDT.aml b/AcpiTables/Hapanero/builtin/GTDT.aml
deleted file mode 100644
index 6b26dbfa..00000000
Binary files a/AcpiTables/Hapanero/builtin/GTDT.aml and /dev/null differ
diff --git a/AcpiTables/Hapanero/builtin/MCFG.aml b/AcpiTables/Hapanero/builtin/MCFG.aml
index 274eea96..7e1f8c2b 100644
Binary files a/AcpiTables/Hapanero/builtin/MCFG.aml and b/AcpiTables/Hapanero/builtin/MCFG.aml differ
diff --git a/AcpiTables/Hapanero/builtin/SSDT.aml b/AcpiTables/Hapanero/builtin/SSDT.aml
new file mode 100644
index 00000000..187d424d
Binary files /dev/null and b/AcpiTables/Hapanero/builtin/SSDT.aml differ
diff --git a/AcpiTables/Hapanero/builtin/TPM2.aml b/AcpiTables/Hapanero/builtin/TPM2.aml
deleted file mode 100644
index 3cc37f99..00000000
Binary files a/AcpiTables/Hapanero/builtin/TPM2.aml and /dev/null differ
diff --git a/AcpiTables/Hapanero/src/CSRT.asl b/AcpiTables/Hapanero/src/CSRT.asl
deleted file mode 100644
index f1a955c1..00000000
--- a/AcpiTables/Hapanero/src/CSRT.asl
+++ /dev/null
@@ -1,40 +0,0 @@
-[000h 0000   4]                    Signature : "CSRT"    [Core System Resource Table]
-[004h 0004   4]                 Table Length : 0000005C
-[008h 0008   1]                     Revision : 00
-[009h 0009   1]                     Checksum : C3
-[00Ah 0010   6]                       Oem ID : "QCOM  "
-[010h 0016   8]                 Oem Table ID : "QCOMEDK2"
-[018h 0024   4]                 Oem Revision : 00008994
-[01Ch 0028   4]              Asl Compiler ID : "QCOM"
-[020h 0032   4]        Asl Compiler Revision : 00000001
-
-
-[024h 0036   4]                       Length : 00000038
-[028h 0040   4]                    Vendor ID : 4D4F4351
-[02Ch 0044   4]                 Subvendor ID : 00000000
-[030h 0048   2]                    Device ID : 100B
-[032h 0050   2]                 Subdevice ID : 0000
-[034h 0052   2]                     Revision : 0000
-[036h 0054   2]                     Reserved : 0000
-[038h 0056   4]           Shared Info Length : 00000000
-
-[03Ch 0060   2]                Major Version : 0020
-[03Eh 0062   2]                Minor Version : 0000
-[040h 0064   4]        MMIO Base Address Low : 00000002
-[044h 0068   4]       MMIO Base Address High : 00000001
-[048h 0072   4]                GSI Interrupt : 00000002
-[04Ch 0076   1]           Interrupt Polarity : 00
-[04Dh 0077   1]               Interrupt Mode : 70
-[04Eh 0078   1]                 Num Channels : 01
-[04Fh 0079   1]            DMA Address Width : F9
-[050h 0080   2]            Base Request Line : 0000
-[052h 0082   2]        Num Handshake Signals : 0000
-[054h 0084   4]               Max Block Size : 00007FFD
-
-[03Ch 0060   4]                       Length : 00000020
-[040h 0064   2]                         Type : 0002
-[042h 0066   2]                      Subtype : 0000
-[044h 0068   4]                          UID : 00000001
-[048h 0072  20]                 ResourceInfo : \
-    02 00 00 00 00 70 01 F9 00 00 00 00 FD 7F 00 00 \
-    23 00 00 00 
diff --git a/AcpiTables/Hapanero/src/DBG2.asl b/AcpiTables/Hapanero/src/DBG2.asl
deleted file mode 100644
index 040557cc..00000000
--- a/AcpiTables/Hapanero/src/DBG2.asl
+++ /dev/null
@@ -1,184 +0,0 @@
-[000h 0000   4]                    Signature : "DBG2"    [Debug Port table type 2]
-[004h 0004   4]                 Table Length : 0000036A
-[008h 0008   1]                     Revision : 01
-[009h 0009   1]                     Checksum : 85
-[00Ah 0010   6]                       Oem ID : "QCOM  "
-[010h 0016   8]                 Oem Table ID : "QCOMEDK2"
-[018h 0024   4]                 Oem Revision : 00008994
-[01Ch 0028   4]              Asl Compiler ID : "QCOM"
-[020h 0032   4]        Asl Compiler Revision : 00000001
-
-[024h 0036   4]                  Info Offset : 0000002C
-[028h 0040   4]                   Info Count : 00000005
-
-[02Ch 0044   1]                     Revision : 01
-[02Dh 0045   2]                       Length : 0046
-[02Fh 0047   1]               Register Count : 01
-[030h 0048   2]              Namepath Length : 000A
-[032h 0050   2]              Namepath Offset : 0026
-[034h 0052   2]              OEM Data Length : 0000 [Optional field not present]
-[036h 0054   2]              OEM Data Offset : 0000 [Optional field not present]
-[038h 0056   2]                    Port Type : 8000
-[03Ah 0058   2]                 Port Subtype : 0004
-[03Ch 0060   2]                     Reserved : 0000
-[03Eh 0062   2]          Base Address Offset : 0016
-[040h 0064   2]          Address Size Offset : 0022
-
-[042h 0066  12]        Base Address Register : [Generic Address Structure]
-[042h 0066   1]                     Space ID : 00 [SystemMemory]
-[043h 0067   1]                    Bit Width : 20
-[044h 0068   1]                   Bit Offset : 00
-[045h 0069   1]         Encoded Access Width : 20 [Unknown Width Encoding]
-[046h 0070   8]                      Address : 00000000F991E000
-
-[04Eh 0078   4]                 Address Size : 00001000
-
-[052h 0082  10]                     Namepath : "\_SB.UAR1"
-
-[072h 0114   1]                     Revision : 01
-[073h 0115   2]                       Length : 00C2
-[075h 0117   1]               Register Count : 02
-[076h 0118   2]              Namepath Length : 000A
-[078h 0120   2]              Namepath Offset : 0036
-[07Ah 0122   2]              OEM Data Length : 006C
-[07Ch 0124   2]              OEM Data Offset : 0056
-[07Eh 0126   2]                    Port Type : 8003
-[080h 0128   2]                 Port Subtype : 5143
-[082h 0130   2]                     Reserved : 0000
-[084h 0132   2]          Base Address Offset : 0016
-[086h 0134   2]          Address Size Offset : 002E
-
-[088h 0136  12]        Base Address Register : [Generic Address Structure]
-[088h 0136   1]                     Space ID : 00 [SystemMemory]
-[089h 0137   1]                    Bit Width : 20
-[08Ah 0138   1]                   Bit Offset : 00
-[08Bh 0139   1]         Encoded Access Width : 20 [Unknown Width Encoding]
-[08Ch 0140   8]                      Address : 00000000F9A55000
-
-
-[094h 0148  12]        Base Address Register : [Generic Address Structure]
-[094h 0148   1]                     Space ID : 00 [SystemMemory]
-[095h 0149   1]                    Bit Width : 20
-[096h 0150   1]                   Bit Offset : 00
-[097h 0151   1]         Encoded Access Width : 20 [Unknown Width Encoding]
-[098h 0152   8]                      Address : 00000000FD4AB000
-
-[0A0h 0160   4]                 Address Size : 00001000
-[0A4h 0164   4]                 Address Size : 00001000
-
-[0A8h 0168  10]                     Namepath : "\_SB.URS0"
-[0C8h 0200 108]                     OEM Data : \
-    03 00 00 00 31 58 49 46 08 00 00 00 01 00 00 00 \
-    00 00 00 00 00 00 00 00 00 00 40 00 00 00 00 00 \
-    4E 45 54 31 00 00 90 00 00 00 00 00 00 00 00 00 \
-    00 00 98 00 00 00 00 00 08 00 00 00 00 00 9C 00 \
-    00 00 00 00 B0 0C 00 00 00 00 70 01 00 00 00 00 \
-    03 00 96 60 00 00 A0 00 00 00 00 00 E0 FF 00 00 \
-    00 00 40 01 00 00 00 00 00 00 08 02 
-
-[134h 0308   1]                     Revision : 01
-[135h 0309   2]                       Length : 00C2
-[137h 0311   1]               Register Count : 02
-[138h 0312   2]              Namepath Length : 000A
-[13Ah 0314   2]              Namepath Offset : 0036
-[13Ch 0316   2]              OEM Data Length : 006C
-[13Eh 0318   2]              OEM Data Offset : 0056
-[140h 0320   2]                    Port Type : 8003
-[142h 0322   2]                 Port Subtype : 5143
-[144h 0324   2]                     Reserved : 0000
-[146h 0326   2]          Base Address Offset : 0016
-[148h 0328   2]          Address Size Offset : 002E
-
-[14Ah 0330  12]        Base Address Register : [Generic Address Structure]
-[14Ah 0330   1]                     Space ID : 00 [SystemMemory]
-[14Bh 0331   1]                    Bit Width : 20
-[14Ch 0332   1]                   Bit Offset : 00
-[14Dh 0333   1]         Encoded Access Width : 20 [Unknown Width Encoding]
-[14Eh 0334   8]                      Address : 00000000F9A55000
-
-
-[156h 0342  12]        Base Address Register : [Generic Address Structure]
-[156h 0342   1]                     Space ID : 00 [SystemMemory]
-[157h 0343   1]                    Bit Width : 20
-[158h 0344   1]                   Bit Offset : 00
-[159h 0345   1]         Encoded Access Width : 20 [Unknown Width Encoding]
-[15Ah 0346   8]                      Address : 00000000FD4AB000
-
-[162h 0354   4]                 Address Size : 00001000
-[166h 0358   4]                 Address Size : 00001000
-
-[16Ah 0362  10]                     Namepath : "\_SB.UFN1"
-[18Ah 0394 108]                     OEM Data : \
-    03 00 00 00 31 58 49 46 08 00 00 00 01 00 00 00 \
-    00 00 00 00 01 00 00 00 00 00 90 00 00 00 00 00 \
-    00 00 00 00 00 00 40 00 00 00 00 00 4E 45 54 32 \
-    00 00 98 00 00 00 00 00 08 00 00 00 00 00 9C 00 \
-    00 00 00 00 B0 0C 00 00 00 00 70 01 00 00 00 00 \
-    03 00 96 60 00 00 A0 00 00 00 00 00 E0 FF 00 00 \
-    00 00 40 01 00 00 00 00 00 00 08 02 
-
-[1F6h 0502   1]                     Revision : 01
-[1F7h 0503   2]                       Length : 00BA
-[1F9h 0505   1]               Register Count : 01
-[1FAh 0506   2]              Namepath Length : 000A
-[1FCh 0508   2]              Namepath Offset : 0026
-[1FEh 0510   2]              OEM Data Length : 0074
-[200h 0512   2]              OEM Data Offset : 0046
-[202h 0514   2]                    Port Type : 8002
-[204h 0516   2]                 Port Subtype : 0004
-[206h 0518   2]                     Reserved : 0000
-[208h 0520   2]          Base Address Offset : 0016
-[20Ah 0522   2]          Address Size Offset : 0022
-
-[20Ch 0524  12]        Base Address Register : [Generic Address Structure]
-[20Ch 0524   1]                     Space ID : 00 [SystemMemory]
-[20Dh 0525   1]                    Bit Width : 20
-[20Eh 0526   1]                   Bit Offset : 00
-[20Fh 0527   1]         Encoded Access Width : 20 [Unknown Width Encoding]
-[210h 0528   8]                      Address : 00000000F9A55000
-
-[218h 0536   4]                 Address Size : 000001AF
-
-[21Ch 0540  10]                     Namepath : "\_SB.URS0"
-[23Ch 0572 116]                     OEM Data : \
-    74 00 00 00 00 50 A5 F9 00 00 00 00 00 10 00 00 \
-    07 00 00 00 40 00 00 00 90 00 00 00 98 00 00 00 \
-    9C 00 00 00 70 01 00 00 A0 00 00 00 40 01 00 00 \
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
-    00 00 00 00 55 53 42 31 00 00 00 00 08 00 00 00 \
-    B0 0C 00 00 03 00 96 60 E0 FF 00 00 00 00 08 02 \
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
-    00 00 00 00 
-
-[2B0h 0688   1]                     Revision : 00
-[2B1h 0689   2]                       Length : 00BA
-[2B3h 0691   1]               Register Count : 01
-[2B4h 0692   2]              Namepath Length : 000A
-[2B6h 0694   2]              Namepath Offset : 0026
-[2B8h 0696   2]              OEM Data Length : 0074
-[2BAh 0698   2]              OEM Data Offset : 0046
-[2BCh 0700   2]                    Port Type : 8002
-[2BEh 0702   2]                 Port Subtype : 0000
-[2C0h 0704   2]                     Reserved : 0000
-[2C2h 0706   2]          Base Address Offset : 0016
-[2C4h 0708   2]          Address Size Offset : 0022
-
-[2C6h 0710  12]        Base Address Register : [Generic Address Structure]
-[2C6h 0710   1]                     Space ID : 00 [SystemMemory]
-[2C7h 0711   1]                    Bit Width : 20
-[2C8h 0712   1]                   Bit Offset : 00
-[2C9h 0713   1]         Encoded Access Width : 20 [Unknown Width Encoding]
-[2CAh 0714   8]                      Address : 00000000F9200000
-
-[2D2h 0722   4]                 Address Size : 000FFFFF
-
-[2D6h 0726  10]                     Namepath : "\_SB.URS0"
-[2F6h 0758 116]                     OEM Data : \
-    74 00 00 00 00 B0 4A FD 00 00 00 00 00 10 00 00 \
-    01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
-    00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 \
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
-    00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
-    00 00 00 00 
\ No newline at end of file
diff --git a/AcpiTables/Hapanero/src/FACS.asl b/AcpiTables/Hapanero/src/FACS.asl
deleted file mode 100644
index f79ec554..00000000
--- a/AcpiTables/Hapanero/src/FACS.asl
+++ /dev/null
@@ -1,13 +0,0 @@
-[000h 0000   4]                    Signature : "FACS"
-[004h 0004   4]                       Length : 00000040
-[008h 0008   4]           Hardware Signature : 00000000
-[00Ch 0012   4]    32 Firmware Waking Vector : 00000000
-[010h 0016   4]                  Global Lock : 00000000
-[014h 0020   4]        Flags (decoded below) : 00000000
-                      S4BIOS Support Present : 0
-                  64-bit Wake Supported (V2) : 0
-[018h 0024   8]    64 Firmware Waking Vector : 0000000000000000
-[020h 0032   1]                      Version : 02
-[021h 0033   3]                     Reserved : 000000
-[024h 0036   4]    OspmFlags (decoded below) : 00000000
-               64-bit Wake Env Required (V2) : 0
\ No newline at end of file
diff --git a/AcpiTables/Hapanero/src/FPDT.asl b/AcpiTables/Hapanero/src/FPDT.asl
deleted file mode 100644
index 369f49d7..00000000
--- a/AcpiTables/Hapanero/src/FPDT.asl
+++ /dev/null
@@ -1,16 +0,0 @@
-[000h 0000   4]                    Signature : "FPDT"    [Firmware Performance Data Table]
-[004h 0004   4]                 Table Length : 00000034
-[008h 0008   1]                     Revision : 01
-[009h 0009   1]                     Checksum : 60
-[00Ah 0010   6]                       Oem ID : "QCOM  "
-[010h 0016   8]                 Oem Table ID : "QCOMEDK2"
-[018h 0024   4]                 Oem Revision : 00008994
-[01Ch 0028   4]              Asl Compiler ID : "QCOM"
-[020h 0032   4]        Asl Compiler Revision : 00000001
-
-
-[024h 0036   2]                Subtable Type : 0000
-[026h 0038   1]                       Length : 10
-[027h 0039   1]                     Revision : 01
-[028h 0040   4]                     Reserved : 00000000
-[02Ch 0044   8]     FPDT Boot Record Address : 0000000000380000
\ No newline at end of file
diff --git a/AcpiTables/Hapanero/src/GTDT.asl b/AcpiTables/Hapanero/src/GTDT.asl
deleted file mode 100644
index 09a8d094..00000000
--- a/AcpiTables/Hapanero/src/GTDT.asl
+++ /dev/null
@@ -1,63 +0,0 @@
-[000h 0000   4]                    Signature : "GTDT"    [Generic Timer Description Table]
-[004h 0004   4]                 Table Length : 0000009C
-[008h 0008   1]                     Revision : 02
-[009h 0009   1]                     Checksum : 8F
-[00Ah 0010   6]                       Oem ID : "QCOM  "
-[010h 0016   8]                 Oem Table ID : "QCOMEDK2"
-[018h 0024   4]                 Oem Revision : 00008994
-[01Ch 0028   4]              Asl Compiler ID : "QCOM"
-[020h 0032   4]        Asl Compiler Revision : 00000001
-
-[024h 0036   8]        Counter Block Address : 00000000F9020000
-[02Ch 0044   4]                     Reserved : 00000000
-
-[030h 0048   4]         Secure EL1 Interrupt : 00000012
-[034h 0052   4]    EL1 Flags (decoded below) : 00000000
-                                Trigger Mode : 0
-                                    Polarity : 0
-                                   Always On : 0
-
-[038h 0056   4]     Non-Secure EL1 Interrupt : 00000013
-[03Ch 0060   4]   NEL1 Flags (decoded below) : 00000000
-                                Trigger Mode : 0
-                                    Polarity : 0
-                                   Always On : 0
-
-[040h 0064   4]      Virtual Timer Interrupt : 00000014
-[044h 0068   4]     VT Flags (decoded below) : 00000000
-                                Trigger Mode : 0
-                                    Polarity : 0
-                                   Always On : 0
-
-[048h 0072   4]     Non-Secure EL2 Interrupt : 00000011
-[04Ch 0076   4]   NEL2 Flags (decoded below) : 00000000
-                                Trigger Mode : 0
-                                    Polarity : 0
-                                   Always On : 0
-[050h 0080   8]   Counter Read Block Address : FFFFFFFFFFFFFFFF
-
-[058h 0088   4]         Platform Timer Count : 00000001
-[05Ch 0092   4]        Platform Timer Offset : 00000060
-
-[060h 0096   1]                Subtable Type : 00 [Generic Timer Block]
-[061h 0097   2]                       Length : 003C
-[063h 0099   1]                     Reserved : 00
-[064h 0100   8]                Block Address : 00000000F9020000
-[06Ch 0108   4]                  Timer Count : 00000001
-[070h 0112   4]                 Timer Offset : 00000014
-
-[074h 0116   1]                 Frame Number : 00
-[075h 0117   3]                     Reserved : 000000
-[078h 0120   8]                 Base Address : 00000000F9021000
-[080h 0128   8]             EL0 Base Address : 00000000F9022000
-[088h 0136   4]              Timer Interrupt : 00000029
-[08Ch 0140   4]  Timer Flags (decoded below) : 00000000
-                                Trigger Mode : 0
-                                    Polarity : 0
-[090h 0144   4]      Virtual Timer Interrupt : 00000028
-[094h 0148   4] Virtual Timer Flags (decoded below) : 00000000
-                                Trigger Mode : 0
-                                    Polarity : 0
-[098h 0152   4] Common Flags (decoded below) : 00000002
-                                      Secure : 0
-                                   Always On : 1
\ No newline at end of file
diff --git a/AcpiTables/Hapanero/src/TPM2.asl b/AcpiTables/Hapanero/src/TPM2.asl
deleted file mode 100644
index 2afded7c..00000000
--- a/AcpiTables/Hapanero/src/TPM2.asl
+++ /dev/null
@@ -1,13 +0,0 @@
-[000h 0000   4]                    Signature : "TPM2"    [Trusted Platform Module hardware interface table]
-[004h 0004   4]                 Table Length : 00000054
-[008h 0008   1]                     Revision : 03
-[009h 0009   1]                     Checksum : 89
-[00Ah 0010   6]                       Oem ID : "QCOM  "
-[010h 0016   8]                 Oem Table ID : "QCOMEDK2"
-[018h 0024   4]                 Oem Revision : 00008994
-[01Ch 0028   4]              Asl Compiler ID : "QCOM"
-[020h 0032   4]        Asl Compiler Revision : 00000001
-
-[024h 0036   4]                     Reserved : 00000000
-[028h 0040   8]              Control Address : 0000000000386000
-[030h 0048   4]                 Start Method : 00000009
\ No newline at end of file
diff --git a/AcpiTables/common/builtin/CSRT.aml b/AcpiTables/common/builtin/CSRT.aml
new file mode 100644
index 00000000..ef9f14fd
Binary files /dev/null and b/AcpiTables/common/builtin/CSRT.aml differ
diff --git a/AcpiTables/common/builtin/DBG2.aml b/AcpiTables/common/builtin/DBG2.aml
new file mode 100644
index 00000000..dcb9aaff
Binary files /dev/null and b/AcpiTables/common/builtin/DBG2.aml differ
diff --git a/AcpiTables/8992/builtin/FACS.aml b/AcpiTables/common/builtin/FACS.aml
similarity index 100%
rename from AcpiTables/8992/builtin/FACS.aml
rename to AcpiTables/common/builtin/FACS.aml
diff --git a/AcpiTables/8992/builtin/FADT.NoPsci.acpi b/AcpiTables/common/builtin/FADT.NoPsci.acpi
similarity index 100%
rename from AcpiTables/8992/builtin/FADT.NoPsci.acpi
rename to AcpiTables/common/builtin/FADT.NoPsci.acpi
diff --git a/AcpiTables/8992/builtin/FADT.PsciSmc.acpi b/AcpiTables/common/builtin/FADT.PsciSmc.acpi
similarity index 100%
rename from AcpiTables/8992/builtin/FADT.PsciSmc.acpi
rename to AcpiTables/common/builtin/FADT.PsciSmc.acpi
diff --git a/AcpiTables/8992/builtin/FADT.acpi b/AcpiTables/common/builtin/FADT.acpi
similarity index 100%
rename from AcpiTables/8992/builtin/FADT.acpi
rename to AcpiTables/common/builtin/FADT.acpi
diff --git a/AcpiTables/8992/builtin/FPDT.aml b/AcpiTables/common/builtin/FPDT.aml
similarity index 100%
rename from AcpiTables/8992/builtin/FPDT.aml
rename to AcpiTables/common/builtin/FPDT.aml
diff --git a/AcpiTables/8994/builtin/GTDT.aml b/AcpiTables/common/builtin/GTDT.aml
similarity index 58%
rename from AcpiTables/8994/builtin/GTDT.aml
rename to AcpiTables/common/builtin/GTDT.aml
index 425c1b65..5efcdad2 100644
Binary files a/AcpiTables/8994/builtin/GTDT.aml and b/AcpiTables/common/builtin/GTDT.aml differ
diff --git a/AcpiTables/common/builtin/TPM2.aml b/AcpiTables/common/builtin/TPM2.aml
new file mode 100644
index 00000000..08c3525c
Binary files /dev/null and b/AcpiTables/common/builtin/TPM2.aml differ
diff --git a/AcpiTables/8992/src/CSRT.asl b/AcpiTables/common/src/CSRT.asl
similarity index 100%
rename from AcpiTables/8992/src/CSRT.asl
rename to AcpiTables/common/src/CSRT.asl
diff --git a/AcpiTables/8992/src/DBG2.asl b/AcpiTables/common/src/DBG2.asl
similarity index 100%
rename from AcpiTables/8992/src/DBG2.asl
rename to AcpiTables/common/src/DBG2.asl
diff --git a/AcpiTables/8992/src/FACS.asl b/AcpiTables/common/src/FACS.asl
similarity index 100%
rename from AcpiTables/8992/src/FACS.asl
rename to AcpiTables/common/src/FACS.asl
diff --git a/AcpiTables/8992/src/FPDT.asl b/AcpiTables/common/src/FPDT.asl
similarity index 100%
rename from AcpiTables/8992/src/FPDT.asl
rename to AcpiTables/common/src/FPDT.asl
diff --git a/AcpiTables/8992/src/GTDT.asl b/AcpiTables/common/src/GTDT.asl
similarity index 100%
rename from AcpiTables/8992/src/GTDT.asl
rename to AcpiTables/common/src/GTDT.asl
diff --git a/AcpiTables/8994/src/TPM2.asl b/AcpiTables/common/src/TPM2.asl
similarity index 100%
rename from AcpiTables/8994/src/TPM2.asl
rename to AcpiTables/common/src/TPM2.asl
diff --git a/Lumia950.fdf b/Lumia950.fdf
index b05f83d8..3141dc98 100644
--- a/Lumia950.fdf
+++ b/Lumia950.fdf
@@ -136,18 +136,18 @@ READ_LOCK_STATUS   = TRUE
 
   # ACPI Tables
   FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD {
-	SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/CSRT.aml
-	SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/DBG2.aml
+	SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/CSRT.aml
+	SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/DBG2.aml
+	SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/FACS.aml
+	SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/FADT.PsciSmc.acpi
+	SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/FPDT.aml
+	SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/GTDT.aml
+	SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/TPM2.aml
 	SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/DSDT.aml
-	SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/FACS.aml
-	SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/FADT.PsciSmc.acpi
-	SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/FPDT.aml
-	SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/GTDT.aml
 	SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/MADT.aml
 	SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/MCFG.aml
 	SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/PPTT.aml
-	SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/TPM2.aml
-	SECTION RAW = Lumia950XLPkg/AcpiTables/8992/generated/SSDT.aml
+	SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/SSDT.aml
 	SECTION UI = "AcpiTables"
   }
 
diff --git a/Lumia950XL.fdf b/Lumia950XL.fdf
index 906beb41..58ba861f 100644
--- a/Lumia950XL.fdf
+++ b/Lumia950XL.fdf
@@ -136,18 +136,18 @@ READ_LOCK_STATUS   = TRUE
 
   # ACPI Tables
   FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD {
-	SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/CSRT.aml
-	SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/DBG2.aml
+	SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/CSRT.aml
+	SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/DBG2.aml
+	SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/FACS.aml
+	SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/FADT.PsciSmc.acpi
+	SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/FPDT.aml
+	SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/GTDT.aml
+	SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/TPM2.aml
 	SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/DSDT.aml
-	SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/FACS.aml
-	SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/FADT.PsciSmc.acpi
-	SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/FPDT.aml
-	SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/GTDT.aml
 	SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/MADT.aml
 	SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/MCFG.aml
 	SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/PPTT.aml
-	SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/TPM2.aml
-	SECTION RAW = Lumia950XLPkg/AcpiTables/8994/generated/SSDT.aml
+	SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/SSDT.aml
 	SECTION UI = "AcpiTables"
   }
 
diff --git a/Tools/PsModules/redirector.psm1 b/Tools/PsModules/redirector.psm1
index c49f06be..701f2b8d 100755
--- a/Tools/PsModules/redirector.psm1
+++ b/Tools/PsModules/redirector.psm1
@@ -4,15 +4,15 @@
 # This script module provides shared utilities.
 #
 
-function Get-AcpiToolsPath {
-    $iaslPath = which "iasl"
-    if ($null -eq $iaslPath) {
-        Write-Error -Message "ACPI tools are not present on this system."
-        return $null
-    }
-
-    return $iaslPath
-}
+# function Get-AcpiToolsPath {
+#     $iaslPath = which "iasl"
+#     if ($null -eq $iaslPath) {
+#         Write-Error -Message "ACPI tools are not present on this system."
+#         return $null
+#     }
+# 
+#     return $iaslPath
+# }
 
 function Get-GnuAarch64CrossCollectionPath {
     param(
diff --git a/Tools/edk2-build.ps1 b/Tools/edk2-build.ps1
index 12afecb1..f8afd415 100755
--- a/Tools/edk2-build.ps1
+++ b/Tools/edk2-build.ps1
@@ -53,9 +53,9 @@ $env:GCC5_AARCH64_PREFIX = $ccprefix
 Write-Output "Use GCC at $($ccprefix) to run builds."
 
 # Probe iASL
-$iaslpath = Get-AcpiToolsPath
-if ($null -eq $iaslpath) { return -1 }
-Write-Output "Use iASL at $($iaslpath) to compile SSDTs."
+# $iaslpath = Get-AcpiToolsPath
+# if ($null -eq $iaslpath) { return -1 }
+# Write-Output "Use iASL at $($iaslpath) to compile SSDTs."
 
 # Build base tools if not exist (dev).
 if (((Test-Path -Path "BaseTools") -eq $false) -or ($Clean -eq $true)) {
@@ -137,24 +137,24 @@ if ($commit) {
 
 # Build SSDT tables
 # Because this is quick enough, we build for any possible platforms
-$ssdts = Get-ChildItem Lumia950XLPkg/AcpiTables/**/src/SSDT*.asl
-if ($null -ne $ssdts) {
-    foreach ($ssdt in $ssdts) {
-        Write-Output "Build $($ssdt)."
-        $srcDir = [System.IO.Path]::GetDirectoryName($ssdt)
-        $fileName = [System.IO.Path]::GetFileNameWithoutExtension($ssdt)
-        $outDir = "$($srcDir)/../generated"
-        if (!(Test-Path -Path $outDir)) {
-            New-Item -ItemType Directory -Force -Path $outDir
-        }
-
-        . $iaslpath -p "$($outDir)/$($fileName).aml" $ssdt
-        if (-not $?) {
-            Write-Error "Build SSDT $($ssdt) failed."
-            return $?
-        }
-    }
-}
+# $ssdts = Get-ChildItem Lumia950XLPkg/AcpiTables/**/src/SSDT*.asl
+# if ($null -ne $ssdts) {
+#     foreach ($ssdt in $ssdts) {
+#         Write-Output "Build $($ssdt)."
+#         $srcDir = [System.IO.Path]::GetDirectoryName($ssdt)
+#         $fileName = [System.IO.Path]::GetFileNameWithoutExtension($ssdt)
+#         $outDir = "$($srcDir)/../generated"
+#         if (!(Test-Path -Path $outDir)) {
+#             New-Item -ItemType Directory -Force -Path $outDir
+#         }
+# 
+#         . $iaslpath -p "$($outDir)/$($fileName).aml" $ssdt
+#         if (-not $?) {
+#             Write-Error "Build SSDT $($ssdt) failed."
+#             return $?
+#         }
+#     }
+# }
 
 foreach ($target in $availableTargets) {
     Write-Output "Build Lumia950XLPkg for $($target) (Release = $($Release))."
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f6cb60cd..adcea935 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -27,11 +27,11 @@ steps:
 
 # Build iASL tool from repository
 # Eventually we will just install prepackaged version
-- script: git clone https://github.com/acpica/acpica acpica-tools
-  displayName: 'Checkout ACPICA tools repository'
+# - script: git clone https://github.com/acpica/acpica acpica-tools
+#   displayName: 'Checkout ACPICA tools repository'
 
-- script: cd acpica-tools && make clean && make && sudo make install && cd ..
-  displayName: 'Build and install ACPICA tools'
+# - script: cd acpica-tools && make clean && make && sudo make install && cd ..
+#   displayName: 'Build and install ACPICA tools'
 
 - script: sudo ./Tools/CI/Bootstrapper/Stage0.sh
   displayName: 'Prepare pre-build environment, phase 0'