diff --git a/src/Kconfig b/src/Kconfig
index 05b4adb..ca7b898 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -157,9 +157,6 @@
 	bool
 	default n
 
-config ATI_RAGE_XL
-	bool
-
 source src/console/Kconfig
 
 config HAVE_ACPI_RESUME
diff --git a/src/drivers/Kconfig b/src/drivers/Kconfig
index da5c7ed..f0bb966 100644
--- a/src/drivers/Kconfig
+++ b/src/drivers/Kconfig
@@ -17,13 +17,11 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-config DRIVERS_SIL_3114
-	bool "Silicon Image SIL3114"
-	default n
-	help
-	It sets PCI class to IDE compatible native mode, allowing
-	SeaBIOS, FILO etc... to boot from it.
-
-
+source src/drivers/ati/Kconfig
 source src/drivers/dec/Kconfig
+source src/drivers/emulation/Kconfig
+source src/drivers/generic/Kconfig
+source src/drivers/i2c/Kconfig
+source src/drivers/sil/Kconfig
+source src/drivers/trident/Kconfig
 
diff --git a/src/drivers/Makefile.inc b/src/drivers/Makefile.inc
index 04fa1a6..232f122 100644
--- a/src/drivers/Makefile.inc
+++ b/src/drivers/Makefile.inc
@@ -17,19 +17,11 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
+subdirs-y += ati
 subdirs-y += dec
-
-# should these be cleaned up to behave like all other subdirectories?
-
-subdirs-y += ati/ragexl
-subdirs-y += emulation/qemu
-subdirs-y += generic/debug
-subdirs-y += i2c/adm1026
-subdirs-y += i2c/adm1027
-subdirs-y += i2c/adt7463
-subdirs-y += i2c/i2cmux
-subdirs-y += i2c/i2cmux2
-subdirs-y += i2c/lm63
-subdirs-y += sil/3114
-subdirs-y += trident/blade3d
+subdirs-y += emulation
+subdirs-y += generic
+subdirs-y += i2c
+subdirs-y += sil
+subdirs-y += trident
 
