diff --git a/src/mainboard/intel/cedarisland_crb/dsdt.asl b/src/mainboard/intel/cedarisland_crb/dsdt.asl
index 3d8321793c..59ce66c8d7 100644
--- a/src/mainboard/intel/cedarisland_crb/dsdt.asl
+++ b/src/mainboard/intel/cedarisland_crb/dsdt.asl
@@ -22,7 +22,7 @@ DefinitionBlock(
 	{
 		Device (PCI0)
 		{
-			#include <soc/intel/xeon_sp/acpi/southcluster.asl>
+			#include <soc/intel/xeon_sp/acpi/gen1/southcluster.asl>
 			#include <soc/intel/common/block/acpi/acpi/lpc.asl>
 
 		}
diff --git a/src/mainboard/ocp/deltalake/dsdt.asl b/src/mainboard/ocp/deltalake/dsdt.asl
index c1e8beef69..844231991a 100644
--- a/src/mainboard/ocp/deltalake/dsdt.asl
+++ b/src/mainboard/ocp/deltalake/dsdt.asl
@@ -20,11 +20,11 @@ DefinitionBlock(
 	#include <cpu/intel/common/acpi/cpu.asl>
 
 	// CPX-SP ACPI tables
-	#include <soc/intel/xeon_sp/acpi/uncore.asl>
+	#include <soc/intel/xeon_sp/acpi/gen1/uncore.asl>
 
 	// LPC related entries
 	Scope (\_SB.PC00)
 	{
-		#include <soc/intel/xeon_sp/acpi/pch.asl>
+		#include <soc/intel/xeon_sp/acpi/gen1/pch.asl>
 	}
 }
diff --git a/src/mainboard/ocp/tiogapass/dsdt.asl b/src/mainboard/ocp/tiogapass/dsdt.asl
index 06145c4d6d..49f20f1e6d 100644
--- a/src/mainboard/ocp/tiogapass/dsdt.asl
+++ b/src/mainboard/ocp/tiogapass/dsdt.asl
@@ -15,9 +15,9 @@ DefinitionBlock(
 	#include "acpi/platform.asl"
 	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
-	#include <soc/intel/xeon_sp/acpi/uncore.asl>
+	#include <soc/intel/xeon_sp/acpi/gen1/uncore.asl>
 	Scope (\_SB.PC00)
 	{
-		#include <soc/intel/xeon_sp/acpi/pch.asl>
+		#include <soc/intel/xeon_sp/acpi/gen1/pch.asl>
 	}
 }
diff --git a/src/soc/intel/xeon_sp/acpi/gpio.asl b/src/soc/intel/xeon_sp/acpi/gen1/gpio.asl
similarity index 100%
rename from src/soc/intel/xeon_sp/acpi/gpio.asl
rename to src/soc/intel/xeon_sp/acpi/gen1/gpio.asl
diff --git a/src/soc/intel/xeon_sp/acpi/iiostack.asl b/src/soc/intel/xeon_sp/acpi/gen1/iiostack.asl
similarity index 100%
rename from src/soc/intel/xeon_sp/acpi/iiostack.asl
rename to src/soc/intel/xeon_sp/acpi/gen1/iiostack.asl
diff --git a/src/soc/intel/xeon_sp/acpi/pch.asl b/src/soc/intel/xeon_sp/acpi/gen1/pch.asl
similarity index 81%
rename from src/soc/intel/xeon_sp/acpi/pch.asl
rename to src/soc/intel/xeon_sp/acpi/gen1/pch.asl
index fef68b0818..93d468a7ff 100644
--- a/src/soc/intel/xeon_sp/acpi/pch.asl
+++ b/src/soc/intel/xeon_sp/acpi/gen1/pch.asl
@@ -3,7 +3,7 @@
 /* This file should be included in the proper platform ACPI \_SB PCI scope */
 
 /* GPIO */
-#include <soc/intel/xeon_sp/acpi/gpio.asl>
+#include <soc/intel/xeon_sp/acpi/gen1/gpio.asl>
 
 /* LPC 0:1f.0 */
 #include <soc/intel/common/block/acpi/acpi/lpc.asl>
diff --git a/src/soc/intel/xeon_sp/acpi/pch_irq.asl b/src/soc/intel/xeon_sp/acpi/gen1/pch_irq.asl
similarity index 100%
rename from src/soc/intel/xeon_sp/acpi/pch_irq.asl
rename to src/soc/intel/xeon_sp/acpi/gen1/pch_irq.asl
diff --git a/src/soc/intel/xeon_sp/acpi/pci_irqs.asl b/src/soc/intel/xeon_sp/acpi/gen1/pci_irqs.asl
similarity index 100%
rename from src/soc/intel/xeon_sp/acpi/pci_irqs.asl
rename to src/soc/intel/xeon_sp/acpi/gen1/pci_irqs.asl
diff --git a/src/soc/intel/xeon_sp/acpi/southcluster.asl b/src/soc/intel/xeon_sp/acpi/gen1/southcluster.asl
similarity index 100%
rename from src/soc/intel/xeon_sp/acpi/southcluster.asl
rename to src/soc/intel/xeon_sp/acpi/gen1/southcluster.asl
diff --git a/src/soc/intel/xeon_sp/acpi/uncore.asl b/src/soc/intel/xeon_sp/acpi/gen1/uncore.asl
similarity index 100%
rename from src/soc/intel/xeon_sp/acpi/uncore.asl
rename to src/soc/intel/xeon_sp/acpi/gen1/uncore.asl
diff --git a/src/soc/intel/xeon_sp/acpi/uncore_irq.asl b/src/soc/intel/xeon_sp/acpi/gen1/uncore_irq.asl
similarity index 100%
rename from src/soc/intel/xeon_sp/acpi/uncore_irq.asl
rename to src/soc/intel/xeon_sp/acpi/gen1/uncore_irq.asl