diff --git a/src/soc/intel/broadwell/Makefile.inc b/src/soc/intel/broadwell/Makefile.inc
index dc6bd93c34..7ee69908f8 100644
--- a/src/soc/intel/broadwell/Makefile.inc
+++ b/src/soc/intel/broadwell/Makefile.inc
@@ -1,11 +1,14 @@
 ifeq ($(CONFIG_SOC_INTEL_BROADWELL),y)
 
-subdirs-y += romstage
-
 subdirs-y += cpu
 subdirs-y += pch
 
-bootblock-y += bootblock/systemagent.c
+bootblock-y += bootblock.c
+
+romstage-y += early_init.c
+romstage-y += raminit.c
+romstage-y += report_platform.c
+romstage-y += romstage.c
 
 ramstage-y += acpi.c
 ramstage-y += finalize.c
diff --git a/src/soc/intel/broadwell/bootblock/systemagent.c b/src/soc/intel/broadwell/bootblock.c
similarity index 100%
rename from src/soc/intel/broadwell/bootblock/systemagent.c
rename to src/soc/intel/broadwell/bootblock.c
diff --git a/src/soc/intel/broadwell/romstage/systemagent.c b/src/soc/intel/broadwell/early_init.c
similarity index 100%
rename from src/soc/intel/broadwell/romstage/systemagent.c
rename to src/soc/intel/broadwell/early_init.c
diff --git a/src/soc/intel/broadwell/romstage/raminit.c b/src/soc/intel/broadwell/raminit.c
similarity index 100%
rename from src/soc/intel/broadwell/romstage/raminit.c
rename to src/soc/intel/broadwell/raminit.c
diff --git a/src/soc/intel/broadwell/romstage/report_platform.c b/src/soc/intel/broadwell/report_platform.c
similarity index 100%
rename from src/soc/intel/broadwell/romstage/report_platform.c
rename to src/soc/intel/broadwell/report_platform.c
diff --git a/src/soc/intel/broadwell/romstage/romstage.c b/src/soc/intel/broadwell/romstage.c
similarity index 100%
rename from src/soc/intel/broadwell/romstage/romstage.c
rename to src/soc/intel/broadwell/romstage.c
diff --git a/src/soc/intel/broadwell/romstage/Makefile.inc b/src/soc/intel/broadwell/romstage/Makefile.inc
deleted file mode 100644
index 65cb9adee5..0000000000
--- a/src/soc/intel/broadwell/romstage/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-romstage-y += raminit.c
-romstage-y += report_platform.c
-romstage-y += romstage.c
-romstage-y += systemagent.c