diff --git a/adl/sof-nau8825/HiFi.kano.conf b/adl/sof-nau8825/HiFi.kano.conf
index 4144e06..1ec3007 100644
--- a/adl/sof-nau8825/HiFi.kano.conf
+++ b/adl/sof-nau8825/HiFi.kano.conf
@@ -12,7 +12,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -114,4 +114,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi2345.conf"
+Include.hdmi.File "/common/hdmi/hdmi2345.conf"
diff --git a/adl/sof-nau8825/HiFi.osiris.conf b/adl/sof-nau8825/HiFi.osiris.conf
index 9036573..7060d57 100644
--- a/adl/sof-nau8825/HiFi.osiris.conf
+++ b/adl/sof-nau8825/HiFi.osiris.conf
@@ -6,7 +6,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -93,4 +93,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi2345.conf"
+Include.hdmi.File "/common/hdmi/hdmi2345.conf"
diff --git a/adl/sof-rt5682/HiFi.banshee.conf b/adl/sof-rt5682/HiFi.banshee.conf
index 36d7543..3fdc01b 100644
--- a/adl/sof-rt5682/HiFi.banshee.conf
+++ b/adl/sof-rt5682/HiFi.banshee.conf
@@ -76,4 +76,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi2345.conf"
+Include.hdmi.File "/common/hdmi/hdmi2345.conf"
diff --git a/adl/sof-rt5682/HiFi.felwinter.conf b/adl/sof-rt5682/HiFi.felwinter.conf
index fc6e818..355e4a2 100644
--- a/adl/sof-rt5682/HiFi.felwinter.conf
+++ b/adl/sof-rt5682/HiFi.felwinter.conf
@@ -75,4 +75,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi2345.conf"
+Include.hdmi.File "/common/hdmi/hdmi2345.conf"
diff --git a/adl/sof-rt5682/HiFi.felwinter.rt5682vs.conf b/adl/sof-rt5682/HiFi.felwinter.rt5682vs.conf
index 36d7543..3fdc01b 100644
--- a/adl/sof-rt5682/HiFi.felwinter.rt5682vs.conf
+++ b/adl/sof-rt5682/HiFi.felwinter.rt5682vs.conf
@@ -76,4 +76,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi2345.conf"
+Include.hdmi.File "/common/hdmi/hdmi2345.conf"
diff --git a/adl/sof-rt5682/HiFi.gimble.conf b/adl/sof-rt5682/HiFi.gimble.conf
index 5d8a7c4..0c42b5a 100644
--- a/adl/sof-rt5682/HiFi.gimble.conf
+++ b/adl/sof-rt5682/HiFi.gimble.conf
@@ -25,7 +25,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -125,4 +125,4 @@ SectionDevice."Mic" {
 	}
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi2345.conf"
+Include.hdmi.File "/common/hdmi/hdmi2345.conf"
diff --git a/adl/sof-rt5682/HiFi.primus.conf b/adl/sof-rt5682/HiFi.primus.conf
index bb2426a..67dcea9 100644
--- a/adl/sof-rt5682/HiFi.primus.conf
+++ b/adl/sof-rt5682/HiFi.primus.conf
@@ -20,7 +20,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -118,4 +118,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi2345.conf"
+Include.hdmi.File "/common/hdmi/hdmi2345.conf"
diff --git a/adl/sof-rt5682/HiFi.primus.rt5682vs.conf b/adl/sof-rt5682/HiFi.primus.rt5682vs.conf
index b44aa11..acf1cb0 100644
--- a/adl/sof-rt5682/HiFi.primus.rt5682vs.conf
+++ b/adl/sof-rt5682/HiFi.primus.rt5682vs.conf
@@ -13,7 +13,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -105,4 +105,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi2345.conf"
+Include.hdmi.File "/common/hdmi/hdmi2345.conf"
diff --git a/adl/sof-rt5682/HiFi.redrix.conf b/adl/sof-rt5682/HiFi.redrix.conf
index 93872b4..568312b 100644
--- a/adl/sof-rt5682/HiFi.redrix.conf
+++ b/adl/sof-rt5682/HiFi.redrix.conf
@@ -29,7 +29,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -130,4 +130,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi2345.conf"
+Include.hdmi.File "/common/hdmi/hdmi2345.conf"
diff --git a/adl/sof-rt5682/HiFi.taeko.conf b/adl/sof-rt5682/HiFi.taeko.conf
index 04ee9d6..c308dc1 100644
--- a/adl/sof-rt5682/HiFi.taeko.conf
+++ b/adl/sof-rt5682/HiFi.taeko.conf
@@ -20,7 +20,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -115,4 +115,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi2345.conf"
+Include.hdmi.File "/common/hdmi/hdmi2345.conf"
diff --git a/adl/sof-rt5682/HiFi.taniks.conf b/adl/sof-rt5682/HiFi.taniks.conf
index c793327..fe13bc9 100644
--- a/adl/sof-rt5682/HiFi.taniks.conf
+++ b/adl/sof-rt5682/HiFi.taniks.conf
@@ -86,4 +86,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi2345.conf"
+Include.hdmi.File "/common/hdmi/hdmi2345.conf"
diff --git a/adl/sof-ssp_amp/HiFi.vell.conf b/adl/sof-ssp_amp/HiFi.vell.conf
index 66596c3..f016215 100644
--- a/adl/sof-ssp_amp/HiFi.vell.conf
+++ b/adl/sof-ssp_amp/HiFi.vell.conf
@@ -31,7 +31,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -91,4 +91,4 @@ SectionDevice."Mic" {
 	}
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi2345.conf"
+Include.hdmi.File "/common/hdmi/hdmi2345.conf"
diff --git a/apl/sof-bxtda7219ma/HiFi.conf b/apl/sof-bxtda7219ma/HiFi.conf
index e4c52ec..e8b7e64 100644
--- a/apl/sof-bxtda7219ma/HiFi.conf
+++ b/apl/sof-bxtda7219ma/HiFi.conf
@@ -84,4 +84,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi567.conf"
+Include.hdmi.File "/common/hdmi/hdmi567.conf"
diff --git a/cml/sof-cml_max9839/HiFi.conf b/cml/sof-cml_max9839/HiFi.conf
index 951ff09..e81d60d 100644
--- a/cml/sof-cml_max9839/HiFi.conf
+++ b/cml/sof-cml_max9839/HiFi.conf
@@ -32,7 +32,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -126,4 +126,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi567.conf"
+Include.hdmi.File "/common/hdmi/hdmi567.conf"
diff --git a/cml/sof-cml_rt1011_/HiFi.conf b/cml/sof-cml_rt1011_/HiFi.conf
index 72b3017..ea37d86 100644
--- a/cml/sof-cml_rt1011_/HiFi.conf
+++ b/cml/sof-cml_rt1011_/HiFi.conf
@@ -92,4 +92,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi234.conf"
+Include.hdmi.File "/common/hdmi/hdmi234.conf"
diff --git a/cml/sof-cmlda7219ma/HiFi.conf b/cml/sof-cmlda7219ma/HiFi.conf
index b281db5..98b78e1 100644
--- a/cml/sof-cmlda7219ma/HiFi.conf
+++ b/cml/sof-cmlda7219ma/HiFi.conf
@@ -24,7 +24,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -137,4 +137,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi567.conf"
+Include.hdmi.File "/common/hdmi/hdmi567.conf"
diff --git a/cml/sof-rt5682/HiFi.conf b/cml/sof-rt5682/HiFi.conf
index 2a3a59b..b7eb55b 100644
--- a/cml/sof-rt5682/HiFi.conf
+++ b/cml/sof-rt5682/HiFi.conf
@@ -13,7 +13,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -126,4 +126,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi234.conf"
+Include.hdmi.File "/common/hdmi/hdmi234.conf"
diff --git a/hdmi-common/hdmi.conf b/common/hdmi/hdmi.conf
similarity index 100%
rename from hdmi-common/hdmi.conf
rename to common/hdmi/hdmi.conf
diff --git a/hdmi-common/hdmi234.conf b/common/hdmi/hdmi234.conf
similarity index 87%
rename from hdmi-common/hdmi234.conf
rename to common/hdmi/hdmi234.conf
index 24c39fe..2c5d399 100644
--- a/hdmi-common/hdmi234.conf
+++ b/common/hdmi/hdmi234.conf
@@ -1,6 +1,6 @@
 # HDA HDMI devices
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi.conf"
+Include.hdmi.File "/common/hdmi/hdmi.conf"
 
 If.hdmi1 {
 	Condition { Type AlwaysTrue }
diff --git a/hdmi-common/hdmi2345.conf b/common/hdmi/hdmi2345.conf
similarity index 90%
rename from hdmi-common/hdmi2345.conf
rename to common/hdmi/hdmi2345.conf
index d0a4475..15f7775 100644
--- a/hdmi-common/hdmi2345.conf
+++ b/common/hdmi/hdmi2345.conf
@@ -1,6 +1,6 @@
 # HDA HDMI devices
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi.conf"
+Include.hdmi.File "/common/hdmi/hdmi.conf"
 
 If.hdmi1 {
 	Condition { Type AlwaysTrue }
diff --git a/hdmi-common/hdmi345.conf b/common/hdmi/hdmi345.conf
similarity index 87%
rename from hdmi-common/hdmi345.conf
rename to common/hdmi/hdmi345.conf
index 9b8c80c..0956579 100644
--- a/hdmi-common/hdmi345.conf
+++ b/common/hdmi/hdmi345.conf
@@ -1,6 +1,6 @@
 # HDA HDMI devices
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi.conf"
+Include.hdmi.File "/common/hdmi/hdmi.conf"
 
 If.hdmi1 {
 	Condition { Type AlwaysTrue }
diff --git a/hdmi-common/hdmi567.conf b/common/hdmi/hdmi567.conf
similarity index 87%
rename from hdmi-common/hdmi567.conf
rename to common/hdmi/hdmi567.conf
index b5fb34f..7cc25d2 100644
--- a/hdmi-common/hdmi567.conf
+++ b/common/hdmi/hdmi567.conf
@@ -1,6 +1,6 @@
 # HDA HDMI devices
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi.conf"
+Include.hdmi.File "/common/hdmi/hdmi.conf"
 
 If.hdmi1 {
 	Condition { Type AlwaysTrue }
diff --git a/dmic-common/split.conf b/common/pcm/split.conf
similarity index 99%
rename from dmic-common/split.conf
rename to common/pcm/split.conf
index 390cd3a..9ed2f95 100644
--- a/dmic-common/split.conf
+++ b/common/pcm/split.conf
@@ -1,6 +1,5 @@
 #
 # Split multichannel PCM stream to channel groups
-# Slightly modified from upstream
 #
 
 #
@@ -327,7 +326,7 @@ DefineMacro.SplitPCMDevice {
 	If.0 {
 		Condition {
 			Type String
-			Empty "${var:__Device}"
+			Empty "${var:-__Device}"
 		}
 		True.Define.__Device "0"
 	}
diff --git a/glk/sof-cs42l42/HiFi.conf b/glk/sof-cs42l42/HiFi.conf
index 1def1ce..3ec117f 100644
--- a/glk/sof-cs42l42/HiFi.conf
+++ b/glk/sof-cs42l42/HiFi.conf
@@ -8,7 +8,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -100,4 +100,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi567.conf"
+Include.hdmi.File "/common/hdmi/hdmi567.conf"
diff --git a/glk/sof-glkda7219ma/HiFi.conf b/glk/sof-glkda7219ma/HiFi.conf
index 41811cf..cef85b1 100644
--- a/glk/sof-glkda7219ma/HiFi.conf
+++ b/glk/sof-glkda7219ma/HiFi.conf
@@ -23,7 +23,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -115,4 +115,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi567.conf"
+Include.hdmi.File "/common/hdmi/hdmi567.conf"
diff --git a/glk/sof-glkrt5682ma/HiFi.conf b/glk/sof-glkrt5682ma/HiFi.conf
index 457dc79..fc62d58 100644
--- a/glk/sof-glkrt5682ma/HiFi.conf
+++ b/glk/sof-glkrt5682ma/HiFi.conf
@@ -20,7 +20,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -114,4 +114,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi567.conf"
+Include.hdmi.File "/common/hdmi/hdmi567.conf"
diff --git a/jsl/sof-cs42l42/HiFi.conf b/jsl/sof-cs42l42/HiFi.conf
index 0930b63..274e6c4 100644
--- a/jsl/sof-cs42l42/HiFi.conf
+++ b/jsl/sof-cs42l42/HiFi.conf
@@ -70,4 +70,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi234.conf"
+Include.hdmi.File "/common/hdmi/hdmi234.conf"
diff --git a/jsl/sof-da7219max98/HiFi.conf b/jsl/sof-da7219max98/HiFi.conf
index 65c59b6..90f39dc 100644
--- a/jsl/sof-da7219max98/HiFi.conf
+++ b/jsl/sof-da7219max98/HiFi.conf
@@ -86,4 +86,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi234.conf"
+Include.hdmi.File "/common/hdmi/hdmi234.conf"
diff --git a/jsl/sof-rt5682/HiFi-Magolor.conf b/jsl/sof-rt5682/HiFi-Magolor.conf
index 0442950..963d58e 100644
--- a/jsl/sof-rt5682/HiFi-Magolor.conf
+++ b/jsl/sof-rt5682/HiFi-Magolor.conf
@@ -87,4 +87,4 @@ SectionDevice."Mic" {
 	}
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi234.conf"
+Include.hdmi.File "/common/hdmi/hdmi234.conf"
diff --git a/jsl/sof-rt5682/HiFi.1mic.conf b/jsl/sof-rt5682/HiFi.1mic.conf
index 819cb5f..3097936 100644
--- a/jsl/sof-rt5682/HiFi.1mic.conf
+++ b/jsl/sof-rt5682/HiFi.1mic.conf
@@ -25,7 +25,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -121,4 +121,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi234.conf"
+Include.hdmi.File "/common/hdmi/hdmi234.conf"
diff --git a/jsl/sof-rt5682/HiFi.1mic.rt5682vs.conf b/jsl/sof-rt5682/HiFi.1mic.rt5682vs.conf
index 2dd814e..48c81b8 100644
--- a/jsl/sof-rt5682/HiFi.1mic.rt5682vs.conf
+++ b/jsl/sof-rt5682/HiFi.1mic.rt5682vs.conf
@@ -18,7 +18,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -112,4 +112,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi234.conf"
+Include.hdmi.File "/common/hdmi/hdmi234.conf"
diff --git a/jsl/sof-rt5682/HiFi.2mic.conf b/jsl/sof-rt5682/HiFi.2mic.conf
index 314bf38..145768f 100644
--- a/jsl/sof-rt5682/HiFi.2mic.conf
+++ b/jsl/sof-rt5682/HiFi.2mic.conf
@@ -25,7 +25,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -142,4 +142,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi234.conf"
+Include.hdmi.File "/common/hdmi/hdmi234.conf"
diff --git a/jsl/sof-rt5682/HiFi.max98360a.rt5682vs.1mic.conf b/jsl/sof-rt5682/HiFi.max98360a.rt5682vs.1mic.conf
index a8fb222..0184b85 100644
--- a/jsl/sof-rt5682/HiFi.max98360a.rt5682vs.1mic.conf
+++ b/jsl/sof-rt5682/HiFi.max98360a.rt5682vs.1mic.conf
@@ -18,7 +18,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -109,4 +109,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi234.conf"
+Include.hdmi.File "/common/hdmi/hdmi234.conf"
diff --git a/jsl/sof-rt5682/HiFi.rt1015p.1mic.conf b/jsl/sof-rt5682/HiFi.rt1015p.1mic.conf
index 24165c7..d27edcc 100644
--- a/jsl/sof-rt5682/HiFi.rt1015p.1mic.conf
+++ b/jsl/sof-rt5682/HiFi.rt1015p.1mic.conf
@@ -20,7 +20,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -116,4 +116,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi234.conf"
+Include.hdmi.File "/common/hdmi/hdmi234.conf"
diff --git a/jsl/sof-rt5682/HiFi.rt1015p.2mic.conf b/jsl/sof-rt5682/HiFi.rt1015p.2mic.conf
index e2b4480..2d5bf8c 100644
--- a/jsl/sof-rt5682/HiFi.rt1015p.2mic.conf
+++ b/jsl/sof-rt5682/HiFi.rt1015p.2mic.conf
@@ -20,7 +20,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -135,4 +135,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi234.conf"
+Include.hdmi.File "/common/hdmi/hdmi234.conf"
diff --git a/mendocino/sof-rt5682s-hs-/HiFi.conf b/mendocino/sof-rt5682s-hs-/HiFi.conf
index e746150..9fd413b 100644
--- a/mendocino/sof-rt5682s-hs-/HiFi.conf
+++ b/mendocino/sof-rt5682s-hs-/HiFi.conf
@@ -44,7 +44,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
diff --git a/tgl/sof-rt5682/HiFi.chronicler.conf b/tgl/sof-rt5682/HiFi.chronicler.conf
index ff36861..e38a561 100644
--- a/tgl/sof-rt5682/HiFi.chronicler.conf
+++ b/tgl/sof-rt5682/HiFi.chronicler.conf
@@ -20,7 +20,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -115,4 +115,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi2345.conf"
+Include.hdmi.File "/common/hdmi/hdmi2345.conf"
diff --git a/tgl/sof-rt5682/HiFi.eldrid.conf b/tgl/sof-rt5682/HiFi.eldrid.conf
index b4a145c..29ba649 100644
--- a/tgl/sof-rt5682/HiFi.eldrid.conf
+++ b/tgl/sof-rt5682/HiFi.eldrid.conf
@@ -20,7 +20,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -118,4 +118,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi2345.conf"
+Include.hdmi.File "/common/hdmi/hdmi2345.conf"
diff --git a/tgl/sof-rt5682/HiFi.elemi.conf b/tgl/sof-rt5682/HiFi.elemi.conf
index 96c2064..15fd2d9 100644
--- a/tgl/sof-rt5682/HiFi.elemi.conf
+++ b/tgl/sof-rt5682/HiFi.elemi.conf
@@ -88,4 +88,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi234.conf"
+Include.hdmi.File "/common/hdmi/hdmi234.conf"
diff --git a/tgl/sof-rt5682/HiFi.lillipup.conf b/tgl/sof-rt5682/HiFi.lillipup.conf
index 6c11ec4..b2388fb 100644
--- a/tgl/sof-rt5682/HiFi.lillipup.conf
+++ b/tgl/sof-rt5682/HiFi.lillipup.conf
@@ -32,7 +32,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -134,4 +134,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi2345.conf"
+Include.hdmi.File "/common/hdmi/hdmi2345.conf"
diff --git a/tgl/sof-rt5682/HiFi.max98373.conf b/tgl/sof-rt5682/HiFi.max98373.conf
index 681e9a4..9deb2ae 100644
--- a/tgl/sof-rt5682/HiFi.max98373.conf
+++ b/tgl/sof-rt5682/HiFi.max98373.conf
@@ -27,7 +27,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -136,4 +136,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi2345.conf"
+Include.hdmi.File "/common/hdmi/hdmi2345.conf"
diff --git a/tgl/sof-rt5682/HiFi.max98373.rt5682vs.conf b/tgl/sof-rt5682/HiFi.max98373.rt5682vs.conf
index 8e6b5ef..816f892 100644
--- a/tgl/sof-rt5682/HiFi.max98373.rt5682vs.conf
+++ b/tgl/sof-rt5682/HiFi.max98373.rt5682vs.conf
@@ -20,7 +20,7 @@ SectionVerb {
 }
 
 # Split 4ch dmic into 2 virtual 2ch mics
-Include.pcm_split.File "/conf.d/dmic-common/split.conf"
+Include.pcm_split.File "/common/pcm/split.conf"
 
 Macro [
 	{
@@ -146,4 +146,4 @@ SectionDevice."Headset" {
 	]
 }
 
-Include.hdmi.File "/conf.d/hdmi-common/hdmi2345.conf"
+Include.hdmi.File "/common/hdmi/hdmi2345.conf"