diff --git a/Makefile b/Makefile
index 3aa48f861e..696bede949 100644
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ export MAINBOARDDIR
 PLATFORM-y += src/arch/$(ARCHDIR-y) src/cpu src/mainboard/$(MAINBOARDDIR)
 TARGETS-y :=
 
-BUILD-y := src/lib src/boot src/console src/devices src/southbridge src/northbridge src/superio src/drivers util/x86emu
+BUILD-y := src/lib src/boot src/console src/devices src/southbridge src/northbridge src/superio src/drivers
 BUILD-y += util/cbfstool
 BUILD-$(CONFIG_ARCH_X86) += src/pc80
 
@@ -162,11 +162,9 @@ includemakefiles= \
 	$(if $(strip $(3)), \
 		$(foreach type,$(2), \
 			$(eval $(type)s+= \
-				$$(abspath $$(patsubst util/%, \
-					$(obj)/util/%, \
-					$$(patsubst src/%, \
+				$$(abspath $$(patsubst src/%, \
 						$(obj)/%, \
-						$$(addprefix $(dir $(1)),$$($(type)-y)))))))) \
+						$$(addprefix $(dir $(1)),$$($(type)-y))))))) \
 	$(eval subdirs+=$$(subst $(PWD)/,,$$(abspath $$(addprefix $(dir $(1)),$$(subdirs-y)))))
 
 # For each path in $(subdirs) call includemakefiles, passing $(1) as $(3)
@@ -214,10 +212,6 @@ define create_cc_template
 # $3 .o infix ("" ".initobj", ...)
 # $4 additional compiler flags
 de$(EMPTY)fine $(1)_$(2)_template
-$(obj)/$$(1)%$(3).o: $$(1)%.$(2) $(obj)/config.h
-	printf "    CC         $$$$(subst $$$$(obj)/,,$$$$(@))\n"
-	$(CC) $(4) $$$$(CFLAGS) -c -o $$$$@ $$$$<
-
 $(obj)/$$(1)%$(3).o: src/$$(1)%.$(2) $(obj)/config.h
 	printf "    CC         $$$$(subst $$$$(obj)/,,$$$$(@))\n"
 	$(CC) $(4) $$$$(CFLAGS) -c -o $$$$@ $$$$<
@@ -263,7 +257,7 @@ printcrt0s:
 
 OBJS     := $(patsubst %,$(obj)/%,$(TARGETS-y))
 INCLUDES := -I$(top)/src -I$(top)/src/include -I$(obj) -I$(top)/src/arch/$(ARCHDIR-y)/include 
-INCLUDES += -I$(top)/util/x86emu/include
+INCLUDES += -I$(top)/src/devices/oprom/include
 INCLUDES += -include $(obj)/config.h
 
 CFLAGS = $(INCLUDES) -Os -nostdinc -pipe
diff --git a/src/devices/Makefile.inc b/src/devices/Makefile.inc
index c932691fef..4516401cc3 100644
--- a/src/devices/Makefile.inc
+++ b/src/devices/Makefile.inc
@@ -13,9 +13,9 @@ obj-y += smbus_ops.o
 
 ifeq ($(CONFIG_PCI_ROM_RUN),y)
 obj-y += pci_rom.o
-subdirs-y += ../../util/x86emu
+subdirs-y += oprom
 else
 obj-$(CONFIG_VGA_ROM_RUN) += pci_rom.o
-subdirs-$(CONFIG_VGA_ROM_RUN) += ../../util/x86emu
+subdirs-$(CONFIG_VGA_ROM_RUN) += oprom
 endif
 
