diff --git a/util/intelp2m/parser/parser.go b/util/intelp2m/parser/parser.go
index 4575549544..91428f83de 100644
--- a/util/intelp2m/parser/parser.go
+++ b/util/intelp2m/parser/parser.go
@@ -7,11 +7,11 @@ import (
 	"strings"
 
 	"review.coreboot.org/coreboot.git/util/intelp2m/config/p2m"
-	"review.coreboot.org/coreboot.git/util/intelp2m/fields"
 	"review.coreboot.org/coreboot.git/util/intelp2m/logs"
 	"review.coreboot.org/coreboot.git/util/intelp2m/parser/template"
 	"review.coreboot.org/coreboot.git/util/intelp2m/platforms"
 	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
+	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/common/fields"
 	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/common/register/bits"
 )
 
diff --git a/util/intelp2m/fields/cb/cb.go b/util/intelp2m/platforms/common/fields/cb/cb.go
similarity index 100%
rename from util/intelp2m/fields/cb/cb.go
rename to util/intelp2m/platforms/common/fields/cb/cb.go
diff --git a/util/intelp2m/fields/cb/cb_test.go b/util/intelp2m/platforms/common/fields/cb/cb_test.go
similarity index 96%
rename from util/intelp2m/fields/cb/cb_test.go
rename to util/intelp2m/platforms/common/fields/cb/cb_test.go
index e553551199..f4fcba850e 100644
--- a/util/intelp2m/fields/cb/cb_test.go
+++ b/util/intelp2m/platforms/common/fields/cb/cb_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"review.coreboot.org/coreboot.git/util/intelp2m/config/p2m"
-	"review.coreboot.org/coreboot.git/util/intelp2m/fields/test"
+	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/common/fields/test"
 )
 
 // sliding-one
diff --git a/util/intelp2m/fields/fields.go b/util/intelp2m/platforms/common/fields/fields.go
similarity index 70%
rename from util/intelp2m/fields/fields.go
rename to util/intelp2m/platforms/common/fields/fields.go
index 19074f9ad1..dc5f7bd7b4 100644
--- a/util/intelp2m/fields/fields.go
+++ b/util/intelp2m/platforms/common/fields/fields.go
@@ -2,10 +2,10 @@ package fields
 
 import (
 	"review.coreboot.org/coreboot.git/util/intelp2m/config/p2m"
-	"review.coreboot.org/coreboot.git/util/intelp2m/fields/cb"
-	"review.coreboot.org/coreboot.git/util/intelp2m/fields/fsp"
-	"review.coreboot.org/coreboot.git/util/intelp2m/fields/raw"
 	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
+	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/common/fields/cb"
+	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/common/fields/fsp"
+	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/common/fields/raw"
 )
 
 // InterfaceSet - set the interface for decoding configuration
diff --git a/util/intelp2m/fields/fsp/fsp.go b/util/intelp2m/platforms/common/fields/fsp/fsp.go
similarity index 100%
rename from util/intelp2m/fields/fsp/fsp.go
rename to util/intelp2m/platforms/common/fields/fsp/fsp.go
diff --git a/util/intelp2m/fields/fsp/fsp_test.go b/util/intelp2m/platforms/common/fields/fsp/fsp_test.go
similarity index 98%
rename from util/intelp2m/fields/fsp/fsp_test.go
rename to util/intelp2m/platforms/common/fields/fsp/fsp_test.go
index 3b6d8c6650..dd36e929c2 100644
--- a/util/intelp2m/fields/fsp/fsp_test.go
+++ b/util/intelp2m/platforms/common/fields/fsp/fsp_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"review.coreboot.org/coreboot.git/util/intelp2m/config/p2m"
-	"review.coreboot.org/coreboot.git/util/intelp2m/fields/test"
+	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/common/fields/test"
 )
 
 func TestFSPFields(t *testing.T) {
diff --git a/util/intelp2m/fields/raw/raw.go b/util/intelp2m/platforms/common/fields/raw/raw.go
similarity index 100%
rename from util/intelp2m/fields/raw/raw.go
rename to util/intelp2m/platforms/common/fields/raw/raw.go
diff --git a/util/intelp2m/fields/raw/raw_test.go b/util/intelp2m/platforms/common/fields/raw/raw_test.go
similarity index 95%
rename from util/intelp2m/fields/raw/raw_test.go
rename to util/intelp2m/platforms/common/fields/raw/raw_test.go
index 067f6aa5ac..d33229dac6 100644
--- a/util/intelp2m/fields/raw/raw_test.go
+++ b/util/intelp2m/platforms/common/fields/raw/raw_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"review.coreboot.org/coreboot.git/util/intelp2m/config/p2m"
-	"review.coreboot.org/coreboot.git/util/intelp2m/fields/test"
+	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/common/fields/test"
 )
 
 func TestRAWFields(t *testing.T) {
diff --git a/util/intelp2m/fields/test/suite.go b/util/intelp2m/platforms/common/fields/test/suite.go
similarity index 94%
rename from util/intelp2m/fields/test/suite.go
rename to util/intelp2m/platforms/common/fields/test/suite.go
index 816a3a8105..7fed3f3bba 100644
--- a/util/intelp2m/fields/test/suite.go
+++ b/util/intelp2m/platforms/common/fields/test/suite.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
-	"review.coreboot.org/coreboot.git/util/intelp2m/fields"
 	"review.coreboot.org/coreboot.git/util/intelp2m/platforms"
 	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
+	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/common/fields"
 )
 
 type TestCase struct {
diff --git a/util/intelp2m/platforms/test/suite.go b/util/intelp2m/platforms/test/suite.go
index aa14d04677..07085368a8 100644
--- a/util/intelp2m/platforms/test/suite.go
+++ b/util/intelp2m/platforms/test/suite.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 
 	"review.coreboot.org/coreboot.git/util/intelp2m/config/p2m"
-	"review.coreboot.org/coreboot.git/util/intelp2m/fields"
 	"review.coreboot.org/coreboot.git/util/intelp2m/platforms"
 	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/common"
+	"review.coreboot.org/coreboot.git/util/intelp2m/platforms/common/fields"
 )
 
 type (