diff --git a/sys/conf/files b/sys/conf/files
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1804,12 +1804,12 @@
 dev/iicbus/iiconf.c		optional iicbus | compat_linuxkpi
 dev/iicbus/iicsmb.c		optional iicsmb				\
 	dependency	"iicbus_if.h"
-dev/iicbus/iicoc.c		optional iicoc
-dev/iicbus/iicoc_fdt.c		optional iicoc fdt
-dev/iicbus/iicoc_pci.c		optional iicoc pci
 dev/iicbus/adc/ad7418.c		optional ad7418
 dev/iicbus/adc/ads111x.c	optional ads111x
 dev/iicbus/adc/pcf8591.c	optional pcf8591
+dev/iicbus/controller/opencores/iicoc.c	optional iicoc
+dev/iicbus/controller/opencores/iicoc_fdt.c	optional iicoc fdt
+dev/iicbus/controller/opencores/iicoc_pci.c	optional iicoc pci
 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
diff --git a/sys/dev/iicbus/iicoc.h b/sys/dev/iicbus/controller/opencores/iicoc.h
rename from sys/dev/iicbus/iicoc.h
rename to sys/dev/iicbus/controller/opencores/iicoc.h
diff --git a/sys/dev/iicbus/iicoc.c b/sys/dev/iicbus/controller/opencores/iicoc.c
rename from sys/dev/iicbus/iicoc.c
rename to sys/dev/iicbus/controller/opencores/iicoc.c
diff --git a/sys/dev/iicbus/iicoc_fdt.c b/sys/dev/iicbus/controller/opencores/iicoc_fdt.c
rename from sys/dev/iicbus/iicoc_fdt.c
rename to sys/dev/iicbus/controller/opencores/iicoc_fdt.c
diff --git a/sys/dev/iicbus/iicoc_pci.c b/sys/dev/iicbus/controller/opencores/iicoc_pci.c
rename from sys/dev/iicbus/iicoc_pci.c
rename to sys/dev/iicbus/controller/opencores/iicoc_pci.c
diff --git a/sys/modules/i2c/controllers/iicoc/Makefile b/sys/modules/i2c/controllers/iicoc/Makefile
--- a/sys/modules/i2c/controllers/iicoc/Makefile
+++ b/sys/modules/i2c/controllers/iicoc/Makefile
@@ -1,4 +1,4 @@
-.PATH:		${SRCTOP}/sys/dev/iicbus
+.PATH:		${SRCTOP}/sys/dev/iicbus/controller/opencores
 
 KMOD		= iicoc
 SRCS		= device_if.h bus_if.h iicbus_if.h \