diff --git a/src/mainboard/google/auron/dsdt.asl b/src/mainboard/google/auron/dsdt.asl
index 32c71dee97..a61a669411 100644
--- a/src/mainboard/google/auron/dsdt.asl
+++ b/src/mainboard/google/auron/dsdt.asl
@@ -16,7 +16,7 @@ DefinitionBlock(
 	#include "acpi/thermal.asl"
 
 	// global NVS and variables
-	#include <soc/intel/broadwell/acpi/globalnvs.asl>
+	#include <soc/intel/broadwell/pch/acpi/globalnvs.asl>
 
 	// CPU
 	#include <cpu/intel/common/acpi/cpu.asl>
@@ -25,7 +25,7 @@ DefinitionBlock(
 		Device (PCI0)
 		{
 			#include <soc/intel/broadwell/acpi/systemagent.asl>
-			#include <soc/intel/broadwell/acpi/pch.asl>
+			#include <soc/intel/broadwell/pch/acpi/pch.asl>
 			#include <drivers/intel/gma/acpi/default_brightness_levels.asl>
 		}
 	}
diff --git a/src/mainboard/google/jecht/dsdt.asl b/src/mainboard/google/jecht/dsdt.asl
index 3746d4bb35..6af99b4a77 100644
--- a/src/mainboard/google/jecht/dsdt.asl
+++ b/src/mainboard/google/jecht/dsdt.asl
@@ -17,7 +17,7 @@ DefinitionBlock(
 	#include <variant/acpi/thermal.asl>
 
 	// global NVS and variables
-	#include <soc/intel/broadwell/acpi/globalnvs.asl>
+	#include <soc/intel/broadwell/pch/acpi/globalnvs.asl>
 
 	// CPU
 	#include <cpu/intel/common/acpi/cpu.asl>
@@ -26,7 +26,7 @@ DefinitionBlock(
 		Device (PCI0)
 		{
 			#include <soc/intel/broadwell/acpi/systemagent.asl>
-			#include <soc/intel/broadwell/acpi/pch.asl>
+			#include <soc/intel/broadwell/pch/acpi/pch.asl>
 		}
 	}
 
diff --git a/src/mainboard/intel/wtm2/dsdt.asl b/src/mainboard/intel/wtm2/dsdt.asl
index b3b2ca6766..c842e8b7f8 100644
--- a/src/mainboard/intel/wtm2/dsdt.asl
+++ b/src/mainboard/intel/wtm2/dsdt.asl
@@ -17,7 +17,7 @@ DefinitionBlock(
 	#include "acpi/platform.asl"
 
 	// global NVS and variables
-	#include <soc/intel/broadwell/acpi/globalnvs.asl>
+	#include <soc/intel/broadwell/pch/acpi/globalnvs.asl>
 
 	// CPU
 	#include <cpu/intel/common/acpi/cpu.asl>
@@ -26,7 +26,7 @@ DefinitionBlock(
 		Device (PCI0)
 		{
 			#include <soc/intel/broadwell/acpi/systemagent.asl>
-			#include <soc/intel/broadwell/acpi/pch.asl>
+			#include <soc/intel/broadwell/pch/acpi/pch.asl>
 		}
 	}
 
diff --git a/src/mainboard/purism/librem_bdw/dsdt.asl b/src/mainboard/purism/librem_bdw/dsdt.asl
index 4d81e1530f..a4b5bd8ca8 100644
--- a/src/mainboard/purism/librem_bdw/dsdt.asl
+++ b/src/mainboard/purism/librem_bdw/dsdt.asl
@@ -13,7 +13,7 @@ DefinitionBlock(
 	#include <soc/intel/broadwell/acpi/platform.asl>
 
 	/* Global NVS and variables */
-	#include <soc/intel/broadwell/acpi/globalnvs.asl>
+	#include <soc/intel/broadwell/pch/acpi/globalnvs.asl>
 
 	/* CPU */
 	#include <cpu/intel/common/acpi/cpu.asl>
@@ -22,7 +22,7 @@ DefinitionBlock(
 		Device (PCI0)
 		{
 			#include <soc/intel/broadwell/acpi/systemagent.asl>
-			#include <soc/intel/broadwell/acpi/pch.asl>
+			#include <soc/intel/broadwell/pch/acpi/pch.asl>
 		}
 	}
 
diff --git a/src/soc/intel/broadwell/acpi/adsp.asl b/src/soc/intel/broadwell/pch/acpi/adsp.asl
similarity index 100%
rename from src/soc/intel/broadwell/acpi/adsp.asl
rename to src/soc/intel/broadwell/pch/acpi/adsp.asl
diff --git a/src/soc/intel/broadwell/acpi/device_nvs.asl b/src/soc/intel/broadwell/pch/acpi/device_nvs.asl
similarity index 100%
rename from src/soc/intel/broadwell/acpi/device_nvs.asl
rename to src/soc/intel/broadwell/pch/acpi/device_nvs.asl
diff --git a/src/soc/intel/broadwell/acpi/ehci.asl b/src/soc/intel/broadwell/pch/acpi/ehci.asl
similarity index 100%
rename from src/soc/intel/broadwell/acpi/ehci.asl
rename to src/soc/intel/broadwell/pch/acpi/ehci.asl
diff --git a/src/soc/intel/broadwell/acpi/globalnvs.asl b/src/soc/intel/broadwell/pch/acpi/globalnvs.asl
similarity index 100%
rename from src/soc/intel/broadwell/acpi/globalnvs.asl
rename to src/soc/intel/broadwell/pch/acpi/globalnvs.asl
diff --git a/src/soc/intel/broadwell/acpi/gpio.asl b/src/soc/intel/broadwell/pch/acpi/gpio.asl
similarity index 100%
rename from src/soc/intel/broadwell/acpi/gpio.asl
rename to src/soc/intel/broadwell/pch/acpi/gpio.asl
diff --git a/src/soc/intel/broadwell/acpi/hda.asl b/src/soc/intel/broadwell/pch/acpi/hda.asl
similarity index 100%
rename from src/soc/intel/broadwell/acpi/hda.asl
rename to src/soc/intel/broadwell/pch/acpi/hda.asl
diff --git a/src/soc/intel/broadwell/acpi/irqlinks.asl b/src/soc/intel/broadwell/pch/acpi/irqlinks.asl
similarity index 100%
rename from src/soc/intel/broadwell/acpi/irqlinks.asl
rename to src/soc/intel/broadwell/pch/acpi/irqlinks.asl
diff --git a/src/soc/intel/broadwell/acpi/lpc.asl b/src/soc/intel/broadwell/pch/acpi/lpc.asl
similarity index 100%
rename from src/soc/intel/broadwell/acpi/lpc.asl
rename to src/soc/intel/broadwell/pch/acpi/lpc.asl
diff --git a/src/soc/intel/broadwell/acpi/pch.asl b/src/soc/intel/broadwell/pch/acpi/pch.asl
similarity index 100%
rename from src/soc/intel/broadwell/acpi/pch.asl
rename to src/soc/intel/broadwell/pch/acpi/pch.asl
diff --git a/src/soc/intel/broadwell/acpi/pcie.asl b/src/soc/intel/broadwell/pch/acpi/pcie.asl
similarity index 100%
rename from src/soc/intel/broadwell/acpi/pcie.asl
rename to src/soc/intel/broadwell/pch/acpi/pcie.asl
diff --git a/src/soc/intel/broadwell/acpi/pcie_port.asl b/src/soc/intel/broadwell/pch/acpi/pcie_port.asl
similarity index 100%
rename from src/soc/intel/broadwell/acpi/pcie_port.asl
rename to src/soc/intel/broadwell/pch/acpi/pcie_port.asl
diff --git a/src/soc/intel/broadwell/acpi/sata.asl b/src/soc/intel/broadwell/pch/acpi/sata.asl
similarity index 100%
rename from src/soc/intel/broadwell/acpi/sata.asl
rename to src/soc/intel/broadwell/pch/acpi/sata.asl
diff --git a/src/soc/intel/broadwell/acpi/serialio.asl b/src/soc/intel/broadwell/pch/acpi/serialio.asl
similarity index 100%
rename from src/soc/intel/broadwell/acpi/serialio.asl
rename to src/soc/intel/broadwell/pch/acpi/serialio.asl
diff --git a/src/soc/intel/broadwell/acpi/smbus.asl b/src/soc/intel/broadwell/pch/acpi/smbus.asl
similarity index 100%
rename from src/soc/intel/broadwell/acpi/smbus.asl
rename to src/soc/intel/broadwell/pch/acpi/smbus.asl
diff --git a/src/soc/intel/broadwell/acpi/xhci.asl b/src/soc/intel/broadwell/pch/acpi/xhci.asl
similarity index 100%
rename from src/soc/intel/broadwell/acpi/xhci.asl
rename to src/soc/intel/broadwell/pch/acpi/xhci.asl