diff --git a/src/drivers/ati/Kconfig b/src/drivers/ati/Kconfig
new file mode 100644
index 0000000..f1ea32c
--- /dev/null
+++ b/src/drivers/ati/Kconfig
@@ -0,0 +1 @@
+source src/drivers/ati/ragexl/Kconfig
diff --git a/src/drivers/ati/Makefile.inc b/src/drivers/ati/Makefile.inc
new file mode 100644
index 0000000..15b5dfc
--- /dev/null
+++ b/src/drivers/ati/Makefile.inc
@@ -0,0 +1 @@
+subdirs-y += ragexl
diff --git a/src/drivers/ati/ragexl/Kconfig b/src/drivers/ati/ragexl/Kconfig
new file mode 100644
index 0000000..117aa66
--- /dev/null
+++ b/src/drivers/ati/ragexl/Kconfig
@@ -0,0 +1,2 @@
+config ATI_RAGE_XL
+	bool
diff --git a/src/drivers/emulation/Kconfig b/src/drivers/emulation/Kconfig
new file mode 100644
index 0000000..3da9f38
--- /dev/null
+++ b/src/drivers/emulation/Kconfig
@@ -0,0 +1,2 @@
+source src/drivers/emulation/qemu/Kconfig
+
diff --git a/src/drivers/emulation/Makefile.inc b/src/drivers/emulation/Makefile.inc
new file mode 100644
index 0000000..c1c92cd
--- /dev/null
+++ b/src/drivers/emulation/Makefile.inc
@@ -0,0 +1 @@
+subdirs-y += qemu
diff --git a/src/drivers/emulation/qemu/Kconfig b/src/drivers/emulation/qemu/Kconfig
new file mode 100644
index 0000000..bd9a2db
--- /dev/null
+++ b/src/drivers/emulation/qemu/Kconfig
@@ -0,0 +1,2 @@
+config DRIVERS_EMULATION_QEMU
+	bool
diff --git a/src/drivers/emulation/qemu/Makefile.inc b/src/drivers/emulation/qemu/Makefile.inc
new file mode 100644
index 0000000..ce7b224
--- /dev/null
+++ b/src/drivers/emulation/qemu/Makefile.inc
@@ -0,0 +1 @@
+driver-$(CONFIG_DRIVERS_EMULATION_QEMU) += init.c
diff --git a/src/drivers/generic/Kconfig b/src/drivers/generic/Kconfig
new file mode 100644
index 0000000..fac6ee5
--- /dev/null
+++ b/src/drivers/generic/Kconfig
@@ -0,0 +1,2 @@
+source src/drivers/generic/debug/Kconfig
+
diff --git a/src/drivers/generic/Makefile.inc b/src/drivers/generic/Makefile.inc
new file mode 100644
index 0000000..0700a0c
--- /dev/null
+++ b/src/drivers/generic/Makefile.inc
@@ -0,0 +1 @@
+subdirs-y += debug
diff --git a/src/drivers/generic/debug/Kconfig b/src/drivers/generic/debug/Kconfig
new file mode 100644
index 0000000..608136af
--- /dev/null
+++ b/src/drivers/generic/debug/Kconfig
@@ -0,0 +1,2 @@
+config DRIVERS_GENERIC_DEBUG
+	bool
diff --git a/src/drivers/i2c/Kconfig b/src/drivers/i2c/Kconfig
new file mode 100644
index 0000000..91ad025
--- /dev/null
+++ b/src/drivers/i2c/Kconfig
@@ -0,0 +1,6 @@
+source src/drivers/i2c/adm1026/Kconfig
+source src/drivers/i2c/adm1027/Kconfig
+source src/drivers/i2c/adt7463/Kconfig
+source src/drivers/i2c/i2cmux/Kconfig
+source src/drivers/i2c/i2cmux2/Kconfig
+source src/drivers/i2c/lm63/Kconfig
diff --git a/src/drivers/i2c/Makefile.inc b/src/drivers/i2c/Makefile.inc
new file mode 100644
index 0000000..d462b69
--- /dev/null
+++ b/src/drivers/i2c/Makefile.inc
@@ -0,0 +1,6 @@
+subdirs-y += adm1026
+subdirs-y += adm1027
+subdirs-y += adt7463
+subdirs-y += i2cmux
+subdirs-y += i2cmux2
+subdirs-y += lm63
diff --git a/src/drivers/i2c/adm1026/Kconfig b/src/drivers/i2c/adm1026/Kconfig
new file mode 100644
index 0000000..8168b29
--- /dev/null
+++ b/src/drivers/i2c/adm1026/Kconfig
@@ -0,0 +1,2 @@
+config DRIVERS_I2C_ADM1026
+	bool
diff --git a/src/drivers/i2c/adm1026/Makefile.inc b/src/drivers/i2c/adm1026/Makefile.inc
new file mode 100644
index 0000000..15b07c3
--- /dev/null
+++ b/src/drivers/i2c/adm1026/Makefile.inc
@@ -0,0 +1 @@
+driver-$(CONFIG_DRIVERS_I2C_ADM1026) += adm1026.c
diff --git a/src/drivers/i2c/adm1027/Kconfig b/src/drivers/i2c/adm1027/Kconfig
new file mode 100644
index 0000000..c135726
--- /dev/null
+++ b/src/drivers/i2c/adm1027/Kconfig
@@ -0,0 +1,2 @@
+config DRIVERS_I2C_ADM1027
+	bool
diff --git a/src/drivers/i2c/adm1027/Makefile.inc b/src/drivers/i2c/adm1027/Makefile.inc
new file mode 100644
index 0000000..942fbd2
--- /dev/null
+++ b/src/drivers/i2c/adm1027/Makefile.inc
@@ -0,0 +1 @@
+driver-$(CONFIG_DRIVERS_I2C_ADM1027) += adm1027.c
diff --git a/src/drivers/i2c/adt7463/Kconfig b/src/drivers/i2c/adt7463/Kconfig
new file mode 100644
index 0000000..b942341
--- /dev/null
+++ b/src/drivers/i2c/adt7463/Kconfig
@@ -0,0 +1,2 @@
+config DRIVERS_I2C_ADT7463
+	bool
diff --git a/src/drivers/i2c/adt7463/Makefile.inc b/src/drivers/i2c/adt7463/Makefile.inc
new file mode 100644
index 0000000..4a6dc0d
--- /dev/null
+++ b/src/drivers/i2c/adt7463/Makefile.inc
@@ -0,0 +1 @@
+driver-$(CONFIG_DRIVERS_I2C_ADT7463) += adt7463.c
diff --git a/src/drivers/i2c/i2cmux/Kconfig b/src/drivers/i2c/i2cmux/Kconfig
new file mode 100644
index 0000000..57bb278
--- /dev/null
+++ b/src/drivers/i2c/i2cmux/Kconfig
@@ -0,0 +1,2 @@
+config DRIVERS_I2C_I2CMUX
+	bool
diff --git a/src/drivers/i2c/i2cmux/Makefile.inc b/src/drivers/i2c/i2cmux/Makefile.inc
new file mode 100644
index 0000000..0645b15
--- /dev/null
+++ b/src/drivers/i2c/i2cmux/Makefile.inc
@@ -0,0 +1 @@
+driver-$(CONFIG_DRIVERS_I2C_I2CMUX) += i2cmux.c
diff --git a/src/drivers/i2c/i2cmux2/Kconfig b/src/drivers/i2c/i2cmux2/Kconfig
new file mode 100644
index 0000000..0213e55
--- /dev/null
+++ b/src/drivers/i2c/i2cmux2/Kconfig
@@ -0,0 +1,2 @@
+config DRIVERS_I2C_I2CMUX2
+	bool
diff --git a/src/drivers/i2c/i2cmux2/Makefile.inc b/src/drivers/i2c/i2cmux2/Makefile.inc
new file mode 100644
index 0000000..df6b2d3
--- /dev/null
+++ b/src/drivers/i2c/i2cmux2/Makefile.inc
@@ -0,0 +1 @@
+driver-$(CONFIG_DRIVERS_I2C_I2CMUX2) += i2cmux2.c
diff --git a/src/drivers/i2c/lm63/Kconfig b/src/drivers/i2c/lm63/Kconfig
new file mode 100644
index 0000000..120ee0d
--- /dev/null
+++ b/src/drivers/i2c/lm63/Kconfig
@@ -0,0 +1,2 @@
+config DRIVERS_I2C_LM63
+	bool
diff --git a/src/drivers/i2c/lm63/Makefile.inc b/src/drivers/i2c/lm63/Makefile.inc
new file mode 100644
index 0000000..782d63d
--- /dev/null
+++ b/src/drivers/i2c/lm63/Makefile.inc
@@ -0,0 +1 @@
+driver-$(CONFIG_DRIVERS_I2C_LM63) += lm63.c
diff --git a/src/drivers/sil/3114/Kconfig b/src/drivers/sil/3114/Kconfig
new file mode 100644
index 0000000..a14515c
--- /dev/null
+++ b/src/drivers/sil/3114/Kconfig
@@ -0,0 +1,8 @@
+config DRIVERS_SIL_3114
+	bool "Silicon Image SIL3114"
+	default n
+	help
+	It sets PCI class to IDE compatible native mode, allowing
+	SeaBIOS, FILO etc... to boot from it.
+
+
diff --git a/src/drivers/sil/Kconfig b/src/drivers/sil/Kconfig
new file mode 100644
index 0000000..a14515c
--- /dev/null
+++ b/src/drivers/sil/Kconfig
@@ -0,0 +1,8 @@
+config DRIVERS_SIL_3114
+	bool "Silicon Image SIL3114"
+	default n
+	help
+	It sets PCI class to IDE compatible native mode, allowing
+	SeaBIOS, FILO etc... to boot from it.
+
+
diff --git a/src/drivers/sil/Makefile.inc b/src/drivers/sil/Makefile.inc
new file mode 100644
index 0000000..6826fc2
--- /dev/null
+++ b/src/drivers/sil/Makefile.inc
@@ -0,0 +1 @@
+subdirs-y += 3114
diff --git a/src/drivers/trident/Kconfig b/src/drivers/trident/Kconfig
new file mode 100644
index 0000000..691891d
--- /dev/null
+++ b/src/drivers/trident/Kconfig
@@ -0,0 +1,2 @@
+source src/drivers/trident/blade3d/Kconfig
+
diff --git a/src/drivers/trident/Makefile.inc b/src/drivers/trident/Makefile.inc
new file mode 100644
index 0000000..730f8ab
--- /dev/null
+++ b/src/drivers/trident/Makefile.inc
@@ -0,0 +1 @@
+subdirs-y += blade3d
diff --git a/src/drivers/trident/blade3d/Kconfig b/src/drivers/trident/blade3d/Kconfig
new file mode 100644
index 0000000..c5e2de0
--- /dev/null
+++ b/src/drivers/trident/blade3d/Kconfig
@@ -0,0 +1,2 @@
+config DRIVERS_TRIDENT_BLADE3D
+	bool
diff --git a/src/drivers/trident/blade3d/Makefile.inc b/src/drivers/trident/blade3d/Makefile.inc
new file mode 100644
index 0000000..390ae13
--- /dev/null
+++ b/src/drivers/trident/blade3d/Makefile.inc
@@ -0,0 +1 @@
+driver-$(CONFIG_DRIVERS_TRIDENT_BLADE3D) += blade3d.c