diff --git a/src/mainboard/google/kahlee/variants/grunt/spd/Makefile.inc b/src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.inc
similarity index 96%
rename from src/mainboard/google/kahlee/variants/grunt/spd/Makefile.inc
rename to src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.inc
index 128edf0b9a..b90357531c 100644
--- a/src/mainboard/google/kahlee/variants/grunt/spd/Makefile.inc
+++ b/src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.inc
@@ -14,7 +14,7 @@
 ## GNU General Public License for more details.
 ##
 
-LIB_SPD_DEPS = $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/spd/$(f).spd.hex)
+LIB_SPD_DEPS = $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/baseboard/spd/$(f).spd.hex)
 
 SPD_SOURCES =  hynix-H5AN8G6NAFR-UH		# 0b0000
 SPD_SOURCES += hynix-H5ANAG6NAMR-UH		# 0b0001
diff --git a/src/mainboard/google/kahlee/variants/grunt/spd/empty.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/empty.spd.hex
similarity index 100%
rename from src/mainboard/google/kahlee/variants/grunt/spd/empty.spd.hex
rename to src/mainboard/google/kahlee/variants/baseboard/spd/empty.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/grunt/spd/hynix-H5AN8G6NAFR-UH.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5AN8G6NAFR-UH.spd.hex
similarity index 100%
rename from src/mainboard/google/kahlee/variants/grunt/spd/hynix-H5AN8G6NAFR-UH.spd.hex
rename to src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5AN8G6NAFR-UH.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/grunt/spd/hynix-H5ANAG6NAMR-UH.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5ANAG6NAMR-UH.spd.hex
similarity index 100%
rename from src/mainboard/google/kahlee/variants/grunt/spd/hynix-H5ANAG6NAMR-UH.spd.hex
rename to src/mainboard/google/kahlee/variants/baseboard/spd/hynix-H5ANAG6NAMR-UH.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/grunt/spd/micron-MT40A1G16KNR-075:E.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A1G16KNR-075:E.spd.hex
similarity index 100%
rename from src/mainboard/google/kahlee/variants/grunt/spd/micron-MT40A1G16KNR-075:E.spd.hex
rename to src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A1G16KNR-075:E.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/grunt/spd/micron-MT40A512M16JY-083E:B.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A512M16JY-083E:B.spd.hex
similarity index 100%
rename from src/mainboard/google/kahlee/variants/grunt/spd/micron-MT40A512M16JY-083E:B.spd.hex
rename to src/mainboard/google/kahlee/variants/baseboard/spd/micron-MT40A512M16JY-083E:B.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/grunt/spd/samsung-K4A8G165WB-BCRC.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4A8G165WB-BCRC.spd.hex
similarity index 100%
rename from src/mainboard/google/kahlee/variants/grunt/spd/samsung-K4A8G165WB-BCRC.spd.hex
rename to src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4A8G165WB-BCRC.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/grunt/spd/samsung-K4AAG165WB-MCRC.spd.hex b/src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4AAG165WB-MCRC.spd.hex
similarity index 100%
rename from src/mainboard/google/kahlee/variants/grunt/spd/samsung-K4AAG165WB-MCRC.spd.hex
rename to src/mainboard/google/kahlee/variants/baseboard/spd/samsung-K4AAG165WB-MCRC.spd.hex
diff --git a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc b/src/mainboard/google/kahlee/variants/grunt/Makefile.inc
index 3ef10b3731..36f55fd85b 100644
--- a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc
+++ b/src/mainboard/google/kahlee/variants/grunt/Makefile.inc
@@ -13,7 +13,7 @@
 # GNU General Public License for more details.
 #
 
-subdirs-y += spd
+subdirs-y += ../baseboard/spd
 
 romstage-y += romstage.c