diff --git a/sys/conf/files b/sys/conf/files
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1794,10 +1794,6 @@
 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/ds1307.c		optional ds1307
-dev/iicbus/ds13rtc.c		optional ds13rtc | ds133x | ds1374
-dev/iicbus/ds1672.c		optional ds1672
-dev/iicbus/ds3231.c		optional ds3231
 dev/iicbus/htu21.c		optional htu21
 dev/iicbus/icee.c		optional icee
 dev/iicbus/if_ic.c		optional ic
@@ -1814,7 +1810,6 @@
 dev/iicbus/iicoc.c		optional iicoc
 dev/iicbus/iicoc_fdt.c		optional iicoc fdt
 dev/iicbus/iicoc_pci.c		optional iicoc pci
-dev/iicbus/isl12xx.c		optional isl12xx
 dev/iicbus/lm75.c		optional lm75
 dev/iicbus/max44009.c		optional max44009
 dev/iicbus/mux/iicmux.c		optional iicmux
@@ -1822,15 +1817,20 @@
 dev/iicbus/mux/iic_gpiomux.c	optional iic_gpiomux fdt
 dev/iicbus/mux/ltc430x.c	optional ltc430x
 dev/iicbus/mux/pca954x.c	optional pca954x iicbus iicmux
-dev/iicbus/nxprtc.c		optional nxprtc | pcf8563
 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/rtc8583.c		optional rtc8583
+dev/iicbus/rtc/ds1307.c		optional ds1307
+dev/iicbus/rtc/ds13rtc.c	optional ds13rtc | ds133x | ds1374
+dev/iicbus/rtc/ds1672.c		optional ds1672
+dev/iicbus/rtc/ds3231.c		optional ds3231
+dev/iicbus/rtc/isl12xx.c	optional isl12xx
+dev/iicbus/rtc/nxprtc.c		optional nxprtc | pcf8563
 dev/iicbus/rtc/pcf85063.c	optional pcf85063 iicbus fdt
+dev/iicbus/rtc/rtc8583.c	optional rtc8583
 dev/iicbus/rtc/rx8803.c		optional rx8803 iicbus fdt
-dev/iicbus/s35390a.c		optional s35390a
+dev/iicbus/rtc/s35390a.c	optional s35390a
 dev/iicbus/sy8106a.c		optional sy8106a fdt
 dev/iicbus/syr827.c		optional syr827 fdt
 dev/iicbus/gpio/tca64xx.c	optional tca64xx fdt gpio
diff --git a/sys/dev/iicbus/ds1307.c b/sys/dev/iicbus/rtc/ds1307.c
rename from sys/dev/iicbus/ds1307.c
rename to sys/dev/iicbus/rtc/ds1307.c
--- a/sys/dev/iicbus/ds1307.c
+++ b/sys/dev/iicbus/rtc/ds1307.c
@@ -48,7 +48,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 #endif
 
-#include <dev/iicbus/ds1307reg.h>
+#include <dev/iicbus/rtc/ds1307reg.h>
 
 #include "clock_if.h"
 #include "iicbus_if.h"
diff --git a/sys/dev/iicbus/ds1307reg.h b/sys/dev/iicbus/rtc/ds1307reg.h
rename from sys/dev/iicbus/ds1307reg.h
rename to sys/dev/iicbus/rtc/ds1307reg.h
diff --git a/sys/dev/iicbus/ds13rtc.c b/sys/dev/iicbus/rtc/ds13rtc.c
rename from sys/dev/iicbus/ds13rtc.c
rename to sys/dev/iicbus/rtc/ds13rtc.c
diff --git a/sys/dev/iicbus/ds1672.c b/sys/dev/iicbus/rtc/ds1672.c
rename from sys/dev/iicbus/ds1672.c
rename to sys/dev/iicbus/rtc/ds1672.c
diff --git a/sys/dev/iicbus/ds3231.c b/sys/dev/iicbus/rtc/ds3231.c
rename from sys/dev/iicbus/ds3231.c
rename to sys/dev/iicbus/rtc/ds3231.c
--- a/sys/dev/iicbus/ds3231.c
+++ b/sys/dev/iicbus/rtc/ds3231.c
@@ -47,7 +47,7 @@
 #include <dev/ofw/ofw_bus_subr.h>
 #endif
 
-#include <dev/iicbus/ds3231reg.h>
+#include <dev/iicbus/rtc/ds3231reg.h>
 
 #include "clock_if.h"
 #include "iicbus_if.h"