diff --git a/util/x86emu/Makefile.inc b/src/devices/oprom/Makefile.inc
similarity index 100%
rename from util/x86emu/Makefile.inc
rename to src/devices/oprom/Makefile.inc
diff --git a/util/x86emu/include/x86emu/fpu_regs.h b/src/devices/oprom/include/x86emu/fpu_regs.h
similarity index 100%
rename from util/x86emu/include/x86emu/fpu_regs.h
rename to src/devices/oprom/include/x86emu/fpu_regs.h
diff --git a/util/x86emu/include/x86emu/regs.h b/src/devices/oprom/include/x86emu/regs.h
similarity index 100%
rename from util/x86emu/include/x86emu/regs.h
rename to src/devices/oprom/include/x86emu/regs.h
diff --git a/util/x86emu/include/x86emu/types.h b/src/devices/oprom/include/x86emu/types.h
similarity index 100%
rename from util/x86emu/include/x86emu/types.h
rename to src/devices/oprom/include/x86emu/types.h
diff --git a/util/x86emu/include/x86emu/x86emu.h b/src/devices/oprom/include/x86emu/x86emu.h
similarity index 100%
rename from util/x86emu/include/x86emu/x86emu.h
rename to src/devices/oprom/include/x86emu/x86emu.h
diff --git a/util/x86emu/x86.c b/src/devices/oprom/x86.c
similarity index 100%
rename from util/x86emu/x86.c
rename to src/devices/oprom/x86.c
diff --git a/util/x86emu/x86_asm.S b/src/devices/oprom/x86_asm.S
similarity index 100%
rename from util/x86emu/x86_asm.S
rename to src/devices/oprom/x86_asm.S
diff --git a/util/x86emu/x86_interrupts.c b/src/devices/oprom/x86_interrupts.c
similarity index 100%
rename from util/x86emu/x86_interrupts.c
rename to src/devices/oprom/x86_interrupts.c
diff --git a/util/x86emu/x86emu/LICENSE b/src/devices/oprom/x86emu/LICENSE
similarity index 100%
rename from util/x86emu/x86emu/LICENSE
rename to src/devices/oprom/x86emu/LICENSE
diff --git a/util/x86emu/x86emu/Makefile.inc b/src/devices/oprom/x86emu/Makefile.inc
similarity index 100%
rename from util/x86emu/x86emu/Makefile.inc
rename to src/devices/oprom/x86emu/Makefile.inc
diff --git a/util/x86emu/x86emu/debug.c b/src/devices/oprom/x86emu/debug.c
similarity index 100%
rename from util/x86emu/x86emu/debug.c
rename to src/devices/oprom/x86emu/debug.c
diff --git a/util/x86emu/x86emu/debug.h b/src/devices/oprom/x86emu/debug.h
similarity index 100%
rename from util/x86emu/x86emu/debug.h
rename to src/devices/oprom/x86emu/debug.h
diff --git a/util/x86emu/x86emu/decode.c b/src/devices/oprom/x86emu/decode.c
similarity index 100%
rename from util/x86emu/x86emu/decode.c
rename to src/devices/oprom/x86emu/decode.c
diff --git a/util/x86emu/x86emu/decode.h b/src/devices/oprom/x86emu/decode.h
similarity index 100%
rename from util/x86emu/x86emu/decode.h
rename to src/devices/oprom/x86emu/decode.h
diff --git a/util/x86emu/x86emu/fpu.c b/src/devices/oprom/x86emu/fpu.c
similarity index 100%
rename from util/x86emu/x86emu/fpu.c
rename to src/devices/oprom/x86emu/fpu.c
diff --git a/util/x86emu/x86emu/fpu.h b/src/devices/oprom/x86emu/fpu.h
similarity index 100%
rename from util/x86emu/x86emu/fpu.h
rename to src/devices/oprom/x86emu/fpu.h
diff --git a/util/x86emu/x86emu/ops.c b/src/devices/oprom/x86emu/ops.c
similarity index 100%
rename from util/x86emu/x86emu/ops.c
rename to src/devices/oprom/x86emu/ops.c
diff --git a/util/x86emu/x86emu/ops.h b/src/devices/oprom/x86emu/ops.h
similarity index 100%
rename from util/x86emu/x86emu/ops.h
rename to src/devices/oprom/x86emu/ops.h
diff --git a/util/x86emu/x86emu/ops2.c b/src/devices/oprom/x86emu/ops2.c
similarity index 100%
rename from util/x86emu/x86emu/ops2.c
rename to src/devices/oprom/x86emu/ops2.c
diff --git a/util/x86emu/x86emu/prim_asm.h b/src/devices/oprom/x86emu/prim_asm.h
similarity index 100%
rename from util/x86emu/x86emu/prim_asm.h
rename to src/devices/oprom/x86emu/prim_asm.h
diff --git a/util/x86emu/x86emu/prim_ops.c b/src/devices/oprom/x86emu/prim_ops.c
similarity index 100%
rename from util/x86emu/x86emu/prim_ops.c
rename to src/devices/oprom/x86emu/prim_ops.c
diff --git a/util/x86emu/x86emu/prim_ops.h b/src/devices/oprom/x86emu/prim_ops.h
similarity index 100%
rename from util/x86emu/x86emu/prim_ops.h
rename to src/devices/oprom/x86emu/prim_ops.h
diff --git a/util/x86emu/x86emu/sys.c b/src/devices/oprom/x86emu/sys.c
similarity index 100%
rename from util/x86emu/x86emu/sys.c
rename to src/devices/oprom/x86emu/sys.c
diff --git a/util/x86emu/x86emu/x86emui.h b/src/devices/oprom/x86emu/x86emui.h
similarity index 100%
rename from util/x86emu/x86emu/x86emui.h
rename to src/devices/oprom/x86emu/x86emui.h
diff --git a/util/x86emu/yabel/Makefile.inc b/src/devices/oprom/yabel/Makefile.inc
similarity index 100%
rename from util/x86emu/yabel/Makefile.inc
rename to src/devices/oprom/yabel/Makefile.inc
diff --git a/util/x86emu/yabel/biosemu.c b/src/devices/oprom/yabel/biosemu.c
similarity index 100%
rename from util/x86emu/yabel/biosemu.c
rename to src/devices/oprom/yabel/biosemu.c
diff --git a/util/x86emu/yabel/biosemu.h b/src/devices/oprom/yabel/biosemu.h
similarity index 100%
rename from util/x86emu/yabel/biosemu.h
rename to src/devices/oprom/yabel/biosemu.h
diff --git a/util/x86emu/yabel/compat/Makefile.inc b/src/devices/oprom/yabel/compat/Makefile.inc
similarity index 100%
rename from util/x86emu/yabel/compat/Makefile.inc
rename to src/devices/oprom/yabel/compat/Makefile.inc
diff --git a/util/x86emu/yabel/compat/functions.c b/src/devices/oprom/yabel/compat/functions.c
similarity index 100%
rename from util/x86emu/yabel/compat/functions.c
rename to src/devices/oprom/yabel/compat/functions.c
diff --git a/util/x86emu/yabel/compat/of.h b/src/devices/oprom/yabel/compat/of.h
similarity index 100%
rename from util/x86emu/yabel/compat/of.h
rename to src/devices/oprom/yabel/compat/of.h
diff --git a/util/x86emu/yabel/compat/rtas.h b/src/devices/oprom/yabel/compat/rtas.h
similarity index 100%
rename from util/x86emu/yabel/compat/rtas.h
rename to src/devices/oprom/yabel/compat/rtas.h
diff --git a/util/x86emu/yabel/compat/time.h b/src/devices/oprom/yabel/compat/time.h
similarity index 100%
rename from util/x86emu/yabel/compat/time.h
rename to src/devices/oprom/yabel/compat/time.h
diff --git a/util/x86emu/yabel/debug.c b/src/devices/oprom/yabel/debug.c
similarity index 100%
rename from util/x86emu/yabel/debug.c
rename to src/devices/oprom/yabel/debug.c
diff --git a/util/x86emu/yabel/debug.h b/src/devices/oprom/yabel/debug.h
similarity index 100%
rename from util/x86emu/yabel/debug.h
rename to src/devices/oprom/yabel/debug.h
diff --git a/util/x86emu/yabel/device.c b/src/devices/oprom/yabel/device.c
similarity index 100%
rename from util/x86emu/yabel/device.c
rename to src/devices/oprom/yabel/device.c
diff --git a/util/x86emu/yabel/device.h b/src/devices/oprom/yabel/device.h
similarity index 100%
rename from util/x86emu/yabel/device.h
rename to src/devices/oprom/yabel/device.h
diff --git a/util/x86emu/yabel/interrupt.c b/src/devices/oprom/yabel/interrupt.c
similarity index 100%
rename from util/x86emu/yabel/interrupt.c
rename to src/devices/oprom/yabel/interrupt.c
diff --git a/util/x86emu/yabel/interrupt.h b/src/devices/oprom/yabel/interrupt.h
similarity index 100%
rename from util/x86emu/yabel/interrupt.h
rename to src/devices/oprom/yabel/interrupt.h
diff --git a/util/x86emu/yabel/io.c b/src/devices/oprom/yabel/io.c
similarity index 100%
rename from util/x86emu/yabel/io.c
rename to src/devices/oprom/yabel/io.c
diff --git a/util/x86emu/yabel/io.h b/src/devices/oprom/yabel/io.h
similarity index 100%
rename from util/x86emu/yabel/io.h
rename to src/devices/oprom/yabel/io.h
diff --git a/util/x86emu/yabel/mem.c b/src/devices/oprom/yabel/mem.c
similarity index 100%
rename from util/x86emu/yabel/mem.c
rename to src/devices/oprom/yabel/mem.c
diff --git a/util/x86emu/yabel/mem.h b/src/devices/oprom/yabel/mem.h
similarity index 100%
rename from util/x86emu/yabel/mem.h
rename to src/devices/oprom/yabel/mem.h
diff --git a/util/x86emu/yabel/pmm.c b/src/devices/oprom/yabel/pmm.c
similarity index 100%
rename from util/x86emu/yabel/pmm.c
rename to src/devices/oprom/yabel/pmm.c
diff --git a/util/x86emu/yabel/pmm.h b/src/devices/oprom/yabel/pmm.h
similarity index 100%
rename from util/x86emu/yabel/pmm.h
rename to src/devices/oprom/yabel/pmm.h
diff --git a/util/x86emu/yabel/vbe.c b/src/devices/oprom/yabel/vbe.c
similarity index 100%
rename from util/x86emu/yabel/vbe.c
rename to src/devices/oprom/yabel/vbe.c
diff --git a/util/x86emu/yabel/vbe.h b/src/devices/oprom/yabel/vbe.h
similarity index 100%
rename from util/x86emu/yabel/vbe.h
rename to src/devices/oprom/yabel/vbe.h