diff --git a/include/configs/keymile-common.h b/include/configs/km/keymile-common.h
similarity index 100%
rename from include/configs/keymile-common.h
rename to include/configs/km/keymile-common.h
diff --git a/include/configs/km-powerpc.h b/include/configs/km/km-powerpc.h
similarity index 100%
rename from include/configs/km-powerpc.h
rename to include/configs/km/km-powerpc.h
diff --git a/include/configs/km82xx-common.h b/include/configs/km/km82xx-common.h
similarity index 100%
rename from include/configs/km82xx-common.h
rename to include/configs/km/km82xx-common.h
diff --git a/include/configs/km8321-common.h b/include/configs/km/km8321-common.h
similarity index 100%
rename from include/configs/km8321-common.h
rename to include/configs/km/km8321-common.h
diff --git a/include/configs/km83xx-common.h b/include/configs/km/km83xx-common.h
similarity index 100%
rename from include/configs/km83xx-common.h
rename to include/configs/km/km83xx-common.h
diff --git a/include/configs/km_arm.h b/include/configs/km/km_arm.h
similarity index 100%
rename from include/configs/km_arm.h
rename to include/configs/km/km_arm.h
diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h
index 2fcecaf88f2c4aeb4070da081b4e0c8bf85a4583..8639ddd96f4b3542280b25ded0d4bd6e0566290a 100644
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -34,7 +34,7 @@
 	"netdev=eth2\0"		\
 
 /* include common defines/options for all 83xx Keymile boards */
-#include "km83xx-common.h"
+#include "km/km83xx-common.h"
 
 #define CONFIG_MISC_INIT_R
 /*
diff --git a/include/configs/kmsupx5.h b/include/configs/kmsupx5.h
index 55ed3f6a490c2da3e818d0183857b0135600cf62..f8cd8e023e13f1b97e85f8f3e2861c2e373c41d4 100644
--- a/include/configs/kmsupx5.h
+++ b/include/configs/kmsupx5.h
@@ -36,7 +36,7 @@
 #define	CONFIG_SYS_TEXT_BASE	0xF0000000
 
 /* include common defines/options for all 8321 Keymile boards */
-#include "km8321-common.h"
+#include "km/km8321-common.h"
 
 /*
  * Init Local Bus Memory Controller:
diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h
index 07458554efea8c305d666157e7545e5da529e711..b736c56c0980147b718b0f2dcd0f8d25041f4b01 100644
--- a/include/configs/mgcoge.h
+++ b/include/configs/mgcoge.h
@@ -37,8 +37,8 @@
 #define	CONFIG_SYS_TEXT_BASE	0xFE000000
 
 /* include common defines/options for all Keymile boards */
-#include "keymile-common.h"
-#include "km-powerpc.h"
+#include "km/keymile-common.h"
+#include "km/km-powerpc.h"
 
 #define CONFIG_SYS_SDRAM_BASE		0x00000000
 #define CONFIG_SYS_FLASH_BASE		0xFE000000
@@ -88,6 +88,6 @@
 #define CONFIG_KM_BOARD_EXTRA_ENV	""
 
 /* include further common stuff for all keymile 82xx boards */
-#include "km82xx-common.h"
+#include "km/km82xx-common.h"
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/mgcoge2un.h b/include/configs/mgcoge2un.h
index d3c7bdcddf783bca0e746f3d54550b2fbb690b06..62560350db30bd50bb60cef6d542d237eca10180 100644
--- a/include/configs/mgcoge2un.h
+++ b/include/configs/mgcoge2un.h
@@ -35,7 +35,7 @@
 #define _CONFIG_MGCOGE2UN_H
 
 /* include common defines/options for all arm based Keymile boards */
-#include "km_arm.h"
+#include "km/km_arm.h"
 
 /*
  * Version number information
diff --git a/include/configs/mgcoge3ne.h b/include/configs/mgcoge3ne.h
index 6f7e12f9a4963b97e3a7b86981b3db86a823acd2..6fa15844955aec08df66dbe003c6ed5a75720c4b 100644
--- a/include/configs/mgcoge3ne.h
+++ b/include/configs/mgcoge3ne.h
@@ -37,8 +37,8 @@
 #define	CONFIG_SYS_TEXT_BASE	0xFE000000
 
 /* include common defines/options for all Keymile boards */