diff --git a/sys/dev/iicbus/ds3231reg.h b/sys/dev/iicbus/rtc/ds3231reg.h
rename from sys/dev/iicbus/ds3231reg.h
rename to sys/dev/iicbus/rtc/ds3231reg.h
diff --git a/sys/dev/iicbus/isl12xx.c b/sys/dev/iicbus/rtc/isl12xx.c
rename from sys/dev/iicbus/isl12xx.c
rename to sys/dev/iicbus/rtc/isl12xx.c
diff --git a/sys/dev/iicbus/nxprtc.c b/sys/dev/iicbus/rtc/nxprtc.c
rename from sys/dev/iicbus/nxprtc.c
rename to sys/dev/iicbus/rtc/nxprtc.c
diff --git a/sys/dev/iicbus/rtc8583.c b/sys/dev/iicbus/rtc/rtc8583.c
rename from sys/dev/iicbus/rtc8583.c
rename to sys/dev/iicbus/rtc/rtc8583.c
diff --git a/sys/dev/iicbus/s35390a.c b/sys/dev/iicbus/rtc/s35390a.c
rename from sys/dev/iicbus/s35390a.c
rename to sys/dev/iicbus/rtc/s35390a.c
diff --git a/sys/modules/i2c/ds1307/Makefile b/sys/modules/i2c/ds1307/Makefile
--- a/sys/modules/i2c/ds1307/Makefile
+++ b/sys/modules/i2c/ds1307/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:		${SRCTOP}/sys/dev/iicbus
+.PATH:		${SRCTOP}/sys/dev/iicbus/rtc
 KMOD		= ds1307
 SRCS		= ds1307.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h
 
diff --git a/sys/modules/i2c/ds13rtc/Makefile b/sys/modules/i2c/ds13rtc/Makefile
--- a/sys/modules/i2c/ds13rtc/Makefile
+++ b/sys/modules/i2c/ds13rtc/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:		${SRCTOP}/sys/dev/iicbus
+.PATH:		${SRCTOP}/sys/dev/iicbus/rtc
 KMOD		= ds13rtc
 SRCS		= ds13rtc.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h
 
diff --git a/sys/modules/i2c/ds1672/Makefile b/sys/modules/i2c/ds1672/Makefile
--- a/sys/modules/i2c/ds1672/Makefile
+++ b/sys/modules/i2c/ds1672/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:	${SRCTOP}/sys/dev/iicbus
+.PATH:	${SRCTOP}/sys/dev/iicbus/rtc
 KMOD	= ds1672
 SRCS	= ds1672.c 
 
diff --git a/sys/modules/i2c/ds3231/Makefile b/sys/modules/i2c/ds3231/Makefile
--- a/sys/modules/i2c/ds3231/Makefile
+++ b/sys/modules/i2c/ds3231/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:		${SRCTOP}/sys/dev/iicbus
+.PATH:		${SRCTOP}/sys/dev/iicbus/rtc
 KMOD		= ds3231
 SRCS		= ds3231.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h
 
diff --git a/sys/modules/i2c/isl12xx/Makefile b/sys/modules/i2c/isl12xx/Makefile
--- a/sys/modules/i2c/isl12xx/Makefile
+++ b/sys/modules/i2c/isl12xx/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:		${SRCTOP}/sys/dev/iicbus
+.PATH:		${SRCTOP}/sys/dev/iicbus/rtc
 KMOD		= isl12xx
 SRCS		= isl12xx.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h
 
diff --git a/sys/modules/i2c/nxprtc/Makefile b/sys/modules/i2c/nxprtc/Makefile
--- a/sys/modules/i2c/nxprtc/Makefile
+++ b/sys/modules/i2c/nxprtc/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:		${SRCTOP}/sys/dev/iicbus
+.PATH:		${SRCTOP}/sys/dev/iicbus/rtc
 KMOD		= nxprtc
 SRCS		= nxprtc.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h
 
diff --git a/sys/modules/i2c/rtc8583/Makefile b/sys/modules/i2c/rtc8583/Makefile
--- a/sys/modules/i2c/rtc8583/Makefile
+++ b/sys/modules/i2c/rtc8583/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:	${SRCTOP}/sys/dev/iicbus
+.PATH:	${SRCTOP}/sys/dev/iicbus/rtc
 KMOD	= rtc8583
 SRCS	= rtc8583.c 
 
diff --git a/sys/modules/i2c/s35390a/Makefile b/sys/modules/i2c/s35390a/Makefile
--- a/sys/modules/i2c/s35390a/Makefile
+++ b/sys/modules/i2c/s35390a/Makefile
@@ -1,5 +1,5 @@
 
-.PATH:		${SRCTOP}/sys/dev/iicbus
+.PATH:		${SRCTOP}/sys/dev/iicbus/rtc
 KMOD		= s35390a
 SRCS		= s35390a.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h