diff --git a/src/drivers/Kconfig b/src/drivers/Kconfig
index d2ff5d7..da5c7ed 100644
--- a/src/drivers/Kconfig
+++ b/src/drivers/Kconfig
@@ -17,9 +17,13 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-config DRIVERS_SIL
+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/dec/Kconfig
+
diff --git a/src/drivers/Makefile.inc b/src/drivers/Makefile.inc
index e817afc..04fa1a6 100644
--- a/src/drivers/Makefile.inc
+++ b/src/drivers/Makefile.inc
@@ -1,5 +1,35 @@
-subdirs-y += generic/debug
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2010 coresystems GmbH
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; version 2 of the License.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+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 += ti/pcmcia-cardbus
-subdirs-y += dec/21143
+subdirs-y += trident/blade3d
+
diff --git a/src/southbridge/dec/21143/21143.c b/src/drivers/dec/21143/21143.c
similarity index 100%
rename from src/southbridge/dec/21143/21143.c
rename to src/drivers/dec/21143/21143.c
diff --git a/src/drivers/dec/21143/Kconfig b/src/drivers/dec/21143/Kconfig
new file mode 100644
index 0000000..82604a6
--- /dev/null
+++ b/src/drivers/dec/21143/Kconfig
@@ -0,0 +1,2 @@
+config DRIVERS_DEC_21143
+	bool
diff --git a/src/southbridge/dec/21143/Makefile.inc b/src/drivers/dec/21143/Makefile.inc
similarity index 100%
rename from src/southbridge/dec/21143/Makefile.inc
rename to src/drivers/dec/21143/Makefile.inc
diff --git a/src/drivers/dec/Kconfig b/src/drivers/dec/Kconfig
new file mode 100644
index 0000000..c9dfe64
--- /dev/null
+++ b/src/drivers/dec/Kconfig
@@ -0,0 +1 @@
+source src/drivers/dec/21143/Kconfig
diff --git a/src/drivers/dec/Makefile.inc b/src/drivers/dec/Makefile.inc
new file mode 100644
index 0000000..196c424
--- /dev/null
+++ b/src/drivers/dec/Makefile.inc
@@ -0,0 +1 @@
+subdirs-$(CONFIG_DRIVERS_DEC_21143) += 21143
diff --git a/src/drivers/sil/3114/Makefile.inc b/src/drivers/sil/3114/Makefile.inc
index 7e5db65..3af907a 100644
--- a/src/drivers/sil/3114/Makefile.inc
+++ b/src/drivers/sil/3114/Makefile.inc
@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_SIL) += sil_sata.o
+driver-$(CONFIG_DRIVERS_SIL_3114) += sil_sata.o
diff --git a/src/mainboard/amd/mahogany/dsdt.asl b/src/mainboard/amd/mahogany/dsdt.asl
index 07d8514..981f728 100644
--- a/src/mainboard/amd/mahogany/dsdt.asl
+++ b/src/mainboard/amd/mahogany/dsdt.asl
@@ -270,7 +270,7 @@
 			/* Byte offsets are computed using the following technique:
 			 * ((bus number + 1) * ((device number * 8) * 4096)) + register offset
 			 * The 8 comes from 8 functions per device, and 4096 bytes per function config space
-			*/
+			 */
 			Offset(0x00088024),	/* Byte offset to SATA register 24h - Bus 0, Device 17, Function 0 */
 			STB5, 32,
 			Offset(0x00098042),	/* Byte offset to OHCI0 register 42h - Bus 0, Device 19, Function 0 */
diff --git a/src/mainboard/tyan/s2881/Kconfig b/src/mainboard/tyan/s2881/Kconfig
index e12e956..eae991c 100644
--- a/src/mainboard/tyan/s2881/Kconfig
+++ b/src/mainboard/tyan/s2881/Kconfig
@@ -14,7 +14,7 @@
 	select HAVE_MP_TABLE
 	select BOARD_ROMSIZE_KB_512
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	select DRIVERS_SIL
+	select DRIVERS_SIL_3114
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/tyan/s2882/Kconfig b/src/mainboard/tyan/s2882/Kconfig
index fdb486d..1c12f41 100644
--- a/src/mainboard/tyan/s2882/Kconfig
+++ b/src/mainboard/tyan/s2882/Kconfig
@@ -13,7 +13,7 @@
 	select HAVE_MP_TABLE
 	select BOARD_ROMSIZE_KB_512
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	select DRIVERS_SIL
+	select DRIVERS_SIL_3114
 
 config MAINBOARD_DIR
 	string
diff --git a/src/southbridge/Kconfig b/src/southbridge/Kconfig
index b0da86a..77fe385 100644
--- a/src/southbridge/Kconfig
+++ b/src/southbridge/Kconfig
@@ -1,6 +1,5 @@
 source src/southbridge/amd/Kconfig
 source src/southbridge/broadcom/Kconfig
-source src/southbridge/dec/Kconfig
 source src/southbridge/intel/Kconfig
 source src/southbridge/nvidia/Kconfig
 source src/southbridge/ricoh/Kconfig
diff --git a/src/southbridge/Makefile.inc b/src/southbridge/Makefile.inc
index c78f0ba..b7e04db 100644
--- a/src/southbridge/Makefile.inc
+++ b/src/southbridge/Makefile.inc
@@ -1,6 +1,5 @@
 subdirs-y += amd
 subdirs-y += broadcom
-subdirs-y += dec
 subdirs-y += intel
 subdirs-y += nvidia
 subdirs-y += ricoh
diff --git a/src/southbridge/dec/21143/Kconfig b/src/southbridge/dec/21143/Kconfig
deleted file mode 100644
index bd6bc67..0000000
--- a/src/southbridge/dec/21143/Kconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-config SOUTHBRIDGE_DEC_21143
-	bool
diff --git a/src/southbridge/dec/Kconfig b/src/southbridge/dec/Kconfig
deleted file mode 100644
index acca5e5..0000000
--- a/src/southbridge/dec/Kconfig
+++ /dev/null
@@ -1 +0,0 @@
-source src/southbridge/dec/21143/Kconfig
diff --git a/src/southbridge/dec/Makefile.inc b/src/southbridge/dec/Makefile.inc
deleted file mode 100644
index 1e75f34..0000000
--- a/src/southbridge/dec/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-subdirs-$(CONFIG_SOUTHBRIDGE_DEC_21143) += 21143