-#include "keymile-common.h"
-#include "km-powerpc.h"
+#include "km/keymile-common.h"
+#include "km/km-powerpc.h"
 
 #define CONFIG_SYS_SDRAM_BASE		0x00000000
 #define CONFIG_SYS_FLASH_BASE		0xFE000000
@@ -88,7 +88,7 @@
 #define CONFIG_KM_BOARD_EXTRA_ENV	"bobcatreset=true\0"
 
 /* include further common stuff for all keymile 82xx boards */
-#include "km82xx-common.h"
+#include "km/km82xx-common.h"
 
 /* bfticu address */
 #define CONFIG_SYS_BFTICU_BASE          0x40000000
diff --git a/include/configs/suen3.h b/include/configs/suen3.h
index 2b6f19ee0c9d22d894629908254c5a6a82dc4c1c..aa4d7787b84e8c3c410a7e2cb70e11c6c6f0ab4c 100644
--- a/include/configs/suen3.h
+++ b/include/configs/suen3.h
@@ -34,7 +34,7 @@
 #define _CONFIG_SUEN3_H
 
 /* include common defines/options for all arm based Keymile boards */
-#include "km_arm.h"
+#include "km/km_arm.h"
 
 /*
  * Version number information
diff --git a/include/configs/suen8.h b/include/configs/suen8.h
index 3f60bc33f0e5fed73c686c51b744991d33be7311..b680dfbe74150fa37b1888165698a9062b65a8eb 100644
--- a/include/configs/suen8.h
+++ b/include/configs/suen8.h
@@ -35,7 +35,7 @@
 #define _CONFIG_SUEN8_H
 
 /* include common defines/options for all arm based Keymile boards */
-#include "km_arm.h"
+#include "km/km_arm.h"
 
 /*
  * Version number information
diff --git a/include/configs/suvd3.h b/include/configs/suvd3.h
index d9eb2019210dc26f069aa55795828a234c5396ba..0b59d512a5c55075762b9c48737cdfa0bb9dd818 100644
--- a/include/configs/suvd3.h
+++ b/include/configs/suvd3.h
@@ -30,7 +30,7 @@
 #define	CONFIG_SYS_TEXT_BASE	0xF0000000
 
 /* include common defines/options for all 8321 Keymile boards */
-#include "km8321-common.h"
+#include "km/km8321-common.h"
 
 #define CONFIG_SYS_APP1_BASE		0xA0000000
 #define	CONFIG_SYS_APP1_SIZE		256 /* Megabytes */
diff --git a/include/configs/tuda1.h b/include/configs/tuda1.h
index 1c0b3e0034227e15f450c8b0f375a10e02695ca6..853c00a978cf46a0b90727eb29b39ed5ce5d1587 100644
--- a/include/configs/tuda1.h
+++ b/include/configs/tuda1.h
@@ -33,7 +33,7 @@
 #define	CONFIG_SYS_TEXT_BASE	0xF0000000
 
 /* include common defines/options for all 8321 Keymile boards */
-#include "km8321-common.h"
+#include "km/km8321-common.h"
 
 #define CONFIG_SYS_APP1_BASE	0xA0000000    /* PAXG */
 #define	CONFIG_SYS_APP1_SIZE	256 /* Megabytes */
diff --git a/include/configs/tuxa1.h b/include/configs/tuxa1.h
index 012db96736e6e9ce169ef9abe27f59dccbb94dcd..ceeb5a3e2c0bfe625def7cd07f6d63056fea51a2 100644
--- a/include/configs/tuxa1.h
+++ b/include/configs/tuxa1.h
@@ -33,7 +33,7 @@
 #define	CONFIG_SYS_TEXT_BASE	0xF0000000
 
 /* include common defines/options for all 8321 Keymile boards */
-#include "km8321-common.h"
+#include "km/km8321-common.h"
 
 #define	CONFIG_SYS_LPXF_BASE		0xA0000000    /* LPXF */
 #define	CONFIG_SYS_LPXF_SIZE		256 /* Megabytes */