diff --git a/sys/conf/files b/sys/conf/files
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1792,8 +1792,6 @@
 dev/ida/ida_disk.c		optional ida
 dev/ida/ida_pci.c		optional ida pci
 dev/iicbus/acpi_iicbus.c	optional acpi iicbus | acpi compat_linuxkpi
-dev/iicbus/ad7418.c		optional ad7418
-dev/iicbus/ads111x.c		optional ads111x
 dev/iicbus/htu21.c		optional htu21
 dev/iicbus/icee.c		optional icee
 dev/iicbus/if_ic.c		optional ic
@@ -1812,6 +1810,9 @@
 dev/iicbus/iicoc_pci.c		optional iicoc pci
 dev/iicbus/lm75.c		optional lm75
 dev/iicbus/max44009.c		optional max44009
+dev/iicbus/adc/ad7418.c		optional ad7418
+dev/iicbus/adc/ads111x.c	optional ads111x
+dev/iicbus/adc/pcf8591.c	optional pcf8591
 dev/iicbus/mux/iicmux.c		optional iicmux
 dev/iicbus/mux/iicmux_if.m	optional iicmux
 dev/iicbus/mux/iic_gpiomux.c	optional iic_gpiomux fdt
@@ -1820,7 +1821,6 @@
 dev/iicbus/ofw_iicbus.c		optional fdt iicbus
 dev/iicbus/ofw_iicbus_if.m	optional fdt iicbus
 dev/iicbus/pcf8574.c		optional pcf8574
-dev/iicbus/pcf8591.c		optional pcf8591
 dev/iicbus/rtc/ds1307.c		optional ds1307
 dev/iicbus/rtc/ds13rtc.c	optional ds13rtc | ds133x | ds1374
 dev/iicbus/rtc/ds1672.c		optional ds1672
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -40,10 +40,10 @@
 dev/hwpmc/hwpmc_power8.c	optional	hwpmc
 dev/hwpmc/hwpmc_powerpc.c	optional	hwpmc
 dev/hwpmc/hwpmc_ppc970.c	optional	hwpmc
-dev/iicbus/ad7417.c		optional	ad7417 powermac
 dev/iicbus/ds1631.c		optional	ds1631 powermac
 dev/iicbus/ds1775.c		optional	ds1775 powermac
 dev/iicbus/max6690.c		optional	max6690 powermac
+dev/iicbus/adc/ad7417.c		optional	ad7417 powermac
 dev/iicbus/ofw_iicbus.c		optional	iicbus aim
 dev/iicbus/ofw_iicbus_if.m	optional	iicbus aim
 dev/iicbus/pwm/adm1030.c	optional	powermac windtunnel | adm1030 powermac
diff --git a/sys/dev/iicbus/ad7417.c b/sys/dev/iicbus/adc/ad7417.c
rename from sys/dev/iicbus/ad7417.c
rename to sys/dev/iicbus/adc/ad7417.c
diff --git a/sys/dev/iicbus/ad7418.c b/sys/dev/iicbus/adc/ad7418.c
rename from sys/dev/iicbus/ad7418.c
rename to sys/dev/iicbus/adc/ad7418.c
diff --git a/sys/dev/iicbus/ads111x.c b/sys/dev/iicbus/adc/ads111x.c
rename from sys/dev/iicbus/ads111x.c
rename to sys/dev/iicbus/adc/ads111x.c
diff --git a/sys/dev/iicbus/pcf8591.c b/sys/dev/iicbus/adc/pcf8591.c
rename from sys/dev/iicbus/pcf8591.c
rename to sys/dev/iicbus/adc/pcf8591.c
diff --git a/sys/modules/i2c/ads111x/Makefile b/sys/modules/i2c/ads111x/Makefile
--- a/sys/modules/i2c/ads111x/Makefile
+++ b/sys/modules/i2c/ads111x/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:		${SRCTOP}/sys/dev/iicbus
+.PATH:		${SRCTOP}/sys/dev/iicbus/adc
 
 KMOD=	ads111x
 SRCS=	ads111x.c
diff --git a/sys/modules/i2c/pcf8591/Makefile b/sys/modules/i2c/pcf8591/Makefile
--- a/sys/modules/i2c/pcf8591/Makefile
+++ b/sys/modules/i2c/pcf8591/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:	${SRCTOP}/sys/dev/iicbus
+.PATH:	${SRCTOP}/sys/dev/iicbus/adc
 KMOD=	pcf8591
 SRCS=	pcf8591.c