diff --git a/src/emu/bus/a1bus/a1bus.c b/src/devices/bus/a1bus/a1bus.c
similarity index 100%
rename from src/emu/bus/a1bus/a1bus.c
rename to src/devices/bus/a1bus/a1bus.c
diff --git a/src/emu/bus/a1bus/a1bus.h b/src/devices/bus/a1bus/a1bus.h
similarity index 100%
rename from src/emu/bus/a1bus/a1bus.h
rename to src/devices/bus/a1bus/a1bus.h
diff --git a/src/emu/bus/a1bus/a1cassette.c b/src/devices/bus/a1bus/a1cassette.c
similarity index 100%
rename from src/emu/bus/a1bus/a1cassette.c
rename to src/devices/bus/a1bus/a1cassette.c
diff --git a/src/emu/bus/a1bus/a1cassette.h b/src/devices/bus/a1bus/a1cassette.h
similarity index 100%
rename from src/emu/bus/a1bus/a1cassette.h
rename to src/devices/bus/a1bus/a1cassette.h
diff --git a/src/emu/bus/a1bus/a1cffa.c b/src/devices/bus/a1bus/a1cffa.c
similarity index 100%
rename from src/emu/bus/a1bus/a1cffa.c
rename to src/devices/bus/a1bus/a1cffa.c
diff --git a/src/emu/bus/a1bus/a1cffa.h b/src/devices/bus/a1bus/a1cffa.h
similarity index 100%
rename from src/emu/bus/a1bus/a1cffa.h
rename to src/devices/bus/a1bus/a1cffa.h
diff --git a/src/emu/bus/a2bus/a2alfam2.c b/src/devices/bus/a2bus/a2alfam2.c
similarity index 100%
rename from src/emu/bus/a2bus/a2alfam2.c
rename to src/devices/bus/a2bus/a2alfam2.c
diff --git a/src/emu/bus/a2bus/a2alfam2.h b/src/devices/bus/a2bus/a2alfam2.h
similarity index 100%
rename from src/emu/bus/a2bus/a2alfam2.h
rename to src/devices/bus/a2bus/a2alfam2.h
diff --git a/src/emu/bus/a2bus/a2applicard.c b/src/devices/bus/a2bus/a2applicard.c
similarity index 100%
rename from src/emu/bus/a2bus/a2applicard.c
rename to src/devices/bus/a2bus/a2applicard.c
diff --git a/src/emu/bus/a2bus/a2applicard.h b/src/devices/bus/a2bus/a2applicard.h
similarity index 100%
rename from src/emu/bus/a2bus/a2applicard.h
rename to src/devices/bus/a2bus/a2applicard.h
diff --git a/src/emu/bus/a2bus/a2arcadebd.c b/src/devices/bus/a2bus/a2arcadebd.c
similarity index 100%
rename from src/emu/bus/a2bus/a2arcadebd.c
rename to src/devices/bus/a2bus/a2arcadebd.c
diff --git a/src/emu/bus/a2bus/a2arcadebd.h b/src/devices/bus/a2bus/a2arcadebd.h
similarity index 100%
rename from src/emu/bus/a2bus/a2arcadebd.h
rename to src/devices/bus/a2bus/a2arcadebd.h
diff --git a/src/emu/bus/a2bus/a2bus.c b/src/devices/bus/a2bus/a2bus.c
similarity index 100%
rename from src/emu/bus/a2bus/a2bus.c
rename to src/devices/bus/a2bus/a2bus.c
diff --git a/src/emu/bus/a2bus/a2bus.h b/src/devices/bus/a2bus/a2bus.h
similarity index 100%
rename from src/emu/bus/a2bus/a2bus.h
rename to src/devices/bus/a2bus/a2bus.h
diff --git a/src/emu/bus/a2bus/a2cffa.c b/src/devices/bus/a2bus/a2cffa.c
similarity index 100%
rename from src/emu/bus/a2bus/a2cffa.c
rename to src/devices/bus/a2bus/a2cffa.c
diff --git a/src/emu/bus/a2bus/a2cffa.h b/src/devices/bus/a2bus/a2cffa.h
similarity index 100%
rename from src/emu/bus/a2bus/a2cffa.h
rename to src/devices/bus/a2bus/a2cffa.h
diff --git a/src/emu/bus/a2bus/a2corvus.c b/src/devices/bus/a2bus/a2corvus.c
similarity index 100%
rename from src/emu/bus/a2bus/a2corvus.c
rename to src/devices/bus/a2bus/a2corvus.c
diff --git a/src/emu/bus/a2bus/a2corvus.h b/src/devices/bus/a2bus/a2corvus.h
similarity index 100%
rename from src/emu/bus/a2bus/a2corvus.h
rename to src/devices/bus/a2bus/a2corvus.h
diff --git a/src/emu/bus/a2bus/a2diskii.c b/src/devices/bus/a2bus/a2diskii.c
similarity index 100%
rename from src/emu/bus/a2bus/a2diskii.c
rename to src/devices/bus/a2bus/a2diskii.c
diff --git a/src/emu/bus/a2bus/a2diskii.h b/src/devices/bus/a2bus/a2diskii.h
similarity index 100%
rename from src/emu/bus/a2bus/a2diskii.h
rename to src/devices/bus/a2bus/a2diskii.h
diff --git a/src/emu/bus/a2bus/a2diskiing.c b/src/devices/bus/a2bus/a2diskiing.c
similarity index 100%
rename from src/emu/bus/a2bus/a2diskiing.c
rename to src/devices/bus/a2bus/a2diskiing.c
diff --git a/src/emu/bus/a2bus/a2diskiing.h b/src/devices/bus/a2bus/a2diskiing.h
similarity index 100%
rename from src/emu/bus/a2bus/a2diskiing.h
rename to src/devices/bus/a2bus/a2diskiing.h
diff --git a/src/emu/bus/a2bus/a2dx1.c b/src/devices/bus/a2bus/a2dx1.c
similarity index 100%
rename from src/emu/bus/a2bus/a2dx1.c
rename to src/devices/bus/a2bus/a2dx1.c
diff --git a/src/emu/bus/a2bus/a2dx1.h b/src/devices/bus/a2bus/a2dx1.h
similarity index 100%
rename from src/emu/bus/a2bus/a2dx1.h
rename to src/devices/bus/a2bus/a2dx1.h
diff --git a/src/emu/bus/a2bus/a2eauxslot.c b/src/devices/bus/a2bus/a2eauxslot.c
similarity index 100%
rename from src/emu/bus/a2bus/a2eauxslot.c
rename to src/devices/bus/a2bus/a2eauxslot.c
diff --git a/src/emu/bus/a2bus/a2eauxslot.h b/src/devices/bus/a2bus/a2eauxslot.h
similarity index 100%
rename from src/emu/bus/a2bus/a2eauxslot.h
rename to src/devices/bus/a2bus/a2eauxslot.h
diff --git a/src/emu/bus/a2bus/a2echoii.c b/src/devices/bus/a2bus/a2echoii.c
similarity index 100%
rename from src/emu/bus/a2bus/a2echoii.c
rename to src/devices/bus/a2bus/a2echoii.c
diff --git a/src/emu/bus/a2bus/a2echoii.h b/src/devices/bus/a2bus/a2echoii.h
similarity index 100%
rename from src/emu/bus/a2bus/a2echoii.h
rename to src/devices/bus/a2bus/a2echoii.h
diff --git a/src/emu/bus/a2bus/a2eext80col.c b/src/devices/bus/a2bus/a2eext80col.c
similarity index 100%
rename from src/emu/bus/a2bus/a2eext80col.c
rename to src/devices/bus/a2bus/a2eext80col.c
diff --git a/src/emu/bus/a2bus/a2eext80col.h b/src/devices/bus/a2bus/a2eext80col.h
similarity index 100%
rename from src/emu/bus/a2bus/a2eext80col.h
rename to src/devices/bus/a2bus/a2eext80col.h
diff --git a/src/emu/bus/a2bus/a2eramworks3.c b/src/devices/bus/a2bus/a2eramworks3.c
similarity index 100%
rename from src/emu/bus/a2bus/a2eramworks3.c
rename to src/devices/bus/a2bus/a2eramworks3.c
diff --git a/src/emu/bus/a2bus/a2eramworks3.h b/src/devices/bus/a2bus/a2eramworks3.h
similarity index 100%
rename from src/emu/bus/a2bus/a2eramworks3.h
rename to src/devices/bus/a2bus/a2eramworks3.h
diff --git a/src/emu/bus/a2bus/a2estd80col.c b/src/devices/bus/a2bus/a2estd80col.c
similarity index 100%
rename from src/emu/bus/a2bus/a2estd80col.c
rename to src/devices/bus/a2bus/a2estd80col.c
diff --git a/src/emu/bus/a2bus/a2estd80col.h b/src/devices/bus/a2bus/a2estd80col.h
similarity index 100%
rename from src/emu/bus/a2bus/a2estd80col.h
rename to src/devices/bus/a2bus/a2estd80col.h
diff --git a/src/emu/bus/a2bus/a2hsscsi.c b/src/devices/bus/a2bus/a2hsscsi.c
similarity index 100%
rename from src/emu/bus/a2bus/a2hsscsi.c
rename to src/devices/bus/a2bus/a2hsscsi.c
diff --git a/src/emu/bus/a2bus/a2hsscsi.h b/src/devices/bus/a2bus/a2hsscsi.h
similarity index 100%
rename from src/emu/bus/a2bus/a2hsscsi.h
rename to src/devices/bus/a2bus/a2hsscsi.h
diff --git a/src/emu/bus/a2bus/a2lang.c b/src/devices/bus/a2bus/a2lang.c
similarity index 100%
rename from src/emu/bus/a2bus/a2lang.c
rename to src/devices/bus/a2bus/a2lang.c
diff --git a/src/emu/bus/a2bus/a2lang.h b/src/devices/bus/a2bus/a2lang.h
similarity index 100%
rename from src/emu/bus/a2bus/a2lang.h
rename to src/devices/bus/a2bus/a2lang.h
diff --git a/src/emu/bus/a2bus/a2mcms.c b/src/devices/bus/a2bus/a2mcms.c
similarity index 100%
rename from src/emu/bus/a2bus/a2mcms.c
rename to src/devices/bus/a2bus/a2mcms.c
diff --git a/src/emu/bus/a2bus/a2mcms.h b/src/devices/bus/a2bus/a2mcms.h
similarity index 100%
rename from src/emu/bus/a2bus/a2mcms.h
rename to src/devices/bus/a2bus/a2mcms.h
diff --git a/src/emu/bus/a2bus/a2memexp.c b/src/devices/bus/a2bus/a2memexp.c
similarity index 100%
rename from src/emu/bus/a2bus/a2memexp.c
rename to src/devices/bus/a2bus/a2memexp.c
diff --git a/src/emu/bus/a2bus/a2memexp.h b/src/devices/bus/a2bus/a2memexp.h
similarity index 100%
rename from src/emu/bus/a2bus/a2memexp.h
rename to src/devices/bus/a2bus/a2memexp.h
diff --git a/src/emu/bus/a2bus/a2midi.c b/src/devices/bus/a2bus/a2midi.c
similarity index 100%
rename from src/emu/bus/a2bus/a2midi.c
rename to src/devices/bus/a2bus/a2midi.c
diff --git a/src/emu/bus/a2bus/a2midi.h b/src/devices/bus/a2bus/a2midi.h
similarity index 100%
rename from src/emu/bus/a2bus/a2midi.h
rename to src/devices/bus/a2bus/a2midi.h
diff --git a/src/emu/bus/a2bus/a2mockingboard.c b/src/devices/bus/a2bus/a2mockingboard.c
similarity index 100%
rename from src/emu/bus/a2bus/a2mockingboard.c
rename to src/devices/bus/a2bus/a2mockingboard.c
diff --git a/src/emu/bus/a2bus/a2mockingboard.h b/src/devices/bus/a2bus/a2mockingboard.h
similarity index 100%
rename from src/emu/bus/a2bus/a2mockingboard.h
rename to src/devices/bus/a2bus/a2mockingboard.h
diff --git a/src/emu/bus/a2bus/a2pic.c b/src/devices/bus/a2bus/a2pic.c
similarity index 100%
rename from src/emu/bus/a2bus/a2pic.c
rename to src/devices/bus/a2bus/a2pic.c
diff --git a/src/emu/bus/a2bus/a2pic.h b/src/devices/bus/a2bus/a2pic.h
similarity index 100%
rename from src/emu/bus/a2bus/a2pic.h
rename to src/devices/bus/a2bus/a2pic.h
diff --git a/src/emu/bus/a2bus/a2sam.c b/src/devices/bus/a2bus/a2sam.c
similarity index 100%
rename from src/emu/bus/a2bus/a2sam.c
rename to src/devices/bus/a2bus/a2sam.c
diff --git a/src/emu/bus/a2bus/a2sam.h b/src/devices/bus/a2bus/a2sam.h
similarity index 100%
rename from src/emu/bus/a2bus/a2sam.h
rename to src/devices/bus/a2bus/a2sam.h
diff --git a/src/emu/bus/a2bus/a2scsi.c b/src/devices/bus/a2bus/a2scsi.c
similarity index 100%
rename from src/emu/bus/a2bus/a2scsi.c
rename to src/devices/bus/a2bus/a2scsi.c
diff --git a/src/emu/bus/a2bus/a2scsi.h b/src/devices/bus/a2bus/a2scsi.h
similarity index 100%
rename from src/emu/bus/a2bus/a2scsi.h
rename to src/devices/bus/a2bus/a2scsi.h
diff --git a/src/emu/bus/a2bus/a2softcard.c b/src/devices/bus/a2bus/a2softcard.c
similarity index 100%
rename from src/emu/bus/a2bus/a2softcard.c
rename to src/devices/bus/a2bus/a2softcard.c
diff --git a/src/emu/bus/a2bus/a2softcard.h b/src/devices/bus/a2bus/a2softcard.h
similarity index 100%
rename from src/emu/bus/a2bus/a2softcard.h
rename to src/devices/bus/a2bus/a2softcard.h
diff --git a/src/emu/bus/a2bus/a2ssc.c b/src/devices/bus/a2bus/a2ssc.c
similarity index 100%
rename from src/emu/bus/a2bus/a2ssc.c
rename to src/devices/bus/a2bus/a2ssc.c
diff --git a/src/emu/bus/a2bus/a2ssc.h b/src/devices/bus/a2bus/a2ssc.h
similarity index 100%
rename from src/emu/bus/a2bus/a2ssc.h
rename to src/devices/bus/a2bus/a2ssc.h
diff --git a/src/emu/bus/a2bus/a2swyft.c b/src/devices/bus/a2bus/a2swyft.c
similarity index 100%
rename from src/emu/bus/a2bus/a2swyft.c
rename to src/devices/bus/a2bus/a2swyft.c
diff --git a/src/emu/bus/a2bus/a2swyft.h b/src/devices/bus/a2bus/a2swyft.h
similarity index 100%
rename from src/emu/bus/a2bus/a2swyft.h
rename to src/devices/bus/a2bus/a2swyft.h
diff --git a/src/emu/bus/a2bus/a2themill.c b/src/devices/bus/a2bus/a2themill.c
similarity index 100%
rename from src/emu/bus/a2bus/a2themill.c
rename to src/devices/bus/a2bus/a2themill.c
diff --git a/src/emu/bus/a2bus/a2themill.h b/src/devices/bus/a2bus/a2themill.h
similarity index 100%
rename from src/emu/bus/a2bus/a2themill.h
rename to src/devices/bus/a2bus/a2themill.h
diff --git a/src/emu/bus/a2bus/a2thunderclock.c b/src/devices/bus/a2bus/a2thunderclock.c
similarity index 100%
rename from src/emu/bus/a2bus/a2thunderclock.c
rename to src/devices/bus/a2bus/a2thunderclock.c
diff --git a/src/emu/bus/a2bus/a2thunderclock.h b/src/devices/bus/a2bus/a2thunderclock.h
similarity index 100%
rename from src/emu/bus/a2bus/a2thunderclock.h
rename to src/devices/bus/a2bus/a2thunderclock.h
diff --git a/src/emu/bus/a2bus/a2ultraterm.c b/src/devices/bus/a2bus/a2ultraterm.c
similarity index 100%
rename from src/emu/bus/a2bus/a2ultraterm.c
rename to src/devices/bus/a2bus/a2ultraterm.c
diff --git a/src/emu/bus/a2bus/a2ultraterm.h b/src/devices/bus/a2bus/a2ultraterm.h
similarity index 100%
rename from src/emu/bus/a2bus/a2ultraterm.h
rename to src/devices/bus/a2bus/a2ultraterm.h
diff --git a/src/emu/bus/a2bus/a2videoterm.c b/src/devices/bus/a2bus/a2videoterm.c
similarity index 100%
rename from src/emu/bus/a2bus/a2videoterm.c
rename to src/devices/bus/a2bus/a2videoterm.c
diff --git a/src/emu/bus/a2bus/a2videoterm.h b/src/devices/bus/a2bus/a2videoterm.h
similarity index 100%
rename from src/emu/bus/a2bus/a2videoterm.h
rename to src/devices/bus/a2bus/a2videoterm.h
diff --git a/src/emu/bus/a2bus/a2vulcan.c b/src/devices/bus/a2bus/a2vulcan.c
similarity index 100%
rename from src/emu/bus/a2bus/a2vulcan.c
rename to src/devices/bus/a2bus/a2vulcan.c
diff --git a/src/emu/bus/a2bus/a2vulcan.h b/src/devices/bus/a2bus/a2vulcan.h
similarity index 100%
rename from src/emu/bus/a2bus/a2vulcan.h
rename to src/devices/bus/a2bus/a2vulcan.h
diff --git a/src/emu/bus/a2bus/a2zipdrive.c b/src/devices/bus/a2bus/a2zipdrive.c
similarity index 100%
rename from src/emu/bus/a2bus/a2zipdrive.c
rename to src/devices/bus/a2bus/a2zipdrive.c
diff --git a/src/emu/bus/a2bus/a2zipdrive.h b/src/devices/bus/a2bus/a2zipdrive.h
similarity index 100%
rename from src/emu/bus/a2bus/a2zipdrive.h
rename to src/devices/bus/a2bus/a2zipdrive.h
diff --git a/src/emu/bus/a2bus/corvfdc01.c b/src/devices/bus/a2bus/corvfdc01.c
similarity index 100%
rename from src/emu/bus/a2bus/corvfdc01.c
rename to src/devices/bus/a2bus/corvfdc01.c
diff --git a/src/emu/bus/a2bus/corvfdc01.h b/src/devices/bus/a2bus/corvfdc01.h
similarity index 100%
rename from src/emu/bus/a2bus/corvfdc01.h
rename to src/devices/bus/a2bus/corvfdc01.h
diff --git a/src/emu/bus/a2bus/corvfdc02.c b/src/devices/bus/a2bus/corvfdc02.c
similarity index 100%
rename from src/emu/bus/a2bus/corvfdc02.c
rename to src/devices/bus/a2bus/corvfdc02.c
diff --git a/src/emu/bus/a2bus/corvfdc02.h b/src/devices/bus/a2bus/corvfdc02.h
similarity index 100%
rename from src/emu/bus/a2bus/corvfdc02.h
rename to src/devices/bus/a2bus/corvfdc02.h
diff --git a/src/emu/bus/a2bus/ezcgi.c b/src/devices/bus/a2bus/ezcgi.c
similarity index 100%
rename from src/emu/bus/a2bus/ezcgi.c
rename to src/devices/bus/a2bus/ezcgi.c
diff --git a/src/emu/bus/a2bus/ezcgi.h b/src/devices/bus/a2bus/ezcgi.h
similarity index 100%
rename from src/emu/bus/a2bus/ezcgi.h
rename to src/devices/bus/a2bus/ezcgi.h
diff --git a/src/emu/bus/a2bus/laser128.c b/src/devices/bus/a2bus/laser128.c
similarity index 100%
rename from src/emu/bus/a2bus/laser128.c
rename to src/devices/bus/a2bus/laser128.c
diff --git a/src/emu/bus/a2bus/laser128.h b/src/devices/bus/a2bus/laser128.h
similarity index 100%
rename from src/emu/bus/a2bus/laser128.h
rename to src/devices/bus/a2bus/laser128.h
diff --git a/src/emu/bus/a2bus/mouse.c b/src/devices/bus/a2bus/mouse.c
similarity index 100%
rename from src/emu/bus/a2bus/mouse.c
rename to src/devices/bus/a2bus/mouse.c
diff --git a/src/emu/bus/a2bus/mouse.h b/src/devices/bus/a2bus/mouse.h
similarity index 100%
rename from src/emu/bus/a2bus/mouse.h
rename to src/devices/bus/a2bus/mouse.h
diff --git a/src/emu/bus/a2bus/ramcard128k.c b/src/devices/bus/a2bus/ramcard128k.c
similarity index 100%
rename from src/emu/bus/a2bus/ramcard128k.c
rename to src/devices/bus/a2bus/ramcard128k.c
diff --git a/src/emu/bus/a2bus/ramcard128k.h b/src/devices/bus/a2bus/ramcard128k.h
similarity index 100%
rename from src/emu/bus/a2bus/ramcard128k.h
rename to src/devices/bus/a2bus/ramcard128k.h
diff --git a/src/emu/bus/a2bus/ramcard16k.c b/src/devices/bus/a2bus/ramcard16k.c
similarity index 100%
rename from src/emu/bus/a2bus/ramcard16k.c
rename to src/devices/bus/a2bus/ramcard16k.c
diff --git a/src/emu/bus/a2bus/ramcard16k.h b/src/devices/bus/a2bus/ramcard16k.h
similarity index 100%
rename from src/emu/bus/a2bus/ramcard16k.h
rename to src/devices/bus/a2bus/ramcard16k.h
diff --git a/src/emu/bus/a2bus/timemasterho.c b/src/devices/bus/a2bus/timemasterho.c
similarity index 100%
rename from src/emu/bus/a2bus/timemasterho.c
rename to src/devices/bus/a2bus/timemasterho.c
diff --git a/src/emu/bus/a2bus/timemasterho.h b/src/devices/bus/a2bus/timemasterho.h
similarity index 100%
rename from src/emu/bus/a2bus/timemasterho.h
rename to src/devices/bus/a2bus/timemasterho.h
diff --git a/src/emu/bus/a7800/a78_carts.h b/src/devices/bus/a7800/a78_carts.h
similarity index 100%
rename from src/emu/bus/a7800/a78_carts.h
rename to src/devices/bus/a7800/a78_carts.h
diff --git a/src/emu/bus/a7800/a78_slot.c b/src/devices/bus/a7800/a78_slot.c
similarity index 100%
rename from src/emu/bus/a7800/a78_slot.c
rename to src/devices/bus/a7800/a78_slot.c
diff --git a/src/emu/bus/a7800/a78_slot.h b/src/devices/bus/a7800/a78_slot.h
similarity index 100%
rename from src/emu/bus/a7800/a78_slot.h
rename to src/devices/bus/a7800/a78_slot.h
diff --git a/src/emu/bus/a7800/cpuwiz.c b/src/devices/bus/a7800/cpuwiz.c
similarity index 100%
rename from src/emu/bus/a7800/cpuwiz.c
rename to src/devices/bus/a7800/cpuwiz.c
diff --git a/src/emu/bus/a7800/cpuwiz.h b/src/devices/bus/a7800/cpuwiz.h
similarity index 100%
rename from src/emu/bus/a7800/cpuwiz.h
rename to src/devices/bus/a7800/cpuwiz.h
diff --git a/src/emu/bus/a7800/hiscore.c b/src/devices/bus/a7800/hiscore.c
similarity index 100%
rename from src/emu/bus/a7800/hiscore.c
rename to src/devices/bus/a7800/hiscore.c
diff --git a/src/emu/bus/a7800/hiscore.h b/src/devices/bus/a7800/hiscore.h
similarity index 100%
rename from src/emu/bus/a7800/hiscore.h
rename to src/devices/bus/a7800/hiscore.h
diff --git a/src/emu/bus/a7800/rom.c b/src/devices/bus/a7800/rom.c
similarity index 100%
rename from src/emu/bus/a7800/rom.c
rename to src/devices/bus/a7800/rom.c
diff --git a/src/emu/bus/a7800/rom.h b/src/devices/bus/a7800/rom.h
similarity index 100%
rename from src/emu/bus/a7800/rom.h
rename to src/devices/bus/a7800/rom.h
diff --git a/src/emu/bus/a7800/xboard.c b/src/devices/bus/a7800/xboard.c
similarity index 100%
rename from src/emu/bus/a7800/xboard.c
rename to src/devices/bus/a7800/xboard.c
diff --git a/src/emu/bus/a7800/xboard.h b/src/devices/bus/a7800/xboard.h
similarity index 100%
rename from src/emu/bus/a7800/xboard.h
rename to src/devices/bus/a7800/xboard.h
diff --git a/src/emu/bus/a800/a800_carts.h b/src/devices/bus/a800/a800_carts.h
similarity index 100%
rename from src/emu/bus/a800/a800_carts.h
rename to src/devices/bus/a800/a800_carts.h
diff --git a/src/emu/bus/a800/a800_slot.c b/src/devices/bus/a800/a800_slot.c
similarity index 100%
rename from src/emu/bus/a800/a800_slot.c
rename to src/devices/bus/a800/a800_slot.c
diff --git a/src/emu/bus/a800/a800_slot.h b/src/devices/bus/a800/a800_slot.h
similarity index 100%
rename from src/emu/bus/a800/a800_slot.h
rename to src/devices/bus/a800/a800_slot.h
diff --git a/src/emu/bus/a800/oss.c b/src/devices/bus/a800/oss.c
similarity index 100%
rename from src/emu/bus/a800/oss.c
rename to src/devices/bus/a800/oss.c
diff --git a/src/emu/bus/a800/oss.h b/src/devices/bus/a800/oss.h
similarity index 100%
rename from src/emu/bus/a800/oss.h
rename to src/devices/bus/a800/oss.h
diff --git a/src/emu/bus/a800/rom.c b/src/devices/bus/a800/rom.c
similarity index 100%
rename from src/emu/bus/a800/rom.c
rename to src/devices/bus/a800/rom.c
diff --git a/src/emu/bus/a800/rom.h b/src/devices/bus/a800/rom.h
similarity index 100%
rename from src/emu/bus/a800/rom.h
rename to src/devices/bus/a800/rom.h
diff --git a/src/emu/bus/a800/sparta.c b/src/devices/bus/a800/sparta.c
similarity index 100%
rename from src/emu/bus/a800/sparta.c
rename to src/devices/bus/a800/sparta.c
diff --git a/src/emu/bus/a800/sparta.h b/src/devices/bus/a800/sparta.h
similarity index 100%
rename from src/emu/bus/a800/sparta.h
rename to src/devices/bus/a800/sparta.h
diff --git a/src/emu/bus/a8sio/a8sio.c b/src/devices/bus/a8sio/a8sio.c
similarity index 100%
rename from src/emu/bus/a8sio/a8sio.c
rename to src/devices/bus/a8sio/a8sio.c
diff --git a/src/emu/bus/a8sio/a8sio.h b/src/devices/bus/a8sio/a8sio.h
similarity index 100%
rename from src/emu/bus/a8sio/a8sio.h
rename to src/devices/bus/a8sio/a8sio.h
diff --git a/src/emu/bus/a8sio/cassette.c b/src/devices/bus/a8sio/cassette.c
similarity index 100%
rename from src/emu/bus/a8sio/cassette.c
rename to src/devices/bus/a8sio/cassette.c
diff --git a/src/emu/bus/a8sio/cassette.h b/src/devices/bus/a8sio/cassette.h
similarity index 100%
rename from src/emu/bus/a8sio/cassette.h
rename to src/devices/bus/a8sio/cassette.h
diff --git a/src/emu/bus/abcbus/abc890.c b/src/devices/bus/abcbus/abc890.c
similarity index 100%
rename from src/emu/bus/abcbus/abc890.c
rename to src/devices/bus/abcbus/abc890.c
diff --git a/src/emu/bus/abcbus/abc890.h b/src/devices/bus/abcbus/abc890.h
similarity index 100%
rename from src/emu/bus/abcbus/abc890.h
rename to src/devices/bus/abcbus/abc890.h
diff --git a/src/emu/bus/abcbus/abcbus.c b/src/devices/bus/abcbus/abcbus.c
similarity index 100%
rename from src/emu/bus/abcbus/abcbus.c
rename to src/devices/bus/abcbus/abcbus.c
diff --git a/src/emu/bus/abcbus/abcbus.h b/src/devices/bus/abcbus/abcbus.h
similarity index 100%
rename from src/emu/bus/abcbus/abcbus.h
rename to src/devices/bus/abcbus/abcbus.h
diff --git a/src/emu/bus/abcbus/fd2.c b/src/devices/bus/abcbus/fd2.c
similarity index 100%
rename from src/emu/bus/abcbus/fd2.c
rename to src/devices/bus/abcbus/fd2.c
diff --git a/src/emu/bus/abcbus/fd2.h b/src/devices/bus/abcbus/fd2.h
similarity index 100%
rename from src/emu/bus/abcbus/fd2.h
rename to src/devices/bus/abcbus/fd2.h
diff --git a/src/emu/bus/abcbus/hdc.c b/src/devices/bus/abcbus/hdc.c
similarity index 100%
rename from src/emu/bus/abcbus/hdc.c
rename to src/devices/bus/abcbus/hdc.c
diff --git a/src/emu/bus/abcbus/hdc.h b/src/devices/bus/abcbus/hdc.h
similarity index 100%
rename from src/emu/bus/abcbus/hdc.h
rename to src/devices/bus/abcbus/hdc.h
diff --git a/src/emu/bus/abcbus/lux10828.c b/src/devices/bus/abcbus/lux10828.c
similarity index 100%
rename from src/emu/bus/abcbus/lux10828.c
rename to src/devices/bus/abcbus/lux10828.c
diff --git a/src/emu/bus/abcbus/lux10828.h b/src/devices/bus/abcbus/lux10828.h
similarity index 100%
rename from src/emu/bus/abcbus/lux10828.h
rename to src/devices/bus/abcbus/lux10828.h
diff --git a/src/emu/bus/abcbus/lux21046.c b/src/devices/bus/abcbus/lux21046.c
similarity index 100%
rename from src/emu/bus/abcbus/lux21046.c
rename to src/devices/bus/abcbus/lux21046.c
diff --git a/src/emu/bus/abcbus/lux21046.h b/src/devices/bus/abcbus/lux21046.h
similarity index 100%
rename from src/emu/bus/abcbus/lux21046.h
rename to src/devices/bus/abcbus/lux21046.h
diff --git a/src/emu/bus/abcbus/lux21056.c b/src/devices/bus/abcbus/lux21056.c
similarity index 100%
rename from src/emu/bus/abcbus/lux21056.c
rename to src/devices/bus/abcbus/lux21056.c
diff --git a/src/emu/bus/abcbus/lux21056.h b/src/devices/bus/abcbus/lux21056.h
similarity index 100%
rename from src/emu/bus/abcbus/lux21056.h
rename to src/devices/bus/abcbus/lux21056.h
diff --git a/src/emu/bus/abcbus/lux4105.c b/src/devices/bus/abcbus/lux4105.c
similarity index 100%
rename from src/emu/bus/abcbus/lux4105.c
rename to src/devices/bus/abcbus/lux4105.c
diff --git a/src/emu/bus/abcbus/lux4105.h b/src/devices/bus/abcbus/lux4105.h
similarity index 100%
rename from src/emu/bus/abcbus/lux4105.h
rename to src/devices/bus/abcbus/lux4105.h
diff --git a/src/emu/bus/abcbus/memcard.c b/src/devices/bus/abcbus/memcard.c
similarity index 100%
rename from src/emu/bus/abcbus/memcard.c
rename to src/devices/bus/abcbus/memcard.c
diff --git a/src/emu/bus/abcbus/memcard.h b/src/devices/bus/abcbus/memcard.h
similarity index 100%
rename from src/emu/bus/abcbus/memcard.h
rename to src/devices/bus/abcbus/memcard.h
diff --git a/src/emu/bus/abcbus/ram.c b/src/devices/bus/abcbus/ram.c
similarity index 100%
rename from src/emu/bus/abcbus/ram.c
rename to src/devices/bus/abcbus/ram.c
diff --git a/src/emu/bus/abcbus/ram.h b/src/devices/bus/abcbus/ram.h
similarity index 100%
rename from src/emu/bus/abcbus/ram.h
rename to src/devices/bus/abcbus/ram.h
diff --git a/src/emu/bus/abcbus/sio.c b/src/devices/bus/abcbus/sio.c
similarity index 100%
rename from src/emu/bus/abcbus/sio.c
rename to src/devices/bus/abcbus/sio.c
diff --git a/src/emu/bus/abcbus/sio.h b/src/devices/bus/abcbus/sio.h
similarity index 100%
rename from src/emu/bus/abcbus/sio.h
rename to src/devices/bus/abcbus/sio.h
diff --git a/src/emu/bus/abcbus/slutprov.c b/src/devices/bus/abcbus/slutprov.c
similarity index 100%
rename from src/emu/bus/abcbus/slutprov.c
rename to src/devices/bus/abcbus/slutprov.c
diff --git a/src/emu/bus/abcbus/slutprov.h b/src/devices/bus/abcbus/slutprov.h
similarity index 100%
rename from src/emu/bus/abcbus/slutprov.h
rename to src/devices/bus/abcbus/slutprov.h
diff --git a/src/emu/bus/abcbus/turbo.c b/src/devices/bus/abcbus/turbo.c
similarity index 100%
rename from src/emu/bus/abcbus/turbo.c
rename to src/devices/bus/abcbus/turbo.c
diff --git a/src/emu/bus/abcbus/turbo.h b/src/devices/bus/abcbus/turbo.h
similarity index 100%
rename from src/emu/bus/abcbus/turbo.h
rename to src/devices/bus/abcbus/turbo.h
diff --git a/src/emu/bus/abcbus/uni800.c b/src/devices/bus/abcbus/uni800.c
similarity index 100%
rename from src/emu/bus/abcbus/uni800.c
rename to src/devices/bus/abcbus/uni800.c
diff --git a/src/emu/bus/abcbus/uni800.h b/src/devices/bus/abcbus/uni800.h
similarity index 100%
rename from src/emu/bus/abcbus/uni800.h
rename to src/devices/bus/abcbus/uni800.h
diff --git a/src/emu/bus/abckb/abc77.c b/src/devices/bus/abckb/abc77.c
similarity index 100%
rename from src/emu/bus/abckb/abc77.c
rename to src/devices/bus/abckb/abc77.c
diff --git a/src/emu/bus/abckb/abc77.h b/src/devices/bus/abckb/abc77.h
similarity index 100%
rename from src/emu/bus/abckb/abc77.h
rename to src/devices/bus/abckb/abc77.h
diff --git a/src/emu/bus/abckb/abc800kb.c b/src/devices/bus/abckb/abc800kb.c
similarity index 100%
rename from src/emu/bus/abckb/abc800kb.c
rename to src/devices/bus/abckb/abc800kb.c
diff --git a/src/emu/bus/abckb/abc800kb.h b/src/devices/bus/abckb/abc800kb.h
similarity index 100%
rename from src/emu/bus/abckb/abc800kb.h
rename to src/devices/bus/abckb/abc800kb.h
diff --git a/src/emu/bus/abckb/abc99.c b/src/devices/bus/abckb/abc99.c
similarity index 100%
rename from src/emu/bus/abckb/abc99.c
rename to src/devices/bus/abckb/abc99.c
diff --git a/src/emu/bus/abckb/abc99.h b/src/devices/bus/abckb/abc99.h
similarity index 100%
rename from src/emu/bus/abckb/abc99.h
rename to src/devices/bus/abckb/abc99.h
diff --git a/src/emu/bus/abckb/abckb.c b/src/devices/bus/abckb/abckb.c
similarity index 100%
rename from src/emu/bus/abckb/abckb.c
rename to src/devices/bus/abckb/abckb.c
diff --git a/src/emu/bus/abckb/abckb.h b/src/devices/bus/abckb/abckb.h
similarity index 100%
rename from src/emu/bus/abckb/abckb.h
rename to src/devices/bus/abckb/abckb.h
diff --git a/src/emu/bus/adam/adamlink.c b/src/devices/bus/adam/adamlink.c
similarity index 100%
rename from src/emu/bus/adam/adamlink.c
rename to src/devices/bus/adam/adamlink.c
diff --git a/src/emu/bus/adam/adamlink.h b/src/devices/bus/adam/adamlink.h
similarity index 100%
rename from src/emu/bus/adam/adamlink.h
rename to src/devices/bus/adam/adamlink.h
diff --git a/src/emu/bus/adam/exp.c b/src/devices/bus/adam/exp.c
similarity index 100%
rename from src/emu/bus/adam/exp.c
rename to src/devices/bus/adam/exp.c
diff --git a/src/emu/bus/adam/exp.h b/src/devices/bus/adam/exp.h
similarity index 100%
rename from src/emu/bus/adam/exp.h
rename to src/devices/bus/adam/exp.h
diff --git a/src/emu/bus/adam/ide.c b/src/devices/bus/adam/ide.c
similarity index 100%
rename from src/emu/bus/adam/ide.c
rename to src/devices/bus/adam/ide.c
diff --git a/src/emu/bus/adam/ide.h b/src/devices/bus/adam/ide.h
similarity index 100%
rename from src/emu/bus/adam/ide.h
rename to src/devices/bus/adam/ide.h
diff --git a/src/emu/bus/adam/ram.c b/src/devices/bus/adam/ram.c
similarity index 100%
rename from src/emu/bus/adam/ram.c
rename to src/devices/bus/adam/ram.c
diff --git a/src/emu/bus/adam/ram.h b/src/devices/bus/adam/ram.h
similarity index 100%
rename from src/emu/bus/adam/ram.h
rename to src/devices/bus/adam/ram.h
diff --git a/src/emu/bus/adamnet/adamnet.c b/src/devices/bus/adamnet/adamnet.c
similarity index 100%
rename from src/emu/bus/adamnet/adamnet.c
rename to src/devices/bus/adamnet/adamnet.c
diff --git a/src/emu/bus/adamnet/adamnet.h b/src/devices/bus/adamnet/adamnet.h
similarity index 100%
rename from src/emu/bus/adamnet/adamnet.h
rename to src/devices/bus/adamnet/adamnet.h
diff --git a/src/emu/bus/adamnet/ddp.c b/src/devices/bus/adamnet/ddp.c
similarity index 100%
rename from src/emu/bus/adamnet/ddp.c
rename to src/devices/bus/adamnet/ddp.c
diff --git a/src/emu/bus/adamnet/ddp.h b/src/devices/bus/adamnet/ddp.h
similarity index 100%
rename from src/emu/bus/adamnet/ddp.h
rename to src/devices/bus/adamnet/ddp.h
diff --git a/src/emu/bus/adamnet/fdc.c b/src/devices/bus/adamnet/fdc.c
similarity index 100%
rename from src/emu/bus/adamnet/fdc.c
rename to src/devices/bus/adamnet/fdc.c
diff --git a/src/emu/bus/adamnet/fdc.h b/src/devices/bus/adamnet/fdc.h
similarity index 100%
rename from src/emu/bus/adamnet/fdc.h
rename to src/devices/bus/adamnet/fdc.h
diff --git a/src/emu/bus/adamnet/kb.c b/src/devices/bus/adamnet/kb.c
similarity index 100%
rename from src/emu/bus/adamnet/kb.c
rename to src/devices/bus/adamnet/kb.c
diff --git a/src/emu/bus/adamnet/kb.h b/src/devices/bus/adamnet/kb.h
similarity index 100%
rename from src/emu/bus/adamnet/kb.h
rename to src/devices/bus/adamnet/kb.h
diff --git a/src/emu/bus/adamnet/printer.c b/src/devices/bus/adamnet/printer.c
similarity index 100%
rename from src/emu/bus/adamnet/printer.c
rename to src/devices/bus/adamnet/printer.c
diff --git a/src/emu/bus/adamnet/printer.h b/src/devices/bus/adamnet/printer.h
similarity index 100%
rename from src/emu/bus/adamnet/printer.h
rename to src/devices/bus/adamnet/printer.h
diff --git a/src/emu/bus/adamnet/spi.c b/src/devices/bus/adamnet/spi.c
similarity index 100%
rename from src/emu/bus/adamnet/spi.c
rename to src/devices/bus/adamnet/spi.c
diff --git a/src/emu/bus/adamnet/spi.h b/src/devices/bus/adamnet/spi.h
similarity index 100%
rename from src/emu/bus/adamnet/spi.h
rename to src/devices/bus/adamnet/spi.h
diff --git a/src/emu/bus/amiga/zorro/a2052.c b/src/devices/bus/amiga/zorro/a2052.c
similarity index 100%
rename from src/emu/bus/amiga/zorro/a2052.c
rename to src/devices/bus/amiga/zorro/a2052.c
diff --git a/src/emu/bus/amiga/zorro/a2052.h b/src/devices/bus/amiga/zorro/a2052.h
similarity index 100%
rename from src/emu/bus/amiga/zorro/a2052.h
rename to src/devices/bus/amiga/zorro/a2052.h
diff --git a/src/emu/bus/amiga/zorro/a2232.c b/src/devices/bus/amiga/zorro/a2232.c
similarity index 100%
rename from src/emu/bus/amiga/zorro/a2232.c
rename to src/devices/bus/amiga/zorro/a2232.c
diff --git a/src/emu/bus/amiga/zorro/a2232.h b/src/devices/bus/amiga/zorro/a2232.h
similarity index 100%
rename from src/emu/bus/amiga/zorro/a2232.h
rename to src/devices/bus/amiga/zorro/a2232.h
diff --git a/src/emu/bus/amiga/zorro/a590.c b/src/devices/bus/amiga/zorro/a590.c
similarity index 100%
rename from src/emu/bus/amiga/zorro/a590.c
rename to src/devices/bus/amiga/zorro/a590.c
diff --git a/src/emu/bus/amiga/zorro/a590.h b/src/devices/bus/amiga/zorro/a590.h
similarity index 100%
rename from src/emu/bus/amiga/zorro/a590.h
rename to src/devices/bus/amiga/zorro/a590.h
diff --git a/src/emu/bus/amiga/zorro/action_replay.c b/src/devices/bus/amiga/zorro/action_replay.c
similarity index 100%
rename from src/emu/bus/amiga/zorro/action_replay.c
rename to src/devices/bus/amiga/zorro/action_replay.c
diff --git a/src/emu/bus/amiga/zorro/action_replay.h b/src/devices/bus/amiga/zorro/action_replay.h
similarity index 100%
rename from src/emu/bus/amiga/zorro/action_replay.h
rename to src/devices/bus/amiga/zorro/action_replay.h
diff --git a/src/emu/bus/amiga/zorro/buddha.c b/src/devices/bus/amiga/zorro/buddha.c
similarity index 100%
rename from src/emu/bus/amiga/zorro/buddha.c
rename to src/devices/bus/amiga/zorro/buddha.c
diff --git a/src/emu/bus/amiga/zorro/buddha.h b/src/devices/bus/amiga/zorro/buddha.h
similarity index 100%
rename from src/emu/bus/amiga/zorro/buddha.h
rename to src/devices/bus/amiga/zorro/buddha.h
diff --git a/src/emu/bus/amiga/zorro/cards.c b/src/devices/bus/amiga/zorro/cards.c
similarity index 100%
rename from src/emu/bus/amiga/zorro/cards.c
rename to src/devices/bus/amiga/zorro/cards.c
diff --git a/src/emu/bus/amiga/zorro/cards.h b/src/devices/bus/amiga/zorro/cards.h
similarity index 100%
rename from src/emu/bus/amiga/zorro/cards.h
rename to src/devices/bus/amiga/zorro/cards.h
diff --git a/src/emu/bus/amiga/zorro/zorro.c b/src/devices/bus/amiga/zorro/zorro.c
similarity index 100%
rename from src/emu/bus/amiga/zorro/zorro.c
rename to src/devices/bus/amiga/zorro/zorro.c
diff --git a/src/emu/bus/amiga/zorro/zorro.h b/src/devices/bus/amiga/zorro/zorro.h
similarity index 100%
rename from src/emu/bus/amiga/zorro/zorro.h
rename to src/devices/bus/amiga/zorro/zorro.h
diff --git a/src/emu/bus/apf/rom.c b/src/devices/bus/apf/rom.c
similarity index 100%
rename from src/emu/bus/apf/rom.c
rename to src/devices/bus/apf/rom.c
diff --git a/src/emu/bus/apf/rom.h b/src/devices/bus/apf/rom.h
similarity index 100%
rename from src/emu/bus/apf/rom.h
rename to src/devices/bus/apf/rom.h
diff --git a/src/emu/bus/apf/slot.c b/src/devices/bus/apf/slot.c
similarity index 100%
rename from src/emu/bus/apf/slot.c
rename to src/devices/bus/apf/slot.c
diff --git a/src/emu/bus/apf/slot.h b/src/devices/bus/apf/slot.h
similarity index 100%
rename from src/emu/bus/apf/slot.h
rename to src/devices/bus/apf/slot.h
diff --git a/src/emu/bus/apricot/cards.c b/src/devices/bus/apricot/cards.c
similarity index 100%
rename from src/emu/bus/apricot/cards.c
rename to src/devices/bus/apricot/cards.c
diff --git a/src/emu/bus/apricot/cards.h b/src/devices/bus/apricot/cards.h
similarity index 100%
rename from src/emu/bus/apricot/cards.h
rename to src/devices/bus/apricot/cards.h
diff --git a/src/emu/bus/apricot/expansion.c b/src/devices/bus/apricot/expansion.c
similarity index 100%
rename from src/emu/bus/apricot/expansion.c
rename to src/devices/bus/apricot/expansion.c
diff --git a/src/emu/bus/apricot/expansion.h b/src/devices/bus/apricot/expansion.h
similarity index 100%
rename from src/emu/bus/apricot/expansion.h
rename to src/devices/bus/apricot/expansion.h
diff --git a/src/emu/bus/apricot/ram.c b/src/devices/bus/apricot/ram.c
similarity index 100%
rename from src/emu/bus/apricot/ram.c
rename to src/devices/bus/apricot/ram.c
diff --git a/src/emu/bus/apricot/ram.h b/src/devices/bus/apricot/ram.h
similarity index 100%
rename from src/emu/bus/apricot/ram.h
rename to src/devices/bus/apricot/ram.h
diff --git a/src/emu/bus/arcadia/rom.c b/src/devices/bus/arcadia/rom.c
similarity index 100%
rename from src/emu/bus/arcadia/rom.c
rename to src/devices/bus/arcadia/rom.c
diff --git a/src/emu/bus/arcadia/rom.h b/src/devices/bus/arcadia/rom.h
similarity index 100%
rename from src/emu/bus/arcadia/rom.h
rename to src/devices/bus/arcadia/rom.h
diff --git a/src/emu/bus/arcadia/slot.c b/src/devices/bus/arcadia/slot.c
similarity index 100%
rename from src/emu/bus/arcadia/slot.c
rename to src/devices/bus/arcadia/slot.c
diff --git a/src/emu/bus/arcadia/slot.h b/src/devices/bus/arcadia/slot.h
similarity index 100%
rename from src/emu/bus/arcadia/slot.h
rename to src/devices/bus/arcadia/slot.h
diff --git a/src/emu/bus/astrocde/exp.c b/src/devices/bus/astrocde/exp.c
similarity index 100%
rename from src/emu/bus/astrocde/exp.c
rename to src/devices/bus/astrocde/exp.c
diff --git a/src/emu/bus/astrocde/exp.h b/src/devices/bus/astrocde/exp.h
similarity index 100%
rename from src/emu/bus/astrocde/exp.h
rename to src/devices/bus/astrocde/exp.h
diff --git a/src/emu/bus/astrocde/ram.c b/src/devices/bus/astrocde/ram.c
similarity index 100%
rename from src/emu/bus/astrocde/ram.c
rename to src/devices/bus/astrocde/ram.c
diff --git a/src/emu/bus/astrocde/ram.h b/src/devices/bus/astrocde/ram.h
similarity index 100%
rename from src/emu/bus/astrocde/ram.h
rename to src/devices/bus/astrocde/ram.h
diff --git a/src/emu/bus/astrocde/rom.c b/src/devices/bus/astrocde/rom.c
similarity index 100%
rename from src/emu/bus/astrocde/rom.c
rename to src/devices/bus/astrocde/rom.c
diff --git a/src/emu/bus/astrocde/rom.h b/src/devices/bus/astrocde/rom.h
similarity index 100%
rename from src/emu/bus/astrocde/rom.h
rename to src/devices/bus/astrocde/rom.h
diff --git a/src/emu/bus/astrocde/slot.c b/src/devices/bus/astrocde/slot.c
similarity index 100%
rename from src/emu/bus/astrocde/slot.c
rename to src/devices/bus/astrocde/slot.c
diff --git a/src/emu/bus/astrocde/slot.h b/src/devices/bus/astrocde/slot.h
similarity index 100%
rename from src/emu/bus/astrocde/slot.h
rename to src/devices/bus/astrocde/slot.h
diff --git a/src/emu/bus/bml3/bml3bus.c b/src/devices/bus/bml3/bml3bus.c
similarity index 100%
rename from src/emu/bus/bml3/bml3bus.c
rename to src/devices/bus/bml3/bml3bus.c
diff --git a/src/emu/bus/bml3/bml3bus.h b/src/devices/bus/bml3/bml3bus.h
similarity index 100%
rename from src/emu/bus/bml3/bml3bus.h
rename to src/devices/bus/bml3/bml3bus.h
diff --git a/src/emu/bus/bml3/bml3kanji.c b/src/devices/bus/bml3/bml3kanji.c
similarity index 100%
rename from src/emu/bus/bml3/bml3kanji.c
rename to src/devices/bus/bml3/bml3kanji.c
diff --git a/src/emu/bus/bml3/bml3kanji.h b/src/devices/bus/bml3/bml3kanji.h
similarity index 100%
rename from src/emu/bus/bml3/bml3kanji.h
rename to src/devices/bus/bml3/bml3kanji.h
diff --git a/src/emu/bus/bml3/bml3mp1802.c b/src/devices/bus/bml3/bml3mp1802.c
similarity index 100%
rename from src/emu/bus/bml3/bml3mp1802.c
rename to src/devices/bus/bml3/bml3mp1802.c
diff --git a/src/emu/bus/bml3/bml3mp1802.h b/src/devices/bus/bml3/bml3mp1802.h
similarity index 100%
rename from src/emu/bus/bml3/bml3mp1802.h
rename to src/devices/bus/bml3/bml3mp1802.h
diff --git a/src/emu/bus/bml3/bml3mp1805.c b/src/devices/bus/bml3/bml3mp1805.c
similarity index 100%
rename from src/emu/bus/bml3/bml3mp1805.c
rename to src/devices/bus/bml3/bml3mp1805.c
diff --git a/src/emu/bus/bml3/bml3mp1805.h b/src/devices/bus/bml3/bml3mp1805.h
similarity index 100%
rename from src/emu/bus/bml3/bml3mp1805.h
rename to src/devices/bus/bml3/bml3mp1805.h
diff --git a/src/emu/bus/bw2/exp.c b/src/devices/bus/bw2/exp.c
similarity index 100%
rename from src/emu/bus/bw2/exp.c
rename to src/devices/bus/bw2/exp.c
diff --git a/src/emu/bus/bw2/exp.h b/src/devices/bus/bw2/exp.h
similarity index 100%
rename from src/emu/bus/bw2/exp.h
rename to src/devices/bus/bw2/exp.h
diff --git a/src/emu/bus/bw2/ramcard.c b/src/devices/bus/bw2/ramcard.c
similarity index 100%
rename from src/emu/bus/bw2/ramcard.c
rename to src/devices/bus/bw2/ramcard.c
diff --git a/src/emu/bus/bw2/ramcard.h b/src/devices/bus/bw2/ramcard.h
similarity index 100%
rename from src/emu/bus/bw2/ramcard.h
rename to src/devices/bus/bw2/ramcard.h
diff --git a/src/emu/bus/c64/16kb.c b/src/devices/bus/c64/16kb.c
similarity index 100%
rename from src/emu/bus/c64/16kb.c
rename to src/devices/bus/c64/16kb.c
diff --git a/src/emu/bus/c64/16kb.h b/src/devices/bus/c64/16kb.h
similarity index 100%
rename from src/emu/bus/c64/16kb.h
rename to src/devices/bus/c64/16kb.h
diff --git a/src/emu/bus/c64/4dxh.c b/src/devices/bus/c64/4dxh.c
similarity index 100%
rename from src/emu/bus/c64/4dxh.c
rename to src/devices/bus/c64/4dxh.c
diff --git a/src/emu/bus/c64/4dxh.h b/src/devices/bus/c64/4dxh.h
similarity index 100%
rename from src/emu/bus/c64/4dxh.h
rename to src/devices/bus/c64/4dxh.h
diff --git a/src/emu/bus/c64/4ksa.c b/src/devices/bus/c64/4ksa.c
similarity index 100%
rename from src/emu/bus/c64/4ksa.c
rename to src/devices/bus/c64/4ksa.c
diff --git a/src/emu/bus/c64/4ksa.h b/src/devices/bus/c64/4ksa.h
similarity index 100%
rename from src/emu/bus/c64/4ksa.h
rename to src/devices/bus/c64/4ksa.h
diff --git a/src/emu/bus/c64/4tba.c b/src/devices/bus/c64/4tba.c
similarity index 100%
rename from src/emu/bus/c64/4tba.c
rename to src/devices/bus/c64/4tba.c
diff --git a/src/emu/bus/c64/4tba.h b/src/devices/bus/c64/4tba.h
similarity index 100%
rename from src/emu/bus/c64/4tba.h
rename to src/devices/bus/c64/4tba.h
diff --git a/src/emu/bus/c64/bn1541.c b/src/devices/bus/c64/bn1541.c
similarity index 100%
rename from src/emu/bus/c64/bn1541.c
rename to src/devices/bus/c64/bn1541.c
diff --git a/src/emu/bus/c64/bn1541.h b/src/devices/bus/c64/bn1541.h
similarity index 100%
rename from src/emu/bus/c64/bn1541.h
rename to src/devices/bus/c64/bn1541.h
diff --git a/src/emu/bus/c64/c128_comal80.c b/src/devices/bus/c64/c128_comal80.c
similarity index 100%
rename from src/emu/bus/c64/c128_comal80.c
rename to src/devices/bus/c64/c128_comal80.c
diff --git a/src/emu/bus/c64/c128_comal80.h b/src/devices/bus/c64/c128_comal80.h
similarity index 100%
rename from src/emu/bus/c64/c128_comal80.h
rename to src/devices/bus/c64/c128_comal80.h
diff --git a/src/emu/bus/c64/c128_partner.c b/src/devices/bus/c64/c128_partner.c
similarity index 100%
rename from src/emu/bus/c64/c128_partner.c
rename to src/devices/bus/c64/c128_partner.c
diff --git a/src/emu/bus/c64/c128_partner.h b/src/devices/bus/c64/c128_partner.h
similarity index 100%
rename from src/emu/bus/c64/c128_partner.h
rename to src/devices/bus/c64/c128_partner.h
diff --git a/src/emu/bus/c64/comal80.c b/src/devices/bus/c64/comal80.c
similarity index 100%
rename from src/emu/bus/c64/comal80.c
rename to src/devices/bus/c64/comal80.c
diff --git a/src/emu/bus/c64/comal80.h b/src/devices/bus/c64/comal80.h
similarity index 100%
rename from src/emu/bus/c64/comal80.h
rename to src/devices/bus/c64/comal80.h
diff --git a/src/emu/bus/c64/cpm.c b/src/devices/bus/c64/cpm.c
similarity index 100%
rename from src/emu/bus/c64/cpm.c
rename to src/devices/bus/c64/cpm.c
diff --git a/src/emu/bus/c64/cpm.h b/src/devices/bus/c64/cpm.h
similarity index 100%
rename from src/emu/bus/c64/cpm.h
rename to src/devices/bus/c64/cpm.h
diff --git a/src/emu/bus/c64/currah_speech.c b/src/devices/bus/c64/currah_speech.c
similarity index 100%
rename from src/emu/bus/c64/currah_speech.c
rename to src/devices/bus/c64/currah_speech.c
diff --git a/src/emu/bus/c64/currah_speech.h b/src/devices/bus/c64/currah_speech.h
similarity index 100%
rename from src/emu/bus/c64/currah_speech.h
rename to src/devices/bus/c64/currah_speech.h
diff --git a/src/emu/bus/c64/dela_ep256.c b/src/devices/bus/c64/dela_ep256.c
similarity index 100%
rename from src/emu/bus/c64/dela_ep256.c
rename to src/devices/bus/c64/dela_ep256.c
diff --git a/src/emu/bus/c64/dela_ep256.h b/src/devices/bus/c64/dela_ep256.h
similarity index 100%
rename from src/emu/bus/c64/dela_ep256.h
rename to src/devices/bus/c64/dela_ep256.h
diff --git a/src/emu/bus/c64/dela_ep64.c b/src/devices/bus/c64/dela_ep64.c
similarity index 100%
rename from src/emu/bus/c64/dela_ep64.c
rename to src/devices/bus/c64/dela_ep64.c
diff --git a/src/emu/bus/c64/dela_ep64.h b/src/devices/bus/c64/dela_ep64.h
similarity index 100%
rename from src/emu/bus/c64/dela_ep64.h
rename to src/devices/bus/c64/dela_ep64.h
diff --git a/src/emu/bus/c64/dela_ep7x8.c b/src/devices/bus/c64/dela_ep7x8.c
similarity index 100%
rename from src/emu/bus/c64/dela_ep7x8.c
rename to src/devices/bus/c64/dela_ep7x8.c
diff --git a/src/emu/bus/c64/dela_ep7x8.h b/src/devices/bus/c64/dela_ep7x8.h
similarity index 100%
rename from src/emu/bus/c64/dela_ep7x8.h
rename to src/devices/bus/c64/dela_ep7x8.h
diff --git a/src/emu/bus/c64/dinamic.c b/src/devices/bus/c64/dinamic.c
similarity index 100%
rename from src/emu/bus/c64/dinamic.c
rename to src/devices/bus/c64/dinamic.c
diff --git a/src/emu/bus/c64/dinamic.h b/src/devices/bus/c64/dinamic.h
similarity index 100%
rename from src/emu/bus/c64/dinamic.h
rename to src/devices/bus/c64/dinamic.h
diff --git a/src/emu/bus/c64/dqbb.c b/src/devices/bus/c64/dqbb.c
similarity index 100%
rename from src/emu/bus/c64/dqbb.c
rename to src/devices/bus/c64/dqbb.c
diff --git a/src/emu/bus/c64/dqbb.h b/src/devices/bus/c64/dqbb.h
similarity index 100%
rename from src/emu/bus/c64/dqbb.h
rename to src/devices/bus/c64/dqbb.h
diff --git a/src/emu/bus/c64/easy_calc_result.c b/src/devices/bus/c64/easy_calc_result.c
similarity index 100%
rename from src/emu/bus/c64/easy_calc_result.c
rename to src/devices/bus/c64/easy_calc_result.c
diff --git a/src/emu/bus/c64/easy_calc_result.h b/src/devices/bus/c64/easy_calc_result.h
similarity index 100%
rename from src/emu/bus/c64/easy_calc_result.h
rename to src/devices/bus/c64/easy_calc_result.h
diff --git a/src/emu/bus/c64/easyflash.c b/src/devices/bus/c64/easyflash.c
similarity index 100%
rename from src/emu/bus/c64/easyflash.c
rename to src/devices/bus/c64/easyflash.c
diff --git a/src/emu/bus/c64/easyflash.h b/src/devices/bus/c64/easyflash.h
similarity index 100%
rename from src/emu/bus/c64/easyflash.h
rename to src/devices/bus/c64/easyflash.h
diff --git a/src/emu/bus/c64/epyx_fast_load.c b/src/devices/bus/c64/epyx_fast_load.c
similarity index 100%
rename from src/emu/bus/c64/epyx_fast_load.c
rename to src/devices/bus/c64/epyx_fast_load.c
diff --git a/src/emu/bus/c64/epyx_fast_load.h b/src/devices/bus/c64/epyx_fast_load.h
similarity index 100%
rename from src/emu/bus/c64/epyx_fast_load.h
rename to src/devices/bus/c64/epyx_fast_load.h
diff --git a/src/emu/bus/c64/exos.c b/src/devices/bus/c64/exos.c
similarity index 100%
rename from src/emu/bus/c64/exos.c
rename to src/devices/bus/c64/exos.c
diff --git a/src/emu/bus/c64/exos.h b/src/devices/bus/c64/exos.h
similarity index 100%
rename from src/emu/bus/c64/exos.h
rename to src/devices/bus/c64/exos.h
diff --git a/src/emu/bus/c64/exp.c b/src/devices/bus/c64/exp.c
similarity index 100%
rename from src/emu/bus/c64/exp.c
rename to src/devices/bus/c64/exp.c
diff --git a/src/emu/bus/c64/exp.h b/src/devices/bus/c64/exp.h
similarity index 100%
rename from src/emu/bus/c64/exp.h
rename to src/devices/bus/c64/exp.h
diff --git a/src/emu/bus/c64/fcc.c b/src/devices/bus/c64/fcc.c
similarity index 100%
rename from src/emu/bus/c64/fcc.c
rename to src/devices/bus/c64/fcc.c
diff --git a/src/emu/bus/c64/fcc.h b/src/devices/bus/c64/fcc.h
similarity index 100%
rename from src/emu/bus/c64/fcc.h
rename to src/devices/bus/c64/fcc.h
diff --git a/src/emu/bus/c64/final.c b/src/devices/bus/c64/final.c
similarity index 100%
rename from src/emu/bus/c64/final.c
rename to src/devices/bus/c64/final.c
diff --git a/src/emu/bus/c64/final.h b/src/devices/bus/c64/final.h
similarity index 100%
rename from src/emu/bus/c64/final.h
rename to src/devices/bus/c64/final.h
diff --git a/src/emu/bus/c64/final3.c b/src/devices/bus/c64/final3.c
similarity index 100%
rename from src/emu/bus/c64/final3.c
rename to src/devices/bus/c64/final3.c
diff --git a/src/emu/bus/c64/final3.h b/src/devices/bus/c64/final3.h
similarity index 100%
rename from src/emu/bus/c64/final3.h
rename to src/devices/bus/c64/final3.h
diff --git a/src/emu/bus/c64/fun_play.c b/src/devices/bus/c64/fun_play.c
similarity index 100%
rename from src/emu/bus/c64/fun_play.c
rename to src/devices/bus/c64/fun_play.c
diff --git a/src/emu/bus/c64/fun_play.h b/src/devices/bus/c64/fun_play.h
similarity index 100%
rename from src/emu/bus/c64/fun_play.h
rename to src/devices/bus/c64/fun_play.h
diff --git a/src/emu/bus/c64/geocable.c b/src/devices/bus/c64/geocable.c
similarity index 100%
rename from src/emu/bus/c64/geocable.c
rename to src/devices/bus/c64/geocable.c
diff --git a/src/emu/bus/c64/geocable.h b/src/devices/bus/c64/geocable.h
similarity index 100%
rename from src/emu/bus/c64/geocable.h
rename to src/devices/bus/c64/geocable.h
diff --git a/src/emu/bus/c64/georam.c b/src/devices/bus/c64/georam.c
similarity index 100%
rename from src/emu/bus/c64/georam.c
rename to src/devices/bus/c64/georam.c
diff --git a/src/emu/bus/c64/georam.h b/src/devices/bus/c64/georam.h
similarity index 100%
rename from src/emu/bus/c64/georam.h
rename to src/devices/bus/c64/georam.h
diff --git a/src/emu/bus/c64/ide64.c b/src/devices/bus/c64/ide64.c
similarity index 100%
rename from src/emu/bus/c64/ide64.c
rename to src/devices/bus/c64/ide64.c
diff --git a/src/emu/bus/c64/ide64.h b/src/devices/bus/c64/ide64.h
similarity index 100%
rename from src/emu/bus/c64/ide64.h
rename to src/devices/bus/c64/ide64.h
diff --git a/src/emu/bus/c64/ieee488.c b/src/devices/bus/c64/ieee488.c
similarity index 100%
rename from src/emu/bus/c64/ieee488.c
rename to src/devices/bus/c64/ieee488.c
diff --git a/src/emu/bus/c64/ieee488.h b/src/devices/bus/c64/ieee488.h
similarity index 100%
rename from src/emu/bus/c64/ieee488.h
rename to src/devices/bus/c64/ieee488.h
diff --git a/src/emu/bus/c64/kingsoft.c b/src/devices/bus/c64/kingsoft.c
similarity index 100%
rename from src/emu/bus/c64/kingsoft.c
rename to src/devices/bus/c64/kingsoft.c
diff --git a/src/emu/bus/c64/kingsoft.h b/src/devices/bus/c64/kingsoft.h
similarity index 100%
rename from src/emu/bus/c64/kingsoft.h
rename to src/devices/bus/c64/kingsoft.h
diff --git a/src/emu/bus/c64/mach5.c b/src/devices/bus/c64/mach5.c
similarity index 100%
rename from src/emu/bus/c64/mach5.c
rename to src/devices/bus/c64/mach5.c
diff --git a/src/emu/bus/c64/mach5.h b/src/devices/bus/c64/mach5.h
similarity index 100%
rename from src/emu/bus/c64/mach5.h
rename to src/devices/bus/c64/mach5.h
diff --git a/src/emu/bus/c64/magic_desk.c b/src/devices/bus/c64/magic_desk.c
similarity index 100%
rename from src/emu/bus/c64/magic_desk.c
rename to src/devices/bus/c64/magic_desk.c
diff --git a/src/emu/bus/c64/magic_desk.h b/src/devices/bus/c64/magic_desk.h
similarity index 100%
rename from src/emu/bus/c64/magic_desk.h
rename to src/devices/bus/c64/magic_desk.h
diff --git a/src/emu/bus/c64/magic_formel.c b/src/devices/bus/c64/magic_formel.c
similarity index 100%
rename from src/emu/bus/c64/magic_formel.c
rename to src/devices/bus/c64/magic_formel.c
diff --git a/src/emu/bus/c64/magic_formel.h b/src/devices/bus/c64/magic_formel.h
similarity index 100%
rename from src/emu/bus/c64/magic_formel.h
rename to src/devices/bus/c64/magic_formel.h
diff --git a/src/emu/bus/c64/magic_voice.c b/src/devices/bus/c64/magic_voice.c
similarity index 100%
rename from src/emu/bus/c64/magic_voice.c
rename to src/devices/bus/c64/magic_voice.c
diff --git a/src/emu/bus/c64/magic_voice.h b/src/devices/bus/c64/magic_voice.h
similarity index 100%
rename from src/emu/bus/c64/magic_voice.h
rename to src/devices/bus/c64/magic_voice.h
diff --git a/src/emu/bus/c64/midi_maplin.c b/src/devices/bus/c64/midi_maplin.c
similarity index 100%
rename from src/emu/bus/c64/midi_maplin.c
rename to src/devices/bus/c64/midi_maplin.c
diff --git a/src/emu/bus/c64/midi_maplin.h b/src/devices/bus/c64/midi_maplin.h
similarity index 100%
rename from src/emu/bus/c64/midi_maplin.h
rename to src/devices/bus/c64/midi_maplin.h
diff --git a/src/emu/bus/c64/midi_namesoft.c b/src/devices/bus/c64/midi_namesoft.c
similarity index 100%
rename from src/emu/bus/c64/midi_namesoft.c
rename to src/devices/bus/c64/midi_namesoft.c
diff --git a/src/emu/bus/c64/midi_namesoft.h b/src/devices/bus/c64/midi_namesoft.h
similarity index 100%
rename from src/emu/bus/c64/midi_namesoft.h
rename to src/devices/bus/c64/midi_namesoft.h
diff --git a/src/emu/bus/c64/midi_passport.c b/src/devices/bus/c64/midi_passport.c
similarity index 100%
rename from src/emu/bus/c64/midi_passport.c
rename to src/devices/bus/c64/midi_passport.c
diff --git a/src/emu/bus/c64/midi_passport.h b/src/devices/bus/c64/midi_passport.h
similarity index 100%
rename from src/emu/bus/c64/midi_passport.h
rename to src/devices/bus/c64/midi_passport.h
diff --git a/src/emu/bus/c64/midi_sci.c b/src/devices/bus/c64/midi_sci.c
similarity index 100%
rename from src/emu/bus/c64/midi_sci.c
rename to src/devices/bus/c64/midi_sci.c
diff --git a/src/emu/bus/c64/midi_sci.h b/src/devices/bus/c64/midi_sci.h
similarity index 100%
rename from src/emu/bus/c64/midi_sci.h
rename to src/devices/bus/c64/midi_sci.h
diff --git a/src/emu/bus/c64/midi_siel.c b/src/devices/bus/c64/midi_siel.c
similarity index 100%
rename from src/emu/bus/c64/midi_siel.c
rename to src/devices/bus/c64/midi_siel.c
diff --git a/src/emu/bus/c64/midi_siel.h b/src/devices/bus/c64/midi_siel.h
similarity index 100%
rename from src/emu/bus/c64/midi_siel.h
rename to src/devices/bus/c64/midi_siel.h
diff --git a/src/emu/bus/c64/mikro_assembler.c b/src/devices/bus/c64/mikro_assembler.c
similarity index 100%
rename from src/emu/bus/c64/mikro_assembler.c
rename to src/devices/bus/c64/mikro_assembler.c
diff --git a/src/emu/bus/c64/mikro_assembler.h b/src/devices/bus/c64/mikro_assembler.h
similarity index 100%
rename from src/emu/bus/c64/mikro_assembler.h
rename to src/devices/bus/c64/mikro_assembler.h
diff --git a/src/emu/bus/c64/multiscreen.c b/src/devices/bus/c64/multiscreen.c
similarity index 100%
rename from src/emu/bus/c64/multiscreen.c
rename to src/devices/bus/c64/multiscreen.c
diff --git a/src/emu/bus/c64/multiscreen.h b/src/devices/bus/c64/multiscreen.h
similarity index 100%
rename from src/emu/bus/c64/multiscreen.h
rename to src/devices/bus/c64/multiscreen.h
diff --git a/src/emu/bus/c64/music64.c b/src/devices/bus/c64/music64.c
similarity index 100%
rename from src/emu/bus/c64/music64.c
rename to src/devices/bus/c64/music64.c
diff --git a/src/emu/bus/c64/music64.h b/src/devices/bus/c64/music64.h
similarity index 100%
rename from src/emu/bus/c64/music64.h
rename to src/devices/bus/c64/music64.h
diff --git a/src/emu/bus/c64/neoram.c b/src/devices/bus/c64/neoram.c
similarity index 100%
rename from src/emu/bus/c64/neoram.c
rename to src/devices/bus/c64/neoram.c
diff --git a/src/emu/bus/c64/neoram.h b/src/devices/bus/c64/neoram.h
similarity index 100%
rename from src/emu/bus/c64/neoram.h
rename to src/devices/bus/c64/neoram.h
diff --git a/src/emu/bus/c64/ocean.c b/src/devices/bus/c64/ocean.c
similarity index 100%
rename from src/emu/bus/c64/ocean.c
rename to src/devices/bus/c64/ocean.c
diff --git a/src/emu/bus/c64/ocean.h b/src/devices/bus/c64/ocean.h
similarity index 100%
rename from src/emu/bus/c64/ocean.h
rename to src/devices/bus/c64/ocean.h
diff --git a/src/emu/bus/c64/pagefox.c b/src/devices/bus/c64/pagefox.c
similarity index 100%
rename from src/emu/bus/c64/pagefox.c
rename to src/devices/bus/c64/pagefox.c
diff --git a/src/emu/bus/c64/pagefox.h b/src/devices/bus/c64/pagefox.h
similarity index 100%
rename from src/emu/bus/c64/pagefox.h
rename to src/devices/bus/c64/pagefox.h
diff --git a/src/emu/bus/c64/partner.c b/src/devices/bus/c64/partner.c
similarity index 100%
rename from src/emu/bus/c64/partner.c
rename to src/devices/bus/c64/partner.c
diff --git a/src/emu/bus/c64/partner.h b/src/devices/bus/c64/partner.h
similarity index 100%
rename from src/emu/bus/c64/partner.h
rename to src/devices/bus/c64/partner.h
diff --git a/src/emu/bus/c64/prophet64.c b/src/devices/bus/c64/prophet64.c
similarity index 100%
rename from src/emu/bus/c64/prophet64.c
rename to src/devices/bus/c64/prophet64.c
diff --git a/src/emu/bus/c64/prophet64.h b/src/devices/bus/c64/prophet64.h
similarity index 100%
rename from src/emu/bus/c64/prophet64.h
rename to src/devices/bus/c64/prophet64.h
diff --git a/src/emu/bus/c64/ps64.c b/src/devices/bus/c64/ps64.c
similarity index 100%
rename from src/emu/bus/c64/ps64.c
rename to src/devices/bus/c64/ps64.c
diff --git a/src/emu/bus/c64/ps64.h b/src/devices/bus/c64/ps64.h
similarity index 100%
rename from src/emu/bus/c64/ps64.h
rename to src/devices/bus/c64/ps64.h
diff --git a/src/emu/bus/c64/reu.c b/src/devices/bus/c64/reu.c
similarity index 100%
rename from src/emu/bus/c64/reu.c
rename to src/devices/bus/c64/reu.c
diff --git a/src/emu/bus/c64/reu.h b/src/devices/bus/c64/reu.h
similarity index 100%
rename from src/emu/bus/c64/reu.h
rename to src/devices/bus/c64/reu.h
diff --git a/src/emu/bus/c64/rex.c b/src/devices/bus/c64/rex.c
similarity index 100%
rename from src/emu/bus/c64/rex.c
rename to src/devices/bus/c64/rex.c
diff --git a/src/emu/bus/c64/rex.h b/src/devices/bus/c64/rex.h
similarity index 100%
rename from src/emu/bus/c64/rex.h
rename to src/devices/bus/c64/rex.h
diff --git a/src/emu/bus/c64/rex_ep256.c b/src/devices/bus/c64/rex_ep256.c
similarity index 100%
rename from src/emu/bus/c64/rex_ep256.c
rename to src/devices/bus/c64/rex_ep256.c
diff --git a/src/emu/bus/c64/rex_ep256.h b/src/devices/bus/c64/rex_ep256.h
similarity index 100%
rename from src/emu/bus/c64/rex_ep256.h
rename to src/devices/bus/c64/rex_ep256.h
diff --git a/src/emu/bus/c64/ross.c b/src/devices/bus/c64/ross.c
similarity index 100%
rename from src/emu/bus/c64/ross.c
rename to src/devices/bus/c64/ross.c
diff --git a/src/emu/bus/c64/ross.h b/src/devices/bus/c64/ross.h
similarity index 100%
rename from src/emu/bus/c64/ross.h
rename to src/devices/bus/c64/ross.h
diff --git a/src/emu/bus/c64/sfx_sound_expander.c b/src/devices/bus/c64/sfx_sound_expander.c
similarity index 100%
rename from src/emu/bus/c64/sfx_sound_expander.c
rename to src/devices/bus/c64/sfx_sound_expander.c
diff --git a/src/emu/bus/c64/sfx_sound_expander.h b/src/devices/bus/c64/sfx_sound_expander.h
similarity index 100%
rename from src/emu/bus/c64/sfx_sound_expander.h
rename to src/devices/bus/c64/sfx_sound_expander.h
diff --git a/src/emu/bus/c64/silverrock.c b/src/devices/bus/c64/silverrock.c
similarity index 100%
rename from src/emu/bus/c64/silverrock.c
rename to src/devices/bus/c64/silverrock.c
diff --git a/src/emu/bus/c64/silverrock.h b/src/devices/bus/c64/silverrock.h
similarity index 100%
rename from src/emu/bus/c64/silverrock.h
rename to src/devices/bus/c64/silverrock.h
diff --git a/src/emu/bus/c64/simons_basic.c b/src/devices/bus/c64/simons_basic.c
similarity index 100%
rename from src/emu/bus/c64/simons_basic.c
rename to src/devices/bus/c64/simons_basic.c
diff --git a/src/emu/bus/c64/simons_basic.h b/src/devices/bus/c64/simons_basic.h
similarity index 100%
rename from src/emu/bus/c64/simons_basic.h
rename to src/devices/bus/c64/simons_basic.h
diff --git a/src/emu/bus/c64/stardos.c b/src/devices/bus/c64/stardos.c
similarity index 100%
rename from src/emu/bus/c64/stardos.c
rename to src/devices/bus/c64/stardos.c
diff --git a/src/emu/bus/c64/stardos.h b/src/devices/bus/c64/stardos.h
similarity index 100%
rename from src/emu/bus/c64/stardos.h
rename to src/devices/bus/c64/stardos.h
diff --git a/src/emu/bus/c64/std.c b/src/devices/bus/c64/std.c
similarity index 100%
rename from src/emu/bus/c64/std.c
rename to src/devices/bus/c64/std.c
diff --git a/src/emu/bus/c64/std.h b/src/devices/bus/c64/std.h
similarity index 100%
rename from src/emu/bus/c64/std.h
rename to src/devices/bus/c64/std.h
diff --git a/src/emu/bus/c64/structured_basic.c b/src/devices/bus/c64/structured_basic.c
similarity index 100%
rename from src/emu/bus/c64/structured_basic.c
rename to src/devices/bus/c64/structured_basic.c
diff --git a/src/emu/bus/c64/structured_basic.h b/src/devices/bus/c64/structured_basic.h
similarity index 100%
rename from src/emu/bus/c64/structured_basic.h
rename to src/devices/bus/c64/structured_basic.h
diff --git a/src/emu/bus/c64/super_explode.c b/src/devices/bus/c64/super_explode.c
similarity index 100%
rename from src/emu/bus/c64/super_explode.c
rename to src/devices/bus/c64/super_explode.c
diff --git a/src/emu/bus/c64/super_explode.h b/src/devices/bus/c64/super_explode.h
similarity index 100%
rename from src/emu/bus/c64/super_explode.h
rename to src/devices/bus/c64/super_explode.h
diff --git a/src/emu/bus/c64/super_games.c b/src/devices/bus/c64/super_games.c
similarity index 100%
rename from src/emu/bus/c64/super_games.c
rename to src/devices/bus/c64/super_games.c
diff --git a/src/emu/bus/c64/super_games.h b/src/devices/bus/c64/super_games.h
similarity index 100%
rename from src/emu/bus/c64/super_games.h
rename to src/devices/bus/c64/super_games.h
diff --git a/src/emu/bus/c64/supercpu.c b/src/devices/bus/c64/supercpu.c
similarity index 100%
rename from src/emu/bus/c64/supercpu.c
rename to src/devices/bus/c64/supercpu.c
diff --git a/src/emu/bus/c64/supercpu.h b/src/devices/bus/c64/supercpu.h
similarity index 100%
rename from src/emu/bus/c64/supercpu.h
rename to src/devices/bus/c64/supercpu.h
diff --git a/src/emu/bus/c64/sw8k.c b/src/devices/bus/c64/sw8k.c
similarity index 100%
rename from src/emu/bus/c64/sw8k.c
rename to src/devices/bus/c64/sw8k.c
diff --git a/src/emu/bus/c64/sw8k.h b/src/devices/bus/c64/sw8k.h
similarity index 100%
rename from src/emu/bus/c64/sw8k.h
rename to src/devices/bus/c64/sw8k.h
diff --git a/src/emu/bus/c64/swiftlink.c b/src/devices/bus/c64/swiftlink.c
similarity index 100%
rename from src/emu/bus/c64/swiftlink.c
rename to src/devices/bus/c64/swiftlink.c
diff --git a/src/emu/bus/c64/swiftlink.h b/src/devices/bus/c64/swiftlink.h
similarity index 100%
rename from src/emu/bus/c64/swiftlink.h
rename to src/devices/bus/c64/swiftlink.h
diff --git a/src/emu/bus/c64/system3.c b/src/devices/bus/c64/system3.c
similarity index 100%
rename from src/emu/bus/c64/system3.c
rename to src/devices/bus/c64/system3.c
diff --git a/src/emu/bus/c64/system3.h b/src/devices/bus/c64/system3.h
similarity index 100%
rename from src/emu/bus/c64/system3.h
rename to src/devices/bus/c64/system3.h
diff --git a/src/emu/bus/c64/tdos.c b/src/devices/bus/c64/tdos.c
similarity index 100%
rename from src/emu/bus/c64/tdos.c
rename to src/devices/bus/c64/tdos.c
diff --git a/src/emu/bus/c64/tdos.h b/src/devices/bus/c64/tdos.h
similarity index 100%
rename from src/emu/bus/c64/tdos.h
rename to src/devices/bus/c64/tdos.h
diff --git a/src/emu/bus/c64/turbo232.c b/src/devices/bus/c64/turbo232.c
similarity index 100%
rename from src/emu/bus/c64/turbo232.c
rename to src/devices/bus/c64/turbo232.c
diff --git a/src/emu/bus/c64/turbo232.h b/src/devices/bus/c64/turbo232.h
similarity index 100%
rename from src/emu/bus/c64/turbo232.h
rename to src/devices/bus/c64/turbo232.h
diff --git a/src/emu/bus/c64/user.c b/src/devices/bus/c64/user.c
similarity index 100%
rename from src/emu/bus/c64/user.c
rename to src/devices/bus/c64/user.c
diff --git a/src/emu/bus/c64/user.h b/src/devices/bus/c64/user.h
similarity index 100%
rename from src/emu/bus/c64/user.h
rename to src/devices/bus/c64/user.h
diff --git a/src/emu/bus/c64/vizastar.c b/src/devices/bus/c64/vizastar.c
similarity index 100%
rename from src/emu/bus/c64/vizastar.c
rename to src/devices/bus/c64/vizastar.c
diff --git a/src/emu/bus/c64/vizastar.h b/src/devices/bus/c64/vizastar.h
similarity index 100%
rename from src/emu/bus/c64/vizastar.h
rename to src/devices/bus/c64/vizastar.h
diff --git a/src/emu/bus/c64/vw64.c b/src/devices/bus/c64/vw64.c
similarity index 100%
rename from src/emu/bus/c64/vw64.c
rename to src/devices/bus/c64/vw64.c
diff --git a/src/emu/bus/c64/vw64.h b/src/devices/bus/c64/vw64.h
similarity index 100%
rename from src/emu/bus/c64/vw64.h
rename to src/devices/bus/c64/vw64.h
diff --git a/src/emu/bus/c64/warp_speed.c b/src/devices/bus/c64/warp_speed.c
similarity index 100%
rename from src/emu/bus/c64/warp_speed.c
rename to src/devices/bus/c64/warp_speed.c
diff --git a/src/emu/bus/c64/warp_speed.h b/src/devices/bus/c64/warp_speed.h
similarity index 100%
rename from src/emu/bus/c64/warp_speed.h
rename to src/devices/bus/c64/warp_speed.h
diff --git a/src/emu/bus/c64/westermann.c b/src/devices/bus/c64/westermann.c
similarity index 100%
rename from src/emu/bus/c64/westermann.c
rename to src/devices/bus/c64/westermann.c
diff --git a/src/emu/bus/c64/westermann.h b/src/devices/bus/c64/westermann.h
similarity index 100%
rename from src/emu/bus/c64/westermann.h
rename to src/devices/bus/c64/westermann.h
diff --git a/src/emu/bus/c64/xl80.c b/src/devices/bus/c64/xl80.c
similarity index 100%
rename from src/emu/bus/c64/xl80.c
rename to src/devices/bus/c64/xl80.c
diff --git a/src/emu/bus/c64/xl80.h b/src/devices/bus/c64/xl80.h
similarity index 100%
rename from src/emu/bus/c64/xl80.h
rename to src/devices/bus/c64/xl80.h
diff --git a/src/emu/bus/c64/zaxxon.c b/src/devices/bus/c64/zaxxon.c
similarity index 100%
rename from src/emu/bus/c64/zaxxon.c
rename to src/devices/bus/c64/zaxxon.c
diff --git a/src/emu/bus/c64/zaxxon.h b/src/devices/bus/c64/zaxxon.h
similarity index 100%
rename from src/emu/bus/c64/zaxxon.h
rename to src/devices/bus/c64/zaxxon.h
diff --git a/src/emu/bus/cbm2/24k.c b/src/devices/bus/cbm2/24k.c
similarity index 100%
rename from src/emu/bus/cbm2/24k.c
rename to src/devices/bus/cbm2/24k.c
diff --git a/src/emu/bus/cbm2/24k.h b/src/devices/bus/cbm2/24k.h
similarity index 100%
rename from src/emu/bus/cbm2/24k.h
rename to src/devices/bus/cbm2/24k.h
diff --git a/src/emu/bus/cbm2/exp.c b/src/devices/bus/cbm2/exp.c
similarity index 100%
rename from src/emu/bus/cbm2/exp.c
rename to src/devices/bus/cbm2/exp.c
diff --git a/src/emu/bus/cbm2/exp.h b/src/devices/bus/cbm2/exp.h
similarity index 100%
rename from src/emu/bus/cbm2/exp.h
rename to src/devices/bus/cbm2/exp.h
diff --git a/src/emu/bus/cbm2/hrg.c b/src/devices/bus/cbm2/hrg.c
similarity index 100%
rename from src/emu/bus/cbm2/hrg.c
rename to src/devices/bus/cbm2/hrg.c
diff --git a/src/emu/bus/cbm2/hrg.h b/src/devices/bus/cbm2/hrg.h
similarity index 100%
rename from src/emu/bus/cbm2/hrg.h
rename to src/devices/bus/cbm2/hrg.h
diff --git a/src/emu/bus/cbm2/std.c b/src/devices/bus/cbm2/std.c
similarity index 100%
rename from src/emu/bus/cbm2/std.c
rename to src/devices/bus/cbm2/std.c
diff --git a/src/emu/bus/cbm2/std.h b/src/devices/bus/cbm2/std.h
similarity index 100%
rename from src/emu/bus/cbm2/std.h
rename to src/devices/bus/cbm2/std.h
diff --git a/src/emu/bus/cbm2/user.c b/src/devices/bus/cbm2/user.c
similarity index 100%
rename from src/emu/bus/cbm2/user.c
rename to src/devices/bus/cbm2/user.c
diff --git a/src/emu/bus/cbm2/user.h b/src/devices/bus/cbm2/user.h
similarity index 100%
rename from src/emu/bus/cbm2/user.h
rename to src/devices/bus/cbm2/user.h
diff --git a/src/emu/bus/cbmiec/c1526.c b/src/devices/bus/cbmiec/c1526.c
similarity index 100%
rename from src/emu/bus/cbmiec/c1526.c
rename to src/devices/bus/cbmiec/c1526.c
diff --git a/src/emu/bus/cbmiec/c1526.h b/src/devices/bus/cbmiec/c1526.h
similarity index 100%
rename from src/emu/bus/cbmiec/c1526.h
rename to src/devices/bus/cbmiec/c1526.h
diff --git a/src/emu/bus/cbmiec/c1541.c b/src/devices/bus/cbmiec/c1541.c
similarity index 100%
rename from src/emu/bus/cbmiec/c1541.c
rename to src/devices/bus/cbmiec/c1541.c
diff --git a/src/emu/bus/cbmiec/c1541.h b/src/devices/bus/cbmiec/c1541.h
similarity index 100%
rename from src/emu/bus/cbmiec/c1541.h
rename to src/devices/bus/cbmiec/c1541.h
diff --git a/src/emu/bus/cbmiec/c1571.c b/src/devices/bus/cbmiec/c1571.c
similarity index 100%
rename from src/emu/bus/cbmiec/c1571.c
rename to src/devices/bus/cbmiec/c1571.c
diff --git a/src/emu/bus/cbmiec/c1571.h b/src/devices/bus/cbmiec/c1571.h
similarity index 100%
rename from src/emu/bus/cbmiec/c1571.h
rename to src/devices/bus/cbmiec/c1571.h
diff --git a/src/emu/bus/cbmiec/c1581.c b/src/devices/bus/cbmiec/c1581.c
similarity index 100%
rename from src/emu/bus/cbmiec/c1581.c
rename to src/devices/bus/cbmiec/c1581.c
diff --git a/src/emu/bus/cbmiec/c1581.h b/src/devices/bus/cbmiec/c1581.h
similarity index 100%
rename from src/emu/bus/cbmiec/c1581.h
rename to src/devices/bus/cbmiec/c1581.h
diff --git a/src/emu/bus/cbmiec/c64_nl10.c b/src/devices/bus/cbmiec/c64_nl10.c
similarity index 100%
rename from src/emu/bus/cbmiec/c64_nl10.c
rename to src/devices/bus/cbmiec/c64_nl10.c
diff --git a/src/emu/bus/cbmiec/c64_nl10.h b/src/devices/bus/cbmiec/c64_nl10.h
similarity index 100%
rename from src/emu/bus/cbmiec/c64_nl10.h
rename to src/devices/bus/cbmiec/c64_nl10.h
diff --git a/src/emu/bus/cbmiec/cbmiec.c b/src/devices/bus/cbmiec/cbmiec.c
similarity index 100%
rename from src/emu/bus/cbmiec/cbmiec.c
rename to src/devices/bus/cbmiec/cbmiec.c
diff --git a/src/emu/bus/cbmiec/cbmiec.h b/src/devices/bus/cbmiec/cbmiec.h
similarity index 100%
rename from src/emu/bus/cbmiec/cbmiec.h
rename to src/devices/bus/cbmiec/cbmiec.h
diff --git a/src/emu/bus/cbmiec/cmdhd.c b/src/devices/bus/cbmiec/cmdhd.c
similarity index 100%
rename from src/emu/bus/cbmiec/cmdhd.c
rename to src/devices/bus/cbmiec/cmdhd.c
diff --git a/src/emu/bus/cbmiec/cmdhd.h b/src/devices/bus/cbmiec/cmdhd.h
similarity index 100%
rename from src/emu/bus/cbmiec/cmdhd.h
rename to src/devices/bus/cbmiec/cmdhd.h
diff --git a/src/emu/bus/cbmiec/diag264_lb_iec.c b/src/devices/bus/cbmiec/diag264_lb_iec.c
similarity index 100%
rename from src/emu/bus/cbmiec/diag264_lb_iec.c
rename to src/devices/bus/cbmiec/diag264_lb_iec.c
diff --git a/src/emu/bus/cbmiec/diag264_lb_iec.h b/src/devices/bus/cbmiec/diag264_lb_iec.h
similarity index 100%
rename from src/emu/bus/cbmiec/diag264_lb_iec.h
rename to src/devices/bus/cbmiec/diag264_lb_iec.h
diff --git a/src/emu/bus/cbmiec/fd2000.c b/src/devices/bus/cbmiec/fd2000.c
similarity index 100%
rename from src/emu/bus/cbmiec/fd2000.c
rename to src/devices/bus/cbmiec/fd2000.c
diff --git a/src/emu/bus/cbmiec/fd2000.h b/src/devices/bus/cbmiec/fd2000.h
similarity index 100%
rename from src/emu/bus/cbmiec/fd2000.h
rename to src/devices/bus/cbmiec/fd2000.h
diff --git a/src/emu/bus/cbmiec/interpod.c b/src/devices/bus/cbmiec/interpod.c
similarity index 100%
rename from src/emu/bus/cbmiec/interpod.c
rename to src/devices/bus/cbmiec/interpod.c
diff --git a/src/emu/bus/cbmiec/interpod.h b/src/devices/bus/cbmiec/interpod.h
similarity index 100%
rename from src/emu/bus/cbmiec/interpod.h
rename to src/devices/bus/cbmiec/interpod.h
diff --git a/src/emu/bus/cbmiec/serialbox.c b/src/devices/bus/cbmiec/serialbox.c
similarity index 100%
rename from src/emu/bus/cbmiec/serialbox.c
rename to src/devices/bus/cbmiec/serialbox.c
diff --git a/src/emu/bus/cbmiec/serialbox.h b/src/devices/bus/cbmiec/serialbox.h
similarity index 100%
rename from src/emu/bus/cbmiec/serialbox.h
rename to src/devices/bus/cbmiec/serialbox.h
diff --git a/src/emu/bus/cbmiec/vic1515.c b/src/devices/bus/cbmiec/vic1515.c
similarity index 100%
rename from src/emu/bus/cbmiec/vic1515.c
rename to src/devices/bus/cbmiec/vic1515.c
diff --git a/src/emu/bus/cbmiec/vic1515.h b/src/devices/bus/cbmiec/vic1515.h
similarity index 100%
rename from src/emu/bus/cbmiec/vic1515.h
rename to src/devices/bus/cbmiec/vic1515.h
diff --git a/src/emu/bus/cbmiec/vic1520.c b/src/devices/bus/cbmiec/vic1520.c
similarity index 100%
rename from src/emu/bus/cbmiec/vic1520.c
rename to src/devices/bus/cbmiec/vic1520.c
diff --git a/src/emu/bus/cbmiec/vic1520.h b/src/devices/bus/cbmiec/vic1520.h
similarity index 100%
rename from src/emu/bus/cbmiec/vic1520.h
rename to src/devices/bus/cbmiec/vic1520.h
diff --git a/src/emu/bus/centronics/comxpl80.c b/src/devices/bus/centronics/comxpl80.c
similarity index 100%
rename from src/emu/bus/centronics/comxpl80.c
rename to src/devices/bus/centronics/comxpl80.c
diff --git a/src/emu/bus/centronics/comxpl80.h b/src/devices/bus/centronics/comxpl80.h
similarity index 100%
rename from src/emu/bus/centronics/comxpl80.h
rename to src/devices/bus/centronics/comxpl80.h
diff --git a/src/emu/bus/centronics/covox.c b/src/devices/bus/centronics/covox.c
similarity index 100%
rename from src/emu/bus/centronics/covox.c
rename to src/devices/bus/centronics/covox.c
diff --git a/src/emu/bus/centronics/covox.h b/src/devices/bus/centronics/covox.h
similarity index 100%
rename from src/emu/bus/centronics/covox.h
rename to src/devices/bus/centronics/covox.h
diff --git a/src/emu/bus/centronics/ctronics.c b/src/devices/bus/centronics/ctronics.c
similarity index 100%
rename from src/emu/bus/centronics/ctronics.c
rename to src/devices/bus/centronics/ctronics.c
diff --git a/src/emu/bus/centronics/ctronics.h b/src/devices/bus/centronics/ctronics.h
similarity index 100%
rename from src/emu/bus/centronics/ctronics.h
rename to src/devices/bus/centronics/ctronics.h
diff --git a/src/emu/bus/centronics/digiblst.c b/src/devices/bus/centronics/digiblst.c
similarity index 100%
rename from src/emu/bus/centronics/digiblst.c
rename to src/devices/bus/centronics/digiblst.c
diff --git a/src/emu/bus/centronics/digiblst.h b/src/devices/bus/centronics/digiblst.h
similarity index 100%
rename from src/emu/bus/centronics/digiblst.h
rename to src/devices/bus/centronics/digiblst.h
diff --git a/src/emu/bus/centronics/dsjoy.c b/src/devices/bus/centronics/dsjoy.c
similarity index 100%
rename from src/emu/bus/centronics/dsjoy.c
rename to src/devices/bus/centronics/dsjoy.c
diff --git a/src/emu/bus/centronics/dsjoy.h b/src/devices/bus/centronics/dsjoy.h
similarity index 100%
rename from src/emu/bus/centronics/dsjoy.h
rename to src/devices/bus/centronics/dsjoy.h
diff --git a/src/emu/bus/centronics/epson_ex800.c b/src/devices/bus/centronics/epson_ex800.c
similarity index 100%
rename from src/emu/bus/centronics/epson_ex800.c
rename to src/devices/bus/centronics/epson_ex800.c
diff --git a/src/emu/bus/centronics/epson_ex800.h b/src/devices/bus/centronics/epson_ex800.h
similarity index 100%
rename from src/emu/bus/centronics/epson_ex800.h
rename to src/devices/bus/centronics/epson_ex800.h
diff --git a/src/emu/bus/centronics/epson_lx800.c b/src/devices/bus/centronics/epson_lx800.c
similarity index 100%
rename from src/emu/bus/centronics/epson_lx800.c
rename to src/devices/bus/centronics/epson_lx800.c
diff --git a/src/emu/bus/centronics/epson_lx800.h b/src/devices/bus/centronics/epson_lx800.h
similarity index 100%
rename from src/emu/bus/centronics/epson_lx800.h
rename to src/devices/bus/centronics/epson_lx800.h
diff --git a/src/emu/bus/centronics/epson_lx810l.c b/src/devices/bus/centronics/epson_lx810l.c
similarity index 100%
rename from src/emu/bus/centronics/epson_lx810l.c
rename to src/devices/bus/centronics/epson_lx810l.c
diff --git a/src/emu/bus/centronics/epson_lx810l.h b/src/devices/bus/centronics/epson_lx810l.h
similarity index 100%
rename from src/emu/bus/centronics/epson_lx810l.h
rename to src/devices/bus/centronics/epson_lx810l.h
diff --git a/src/emu/bus/centronics/printer.c b/src/devices/bus/centronics/printer.c
similarity index 100%
rename from src/emu/bus/centronics/printer.c
rename to src/devices/bus/centronics/printer.c
diff --git a/src/emu/bus/centronics/printer.h b/src/devices/bus/centronics/printer.h
similarity index 100%
rename from src/emu/bus/centronics/printer.h
rename to src/devices/bus/centronics/printer.h
diff --git a/src/emu/bus/cgenie/expansion/carts.c b/src/devices/bus/cgenie/expansion/carts.c
similarity index 100%
rename from src/emu/bus/cgenie/expansion/carts.c
rename to src/devices/bus/cgenie/expansion/carts.c
diff --git a/src/emu/bus/cgenie/expansion/carts.h b/src/devices/bus/cgenie/expansion/carts.h
similarity index 100%
rename from src/emu/bus/cgenie/expansion/carts.h
rename to src/devices/bus/cgenie/expansion/carts.h
diff --git a/src/emu/bus/cgenie/expansion/expansion.c b/src/devices/bus/cgenie/expansion/expansion.c
similarity index 100%
rename from src/emu/bus/cgenie/expansion/expansion.c
rename to src/devices/bus/cgenie/expansion/expansion.c
diff --git a/src/emu/bus/cgenie/expansion/expansion.h b/src/devices/bus/cgenie/expansion/expansion.h
similarity index 100%
rename from src/emu/bus/cgenie/expansion/expansion.h
rename to src/devices/bus/cgenie/expansion/expansion.h
diff --git a/src/emu/bus/cgenie/expansion/floppy.c b/src/devices/bus/cgenie/expansion/floppy.c
similarity index 100%
rename from src/emu/bus/cgenie/expansion/floppy.c
rename to src/devices/bus/cgenie/expansion/floppy.c
diff --git a/src/emu/bus/cgenie/expansion/floppy.h b/src/devices/bus/cgenie/expansion/floppy.h
similarity index 100%
rename from src/emu/bus/cgenie/expansion/floppy.h
rename to src/devices/bus/cgenie/expansion/floppy.h
diff --git a/src/emu/bus/cgenie/parallel/carts.c b/src/devices/bus/cgenie/parallel/carts.c
similarity index 100%
rename from src/emu/bus/cgenie/parallel/carts.c
rename to src/devices/bus/cgenie/parallel/carts.c
diff --git a/src/emu/bus/cgenie/parallel/carts.h b/src/devices/bus/cgenie/parallel/carts.h
similarity index 100%
rename from src/emu/bus/cgenie/parallel/carts.h
rename to src/devices/bus/cgenie/parallel/carts.h
diff --git a/src/emu/bus/cgenie/parallel/joystick.c b/src/devices/bus/cgenie/parallel/joystick.c
similarity index 100%
rename from src/emu/bus/cgenie/parallel/joystick.c
rename to src/devices/bus/cgenie/parallel/joystick.c
diff --git a/src/emu/bus/cgenie/parallel/joystick.h b/src/devices/bus/cgenie/parallel/joystick.h
similarity index 100%
rename from src/emu/bus/cgenie/parallel/joystick.h
rename to src/devices/bus/cgenie/parallel/joystick.h
diff --git a/src/emu/bus/cgenie/parallel/parallel.c b/src/devices/bus/cgenie/parallel/parallel.c
similarity index 100%
rename from src/emu/bus/cgenie/parallel/parallel.c
rename to src/devices/bus/cgenie/parallel/parallel.c
diff --git a/src/emu/bus/cgenie/parallel/parallel.h b/src/devices/bus/cgenie/parallel/parallel.h
similarity index 100%
rename from src/emu/bus/cgenie/parallel/parallel.h
rename to src/devices/bus/cgenie/parallel/parallel.h
diff --git a/src/emu/bus/cgenie/parallel/printer.c b/src/devices/bus/cgenie/parallel/printer.c
similarity index 100%
rename from src/emu/bus/cgenie/parallel/printer.c
rename to src/devices/bus/cgenie/parallel/printer.c
diff --git a/src/emu/bus/cgenie/parallel/printer.h b/src/devices/bus/cgenie/parallel/printer.h
similarity index 100%
rename from src/emu/bus/cgenie/parallel/printer.h
rename to src/devices/bus/cgenie/parallel/printer.h
diff --git a/src/emu/bus/chanf/rom.c b/src/devices/bus/chanf/rom.c
similarity index 100%
rename from src/emu/bus/chanf/rom.c
rename to src/devices/bus/chanf/rom.c
diff --git a/src/emu/bus/chanf/rom.h b/src/devices/bus/chanf/rom.h
similarity index 100%
rename from src/emu/bus/chanf/rom.h
rename to src/devices/bus/chanf/rom.h
diff --git a/src/emu/bus/chanf/slot.c b/src/devices/bus/chanf/slot.c
similarity index 100%
rename from src/emu/bus/chanf/slot.c
rename to src/devices/bus/chanf/slot.c
diff --git a/src/emu/bus/chanf/slot.h b/src/devices/bus/chanf/slot.h
similarity index 100%
rename from src/emu/bus/chanf/slot.h
rename to src/devices/bus/chanf/slot.h
diff --git a/src/emu/bus/coco/coco_232.c b/src/devices/bus/coco/coco_232.c
similarity index 100%
rename from src/emu/bus/coco/coco_232.c
rename to src/devices/bus/coco/coco_232.c
diff --git a/src/emu/bus/coco/coco_232.h b/src/devices/bus/coco/coco_232.h
similarity index 100%
rename from src/emu/bus/coco/coco_232.h
rename to src/devices/bus/coco/coco_232.h
diff --git a/src/emu/bus/coco/coco_dwsock.c b/src/devices/bus/coco/coco_dwsock.c
similarity index 100%
rename from src/emu/bus/coco/coco_dwsock.c
rename to src/devices/bus/coco/coco_dwsock.c
diff --git a/src/emu/bus/coco/coco_dwsock.h b/src/devices/bus/coco/coco_dwsock.h
similarity index 100%
rename from src/emu/bus/coco/coco_dwsock.h
rename to src/devices/bus/coco/coco_dwsock.h
diff --git a/src/emu/bus/coco/coco_fdc.c b/src/devices/bus/coco/coco_fdc.c
similarity index 100%
rename from src/emu/bus/coco/coco_fdc.c
rename to src/devices/bus/coco/coco_fdc.c
diff --git a/src/emu/bus/coco/coco_fdc.h b/src/devices/bus/coco/coco_fdc.h
similarity index 100%
rename from src/emu/bus/coco/coco_fdc.h
rename to src/devices/bus/coco/coco_fdc.h
diff --git a/src/emu/bus/coco/coco_multi.c b/src/devices/bus/coco/coco_multi.c
similarity index 100%
rename from src/emu/bus/coco/coco_multi.c
rename to src/devices/bus/coco/coco_multi.c
diff --git a/src/emu/bus/coco/coco_multi.h b/src/devices/bus/coco/coco_multi.h
similarity index 100%
rename from src/emu/bus/coco/coco_multi.h
rename to src/devices/bus/coco/coco_multi.h
diff --git a/src/emu/bus/coco/coco_orch90.c b/src/devices/bus/coco/coco_orch90.c
similarity index 100%
rename from src/emu/bus/coco/coco_orch90.c
rename to src/devices/bus/coco/coco_orch90.c
diff --git a/src/emu/bus/coco/coco_orch90.h b/src/devices/bus/coco/coco_orch90.h
similarity index 100%
rename from src/emu/bus/coco/coco_orch90.h
rename to src/devices/bus/coco/coco_orch90.h
diff --git a/src/emu/bus/coco/coco_pak.c b/src/devices/bus/coco/coco_pak.c
similarity index 100%
rename from src/emu/bus/coco/coco_pak.c
rename to src/devices/bus/coco/coco_pak.c
diff --git a/src/emu/bus/coco/coco_pak.h b/src/devices/bus/coco/coco_pak.h
similarity index 100%
rename from src/emu/bus/coco/coco_pak.h
rename to src/devices/bus/coco/coco_pak.h
diff --git a/src/emu/bus/coco/cococart.c b/src/devices/bus/coco/cococart.c
similarity index 100%
rename from src/emu/bus/coco/cococart.c
rename to src/devices/bus/coco/cococart.c
diff --git a/src/emu/bus/coco/cococart.h b/src/devices/bus/coco/cococart.h
similarity index 100%
rename from src/emu/bus/coco/cococart.h
rename to src/devices/bus/coco/cococart.h
diff --git a/src/emu/bus/coleco/ctrl.c b/src/devices/bus/coleco/ctrl.c
similarity index 100%
rename from src/emu/bus/coleco/ctrl.c
rename to src/devices/bus/coleco/ctrl.c
diff --git a/src/emu/bus/coleco/ctrl.h b/src/devices/bus/coleco/ctrl.h
similarity index 100%
rename from src/emu/bus/coleco/ctrl.h
rename to src/devices/bus/coleco/ctrl.h
diff --git a/src/emu/bus/coleco/exp.c b/src/devices/bus/coleco/exp.c
similarity index 100%
rename from src/emu/bus/coleco/exp.c
rename to src/devices/bus/coleco/exp.c
diff --git a/src/emu/bus/coleco/exp.h b/src/devices/bus/coleco/exp.h
similarity index 100%
rename from src/emu/bus/coleco/exp.h
rename to src/devices/bus/coleco/exp.h
diff --git a/src/emu/bus/coleco/hand.c b/src/devices/bus/coleco/hand.c
similarity index 100%
rename from src/emu/bus/coleco/hand.c
rename to src/devices/bus/coleco/hand.c
diff --git a/src/emu/bus/coleco/hand.h b/src/devices/bus/coleco/hand.h
similarity index 100%
rename from src/emu/bus/coleco/hand.h
rename to src/devices/bus/coleco/hand.h
diff --git a/src/emu/bus/coleco/sac.c b/src/devices/bus/coleco/sac.c
similarity index 100%
rename from src/emu/bus/coleco/sac.c
rename to src/devices/bus/coleco/sac.c
diff --git a/src/emu/bus/coleco/sac.h b/src/devices/bus/coleco/sac.h
similarity index 100%
rename from src/emu/bus/coleco/sac.h
rename to src/devices/bus/coleco/sac.h
diff --git a/src/emu/bus/coleco/std.c b/src/devices/bus/coleco/std.c
similarity index 100%
rename from src/emu/bus/coleco/std.c
rename to src/devices/bus/coleco/std.c
diff --git a/src/emu/bus/coleco/std.h b/src/devices/bus/coleco/std.h
similarity index 100%
rename from src/emu/bus/coleco/std.h
rename to src/devices/bus/coleco/std.h
diff --git a/src/emu/bus/coleco/xin1.c b/src/devices/bus/coleco/xin1.c
similarity index 100%
rename from src/emu/bus/coleco/xin1.c
rename to src/devices/bus/coleco/xin1.c
diff --git a/src/emu/bus/coleco/xin1.h b/src/devices/bus/coleco/xin1.h
similarity index 100%
rename from src/emu/bus/coleco/xin1.h
rename to src/devices/bus/coleco/xin1.h
diff --git a/src/emu/bus/compucolor/floppy.c b/src/devices/bus/compucolor/floppy.c
similarity index 100%
rename from src/emu/bus/compucolor/floppy.c
rename to src/devices/bus/compucolor/floppy.c
diff --git a/src/emu/bus/compucolor/floppy.h b/src/devices/bus/compucolor/floppy.h
similarity index 100%
rename from src/emu/bus/compucolor/floppy.h
rename to src/devices/bus/compucolor/floppy.h
diff --git a/src/emu/bus/comx35/clm.c b/src/devices/bus/comx35/clm.c
similarity index 100%
rename from src/emu/bus/comx35/clm.c
rename to src/devices/bus/comx35/clm.c
diff --git a/src/emu/bus/comx35/clm.h b/src/devices/bus/comx35/clm.h
similarity index 100%
rename from src/emu/bus/comx35/clm.h
rename to src/devices/bus/comx35/clm.h
diff --git a/src/emu/bus/comx35/eprom.c b/src/devices/bus/comx35/eprom.c
similarity index 100%
rename from src/emu/bus/comx35/eprom.c
rename to src/devices/bus/comx35/eprom.c
diff --git a/src/emu/bus/comx35/eprom.h b/src/devices/bus/comx35/eprom.h
similarity index 100%
rename from src/emu/bus/comx35/eprom.h
rename to src/devices/bus/comx35/eprom.h
diff --git a/src/emu/bus/comx35/exp.c b/src/devices/bus/comx35/exp.c
similarity index 100%
rename from src/emu/bus/comx35/exp.c
rename to src/devices/bus/comx35/exp.c
diff --git a/src/emu/bus/comx35/exp.h b/src/devices/bus/comx35/exp.h
similarity index 100%
rename from src/emu/bus/comx35/exp.h
rename to src/devices/bus/comx35/exp.h
diff --git a/src/emu/bus/comx35/expbox.c b/src/devices/bus/comx35/expbox.c
similarity index 100%
rename from src/emu/bus/comx35/expbox.c
rename to src/devices/bus/comx35/expbox.c
diff --git a/src/emu/bus/comx35/expbox.h b/src/devices/bus/comx35/expbox.h
similarity index 100%
rename from src/emu/bus/comx35/expbox.h
rename to src/devices/bus/comx35/expbox.h
diff --git a/src/emu/bus/comx35/fdc.c b/src/devices/bus/comx35/fdc.c
similarity index 100%
rename from src/emu/bus/comx35/fdc.c
rename to src/devices/bus/comx35/fdc.c
diff --git a/src/emu/bus/comx35/fdc.h b/src/devices/bus/comx35/fdc.h
similarity index 100%
rename from src/emu/bus/comx35/fdc.h
rename to src/devices/bus/comx35/fdc.h
diff --git a/src/emu/bus/comx35/joycard.c b/src/devices/bus/comx35/joycard.c
similarity index 100%
rename from src/emu/bus/comx35/joycard.c
rename to src/devices/bus/comx35/joycard.c
diff --git a/src/emu/bus/comx35/joycard.h b/src/devices/bus/comx35/joycard.h
similarity index 100%
rename from src/emu/bus/comx35/joycard.h
rename to src/devices/bus/comx35/joycard.h
diff --git a/src/emu/bus/comx35/printer.c b/src/devices/bus/comx35/printer.c
similarity index 100%
rename from src/emu/bus/comx35/printer.c
rename to src/devices/bus/comx35/printer.c
diff --git a/src/emu/bus/comx35/printer.h b/src/devices/bus/comx35/printer.h
similarity index 100%
rename from src/emu/bus/comx35/printer.h
rename to src/devices/bus/comx35/printer.h
diff --git a/src/emu/bus/comx35/ram.c b/src/devices/bus/comx35/ram.c
similarity index 100%
rename from src/emu/bus/comx35/ram.c
rename to src/devices/bus/comx35/ram.c
diff --git a/src/emu/bus/comx35/ram.h b/src/devices/bus/comx35/ram.h
similarity index 100%
rename from src/emu/bus/comx35/ram.h
rename to src/devices/bus/comx35/ram.h
diff --git a/src/emu/bus/comx35/thermal.c b/src/devices/bus/comx35/thermal.c
similarity index 100%
rename from src/emu/bus/comx35/thermal.c
rename to src/devices/bus/comx35/thermal.c
diff --git a/src/emu/bus/comx35/thermal.h b/src/devices/bus/comx35/thermal.h
similarity index 100%
rename from src/emu/bus/comx35/thermal.h
rename to src/devices/bus/comx35/thermal.h
diff --git a/src/emu/bus/cpc/amdrum.c b/src/devices/bus/cpc/amdrum.c
similarity index 100%
rename from src/emu/bus/cpc/amdrum.c
rename to src/devices/bus/cpc/amdrum.c
diff --git a/src/emu/bus/cpc/amdrum.h b/src/devices/bus/cpc/amdrum.h
similarity index 100%
rename from src/emu/bus/cpc/amdrum.h
rename to src/devices/bus/cpc/amdrum.h
diff --git a/src/emu/bus/cpc/brunword4.c b/src/devices/bus/cpc/brunword4.c
similarity index 100%
rename from src/emu/bus/cpc/brunword4.c
rename to src/devices/bus/cpc/brunword4.c
diff --git a/src/emu/bus/cpc/brunword4.h b/src/devices/bus/cpc/brunword4.h
similarity index 100%
rename from src/emu/bus/cpc/brunword4.h
rename to src/devices/bus/cpc/brunword4.h
diff --git a/src/emu/bus/cpc/cpc_pds.c b/src/devices/bus/cpc/cpc_pds.c
similarity index 100%
rename from src/emu/bus/cpc/cpc_pds.c
rename to src/devices/bus/cpc/cpc_pds.c
diff --git a/src/emu/bus/cpc/cpc_pds.h b/src/devices/bus/cpc/cpc_pds.h
similarity index 100%
rename from src/emu/bus/cpc/cpc_pds.h
rename to src/devices/bus/cpc/cpc_pds.h
diff --git a/src/emu/bus/cpc/cpc_rom.c b/src/devices/bus/cpc/cpc_rom.c
similarity index 100%
rename from src/emu/bus/cpc/cpc_rom.c
rename to src/devices/bus/cpc/cpc_rom.c
diff --git a/src/emu/bus/cpc/cpc_rom.h b/src/devices/bus/cpc/cpc_rom.h
similarity index 100%
rename from src/emu/bus/cpc/cpc_rom.h
rename to src/devices/bus/cpc/cpc_rom.h
diff --git a/src/emu/bus/cpc/cpc_rs232.c b/src/devices/bus/cpc/cpc_rs232.c
similarity index 100%
rename from src/emu/bus/cpc/cpc_rs232.c
rename to src/devices/bus/cpc/cpc_rs232.c
diff --git a/src/emu/bus/cpc/cpc_rs232.h b/src/devices/bus/cpc/cpc_rs232.h
similarity index 100%
rename from src/emu/bus/cpc/cpc_rs232.h
rename to src/devices/bus/cpc/cpc_rs232.h
diff --git a/src/emu/bus/cpc/cpc_ssa1.c b/src/devices/bus/cpc/cpc_ssa1.c
similarity index 100%
rename from src/emu/bus/cpc/cpc_ssa1.c
rename to src/devices/bus/cpc/cpc_ssa1.c
diff --git a/src/emu/bus/cpc/cpc_ssa1.h b/src/devices/bus/cpc/cpc_ssa1.h
similarity index 100%
rename from src/emu/bus/cpc/cpc_ssa1.h
rename to src/devices/bus/cpc/cpc_ssa1.h
diff --git a/src/emu/bus/cpc/cpcexp.c b/src/devices/bus/cpc/cpcexp.c
similarity index 100%
rename from src/emu/bus/cpc/cpcexp.c
rename to src/devices/bus/cpc/cpcexp.c
diff --git a/src/emu/bus/cpc/cpcexp.h b/src/devices/bus/cpc/cpcexp.h
similarity index 100%
rename from src/emu/bus/cpc/cpcexp.h
rename to src/devices/bus/cpc/cpcexp.h
diff --git a/src/emu/bus/cpc/ddi1.c b/src/devices/bus/cpc/ddi1.c
similarity index 100%
rename from src/emu/bus/cpc/ddi1.c
rename to src/devices/bus/cpc/ddi1.c
diff --git a/src/emu/bus/cpc/ddi1.h b/src/devices/bus/cpc/ddi1.h
similarity index 100%
rename from src/emu/bus/cpc/ddi1.h
rename to src/devices/bus/cpc/ddi1.h
diff --git a/src/emu/bus/cpc/hd20.c b/src/devices/bus/cpc/hd20.c
similarity index 100%
rename from src/emu/bus/cpc/hd20.c
rename to src/devices/bus/cpc/hd20.c
diff --git a/src/emu/bus/cpc/hd20.h b/src/devices/bus/cpc/hd20.h
similarity index 100%
rename from src/emu/bus/cpc/hd20.h
rename to src/devices/bus/cpc/hd20.h
diff --git a/src/emu/bus/cpc/magicsound.c b/src/devices/bus/cpc/magicsound.c
similarity index 100%
rename from src/emu/bus/cpc/magicsound.c
rename to src/devices/bus/cpc/magicsound.c
diff --git a/src/emu/bus/cpc/magicsound.h b/src/devices/bus/cpc/magicsound.h
similarity index 100%
rename from src/emu/bus/cpc/magicsound.h
rename to src/devices/bus/cpc/magicsound.h
diff --git a/src/emu/bus/cpc/mface2.c b/src/devices/bus/cpc/mface2.c
similarity index 100%
rename from src/emu/bus/cpc/mface2.c
rename to src/devices/bus/cpc/mface2.c
diff --git a/src/emu/bus/cpc/mface2.h b/src/devices/bus/cpc/mface2.h
similarity index 100%
rename from src/emu/bus/cpc/mface2.h
rename to src/devices/bus/cpc/mface2.h
diff --git a/src/emu/bus/cpc/playcity.c b/src/devices/bus/cpc/playcity.c
similarity index 100%
rename from src/emu/bus/cpc/playcity.c
rename to src/devices/bus/cpc/playcity.c
diff --git a/src/emu/bus/cpc/playcity.h b/src/devices/bus/cpc/playcity.h
similarity index 100%
rename from src/emu/bus/cpc/playcity.h
rename to src/devices/bus/cpc/playcity.h
diff --git a/src/emu/bus/cpc/smartwatch.c b/src/devices/bus/cpc/smartwatch.c
similarity index 100%
rename from src/emu/bus/cpc/smartwatch.c
rename to src/devices/bus/cpc/smartwatch.c
diff --git a/src/emu/bus/cpc/smartwatch.h b/src/devices/bus/cpc/smartwatch.h
similarity index 100%
rename from src/emu/bus/cpc/smartwatch.h
rename to src/devices/bus/cpc/smartwatch.h
diff --git a/src/emu/bus/cpc/symbfac2.c b/src/devices/bus/cpc/symbfac2.c
similarity index 100%
rename from src/emu/bus/cpc/symbfac2.c
rename to src/devices/bus/cpc/symbfac2.c
diff --git a/src/emu/bus/cpc/symbfac2.h b/src/devices/bus/cpc/symbfac2.h
similarity index 100%
rename from src/emu/bus/cpc/symbfac2.h
rename to src/devices/bus/cpc/symbfac2.h
diff --git a/src/emu/bus/crvision/rom.c b/src/devices/bus/crvision/rom.c
similarity index 100%
rename from src/emu/bus/crvision/rom.c
rename to src/devices/bus/crvision/rom.c
diff --git a/src/emu/bus/crvision/rom.h b/src/devices/bus/crvision/rom.h
similarity index 100%
rename from src/emu/bus/crvision/rom.h
rename to src/devices/bus/crvision/rom.h
diff --git a/src/emu/bus/crvision/slot.c b/src/devices/bus/crvision/slot.c
similarity index 100%
rename from src/emu/bus/crvision/slot.c
rename to src/devices/bus/crvision/slot.c
diff --git a/src/emu/bus/crvision/slot.h b/src/devices/bus/crvision/slot.h
similarity index 100%
rename from src/emu/bus/crvision/slot.h
rename to src/devices/bus/crvision/slot.h
diff --git a/src/emu/bus/dmv/dmvbus.c b/src/devices/bus/dmv/dmvbus.c
similarity index 100%
rename from src/emu/bus/dmv/dmvbus.c
rename to src/devices/bus/dmv/dmvbus.c
diff --git a/src/emu/bus/dmv/dmvbus.h b/src/devices/bus/dmv/dmvbus.h
similarity index 100%
rename from src/emu/bus/dmv/dmvbus.h
rename to src/devices/bus/dmv/dmvbus.h
diff --git a/src/emu/bus/dmv/k210.c b/src/devices/bus/dmv/k210.c
similarity index 100%
rename from src/emu/bus/dmv/k210.c
rename to src/devices/bus/dmv/k210.c
diff --git a/src/emu/bus/dmv/k210.h b/src/devices/bus/dmv/k210.h
similarity index 100%
rename from src/emu/bus/dmv/k210.h
rename to src/devices/bus/dmv/k210.h
diff --git a/src/emu/bus/dmv/k220.c b/src/devices/bus/dmv/k220.c
similarity index 100%
rename from src/emu/bus/dmv/k220.c
rename to src/devices/bus/dmv/k220.c
diff --git a/src/emu/bus/dmv/k220.h b/src/devices/bus/dmv/k220.h
similarity index 100%
rename from src/emu/bus/dmv/k220.h
rename to src/devices/bus/dmv/k220.h
diff --git a/src/emu/bus/dmv/k230.c b/src/devices/bus/dmv/k230.c
similarity index 100%
rename from src/emu/bus/dmv/k230.c
rename to src/devices/bus/dmv/k230.c
diff --git a/src/emu/bus/dmv/k230.h b/src/devices/bus/dmv/k230.h
similarity index 100%
rename from src/emu/bus/dmv/k230.h
rename to src/devices/bus/dmv/k230.h
diff --git a/src/emu/bus/dmv/k233.c b/src/devices/bus/dmv/k233.c
similarity index 100%
rename from src/emu/bus/dmv/k233.c
rename to src/devices/bus/dmv/k233.c
diff --git a/src/emu/bus/dmv/k233.h b/src/devices/bus/dmv/k233.h
similarity index 100%
rename from src/emu/bus/dmv/k233.h
rename to src/devices/bus/dmv/k233.h
diff --git a/src/emu/bus/dmv/k801.c b/src/devices/bus/dmv/k801.c
similarity index 100%
rename from src/emu/bus/dmv/k801.c
rename to src/devices/bus/dmv/k801.c
diff --git a/src/emu/bus/dmv/k801.h b/src/devices/bus/dmv/k801.h
similarity index 100%
rename from src/emu/bus/dmv/k801.h
rename to src/devices/bus/dmv/k801.h
diff --git a/src/emu/bus/dmv/k803.c b/src/devices/bus/dmv/k803.c
similarity index 100%
rename from src/emu/bus/dmv/k803.c
rename to src/devices/bus/dmv/k803.c
diff --git a/src/emu/bus/dmv/k803.h b/src/devices/bus/dmv/k803.h
similarity index 100%
rename from src/emu/bus/dmv/k803.h
rename to src/devices/bus/dmv/k803.h
diff --git a/src/emu/bus/dmv/k806.c b/src/devices/bus/dmv/k806.c
similarity index 100%
rename from src/emu/bus/dmv/k806.c
rename to src/devices/bus/dmv/k806.c
diff --git a/src/emu/bus/dmv/k806.h b/src/devices/bus/dmv/k806.h
similarity index 100%
rename from src/emu/bus/dmv/k806.h
rename to src/devices/bus/dmv/k806.h
diff --git a/src/emu/bus/dmv/ram.c b/src/devices/bus/dmv/ram.c
similarity index 100%
rename from src/emu/bus/dmv/ram.c
rename to src/devices/bus/dmv/ram.c
diff --git a/src/emu/bus/dmv/ram.h b/src/devices/bus/dmv/ram.h
similarity index 100%
rename from src/emu/bus/dmv/ram.h
rename to src/devices/bus/dmv/ram.h
diff --git a/src/emu/bus/ecbbus/ecbbus.c b/src/devices/bus/ecbbus/ecbbus.c
similarity index 100%
rename from src/emu/bus/ecbbus/ecbbus.c
rename to src/devices/bus/ecbbus/ecbbus.c
diff --git a/src/emu/bus/ecbbus/ecbbus.h b/src/devices/bus/ecbbus/ecbbus.h
similarity index 100%
rename from src/emu/bus/ecbbus/ecbbus.h
rename to src/devices/bus/ecbbus/ecbbus.h
diff --git a/src/emu/bus/ecbbus/grip.c b/src/devices/bus/ecbbus/grip.c
similarity index 100%
rename from src/emu/bus/ecbbus/grip.c
rename to src/devices/bus/ecbbus/grip.c
diff --git a/src/emu/bus/ecbbus/grip.h b/src/devices/bus/ecbbus/grip.h
similarity index 100%
rename from src/emu/bus/ecbbus/grip.h
rename to src/devices/bus/ecbbus/grip.h
diff --git a/src/emu/bus/econet/e01.c b/src/devices/bus/econet/e01.c
similarity index 100%
rename from src/emu/bus/econet/e01.c
rename to src/devices/bus/econet/e01.c
diff --git a/src/emu/bus/econet/e01.h b/src/devices/bus/econet/e01.h
similarity index 100%
rename from src/emu/bus/econet/e01.h
rename to src/devices/bus/econet/e01.h
diff --git a/src/emu/bus/econet/econet.c b/src/devices/bus/econet/econet.c
similarity index 100%
rename from src/emu/bus/econet/econet.c
rename to src/devices/bus/econet/econet.c
diff --git a/src/emu/bus/econet/econet.h b/src/devices/bus/econet/econet.h
similarity index 100%
rename from src/emu/bus/econet/econet.h
rename to src/devices/bus/econet/econet.h
diff --git a/src/emu/bus/ep64/exdos.c b/src/devices/bus/ep64/exdos.c
similarity index 100%
rename from src/emu/bus/ep64/exdos.c
rename to src/devices/bus/ep64/exdos.c
diff --git a/src/emu/bus/ep64/exdos.h b/src/devices/bus/ep64/exdos.h
similarity index 100%
rename from src/emu/bus/ep64/exdos.h
rename to src/devices/bus/ep64/exdos.h
diff --git a/src/emu/bus/ep64/exp.c b/src/devices/bus/ep64/exp.c
similarity index 100%
rename from src/emu/bus/ep64/exp.c
rename to src/devices/bus/ep64/exp.c
diff --git a/src/emu/bus/ep64/exp.h b/src/devices/bus/ep64/exp.h
similarity index 100%
rename from src/emu/bus/ep64/exp.h
rename to src/devices/bus/ep64/exp.h
diff --git a/src/emu/bus/epson_sio/epson_sio.c b/src/devices/bus/epson_sio/epson_sio.c
similarity index 100%
rename from src/emu/bus/epson_sio/epson_sio.c
rename to src/devices/bus/epson_sio/epson_sio.c
diff --git a/src/emu/bus/epson_sio/epson_sio.h b/src/devices/bus/epson_sio/epson_sio.h
similarity index 100%
rename from src/emu/bus/epson_sio/epson_sio.h
rename to src/devices/bus/epson_sio/epson_sio.h
diff --git a/src/emu/bus/epson_sio/pf10.c b/src/devices/bus/epson_sio/pf10.c
similarity index 100%
rename from src/emu/bus/epson_sio/pf10.c
rename to src/devices/bus/epson_sio/pf10.c
diff --git a/src/emu/bus/epson_sio/pf10.h b/src/devices/bus/epson_sio/pf10.h
similarity index 100%
rename from src/emu/bus/epson_sio/pf10.h
rename to src/devices/bus/epson_sio/pf10.h
diff --git a/src/emu/bus/epson_sio/tf20.c b/src/devices/bus/epson_sio/tf20.c
similarity index 100%
rename from src/emu/bus/epson_sio/tf20.c
rename to src/devices/bus/epson_sio/tf20.c
diff --git a/src/emu/bus/epson_sio/tf20.h b/src/devices/bus/epson_sio/tf20.h
similarity index 100%
rename from src/emu/bus/epson_sio/tf20.h
rename to src/devices/bus/epson_sio/tf20.h
diff --git a/src/emu/bus/gameboy/gb_slot.c b/src/devices/bus/gameboy/gb_slot.c
similarity index 100%
rename from src/emu/bus/gameboy/gb_slot.c
rename to src/devices/bus/gameboy/gb_slot.c
diff --git a/src/emu/bus/gameboy/gb_slot.h b/src/devices/bus/gameboy/gb_slot.h
similarity index 100%
rename from src/emu/bus/gameboy/gb_slot.h
rename to src/devices/bus/gameboy/gb_slot.h
diff --git a/src/emu/bus/gameboy/mbc.c b/src/devices/bus/gameboy/mbc.c
similarity index 100%
rename from src/emu/bus/gameboy/mbc.c
rename to src/devices/bus/gameboy/mbc.c
diff --git a/src/emu/bus/gameboy/mbc.h b/src/devices/bus/gameboy/mbc.h
similarity index 100%
rename from src/emu/bus/gameboy/mbc.h
rename to src/devices/bus/gameboy/mbc.h
diff --git a/src/emu/bus/gameboy/rom.c b/src/devices/bus/gameboy/rom.c
similarity index 100%
rename from src/emu/bus/gameboy/rom.c
rename to src/devices/bus/gameboy/rom.c
diff --git a/src/emu/bus/gameboy/rom.h b/src/devices/bus/gameboy/rom.h
similarity index 100%
rename from src/emu/bus/gameboy/rom.h
rename to src/devices/bus/gameboy/rom.h
diff --git a/src/emu/bus/gamegear/ggext.c b/src/devices/bus/gamegear/ggext.c
similarity index 100%
rename from src/emu/bus/gamegear/ggext.c
rename to src/devices/bus/gamegear/ggext.c
diff --git a/src/emu/bus/gamegear/ggext.h b/src/devices/bus/gamegear/ggext.h
similarity index 100%
rename from src/emu/bus/gamegear/ggext.h
rename to src/devices/bus/gamegear/ggext.h
diff --git a/src/emu/bus/gamegear/smsctrladp.c b/src/devices/bus/gamegear/smsctrladp.c
similarity index 100%
rename from src/emu/bus/gamegear/smsctrladp.c
rename to src/devices/bus/gamegear/smsctrladp.c
diff --git a/src/emu/bus/gamegear/smsctrladp.h b/src/devices/bus/gamegear/smsctrladp.h
similarity index 100%
rename from src/emu/bus/gamegear/smsctrladp.h
rename to src/devices/bus/gamegear/smsctrladp.h
diff --git a/src/emu/bus/gba/gba_slot.c b/src/devices/bus/gba/gba_slot.c
similarity index 100%
rename from src/emu/bus/gba/gba_slot.c
rename to src/devices/bus/gba/gba_slot.c
diff --git a/src/emu/bus/gba/gba_slot.h b/src/devices/bus/gba/gba_slot.h
similarity index 100%
rename from src/emu/bus/gba/gba_slot.h
rename to src/devices/bus/gba/gba_slot.h
diff --git a/src/emu/bus/gba/rom.c b/src/devices/bus/gba/rom.c
similarity index 100%
rename from src/emu/bus/gba/rom.c
rename to src/devices/bus/gba/rom.c
diff --git a/src/emu/bus/gba/rom.h b/src/devices/bus/gba/rom.h
similarity index 100%
rename from src/emu/bus/gba/rom.h
rename to src/devices/bus/gba/rom.h
diff --git a/src/emu/bus/generic/carts.c b/src/devices/bus/generic/carts.c
similarity index 100%
rename from src/emu/bus/generic/carts.c
rename to src/devices/bus/generic/carts.c
diff --git a/src/emu/bus/generic/carts.h b/src/devices/bus/generic/carts.h
similarity index 100%
rename from src/emu/bus/generic/carts.h
rename to src/devices/bus/generic/carts.h
diff --git a/src/emu/bus/generic/ram.c b/src/devices/bus/generic/ram.c
similarity index 100%
rename from src/emu/bus/generic/ram.c
rename to src/devices/bus/generic/ram.c
diff --git a/src/emu/bus/generic/ram.h b/src/devices/bus/generic/ram.h
similarity index 100%
rename from src/emu/bus/generic/ram.h
rename to src/devices/bus/generic/ram.h
diff --git a/src/emu/bus/generic/rom.c b/src/devices/bus/generic/rom.c
similarity index 100%
rename from src/emu/bus/generic/rom.c
rename to src/devices/bus/generic/rom.c
diff --git a/src/emu/bus/generic/rom.h b/src/devices/bus/generic/rom.h
similarity index 100%
rename from src/emu/bus/generic/rom.h
rename to src/devices/bus/generic/rom.h
diff --git a/src/emu/bus/generic/slot.c b/src/devices/bus/generic/slot.c
similarity index 100%
rename from src/emu/bus/generic/slot.c
rename to src/devices/bus/generic/slot.c
diff --git a/src/emu/bus/generic/slot.h b/src/devices/bus/generic/slot.h
similarity index 100%
rename from src/emu/bus/generic/slot.h
rename to src/devices/bus/generic/slot.h
diff --git a/src/emu/bus/ieee488/c2031.c b/src/devices/bus/ieee488/c2031.c
similarity index 100%
rename from src/emu/bus/ieee488/c2031.c
rename to src/devices/bus/ieee488/c2031.c
diff --git a/src/emu/bus/ieee488/c2031.h b/src/devices/bus/ieee488/c2031.h
similarity index 100%
rename from src/emu/bus/ieee488/c2031.h
rename to src/devices/bus/ieee488/c2031.h
diff --git a/src/emu/bus/ieee488/c2040.c b/src/devices/bus/ieee488/c2040.c
similarity index 100%
rename from src/emu/bus/ieee488/c2040.c
rename to src/devices/bus/ieee488/c2040.c
diff --git a/src/emu/bus/ieee488/c2040.h b/src/devices/bus/ieee488/c2040.h
similarity index 100%
rename from src/emu/bus/ieee488/c2040.h
rename to src/devices/bus/ieee488/c2040.h
diff --git a/src/emu/bus/ieee488/c2040fdc.c b/src/devices/bus/ieee488/c2040fdc.c
similarity index 100%
rename from src/emu/bus/ieee488/c2040fdc.c
rename to src/devices/bus/ieee488/c2040fdc.c
diff --git a/src/emu/bus/ieee488/c2040fdc.h b/src/devices/bus/ieee488/c2040fdc.h
similarity index 100%
rename from src/emu/bus/ieee488/c2040fdc.h
rename to src/devices/bus/ieee488/c2040fdc.h
diff --git a/src/emu/bus/ieee488/c8050.c b/src/devices/bus/ieee488/c8050.c
similarity index 100%
rename from src/emu/bus/ieee488/c8050.c
rename to src/devices/bus/ieee488/c8050.c
diff --git a/src/emu/bus/ieee488/c8050.h b/src/devices/bus/ieee488/c8050.h
similarity index 100%
rename from src/emu/bus/ieee488/c8050.h
rename to src/devices/bus/ieee488/c8050.h
diff --git a/src/emu/bus/ieee488/c8050fdc.c b/src/devices/bus/ieee488/c8050fdc.c
similarity index 100%
rename from src/emu/bus/ieee488/c8050fdc.c
rename to src/devices/bus/ieee488/c8050fdc.c
diff --git a/src/emu/bus/ieee488/c8050fdc.h b/src/devices/bus/ieee488/c8050fdc.h
similarity index 100%
rename from src/emu/bus/ieee488/c8050fdc.h
rename to src/devices/bus/ieee488/c8050fdc.h
diff --git a/src/emu/bus/ieee488/c8280.c b/src/devices/bus/ieee488/c8280.c
similarity index 100%
rename from src/emu/bus/ieee488/c8280.c
rename to src/devices/bus/ieee488/c8280.c
diff --git a/src/emu/bus/ieee488/c8280.h b/src/devices/bus/ieee488/c8280.h
similarity index 100%
rename from src/emu/bus/ieee488/c8280.h
rename to src/devices/bus/ieee488/c8280.h
diff --git a/src/emu/bus/ieee488/d9060.c b/src/devices/bus/ieee488/d9060.c
similarity index 100%
rename from src/emu/bus/ieee488/d9060.c
rename to src/devices/bus/ieee488/d9060.c
diff --git a/src/emu/bus/ieee488/d9060.h b/src/devices/bus/ieee488/d9060.h
similarity index 100%
rename from src/emu/bus/ieee488/d9060.h
rename to src/devices/bus/ieee488/d9060.h
diff --git a/src/emu/bus/ieee488/hardbox.c b/src/devices/bus/ieee488/hardbox.c
similarity index 100%
rename from src/emu/bus/ieee488/hardbox.c
rename to src/devices/bus/ieee488/hardbox.c
diff --git a/src/emu/bus/ieee488/hardbox.h b/src/devices/bus/ieee488/hardbox.h
similarity index 100%
rename from src/emu/bus/ieee488/hardbox.h
rename to src/devices/bus/ieee488/hardbox.h
diff --git a/src/emu/bus/ieee488/ieee488.c b/src/devices/bus/ieee488/ieee488.c
similarity index 100%
rename from src/emu/bus/ieee488/ieee488.c
rename to src/devices/bus/ieee488/ieee488.c
diff --git a/src/emu/bus/ieee488/ieee488.h b/src/devices/bus/ieee488/ieee488.h
similarity index 100%
rename from src/emu/bus/ieee488/ieee488.h
rename to src/devices/bus/ieee488/ieee488.h
diff --git a/src/emu/bus/ieee488/shark.c b/src/devices/bus/ieee488/shark.c
similarity index 100%
rename from src/emu/bus/ieee488/shark.c
rename to src/devices/bus/ieee488/shark.c
diff --git a/src/emu/bus/ieee488/shark.h b/src/devices/bus/ieee488/shark.h
similarity index 100%
rename from src/emu/bus/ieee488/shark.h
rename to src/devices/bus/ieee488/shark.h
diff --git a/src/emu/bus/ieee488/softbox.c b/src/devices/bus/ieee488/softbox.c
similarity index 100%
rename from src/emu/bus/ieee488/softbox.c
rename to src/devices/bus/ieee488/softbox.c
diff --git a/src/emu/bus/ieee488/softbox.h b/src/devices/bus/ieee488/softbox.h
similarity index 100%
rename from src/emu/bus/ieee488/softbox.h
rename to src/devices/bus/ieee488/softbox.h
diff --git a/src/emu/bus/imi7000/imi5000h.c b/src/devices/bus/imi7000/imi5000h.c
similarity index 100%
rename from src/emu/bus/imi7000/imi5000h.c
rename to src/devices/bus/imi7000/imi5000h.c
diff --git a/src/emu/bus/imi7000/imi5000h.h b/src/devices/bus/imi7000/imi5000h.h
similarity index 100%
rename from src/emu/bus/imi7000/imi5000h.h
rename to src/devices/bus/imi7000/imi5000h.h
diff --git a/src/emu/bus/imi7000/imi7000.c b/src/devices/bus/imi7000/imi7000.c
similarity index 100%
rename from src/emu/bus/imi7000/imi7000.c
rename to src/devices/bus/imi7000/imi7000.c
diff --git a/src/emu/bus/imi7000/imi7000.h b/src/devices/bus/imi7000/imi7000.h
similarity index 100%
rename from src/emu/bus/imi7000/imi7000.h
rename to src/devices/bus/imi7000/imi7000.h
diff --git a/src/emu/bus/intv/ecs.c b/src/devices/bus/intv/ecs.c
similarity index 100%
rename from src/emu/bus/intv/ecs.c
rename to src/devices/bus/intv/ecs.c
diff --git a/src/emu/bus/intv/ecs.h b/src/devices/bus/intv/ecs.h
similarity index 100%
rename from src/emu/bus/intv/ecs.h
rename to src/devices/bus/intv/ecs.h
diff --git a/src/emu/bus/intv/rom.c b/src/devices/bus/intv/rom.c
similarity index 100%
rename from src/emu/bus/intv/rom.c
rename to src/devices/bus/intv/rom.c
diff --git a/src/emu/bus/intv/rom.h b/src/devices/bus/intv/rom.h
similarity index 100%
rename from src/emu/bus/intv/rom.h
rename to src/devices/bus/intv/rom.h
diff --git a/src/emu/bus/intv/slot.c b/src/devices/bus/intv/slot.c
similarity index 100%
rename from src/emu/bus/intv/slot.c
rename to src/devices/bus/intv/slot.c
diff --git a/src/emu/bus/intv/slot.h b/src/devices/bus/intv/slot.h
similarity index 100%
rename from src/emu/bus/intv/slot.h
rename to src/devices/bus/intv/slot.h
diff --git a/src/emu/bus/intv/voice.c b/src/devices/bus/intv/voice.c
similarity index 100%
rename from src/emu/bus/intv/voice.c
rename to src/devices/bus/intv/voice.c
diff --git a/src/emu/bus/intv/voice.h b/src/devices/bus/intv/voice.h
similarity index 100%
rename from src/emu/bus/intv/voice.h
rename to src/devices/bus/intv/voice.h
diff --git a/src/emu/bus/iq151/disc2.c b/src/devices/bus/iq151/disc2.c
similarity index 100%
rename from src/emu/bus/iq151/disc2.c
rename to src/devices/bus/iq151/disc2.c
diff --git a/src/emu/bus/iq151/disc2.h b/src/devices/bus/iq151/disc2.h
similarity index 100%
rename from src/emu/bus/iq151/disc2.h
rename to src/devices/bus/iq151/disc2.h
diff --git a/src/emu/bus/iq151/grafik.c b/src/devices/bus/iq151/grafik.c
similarity index 100%
rename from src/emu/bus/iq151/grafik.c
rename to src/devices/bus/iq151/grafik.c
diff --git a/src/emu/bus/iq151/grafik.h b/src/devices/bus/iq151/grafik.h
similarity index 100%
rename from src/emu/bus/iq151/grafik.h
rename to src/devices/bus/iq151/grafik.h
diff --git a/src/emu/bus/iq151/iq151.c b/src/devices/bus/iq151/iq151.c
similarity index 100%
rename from src/emu/bus/iq151/iq151.c
rename to src/devices/bus/iq151/iq151.c
diff --git a/src/emu/bus/iq151/iq151.h b/src/devices/bus/iq151/iq151.h
similarity index 100%
rename from src/emu/bus/iq151/iq151.h
rename to src/devices/bus/iq151/iq151.h
diff --git a/src/emu/bus/iq151/minigraf.c b/src/devices/bus/iq151/minigraf.c
similarity index 100%
rename from src/emu/bus/iq151/minigraf.c
rename to src/devices/bus/iq151/minigraf.c
diff --git a/src/emu/bus/iq151/minigraf.h b/src/devices/bus/iq151/minigraf.h
similarity index 100%
rename from src/emu/bus/iq151/minigraf.h
rename to src/devices/bus/iq151/minigraf.h
diff --git a/src/emu/bus/iq151/ms151a.c b/src/devices/bus/iq151/ms151a.c
similarity index 100%
rename from src/emu/bus/iq151/ms151a.c
rename to src/devices/bus/iq151/ms151a.c
diff --git a/src/emu/bus/iq151/ms151a.h b/src/devices/bus/iq151/ms151a.h
similarity index 100%
rename from src/emu/bus/iq151/ms151a.h
rename to src/devices/bus/iq151/ms151a.h
diff --git a/src/emu/bus/iq151/rom.c b/src/devices/bus/iq151/rom.c
similarity index 100%
rename from src/emu/bus/iq151/rom.c
rename to src/devices/bus/iq151/rom.c
diff --git a/src/emu/bus/iq151/rom.h b/src/devices/bus/iq151/rom.h
similarity index 100%
rename from src/emu/bus/iq151/rom.h
rename to src/devices/bus/iq151/rom.h
diff --git a/src/emu/bus/iq151/staper.c b/src/devices/bus/iq151/staper.c
similarity index 100%
rename from src/emu/bus/iq151/staper.c
rename to src/devices/bus/iq151/staper.c
diff --git a/src/emu/bus/iq151/staper.h b/src/devices/bus/iq151/staper.h
similarity index 100%
rename from src/emu/bus/iq151/staper.h
rename to src/devices/bus/iq151/staper.h
diff --git a/src/emu/bus/iq151/video32.c b/src/devices/bus/iq151/video32.c
similarity index 100%
rename from src/emu/bus/iq151/video32.c
rename to src/devices/bus/iq151/video32.c
diff --git a/src/emu/bus/iq151/video32.h b/src/devices/bus/iq151/video32.h
similarity index 100%
rename from src/emu/bus/iq151/video32.h
rename to src/devices/bus/iq151/video32.h
diff --git a/src/emu/bus/iq151/video64.c b/src/devices/bus/iq151/video64.c
similarity index 100%
rename from src/emu/bus/iq151/video64.c
rename to src/devices/bus/iq151/video64.c
diff --git a/src/emu/bus/iq151/video64.h b/src/devices/bus/iq151/video64.h
similarity index 100%
rename from src/emu/bus/iq151/video64.h
rename to src/devices/bus/iq151/video64.h
diff --git a/src/emu/bus/isa/3c503.c b/src/devices/bus/isa/3c503.c
similarity index 100%
rename from src/emu/bus/isa/3c503.c
rename to src/devices/bus/isa/3c503.c
diff --git a/src/emu/bus/isa/3c503.h b/src/devices/bus/isa/3c503.h
similarity index 100%
rename from src/emu/bus/isa/3c503.h
rename to src/devices/bus/isa/3c503.h
diff --git a/src/emu/bus/isa/3c505.c b/src/devices/bus/isa/3c505.c
similarity index 100%
rename from src/emu/bus/isa/3c505.c
rename to src/devices/bus/isa/3c505.c
diff --git a/src/emu/bus/isa/3c505.h b/src/devices/bus/isa/3c505.h
similarity index 100%
rename from src/emu/bus/isa/3c505.h
rename to src/devices/bus/isa/3c505.h
diff --git a/src/emu/bus/isa/adlib.c b/src/devices/bus/isa/adlib.c
similarity index 100%
rename from src/emu/bus/isa/adlib.c
rename to src/devices/bus/isa/adlib.c
diff --git a/src/emu/bus/isa/adlib.h b/src/devices/bus/isa/adlib.h
similarity index 100%
rename from src/emu/bus/isa/adlib.h
rename to src/devices/bus/isa/adlib.h
diff --git a/src/emu/bus/isa/aga.c b/src/devices/bus/isa/aga.c
similarity index 100%
rename from src/emu/bus/isa/aga.c
rename to src/devices/bus/isa/aga.c
diff --git a/src/emu/bus/isa/aga.h b/src/devices/bus/isa/aga.h
similarity index 100%
rename from src/emu/bus/isa/aga.h
rename to src/devices/bus/isa/aga.h
diff --git a/src/emu/bus/isa/aha1542.c b/src/devices/bus/isa/aha1542.c
similarity index 100%
rename from src/emu/bus/isa/aha1542.c
rename to src/devices/bus/isa/aha1542.c
diff --git a/src/emu/bus/isa/aha1542.h b/src/devices/bus/isa/aha1542.h
similarity index 100%
rename from src/emu/bus/isa/aha1542.h
rename to src/devices/bus/isa/aha1542.h
diff --git a/src/emu/bus/isa/cga.c b/src/devices/bus/isa/cga.c
similarity index 100%
rename from src/emu/bus/isa/cga.c
rename to src/devices/bus/isa/cga.c
diff --git a/src/emu/bus/isa/cga.h b/src/devices/bus/isa/cga.h
similarity index 100%
rename from src/emu/bus/isa/cga.h
rename to src/devices/bus/isa/cga.h
diff --git a/src/emu/bus/isa/com.c b/src/devices/bus/isa/com.c
similarity index 100%
rename from src/emu/bus/isa/com.c
rename to src/devices/bus/isa/com.c
diff --git a/src/emu/bus/isa/com.h b/src/devices/bus/isa/com.h
similarity index 100%
rename from src/emu/bus/isa/com.h
rename to src/devices/bus/isa/com.h
diff --git a/src/emu/bus/isa/dectalk.c b/src/devices/bus/isa/dectalk.c
similarity index 100%
rename from src/emu/bus/isa/dectalk.c
rename to src/devices/bus/isa/dectalk.c
diff --git a/src/emu/bus/isa/dectalk.h b/src/devices/bus/isa/dectalk.h
similarity index 100%
rename from src/emu/bus/isa/dectalk.h
rename to src/devices/bus/isa/dectalk.h
diff --git a/src/emu/bus/isa/ega.c b/src/devices/bus/isa/ega.c
similarity index 100%
rename from src/emu/bus/isa/ega.c
rename to src/devices/bus/isa/ega.c
diff --git a/src/emu/bus/isa/ega.h b/src/devices/bus/isa/ega.h
similarity index 100%
rename from src/emu/bus/isa/ega.h
rename to src/devices/bus/isa/ega.h
diff --git a/src/emu/bus/isa/fdc.c b/src/devices/bus/isa/fdc.c
similarity index 100%
rename from src/emu/bus/isa/fdc.c
rename to src/devices/bus/isa/fdc.c
diff --git a/src/emu/bus/isa/fdc.h b/src/devices/bus/isa/fdc.h
similarity index 100%
rename from src/emu/bus/isa/fdc.h
rename to src/devices/bus/isa/fdc.h
diff --git a/src/emu/bus/isa/finalchs.c b/src/devices/bus/isa/finalchs.c
similarity index 100%
rename from src/emu/bus/isa/finalchs.c
rename to src/devices/bus/isa/finalchs.c
diff --git a/src/emu/bus/isa/finalchs.h b/src/devices/bus/isa/finalchs.h
similarity index 100%
rename from src/emu/bus/isa/finalchs.h
rename to src/devices/bus/isa/finalchs.h
diff --git a/src/emu/bus/isa/gblaster.c b/src/devices/bus/isa/gblaster.c
similarity index 100%
rename from src/emu/bus/isa/gblaster.c
rename to src/devices/bus/isa/gblaster.c
diff --git a/src/emu/bus/isa/gblaster.h b/src/devices/bus/isa/gblaster.h
similarity index 100%
rename from src/emu/bus/isa/gblaster.h
rename to src/devices/bus/isa/gblaster.h
diff --git a/src/emu/bus/isa/gus.c b/src/devices/bus/isa/gus.c
similarity index 100%
rename from src/emu/bus/isa/gus.c
rename to src/devices/bus/isa/gus.c
diff --git a/src/emu/bus/isa/gus.h b/src/devices/bus/isa/gus.h
similarity index 100%
rename from src/emu/bus/isa/gus.h
rename to src/devices/bus/isa/gus.h
diff --git a/src/emu/bus/isa/hdc.c b/src/devices/bus/isa/hdc.c
similarity index 100%
rename from src/emu/bus/isa/hdc.c
rename to src/devices/bus/isa/hdc.c
diff --git a/src/emu/bus/isa/hdc.h b/src/devices/bus/isa/hdc.h
similarity index 100%
rename from src/emu/bus/isa/hdc.h
rename to src/devices/bus/isa/hdc.h
diff --git a/src/emu/bus/isa/ibm_mfc.c b/src/devices/bus/isa/ibm_mfc.c
similarity index 100%
rename from src/emu/bus/isa/ibm_mfc.c
rename to src/devices/bus/isa/ibm_mfc.c
diff --git a/src/emu/bus/isa/ibm_mfc.h b/src/devices/bus/isa/ibm_mfc.h
similarity index 100%
rename from src/emu/bus/isa/ibm_mfc.h
rename to src/devices/bus/isa/ibm_mfc.h
diff --git a/src/emu/bus/isa/ide.c b/src/devices/bus/isa/ide.c
similarity index 100%
rename from src/emu/bus/isa/ide.c
rename to src/devices/bus/isa/ide.c
diff --git a/src/emu/bus/isa/ide.h b/src/devices/bus/isa/ide.h
similarity index 100%
rename from src/emu/bus/isa/ide.h
rename to src/devices/bus/isa/ide.h
diff --git a/src/emu/bus/isa/isa.c b/src/devices/bus/isa/isa.c
similarity index 100%
rename from src/emu/bus/isa/isa.c
rename to src/devices/bus/isa/isa.c
diff --git a/src/emu/bus/isa/isa.h b/src/devices/bus/isa/isa.h
similarity index 100%
rename from src/emu/bus/isa/isa.h
rename to src/devices/bus/isa/isa.h
diff --git a/src/emu/bus/isa/isa_cards.c b/src/devices/bus/isa/isa_cards.c
similarity index 100%
rename from src/emu/bus/isa/isa_cards.c
rename to src/devices/bus/isa/isa_cards.c
diff --git a/src/emu/bus/isa/isa_cards.h b/src/devices/bus/isa/isa_cards.h
similarity index 100%
rename from src/emu/bus/isa/isa_cards.h
rename to src/devices/bus/isa/isa_cards.h
diff --git a/src/emu/bus/isa/lpt.c b/src/devices/bus/isa/lpt.c
similarity index 100%
rename from src/emu/bus/isa/lpt.c
rename to src/devices/bus/isa/lpt.c
diff --git a/src/emu/bus/isa/lpt.h b/src/devices/bus/isa/lpt.h
similarity index 100%
rename from src/emu/bus/isa/lpt.h
rename to src/devices/bus/isa/lpt.h
diff --git a/src/emu/bus/isa/mach32.c b/src/devices/bus/isa/mach32.c
similarity index 100%
rename from src/emu/bus/isa/mach32.c
rename to src/devices/bus/isa/mach32.c
diff --git a/src/emu/bus/isa/mach32.h b/src/devices/bus/isa/mach32.h
similarity index 100%
rename from src/emu/bus/isa/mach32.h
rename to src/devices/bus/isa/mach32.h
diff --git a/src/emu/bus/isa/mc1502_fdc.c b/src/devices/bus/isa/mc1502_fdc.c
similarity index 100%
rename from src/emu/bus/isa/mc1502_fdc.c
rename to src/devices/bus/isa/mc1502_fdc.c
diff --git a/src/emu/bus/isa/mc1502_fdc.h b/src/devices/bus/isa/mc1502_fdc.h
similarity index 100%
rename from src/emu/bus/isa/mc1502_fdc.h
rename to src/devices/bus/isa/mc1502_fdc.h
diff --git a/src/emu/bus/isa/mc1502_rom.c b/src/devices/bus/isa/mc1502_rom.c
similarity index 100%
rename from src/emu/bus/isa/mc1502_rom.c
rename to src/devices/bus/isa/mc1502_rom.c
diff --git a/src/emu/bus/isa/mc1502_rom.h b/src/devices/bus/isa/mc1502_rom.h
similarity index 100%
rename from src/emu/bus/isa/mc1502_rom.h
rename to src/devices/bus/isa/mc1502_rom.h
diff --git a/src/emu/bus/isa/mda.c b/src/devices/bus/isa/mda.c
similarity index 100%
rename from src/emu/bus/isa/mda.c
rename to src/devices/bus/isa/mda.c
diff --git a/src/emu/bus/isa/mda.h b/src/devices/bus/isa/mda.h
similarity index 100%
rename from src/emu/bus/isa/mda.h
rename to src/devices/bus/isa/mda.h
diff --git a/src/emu/bus/isa/mpu401.c b/src/devices/bus/isa/mpu401.c
similarity index 100%
rename from src/emu/bus/isa/mpu401.c
rename to src/devices/bus/isa/mpu401.c
diff --git a/src/emu/bus/isa/mpu401.h b/src/devices/bus/isa/mpu401.h
similarity index 100%
rename from src/emu/bus/isa/mpu401.h
rename to src/devices/bus/isa/mpu401.h
diff --git a/src/emu/bus/isa/mufdc.c b/src/devices/bus/isa/mufdc.c
similarity index 100%
rename from src/emu/bus/isa/mufdc.c
rename to src/devices/bus/isa/mufdc.c
diff --git a/src/emu/bus/isa/mufdc.h b/src/devices/bus/isa/mufdc.h
similarity index 100%
rename from src/emu/bus/isa/mufdc.h
rename to src/devices/bus/isa/mufdc.h
diff --git a/src/emu/bus/isa/ne1000.c b/src/devices/bus/isa/ne1000.c
similarity index 100%
rename from src/emu/bus/isa/ne1000.c
rename to src/devices/bus/isa/ne1000.c
diff --git a/src/emu/bus/isa/ne1000.h b/src/devices/bus/isa/ne1000.h
similarity index 100%
rename from src/emu/bus/isa/ne1000.h
rename to src/devices/bus/isa/ne1000.h
diff --git a/src/emu/bus/isa/ne2000.c b/src/devices/bus/isa/ne2000.c
similarity index 100%
rename from src/emu/bus/isa/ne2000.c
rename to src/devices/bus/isa/ne2000.c
diff --git a/src/emu/bus/isa/ne2000.h b/src/devices/bus/isa/ne2000.h
similarity index 100%
rename from src/emu/bus/isa/ne2000.h
rename to src/devices/bus/isa/ne2000.h
diff --git a/src/emu/bus/isa/num9rev.c b/src/devices/bus/isa/num9rev.c
similarity index 100%
rename from src/emu/bus/isa/num9rev.c
rename to src/devices/bus/isa/num9rev.c
diff --git a/src/emu/bus/isa/num9rev.h b/src/devices/bus/isa/num9rev.h
similarity index 100%
rename from src/emu/bus/isa/num9rev.h
rename to src/devices/bus/isa/num9rev.h
diff --git a/src/emu/bus/isa/omti8621.c b/src/devices/bus/isa/omti8621.c
similarity index 100%
rename from src/emu/bus/isa/omti8621.c
rename to src/devices/bus/isa/omti8621.c
diff --git a/src/emu/bus/isa/omti8621.h b/src/devices/bus/isa/omti8621.h
similarity index 100%
rename from src/emu/bus/isa/omti8621.h
rename to src/devices/bus/isa/omti8621.h
diff --git a/src/emu/bus/isa/p1_fdc.c b/src/devices/bus/isa/p1_fdc.c
similarity index 100%
rename from src/emu/bus/isa/p1_fdc.c
rename to src/devices/bus/isa/p1_fdc.c
diff --git a/src/emu/bus/isa/p1_fdc.h b/src/devices/bus/isa/p1_fdc.h
similarity index 100%
rename from src/emu/bus/isa/p1_fdc.h
rename to src/devices/bus/isa/p1_fdc.h
diff --git a/src/emu/bus/isa/p1_hdc.c b/src/devices/bus/isa/p1_hdc.c
similarity index 100%
rename from src/emu/bus/isa/p1_hdc.c
rename to src/devices/bus/isa/p1_hdc.c
diff --git a/src/emu/bus/isa/p1_hdc.h b/src/devices/bus/isa/p1_hdc.h
similarity index 100%
rename from src/emu/bus/isa/p1_hdc.h
rename to src/devices/bus/isa/p1_hdc.h
diff --git a/src/emu/bus/isa/p1_rom.c b/src/devices/bus/isa/p1_rom.c
similarity index 100%
rename from src/emu/bus/isa/p1_rom.c
rename to src/devices/bus/isa/p1_rom.c
diff --git a/src/emu/bus/isa/p1_rom.h b/src/devices/bus/isa/p1_rom.h
similarity index 100%
rename from src/emu/bus/isa/p1_rom.h
rename to src/devices/bus/isa/p1_rom.h
diff --git a/src/emu/bus/isa/pc1640_iga.c b/src/devices/bus/isa/pc1640_iga.c
similarity index 100%
rename from src/emu/bus/isa/pc1640_iga.c
rename to src/devices/bus/isa/pc1640_iga.c
diff --git a/src/emu/bus/isa/pc1640_iga.h b/src/devices/bus/isa/pc1640_iga.h
similarity index 100%
rename from src/emu/bus/isa/pc1640_iga.h
rename to src/devices/bus/isa/pc1640_iga.h
diff --git a/src/emu/bus/isa/pds.c b/src/devices/bus/isa/pds.c
similarity index 100%
rename from src/emu/bus/isa/pds.c
rename to src/devices/bus/isa/pds.c
diff --git a/src/emu/bus/isa/pds.h b/src/devices/bus/isa/pds.h
similarity index 100%
rename from src/emu/bus/isa/pds.h
rename to src/devices/bus/isa/pds.h
diff --git a/src/emu/bus/isa/pgc.c b/src/devices/bus/isa/pgc.c
similarity index 100%
rename from src/emu/bus/isa/pgc.c
rename to src/devices/bus/isa/pgc.c
diff --git a/src/emu/bus/isa/pgc.h b/src/devices/bus/isa/pgc.h
similarity index 100%
rename from src/emu/bus/isa/pgc.h
rename to src/devices/bus/isa/pgc.h
diff --git a/src/emu/bus/isa/s3virge.c b/src/devices/bus/isa/s3virge.c
similarity index 100%
rename from src/emu/bus/isa/s3virge.c
rename to src/devices/bus/isa/s3virge.c
diff --git a/src/emu/bus/isa/s3virge.h b/src/devices/bus/isa/s3virge.h
similarity index 100%
rename from src/emu/bus/isa/s3virge.h
rename to src/devices/bus/isa/s3virge.h
diff --git a/src/emu/bus/isa/sb16.c b/src/devices/bus/isa/sb16.c
similarity index 100%
rename from src/emu/bus/isa/sb16.c
rename to src/devices/bus/isa/sb16.c
diff --git a/src/emu/bus/isa/sb16.h b/src/devices/bus/isa/sb16.h
similarity index 100%
rename from src/emu/bus/isa/sb16.h
rename to src/devices/bus/isa/sb16.h
diff --git a/src/emu/bus/isa/sblaster.c b/src/devices/bus/isa/sblaster.c
similarity index 100%
rename from src/emu/bus/isa/sblaster.c
rename to src/devices/bus/isa/sblaster.c
diff --git a/src/emu/bus/isa/sblaster.h b/src/devices/bus/isa/sblaster.h
similarity index 100%
rename from src/emu/bus/isa/sblaster.h
rename to src/devices/bus/isa/sblaster.h
diff --git a/src/emu/bus/isa/sc499.c b/src/devices/bus/isa/sc499.c
similarity index 100%
rename from src/emu/bus/isa/sc499.c
rename to src/devices/bus/isa/sc499.c
diff --git a/src/emu/bus/isa/sc499.h b/src/devices/bus/isa/sc499.h
similarity index 100%
rename from src/emu/bus/isa/sc499.h
rename to src/devices/bus/isa/sc499.h
diff --git a/src/emu/bus/isa/side116.c b/src/devices/bus/isa/side116.c
similarity index 100%
rename from src/emu/bus/isa/side116.c
rename to src/devices/bus/isa/side116.c
diff --git a/src/emu/bus/isa/side116.h b/src/devices/bus/isa/side116.h
similarity index 100%
rename from src/emu/bus/isa/side116.h
rename to src/devices/bus/isa/side116.h
diff --git a/src/emu/bus/isa/ssi2001.c b/src/devices/bus/isa/ssi2001.c
similarity index 100%
rename from src/emu/bus/isa/ssi2001.c
rename to src/devices/bus/isa/ssi2001.c
diff --git a/src/emu/bus/isa/ssi2001.h b/src/devices/bus/isa/ssi2001.h
similarity index 100%
rename from src/emu/bus/isa/ssi2001.h
rename to src/devices/bus/isa/ssi2001.h
diff --git a/src/emu/bus/isa/stereo_fx.c b/src/devices/bus/isa/stereo_fx.c
similarity index 100%
rename from src/emu/bus/isa/stereo_fx.c
rename to src/devices/bus/isa/stereo_fx.c
diff --git a/src/emu/bus/isa/stereo_fx.h b/src/devices/bus/isa/stereo_fx.h
similarity index 100%
rename from src/emu/bus/isa/stereo_fx.h
rename to src/devices/bus/isa/stereo_fx.h
diff --git a/src/emu/bus/isa/svga_cirrus.c b/src/devices/bus/isa/svga_cirrus.c
similarity index 100%
rename from src/emu/bus/isa/svga_cirrus.c
rename to src/devices/bus/isa/svga_cirrus.c
diff --git a/src/emu/bus/isa/svga_cirrus.h b/src/devices/bus/isa/svga_cirrus.h
similarity index 100%
rename from src/emu/bus/isa/svga_cirrus.h
rename to src/devices/bus/isa/svga_cirrus.h
diff --git a/src/emu/bus/isa/svga_s3.c b/src/devices/bus/isa/svga_s3.c
similarity index 100%
rename from src/emu/bus/isa/svga_s3.c
rename to src/devices/bus/isa/svga_s3.c
diff --git a/src/emu/bus/isa/svga_s3.h b/src/devices/bus/isa/svga_s3.h
similarity index 100%
rename from src/emu/bus/isa/svga_s3.h
rename to src/devices/bus/isa/svga_s3.h
diff --git a/src/emu/bus/isa/svga_trident.c b/src/devices/bus/isa/svga_trident.c
similarity index 100%
rename from src/emu/bus/isa/svga_trident.c
rename to src/devices/bus/isa/svga_trident.c
diff --git a/src/emu/bus/isa/svga_trident.h b/src/devices/bus/isa/svga_trident.h
similarity index 100%
rename from src/emu/bus/isa/svga_trident.h
rename to src/devices/bus/isa/svga_trident.h
diff --git a/src/emu/bus/isa/svga_tseng.c b/src/devices/bus/isa/svga_tseng.c
similarity index 100%
rename from src/emu/bus/isa/svga_tseng.c
rename to src/devices/bus/isa/svga_tseng.c
diff --git a/src/emu/bus/isa/svga_tseng.h b/src/devices/bus/isa/svga_tseng.h
similarity index 100%
rename from src/emu/bus/isa/svga_tseng.h
rename to src/devices/bus/isa/svga_tseng.h
diff --git a/src/emu/bus/isa/trident.c b/src/devices/bus/isa/trident.c
similarity index 100%
rename from src/emu/bus/isa/trident.c
rename to src/devices/bus/isa/trident.c
diff --git a/src/emu/bus/isa/trident.h b/src/devices/bus/isa/trident.h
similarity index 100%
rename from src/emu/bus/isa/trident.h
rename to src/devices/bus/isa/trident.h
diff --git a/src/emu/bus/isa/vga.c b/src/devices/bus/isa/vga.c
similarity index 100%
rename from src/emu/bus/isa/vga.c
rename to src/devices/bus/isa/vga.c
diff --git a/src/emu/bus/isa/vga.h b/src/devices/bus/isa/vga.h
similarity index 100%
rename from src/emu/bus/isa/vga.h
rename to src/devices/bus/isa/vga.h
diff --git a/src/emu/bus/isa/vga_ati.c b/src/devices/bus/isa/vga_ati.c
similarity index 100%
rename from src/emu/bus/isa/vga_ati.c
rename to src/devices/bus/isa/vga_ati.c
diff --git a/src/emu/bus/isa/vga_ati.h b/src/devices/bus/isa/vga_ati.h
similarity index 100%
rename from src/emu/bus/isa/vga_ati.h
rename to src/devices/bus/isa/vga_ati.h
diff --git a/src/emu/bus/isa/wd1002a_wx1.c b/src/devices/bus/isa/wd1002a_wx1.c
similarity index 100%
rename from src/emu/bus/isa/wd1002a_wx1.c
rename to src/devices/bus/isa/wd1002a_wx1.c
diff --git a/src/emu/bus/isa/wd1002a_wx1.h b/src/devices/bus/isa/wd1002a_wx1.h
similarity index 100%
rename from src/emu/bus/isa/wd1002a_wx1.h
rename to src/devices/bus/isa/wd1002a_wx1.h
diff --git a/src/emu/bus/isa/wdxt_gen.c b/src/devices/bus/isa/wdxt_gen.c
similarity index 100%
rename from src/emu/bus/isa/wdxt_gen.c
rename to src/devices/bus/isa/wdxt_gen.c
diff --git a/src/emu/bus/isa/wdxt_gen.h b/src/devices/bus/isa/wdxt_gen.h
similarity index 100%
rename from src/emu/bus/isa/wdxt_gen.h
rename to src/devices/bus/isa/wdxt_gen.h
diff --git a/src/emu/bus/isa/xsu_cards.c b/src/devices/bus/isa/xsu_cards.c
similarity index 100%
rename from src/emu/bus/isa/xsu_cards.c
rename to src/devices/bus/isa/xsu_cards.c
diff --git a/src/emu/bus/isa/xsu_cards.h b/src/devices/bus/isa/xsu_cards.h
similarity index 100%
rename from src/emu/bus/isa/xsu_cards.h
rename to src/devices/bus/isa/xsu_cards.h
diff --git a/src/emu/bus/isa/xtide.c b/src/devices/bus/isa/xtide.c
similarity index 100%
rename from src/emu/bus/isa/xtide.c
rename to src/devices/bus/isa/xtide.c
diff --git a/src/emu/bus/isa/xtide.h b/src/devices/bus/isa/xtide.h
similarity index 100%
rename from src/emu/bus/isa/xtide.h
rename to src/devices/bus/isa/xtide.h
diff --git a/src/emu/bus/isbx/compis_fdc.c b/src/devices/bus/isbx/compis_fdc.c
similarity index 100%
rename from src/emu/bus/isbx/compis_fdc.c
rename to src/devices/bus/isbx/compis_fdc.c
diff --git a/src/emu/bus/isbx/compis_fdc.h b/src/devices/bus/isbx/compis_fdc.h
similarity index 100%
rename from src/emu/bus/isbx/compis_fdc.h
rename to src/devices/bus/isbx/compis_fdc.h
diff --git a/src/emu/bus/isbx/isbc_218a.c b/src/devices/bus/isbx/isbc_218a.c
similarity index 100%
rename from src/emu/bus/isbx/isbc_218a.c
rename to src/devices/bus/isbx/isbc_218a.c
diff --git a/src/emu/bus/isbx/isbc_218a.h b/src/devices/bus/isbx/isbc_218a.h
similarity index 100%
rename from src/emu/bus/isbx/isbc_218a.h
rename to src/devices/bus/isbx/isbc_218a.h
diff --git a/src/emu/bus/isbx/isbx.c b/src/devices/bus/isbx/isbx.c
similarity index 100%
rename from src/emu/bus/isbx/isbx.c
rename to src/devices/bus/isbx/isbx.c
diff --git a/src/emu/bus/isbx/isbx.h b/src/devices/bus/isbx/isbx.h
similarity index 100%
rename from src/emu/bus/isbx/isbx.h
rename to src/devices/bus/isbx/isbx.h
diff --git a/src/emu/bus/kc/d002.c b/src/devices/bus/kc/d002.c
similarity index 100%
rename from src/emu/bus/kc/d002.c
rename to src/devices/bus/kc/d002.c
diff --git a/src/emu/bus/kc/d002.h b/src/devices/bus/kc/d002.h
similarity index 100%
rename from src/emu/bus/kc/d002.h
rename to src/devices/bus/kc/d002.h
diff --git a/src/emu/bus/kc/d004.c b/src/devices/bus/kc/d004.c
similarity index 100%
rename from src/emu/bus/kc/d004.c
rename to src/devices/bus/kc/d004.c
diff --git a/src/emu/bus/kc/d004.h b/src/devices/bus/kc/d004.h
similarity index 100%
rename from src/emu/bus/kc/d004.h
rename to src/devices/bus/kc/d004.h
diff --git a/src/emu/bus/kc/kc.c b/src/devices/bus/kc/kc.c
similarity index 100%
rename from src/emu/bus/kc/kc.c
rename to src/devices/bus/kc/kc.c
diff --git a/src/emu/bus/kc/kc.h b/src/devices/bus/kc/kc.h
similarity index 100%
rename from src/emu/bus/kc/kc.h
rename to src/devices/bus/kc/kc.h
diff --git a/src/emu/bus/kc/ram.c b/src/devices/bus/kc/ram.c
similarity index 100%
rename from src/emu/bus/kc/ram.c
rename to src/devices/bus/kc/ram.c
diff --git a/src/emu/bus/kc/ram.h b/src/devices/bus/kc/ram.h
similarity index 100%
rename from src/emu/bus/kc/ram.h
rename to src/devices/bus/kc/ram.h
diff --git a/src/emu/bus/kc/rom.c b/src/devices/bus/kc/rom.c
similarity index 100%
rename from src/emu/bus/kc/rom.c
rename to src/devices/bus/kc/rom.c
diff --git a/src/emu/bus/kc/rom.h b/src/devices/bus/kc/rom.h
similarity index 100%
rename from src/emu/bus/kc/rom.h
rename to src/devices/bus/kc/rom.h
diff --git a/src/emu/bus/lpci/cirrus.c b/src/devices/bus/lpci/cirrus.c
similarity index 100%
rename from src/emu/bus/lpci/cirrus.c
rename to src/devices/bus/lpci/cirrus.c
diff --git a/src/emu/bus/lpci/cirrus.h b/src/devices/bus/lpci/cirrus.h
similarity index 100%
rename from src/emu/bus/lpci/cirrus.h
rename to src/devices/bus/lpci/cirrus.h
diff --git a/src/emu/bus/lpci/i82371ab.c b/src/devices/bus/lpci/i82371ab.c
similarity index 100%
rename from src/emu/bus/lpci/i82371ab.c
rename to src/devices/bus/lpci/i82371ab.c
diff --git a/src/emu/bus/lpci/i82371ab.h b/src/devices/bus/lpci/i82371ab.h
similarity index 100%
rename from src/emu/bus/lpci/i82371ab.h
rename to src/devices/bus/lpci/i82371ab.h
diff --git a/src/emu/bus/lpci/i82371sb.c b/src/devices/bus/lpci/i82371sb.c
similarity index 100%
rename from src/emu/bus/lpci/i82371sb.c
rename to src/devices/bus/lpci/i82371sb.c
diff --git a/src/emu/bus/lpci/i82371sb.h b/src/devices/bus/lpci/i82371sb.h
similarity index 100%
rename from src/emu/bus/lpci/i82371sb.h
rename to src/devices/bus/lpci/i82371sb.h
diff --git a/src/emu/bus/lpci/i82439tx.c b/src/devices/bus/lpci/i82439tx.c
similarity index 100%
rename from src/emu/bus/lpci/i82439tx.c
rename to src/devices/bus/lpci/i82439tx.c
diff --git a/src/emu/bus/lpci/i82439tx.h b/src/devices/bus/lpci/i82439tx.h
similarity index 100%
rename from src/emu/bus/lpci/i82439tx.h
rename to src/devices/bus/lpci/i82439tx.h
diff --git a/src/emu/bus/lpci/mpc105.c b/src/devices/bus/lpci/mpc105.c
similarity index 100%
rename from src/emu/bus/lpci/mpc105.c
rename to src/devices/bus/lpci/mpc105.c
diff --git a/src/emu/bus/lpci/mpc105.h b/src/devices/bus/lpci/mpc105.h
similarity index 100%
rename from src/emu/bus/lpci/mpc105.h
rename to src/devices/bus/lpci/mpc105.h
diff --git a/src/emu/bus/lpci/northbridge.c b/src/devices/bus/lpci/northbridge.c
similarity index 100%
rename from src/emu/bus/lpci/northbridge.c
rename to src/devices/bus/lpci/northbridge.c
diff --git a/src/emu/bus/lpci/northbridge.h b/src/devices/bus/lpci/northbridge.h
similarity index 100%
rename from src/emu/bus/lpci/northbridge.h
rename to src/devices/bus/lpci/northbridge.h
diff --git a/src/emu/bus/lpci/pci.c b/src/devices/bus/lpci/pci.c
similarity index 100%
rename from src/emu/bus/lpci/pci.c
rename to src/devices/bus/lpci/pci.c
diff --git a/src/emu/bus/lpci/pci.h b/src/devices/bus/lpci/pci.h
similarity index 100%
rename from src/emu/bus/lpci/pci.h
rename to src/devices/bus/lpci/pci.h
diff --git a/src/emu/bus/lpci/southbridge.c b/src/devices/bus/lpci/southbridge.c
similarity index 100%
rename from src/emu/bus/lpci/southbridge.c
rename to src/devices/bus/lpci/southbridge.c
diff --git a/src/emu/bus/lpci/southbridge.h b/src/devices/bus/lpci/southbridge.h
similarity index 100%
rename from src/emu/bus/lpci/southbridge.h
rename to src/devices/bus/lpci/southbridge.h
diff --git a/src/emu/bus/macpds/macpds.c b/src/devices/bus/macpds/macpds.c
similarity index 100%
rename from src/emu/bus/macpds/macpds.c
rename to src/devices/bus/macpds/macpds.c
diff --git a/src/emu/bus/macpds/macpds.h b/src/devices/bus/macpds/macpds.h
similarity index 100%
rename from src/emu/bus/macpds/macpds.h
rename to src/devices/bus/macpds/macpds.h
diff --git a/src/emu/bus/macpds/pds_tpdfpd.c b/src/devices/bus/macpds/pds_tpdfpd.c
similarity index 100%
rename from src/emu/bus/macpds/pds_tpdfpd.c
rename to src/devices/bus/macpds/pds_tpdfpd.c
diff --git a/src/emu/bus/macpds/pds_tpdfpd.h b/src/devices/bus/macpds/pds_tpdfpd.h
similarity index 100%
rename from src/emu/bus/macpds/pds_tpdfpd.h
rename to src/devices/bus/macpds/pds_tpdfpd.h
diff --git a/src/emu/bus/megadrive/eeprom.c b/src/devices/bus/megadrive/eeprom.c
similarity index 100%
rename from src/emu/bus/megadrive/eeprom.c
rename to src/devices/bus/megadrive/eeprom.c
diff --git a/src/emu/bus/megadrive/eeprom.h b/src/devices/bus/megadrive/eeprom.h
similarity index 100%
rename from src/emu/bus/megadrive/eeprom.h
rename to src/devices/bus/megadrive/eeprom.h
diff --git a/src/emu/bus/megadrive/ggenie.c b/src/devices/bus/megadrive/ggenie.c
similarity index 100%
rename from src/emu/bus/megadrive/ggenie.c
rename to src/devices/bus/megadrive/ggenie.c
diff --git a/src/emu/bus/megadrive/ggenie.h b/src/devices/bus/megadrive/ggenie.h
similarity index 100%
rename from src/emu/bus/megadrive/ggenie.h
rename to src/devices/bus/megadrive/ggenie.h
diff --git a/src/emu/bus/megadrive/jcart.c b/src/devices/bus/megadrive/jcart.c
similarity index 100%
rename from src/emu/bus/megadrive/jcart.c
rename to src/devices/bus/megadrive/jcart.c
diff --git a/src/emu/bus/megadrive/jcart.h b/src/devices/bus/megadrive/jcart.h
similarity index 100%
rename from src/emu/bus/megadrive/jcart.h
rename to src/devices/bus/megadrive/jcart.h
diff --git a/src/emu/bus/megadrive/md_carts.c b/src/devices/bus/megadrive/md_carts.c
similarity index 100%
rename from src/emu/bus/megadrive/md_carts.c
rename to src/devices/bus/megadrive/md_carts.c
diff --git a/src/emu/bus/megadrive/md_carts.h b/src/devices/bus/megadrive/md_carts.h
similarity index 100%
rename from src/emu/bus/megadrive/md_carts.h
rename to src/devices/bus/megadrive/md_carts.h
diff --git a/src/emu/bus/megadrive/md_slot.c b/src/devices/bus/megadrive/md_slot.c
similarity index 100%
rename from src/emu/bus/megadrive/md_slot.c
rename to src/devices/bus/megadrive/md_slot.c
diff --git a/src/emu/bus/megadrive/md_slot.h b/src/devices/bus/megadrive/md_slot.h
similarity index 100%
rename from src/emu/bus/megadrive/md_slot.h
rename to src/devices/bus/megadrive/md_slot.h
diff --git a/src/emu/bus/megadrive/rom.c b/src/devices/bus/megadrive/rom.c
similarity index 100%
rename from src/emu/bus/megadrive/rom.c
rename to src/devices/bus/megadrive/rom.c
diff --git a/src/emu/bus/megadrive/rom.h b/src/devices/bus/megadrive/rom.h
similarity index 100%
rename from src/emu/bus/megadrive/rom.h
rename to src/devices/bus/megadrive/rom.h
diff --git a/src/emu/bus/megadrive/sk.c b/src/devices/bus/megadrive/sk.c
similarity index 100%
rename from src/emu/bus/megadrive/sk.c
rename to src/devices/bus/megadrive/sk.c
diff --git a/src/emu/bus/megadrive/sk.h b/src/devices/bus/megadrive/sk.h
similarity index 100%
rename from src/emu/bus/megadrive/sk.h
rename to src/devices/bus/megadrive/sk.h
diff --git a/src/emu/bus/megadrive/stm95.c b/src/devices/bus/megadrive/stm95.c
similarity index 100%
rename from src/emu/bus/megadrive/stm95.c
rename to src/devices/bus/megadrive/stm95.c
diff --git a/src/emu/bus/megadrive/stm95.h b/src/devices/bus/megadrive/stm95.h
similarity index 100%
rename from src/emu/bus/megadrive/stm95.h
rename to src/devices/bus/megadrive/stm95.h
diff --git a/src/emu/bus/megadrive/svp.c b/src/devices/bus/megadrive/svp.c
similarity index 100%
rename from src/emu/bus/megadrive/svp.c
rename to src/devices/bus/megadrive/svp.c
diff --git a/src/emu/bus/megadrive/svp.h b/src/devices/bus/megadrive/svp.h
similarity index 100%
rename from src/emu/bus/megadrive/svp.h
rename to src/devices/bus/megadrive/svp.h
diff --git a/src/emu/bus/midi/midi.c b/src/devices/bus/midi/midi.c
similarity index 100%
rename from src/emu/bus/midi/midi.c
rename to src/devices/bus/midi/midi.c
diff --git a/src/emu/bus/midi/midi.h b/src/devices/bus/midi/midi.h
similarity index 100%
rename from src/emu/bus/midi/midi.h
rename to src/devices/bus/midi/midi.h
diff --git a/src/emu/bus/midi/midiinport.c b/src/devices/bus/midi/midiinport.c
similarity index 100%
rename from src/emu/bus/midi/midiinport.c
rename to src/devices/bus/midi/midiinport.c
diff --git a/src/emu/bus/midi/midiinport.h b/src/devices/bus/midi/midiinport.h
similarity index 100%
rename from src/emu/bus/midi/midiinport.h
rename to src/devices/bus/midi/midiinport.h
diff --git a/src/emu/bus/midi/midioutport.c b/src/devices/bus/midi/midioutport.c
similarity index 100%
rename from src/emu/bus/midi/midioutport.c
rename to src/devices/bus/midi/midioutport.c
diff --git a/src/emu/bus/midi/midioutport.h b/src/devices/bus/midi/midioutport.h
similarity index 100%
rename from src/emu/bus/midi/midioutport.h
rename to src/devices/bus/midi/midioutport.h
diff --git a/src/emu/bus/msx_cart/arc.c b/src/devices/bus/msx_cart/arc.c
similarity index 100%
rename from src/emu/bus/msx_cart/arc.c
rename to src/devices/bus/msx_cart/arc.c
diff --git a/src/emu/bus/msx_cart/arc.h b/src/devices/bus/msx_cart/arc.h
similarity index 100%
rename from src/emu/bus/msx_cart/arc.h
rename to src/devices/bus/msx_cart/arc.h
diff --git a/src/emu/bus/msx_cart/ascii.c b/src/devices/bus/msx_cart/ascii.c
similarity index 100%
rename from src/emu/bus/msx_cart/ascii.c
rename to src/devices/bus/msx_cart/ascii.c
diff --git a/src/emu/bus/msx_cart/ascii.h b/src/devices/bus/msx_cart/ascii.h
similarity index 100%
rename from src/emu/bus/msx_cart/ascii.h
rename to src/devices/bus/msx_cart/ascii.h
diff --git a/src/emu/bus/msx_cart/bm_012.c b/src/devices/bus/msx_cart/bm_012.c
similarity index 100%
rename from src/emu/bus/msx_cart/bm_012.c
rename to src/devices/bus/msx_cart/bm_012.c
diff --git a/src/emu/bus/msx_cart/bm_012.h b/src/devices/bus/msx_cart/bm_012.h
similarity index 100%
rename from src/emu/bus/msx_cart/bm_012.h
rename to src/devices/bus/msx_cart/bm_012.h
diff --git a/src/emu/bus/msx_cart/cartridge.c b/src/devices/bus/msx_cart/cartridge.c
similarity index 100%
rename from src/emu/bus/msx_cart/cartridge.c
rename to src/devices/bus/msx_cart/cartridge.c
diff --git a/src/emu/bus/msx_cart/cartridge.h b/src/devices/bus/msx_cart/cartridge.h
similarity index 100%
rename from src/emu/bus/msx_cart/cartridge.h
rename to src/devices/bus/msx_cart/cartridge.h
diff --git a/src/emu/bus/msx_cart/crossblaim.c b/src/devices/bus/msx_cart/crossblaim.c
similarity index 100%
rename from src/emu/bus/msx_cart/crossblaim.c
rename to src/devices/bus/msx_cart/crossblaim.c
diff --git a/src/emu/bus/msx_cart/crossblaim.h b/src/devices/bus/msx_cart/crossblaim.h
similarity index 100%
rename from src/emu/bus/msx_cart/crossblaim.h
rename to src/devices/bus/msx_cart/crossblaim.h
diff --git a/src/emu/bus/msx_cart/disk.c b/src/devices/bus/msx_cart/disk.c
similarity index 100%
rename from src/emu/bus/msx_cart/disk.c
rename to src/devices/bus/msx_cart/disk.c
diff --git a/src/emu/bus/msx_cart/disk.h b/src/devices/bus/msx_cart/disk.h
similarity index 100%
rename from src/emu/bus/msx_cart/disk.h
rename to src/devices/bus/msx_cart/disk.h
diff --git a/src/emu/bus/msx_cart/dooly.c b/src/devices/bus/msx_cart/dooly.c
similarity index 100%
rename from src/emu/bus/msx_cart/dooly.c
rename to src/devices/bus/msx_cart/dooly.c
diff --git a/src/emu/bus/msx_cart/dooly.h b/src/devices/bus/msx_cart/dooly.h
similarity index 100%
rename from src/emu/bus/msx_cart/dooly.h
rename to src/devices/bus/msx_cart/dooly.h
diff --git a/src/emu/bus/msx_cart/fmpac.c b/src/devices/bus/msx_cart/fmpac.c
similarity index 100%
rename from src/emu/bus/msx_cart/fmpac.c
rename to src/devices/bus/msx_cart/fmpac.c
diff --git a/src/emu/bus/msx_cart/fmpac.h b/src/devices/bus/msx_cart/fmpac.h
similarity index 100%
rename from src/emu/bus/msx_cart/fmpac.h
rename to src/devices/bus/msx_cart/fmpac.h
diff --git a/src/emu/bus/msx_cart/fs_sr022.c b/src/devices/bus/msx_cart/fs_sr022.c
similarity index 100%
rename from src/emu/bus/msx_cart/fs_sr022.c
rename to src/devices/bus/msx_cart/fs_sr022.c
diff --git a/src/emu/bus/msx_cart/fs_sr022.h b/src/devices/bus/msx_cart/fs_sr022.h
similarity index 100%
rename from src/emu/bus/msx_cart/fs_sr022.h
rename to src/devices/bus/msx_cart/fs_sr022.h
diff --git a/src/emu/bus/msx_cart/halnote.c b/src/devices/bus/msx_cart/halnote.c
similarity index 100%
rename from src/emu/bus/msx_cart/halnote.c
rename to src/devices/bus/msx_cart/halnote.c
diff --git a/src/emu/bus/msx_cart/halnote.h b/src/devices/bus/msx_cart/halnote.h
similarity index 100%
rename from src/emu/bus/msx_cart/halnote.h
rename to src/devices/bus/msx_cart/halnote.h
diff --git a/src/emu/bus/msx_cart/hfox.c b/src/devices/bus/msx_cart/hfox.c
similarity index 100%
rename from src/emu/bus/msx_cart/hfox.c
rename to src/devices/bus/msx_cart/hfox.c
diff --git a/src/emu/bus/msx_cart/hfox.h b/src/devices/bus/msx_cart/hfox.h
similarity index 100%
rename from src/emu/bus/msx_cart/hfox.h
rename to src/devices/bus/msx_cart/hfox.h
diff --git a/src/emu/bus/msx_cart/holy_quran.c b/src/devices/bus/msx_cart/holy_quran.c
similarity index 100%
rename from src/emu/bus/msx_cart/holy_quran.c
rename to src/devices/bus/msx_cart/holy_quran.c
diff --git a/src/emu/bus/msx_cart/holy_quran.h b/src/devices/bus/msx_cart/holy_quran.h
similarity index 100%
rename from src/emu/bus/msx_cart/holy_quran.h
rename to src/devices/bus/msx_cart/holy_quran.h
diff --git a/src/emu/bus/msx_cart/konami.c b/src/devices/bus/msx_cart/konami.c
similarity index 100%
rename from src/emu/bus/msx_cart/konami.c
rename to src/devices/bus/msx_cart/konami.c
diff --git a/src/emu/bus/msx_cart/konami.h b/src/devices/bus/msx_cart/konami.h
similarity index 100%
rename from src/emu/bus/msx_cart/konami.h
rename to src/devices/bus/msx_cart/konami.h
diff --git a/src/emu/bus/msx_cart/korean.c b/src/devices/bus/msx_cart/korean.c
similarity index 100%
rename from src/emu/bus/msx_cart/korean.c
rename to src/devices/bus/msx_cart/korean.c
diff --git a/src/emu/bus/msx_cart/korean.h b/src/devices/bus/msx_cart/korean.h
similarity index 100%
rename from src/emu/bus/msx_cart/korean.h
rename to src/devices/bus/msx_cart/korean.h
diff --git a/src/emu/bus/msx_cart/majutsushi.c b/src/devices/bus/msx_cart/majutsushi.c
similarity index 100%
rename from src/emu/bus/msx_cart/majutsushi.c
rename to src/devices/bus/msx_cart/majutsushi.c
diff --git a/src/emu/bus/msx_cart/majutsushi.h b/src/devices/bus/msx_cart/majutsushi.h
similarity index 100%
rename from src/emu/bus/msx_cart/majutsushi.h
rename to src/devices/bus/msx_cart/majutsushi.h
diff --git a/src/emu/bus/msx_cart/moonsound.c b/src/devices/bus/msx_cart/moonsound.c
similarity index 100%
rename from src/emu/bus/msx_cart/moonsound.c
rename to src/devices/bus/msx_cart/moonsound.c
diff --git a/src/emu/bus/msx_cart/moonsound.h b/src/devices/bus/msx_cart/moonsound.h
similarity index 100%
rename from src/emu/bus/msx_cart/moonsound.h
rename to src/devices/bus/msx_cart/moonsound.h
diff --git a/src/emu/bus/msx_cart/msx_audio.c b/src/devices/bus/msx_cart/msx_audio.c
similarity index 100%
rename from src/emu/bus/msx_cart/msx_audio.c
rename to src/devices/bus/msx_cart/msx_audio.c
diff --git a/src/emu/bus/msx_cart/msx_audio.h b/src/devices/bus/msx_cart/msx_audio.h
similarity index 100%
rename from src/emu/bus/msx_cart/msx_audio.h
rename to src/devices/bus/msx_cart/msx_audio.h
diff --git a/src/emu/bus/msx_cart/msx_audio_kb.c b/src/devices/bus/msx_cart/msx_audio_kb.c
similarity index 100%
rename from src/emu/bus/msx_cart/msx_audio_kb.c
rename to src/devices/bus/msx_cart/msx_audio_kb.c
diff --git a/src/emu/bus/msx_cart/msx_audio_kb.h b/src/devices/bus/msx_cart/msx_audio_kb.h
similarity index 100%
rename from src/emu/bus/msx_cart/msx_audio_kb.h
rename to src/devices/bus/msx_cart/msx_audio_kb.h
diff --git a/src/emu/bus/msx_cart/msxdos2.c b/src/devices/bus/msx_cart/msxdos2.c
similarity index 100%
rename from src/emu/bus/msx_cart/msxdos2.c
rename to src/devices/bus/msx_cart/msxdos2.c
diff --git a/src/emu/bus/msx_cart/msxdos2.h b/src/devices/bus/msx_cart/msxdos2.h
similarity index 100%
rename from src/emu/bus/msx_cart/msxdos2.h
rename to src/devices/bus/msx_cart/msxdos2.h
diff --git a/src/emu/bus/msx_cart/nomapper.c b/src/devices/bus/msx_cart/nomapper.c
similarity index 100%
rename from src/emu/bus/msx_cart/nomapper.c
rename to src/devices/bus/msx_cart/nomapper.c
diff --git a/src/emu/bus/msx_cart/nomapper.h b/src/devices/bus/msx_cart/nomapper.h
similarity index 100%
rename from src/emu/bus/msx_cart/nomapper.h
rename to src/devices/bus/msx_cart/nomapper.h
diff --git a/src/emu/bus/msx_cart/rtype.c b/src/devices/bus/msx_cart/rtype.c
similarity index 100%
rename from src/emu/bus/msx_cart/rtype.c
rename to src/devices/bus/msx_cart/rtype.c
diff --git a/src/emu/bus/msx_cart/rtype.h b/src/devices/bus/msx_cart/rtype.h
similarity index 100%
rename from src/emu/bus/msx_cart/rtype.h
rename to src/devices/bus/msx_cart/rtype.h
diff --git a/src/emu/bus/msx_cart/super_swangi.c b/src/devices/bus/msx_cart/super_swangi.c
similarity index 100%
rename from src/emu/bus/msx_cart/super_swangi.c
rename to src/devices/bus/msx_cart/super_swangi.c
diff --git a/src/emu/bus/msx_cart/super_swangi.h b/src/devices/bus/msx_cart/super_swangi.h
similarity index 100%
rename from src/emu/bus/msx_cart/super_swangi.h
rename to src/devices/bus/msx_cart/super_swangi.h
diff --git a/src/emu/bus/msx_cart/superloderunner.c b/src/devices/bus/msx_cart/superloderunner.c
similarity index 100%
rename from src/emu/bus/msx_cart/superloderunner.c
rename to src/devices/bus/msx_cart/superloderunner.c
diff --git a/src/emu/bus/msx_cart/superloderunner.h b/src/devices/bus/msx_cart/superloderunner.h
similarity index 100%
rename from src/emu/bus/msx_cart/superloderunner.h
rename to src/devices/bus/msx_cart/superloderunner.h
diff --git a/src/emu/bus/msx_cart/yamaha.c b/src/devices/bus/msx_cart/yamaha.c
similarity index 100%
rename from src/emu/bus/msx_cart/yamaha.c
rename to src/devices/bus/msx_cart/yamaha.c
diff --git a/src/emu/bus/msx_cart/yamaha.h b/src/devices/bus/msx_cart/yamaha.h
similarity index 100%
rename from src/emu/bus/msx_cart/yamaha.h
rename to src/devices/bus/msx_cart/yamaha.h
diff --git a/src/emu/bus/msx_slot/bunsetsu.c b/src/devices/bus/msx_slot/bunsetsu.c
similarity index 100%
rename from src/emu/bus/msx_slot/bunsetsu.c
rename to src/devices/bus/msx_slot/bunsetsu.c
diff --git a/src/emu/bus/msx_slot/bunsetsu.h b/src/devices/bus/msx_slot/bunsetsu.h
similarity index 100%
rename from src/emu/bus/msx_slot/bunsetsu.h
rename to src/devices/bus/msx_slot/bunsetsu.h
diff --git a/src/emu/bus/msx_slot/cartridge.c b/src/devices/bus/msx_slot/cartridge.c
similarity index 100%
rename from src/emu/bus/msx_slot/cartridge.c
rename to src/devices/bus/msx_slot/cartridge.c
diff --git a/src/emu/bus/msx_slot/cartridge.h b/src/devices/bus/msx_slot/cartridge.h
similarity index 100%
rename from src/emu/bus/msx_slot/cartridge.h
rename to src/devices/bus/msx_slot/cartridge.h
diff --git a/src/emu/bus/msx_slot/disk.c b/src/devices/bus/msx_slot/disk.c
similarity index 100%
rename from src/emu/bus/msx_slot/disk.c
rename to src/devices/bus/msx_slot/disk.c
diff --git a/src/emu/bus/msx_slot/disk.h b/src/devices/bus/msx_slot/disk.h
similarity index 100%
rename from src/emu/bus/msx_slot/disk.h
rename to src/devices/bus/msx_slot/disk.h
diff --git a/src/emu/bus/msx_slot/fs4600.c b/src/devices/bus/msx_slot/fs4600.c
similarity index 100%
rename from src/emu/bus/msx_slot/fs4600.c
rename to src/devices/bus/msx_slot/fs4600.c
diff --git a/src/emu/bus/msx_slot/fs4600.h b/src/devices/bus/msx_slot/fs4600.h
similarity index 100%
rename from src/emu/bus/msx_slot/fs4600.h
rename to src/devices/bus/msx_slot/fs4600.h
diff --git a/src/emu/bus/msx_slot/music.c b/src/devices/bus/msx_slot/music.c
similarity index 100%
rename from src/emu/bus/msx_slot/music.c
rename to src/devices/bus/msx_slot/music.c
diff --git a/src/emu/bus/msx_slot/music.h b/src/devices/bus/msx_slot/music.h
similarity index 100%
rename from src/emu/bus/msx_slot/music.h
rename to src/devices/bus/msx_slot/music.h
diff --git a/src/emu/bus/msx_slot/panasonic08.c b/src/devices/bus/msx_slot/panasonic08.c
similarity index 100%
rename from src/emu/bus/msx_slot/panasonic08.c
rename to src/devices/bus/msx_slot/panasonic08.c
diff --git a/src/emu/bus/msx_slot/panasonic08.h b/src/devices/bus/msx_slot/panasonic08.h
similarity index 100%
rename from src/emu/bus/msx_slot/panasonic08.h
rename to src/devices/bus/msx_slot/panasonic08.h
diff --git a/src/emu/bus/msx_slot/ram.c b/src/devices/bus/msx_slot/ram.c
similarity index 100%
rename from src/emu/bus/msx_slot/ram.c
rename to src/devices/bus/msx_slot/ram.c
diff --git a/src/emu/bus/msx_slot/ram.h b/src/devices/bus/msx_slot/ram.h
similarity index 100%
rename from src/emu/bus/msx_slot/ram.h
rename to src/devices/bus/msx_slot/ram.h
diff --git a/src/emu/bus/msx_slot/ram_mm.c b/src/devices/bus/msx_slot/ram_mm.c
similarity index 100%
rename from src/emu/bus/msx_slot/ram_mm.c
rename to src/devices/bus/msx_slot/ram_mm.c
diff --git a/src/emu/bus/msx_slot/ram_mm.h b/src/devices/bus/msx_slot/ram_mm.h
similarity index 100%
rename from src/emu/bus/msx_slot/ram_mm.h
rename to src/devices/bus/msx_slot/ram_mm.h
diff --git a/src/emu/bus/msx_slot/rom.c b/src/devices/bus/msx_slot/rom.c
similarity index 100%
rename from src/emu/bus/msx_slot/rom.c
rename to src/devices/bus/msx_slot/rom.c
diff --git a/src/emu/bus/msx_slot/rom.h b/src/devices/bus/msx_slot/rom.h
similarity index 100%
rename from src/emu/bus/msx_slot/rom.h
rename to src/devices/bus/msx_slot/rom.h
diff --git a/src/emu/bus/msx_slot/slot.c b/src/devices/bus/msx_slot/slot.c
similarity index 100%
rename from src/emu/bus/msx_slot/slot.c
rename to src/devices/bus/msx_slot/slot.c
diff --git a/src/emu/bus/msx_slot/slot.h b/src/devices/bus/msx_slot/slot.h
similarity index 100%
rename from src/emu/bus/msx_slot/slot.h
rename to src/devices/bus/msx_slot/slot.h
diff --git a/src/emu/bus/msx_slot/sony08.c b/src/devices/bus/msx_slot/sony08.c
similarity index 100%
rename from src/emu/bus/msx_slot/sony08.c
rename to src/devices/bus/msx_slot/sony08.c
diff --git a/src/emu/bus/msx_slot/sony08.h b/src/devices/bus/msx_slot/sony08.h
similarity index 100%
rename from src/emu/bus/msx_slot/sony08.h
rename to src/devices/bus/msx_slot/sony08.h
diff --git a/src/emu/bus/nasbus/avc.c b/src/devices/bus/nasbus/avc.c
similarity index 100%
rename from src/emu/bus/nasbus/avc.c
rename to src/devices/bus/nasbus/avc.c
diff --git a/src/emu/bus/nasbus/avc.h b/src/devices/bus/nasbus/avc.h
similarity index 100%
rename from src/emu/bus/nasbus/avc.h
rename to src/devices/bus/nasbus/avc.h
diff --git a/src/emu/bus/nasbus/cards.c b/src/devices/bus/nasbus/cards.c
similarity index 100%
rename from src/emu/bus/nasbus/cards.c
rename to src/devices/bus/nasbus/cards.c
diff --git a/src/emu/bus/nasbus/cards.h b/src/devices/bus/nasbus/cards.h
similarity index 100%
rename from src/emu/bus/nasbus/cards.h
rename to src/devices/bus/nasbus/cards.h
diff --git a/src/emu/bus/nasbus/floppy.c b/src/devices/bus/nasbus/floppy.c
similarity index 100%
rename from src/emu/bus/nasbus/floppy.c
rename to src/devices/bus/nasbus/floppy.c
diff --git a/src/emu/bus/nasbus/floppy.h b/src/devices/bus/nasbus/floppy.h
similarity index 100%
rename from src/emu/bus/nasbus/floppy.h
rename to src/devices/bus/nasbus/floppy.h
diff --git a/src/emu/bus/nasbus/nasbus.c b/src/devices/bus/nasbus/nasbus.c
similarity index 100%
rename from src/emu/bus/nasbus/nasbus.c
rename to src/devices/bus/nasbus/nasbus.c
diff --git a/src/emu/bus/nasbus/nasbus.h b/src/devices/bus/nasbus/nasbus.h
similarity index 100%
rename from src/emu/bus/nasbus/nasbus.h
rename to src/devices/bus/nasbus/nasbus.h
diff --git a/src/emu/bus/neogeo/banked_cart.c b/src/devices/bus/neogeo/banked_cart.c
similarity index 100%
rename from src/emu/bus/neogeo/banked_cart.c
rename to src/devices/bus/neogeo/banked_cart.c
diff --git a/src/emu/bus/neogeo/banked_cart.h b/src/devices/bus/neogeo/banked_cart.h
similarity index 100%
rename from src/emu/bus/neogeo/banked_cart.h
rename to src/devices/bus/neogeo/banked_cart.h
diff --git a/src/emu/bus/neogeo/bootleg_cart.c b/src/devices/bus/neogeo/bootleg_cart.c
similarity index 100%
rename from src/emu/bus/neogeo/bootleg_cart.c
rename to src/devices/bus/neogeo/bootleg_cart.c
diff --git a/src/emu/bus/neogeo/bootleg_cart.h b/src/devices/bus/neogeo/bootleg_cart.h
similarity index 100%
rename from src/emu/bus/neogeo/bootleg_cart.h
rename to src/devices/bus/neogeo/bootleg_cart.h
diff --git a/src/emu/bus/neogeo/bootleg_hybrid_cart.c b/src/devices/bus/neogeo/bootleg_hybrid_cart.c
similarity index 100%
rename from src/emu/bus/neogeo/bootleg_hybrid_cart.c
rename to src/devices/bus/neogeo/bootleg_hybrid_cart.c
diff --git a/src/emu/bus/neogeo/bootleg_hybrid_cart.h b/src/devices/bus/neogeo/bootleg_hybrid_cart.h
similarity index 100%
rename from src/emu/bus/neogeo/bootleg_hybrid_cart.h
rename to src/devices/bus/neogeo/bootleg_hybrid_cart.h
diff --git a/src/emu/bus/neogeo/bootleg_prot.c b/src/devices/bus/neogeo/bootleg_prot.c
similarity index 100%
rename from src/emu/bus/neogeo/bootleg_prot.c
rename to src/devices/bus/neogeo/bootleg_prot.c
diff --git a/src/emu/bus/neogeo/bootleg_prot.h b/src/devices/bus/neogeo/bootleg_prot.h
similarity index 100%
rename from src/emu/bus/neogeo/bootleg_prot.h
rename to src/devices/bus/neogeo/bootleg_prot.h
diff --git a/src/emu/bus/neogeo/cmc_cart.c b/src/devices/bus/neogeo/cmc_cart.c
similarity index 100%
rename from src/emu/bus/neogeo/cmc_cart.c
rename to src/devices/bus/neogeo/cmc_cart.c
diff --git a/src/emu/bus/neogeo/cmc_cart.h b/src/devices/bus/neogeo/cmc_cart.h
similarity index 100%
rename from src/emu/bus/neogeo/cmc_cart.h
rename to src/devices/bus/neogeo/cmc_cart.h
diff --git a/src/emu/bus/neogeo/cmc_prot.c b/src/devices/bus/neogeo/cmc_prot.c
similarity index 100%
rename from src/emu/bus/neogeo/cmc_prot.c
rename to src/devices/bus/neogeo/cmc_prot.c
diff --git a/src/emu/bus/neogeo/cmc_prot.h b/src/devices/bus/neogeo/cmc_prot.h
similarity index 100%
rename from src/emu/bus/neogeo/cmc_prot.h
rename to src/devices/bus/neogeo/cmc_prot.h
diff --git a/src/emu/bus/neogeo/fatfury2_cart.c b/src/devices/bus/neogeo/fatfury2_cart.c
similarity index 100%
rename from src/emu/bus/neogeo/fatfury2_cart.c
rename to src/devices/bus/neogeo/fatfury2_cart.c
diff --git a/src/emu/bus/neogeo/fatfury2_cart.h b/src/devices/bus/neogeo/fatfury2_cart.h
similarity index 100%
rename from src/emu/bus/neogeo/fatfury2_cart.h
rename to src/devices/bus/neogeo/fatfury2_cart.h
diff --git a/src/emu/bus/neogeo/fatfury2_prot.c b/src/devices/bus/neogeo/fatfury2_prot.c
similarity index 100%
rename from src/emu/bus/neogeo/fatfury2_prot.c
rename to src/devices/bus/neogeo/fatfury2_prot.c
diff --git a/src/emu/bus/neogeo/fatfury2_prot.h b/src/devices/bus/neogeo/fatfury2_prot.h
similarity index 100%
rename from src/emu/bus/neogeo/fatfury2_prot.h
rename to src/devices/bus/neogeo/fatfury2_prot.h
diff --git a/src/emu/bus/neogeo/kof2002_cart.c b/src/devices/bus/neogeo/kof2002_cart.c
similarity index 100%
rename from src/emu/bus/neogeo/kof2002_cart.c
rename to src/devices/bus/neogeo/kof2002_cart.c
diff --git a/src/emu/bus/neogeo/kof2002_cart.h b/src/devices/bus/neogeo/kof2002_cart.h
similarity index 100%
rename from src/emu/bus/neogeo/kof2002_cart.h
rename to src/devices/bus/neogeo/kof2002_cart.h
diff --git a/src/emu/bus/neogeo/kof2002_prot.c b/src/devices/bus/neogeo/kof2002_prot.c
similarity index 100%
rename from src/emu/bus/neogeo/kof2002_prot.c
rename to src/devices/bus/neogeo/kof2002_prot.c
diff --git a/src/emu/bus/neogeo/kof2002_prot.h b/src/devices/bus/neogeo/kof2002_prot.h
similarity index 100%
rename from src/emu/bus/neogeo/kof2002_prot.h
rename to src/devices/bus/neogeo/kof2002_prot.h
diff --git a/src/emu/bus/neogeo/kof98_cart.c b/src/devices/bus/neogeo/kof98_cart.c
similarity index 100%
rename from src/emu/bus/neogeo/kof98_cart.c
rename to src/devices/bus/neogeo/kof98_cart.c
diff --git a/src/emu/bus/neogeo/kof98_cart.h b/src/devices/bus/neogeo/kof98_cart.h
similarity index 100%
rename from src/emu/bus/neogeo/kof98_cart.h
rename to src/devices/bus/neogeo/kof98_cart.h
diff --git a/src/emu/bus/neogeo/kof98_prot.c b/src/devices/bus/neogeo/kof98_prot.c
similarity index 100%
rename from src/emu/bus/neogeo/kof98_prot.c
rename to src/devices/bus/neogeo/kof98_prot.c
diff --git a/src/emu/bus/neogeo/kof98_prot.h b/src/devices/bus/neogeo/kof98_prot.h
similarity index 100%
rename from src/emu/bus/neogeo/kof98_prot.h
rename to src/devices/bus/neogeo/kof98_prot.h
diff --git a/src/emu/bus/neogeo/kog_prot.c b/src/devices/bus/neogeo/kog_prot.c
similarity index 100%
rename from src/emu/bus/neogeo/kog_prot.c
rename to src/devices/bus/neogeo/kog_prot.c
diff --git a/src/emu/bus/neogeo/kog_prot.h b/src/devices/bus/neogeo/kog_prot.h
similarity index 100%
rename from src/emu/bus/neogeo/kog_prot.h
rename to src/devices/bus/neogeo/kog_prot.h
diff --git a/src/emu/bus/neogeo/mslugx_cart.c b/src/devices/bus/neogeo/mslugx_cart.c
similarity index 100%
rename from src/emu/bus/neogeo/mslugx_cart.c
rename to src/devices/bus/neogeo/mslugx_cart.c
diff --git a/src/emu/bus/neogeo/mslugx_cart.h b/src/devices/bus/neogeo/mslugx_cart.h
similarity index 100%
rename from src/emu/bus/neogeo/mslugx_cart.h
rename to src/devices/bus/neogeo/mslugx_cart.h
diff --git a/src/emu/bus/neogeo/mslugx_prot.c b/src/devices/bus/neogeo/mslugx_prot.c
similarity index 100%
rename from src/emu/bus/neogeo/mslugx_prot.c
rename to src/devices/bus/neogeo/mslugx_prot.c
diff --git a/src/emu/bus/neogeo/mslugx_prot.h b/src/devices/bus/neogeo/mslugx_prot.h
similarity index 100%
rename from src/emu/bus/neogeo/mslugx_prot.h
rename to src/devices/bus/neogeo/mslugx_prot.h
diff --git a/src/emu/bus/neogeo/neogeo_carts.c b/src/devices/bus/neogeo/neogeo_carts.c
similarity index 100%
rename from src/emu/bus/neogeo/neogeo_carts.c
rename to src/devices/bus/neogeo/neogeo_carts.c
diff --git a/src/emu/bus/neogeo/neogeo_carts.h b/src/devices/bus/neogeo/neogeo_carts.h
similarity index 100%
rename from src/emu/bus/neogeo/neogeo_carts.h
rename to src/devices/bus/neogeo/neogeo_carts.h
diff --git a/src/emu/bus/neogeo/neogeo_helper.c b/src/devices/bus/neogeo/neogeo_helper.c
similarity index 100%
rename from src/emu/bus/neogeo/neogeo_helper.c
rename to src/devices/bus/neogeo/neogeo_helper.c
diff --git a/src/emu/bus/neogeo/neogeo_helper.h b/src/devices/bus/neogeo/neogeo_helper.h
similarity index 100%
rename from src/emu/bus/neogeo/neogeo_helper.h
rename to src/devices/bus/neogeo/neogeo_helper.h
diff --git a/src/emu/bus/neogeo/neogeo_intf.c b/src/devices/bus/neogeo/neogeo_intf.c
similarity index 100%
rename from src/emu/bus/neogeo/neogeo_intf.c
rename to src/devices/bus/neogeo/neogeo_intf.c
diff --git a/src/emu/bus/neogeo/neogeo_intf.h b/src/devices/bus/neogeo/neogeo_intf.h
similarity index 100%
rename from src/emu/bus/neogeo/neogeo_intf.h
rename to src/devices/bus/neogeo/neogeo_intf.h
diff --git a/src/emu/bus/neogeo/neogeo_slot.c b/src/devices/bus/neogeo/neogeo_slot.c
similarity index 100%
rename from src/emu/bus/neogeo/neogeo_slot.c
rename to src/devices/bus/neogeo/neogeo_slot.c
diff --git a/src/emu/bus/neogeo/neogeo_slot.h b/src/devices/bus/neogeo/neogeo_slot.h
similarity index 100%
rename from src/emu/bus/neogeo/neogeo_slot.h
rename to src/devices/bus/neogeo/neogeo_slot.h
diff --git a/src/emu/bus/neogeo/pcm2_cart.c b/src/devices/bus/neogeo/pcm2_cart.c
similarity index 100%
rename from src/emu/bus/neogeo/pcm2_cart.c
rename to src/devices/bus/neogeo/pcm2_cart.c
diff --git a/src/emu/bus/neogeo/pcm2_cart.h b/src/devices/bus/neogeo/pcm2_cart.h
similarity index 100%
rename from src/emu/bus/neogeo/pcm2_cart.h
rename to src/devices/bus/neogeo/pcm2_cart.h
diff --git a/src/emu/bus/neogeo/pcm2_prot.c b/src/devices/bus/neogeo/pcm2_prot.c
similarity index 100%
rename from src/emu/bus/neogeo/pcm2_prot.c
rename to src/devices/bus/neogeo/pcm2_prot.c
diff --git a/src/emu/bus/neogeo/pcm2_prot.h b/src/devices/bus/neogeo/pcm2_prot.h
similarity index 100%
rename from src/emu/bus/neogeo/pcm2_prot.h
rename to src/devices/bus/neogeo/pcm2_prot.h
diff --git a/src/emu/bus/neogeo/pvc_cart.c b/src/devices/bus/neogeo/pvc_cart.c
similarity index 100%
rename from src/emu/bus/neogeo/pvc_cart.c
rename to src/devices/bus/neogeo/pvc_cart.c
diff --git a/src/emu/bus/neogeo/pvc_cart.h b/src/devices/bus/neogeo/pvc_cart.h
similarity index 100%
rename from src/emu/bus/neogeo/pvc_cart.h
rename to src/devices/bus/neogeo/pvc_cart.h
diff --git a/src/emu/bus/neogeo/pvc_prot.c b/src/devices/bus/neogeo/pvc_prot.c
similarity index 100%
rename from src/emu/bus/neogeo/pvc_prot.c
rename to src/devices/bus/neogeo/pvc_prot.c
diff --git a/src/emu/bus/neogeo/pvc_prot.h b/src/devices/bus/neogeo/pvc_prot.h
similarity index 100%
rename from src/emu/bus/neogeo/pvc_prot.h
rename to src/devices/bus/neogeo/pvc_prot.h
diff --git a/src/emu/bus/neogeo/rom.c b/src/devices/bus/neogeo/rom.c
similarity index 100%
rename from src/emu/bus/neogeo/rom.c
rename to src/devices/bus/neogeo/rom.c
diff --git a/src/emu/bus/neogeo/rom.h b/src/devices/bus/neogeo/rom.h
similarity index 100%
rename from src/emu/bus/neogeo/rom.h
rename to src/devices/bus/neogeo/rom.h
diff --git a/src/emu/bus/neogeo/sbp_prot.c b/src/devices/bus/neogeo/sbp_prot.c
similarity index 100%
rename from src/emu/bus/neogeo/sbp_prot.c
rename to src/devices/bus/neogeo/sbp_prot.c
diff --git a/src/emu/bus/neogeo/sbp_prot.h b/src/devices/bus/neogeo/sbp_prot.h
similarity index 100%
rename from src/emu/bus/neogeo/sbp_prot.h
rename to src/devices/bus/neogeo/sbp_prot.h
diff --git a/src/emu/bus/neogeo/sma_cart.c b/src/devices/bus/neogeo/sma_cart.c
similarity index 100%
rename from src/emu/bus/neogeo/sma_cart.c
rename to src/devices/bus/neogeo/sma_cart.c
diff --git a/src/emu/bus/neogeo/sma_cart.h b/src/devices/bus/neogeo/sma_cart.h
similarity index 100%
rename from src/emu/bus/neogeo/sma_cart.h
rename to src/devices/bus/neogeo/sma_cart.h
diff --git a/src/emu/bus/neogeo/sma_prot.c b/src/devices/bus/neogeo/sma_prot.c
similarity index 100%
rename from src/emu/bus/neogeo/sma_prot.c
rename to src/devices/bus/neogeo/sma_prot.c
diff --git a/src/emu/bus/neogeo/sma_prot.h b/src/devices/bus/neogeo/sma_prot.h
similarity index 100%
rename from src/emu/bus/neogeo/sma_prot.h
rename to src/devices/bus/neogeo/sma_prot.h
diff --git a/src/emu/bus/nes/2a03pur.c b/src/devices/bus/nes/2a03pur.c
similarity index 100%
rename from src/emu/bus/nes/2a03pur.c
rename to src/devices/bus/nes/2a03pur.c
diff --git a/src/emu/bus/nes/2a03pur.h b/src/devices/bus/nes/2a03pur.h
similarity index 100%
rename from src/emu/bus/nes/2a03pur.h
rename to src/devices/bus/nes/2a03pur.h
diff --git a/src/emu/bus/nes/act53.c b/src/devices/bus/nes/act53.c
similarity index 100%
rename from src/emu/bus/nes/act53.c
rename to src/devices/bus/nes/act53.c
diff --git a/src/emu/bus/nes/act53.h b/src/devices/bus/nes/act53.h
similarity index 100%
rename from src/emu/bus/nes/act53.h
rename to src/devices/bus/nes/act53.h
diff --git a/src/emu/bus/nes/aladdin.c b/src/devices/bus/nes/aladdin.c
similarity index 100%
rename from src/emu/bus/nes/aladdin.c
rename to src/devices/bus/nes/aladdin.c
diff --git a/src/emu/bus/nes/aladdin.h b/src/devices/bus/nes/aladdin.h
similarity index 100%
rename from src/emu/bus/nes/aladdin.h
rename to src/devices/bus/nes/aladdin.h
diff --git a/src/emu/bus/nes/ave.c b/src/devices/bus/nes/ave.c
similarity index 100%
rename from src/emu/bus/nes/ave.c
rename to src/devices/bus/nes/ave.c
diff --git a/src/emu/bus/nes/ave.h b/src/devices/bus/nes/ave.h
similarity index 100%
rename from src/emu/bus/nes/ave.h
rename to src/devices/bus/nes/ave.h
diff --git a/src/emu/bus/nes/bandai.c b/src/devices/bus/nes/bandai.c
similarity index 100%
rename from src/emu/bus/nes/bandai.c
rename to src/devices/bus/nes/bandai.c
diff --git a/src/emu/bus/nes/bandai.h b/src/devices/bus/nes/bandai.h
similarity index 100%
rename from src/emu/bus/nes/bandai.h
rename to src/devices/bus/nes/bandai.h
diff --git a/src/emu/bus/nes/benshieng.c b/src/devices/bus/nes/benshieng.c
similarity index 100%
rename from src/emu/bus/nes/benshieng.c
rename to src/devices/bus/nes/benshieng.c
diff --git a/src/emu/bus/nes/benshieng.h b/src/devices/bus/nes/benshieng.h
similarity index 100%
rename from src/emu/bus/nes/benshieng.h
rename to src/devices/bus/nes/benshieng.h
diff --git a/src/emu/bus/nes/bootleg.c b/src/devices/bus/nes/bootleg.c
similarity index 100%
rename from src/emu/bus/nes/bootleg.c
rename to src/devices/bus/nes/bootleg.c
diff --git a/src/emu/bus/nes/bootleg.h b/src/devices/bus/nes/bootleg.h
similarity index 100%
rename from src/emu/bus/nes/bootleg.h
rename to src/devices/bus/nes/bootleg.h
diff --git a/src/emu/bus/nes/camerica.c b/src/devices/bus/nes/camerica.c
similarity index 100%
rename from src/emu/bus/nes/camerica.c
rename to src/devices/bus/nes/camerica.c
diff --git a/src/emu/bus/nes/camerica.h b/src/devices/bus/nes/camerica.h
similarity index 100%
rename from src/emu/bus/nes/camerica.h
rename to src/devices/bus/nes/camerica.h
diff --git a/src/emu/bus/nes/cne.c b/src/devices/bus/nes/cne.c
similarity index 100%
rename from src/emu/bus/nes/cne.c
rename to src/devices/bus/nes/cne.c
diff --git a/src/emu/bus/nes/cne.h b/src/devices/bus/nes/cne.h
similarity index 100%
rename from src/emu/bus/nes/cne.h
rename to src/devices/bus/nes/cne.h
diff --git a/src/emu/bus/nes/cony.c b/src/devices/bus/nes/cony.c
similarity index 100%
rename from src/emu/bus/nes/cony.c
rename to src/devices/bus/nes/cony.c
diff --git a/src/emu/bus/nes/cony.h b/src/devices/bus/nes/cony.h
similarity index 100%
rename from src/emu/bus/nes/cony.h
rename to src/devices/bus/nes/cony.h
diff --git a/src/emu/bus/nes/datach.c b/src/devices/bus/nes/datach.c
similarity index 100%
rename from src/emu/bus/nes/datach.c
rename to src/devices/bus/nes/datach.c
diff --git a/src/emu/bus/nes/datach.h b/src/devices/bus/nes/datach.h
similarity index 100%
rename from src/emu/bus/nes/datach.h
rename to src/devices/bus/nes/datach.h
diff --git a/src/emu/bus/nes/discrete.c b/src/devices/bus/nes/discrete.c
similarity index 100%
rename from src/emu/bus/nes/discrete.c
rename to src/devices/bus/nes/discrete.c
diff --git a/src/emu/bus/nes/discrete.h b/src/devices/bus/nes/discrete.h
similarity index 100%
rename from src/emu/bus/nes/discrete.h
rename to src/devices/bus/nes/discrete.h
diff --git a/src/emu/bus/nes/disksys.c b/src/devices/bus/nes/disksys.c
similarity index 100%
rename from src/emu/bus/nes/disksys.c
rename to src/devices/bus/nes/disksys.c
diff --git a/src/emu/bus/nes/disksys.h b/src/devices/bus/nes/disksys.h
similarity index 100%
rename from src/emu/bus/nes/disksys.h
rename to src/devices/bus/nes/disksys.h
diff --git a/src/emu/bus/nes/event.c b/src/devices/bus/nes/event.c
similarity index 100%
rename from src/emu/bus/nes/event.c
rename to src/devices/bus/nes/event.c
diff --git a/src/emu/bus/nes/event.h b/src/devices/bus/nes/event.h
similarity index 100%
rename from src/emu/bus/nes/event.h
rename to src/devices/bus/nes/event.h
diff --git a/src/emu/bus/nes/ggenie.c b/src/devices/bus/nes/ggenie.c
similarity index 100%
rename from src/emu/bus/nes/ggenie.c
rename to src/devices/bus/nes/ggenie.c
diff --git a/src/emu/bus/nes/ggenie.h b/src/devices/bus/nes/ggenie.h
similarity index 100%
rename from src/emu/bus/nes/ggenie.h
rename to src/devices/bus/nes/ggenie.h
diff --git a/src/emu/bus/nes/henggedianzi.c b/src/devices/bus/nes/henggedianzi.c
similarity index 100%
rename from src/emu/bus/nes/henggedianzi.c
rename to src/devices/bus/nes/henggedianzi.c
diff --git a/src/emu/bus/nes/henggedianzi.h b/src/devices/bus/nes/henggedianzi.h
similarity index 100%
rename from src/emu/bus/nes/henggedianzi.h
rename to src/devices/bus/nes/henggedianzi.h
diff --git a/src/emu/bus/nes/hes.c b/src/devices/bus/nes/hes.c
similarity index 100%
rename from src/emu/bus/nes/hes.c
rename to src/devices/bus/nes/hes.c
diff --git a/src/emu/bus/nes/hes.h b/src/devices/bus/nes/hes.h
similarity index 100%
rename from src/emu/bus/nes/hes.h
rename to src/devices/bus/nes/hes.h
diff --git a/src/emu/bus/nes/hosenkan.c b/src/devices/bus/nes/hosenkan.c
similarity index 100%
rename from src/emu/bus/nes/hosenkan.c
rename to src/devices/bus/nes/hosenkan.c
diff --git a/src/emu/bus/nes/hosenkan.h b/src/devices/bus/nes/hosenkan.h
similarity index 100%
rename from src/emu/bus/nes/hosenkan.h
rename to src/devices/bus/nes/hosenkan.h
diff --git a/src/emu/bus/nes/irem.c b/src/devices/bus/nes/irem.c
similarity index 100%
rename from src/emu/bus/nes/irem.c
rename to src/devices/bus/nes/irem.c
diff --git a/src/emu/bus/nes/irem.h b/src/devices/bus/nes/irem.h
similarity index 100%
rename from src/emu/bus/nes/irem.h
rename to src/devices/bus/nes/irem.h
diff --git a/src/emu/bus/nes/jaleco.c b/src/devices/bus/nes/jaleco.c
similarity index 100%
rename from src/emu/bus/nes/jaleco.c
rename to src/devices/bus/nes/jaleco.c
diff --git a/src/emu/bus/nes/jaleco.h b/src/devices/bus/nes/jaleco.h
similarity index 100%
rename from src/emu/bus/nes/jaleco.h
rename to src/devices/bus/nes/jaleco.h
diff --git a/src/emu/bus/nes/jy.c b/src/devices/bus/nes/jy.c
similarity index 100%
rename from src/emu/bus/nes/jy.c
rename to src/devices/bus/nes/jy.c
diff --git a/src/emu/bus/nes/jy.h b/src/devices/bus/nes/jy.h
similarity index 100%
rename from src/emu/bus/nes/jy.h
rename to src/devices/bus/nes/jy.h
diff --git a/src/emu/bus/nes/kaiser.c b/src/devices/bus/nes/kaiser.c
similarity index 100%
rename from src/emu/bus/nes/kaiser.c
rename to src/devices/bus/nes/kaiser.c
diff --git a/src/emu/bus/nes/kaiser.h b/src/devices/bus/nes/kaiser.h
similarity index 100%
rename from src/emu/bus/nes/kaiser.h
rename to src/devices/bus/nes/kaiser.h
diff --git a/src/emu/bus/nes/karastudio.c b/src/devices/bus/nes/karastudio.c
similarity index 100%
rename from src/emu/bus/nes/karastudio.c
rename to src/devices/bus/nes/karastudio.c
diff --git a/src/emu/bus/nes/karastudio.h b/src/devices/bus/nes/karastudio.h
similarity index 100%
rename from src/emu/bus/nes/karastudio.h
rename to src/devices/bus/nes/karastudio.h
diff --git a/src/emu/bus/nes/konami.c b/src/devices/bus/nes/konami.c
similarity index 100%
rename from src/emu/bus/nes/konami.c
rename to src/devices/bus/nes/konami.c
diff --git a/src/emu/bus/nes/konami.h b/src/devices/bus/nes/konami.h
similarity index 100%
rename from src/emu/bus/nes/konami.h
rename to src/devices/bus/nes/konami.h
diff --git a/src/emu/bus/nes/legacy.c b/src/devices/bus/nes/legacy.c
similarity index 100%
rename from src/emu/bus/nes/legacy.c
rename to src/devices/bus/nes/legacy.c
diff --git a/src/emu/bus/nes/legacy.h b/src/devices/bus/nes/legacy.h
similarity index 100%
rename from src/emu/bus/nes/legacy.h
rename to src/devices/bus/nes/legacy.h
diff --git a/src/emu/bus/nes/mmc1.c b/src/devices/bus/nes/mmc1.c
similarity index 100%
rename from src/emu/bus/nes/mmc1.c
rename to src/devices/bus/nes/mmc1.c
diff --git a/src/emu/bus/nes/mmc1.h b/src/devices/bus/nes/mmc1.h
similarity index 100%
rename from src/emu/bus/nes/mmc1.h
rename to src/devices/bus/nes/mmc1.h
diff --git a/src/emu/bus/nes/mmc2.c b/src/devices/bus/nes/mmc2.c
similarity index 100%
rename from src/emu/bus/nes/mmc2.c
rename to src/devices/bus/nes/mmc2.c
diff --git a/src/emu/bus/nes/mmc2.h b/src/devices/bus/nes/mmc2.h
similarity index 100%
rename from src/emu/bus/nes/mmc2.h
rename to src/devices/bus/nes/mmc2.h
diff --git a/src/emu/bus/nes/mmc3.c b/src/devices/bus/nes/mmc3.c
similarity index 100%
rename from src/emu/bus/nes/mmc3.c
rename to src/devices/bus/nes/mmc3.c
diff --git a/src/emu/bus/nes/mmc3.h b/src/devices/bus/nes/mmc3.h
similarity index 100%
rename from src/emu/bus/nes/mmc3.h
rename to src/devices/bus/nes/mmc3.h
diff --git a/src/emu/bus/nes/mmc3_clones.c b/src/devices/bus/nes/mmc3_clones.c
similarity index 100%
rename from src/emu/bus/nes/mmc3_clones.c
rename to src/devices/bus/nes/mmc3_clones.c
diff --git a/src/emu/bus/nes/mmc3_clones.h b/src/devices/bus/nes/mmc3_clones.h
similarity index 100%
rename from src/emu/bus/nes/mmc3_clones.h
rename to src/devices/bus/nes/mmc3_clones.h
diff --git a/src/emu/bus/nes/mmc5.c b/src/devices/bus/nes/mmc5.c
similarity index 100%
rename from src/emu/bus/nes/mmc5.c
rename to src/devices/bus/nes/mmc5.c
diff --git a/src/emu/bus/nes/mmc5.h b/src/devices/bus/nes/mmc5.h
similarity index 100%
rename from src/emu/bus/nes/mmc5.h
rename to src/devices/bus/nes/mmc5.h
diff --git a/src/emu/bus/nes/multigame.c b/src/devices/bus/nes/multigame.c
similarity index 100%
rename from src/emu/bus/nes/multigame.c
rename to src/devices/bus/nes/multigame.c
diff --git a/src/emu/bus/nes/multigame.h b/src/devices/bus/nes/multigame.h
similarity index 100%
rename from src/emu/bus/nes/multigame.h
rename to src/devices/bus/nes/multigame.h
diff --git a/src/emu/bus/nes/namcot.c b/src/devices/bus/nes/namcot.c
similarity index 100%
rename from src/emu/bus/nes/namcot.c
rename to src/devices/bus/nes/namcot.c
diff --git a/src/emu/bus/nes/namcot.h b/src/devices/bus/nes/namcot.h
similarity index 100%
rename from src/emu/bus/nes/namcot.h
rename to src/devices/bus/nes/namcot.h
diff --git a/src/emu/bus/nes/nanjing.c b/src/devices/bus/nes/nanjing.c
similarity index 100%
rename from src/emu/bus/nes/nanjing.c
rename to src/devices/bus/nes/nanjing.c
diff --git a/src/emu/bus/nes/nanjing.h b/src/devices/bus/nes/nanjing.h
similarity index 100%
rename from src/emu/bus/nes/nanjing.h
rename to src/devices/bus/nes/nanjing.h
diff --git a/src/emu/bus/nes/nes_carts.c b/src/devices/bus/nes/nes_carts.c
similarity index 100%
rename from src/emu/bus/nes/nes_carts.c
rename to src/devices/bus/nes/nes_carts.c
diff --git a/src/emu/bus/nes/nes_carts.h b/src/devices/bus/nes/nes_carts.h
similarity index 100%
rename from src/emu/bus/nes/nes_carts.h
rename to src/devices/bus/nes/nes_carts.h
diff --git a/src/emu/bus/nes/nes_ines.inc b/src/devices/bus/nes/nes_ines.inc
similarity index 100%
rename from src/emu/bus/nes/nes_ines.inc
rename to src/devices/bus/nes/nes_ines.inc
diff --git a/src/emu/bus/nes/nes_pcb.inc b/src/devices/bus/nes/nes_pcb.inc
similarity index 100%
rename from src/emu/bus/nes/nes_pcb.inc
rename to src/devices/bus/nes/nes_pcb.inc
diff --git a/src/emu/bus/nes/nes_slot.c b/src/devices/bus/nes/nes_slot.c
similarity index 100%
rename from src/emu/bus/nes/nes_slot.c
rename to src/devices/bus/nes/nes_slot.c
diff --git a/src/emu/bus/nes/nes_slot.h b/src/devices/bus/nes/nes_slot.h
similarity index 100%
rename from src/emu/bus/nes/nes_slot.h
rename to src/devices/bus/nes/nes_slot.h
diff --git a/src/emu/bus/nes/nes_unif.inc b/src/devices/bus/nes/nes_unif.inc
similarity index 100%
rename from src/emu/bus/nes/nes_unif.inc
rename to src/devices/bus/nes/nes_unif.inc
diff --git a/src/emu/bus/nes/ntdec.c b/src/devices/bus/nes/ntdec.c
similarity index 100%
rename from src/emu/bus/nes/ntdec.c
rename to src/devices/bus/nes/ntdec.c
diff --git a/src/emu/bus/nes/ntdec.h b/src/devices/bus/nes/ntdec.h
similarity index 100%
rename from src/emu/bus/nes/ntdec.h
rename to src/devices/bus/nes/ntdec.h
diff --git a/src/emu/bus/nes/nxrom.c b/src/devices/bus/nes/nxrom.c
similarity index 100%
rename from src/emu/bus/nes/nxrom.c
rename to src/devices/bus/nes/nxrom.c
diff --git a/src/emu/bus/nes/nxrom.h b/src/devices/bus/nes/nxrom.h
similarity index 100%
rename from src/emu/bus/nes/nxrom.h
rename to src/devices/bus/nes/nxrom.h
diff --git a/src/emu/bus/nes/pirate.c b/src/devices/bus/nes/pirate.c
similarity index 100%
rename from src/emu/bus/nes/pirate.c
rename to src/devices/bus/nes/pirate.c
diff --git a/src/emu/bus/nes/pirate.h b/src/devices/bus/nes/pirate.h
similarity index 100%
rename from src/emu/bus/nes/pirate.h
rename to src/devices/bus/nes/pirate.h
diff --git a/src/emu/bus/nes/pt554.c b/src/devices/bus/nes/pt554.c
similarity index 100%
rename from src/emu/bus/nes/pt554.c
rename to src/devices/bus/nes/pt554.c
diff --git a/src/emu/bus/nes/pt554.h b/src/devices/bus/nes/pt554.h
similarity index 100%
rename from src/emu/bus/nes/pt554.h
rename to src/devices/bus/nes/pt554.h
diff --git a/src/emu/bus/nes/racermate.c b/src/devices/bus/nes/racermate.c
similarity index 100%
rename from src/emu/bus/nes/racermate.c
rename to src/devices/bus/nes/racermate.c
diff --git a/src/emu/bus/nes/racermate.h b/src/devices/bus/nes/racermate.h
similarity index 100%
rename from src/emu/bus/nes/racermate.h
rename to src/devices/bus/nes/racermate.h
diff --git a/src/emu/bus/nes/rcm.c b/src/devices/bus/nes/rcm.c
similarity index 100%
rename from src/emu/bus/nes/rcm.c
rename to src/devices/bus/nes/rcm.c
diff --git a/src/emu/bus/nes/rcm.h b/src/devices/bus/nes/rcm.h
similarity index 100%
rename from src/emu/bus/nes/rcm.h
rename to src/devices/bus/nes/rcm.h
diff --git a/src/emu/bus/nes/rexsoft.c b/src/devices/bus/nes/rexsoft.c
similarity index 100%
rename from src/emu/bus/nes/rexsoft.c
rename to src/devices/bus/nes/rexsoft.c
diff --git a/src/emu/bus/nes/rexsoft.h b/src/devices/bus/nes/rexsoft.h
similarity index 100%
rename from src/emu/bus/nes/rexsoft.h
rename to src/devices/bus/nes/rexsoft.h
diff --git a/src/emu/bus/nes/sachen.c b/src/devices/bus/nes/sachen.c
similarity index 100%
rename from src/emu/bus/nes/sachen.c
rename to src/devices/bus/nes/sachen.c
diff --git a/src/emu/bus/nes/sachen.h b/src/devices/bus/nes/sachen.h
similarity index 100%
rename from src/emu/bus/nes/sachen.h
rename to src/devices/bus/nes/sachen.h
diff --git a/src/emu/bus/nes/somari.c b/src/devices/bus/nes/somari.c
similarity index 100%
rename from src/emu/bus/nes/somari.c
rename to src/devices/bus/nes/somari.c
diff --git a/src/emu/bus/nes/somari.h b/src/devices/bus/nes/somari.h
similarity index 100%
rename from src/emu/bus/nes/somari.h
rename to src/devices/bus/nes/somari.h
diff --git a/src/emu/bus/nes/sunsoft.c b/src/devices/bus/nes/sunsoft.c
similarity index 100%
rename from src/emu/bus/nes/sunsoft.c
rename to src/devices/bus/nes/sunsoft.c
diff --git a/src/emu/bus/nes/sunsoft.h b/src/devices/bus/nes/sunsoft.h
similarity index 100%
rename from src/emu/bus/nes/sunsoft.h
rename to src/devices/bus/nes/sunsoft.h
diff --git a/src/emu/bus/nes/sunsoft_dcs.c b/src/devices/bus/nes/sunsoft_dcs.c
similarity index 100%
rename from src/emu/bus/nes/sunsoft_dcs.c
rename to src/devices/bus/nes/sunsoft_dcs.c
diff --git a/src/emu/bus/nes/sunsoft_dcs.h b/src/devices/bus/nes/sunsoft_dcs.h
similarity index 100%
rename from src/emu/bus/nes/sunsoft_dcs.h
rename to src/devices/bus/nes/sunsoft_dcs.h
diff --git a/src/emu/bus/nes/taito.c b/src/devices/bus/nes/taito.c
similarity index 100%
rename from src/emu/bus/nes/taito.c
rename to src/devices/bus/nes/taito.c
diff --git a/src/emu/bus/nes/taito.h b/src/devices/bus/nes/taito.h
similarity index 100%
rename from src/emu/bus/nes/taito.h
rename to src/devices/bus/nes/taito.h
diff --git a/src/emu/bus/nes/tengen.c b/src/devices/bus/nes/tengen.c
similarity index 100%
rename from src/emu/bus/nes/tengen.c
rename to src/devices/bus/nes/tengen.c
diff --git a/src/emu/bus/nes/tengen.h b/src/devices/bus/nes/tengen.h
similarity index 100%
rename from src/emu/bus/nes/tengen.h
rename to src/devices/bus/nes/tengen.h
diff --git a/src/emu/bus/nes/txc.c b/src/devices/bus/nes/txc.c
similarity index 100%
rename from src/emu/bus/nes/txc.c
rename to src/devices/bus/nes/txc.c
diff --git a/src/emu/bus/nes/txc.h b/src/devices/bus/nes/txc.h
similarity index 100%
rename from src/emu/bus/nes/txc.h
rename to src/devices/bus/nes/txc.h
diff --git a/src/emu/bus/nes/waixing.c b/src/devices/bus/nes/waixing.c
similarity index 100%
rename from src/emu/bus/nes/waixing.c
rename to src/devices/bus/nes/waixing.c
diff --git a/src/emu/bus/nes/waixing.h b/src/devices/bus/nes/waixing.h
similarity index 100%
rename from src/emu/bus/nes/waixing.h
rename to src/devices/bus/nes/waixing.h
diff --git a/src/emu/bus/nes_ctrl/4score.c b/src/devices/bus/nes_ctrl/4score.c
similarity index 100%
rename from src/emu/bus/nes_ctrl/4score.c
rename to src/devices/bus/nes_ctrl/4score.c
diff --git a/src/emu/bus/nes_ctrl/4score.h b/src/devices/bus/nes_ctrl/4score.h
similarity index 100%
rename from src/emu/bus/nes_ctrl/4score.h
rename to src/devices/bus/nes_ctrl/4score.h
diff --git a/src/emu/bus/nes_ctrl/arkpaddle.c b/src/devices/bus/nes_ctrl/arkpaddle.c
similarity index 100%
rename from src/emu/bus/nes_ctrl/arkpaddle.c
rename to src/devices/bus/nes_ctrl/arkpaddle.c
diff --git a/src/emu/bus/nes_ctrl/arkpaddle.h b/src/devices/bus/nes_ctrl/arkpaddle.h
similarity index 100%
rename from src/emu/bus/nes_ctrl/arkpaddle.h
rename to src/devices/bus/nes_ctrl/arkpaddle.h
diff --git a/src/emu/bus/nes_ctrl/bcbattle.c b/src/devices/bus/nes_ctrl/bcbattle.c
similarity index 100%
rename from src/emu/bus/nes_ctrl/bcbattle.c
rename to src/devices/bus/nes_ctrl/bcbattle.c
diff --git a/src/emu/bus/nes_ctrl/bcbattle.h b/src/devices/bus/nes_ctrl/bcbattle.h
similarity index 100%
rename from src/emu/bus/nes_ctrl/bcbattle.h
rename to src/devices/bus/nes_ctrl/bcbattle.h
diff --git a/src/emu/bus/nes_ctrl/ctrl.c b/src/devices/bus/nes_ctrl/ctrl.c
similarity index 100%
rename from src/emu/bus/nes_ctrl/ctrl.c
rename to src/devices/bus/nes_ctrl/ctrl.c
diff --git a/src/emu/bus/nes_ctrl/ctrl.h b/src/devices/bus/nes_ctrl/ctrl.h
similarity index 100%
rename from src/emu/bus/nes_ctrl/ctrl.h
rename to src/devices/bus/nes_ctrl/ctrl.h
diff --git a/src/emu/bus/nes_ctrl/fckeybrd.c b/src/devices/bus/nes_ctrl/fckeybrd.c
similarity index 100%
rename from src/emu/bus/nes_ctrl/fckeybrd.c
rename to src/devices/bus/nes_ctrl/fckeybrd.c
diff --git a/src/emu/bus/nes_ctrl/fckeybrd.h b/src/devices/bus/nes_ctrl/fckeybrd.h
similarity index 100%
rename from src/emu/bus/nes_ctrl/fckeybrd.h
rename to src/devices/bus/nes_ctrl/fckeybrd.h
diff --git a/src/emu/bus/nes_ctrl/ftrainer.c b/src/devices/bus/nes_ctrl/ftrainer.c
similarity index 100%
rename from src/emu/bus/nes_ctrl/ftrainer.c
rename to src/devices/bus/nes_ctrl/ftrainer.c
diff --git a/src/emu/bus/nes_ctrl/ftrainer.h b/src/devices/bus/nes_ctrl/ftrainer.h
similarity index 100%
rename from src/emu/bus/nes_ctrl/ftrainer.h
rename to src/devices/bus/nes_ctrl/ftrainer.h
diff --git a/src/emu/bus/nes_ctrl/hori.c b/src/devices/bus/nes_ctrl/hori.c
similarity index 100%
rename from src/emu/bus/nes_ctrl/hori.c
rename to src/devices/bus/nes_ctrl/hori.c
diff --git a/src/emu/bus/nes_ctrl/hori.h b/src/devices/bus/nes_ctrl/hori.h
similarity index 100%
rename from src/emu/bus/nes_ctrl/hori.h
rename to src/devices/bus/nes_ctrl/hori.h
diff --git a/src/emu/bus/nes_ctrl/joypad.c b/src/devices/bus/nes_ctrl/joypad.c
similarity index 100%
rename from src/emu/bus/nes_ctrl/joypad.c
rename to src/devices/bus/nes_ctrl/joypad.c
diff --git a/src/emu/bus/nes_ctrl/joypad.h b/src/devices/bus/nes_ctrl/joypad.h
similarity index 100%
rename from src/emu/bus/nes_ctrl/joypad.h
rename to src/devices/bus/nes_ctrl/joypad.h
diff --git a/src/emu/bus/nes_ctrl/konamihs.c b/src/devices/bus/nes_ctrl/konamihs.c
similarity index 100%
rename from src/emu/bus/nes_ctrl/konamihs.c
rename to src/devices/bus/nes_ctrl/konamihs.c
diff --git a/src/emu/bus/nes_ctrl/konamihs.h b/src/devices/bus/nes_ctrl/konamihs.h
similarity index 100%
rename from src/emu/bus/nes_ctrl/konamihs.h
rename to src/devices/bus/nes_ctrl/konamihs.h
diff --git a/src/emu/bus/nes_ctrl/miracle.c b/src/devices/bus/nes_ctrl/miracle.c
similarity index 100%
rename from src/emu/bus/nes_ctrl/miracle.c
rename to src/devices/bus/nes_ctrl/miracle.c
diff --git a/src/emu/bus/nes_ctrl/miracle.h b/src/devices/bus/nes_ctrl/miracle.h
similarity index 100%
rename from src/emu/bus/nes_ctrl/miracle.h
rename to src/devices/bus/nes_ctrl/miracle.h
diff --git a/src/emu/bus/nes_ctrl/mjpanel.c b/src/devices/bus/nes_ctrl/mjpanel.c
similarity index 100%
rename from src/emu/bus/nes_ctrl/mjpanel.c
rename to src/devices/bus/nes_ctrl/mjpanel.c
diff --git a/src/emu/bus/nes_ctrl/mjpanel.h b/src/devices/bus/nes_ctrl/mjpanel.h
similarity index 100%
rename from src/emu/bus/nes_ctrl/mjpanel.h
rename to src/devices/bus/nes_ctrl/mjpanel.h
diff --git a/src/emu/bus/nes_ctrl/pachinko.c b/src/devices/bus/nes_ctrl/pachinko.c
similarity index 100%
rename from src/emu/bus/nes_ctrl/pachinko.c
rename to src/devices/bus/nes_ctrl/pachinko.c
diff --git a/src/emu/bus/nes_ctrl/pachinko.h b/src/devices/bus/nes_ctrl/pachinko.h
similarity index 100%
rename from src/emu/bus/nes_ctrl/pachinko.h
rename to src/devices/bus/nes_ctrl/pachinko.h
diff --git a/src/emu/bus/nes_ctrl/partytap.c b/src/devices/bus/nes_ctrl/partytap.c
similarity index 100%
rename from src/emu/bus/nes_ctrl/partytap.c
rename to src/devices/bus/nes_ctrl/partytap.c
diff --git a/src/emu/bus/nes_ctrl/partytap.h b/src/devices/bus/nes_ctrl/partytap.h
similarity index 100%
rename from src/emu/bus/nes_ctrl/partytap.h
rename to src/devices/bus/nes_ctrl/partytap.h
diff --git a/src/emu/bus/nes_ctrl/powerpad.c b/src/devices/bus/nes_ctrl/powerpad.c
similarity index 100%
rename from src/emu/bus/nes_ctrl/powerpad.c
rename to src/devices/bus/nes_ctrl/powerpad.c
diff --git a/src/emu/bus/nes_ctrl/powerpad.h b/src/devices/bus/nes_ctrl/powerpad.h
similarity index 100%
rename from src/emu/bus/nes_ctrl/powerpad.h
rename to src/devices/bus/nes_ctrl/powerpad.h
diff --git a/src/emu/bus/nes_ctrl/suborkey.c b/src/devices/bus/nes_ctrl/suborkey.c
similarity index 100%
rename from src/emu/bus/nes_ctrl/suborkey.c
rename to src/devices/bus/nes_ctrl/suborkey.c
diff --git a/src/emu/bus/nes_ctrl/suborkey.h b/src/devices/bus/nes_ctrl/suborkey.h
similarity index 100%
rename from src/emu/bus/nes_ctrl/suborkey.h
rename to src/devices/bus/nes_ctrl/suborkey.h
diff --git a/src/emu/bus/nes_ctrl/zapper.c b/src/devices/bus/nes_ctrl/zapper.c
similarity index 100%
rename from src/emu/bus/nes_ctrl/zapper.c
rename to src/devices/bus/nes_ctrl/zapper.c
diff --git a/src/emu/bus/nes_ctrl/zapper.h b/src/devices/bus/nes_ctrl/zapper.h
similarity index 100%
rename from src/emu/bus/nes_ctrl/zapper.h
rename to src/devices/bus/nes_ctrl/zapper.h
diff --git a/src/emu/bus/nubus/nubus.c b/src/devices/bus/nubus/nubus.c
similarity index 100%
rename from src/emu/bus/nubus/nubus.c
rename to src/devices/bus/nubus/nubus.c
diff --git a/src/emu/bus/nubus/nubus.h b/src/devices/bus/nubus/nubus.h
similarity index 100%
rename from src/emu/bus/nubus/nubus.h
rename to src/devices/bus/nubus/nubus.h
diff --git a/src/emu/bus/nubus/nubus_48gc.c b/src/devices/bus/nubus/nubus_48gc.c
similarity index 100%
rename from src/emu/bus/nubus/nubus_48gc.c
rename to src/devices/bus/nubus/nubus_48gc.c
diff --git a/src/emu/bus/nubus/nubus_48gc.h b/src/devices/bus/nubus/nubus_48gc.h
similarity index 100%
rename from src/emu/bus/nubus/nubus_48gc.h
rename to src/devices/bus/nubus/nubus_48gc.h
diff --git a/src/emu/bus/nubus/nubus_asntmc3b.c b/src/devices/bus/nubus/nubus_asntmc3b.c
similarity index 100%
rename from src/emu/bus/nubus/nubus_asntmc3b.c
rename to src/devices/bus/nubus/nubus_asntmc3b.c
diff --git a/src/emu/bus/nubus/nubus_asntmc3b.h b/src/devices/bus/nubus/nubus_asntmc3b.h
similarity index 100%
rename from src/emu/bus/nubus/nubus_asntmc3b.h
rename to src/devices/bus/nubus/nubus_asntmc3b.h
diff --git a/src/emu/bus/nubus/nubus_cb264.c b/src/devices/bus/nubus/nubus_cb264.c
similarity index 100%
rename from src/emu/bus/nubus/nubus_cb264.c
rename to src/devices/bus/nubus/nubus_cb264.c
diff --git a/src/emu/bus/nubus/nubus_cb264.h b/src/devices/bus/nubus/nubus_cb264.h
similarity index 100%
rename from src/emu/bus/nubus/nubus_cb264.h
rename to src/devices/bus/nubus/nubus_cb264.h
diff --git a/src/emu/bus/nubus/nubus_image.c b/src/devices/bus/nubus/nubus_image.c
similarity index 100%
rename from src/emu/bus/nubus/nubus_image.c
rename to src/devices/bus/nubus/nubus_image.c
diff --git a/src/emu/bus/nubus/nubus_image.h b/src/devices/bus/nubus/nubus_image.h
similarity index 100%
rename from src/emu/bus/nubus/nubus_image.h
rename to src/devices/bus/nubus/nubus_image.h
diff --git a/src/emu/bus/nubus/nubus_m2hires.c b/src/devices/bus/nubus/nubus_m2hires.c
similarity index 100%
rename from src/emu/bus/nubus/nubus_m2hires.c
rename to src/devices/bus/nubus/nubus_m2hires.c
diff --git a/src/emu/bus/nubus/nubus_m2hires.h b/src/devices/bus/nubus/nubus_m2hires.h
similarity index 100%
rename from src/emu/bus/nubus/nubus_m2hires.h
rename to src/devices/bus/nubus/nubus_m2hires.h
diff --git a/src/emu/bus/nubus/nubus_m2video.c b/src/devices/bus/nubus/nubus_m2video.c
similarity index 100%
rename from src/emu/bus/nubus/nubus_m2video.c
rename to src/devices/bus/nubus/nubus_m2video.c
diff --git a/src/emu/bus/nubus/nubus_m2video.h b/src/devices/bus/nubus/nubus_m2video.h
similarity index 100%
rename from src/emu/bus/nubus/nubus_m2video.h
rename to src/devices/bus/nubus/nubus_m2video.h
diff --git a/src/emu/bus/nubus/nubus_radiustpd.c b/src/devices/bus/nubus/nubus_radiustpd.c
similarity index 100%
rename from src/emu/bus/nubus/nubus_radiustpd.c
rename to src/devices/bus/nubus/nubus_radiustpd.c
diff --git a/src/emu/bus/nubus/nubus_radiustpd.h b/src/devices/bus/nubus/nubus_radiustpd.h
similarity index 100%
rename from src/emu/bus/nubus/nubus_radiustpd.h
rename to src/devices/bus/nubus/nubus_radiustpd.h
diff --git a/src/emu/bus/nubus/nubus_spec8.c b/src/devices/bus/nubus/nubus_spec8.c
similarity index 100%
rename from src/emu/bus/nubus/nubus_spec8.c
rename to src/devices/bus/nubus/nubus_spec8.c
diff --git a/src/emu/bus/nubus/nubus_spec8.h b/src/devices/bus/nubus/nubus_spec8.h
similarity index 100%
rename from src/emu/bus/nubus/nubus_spec8.h
rename to src/devices/bus/nubus/nubus_spec8.h
diff --git a/src/emu/bus/nubus/nubus_specpdq.c b/src/devices/bus/nubus/nubus_specpdq.c
similarity index 100%
rename from src/emu/bus/nubus/nubus_specpdq.c
rename to src/devices/bus/nubus/nubus_specpdq.c
diff --git a/src/emu/bus/nubus/nubus_specpdq.h b/src/devices/bus/nubus/nubus_specpdq.h
similarity index 100%
rename from src/emu/bus/nubus/nubus_specpdq.h
rename to src/devices/bus/nubus/nubus_specpdq.h
diff --git a/src/emu/bus/nubus/nubus_vikbw.c b/src/devices/bus/nubus/nubus_vikbw.c
similarity index 100%
rename from src/emu/bus/nubus/nubus_vikbw.c
rename to src/devices/bus/nubus/nubus_vikbw.c
diff --git a/src/emu/bus/nubus/nubus_vikbw.h b/src/devices/bus/nubus/nubus_vikbw.h
similarity index 100%
rename from src/emu/bus/nubus/nubus_vikbw.h
rename to src/devices/bus/nubus/nubus_vikbw.h
diff --git a/src/emu/bus/nubus/nubus_wsportrait.c b/src/devices/bus/nubus/nubus_wsportrait.c
similarity index 100%
rename from src/emu/bus/nubus/nubus_wsportrait.c
rename to src/devices/bus/nubus/nubus_wsportrait.c
diff --git a/src/emu/bus/nubus/nubus_wsportrait.h b/src/devices/bus/nubus/nubus_wsportrait.h
similarity index 100%
rename from src/emu/bus/nubus/nubus_wsportrait.h
rename to src/devices/bus/nubus/nubus_wsportrait.h
diff --git a/src/emu/bus/nubus/pds30_30hr.c b/src/devices/bus/nubus/pds30_30hr.c
similarity index 100%
rename from src/emu/bus/nubus/pds30_30hr.c
rename to src/devices/bus/nubus/pds30_30hr.c
diff --git a/src/emu/bus/nubus/pds30_30hr.h b/src/devices/bus/nubus/pds30_30hr.h
similarity index 100%
rename from src/emu/bus/nubus/pds30_30hr.h
rename to src/devices/bus/nubus/pds30_30hr.h
diff --git a/src/emu/bus/nubus/pds30_cb264.c b/src/devices/bus/nubus/pds30_cb264.c
similarity index 100%
rename from src/emu/bus/nubus/pds30_cb264.c
rename to src/devices/bus/nubus/pds30_cb264.c
diff --git a/src/emu/bus/nubus/pds30_cb264.h b/src/devices/bus/nubus/pds30_cb264.h
similarity index 100%
rename from src/emu/bus/nubus/pds30_cb264.h
rename to src/devices/bus/nubus/pds30_cb264.h
diff --git a/src/emu/bus/nubus/pds30_mc30.c b/src/devices/bus/nubus/pds30_mc30.c
similarity index 100%
rename from src/emu/bus/nubus/pds30_mc30.c
rename to src/devices/bus/nubus/pds30_mc30.c
diff --git a/src/emu/bus/nubus/pds30_mc30.h b/src/devices/bus/nubus/pds30_mc30.h
similarity index 100%
rename from src/emu/bus/nubus/pds30_mc30.h
rename to src/devices/bus/nubus/pds30_mc30.h
diff --git a/src/emu/bus/nubus/pds30_procolor816.c b/src/devices/bus/nubus/pds30_procolor816.c
similarity index 100%
rename from src/emu/bus/nubus/pds30_procolor816.c
rename to src/devices/bus/nubus/pds30_procolor816.c
diff --git a/src/emu/bus/nubus/pds30_procolor816.h b/src/devices/bus/nubus/pds30_procolor816.h
similarity index 100%
rename from src/emu/bus/nubus/pds30_procolor816.h
rename to src/devices/bus/nubus/pds30_procolor816.h
diff --git a/src/emu/bus/nubus/pds30_sigmalview.c b/src/devices/bus/nubus/pds30_sigmalview.c
similarity index 100%
rename from src/emu/bus/nubus/pds30_sigmalview.c
rename to src/devices/bus/nubus/pds30_sigmalview.c
diff --git a/src/emu/bus/nubus/pds30_sigmalview.h b/src/devices/bus/nubus/pds30_sigmalview.h
similarity index 100%
rename from src/emu/bus/nubus/pds30_sigmalview.h
rename to src/devices/bus/nubus/pds30_sigmalview.h
diff --git a/src/emu/bus/odyssey2/chess.c b/src/devices/bus/odyssey2/chess.c
similarity index 100%
rename from src/emu/bus/odyssey2/chess.c
rename to src/devices/bus/odyssey2/chess.c
diff --git a/src/emu/bus/odyssey2/chess.h b/src/devices/bus/odyssey2/chess.h
similarity index 100%
rename from src/emu/bus/odyssey2/chess.h
rename to src/devices/bus/odyssey2/chess.h
diff --git a/src/emu/bus/odyssey2/rom.c b/src/devices/bus/odyssey2/rom.c
similarity index 100%
rename from src/emu/bus/odyssey2/rom.c
rename to src/devices/bus/odyssey2/rom.c
diff --git a/src/emu/bus/odyssey2/rom.h b/src/devices/bus/odyssey2/rom.h
similarity index 100%
rename from src/emu/bus/odyssey2/rom.h
rename to src/devices/bus/odyssey2/rom.h
diff --git a/src/emu/bus/odyssey2/slot.c b/src/devices/bus/odyssey2/slot.c
similarity index 100%
rename from src/emu/bus/odyssey2/slot.c
rename to src/devices/bus/odyssey2/slot.c
diff --git a/src/emu/bus/odyssey2/slot.h b/src/devices/bus/odyssey2/slot.h
similarity index 100%
rename from src/emu/bus/odyssey2/slot.h
rename to src/devices/bus/odyssey2/slot.h
diff --git a/src/emu/bus/odyssey2/voice.c b/src/devices/bus/odyssey2/voice.c
similarity index 100%
rename from src/emu/bus/odyssey2/voice.c
rename to src/devices/bus/odyssey2/voice.c
diff --git a/src/emu/bus/odyssey2/voice.h b/src/devices/bus/odyssey2/voice.h
similarity index 100%
rename from src/emu/bus/odyssey2/voice.h
rename to src/devices/bus/odyssey2/voice.h
diff --git a/src/emu/bus/oricext/jasmin.c b/src/devices/bus/oricext/jasmin.c
similarity index 100%
rename from src/emu/bus/oricext/jasmin.c
rename to src/devices/bus/oricext/jasmin.c
diff --git a/src/emu/bus/oricext/jasmin.h b/src/devices/bus/oricext/jasmin.h
similarity index 100%
rename from src/emu/bus/oricext/jasmin.h
rename to src/devices/bus/oricext/jasmin.h
diff --git a/src/emu/bus/oricext/microdisc.c b/src/devices/bus/oricext/microdisc.c
similarity index 100%
rename from src/emu/bus/oricext/microdisc.c
rename to src/devices/bus/oricext/microdisc.c
diff --git a/src/emu/bus/oricext/microdisc.h b/src/devices/bus/oricext/microdisc.h
similarity index 100%
rename from src/emu/bus/oricext/microdisc.h
rename to src/devices/bus/oricext/microdisc.h
diff --git a/src/emu/bus/oricext/oricext.c b/src/devices/bus/oricext/oricext.c
similarity index 100%
rename from src/emu/bus/oricext/oricext.c
rename to src/devices/bus/oricext/oricext.c
diff --git a/src/emu/bus/oricext/oricext.h b/src/devices/bus/oricext/oricext.h
similarity index 100%
rename from src/emu/bus/oricext/oricext.h
rename to src/devices/bus/oricext/oricext.h
diff --git a/src/emu/bus/pc_joy/pc_joy.c b/src/devices/bus/pc_joy/pc_joy.c
similarity index 100%
rename from src/emu/bus/pc_joy/pc_joy.c
rename to src/devices/bus/pc_joy/pc_joy.c
diff --git a/src/emu/bus/pc_joy/pc_joy.h b/src/devices/bus/pc_joy/pc_joy.h
similarity index 100%
rename from src/emu/bus/pc_joy/pc_joy.h
rename to src/devices/bus/pc_joy/pc_joy.h
diff --git a/src/emu/bus/pc_joy/pc_joy_sw.c b/src/devices/bus/pc_joy/pc_joy_sw.c
similarity index 100%
rename from src/emu/bus/pc_joy/pc_joy_sw.c
rename to src/devices/bus/pc_joy/pc_joy_sw.c
diff --git a/src/emu/bus/pc_joy/pc_joy_sw.h b/src/devices/bus/pc_joy/pc_joy_sw.h
similarity index 100%
rename from src/emu/bus/pc_joy/pc_joy_sw.h
rename to src/devices/bus/pc_joy/pc_joy_sw.h
diff --git a/src/emu/bus/pc_kbd/ec1841.c b/src/devices/bus/pc_kbd/ec1841.c
similarity index 100%
rename from src/emu/bus/pc_kbd/ec1841.c
rename to src/devices/bus/pc_kbd/ec1841.c
diff --git a/src/emu/bus/pc_kbd/ec1841.h b/src/devices/bus/pc_kbd/ec1841.h
similarity index 100%
rename from src/emu/bus/pc_kbd/ec1841.h
rename to src/devices/bus/pc_kbd/ec1841.h
diff --git a/src/emu/bus/pc_kbd/iskr1030.c b/src/devices/bus/pc_kbd/iskr1030.c
similarity index 100%
rename from src/emu/bus/pc_kbd/iskr1030.c
rename to src/devices/bus/pc_kbd/iskr1030.c
diff --git a/src/emu/bus/pc_kbd/iskr1030.h b/src/devices/bus/pc_kbd/iskr1030.h
similarity index 100%
rename from src/emu/bus/pc_kbd/iskr1030.h
rename to src/devices/bus/pc_kbd/iskr1030.h
diff --git a/src/emu/bus/pc_kbd/keyboards.c b/src/devices/bus/pc_kbd/keyboards.c
similarity index 100%
rename from src/emu/bus/pc_kbd/keyboards.c
rename to src/devices/bus/pc_kbd/keyboards.c
diff --git a/src/emu/bus/pc_kbd/keyboards.h b/src/devices/bus/pc_kbd/keyboards.h
similarity index 100%
rename from src/emu/bus/pc_kbd/keyboards.h
rename to src/devices/bus/pc_kbd/keyboards.h
diff --git a/src/emu/bus/pc_kbd/keytro.c b/src/devices/bus/pc_kbd/keytro.c
similarity index 100%
rename from src/emu/bus/pc_kbd/keytro.c
rename to src/devices/bus/pc_kbd/keytro.c
diff --git a/src/emu/bus/pc_kbd/keytro.h b/src/devices/bus/pc_kbd/keytro.h
similarity index 100%
rename from src/emu/bus/pc_kbd/keytro.h
rename to src/devices/bus/pc_kbd/keytro.h
diff --git a/src/emu/bus/pc_kbd/msnat.c b/src/devices/bus/pc_kbd/msnat.c
similarity index 100%
rename from src/emu/bus/pc_kbd/msnat.c
rename to src/devices/bus/pc_kbd/msnat.c
diff --git a/src/emu/bus/pc_kbd/msnat.h b/src/devices/bus/pc_kbd/msnat.h
similarity index 100%
rename from src/emu/bus/pc_kbd/msnat.h
rename to src/devices/bus/pc_kbd/msnat.h
diff --git a/src/emu/bus/pc_kbd/pc83.c b/src/devices/bus/pc_kbd/pc83.c
similarity index 100%
rename from src/emu/bus/pc_kbd/pc83.c
rename to src/devices/bus/pc_kbd/pc83.c
diff --git a/src/emu/bus/pc_kbd/pc83.h b/src/devices/bus/pc_kbd/pc83.h
similarity index 100%
rename from src/emu/bus/pc_kbd/pc83.h
rename to src/devices/bus/pc_kbd/pc83.h
diff --git a/src/emu/bus/pc_kbd/pc_kbdc.c b/src/devices/bus/pc_kbd/pc_kbdc.c
similarity index 100%
rename from src/emu/bus/pc_kbd/pc_kbdc.c
rename to src/devices/bus/pc_kbd/pc_kbdc.c
diff --git a/src/emu/bus/pc_kbd/pc_kbdc.h b/src/devices/bus/pc_kbd/pc_kbdc.h
similarity index 100%
rename from src/emu/bus/pc_kbd/pc_kbdc.h
rename to src/devices/bus/pc_kbd/pc_kbdc.h
diff --git a/src/emu/bus/pc_kbd/pcat84.c b/src/devices/bus/pc_kbd/pcat84.c
similarity index 100%
rename from src/emu/bus/pc_kbd/pcat84.c
rename to src/devices/bus/pc_kbd/pcat84.c
diff --git a/src/emu/bus/pc_kbd/pcat84.h b/src/devices/bus/pc_kbd/pcat84.h
similarity index 100%
rename from src/emu/bus/pc_kbd/pcat84.h
rename to src/devices/bus/pc_kbd/pcat84.h
diff --git a/src/emu/bus/pc_kbd/pcxt83.c b/src/devices/bus/pc_kbd/pcxt83.c
similarity index 100%
rename from src/emu/bus/pc_kbd/pcxt83.c
rename to src/devices/bus/pc_kbd/pcxt83.c
diff --git a/src/emu/bus/pc_kbd/pcxt83.h b/src/devices/bus/pc_kbd/pcxt83.h
similarity index 100%
rename from src/emu/bus/pc_kbd/pcxt83.h
rename to src/devices/bus/pc_kbd/pcxt83.h
diff --git a/src/emu/bus/pce/pce_rom.c b/src/devices/bus/pce/pce_rom.c
similarity index 100%
rename from src/emu/bus/pce/pce_rom.c
rename to src/devices/bus/pce/pce_rom.c
diff --git a/src/emu/bus/pce/pce_rom.h b/src/devices/bus/pce/pce_rom.h
similarity index 100%
rename from src/emu/bus/pce/pce_rom.h
rename to src/devices/bus/pce/pce_rom.h
diff --git a/src/emu/bus/pce/pce_slot.c b/src/devices/bus/pce/pce_slot.c
similarity index 100%
rename from src/emu/bus/pce/pce_slot.c
rename to src/devices/bus/pce/pce_slot.c
diff --git a/src/emu/bus/pce/pce_slot.h b/src/devices/bus/pce/pce_slot.h
similarity index 100%
rename from src/emu/bus/pce/pce_slot.h
rename to src/devices/bus/pce/pce_slot.h
diff --git a/src/emu/bus/pet/64k.c b/src/devices/bus/pet/64k.c
similarity index 100%
rename from src/emu/bus/pet/64k.c
rename to src/devices/bus/pet/64k.c
diff --git a/src/emu/bus/pet/64k.h b/src/devices/bus/pet/64k.h
similarity index 100%
rename from src/emu/bus/pet/64k.h
rename to src/devices/bus/pet/64k.h
diff --git a/src/emu/bus/pet/c2n.c b/src/devices/bus/pet/c2n.c
similarity index 100%
rename from src/emu/bus/pet/c2n.c
rename to src/devices/bus/pet/c2n.c
diff --git a/src/emu/bus/pet/c2n.h b/src/devices/bus/pet/c2n.h
similarity index 100%
rename from src/emu/bus/pet/c2n.h
rename to src/devices/bus/pet/c2n.h
diff --git a/src/emu/bus/pet/cass.c b/src/devices/bus/pet/cass.c
similarity index 100%
rename from src/emu/bus/pet/cass.c
rename to src/devices/bus/pet/cass.c
diff --git a/src/emu/bus/pet/cass.h b/src/devices/bus/pet/cass.h
similarity index 100%
rename from src/emu/bus/pet/cass.h
rename to src/devices/bus/pet/cass.h
diff --git a/src/emu/bus/pet/cb2snd.c b/src/devices/bus/pet/cb2snd.c
similarity index 100%
rename from src/emu/bus/pet/cb2snd.c
rename to src/devices/bus/pet/cb2snd.c
diff --git a/src/emu/bus/pet/cb2snd.h b/src/devices/bus/pet/cb2snd.h
similarity index 100%
rename from src/emu/bus/pet/cb2snd.h
rename to src/devices/bus/pet/cb2snd.h
diff --git a/src/emu/bus/pet/diag.c b/src/devices/bus/pet/diag.c
similarity index 100%
rename from src/emu/bus/pet/diag.c
rename to src/devices/bus/pet/diag.c
diff --git a/src/emu/bus/pet/diag.h b/src/devices/bus/pet/diag.h
similarity index 100%
rename from src/emu/bus/pet/diag.h
rename to src/devices/bus/pet/diag.h
diff --git a/src/emu/bus/pet/diag264_lb_tape.c b/src/devices/bus/pet/diag264_lb_tape.c
similarity index 100%
rename from src/emu/bus/pet/diag264_lb_tape.c
rename to src/devices/bus/pet/diag264_lb_tape.c
diff --git a/src/emu/bus/pet/diag264_lb_tape.h b/src/devices/bus/pet/diag264_lb_tape.h
similarity index 100%
rename from src/emu/bus/pet/diag264_lb_tape.h
rename to src/devices/bus/pet/diag264_lb_tape.h
diff --git a/src/emu/bus/pet/exp.c b/src/devices/bus/pet/exp.c
similarity index 100%
rename from src/emu/bus/pet/exp.c
rename to src/devices/bus/pet/exp.c
diff --git a/src/emu/bus/pet/exp.h b/src/devices/bus/pet/exp.h
similarity index 100%
rename from src/emu/bus/pet/exp.h
rename to src/devices/bus/pet/exp.h
diff --git a/src/emu/bus/pet/hsg.c b/src/devices/bus/pet/hsg.c
similarity index 100%
rename from src/emu/bus/pet/hsg.c
rename to src/devices/bus/pet/hsg.c
diff --git a/src/emu/bus/pet/hsg.h b/src/devices/bus/pet/hsg.h
similarity index 100%
rename from src/emu/bus/pet/hsg.h
rename to src/devices/bus/pet/hsg.h
diff --git a/src/emu/bus/pet/petuja.c b/src/devices/bus/pet/petuja.c
similarity index 100%
rename from src/emu/bus/pet/petuja.c
rename to src/devices/bus/pet/petuja.c
diff --git a/src/emu/bus/pet/petuja.h b/src/devices/bus/pet/petuja.h
similarity index 100%
rename from src/emu/bus/pet/petuja.h
rename to src/devices/bus/pet/petuja.h
diff --git a/src/emu/bus/pet/superpet.c b/src/devices/bus/pet/superpet.c
similarity index 100%
rename from src/emu/bus/pet/superpet.c
rename to src/devices/bus/pet/superpet.c
diff --git a/src/emu/bus/pet/superpet.h b/src/devices/bus/pet/superpet.h
similarity index 100%
rename from src/emu/bus/pet/superpet.h
rename to src/devices/bus/pet/superpet.h
diff --git a/src/emu/bus/pet/user.c b/src/devices/bus/pet/user.c
similarity index 100%
rename from src/emu/bus/pet/user.c
rename to src/devices/bus/pet/user.c
diff --git a/src/emu/bus/pet/user.h b/src/devices/bus/pet/user.h
similarity index 100%
rename from src/emu/bus/pet/user.h
rename to src/devices/bus/pet/user.h
diff --git a/src/emu/bus/plus4/c1551.c b/src/devices/bus/plus4/c1551.c
similarity index 100%
rename from src/emu/bus/plus4/c1551.c
rename to src/devices/bus/plus4/c1551.c
diff --git a/src/emu/bus/plus4/c1551.h b/src/devices/bus/plus4/c1551.h
similarity index 100%
rename from src/emu/bus/plus4/c1551.h
rename to src/devices/bus/plus4/c1551.h
diff --git a/src/emu/bus/plus4/diag264_lb_user.c b/src/devices/bus/plus4/diag264_lb_user.c
similarity index 100%
rename from src/emu/bus/plus4/diag264_lb_user.c
rename to src/devices/bus/plus4/diag264_lb_user.c
diff --git a/src/emu/bus/plus4/diag264_lb_user.h b/src/devices/bus/plus4/diag264_lb_user.h
similarity index 100%
rename from src/emu/bus/plus4/diag264_lb_user.h
rename to src/devices/bus/plus4/diag264_lb_user.h
diff --git a/src/emu/bus/plus4/exp.c b/src/devices/bus/plus4/exp.c
similarity index 100%
rename from src/emu/bus/plus4/exp.c
rename to src/devices/bus/plus4/exp.c
diff --git a/src/emu/bus/plus4/exp.h b/src/devices/bus/plus4/exp.h
similarity index 100%
rename from src/emu/bus/plus4/exp.h
rename to src/devices/bus/plus4/exp.h
diff --git a/src/emu/bus/plus4/sid.c b/src/devices/bus/plus4/sid.c
similarity index 100%
rename from src/emu/bus/plus4/sid.c
rename to src/devices/bus/plus4/sid.c
diff --git a/src/emu/bus/plus4/sid.h b/src/devices/bus/plus4/sid.h
similarity index 100%
rename from src/emu/bus/plus4/sid.h
rename to src/devices/bus/plus4/sid.h
diff --git a/src/emu/bus/plus4/std.c b/src/devices/bus/plus4/std.c
similarity index 100%
rename from src/emu/bus/plus4/std.c
rename to src/devices/bus/plus4/std.c
diff --git a/src/emu/bus/plus4/std.h b/src/devices/bus/plus4/std.h
similarity index 100%
rename from src/emu/bus/plus4/std.h
rename to src/devices/bus/plus4/std.h
diff --git a/src/emu/bus/plus4/user.c b/src/devices/bus/plus4/user.c
similarity index 100%
rename from src/emu/bus/plus4/user.c
rename to src/devices/bus/plus4/user.c
diff --git a/src/emu/bus/plus4/user.h b/src/devices/bus/plus4/user.h
similarity index 100%
rename from src/emu/bus/plus4/user.h
rename to src/devices/bus/plus4/user.h
diff --git a/src/emu/bus/psx/analogue.c b/src/devices/bus/psx/analogue.c
similarity index 100%
rename from src/emu/bus/psx/analogue.c
rename to src/devices/bus/psx/analogue.c
diff --git a/src/emu/bus/psx/analogue.h b/src/devices/bus/psx/analogue.h
similarity index 100%
rename from src/emu/bus/psx/analogue.h
rename to src/devices/bus/psx/analogue.h
diff --git a/src/emu/bus/psx/ctlrport.c b/src/devices/bus/psx/ctlrport.c
similarity index 100%
rename from src/emu/bus/psx/ctlrport.c
rename to src/devices/bus/psx/ctlrport.c
diff --git a/src/emu/bus/psx/ctlrport.h b/src/devices/bus/psx/ctlrport.h
similarity index 100%
rename from src/emu/bus/psx/ctlrport.h
rename to src/devices/bus/psx/ctlrport.h
diff --git a/src/emu/bus/psx/memcard.c b/src/devices/bus/psx/memcard.c
similarity index 100%
rename from src/emu/bus/psx/memcard.c
rename to src/devices/bus/psx/memcard.c
diff --git a/src/emu/bus/psx/memcard.h b/src/devices/bus/psx/memcard.h
similarity index 100%
rename from src/emu/bus/psx/memcard.h
rename to src/devices/bus/psx/memcard.h
diff --git a/src/emu/bus/psx/multitap.c b/src/devices/bus/psx/multitap.c
similarity index 100%
rename from src/emu/bus/psx/multitap.c
rename to src/devices/bus/psx/multitap.c
diff --git a/src/emu/bus/psx/multitap.h b/src/devices/bus/psx/multitap.h
similarity index 100%
rename from src/emu/bus/psx/multitap.h
rename to src/devices/bus/psx/multitap.h
diff --git a/src/emu/bus/ql/cst_q_plus4.c b/src/devices/bus/ql/cst_q_plus4.c
similarity index 100%
rename from src/emu/bus/ql/cst_q_plus4.c
rename to src/devices/bus/ql/cst_q_plus4.c
diff --git a/src/emu/bus/ql/cst_q_plus4.h b/src/devices/bus/ql/cst_q_plus4.h
similarity index 100%
rename from src/emu/bus/ql/cst_q_plus4.h
rename to src/devices/bus/ql/cst_q_plus4.h
diff --git a/src/emu/bus/ql/cst_qdisc.c b/src/devices/bus/ql/cst_qdisc.c
similarity index 100%
rename from src/emu/bus/ql/cst_qdisc.c
rename to src/devices/bus/ql/cst_qdisc.c
diff --git a/src/emu/bus/ql/cst_qdisc.h b/src/devices/bus/ql/cst_qdisc.h
similarity index 100%
rename from src/emu/bus/ql/cst_qdisc.h
rename to src/devices/bus/ql/cst_qdisc.h
diff --git a/src/emu/bus/ql/cumana_fdi.c b/src/devices/bus/ql/cumana_fdi.c
similarity index 100%
rename from src/emu/bus/ql/cumana_fdi.c
rename to src/devices/bus/ql/cumana_fdi.c
diff --git a/src/emu/bus/ql/cumana_fdi.h b/src/devices/bus/ql/cumana_fdi.h
similarity index 100%
rename from src/emu/bus/ql/cumana_fdi.h
rename to src/devices/bus/ql/cumana_fdi.h
diff --git a/src/emu/bus/ql/exp.c b/src/devices/bus/ql/exp.c
similarity index 100%
rename from src/emu/bus/ql/exp.c
rename to src/devices/bus/ql/exp.c
diff --git a/src/emu/bus/ql/exp.h b/src/devices/bus/ql/exp.h
similarity index 100%
rename from src/emu/bus/ql/exp.h
rename to src/devices/bus/ql/exp.h
diff --git a/src/emu/bus/ql/kempston_di.c b/src/devices/bus/ql/kempston_di.c
similarity index 100%
rename from src/emu/bus/ql/kempston_di.c
rename to src/devices/bus/ql/kempston_di.c
diff --git a/src/emu/bus/ql/kempston_di.h b/src/devices/bus/ql/kempston_di.h
similarity index 100%
rename from src/emu/bus/ql/kempston_di.h
rename to src/devices/bus/ql/kempston_di.h
diff --git a/src/emu/bus/ql/miracle_gold_card.c b/src/devices/bus/ql/miracle_gold_card.c
similarity index 100%
rename from src/emu/bus/ql/miracle_gold_card.c
rename to src/devices/bus/ql/miracle_gold_card.c
diff --git a/src/emu/bus/ql/miracle_gold_card.h b/src/devices/bus/ql/miracle_gold_card.h
similarity index 100%
rename from src/emu/bus/ql/miracle_gold_card.h
rename to src/devices/bus/ql/miracle_gold_card.h
diff --git a/src/emu/bus/ql/miracle_hd.c b/src/devices/bus/ql/miracle_hd.c
similarity index 100%
rename from src/emu/bus/ql/miracle_hd.c
rename to src/devices/bus/ql/miracle_hd.c
diff --git a/src/emu/bus/ql/miracle_hd.h b/src/devices/bus/ql/miracle_hd.h
similarity index 100%
rename from src/emu/bus/ql/miracle_hd.h
rename to src/devices/bus/ql/miracle_hd.h
diff --git a/src/emu/bus/ql/mp_fdi.c b/src/devices/bus/ql/mp_fdi.c
similarity index 100%
rename from src/emu/bus/ql/mp_fdi.c
rename to src/devices/bus/ql/mp_fdi.c
diff --git a/src/emu/bus/ql/mp_fdi.h b/src/devices/bus/ql/mp_fdi.h
similarity index 100%
rename from src/emu/bus/ql/mp_fdi.h
rename to src/devices/bus/ql/mp_fdi.h
diff --git a/src/emu/bus/ql/opd_basic_master.c b/src/devices/bus/ql/opd_basic_master.c
similarity index 100%
rename from src/emu/bus/ql/opd_basic_master.c
rename to src/devices/bus/ql/opd_basic_master.c
diff --git a/src/emu/bus/ql/opd_basic_master.h b/src/devices/bus/ql/opd_basic_master.h
similarity index 100%
rename from src/emu/bus/ql/opd_basic_master.h
rename to src/devices/bus/ql/opd_basic_master.h
diff --git a/src/emu/bus/ql/pcml_qdisk.c b/src/devices/bus/ql/pcml_qdisk.c
similarity index 100%
rename from src/emu/bus/ql/pcml_qdisk.c
rename to src/devices/bus/ql/pcml_qdisk.c
diff --git a/src/emu/bus/ql/pcml_qdisk.h b/src/devices/bus/ql/pcml_qdisk.h
similarity index 100%
rename from src/emu/bus/ql/pcml_qdisk.h
rename to src/devices/bus/ql/pcml_qdisk.h
diff --git a/src/emu/bus/ql/qubide.c b/src/devices/bus/ql/qubide.c
similarity index 100%
rename from src/emu/bus/ql/qubide.c
rename to src/devices/bus/ql/qubide.c
diff --git a/src/emu/bus/ql/qubide.h b/src/devices/bus/ql/qubide.h
similarity index 100%
rename from src/emu/bus/ql/qubide.h
rename to src/devices/bus/ql/qubide.h
diff --git a/src/emu/bus/ql/rom.c b/src/devices/bus/ql/rom.c
similarity index 100%
rename from src/emu/bus/ql/rom.c
rename to src/devices/bus/ql/rom.c
diff --git a/src/emu/bus/ql/rom.h b/src/devices/bus/ql/rom.h
similarity index 100%
rename from src/emu/bus/ql/rom.h
rename to src/devices/bus/ql/rom.h
diff --git a/src/emu/bus/ql/sandy_superdisk.c b/src/devices/bus/ql/sandy_superdisk.c
similarity index 100%
rename from src/emu/bus/ql/sandy_superdisk.c
rename to src/devices/bus/ql/sandy_superdisk.c
diff --git a/src/emu/bus/ql/sandy_superdisk.h b/src/devices/bus/ql/sandy_superdisk.h
similarity index 100%
rename from src/emu/bus/ql/sandy_superdisk.h
rename to src/devices/bus/ql/sandy_superdisk.h
diff --git a/src/emu/bus/ql/sandy_superqboard.c b/src/devices/bus/ql/sandy_superqboard.c
similarity index 100%
rename from src/emu/bus/ql/sandy_superqboard.c
rename to src/devices/bus/ql/sandy_superqboard.c
diff --git a/src/emu/bus/ql/sandy_superqboard.h b/src/devices/bus/ql/sandy_superqboard.h
similarity index 100%
rename from src/emu/bus/ql/sandy_superqboard.h
rename to src/devices/bus/ql/sandy_superqboard.h
diff --git a/src/emu/bus/ql/std.c b/src/devices/bus/ql/std.c
similarity index 100%
rename from src/emu/bus/ql/std.c
rename to src/devices/bus/ql/std.c
diff --git a/src/emu/bus/ql/std.h b/src/devices/bus/ql/std.h
similarity index 100%
rename from src/emu/bus/ql/std.h
rename to src/devices/bus/ql/std.h
diff --git a/src/emu/bus/ql/trumpcard.c b/src/devices/bus/ql/trumpcard.c
similarity index 100%
rename from src/emu/bus/ql/trumpcard.c
rename to src/devices/bus/ql/trumpcard.c
diff --git a/src/emu/bus/ql/trumpcard.h b/src/devices/bus/ql/trumpcard.h
similarity index 100%
rename from src/emu/bus/ql/trumpcard.h
rename to src/devices/bus/ql/trumpcard.h
diff --git a/src/emu/bus/rs232/keyboard.c b/src/devices/bus/rs232/keyboard.c
similarity index 100%
rename from src/emu/bus/rs232/keyboard.c
rename to src/devices/bus/rs232/keyboard.c
diff --git a/src/emu/bus/rs232/keyboard.h b/src/devices/bus/rs232/keyboard.h
similarity index 100%
rename from src/emu/bus/rs232/keyboard.h
rename to src/devices/bus/rs232/keyboard.h
diff --git a/src/emu/bus/rs232/loopback.c b/src/devices/bus/rs232/loopback.c
similarity index 100%
rename from src/emu/bus/rs232/loopback.c
rename to src/devices/bus/rs232/loopback.c
diff --git a/src/emu/bus/rs232/loopback.h b/src/devices/bus/rs232/loopback.h
similarity index 100%
rename from src/emu/bus/rs232/loopback.h
rename to src/devices/bus/rs232/loopback.h
diff --git a/src/emu/bus/rs232/null_modem.c b/src/devices/bus/rs232/null_modem.c
similarity index 100%
rename from src/emu/bus/rs232/null_modem.c
rename to src/devices/bus/rs232/null_modem.c
diff --git a/src/emu/bus/rs232/null_modem.h b/src/devices/bus/rs232/null_modem.h
similarity index 100%
rename from src/emu/bus/rs232/null_modem.h
rename to src/devices/bus/rs232/null_modem.h
diff --git a/src/emu/bus/rs232/printer.c b/src/devices/bus/rs232/printer.c
similarity index 100%
rename from src/emu/bus/rs232/printer.c
rename to src/devices/bus/rs232/printer.c
diff --git a/src/emu/bus/rs232/printer.h b/src/devices/bus/rs232/printer.h
similarity index 100%
rename from src/emu/bus/rs232/printer.h
rename to src/devices/bus/rs232/printer.h
diff --git a/src/emu/bus/rs232/rs232.c b/src/devices/bus/rs232/rs232.c
similarity index 100%
rename from src/emu/bus/rs232/rs232.c
rename to src/devices/bus/rs232/rs232.c
diff --git a/src/emu/bus/rs232/rs232.h b/src/devices/bus/rs232/rs232.h
similarity index 100%
rename from src/emu/bus/rs232/rs232.h
rename to src/devices/bus/rs232/rs232.h
diff --git a/src/emu/bus/rs232/ser_mouse.c b/src/devices/bus/rs232/ser_mouse.c
similarity index 100%
rename from src/emu/bus/rs232/ser_mouse.c
rename to src/devices/bus/rs232/ser_mouse.c
diff --git a/src/emu/bus/rs232/ser_mouse.h b/src/devices/bus/rs232/ser_mouse.h
similarity index 100%
rename from src/emu/bus/rs232/ser_mouse.h
rename to src/devices/bus/rs232/ser_mouse.h
diff --git a/src/emu/bus/rs232/terminal.c b/src/devices/bus/rs232/terminal.c
similarity index 100%
rename from src/emu/bus/rs232/terminal.c
rename to src/devices/bus/rs232/terminal.c
diff --git a/src/emu/bus/rs232/terminal.h b/src/devices/bus/rs232/terminal.h
similarity index 100%
rename from src/emu/bus/rs232/terminal.h
rename to src/devices/bus/rs232/terminal.h
diff --git a/src/emu/bus/rs232/xvd701.c b/src/devices/bus/rs232/xvd701.c
similarity index 100%
rename from src/emu/bus/rs232/xvd701.c
rename to src/devices/bus/rs232/xvd701.c
diff --git a/src/emu/bus/rs232/xvd701.h b/src/devices/bus/rs232/xvd701.h
similarity index 100%
rename from src/emu/bus/rs232/xvd701.h
rename to src/devices/bus/rs232/xvd701.h
diff --git a/src/emu/bus/s100/dj2db.c b/src/devices/bus/s100/dj2db.c
similarity index 100%
rename from src/emu/bus/s100/dj2db.c
rename to src/devices/bus/s100/dj2db.c
diff --git a/src/emu/bus/s100/dj2db.h b/src/devices/bus/s100/dj2db.h
similarity index 100%
rename from src/emu/bus/s100/dj2db.h
rename to src/devices/bus/s100/dj2db.h
diff --git a/src/emu/bus/s100/djdma.c b/src/devices/bus/s100/djdma.c
similarity index 100%
rename from src/emu/bus/s100/djdma.c
rename to src/devices/bus/s100/djdma.c
diff --git a/src/emu/bus/s100/djdma.h b/src/devices/bus/s100/djdma.h
similarity index 100%
rename from src/emu/bus/s100/djdma.h
rename to src/devices/bus/s100/djdma.h
diff --git a/src/emu/bus/s100/mm65k16s.c b/src/devices/bus/s100/mm65k16s.c
similarity index 100%
rename from src/emu/bus/s100/mm65k16s.c
rename to src/devices/bus/s100/mm65k16s.c
diff --git a/src/emu/bus/s100/mm65k16s.h b/src/devices/bus/s100/mm65k16s.h
similarity index 100%
rename from src/emu/bus/s100/mm65k16s.h
rename to src/devices/bus/s100/mm65k16s.h
diff --git a/src/emu/bus/s100/nsmdsa.c b/src/devices/bus/s100/nsmdsa.c
similarity index 100%
rename from src/emu/bus/s100/nsmdsa.c
rename to src/devices/bus/s100/nsmdsa.c
diff --git a/src/emu/bus/s100/nsmdsa.h b/src/devices/bus/s100/nsmdsa.h
similarity index 100%
rename from src/emu/bus/s100/nsmdsa.h
rename to src/devices/bus/s100/nsmdsa.h
diff --git a/src/emu/bus/s100/nsmdsad.c b/src/devices/bus/s100/nsmdsad.c
similarity index 100%
rename from src/emu/bus/s100/nsmdsad.c
rename to src/devices/bus/s100/nsmdsad.c
diff --git a/src/emu/bus/s100/nsmdsad.h b/src/devices/bus/s100/nsmdsad.h
similarity index 100%
rename from src/emu/bus/s100/nsmdsad.h
rename to src/devices/bus/s100/nsmdsad.h
diff --git a/src/emu/bus/s100/s100.c b/src/devices/bus/s100/s100.c
similarity index 100%
rename from src/emu/bus/s100/s100.c
rename to src/devices/bus/s100/s100.c
diff --git a/src/emu/bus/s100/s100.h b/src/devices/bus/s100/s100.h
similarity index 100%
rename from src/emu/bus/s100/s100.h
rename to src/devices/bus/s100/s100.h
diff --git a/src/emu/bus/s100/wunderbus.c b/src/devices/bus/s100/wunderbus.c
similarity index 100%
rename from src/emu/bus/s100/wunderbus.c
rename to src/devices/bus/s100/wunderbus.c
diff --git a/src/emu/bus/s100/wunderbus.h b/src/devices/bus/s100/wunderbus.h
similarity index 100%
rename from src/emu/bus/s100/wunderbus.h
rename to src/devices/bus/s100/wunderbus.h
diff --git a/src/emu/bus/saturn/bram.c b/src/devices/bus/saturn/bram.c
similarity index 100%
rename from src/emu/bus/saturn/bram.c
rename to src/devices/bus/saturn/bram.c
diff --git a/src/emu/bus/saturn/bram.h b/src/devices/bus/saturn/bram.h
similarity index 100%
rename from src/emu/bus/saturn/bram.h
rename to src/devices/bus/saturn/bram.h
diff --git a/src/emu/bus/saturn/dram.c b/src/devices/bus/saturn/dram.c
similarity index 100%
rename from src/emu/bus/saturn/dram.c
rename to src/devices/bus/saturn/dram.c
diff --git a/src/emu/bus/saturn/dram.h b/src/devices/bus/saturn/dram.h
similarity index 100%
rename from src/emu/bus/saturn/dram.h
rename to src/devices/bus/saturn/dram.h
diff --git a/src/emu/bus/saturn/rom.c b/src/devices/bus/saturn/rom.c
similarity index 100%
rename from src/emu/bus/saturn/rom.c
rename to src/devices/bus/saturn/rom.c
diff --git a/src/emu/bus/saturn/rom.h b/src/devices/bus/saturn/rom.h
similarity index 100%
rename from src/emu/bus/saturn/rom.h
rename to src/devices/bus/saturn/rom.h
diff --git a/src/emu/bus/saturn/sat_slot.c b/src/devices/bus/saturn/sat_slot.c
similarity index 100%
rename from src/emu/bus/saturn/sat_slot.c
rename to src/devices/bus/saturn/sat_slot.c
diff --git a/src/emu/bus/saturn/sat_slot.h b/src/devices/bus/saturn/sat_slot.h
similarity index 100%
rename from src/emu/bus/saturn/sat_slot.h
rename to src/devices/bus/saturn/sat_slot.h
diff --git a/src/emu/bus/scsi/acb4070.c b/src/devices/bus/scsi/acb4070.c
similarity index 100%
rename from src/emu/bus/scsi/acb4070.c
rename to src/devices/bus/scsi/acb4070.c
diff --git a/src/emu/bus/scsi/acb4070.h b/src/devices/bus/scsi/acb4070.h
similarity index 100%
rename from src/emu/bus/scsi/acb4070.h
rename to src/devices/bus/scsi/acb4070.h
diff --git a/src/emu/bus/scsi/cdu76s.c b/src/devices/bus/scsi/cdu76s.c
similarity index 100%
rename from src/emu/bus/scsi/cdu76s.c
rename to src/devices/bus/scsi/cdu76s.c
diff --git a/src/emu/bus/scsi/cdu76s.h b/src/devices/bus/scsi/cdu76s.h
similarity index 100%
rename from src/emu/bus/scsi/cdu76s.h
rename to src/devices/bus/scsi/cdu76s.h
diff --git a/src/emu/bus/scsi/d9060hd.c b/src/devices/bus/scsi/d9060hd.c
similarity index 100%
rename from src/emu/bus/scsi/d9060hd.c
rename to src/devices/bus/scsi/d9060hd.c
diff --git a/src/emu/bus/scsi/d9060hd.h b/src/devices/bus/scsi/d9060hd.h
similarity index 100%
rename from src/emu/bus/scsi/d9060hd.h
rename to src/devices/bus/scsi/d9060hd.h
diff --git a/src/emu/bus/scsi/omti5100.c b/src/devices/bus/scsi/omti5100.c
similarity index 100%
rename from src/emu/bus/scsi/omti5100.c
rename to src/devices/bus/scsi/omti5100.c
diff --git a/src/emu/bus/scsi/omti5100.h b/src/devices/bus/scsi/omti5100.h
similarity index 100%
rename from src/emu/bus/scsi/omti5100.h
rename to src/devices/bus/scsi/omti5100.h
diff --git a/src/emu/bus/scsi/pc9801_sasi.c b/src/devices/bus/scsi/pc9801_sasi.c
similarity index 100%
rename from src/emu/bus/scsi/pc9801_sasi.c
rename to src/devices/bus/scsi/pc9801_sasi.c
diff --git a/src/emu/bus/scsi/pc9801_sasi.h b/src/devices/bus/scsi/pc9801_sasi.h
similarity index 100%
rename from src/emu/bus/scsi/pc9801_sasi.h
rename to src/devices/bus/scsi/pc9801_sasi.h
diff --git a/src/emu/bus/scsi/s1410.c b/src/devices/bus/scsi/s1410.c
similarity index 100%
rename from src/emu/bus/scsi/s1410.c
rename to src/devices/bus/scsi/s1410.c
diff --git a/src/emu/bus/scsi/s1410.h b/src/devices/bus/scsi/s1410.h
similarity index 100%
rename from src/emu/bus/scsi/s1410.h
rename to src/devices/bus/scsi/s1410.h
diff --git a/src/emu/bus/scsi/sa1403d.c b/src/devices/bus/scsi/sa1403d.c
similarity index 100%
rename from src/emu/bus/scsi/sa1403d.c
rename to src/devices/bus/scsi/sa1403d.c
diff --git a/src/emu/bus/scsi/sa1403d.h b/src/devices/bus/scsi/sa1403d.h
similarity index 100%
rename from src/emu/bus/scsi/sa1403d.h
rename to src/devices/bus/scsi/sa1403d.h
diff --git a/src/emu/bus/scsi/scsi.c b/src/devices/bus/scsi/scsi.c
similarity index 100%
rename from src/emu/bus/scsi/scsi.c
rename to src/devices/bus/scsi/scsi.c
diff --git a/src/emu/bus/scsi/scsi.h b/src/devices/bus/scsi/scsi.h
similarity index 100%
rename from src/emu/bus/scsi/scsi.h
rename to src/devices/bus/scsi/scsi.h
diff --git a/src/emu/bus/scsi/scsicd.c b/src/devices/bus/scsi/scsicd.c
similarity index 100%
rename from src/emu/bus/scsi/scsicd.c
rename to src/devices/bus/scsi/scsicd.c
diff --git a/src/emu/bus/scsi/scsicd.h b/src/devices/bus/scsi/scsicd.h
similarity index 100%
rename from src/emu/bus/scsi/scsicd.h
rename to src/devices/bus/scsi/scsicd.h
diff --git a/src/emu/bus/scsi/scsihd.c b/src/devices/bus/scsi/scsihd.c
similarity index 100%
rename from src/emu/bus/scsi/scsihd.c
rename to src/devices/bus/scsi/scsihd.c
diff --git a/src/emu/bus/scsi/scsihd.h b/src/devices/bus/scsi/scsihd.h
similarity index 100%
rename from src/emu/bus/scsi/scsihd.h
rename to src/devices/bus/scsi/scsihd.h
diff --git a/src/emu/bus/scsi/scsihle.c b/src/devices/bus/scsi/scsihle.c
similarity index 100%
rename from src/emu/bus/scsi/scsihle.c
rename to src/devices/bus/scsi/scsihle.c
diff --git a/src/emu/bus/scsi/scsihle.h b/src/devices/bus/scsi/scsihle.h
similarity index 100%
rename from src/emu/bus/scsi/scsihle.h
rename to src/devices/bus/scsi/scsihle.h
diff --git a/src/emu/bus/scv/rom.c b/src/devices/bus/scv/rom.c
similarity index 100%
rename from src/emu/bus/scv/rom.c
rename to src/devices/bus/scv/rom.c
diff --git a/src/emu/bus/scv/rom.h b/src/devices/bus/scv/rom.h
similarity index 100%
rename from src/emu/bus/scv/rom.h
rename to src/devices/bus/scv/rom.h
diff --git a/src/emu/bus/scv/slot.c b/src/devices/bus/scv/slot.c
similarity index 100%
rename from src/emu/bus/scv/slot.c
rename to src/devices/bus/scv/slot.c
diff --git a/src/emu/bus/scv/slot.h b/src/devices/bus/scv/slot.h
similarity index 100%
rename from src/emu/bus/scv/slot.h
rename to src/devices/bus/scv/slot.h
diff --git a/src/emu/bus/sega8/ccatch.c b/src/devices/bus/sega8/ccatch.c
similarity index 100%
rename from src/emu/bus/sega8/ccatch.c
rename to src/devices/bus/sega8/ccatch.c
diff --git a/src/emu/bus/sega8/ccatch.h b/src/devices/bus/sega8/ccatch.h
similarity index 100%
rename from src/emu/bus/sega8/ccatch.h
rename to src/devices/bus/sega8/ccatch.h
diff --git a/src/emu/bus/sega8/mgear.c b/src/devices/bus/sega8/mgear.c
similarity index 100%
rename from src/emu/bus/sega8/mgear.c
rename to src/devices/bus/sega8/mgear.c
diff --git a/src/emu/bus/sega8/mgear.h b/src/devices/bus/sega8/mgear.h
similarity index 100%
rename from src/emu/bus/sega8/mgear.h
rename to src/devices/bus/sega8/mgear.h
diff --git a/src/emu/bus/sega8/rom.c b/src/devices/bus/sega8/rom.c
similarity index 100%
rename from src/emu/bus/sega8/rom.c
rename to src/devices/bus/sega8/rom.c
diff --git a/src/emu/bus/sega8/rom.h b/src/devices/bus/sega8/rom.h
similarity index 100%
rename from src/emu/bus/sega8/rom.h
rename to src/devices/bus/sega8/rom.h
diff --git a/src/emu/bus/sega8/sega8_slot.c b/src/devices/bus/sega8/sega8_slot.c
similarity index 100%
rename from src/emu/bus/sega8/sega8_slot.c
rename to src/devices/bus/sega8/sega8_slot.c
diff --git a/src/emu/bus/sega8/sega8_slot.h b/src/devices/bus/sega8/sega8_slot.h
similarity index 100%
rename from src/emu/bus/sega8/sega8_slot.h
rename to src/devices/bus/sega8/sega8_slot.h
diff --git a/src/emu/bus/sms_ctrl/graphic.c b/src/devices/bus/sms_ctrl/graphic.c
similarity index 100%
rename from src/emu/bus/sms_ctrl/graphic.c
rename to src/devices/bus/sms_ctrl/graphic.c
diff --git a/src/emu/bus/sms_ctrl/graphic.h b/src/devices/bus/sms_ctrl/graphic.h
similarity index 100%
rename from src/emu/bus/sms_ctrl/graphic.h
rename to src/devices/bus/sms_ctrl/graphic.h
diff --git a/src/emu/bus/sms_ctrl/joypad.c b/src/devices/bus/sms_ctrl/joypad.c
similarity index 100%
rename from src/emu/bus/sms_ctrl/joypad.c
rename to src/devices/bus/sms_ctrl/joypad.c
diff --git a/src/emu/bus/sms_ctrl/joypad.h b/src/devices/bus/sms_ctrl/joypad.h
similarity index 100%
rename from src/emu/bus/sms_ctrl/joypad.h
rename to src/devices/bus/sms_ctrl/joypad.h
diff --git a/src/emu/bus/sms_ctrl/lphaser.c b/src/devices/bus/sms_ctrl/lphaser.c
similarity index 100%
rename from src/emu/bus/sms_ctrl/lphaser.c
rename to src/devices/bus/sms_ctrl/lphaser.c
diff --git a/src/emu/bus/sms_ctrl/lphaser.h b/src/devices/bus/sms_ctrl/lphaser.h
similarity index 100%
rename from src/emu/bus/sms_ctrl/lphaser.h
rename to src/devices/bus/sms_ctrl/lphaser.h
diff --git a/src/emu/bus/sms_ctrl/multitap.c b/src/devices/bus/sms_ctrl/multitap.c
similarity index 100%
rename from src/emu/bus/sms_ctrl/multitap.c
rename to src/devices/bus/sms_ctrl/multitap.c
diff --git a/src/emu/bus/sms_ctrl/multitap.h b/src/devices/bus/sms_ctrl/multitap.h
similarity index 100%
rename from src/emu/bus/sms_ctrl/multitap.h
rename to src/devices/bus/sms_ctrl/multitap.h
diff --git a/src/emu/bus/sms_ctrl/paddle.c b/src/devices/bus/sms_ctrl/paddle.c
similarity index 100%
rename from src/emu/bus/sms_ctrl/paddle.c
rename to src/devices/bus/sms_ctrl/paddle.c
diff --git a/src/emu/bus/sms_ctrl/paddle.h b/src/devices/bus/sms_ctrl/paddle.h
similarity index 100%
rename from src/emu/bus/sms_ctrl/paddle.h
rename to src/devices/bus/sms_ctrl/paddle.h
diff --git a/src/emu/bus/sms_ctrl/rfu.c b/src/devices/bus/sms_ctrl/rfu.c
similarity index 100%
rename from src/emu/bus/sms_ctrl/rfu.c
rename to src/devices/bus/sms_ctrl/rfu.c
diff --git a/src/emu/bus/sms_ctrl/rfu.h b/src/devices/bus/sms_ctrl/rfu.h
similarity index 100%
rename from src/emu/bus/sms_ctrl/rfu.h
rename to src/devices/bus/sms_ctrl/rfu.h
diff --git a/src/emu/bus/sms_ctrl/smsctrl.c b/src/devices/bus/sms_ctrl/smsctrl.c
similarity index 100%
rename from src/emu/bus/sms_ctrl/smsctrl.c
rename to src/devices/bus/sms_ctrl/smsctrl.c
diff --git a/src/emu/bus/sms_ctrl/smsctrl.h b/src/devices/bus/sms_ctrl/smsctrl.h
similarity index 100%
rename from src/emu/bus/sms_ctrl/smsctrl.h
rename to src/devices/bus/sms_ctrl/smsctrl.h
diff --git a/src/emu/bus/sms_ctrl/sports.c b/src/devices/bus/sms_ctrl/sports.c
similarity index 100%
rename from src/emu/bus/sms_ctrl/sports.c
rename to src/devices/bus/sms_ctrl/sports.c
diff --git a/src/emu/bus/sms_ctrl/sports.h b/src/devices/bus/sms_ctrl/sports.h
similarity index 100%
rename from src/emu/bus/sms_ctrl/sports.h
rename to src/devices/bus/sms_ctrl/sports.h
diff --git a/src/emu/bus/sms_ctrl/sportsjp.c b/src/devices/bus/sms_ctrl/sportsjp.c
similarity index 100%
rename from src/emu/bus/sms_ctrl/sportsjp.c
rename to src/devices/bus/sms_ctrl/sportsjp.c
diff --git a/src/emu/bus/sms_ctrl/sportsjp.h b/src/devices/bus/sms_ctrl/sportsjp.h
similarity index 100%
rename from src/emu/bus/sms_ctrl/sportsjp.h
rename to src/devices/bus/sms_ctrl/sportsjp.h
diff --git a/src/emu/bus/sms_exp/gender.c b/src/devices/bus/sms_exp/gender.c
similarity index 100%
rename from src/emu/bus/sms_exp/gender.c
rename to src/devices/bus/sms_exp/gender.c
diff --git a/src/emu/bus/sms_exp/gender.h b/src/devices/bus/sms_exp/gender.h
similarity index 100%
rename from src/emu/bus/sms_exp/gender.h
rename to src/devices/bus/sms_exp/gender.h
diff --git a/src/emu/bus/sms_exp/smsexp.c b/src/devices/bus/sms_exp/smsexp.c
similarity index 100%
rename from src/emu/bus/sms_exp/smsexp.c
rename to src/devices/bus/sms_exp/smsexp.c
diff --git a/src/emu/bus/sms_exp/smsexp.h b/src/devices/bus/sms_exp/smsexp.h
similarity index 100%
rename from src/emu/bus/sms_exp/smsexp.h
rename to src/devices/bus/sms_exp/smsexp.h
diff --git a/src/emu/bus/snes/bsx.c b/src/devices/bus/snes/bsx.c
similarity index 100%
rename from src/emu/bus/snes/bsx.c
rename to src/devices/bus/snes/bsx.c
diff --git a/src/emu/bus/snes/bsx.h b/src/devices/bus/snes/bsx.h
similarity index 100%
rename from src/emu/bus/snes/bsx.h
rename to src/devices/bus/snes/bsx.h
diff --git a/src/emu/bus/snes/event.c b/src/devices/bus/snes/event.c
similarity index 100%
rename from src/emu/bus/snes/event.c
rename to src/devices/bus/snes/event.c
diff --git a/src/emu/bus/snes/event.h b/src/devices/bus/snes/event.h
similarity index 100%
rename from src/emu/bus/snes/event.h
rename to src/devices/bus/snes/event.h
diff --git a/src/emu/bus/snes/rom.c b/src/devices/bus/snes/rom.c
similarity index 100%
rename from src/emu/bus/snes/rom.c
rename to src/devices/bus/snes/rom.c
diff --git a/src/emu/bus/snes/rom.h b/src/devices/bus/snes/rom.h
similarity index 100%
rename from src/emu/bus/snes/rom.h
rename to src/devices/bus/snes/rom.h
diff --git a/src/emu/bus/snes/rom21.c b/src/devices/bus/snes/rom21.c
similarity index 100%
rename from src/emu/bus/snes/rom21.c
rename to src/devices/bus/snes/rom21.c
diff --git a/src/emu/bus/snes/rom21.h b/src/devices/bus/snes/rom21.h
similarity index 100%
rename from src/emu/bus/snes/rom21.h
rename to src/devices/bus/snes/rom21.h
diff --git a/src/emu/bus/snes/sa1.c b/src/devices/bus/snes/sa1.c
similarity index 100%
rename from src/emu/bus/snes/sa1.c
rename to src/devices/bus/snes/sa1.c
diff --git a/src/emu/bus/snes/sa1.h b/src/devices/bus/snes/sa1.h
similarity index 100%
rename from src/emu/bus/snes/sa1.h
rename to src/devices/bus/snes/sa1.h
diff --git a/src/emu/bus/snes/sdd1.c b/src/devices/bus/snes/sdd1.c
similarity index 100%
rename from src/emu/bus/snes/sdd1.c
rename to src/devices/bus/snes/sdd1.c
diff --git a/src/emu/bus/snes/sdd1.h b/src/devices/bus/snes/sdd1.h
similarity index 100%
rename from src/emu/bus/snes/sdd1.h
rename to src/devices/bus/snes/sdd1.h
diff --git a/src/emu/bus/snes/sfx.c b/src/devices/bus/snes/sfx.c
similarity index 100%
rename from src/emu/bus/snes/sfx.c
rename to src/devices/bus/snes/sfx.c
diff --git a/src/emu/bus/snes/sfx.h b/src/devices/bus/snes/sfx.h
similarity index 100%
rename from src/emu/bus/snes/sfx.h
rename to src/devices/bus/snes/sfx.h
diff --git a/src/emu/bus/snes/sgb.c b/src/devices/bus/snes/sgb.c
similarity index 100%
rename from src/emu/bus/snes/sgb.c
rename to src/devices/bus/snes/sgb.c
diff --git a/src/emu/bus/snes/sgb.h b/src/devices/bus/snes/sgb.h
similarity index 100%
rename from src/emu/bus/snes/sgb.h
rename to src/devices/bus/snes/sgb.h
diff --git a/src/emu/bus/snes/snes_carts.c b/src/devices/bus/snes/snes_carts.c
similarity index 100%
rename from src/emu/bus/snes/snes_carts.c
rename to src/devices/bus/snes/snes_carts.c
diff --git a/src/emu/bus/snes/snes_carts.h b/src/devices/bus/snes/snes_carts.h
similarity index 100%
rename from src/emu/bus/snes/snes_carts.h
rename to src/devices/bus/snes/snes_carts.h
diff --git a/src/emu/bus/snes/snes_slot.c b/src/devices/bus/snes/snes_slot.c
similarity index 100%
rename from src/emu/bus/snes/snes_slot.c
rename to src/devices/bus/snes/snes_slot.c
diff --git a/src/emu/bus/snes/snes_slot.h b/src/devices/bus/snes/snes_slot.h
similarity index 100%
rename from src/emu/bus/snes/snes_slot.h
rename to src/devices/bus/snes/snes_slot.h
diff --git a/src/emu/bus/snes/spc7110.c b/src/devices/bus/snes/spc7110.c
similarity index 100%
rename from src/emu/bus/snes/spc7110.c
rename to src/devices/bus/snes/spc7110.c
diff --git a/src/emu/bus/snes/spc7110.h b/src/devices/bus/snes/spc7110.h
similarity index 100%
rename from src/emu/bus/snes/spc7110.h
rename to src/devices/bus/snes/spc7110.h
diff --git a/src/emu/bus/snes/sufami.c b/src/devices/bus/snes/sufami.c
similarity index 100%
rename from src/emu/bus/snes/sufami.c
rename to src/devices/bus/snes/sufami.c
diff --git a/src/emu/bus/snes/sufami.h b/src/devices/bus/snes/sufami.h
similarity index 100%
rename from src/emu/bus/snes/sufami.h
rename to src/devices/bus/snes/sufami.h
diff --git a/src/emu/bus/snes/upd.c b/src/devices/bus/snes/upd.c
similarity index 100%
rename from src/emu/bus/snes/upd.c
rename to src/devices/bus/snes/upd.c
diff --git a/src/emu/bus/snes/upd.h b/src/devices/bus/snes/upd.h
similarity index 100%
rename from src/emu/bus/snes/upd.h
rename to src/devices/bus/snes/upd.h
diff --git a/src/emu/bus/snes_ctrl/bcbattle.c b/src/devices/bus/snes_ctrl/bcbattle.c
similarity index 100%
rename from src/emu/bus/snes_ctrl/bcbattle.c
rename to src/devices/bus/snes_ctrl/bcbattle.c
diff --git a/src/emu/bus/snes_ctrl/bcbattle.h b/src/devices/bus/snes_ctrl/bcbattle.h
similarity index 100%
rename from src/emu/bus/snes_ctrl/bcbattle.h
rename to src/devices/bus/snes_ctrl/bcbattle.h
diff --git a/src/emu/bus/snes_ctrl/ctrl.c b/src/devices/bus/snes_ctrl/ctrl.c
similarity index 100%
rename from src/emu/bus/snes_ctrl/ctrl.c
rename to src/devices/bus/snes_ctrl/ctrl.c
diff --git a/src/emu/bus/snes_ctrl/ctrl.h b/src/devices/bus/snes_ctrl/ctrl.h
similarity index 100%
rename from src/emu/bus/snes_ctrl/ctrl.h
rename to src/devices/bus/snes_ctrl/ctrl.h
diff --git a/src/emu/bus/snes_ctrl/joypad.c b/src/devices/bus/snes_ctrl/joypad.c
similarity index 100%
rename from src/emu/bus/snes_ctrl/joypad.c
rename to src/devices/bus/snes_ctrl/joypad.c
diff --git a/src/emu/bus/snes_ctrl/joypad.h b/src/devices/bus/snes_ctrl/joypad.h
similarity index 100%
rename from src/emu/bus/snes_ctrl/joypad.h
rename to src/devices/bus/snes_ctrl/joypad.h
diff --git a/src/emu/bus/snes_ctrl/miracle.c b/src/devices/bus/snes_ctrl/miracle.c
similarity index 100%
rename from src/emu/bus/snes_ctrl/miracle.c
rename to src/devices/bus/snes_ctrl/miracle.c
diff --git a/src/emu/bus/snes_ctrl/miracle.h b/src/devices/bus/snes_ctrl/miracle.h
similarity index 100%
rename from src/emu/bus/snes_ctrl/miracle.h
rename to src/devices/bus/snes_ctrl/miracle.h
diff --git a/src/emu/bus/snes_ctrl/mouse.c b/src/devices/bus/snes_ctrl/mouse.c
similarity index 100%
rename from src/emu/bus/snes_ctrl/mouse.c
rename to src/devices/bus/snes_ctrl/mouse.c
diff --git a/src/emu/bus/snes_ctrl/mouse.h b/src/devices/bus/snes_ctrl/mouse.h
similarity index 100%
rename from src/emu/bus/snes_ctrl/mouse.h
rename to src/devices/bus/snes_ctrl/mouse.h
diff --git a/src/emu/bus/snes_ctrl/multitap.c b/src/devices/bus/snes_ctrl/multitap.c
similarity index 100%
rename from src/emu/bus/snes_ctrl/multitap.c
rename to src/devices/bus/snes_ctrl/multitap.c
diff --git a/src/emu/bus/snes_ctrl/multitap.h b/src/devices/bus/snes_ctrl/multitap.h
similarity index 100%
rename from src/emu/bus/snes_ctrl/multitap.h
rename to src/devices/bus/snes_ctrl/multitap.h
diff --git a/src/emu/bus/snes_ctrl/pachinko.c b/src/devices/bus/snes_ctrl/pachinko.c
similarity index 100%
rename from src/emu/bus/snes_ctrl/pachinko.c
rename to src/devices/bus/snes_ctrl/pachinko.c
diff --git a/src/emu/bus/snes_ctrl/pachinko.h b/src/devices/bus/snes_ctrl/pachinko.h
similarity index 100%
rename from src/emu/bus/snes_ctrl/pachinko.h
rename to src/devices/bus/snes_ctrl/pachinko.h
diff --git a/src/emu/bus/snes_ctrl/sscope.c b/src/devices/bus/snes_ctrl/sscope.c
similarity index 100%
rename from src/emu/bus/snes_ctrl/sscope.c
rename to src/devices/bus/snes_ctrl/sscope.c
diff --git a/src/emu/bus/snes_ctrl/sscope.h b/src/devices/bus/snes_ctrl/sscope.h
similarity index 100%
rename from src/emu/bus/snes_ctrl/sscope.h
rename to src/devices/bus/snes_ctrl/sscope.h
diff --git a/src/emu/bus/snes_ctrl/twintap.c b/src/devices/bus/snes_ctrl/twintap.c
similarity index 100%
rename from src/emu/bus/snes_ctrl/twintap.c
rename to src/devices/bus/snes_ctrl/twintap.c
diff --git a/src/emu/bus/snes_ctrl/twintap.h b/src/devices/bus/snes_ctrl/twintap.h
similarity index 100%
rename from src/emu/bus/snes_ctrl/twintap.h
rename to src/devices/bus/snes_ctrl/twintap.h
diff --git a/src/emu/bus/spc1000/exp.c b/src/devices/bus/spc1000/exp.c
similarity index 100%
rename from src/emu/bus/spc1000/exp.c
rename to src/devices/bus/spc1000/exp.c
diff --git a/src/emu/bus/spc1000/exp.h b/src/devices/bus/spc1000/exp.h
similarity index 100%
rename from src/emu/bus/spc1000/exp.h
rename to src/devices/bus/spc1000/exp.h
diff --git a/src/emu/bus/spc1000/fdd.c b/src/devices/bus/spc1000/fdd.c
similarity index 100%
rename from src/emu/bus/spc1000/fdd.c
rename to src/devices/bus/spc1000/fdd.c
diff --git a/src/emu/bus/spc1000/fdd.h b/src/devices/bus/spc1000/fdd.h
similarity index 100%
rename from src/emu/bus/spc1000/fdd.h
rename to src/devices/bus/spc1000/fdd.h
diff --git a/src/emu/bus/spc1000/vdp.c b/src/devices/bus/spc1000/vdp.c
similarity index 100%
rename from src/emu/bus/spc1000/vdp.c
rename to src/devices/bus/spc1000/vdp.c
diff --git a/src/emu/bus/spc1000/vdp.h b/src/devices/bus/spc1000/vdp.h
similarity index 100%
rename from src/emu/bus/spc1000/vdp.h
rename to src/devices/bus/spc1000/vdp.h
diff --git a/src/emu/bus/ti99_peb/bwg.c b/src/devices/bus/ti99_peb/bwg.c
similarity index 100%
rename from src/emu/bus/ti99_peb/bwg.c
rename to src/devices/bus/ti99_peb/bwg.c
diff --git a/src/emu/bus/ti99_peb/bwg.h b/src/devices/bus/ti99_peb/bwg.h
similarity index 100%
rename from src/emu/bus/ti99_peb/bwg.h
rename to src/devices/bus/ti99_peb/bwg.h
diff --git a/src/emu/bus/ti99_peb/evpc.c b/src/devices/bus/ti99_peb/evpc.c
similarity index 100%
rename from src/emu/bus/ti99_peb/evpc.c
rename to src/devices/bus/ti99_peb/evpc.c
diff --git a/src/emu/bus/ti99_peb/evpc.h b/src/devices/bus/ti99_peb/evpc.h
similarity index 100%
rename from src/emu/bus/ti99_peb/evpc.h
rename to src/devices/bus/ti99_peb/evpc.h
diff --git a/src/emu/bus/ti99_peb/hfdc.c b/src/devices/bus/ti99_peb/hfdc.c
similarity index 100%
rename from src/emu/bus/ti99_peb/hfdc.c
rename to src/devices/bus/ti99_peb/hfdc.c
diff --git a/src/emu/bus/ti99_peb/hfdc.h b/src/devices/bus/ti99_peb/hfdc.h
similarity index 100%
rename from src/emu/bus/ti99_peb/hfdc.h
rename to src/devices/bus/ti99_peb/hfdc.h
diff --git a/src/emu/bus/ti99_peb/horizon.c b/src/devices/bus/ti99_peb/horizon.c
similarity index 100%
rename from src/emu/bus/ti99_peb/horizon.c
rename to src/devices/bus/ti99_peb/horizon.c
diff --git a/src/emu/bus/ti99_peb/horizon.h b/src/devices/bus/ti99_peb/horizon.h
similarity index 100%
rename from src/emu/bus/ti99_peb/horizon.h
rename to src/devices/bus/ti99_peb/horizon.h
diff --git a/src/emu/bus/ti99_peb/hsgpl.c b/src/devices/bus/ti99_peb/hsgpl.c
similarity index 100%
rename from src/emu/bus/ti99_peb/hsgpl.c
rename to src/devices/bus/ti99_peb/hsgpl.c
diff --git a/src/emu/bus/ti99_peb/hsgpl.h b/src/devices/bus/ti99_peb/hsgpl.h
similarity index 100%
rename from src/emu/bus/ti99_peb/hsgpl.h
rename to src/devices/bus/ti99_peb/hsgpl.h
diff --git a/src/emu/bus/ti99_peb/memex.c b/src/devices/bus/ti99_peb/memex.c
similarity index 100%
rename from src/emu/bus/ti99_peb/memex.c
rename to src/devices/bus/ti99_peb/memex.c
diff --git a/src/emu/bus/ti99_peb/memex.h b/src/devices/bus/ti99_peb/memex.h
similarity index 100%
rename from src/emu/bus/ti99_peb/memex.h
rename to src/devices/bus/ti99_peb/memex.h
diff --git a/src/emu/bus/ti99_peb/myarcmem.c b/src/devices/bus/ti99_peb/myarcmem.c
similarity index 100%
rename from src/emu/bus/ti99_peb/myarcmem.c
rename to src/devices/bus/ti99_peb/myarcmem.c
diff --git a/src/emu/bus/ti99_peb/myarcmem.h b/src/devices/bus/ti99_peb/myarcmem.h
similarity index 100%
rename from src/emu/bus/ti99_peb/myarcmem.h
rename to src/devices/bus/ti99_peb/myarcmem.h
diff --git a/src/emu/bus/ti99_peb/pcode.c b/src/devices/bus/ti99_peb/pcode.c
similarity index 100%
rename from src/emu/bus/ti99_peb/pcode.c
rename to src/devices/bus/ti99_peb/pcode.c
diff --git a/src/emu/bus/ti99_peb/pcode.h b/src/devices/bus/ti99_peb/pcode.h
similarity index 100%
rename from src/emu/bus/ti99_peb/pcode.h
rename to src/devices/bus/ti99_peb/pcode.h
diff --git a/src/emu/bus/ti99_peb/peribox.c b/src/devices/bus/ti99_peb/peribox.c
similarity index 100%
rename from src/emu/bus/ti99_peb/peribox.c
rename to src/devices/bus/ti99_peb/peribox.c
diff --git a/src/emu/bus/ti99_peb/peribox.h b/src/devices/bus/ti99_peb/peribox.h
similarity index 100%
rename from src/emu/bus/ti99_peb/peribox.h
rename to src/devices/bus/ti99_peb/peribox.h
diff --git a/src/emu/bus/ti99_peb/samsmem.c b/src/devices/bus/ti99_peb/samsmem.c
similarity index 100%
rename from src/emu/bus/ti99_peb/samsmem.c
rename to src/devices/bus/ti99_peb/samsmem.c
diff --git a/src/emu/bus/ti99_peb/samsmem.h b/src/devices/bus/ti99_peb/samsmem.h
similarity index 100%
rename from src/emu/bus/ti99_peb/samsmem.h
rename to src/devices/bus/ti99_peb/samsmem.h
diff --git a/src/emu/bus/ti99_peb/spchsyn.c b/src/devices/bus/ti99_peb/spchsyn.c
similarity index 100%
rename from src/emu/bus/ti99_peb/spchsyn.c
rename to src/devices/bus/ti99_peb/spchsyn.c
diff --git a/src/emu/bus/ti99_peb/spchsyn.h b/src/devices/bus/ti99_peb/spchsyn.h
similarity index 100%
rename from src/emu/bus/ti99_peb/spchsyn.h
rename to src/devices/bus/ti99_peb/spchsyn.h
diff --git a/src/emu/bus/ti99_peb/ti_32kmem.c b/src/devices/bus/ti99_peb/ti_32kmem.c
similarity index 100%
rename from src/emu/bus/ti99_peb/ti_32kmem.c
rename to src/devices/bus/ti99_peb/ti_32kmem.c
diff --git a/src/emu/bus/ti99_peb/ti_32kmem.h b/src/devices/bus/ti99_peb/ti_32kmem.h
similarity index 100%
rename from src/emu/bus/ti99_peb/ti_32kmem.h
rename to src/devices/bus/ti99_peb/ti_32kmem.h
diff --git a/src/emu/bus/ti99_peb/ti_fdc.c b/src/devices/bus/ti99_peb/ti_fdc.c
similarity index 100%
rename from src/emu/bus/ti99_peb/ti_fdc.c
rename to src/devices/bus/ti99_peb/ti_fdc.c
diff --git a/src/emu/bus/ti99_peb/ti_fdc.h b/src/devices/bus/ti99_peb/ti_fdc.h
similarity index 100%
rename from src/emu/bus/ti99_peb/ti_fdc.h
rename to src/devices/bus/ti99_peb/ti_fdc.h
diff --git a/src/emu/bus/ti99_peb/ti_rs232.c b/src/devices/bus/ti99_peb/ti_rs232.c
similarity index 100%
rename from src/emu/bus/ti99_peb/ti_rs232.c
rename to src/devices/bus/ti99_peb/ti_rs232.c
diff --git a/src/emu/bus/ti99_peb/ti_rs232.h b/src/devices/bus/ti99_peb/ti_rs232.h
similarity index 100%
rename from src/emu/bus/ti99_peb/ti_rs232.h
rename to src/devices/bus/ti99_peb/ti_rs232.h
diff --git a/src/emu/bus/ti99_peb/tn_ide.c b/src/devices/bus/ti99_peb/tn_ide.c
similarity index 100%
rename from src/emu/bus/ti99_peb/tn_ide.c
rename to src/devices/bus/ti99_peb/tn_ide.c
diff --git a/src/emu/bus/ti99_peb/tn_ide.h b/src/devices/bus/ti99_peb/tn_ide.h
similarity index 100%
rename from src/emu/bus/ti99_peb/tn_ide.h
rename to src/devices/bus/ti99_peb/tn_ide.h
diff --git a/src/emu/bus/ti99_peb/tn_usbsm.c b/src/devices/bus/ti99_peb/tn_usbsm.c
similarity index 100%
rename from src/emu/bus/ti99_peb/tn_usbsm.c
rename to src/devices/bus/ti99_peb/tn_usbsm.c
diff --git a/src/emu/bus/ti99_peb/tn_usbsm.h b/src/devices/bus/ti99_peb/tn_usbsm.h
similarity index 100%
rename from src/emu/bus/ti99_peb/tn_usbsm.h
rename to src/devices/bus/ti99_peb/tn_usbsm.h
diff --git a/src/emu/bus/ti99x/990_dk.c b/src/devices/bus/ti99x/990_dk.c
similarity index 100%
rename from src/emu/bus/ti99x/990_dk.c
rename to src/devices/bus/ti99x/990_dk.c
diff --git a/src/emu/bus/ti99x/990_dk.h b/src/devices/bus/ti99x/990_dk.h
similarity index 100%
rename from src/emu/bus/ti99x/990_dk.h
rename to src/devices/bus/ti99x/990_dk.h
diff --git a/src/emu/bus/ti99x/990_hd.c b/src/devices/bus/ti99x/990_hd.c
similarity index 100%
rename from src/emu/bus/ti99x/990_hd.c
rename to src/devices/bus/ti99x/990_hd.c
diff --git a/src/emu/bus/ti99x/990_hd.h b/src/devices/bus/ti99x/990_hd.h
similarity index 100%
rename from src/emu/bus/ti99x/990_hd.h
rename to src/devices/bus/ti99x/990_hd.h
diff --git a/src/emu/bus/ti99x/990_tap.c b/src/devices/bus/ti99x/990_tap.c
similarity index 100%
rename from src/emu/bus/ti99x/990_tap.c
rename to src/devices/bus/ti99x/990_tap.c
diff --git a/src/emu/bus/ti99x/990_tap.h b/src/devices/bus/ti99x/990_tap.h
similarity index 100%
rename from src/emu/bus/ti99x/990_tap.h
rename to src/devices/bus/ti99x/990_tap.h
diff --git a/src/emu/bus/ti99x/998board.c b/src/devices/bus/ti99x/998board.c
similarity index 100%
rename from src/emu/bus/ti99x/998board.c
rename to src/devices/bus/ti99x/998board.c
diff --git a/src/emu/bus/ti99x/998board.h b/src/devices/bus/ti99x/998board.h
similarity index 100%
rename from src/emu/bus/ti99x/998board.h
rename to src/devices/bus/ti99x/998board.h
diff --git a/src/emu/bus/ti99x/datamux.c b/src/devices/bus/ti99x/datamux.c
similarity index 100%
rename from src/emu/bus/ti99x/datamux.c
rename to src/devices/bus/ti99x/datamux.c
diff --git a/src/emu/bus/ti99x/datamux.h b/src/devices/bus/ti99x/datamux.h
similarity index 100%
rename from src/emu/bus/ti99x/datamux.h
rename to src/devices/bus/ti99x/datamux.h
diff --git a/src/emu/bus/ti99x/genboard.c b/src/devices/bus/ti99x/genboard.c
similarity index 100%
rename from src/emu/bus/ti99x/genboard.c
rename to src/devices/bus/ti99x/genboard.c
diff --git a/src/emu/bus/ti99x/genboard.h b/src/devices/bus/ti99x/genboard.h
similarity index 100%
rename from src/emu/bus/ti99x/genboard.h
rename to src/devices/bus/ti99x/genboard.h
diff --git a/src/emu/bus/ti99x/grom.c b/src/devices/bus/ti99x/grom.c
similarity index 100%
rename from src/emu/bus/ti99x/grom.c
rename to src/devices/bus/ti99x/grom.c
diff --git a/src/emu/bus/ti99x/grom.h b/src/devices/bus/ti99x/grom.h
similarity index 100%
rename from src/emu/bus/ti99x/grom.h
rename to src/devices/bus/ti99x/grom.h
diff --git a/src/emu/bus/ti99x/gromport.c b/src/devices/bus/ti99x/gromport.c
similarity index 100%
rename from src/emu/bus/ti99x/gromport.c
rename to src/devices/bus/ti99x/gromport.c
diff --git a/src/emu/bus/ti99x/gromport.h b/src/devices/bus/ti99x/gromport.h
similarity index 100%
rename from src/emu/bus/ti99x/gromport.h
rename to src/devices/bus/ti99x/gromport.h
diff --git a/src/emu/bus/ti99x/handset.c b/src/devices/bus/ti99x/handset.c
similarity index 100%
rename from src/emu/bus/ti99x/handset.c
rename to src/devices/bus/ti99x/handset.c
diff --git a/src/emu/bus/ti99x/handset.h b/src/devices/bus/ti99x/handset.h
similarity index 100%
rename from src/emu/bus/ti99x/handset.h
rename to src/devices/bus/ti99x/handset.h
diff --git a/src/emu/bus/ti99x/joyport.c b/src/devices/bus/ti99x/joyport.c
similarity index 100%
rename from src/emu/bus/ti99x/joyport.c
rename to src/devices/bus/ti99x/joyport.c
diff --git a/src/emu/bus/ti99x/joyport.h b/src/devices/bus/ti99x/joyport.h
similarity index 100%
rename from src/emu/bus/ti99x/joyport.h
rename to src/devices/bus/ti99x/joyport.h
diff --git a/src/emu/bus/ti99x/mecmouse.c b/src/devices/bus/ti99x/mecmouse.c
similarity index 100%
rename from src/emu/bus/ti99x/mecmouse.c
rename to src/devices/bus/ti99x/mecmouse.c
diff --git a/src/emu/bus/ti99x/mecmouse.h b/src/devices/bus/ti99x/mecmouse.h
similarity index 100%
rename from src/emu/bus/ti99x/mecmouse.h
rename to src/devices/bus/ti99x/mecmouse.h
diff --git a/src/emu/bus/ti99x/ti99defs.h b/src/devices/bus/ti99x/ti99defs.h
similarity index 100%
rename from src/emu/bus/ti99x/ti99defs.h
rename to src/devices/bus/ti99x/ti99defs.h
diff --git a/src/emu/bus/ti99x/videowrp.c b/src/devices/bus/ti99x/videowrp.c
similarity index 100%
rename from src/emu/bus/ti99x/videowrp.c
rename to src/devices/bus/ti99x/videowrp.c
diff --git a/src/emu/bus/ti99x/videowrp.h b/src/devices/bus/ti99x/videowrp.h
similarity index 100%
rename from src/emu/bus/ti99x/videowrp.h
rename to src/devices/bus/ti99x/videowrp.h
diff --git a/src/emu/bus/tvc/hbf.c b/src/devices/bus/tvc/hbf.c
similarity index 100%
rename from src/emu/bus/tvc/hbf.c
rename to src/devices/bus/tvc/hbf.c
diff --git a/src/emu/bus/tvc/hbf.h b/src/devices/bus/tvc/hbf.h
similarity index 100%
rename from src/emu/bus/tvc/hbf.h
rename to src/devices/bus/tvc/hbf.h
diff --git a/src/emu/bus/tvc/tvc.c b/src/devices/bus/tvc/tvc.c
similarity index 100%
rename from src/emu/bus/tvc/tvc.c
rename to src/devices/bus/tvc/tvc.c
diff --git a/src/emu/bus/tvc/tvc.h b/src/devices/bus/tvc/tvc.h
similarity index 100%
rename from src/emu/bus/tvc/tvc.h
rename to src/devices/bus/tvc/tvc.h
diff --git a/src/emu/bus/vboy/rom.c b/src/devices/bus/vboy/rom.c
similarity index 100%
rename from src/emu/bus/vboy/rom.c
rename to src/devices/bus/vboy/rom.c
diff --git a/src/emu/bus/vboy/rom.h b/src/devices/bus/vboy/rom.h
similarity index 100%
rename from src/emu/bus/vboy/rom.h
rename to src/devices/bus/vboy/rom.h
diff --git a/src/emu/bus/vboy/slot.c b/src/devices/bus/vboy/slot.c
similarity index 100%
rename from src/emu/bus/vboy/slot.c
rename to src/devices/bus/vboy/slot.c
diff --git a/src/emu/bus/vboy/slot.h b/src/devices/bus/vboy/slot.h
similarity index 100%
rename from src/emu/bus/vboy/slot.h
rename to src/devices/bus/vboy/slot.h
diff --git a/src/emu/bus/vc4000/rom.c b/src/devices/bus/vc4000/rom.c
similarity index 100%
rename from src/emu/bus/vc4000/rom.c
rename to src/devices/bus/vc4000/rom.c
diff --git a/src/emu/bus/vc4000/rom.h b/src/devices/bus/vc4000/rom.h
similarity index 100%
rename from src/emu/bus/vc4000/rom.h
rename to src/devices/bus/vc4000/rom.h
diff --git a/src/emu/bus/vc4000/slot.c b/src/devices/bus/vc4000/slot.c
similarity index 100%
rename from src/emu/bus/vc4000/slot.c
rename to src/devices/bus/vc4000/slot.c
diff --git a/src/emu/bus/vc4000/slot.h b/src/devices/bus/vc4000/slot.h
similarity index 100%
rename from src/emu/bus/vc4000/slot.h
rename to src/devices/bus/vc4000/slot.h
diff --git a/src/emu/bus/vcs/compumat.c b/src/devices/bus/vcs/compumat.c
similarity index 100%
rename from src/emu/bus/vcs/compumat.c
rename to src/devices/bus/vcs/compumat.c
diff --git a/src/emu/bus/vcs/compumat.h b/src/devices/bus/vcs/compumat.h
similarity index 100%
rename from src/emu/bus/vcs/compumat.h
rename to src/devices/bus/vcs/compumat.h
diff --git a/src/emu/bus/vcs/dpc.c b/src/devices/bus/vcs/dpc.c
similarity index 100%
rename from src/emu/bus/vcs/dpc.c
rename to src/devices/bus/vcs/dpc.c
diff --git a/src/emu/bus/vcs/dpc.h b/src/devices/bus/vcs/dpc.h
similarity index 100%
rename from src/emu/bus/vcs/dpc.h
rename to src/devices/bus/vcs/dpc.h
diff --git a/src/emu/bus/vcs/rom.c b/src/devices/bus/vcs/rom.c
similarity index 100%
rename from src/emu/bus/vcs/rom.c
rename to src/devices/bus/vcs/rom.c
diff --git a/src/emu/bus/vcs/rom.h b/src/devices/bus/vcs/rom.h
similarity index 100%
rename from src/emu/bus/vcs/rom.h
rename to src/devices/bus/vcs/rom.h
diff --git a/src/emu/bus/vcs/scharger.c b/src/devices/bus/vcs/scharger.c
similarity index 100%
rename from src/emu/bus/vcs/scharger.c
rename to src/devices/bus/vcs/scharger.c
diff --git a/src/emu/bus/vcs/scharger.h b/src/devices/bus/vcs/scharger.h
similarity index 100%
rename from src/emu/bus/vcs/scharger.h
rename to src/devices/bus/vcs/scharger.h
diff --git a/src/emu/bus/vcs/vcs_slot.c b/src/devices/bus/vcs/vcs_slot.c
similarity index 100%
rename from src/emu/bus/vcs/vcs_slot.c
rename to src/devices/bus/vcs/vcs_slot.c
diff --git a/src/emu/bus/vcs/vcs_slot.h b/src/devices/bus/vcs/vcs_slot.h
similarity index 100%
rename from src/emu/bus/vcs/vcs_slot.h
rename to src/devices/bus/vcs/vcs_slot.h
diff --git a/src/emu/bus/vcs_ctrl/ctrl.c b/src/devices/bus/vcs_ctrl/ctrl.c
similarity index 100%
rename from src/emu/bus/vcs_ctrl/ctrl.c
rename to src/devices/bus/vcs_ctrl/ctrl.c
diff --git a/src/emu/bus/vcs_ctrl/ctrl.h b/src/devices/bus/vcs_ctrl/ctrl.h
similarity index 100%
rename from src/emu/bus/vcs_ctrl/ctrl.h
rename to src/devices/bus/vcs_ctrl/ctrl.h
diff --git a/src/emu/bus/vcs_ctrl/joybooster.c b/src/devices/bus/vcs_ctrl/joybooster.c
similarity index 100%
rename from src/emu/bus/vcs_ctrl/joybooster.c
rename to src/devices/bus/vcs_ctrl/joybooster.c
diff --git a/src/emu/bus/vcs_ctrl/joybooster.h b/src/devices/bus/vcs_ctrl/joybooster.h
similarity index 100%
rename from src/emu/bus/vcs_ctrl/joybooster.h
rename to src/devices/bus/vcs_ctrl/joybooster.h
diff --git a/src/emu/bus/vcs_ctrl/joystick.c b/src/devices/bus/vcs_ctrl/joystick.c
similarity index 100%
rename from src/emu/bus/vcs_ctrl/joystick.c
rename to src/devices/bus/vcs_ctrl/joystick.c
diff --git a/src/emu/bus/vcs_ctrl/joystick.h b/src/devices/bus/vcs_ctrl/joystick.h
similarity index 100%
rename from src/emu/bus/vcs_ctrl/joystick.h
rename to src/devices/bus/vcs_ctrl/joystick.h
diff --git a/src/emu/bus/vcs_ctrl/keypad.c b/src/devices/bus/vcs_ctrl/keypad.c
similarity index 100%
rename from src/emu/bus/vcs_ctrl/keypad.c
rename to src/devices/bus/vcs_ctrl/keypad.c
diff --git a/src/emu/bus/vcs_ctrl/keypad.h b/src/devices/bus/vcs_ctrl/keypad.h
similarity index 100%
rename from src/emu/bus/vcs_ctrl/keypad.h
rename to src/devices/bus/vcs_ctrl/keypad.h
diff --git a/src/emu/bus/vcs_ctrl/lightpen.c b/src/devices/bus/vcs_ctrl/lightpen.c
similarity index 100%
rename from src/emu/bus/vcs_ctrl/lightpen.c
rename to src/devices/bus/vcs_ctrl/lightpen.c
diff --git a/src/emu/bus/vcs_ctrl/lightpen.h b/src/devices/bus/vcs_ctrl/lightpen.h
similarity index 100%
rename from src/emu/bus/vcs_ctrl/lightpen.h
rename to src/devices/bus/vcs_ctrl/lightpen.h
diff --git a/src/emu/bus/vcs_ctrl/paddles.c b/src/devices/bus/vcs_ctrl/paddles.c
similarity index 100%
rename from src/emu/bus/vcs_ctrl/paddles.c
rename to src/devices/bus/vcs_ctrl/paddles.c
diff --git a/src/emu/bus/vcs_ctrl/paddles.h b/src/devices/bus/vcs_ctrl/paddles.h
similarity index 100%
rename from src/emu/bus/vcs_ctrl/paddles.h
rename to src/devices/bus/vcs_ctrl/paddles.h
diff --git a/src/emu/bus/vcs_ctrl/wheel.c b/src/devices/bus/vcs_ctrl/wheel.c
similarity index 100%
rename from src/emu/bus/vcs_ctrl/wheel.c
rename to src/devices/bus/vcs_ctrl/wheel.c
diff --git a/src/emu/bus/vcs_ctrl/wheel.h b/src/devices/bus/vcs_ctrl/wheel.h
similarity index 100%
rename from src/emu/bus/vcs_ctrl/wheel.h
rename to src/devices/bus/vcs_ctrl/wheel.h
diff --git a/src/emu/bus/vectrex/rom.c b/src/devices/bus/vectrex/rom.c
similarity index 100%
rename from src/emu/bus/vectrex/rom.c
rename to src/devices/bus/vectrex/rom.c
diff --git a/src/emu/bus/vectrex/rom.h b/src/devices/bus/vectrex/rom.h
similarity index 100%
rename from src/emu/bus/vectrex/rom.h
rename to src/devices/bus/vectrex/rom.h
diff --git a/src/emu/bus/vectrex/slot.c b/src/devices/bus/vectrex/slot.c
similarity index 100%
rename from src/emu/bus/vectrex/slot.c
rename to src/devices/bus/vectrex/slot.c
diff --git a/src/emu/bus/vectrex/slot.h b/src/devices/bus/vectrex/slot.h
similarity index 100%
rename from src/emu/bus/vectrex/slot.h
rename to src/devices/bus/vectrex/slot.h
diff --git a/src/emu/bus/vic10/exp.c b/src/devices/bus/vic10/exp.c
similarity index 100%
rename from src/emu/bus/vic10/exp.c
rename to src/devices/bus/vic10/exp.c
diff --git a/src/emu/bus/vic10/exp.h b/src/devices/bus/vic10/exp.h
similarity index 100%
rename from src/emu/bus/vic10/exp.h
rename to src/devices/bus/vic10/exp.h
diff --git a/src/emu/bus/vic10/std.c b/src/devices/bus/vic10/std.c
similarity index 100%
rename from src/emu/bus/vic10/std.c
rename to src/devices/bus/vic10/std.c
diff --git a/src/emu/bus/vic10/std.h b/src/devices/bus/vic10/std.h
similarity index 100%
rename from src/emu/bus/vic10/std.h
rename to src/devices/bus/vic10/std.h
diff --git a/src/emu/bus/vic20/4cga.c b/src/devices/bus/vic20/4cga.c
similarity index 100%
rename from src/emu/bus/vic20/4cga.c
rename to src/devices/bus/vic20/4cga.c
diff --git a/src/emu/bus/vic20/4cga.h b/src/devices/bus/vic20/4cga.h
similarity index 100%
rename from src/emu/bus/vic20/4cga.h
rename to src/devices/bus/vic20/4cga.h
diff --git a/src/emu/bus/vic20/exp.c b/src/devices/bus/vic20/exp.c
similarity index 100%
rename from src/emu/bus/vic20/exp.c
rename to src/devices/bus/vic20/exp.c
diff --git a/src/emu/bus/vic20/exp.h b/src/devices/bus/vic20/exp.h
similarity index 100%
rename from src/emu/bus/vic20/exp.h
rename to src/devices/bus/vic20/exp.h
diff --git a/src/emu/bus/vic20/fe3.c b/src/devices/bus/vic20/fe3.c
similarity index 100%
rename from src/emu/bus/vic20/fe3.c
rename to src/devices/bus/vic20/fe3.c
diff --git a/src/emu/bus/vic20/fe3.h b/src/devices/bus/vic20/fe3.h
similarity index 100%
rename from src/emu/bus/vic20/fe3.h
rename to src/devices/bus/vic20/fe3.h
diff --git a/src/emu/bus/vic20/megacart.c b/src/devices/bus/vic20/megacart.c
similarity index 100%
rename from src/emu/bus/vic20/megacart.c
rename to src/devices/bus/vic20/megacart.c
diff --git a/src/emu/bus/vic20/megacart.h b/src/devices/bus/vic20/megacart.h
similarity index 100%
rename from src/emu/bus/vic20/megacart.h
rename to src/devices/bus/vic20/megacart.h
diff --git a/src/emu/bus/vic20/std.c b/src/devices/bus/vic20/std.c
similarity index 100%
rename from src/emu/bus/vic20/std.c
rename to src/devices/bus/vic20/std.c
diff --git a/src/emu/bus/vic20/std.h b/src/devices/bus/vic20/std.h
similarity index 100%
rename from src/emu/bus/vic20/std.h
rename to src/devices/bus/vic20/std.h
diff --git a/src/emu/bus/vic20/user.c b/src/devices/bus/vic20/user.c
similarity index 100%
rename from src/emu/bus/vic20/user.c
rename to src/devices/bus/vic20/user.c
diff --git a/src/emu/bus/vic20/user.h b/src/devices/bus/vic20/user.h
similarity index 100%
rename from src/emu/bus/vic20/user.h
rename to src/devices/bus/vic20/user.h
diff --git a/src/emu/bus/vic20/vic1010.c b/src/devices/bus/vic20/vic1010.c
similarity index 100%
rename from src/emu/bus/vic20/vic1010.c
rename to src/devices/bus/vic20/vic1010.c
diff --git a/src/emu/bus/vic20/vic1010.h b/src/devices/bus/vic20/vic1010.h
similarity index 100%
rename from src/emu/bus/vic20/vic1010.h
rename to src/devices/bus/vic20/vic1010.h
diff --git a/src/emu/bus/vic20/vic1011.c b/src/devices/bus/vic20/vic1011.c
similarity index 100%
rename from src/emu/bus/vic20/vic1011.c
rename to src/devices/bus/vic20/vic1011.c
diff --git a/src/emu/bus/vic20/vic1011.h b/src/devices/bus/vic20/vic1011.h
similarity index 100%
rename from src/emu/bus/vic20/vic1011.h
rename to src/devices/bus/vic20/vic1011.h
diff --git a/src/emu/bus/vic20/vic1110.c b/src/devices/bus/vic20/vic1110.c
similarity index 100%
rename from src/emu/bus/vic20/vic1110.c
rename to src/devices/bus/vic20/vic1110.c
diff --git a/src/emu/bus/vic20/vic1110.h b/src/devices/bus/vic20/vic1110.h
similarity index 100%
rename from src/emu/bus/vic20/vic1110.h
rename to src/devices/bus/vic20/vic1110.h
diff --git a/src/emu/bus/vic20/vic1111.c b/src/devices/bus/vic20/vic1111.c
similarity index 100%
rename from src/emu/bus/vic20/vic1111.c
rename to src/devices/bus/vic20/vic1111.c
diff --git a/src/emu/bus/vic20/vic1111.h b/src/devices/bus/vic20/vic1111.h
similarity index 100%
rename from src/emu/bus/vic20/vic1111.h
rename to src/devices/bus/vic20/vic1111.h
diff --git a/src/emu/bus/vic20/vic1112.c b/src/devices/bus/vic20/vic1112.c
similarity index 100%
rename from src/emu/bus/vic20/vic1112.c
rename to src/devices/bus/vic20/vic1112.c
diff --git a/src/emu/bus/vic20/vic1112.h b/src/devices/bus/vic20/vic1112.h
similarity index 100%
rename from src/emu/bus/vic20/vic1112.h
rename to src/devices/bus/vic20/vic1112.h
diff --git a/src/emu/bus/vic20/vic1210.c b/src/devices/bus/vic20/vic1210.c
similarity index 100%
rename from src/emu/bus/vic20/vic1210.c
rename to src/devices/bus/vic20/vic1210.c
diff --git a/src/emu/bus/vic20/vic1210.h b/src/devices/bus/vic20/vic1210.h
similarity index 100%
rename from src/emu/bus/vic20/vic1210.h
rename to src/devices/bus/vic20/vic1210.h
diff --git a/src/emu/bus/vidbrain/exp.c b/src/devices/bus/vidbrain/exp.c
similarity index 100%
rename from src/emu/bus/vidbrain/exp.c
rename to src/devices/bus/vidbrain/exp.c
diff --git a/src/emu/bus/vidbrain/exp.h b/src/devices/bus/vidbrain/exp.h
similarity index 100%
rename from src/emu/bus/vidbrain/exp.h
rename to src/devices/bus/vidbrain/exp.h
diff --git a/src/emu/bus/vidbrain/money_minder.c b/src/devices/bus/vidbrain/money_minder.c
similarity index 100%
rename from src/emu/bus/vidbrain/money_minder.c
rename to src/devices/bus/vidbrain/money_minder.c
diff --git a/src/emu/bus/vidbrain/money_minder.h b/src/devices/bus/vidbrain/money_minder.h
similarity index 100%
rename from src/emu/bus/vidbrain/money_minder.h
rename to src/devices/bus/vidbrain/money_minder.h
diff --git a/src/emu/bus/vidbrain/std.c b/src/devices/bus/vidbrain/std.c
similarity index 100%
rename from src/emu/bus/vidbrain/std.c
rename to src/devices/bus/vidbrain/std.c
diff --git a/src/emu/bus/vidbrain/std.h b/src/devices/bus/vidbrain/std.h
similarity index 100%
rename from src/emu/bus/vidbrain/std.h
rename to src/devices/bus/vidbrain/std.h
diff --git a/src/emu/bus/vidbrain/timeshare.c b/src/devices/bus/vidbrain/timeshare.c
similarity index 100%
rename from src/emu/bus/vidbrain/timeshare.c
rename to src/devices/bus/vidbrain/timeshare.c
diff --git a/src/emu/bus/vidbrain/timeshare.h b/src/devices/bus/vidbrain/timeshare.h
similarity index 100%
rename from src/emu/bus/vidbrain/timeshare.h
rename to src/devices/bus/vidbrain/timeshare.h
diff --git a/src/emu/bus/vip/byteio.c b/src/devices/bus/vip/byteio.c
similarity index 100%
rename from src/emu/bus/vip/byteio.c
rename to src/devices/bus/vip/byteio.c
diff --git a/src/emu/bus/vip/byteio.h b/src/devices/bus/vip/byteio.h
similarity index 100%
rename from src/emu/bus/vip/byteio.h
rename to src/devices/bus/vip/byteio.h
diff --git a/src/emu/bus/vip/exp.c b/src/devices/bus/vip/exp.c
similarity index 100%
rename from src/emu/bus/vip/exp.c
rename to src/devices/bus/vip/exp.c
diff --git a/src/emu/bus/vip/exp.h b/src/devices/bus/vip/exp.h
similarity index 100%
rename from src/emu/bus/vip/exp.h
rename to src/devices/bus/vip/exp.h
diff --git a/src/emu/bus/vip/vp550.c b/src/devices/bus/vip/vp550.c
similarity index 100%
rename from src/emu/bus/vip/vp550.c
rename to src/devices/bus/vip/vp550.c
diff --git a/src/emu/bus/vip/vp550.h b/src/devices/bus/vip/vp550.h
similarity index 100%
rename from src/emu/bus/vip/vp550.h
rename to src/devices/bus/vip/vp550.h
diff --git a/src/emu/bus/vip/vp570.c b/src/devices/bus/vip/vp570.c
similarity index 100%
rename from src/emu/bus/vip/vp570.c
rename to src/devices/bus/vip/vp570.c
diff --git a/src/emu/bus/vip/vp570.h b/src/devices/bus/vip/vp570.h
similarity index 100%
rename from src/emu/bus/vip/vp570.h
rename to src/devices/bus/vip/vp570.h
diff --git a/src/emu/bus/vip/vp575.c b/src/devices/bus/vip/vp575.c
similarity index 100%
rename from src/emu/bus/vip/vp575.c
rename to src/devices/bus/vip/vp575.c
diff --git a/src/emu/bus/vip/vp575.h b/src/devices/bus/vip/vp575.h
similarity index 100%
rename from src/emu/bus/vip/vp575.h
rename to src/devices/bus/vip/vp575.h
diff --git a/src/emu/bus/vip/vp585.c b/src/devices/bus/vip/vp585.c
similarity index 100%
rename from src/emu/bus/vip/vp585.c
rename to src/devices/bus/vip/vp585.c
diff --git a/src/emu/bus/vip/vp585.h b/src/devices/bus/vip/vp585.h
similarity index 100%
rename from src/emu/bus/vip/vp585.h
rename to src/devices/bus/vip/vp585.h
diff --git a/src/emu/bus/vip/vp590.c b/src/devices/bus/vip/vp590.c
similarity index 100%
rename from src/emu/bus/vip/vp590.c
rename to src/devices/bus/vip/vp590.c
diff --git a/src/emu/bus/vip/vp590.h b/src/devices/bus/vip/vp590.h
similarity index 100%
rename from src/emu/bus/vip/vp590.h
rename to src/devices/bus/vip/vp590.h
diff --git a/src/emu/bus/vip/vp595.c b/src/devices/bus/vip/vp595.c
similarity index 100%
rename from src/emu/bus/vip/vp595.c
rename to src/devices/bus/vip/vp595.c
diff --git a/src/emu/bus/vip/vp595.h b/src/devices/bus/vip/vp595.h
similarity index 100%
rename from src/emu/bus/vip/vp595.h
rename to src/devices/bus/vip/vp595.h
diff --git a/src/emu/bus/vip/vp620.c b/src/devices/bus/vip/vp620.c
similarity index 100%
rename from src/emu/bus/vip/vp620.c
rename to src/devices/bus/vip/vp620.c
diff --git a/src/emu/bus/vip/vp620.h b/src/devices/bus/vip/vp620.h
similarity index 100%
rename from src/emu/bus/vip/vp620.h
rename to src/devices/bus/vip/vp620.h
diff --git a/src/emu/bus/vip/vp700.c b/src/devices/bus/vip/vp700.c
similarity index 100%
rename from src/emu/bus/vip/vp700.c
rename to src/devices/bus/vip/vp700.c
diff --git a/src/emu/bus/vip/vp700.h b/src/devices/bus/vip/vp700.h
similarity index 100%
rename from src/emu/bus/vip/vp700.h
rename to src/devices/bus/vip/vp700.h
diff --git a/src/emu/bus/vtech/ioexp/carts.c b/src/devices/bus/vtech/ioexp/carts.c
similarity index 100%
rename from src/emu/bus/vtech/ioexp/carts.c
rename to src/devices/bus/vtech/ioexp/carts.c
diff --git a/src/emu/bus/vtech/ioexp/carts.h b/src/devices/bus/vtech/ioexp/carts.h
similarity index 100%
rename from src/emu/bus/vtech/ioexp/carts.h
rename to src/devices/bus/vtech/ioexp/carts.h
diff --git a/src/emu/bus/vtech/ioexp/ioexp.c b/src/devices/bus/vtech/ioexp/ioexp.c
similarity index 100%
rename from src/emu/bus/vtech/ioexp/ioexp.c
rename to src/devices/bus/vtech/ioexp/ioexp.c
diff --git a/src/emu/bus/vtech/ioexp/ioexp.h b/src/devices/bus/vtech/ioexp/ioexp.h
similarity index 100%
rename from src/emu/bus/vtech/ioexp/ioexp.h
rename to src/devices/bus/vtech/ioexp/ioexp.h
diff --git a/src/emu/bus/vtech/ioexp/joystick.c b/src/devices/bus/vtech/ioexp/joystick.c
similarity index 100%
rename from src/emu/bus/vtech/ioexp/joystick.c
rename to src/devices/bus/vtech/ioexp/joystick.c
diff --git a/src/emu/bus/vtech/ioexp/joystick.h b/src/devices/bus/vtech/ioexp/joystick.h
similarity index 100%
rename from src/emu/bus/vtech/ioexp/joystick.h
rename to src/devices/bus/vtech/ioexp/joystick.h
diff --git a/src/emu/bus/vtech/ioexp/printer.c b/src/devices/bus/vtech/ioexp/printer.c
similarity index 100%
rename from src/emu/bus/vtech/ioexp/printer.c
rename to src/devices/bus/vtech/ioexp/printer.c
diff --git a/src/emu/bus/vtech/ioexp/printer.h b/src/devices/bus/vtech/ioexp/printer.h
similarity index 100%
rename from src/emu/bus/vtech/ioexp/printer.h
rename to src/devices/bus/vtech/ioexp/printer.h
diff --git a/src/emu/bus/vtech/memexp/carts.c b/src/devices/bus/vtech/memexp/carts.c
similarity index 100%
rename from src/emu/bus/vtech/memexp/carts.c
rename to src/devices/bus/vtech/memexp/carts.c
diff --git a/src/emu/bus/vtech/memexp/carts.h b/src/devices/bus/vtech/memexp/carts.h
similarity index 100%
rename from src/emu/bus/vtech/memexp/carts.h
rename to src/devices/bus/vtech/memexp/carts.h
diff --git a/src/emu/bus/vtech/memexp/floppy.c b/src/devices/bus/vtech/memexp/floppy.c
similarity index 100%
rename from src/emu/bus/vtech/memexp/floppy.c
rename to src/devices/bus/vtech/memexp/floppy.c
diff --git a/src/emu/bus/vtech/memexp/floppy.h b/src/devices/bus/vtech/memexp/floppy.h
similarity index 100%
rename from src/emu/bus/vtech/memexp/floppy.h
rename to src/devices/bus/vtech/memexp/floppy.h
diff --git a/src/emu/bus/vtech/memexp/memexp.c b/src/devices/bus/vtech/memexp/memexp.c
similarity index 100%
rename from src/emu/bus/vtech/memexp/memexp.c
rename to src/devices/bus/vtech/memexp/memexp.c
diff --git a/src/emu/bus/vtech/memexp/memexp.h b/src/devices/bus/vtech/memexp/memexp.h
similarity index 100%
rename from src/emu/bus/vtech/memexp/memexp.h
rename to src/devices/bus/vtech/memexp/memexp.h
diff --git a/src/emu/bus/vtech/memexp/memory.c b/src/devices/bus/vtech/memexp/memory.c
similarity index 100%
rename from src/emu/bus/vtech/memexp/memory.c
rename to src/devices/bus/vtech/memexp/memory.c
diff --git a/src/emu/bus/vtech/memexp/memory.h b/src/devices/bus/vtech/memexp/memory.h
similarity index 100%
rename from src/emu/bus/vtech/memexp/memory.h
rename to src/devices/bus/vtech/memexp/memory.h
diff --git a/src/emu/bus/vtech/memexp/rs232.c b/src/devices/bus/vtech/memexp/rs232.c
similarity index 100%
rename from src/emu/bus/vtech/memexp/rs232.c
rename to src/devices/bus/vtech/memexp/rs232.c
diff --git a/src/emu/bus/vtech/memexp/rs232.h b/src/devices/bus/vtech/memexp/rs232.h
similarity index 100%
rename from src/emu/bus/vtech/memexp/rs232.h
rename to src/devices/bus/vtech/memexp/rs232.h
diff --git a/src/emu/bus/vtech/memexp/wordpro.c b/src/devices/bus/vtech/memexp/wordpro.c
similarity index 100%
rename from src/emu/bus/vtech/memexp/wordpro.c
rename to src/devices/bus/vtech/memexp/wordpro.c
diff --git a/src/emu/bus/vtech/memexp/wordpro.h b/src/devices/bus/vtech/memexp/wordpro.h
similarity index 100%
rename from src/emu/bus/vtech/memexp/wordpro.h
rename to src/devices/bus/vtech/memexp/wordpro.h
diff --git a/src/emu/bus/wangpc/emb.c b/src/devices/bus/wangpc/emb.c
similarity index 100%
rename from src/emu/bus/wangpc/emb.c
rename to src/devices/bus/wangpc/emb.c
diff --git a/src/emu/bus/wangpc/emb.h b/src/devices/bus/wangpc/emb.h
similarity index 100%
rename from src/emu/bus/wangpc/emb.h
rename to src/devices/bus/wangpc/emb.h
diff --git a/src/emu/bus/wangpc/lic.c b/src/devices/bus/wangpc/lic.c
similarity index 100%
rename from src/emu/bus/wangpc/lic.c
rename to src/devices/bus/wangpc/lic.c
diff --git a/src/emu/bus/wangpc/lic.h b/src/devices/bus/wangpc/lic.h
similarity index 100%
rename from src/emu/bus/wangpc/lic.h
rename to src/devices/bus/wangpc/lic.h
diff --git a/src/emu/bus/wangpc/lvc.c b/src/devices/bus/wangpc/lvc.c
similarity index 100%
rename from src/emu/bus/wangpc/lvc.c
rename to src/devices/bus/wangpc/lvc.c
diff --git a/src/emu/bus/wangpc/lvc.h b/src/devices/bus/wangpc/lvc.h
similarity index 100%
rename from src/emu/bus/wangpc/lvc.h
rename to src/devices/bus/wangpc/lvc.h
diff --git a/src/emu/bus/wangpc/mcc.c b/src/devices/bus/wangpc/mcc.c
similarity index 100%
rename from src/emu/bus/wangpc/mcc.c
rename to src/devices/bus/wangpc/mcc.c
diff --git a/src/emu/bus/wangpc/mcc.h b/src/devices/bus/wangpc/mcc.h
similarity index 100%
rename from src/emu/bus/wangpc/mcc.h
rename to src/devices/bus/wangpc/mcc.h
diff --git a/src/emu/bus/wangpc/mvc.c b/src/devices/bus/wangpc/mvc.c
similarity index 100%
rename from src/emu/bus/wangpc/mvc.c
rename to src/devices/bus/wangpc/mvc.c
diff --git a/src/emu/bus/wangpc/mvc.h b/src/devices/bus/wangpc/mvc.h
similarity index 100%
rename from src/emu/bus/wangpc/mvc.h
rename to src/devices/bus/wangpc/mvc.h
diff --git a/src/emu/bus/wangpc/rtc.c b/src/devices/bus/wangpc/rtc.c
similarity index 100%
rename from src/emu/bus/wangpc/rtc.c
rename to src/devices/bus/wangpc/rtc.c
diff --git a/src/emu/bus/wangpc/rtc.h b/src/devices/bus/wangpc/rtc.h
similarity index 100%
rename from src/emu/bus/wangpc/rtc.h
rename to src/devices/bus/wangpc/rtc.h
diff --git a/src/emu/bus/wangpc/tig.c b/src/devices/bus/wangpc/tig.c
similarity index 100%
rename from src/emu/bus/wangpc/tig.c
rename to src/devices/bus/wangpc/tig.c
diff --git a/src/emu/bus/wangpc/tig.h b/src/devices/bus/wangpc/tig.h
similarity index 100%
rename from src/emu/bus/wangpc/tig.h
rename to src/devices/bus/wangpc/tig.h
diff --git a/src/emu/bus/wangpc/wangpc.c b/src/devices/bus/wangpc/wangpc.c
similarity index 100%
rename from src/emu/bus/wangpc/wangpc.c
rename to src/devices/bus/wangpc/wangpc.c
diff --git a/src/emu/bus/wangpc/wangpc.h b/src/devices/bus/wangpc/wangpc.h
similarity index 100%
rename from src/emu/bus/wangpc/wangpc.h
rename to src/devices/bus/wangpc/wangpc.h
diff --git a/src/emu/bus/wangpc/wdc.c b/src/devices/bus/wangpc/wdc.c
similarity index 100%
rename from src/emu/bus/wangpc/wdc.c
rename to src/devices/bus/wangpc/wdc.c
diff --git a/src/emu/bus/wangpc/wdc.h b/src/devices/bus/wangpc/wdc.h
similarity index 100%
rename from src/emu/bus/wangpc/wdc.h
rename to src/devices/bus/wangpc/wdc.h
diff --git a/src/emu/bus/wswan/rom.c b/src/devices/bus/wswan/rom.c
similarity index 100%
rename from src/emu/bus/wswan/rom.c
rename to src/devices/bus/wswan/rom.c
diff --git a/src/emu/bus/wswan/rom.h b/src/devices/bus/wswan/rom.h
similarity index 100%
rename from src/emu/bus/wswan/rom.h
rename to src/devices/bus/wswan/rom.h
diff --git a/src/emu/bus/wswan/slot.c b/src/devices/bus/wswan/slot.c
similarity index 100%
rename from src/emu/bus/wswan/slot.c
rename to src/devices/bus/wswan/slot.c
diff --git a/src/emu/bus/wswan/slot.h b/src/devices/bus/wswan/slot.h
similarity index 100%
rename from src/emu/bus/wswan/slot.h
rename to src/devices/bus/wswan/slot.h
diff --git a/src/emu/bus/x68k/x68k_neptunex.c b/src/devices/bus/x68k/x68k_neptunex.c
similarity index 100%
rename from src/emu/bus/x68k/x68k_neptunex.c
rename to src/devices/bus/x68k/x68k_neptunex.c
diff --git a/src/emu/bus/x68k/x68k_neptunex.h b/src/devices/bus/x68k/x68k_neptunex.h
similarity index 100%
rename from src/emu/bus/x68k/x68k_neptunex.h
rename to src/devices/bus/x68k/x68k_neptunex.h
diff --git a/src/emu/bus/x68k/x68k_scsiext.c b/src/devices/bus/x68k/x68k_scsiext.c
similarity index 100%
rename from src/emu/bus/x68k/x68k_scsiext.c
rename to src/devices/bus/x68k/x68k_scsiext.c
diff --git a/src/emu/bus/x68k/x68k_scsiext.h b/src/devices/bus/x68k/x68k_scsiext.h
similarity index 100%
rename from src/emu/bus/x68k/x68k_scsiext.h
rename to src/devices/bus/x68k/x68k_scsiext.h
diff --git a/src/emu/bus/x68k/x68kexp.c b/src/devices/bus/x68k/x68kexp.c
similarity index 100%
rename from src/emu/bus/x68k/x68kexp.c
rename to src/devices/bus/x68k/x68kexp.c
diff --git a/src/emu/bus/x68k/x68kexp.h b/src/devices/bus/x68k/x68kexp.h
similarity index 100%
rename from src/emu/bus/x68k/x68kexp.h
rename to src/devices/bus/x68k/x68kexp.h
diff --git a/src/emu/bus/z88/flash.c b/src/devices/bus/z88/flash.c
similarity index 100%
rename from src/emu/bus/z88/flash.c
rename to src/devices/bus/z88/flash.c
diff --git a/src/emu/bus/z88/flash.h b/src/devices/bus/z88/flash.h
similarity index 100%
rename from src/emu/bus/z88/flash.h
rename to src/devices/bus/z88/flash.h
diff --git a/src/emu/bus/z88/ram.c b/src/devices/bus/z88/ram.c
similarity index 100%
rename from src/emu/bus/z88/ram.c
rename to src/devices/bus/z88/ram.c
diff --git a/src/emu/bus/z88/ram.h b/src/devices/bus/z88/ram.h
similarity index 100%
rename from src/emu/bus/z88/ram.h
rename to src/devices/bus/z88/ram.h
diff --git a/src/emu/bus/z88/rom.c b/src/devices/bus/z88/rom.c
similarity index 100%
rename from src/emu/bus/z88/rom.c
rename to src/devices/bus/z88/rom.c
diff --git a/src/emu/bus/z88/rom.h b/src/devices/bus/z88/rom.h
similarity index 100%
rename from src/emu/bus/z88/rom.h
rename to src/devices/bus/z88/rom.h
diff --git a/src/emu/bus/z88/z88.c b/src/devices/bus/z88/z88.c
similarity index 100%
rename from src/emu/bus/z88/z88.c
rename to src/devices/bus/z88/z88.c
diff --git a/src/emu/bus/z88/z88.h b/src/devices/bus/z88/z88.h
similarity index 100%
rename from src/emu/bus/z88/z88.h
rename to src/devices/bus/z88/z88.h
diff --git a/src/emu/cpu/8x300/8x300.c b/src/devices/cpu/8x300/8x300.c
similarity index 100%
rename from src/emu/cpu/8x300/8x300.c
rename to src/devices/cpu/8x300/8x300.c
diff --git a/src/emu/cpu/8x300/8x300.h b/src/devices/cpu/8x300/8x300.h
similarity index 100%
rename from src/emu/cpu/8x300/8x300.h
rename to src/devices/cpu/8x300/8x300.h
diff --git a/src/emu/cpu/8x300/8x300dasm.c b/src/devices/cpu/8x300/8x300dasm.c
similarity index 100%
rename from src/emu/cpu/8x300/8x300dasm.c
rename to src/devices/cpu/8x300/8x300dasm.c
diff --git a/src/emu/cpu/adsp2100/2100dasm.c b/src/devices/cpu/adsp2100/2100dasm.c
similarity index 100%
rename from src/emu/cpu/adsp2100/2100dasm.c
rename to src/devices/cpu/adsp2100/2100dasm.c
diff --git a/src/emu/cpu/adsp2100/2100ops.inc b/src/devices/cpu/adsp2100/2100ops.inc
similarity index 100%
rename from src/emu/cpu/adsp2100/2100ops.inc
rename to src/devices/cpu/adsp2100/2100ops.inc
diff --git a/src/emu/cpu/adsp2100/adsp2100.c b/src/devices/cpu/adsp2100/adsp2100.c
similarity index 100%
rename from src/emu/cpu/adsp2100/adsp2100.c
rename to src/devices/cpu/adsp2100/adsp2100.c
diff --git a/src/emu/cpu/adsp2100/adsp2100.h b/src/devices/cpu/adsp2100/adsp2100.h
similarity index 100%
rename from src/emu/cpu/adsp2100/adsp2100.h
rename to src/devices/cpu/adsp2100/adsp2100.h
diff --git a/src/emu/cpu/alph8201/8201dasm.c b/src/devices/cpu/alph8201/8201dasm.c
similarity index 100%
rename from src/emu/cpu/alph8201/8201dasm.c
rename to src/devices/cpu/alph8201/8201dasm.c
diff --git a/src/emu/cpu/alph8201/alph8201.c b/src/devices/cpu/alph8201/alph8201.c
similarity index 100%
rename from src/emu/cpu/alph8201/alph8201.c
rename to src/devices/cpu/alph8201/alph8201.c
diff --git a/src/emu/cpu/alph8201/alph8201.h b/src/devices/cpu/alph8201/alph8201.h
similarity index 100%
rename from src/emu/cpu/alph8201/alph8201.h
rename to src/devices/cpu/alph8201/alph8201.h
diff --git a/src/emu/cpu/alto2/a2curt.c b/src/devices/cpu/alto2/a2curt.c
similarity index 100%
rename from src/emu/cpu/alto2/a2curt.c
rename to src/devices/cpu/alto2/a2curt.c
diff --git a/src/emu/cpu/alto2/a2curt.h b/src/devices/cpu/alto2/a2curt.h
similarity index 100%
rename from src/emu/cpu/alto2/a2curt.h
rename to src/devices/cpu/alto2/a2curt.h
diff --git a/src/emu/cpu/alto2/a2dht.c b/src/devices/cpu/alto2/a2dht.c
similarity index 100%
rename from src/emu/cpu/alto2/a2dht.c
rename to src/devices/cpu/alto2/a2dht.c
diff --git a/src/emu/cpu/alto2/a2dht.h b/src/devices/cpu/alto2/a2dht.h
similarity index 100%
rename from src/emu/cpu/alto2/a2dht.h
rename to src/devices/cpu/alto2/a2dht.h
diff --git a/src/emu/cpu/alto2/a2disk.c b/src/devices/cpu/alto2/a2disk.c
similarity index 100%
rename from src/emu/cpu/alto2/a2disk.c
rename to src/devices/cpu/alto2/a2disk.c
diff --git a/src/emu/cpu/alto2/a2disk.h b/src/devices/cpu/alto2/a2disk.h
similarity index 100%
rename from src/emu/cpu/alto2/a2disk.h
rename to src/devices/cpu/alto2/a2disk.h
diff --git a/src/emu/cpu/alto2/a2disp.c b/src/devices/cpu/alto2/a2disp.c
similarity index 100%
rename from src/emu/cpu/alto2/a2disp.c
rename to src/devices/cpu/alto2/a2disp.c
diff --git a/src/emu/cpu/alto2/a2disp.h b/src/devices/cpu/alto2/a2disp.h
similarity index 100%
rename from src/emu/cpu/alto2/a2disp.h
rename to src/devices/cpu/alto2/a2disp.h
diff --git a/src/emu/cpu/alto2/a2dvt.c b/src/devices/cpu/alto2/a2dvt.c
similarity index 100%
rename from src/emu/cpu/alto2/a2dvt.c
rename to src/devices/cpu/alto2/a2dvt.c
diff --git a/src/emu/cpu/alto2/a2dvt.h b/src/devices/cpu/alto2/a2dvt.h
similarity index 100%
rename from src/emu/cpu/alto2/a2dvt.h
rename to src/devices/cpu/alto2/a2dvt.h
diff --git a/src/emu/cpu/alto2/a2dwt.c b/src/devices/cpu/alto2/a2dwt.c
similarity index 100%
rename from src/emu/cpu/alto2/a2dwt.c
rename to src/devices/cpu/alto2/a2dwt.c
diff --git a/src/emu/cpu/alto2/a2dwt.h b/src/devices/cpu/alto2/a2dwt.h
similarity index 100%
rename from src/emu/cpu/alto2/a2dwt.h
rename to src/devices/cpu/alto2/a2dwt.h
diff --git a/src/emu/cpu/alto2/a2emu.c b/src/devices/cpu/alto2/a2emu.c
similarity index 100%
rename from src/emu/cpu/alto2/a2emu.c
rename to src/devices/cpu/alto2/a2emu.c
diff --git a/src/emu/cpu/alto2/a2emu.h b/src/devices/cpu/alto2/a2emu.h
similarity index 100%
rename from src/emu/cpu/alto2/a2emu.h
rename to src/devices/cpu/alto2/a2emu.h
diff --git a/src/emu/cpu/alto2/a2ether.c b/src/devices/cpu/alto2/a2ether.c
similarity index 100%
rename from src/emu/cpu/alto2/a2ether.c
rename to src/devices/cpu/alto2/a2ether.c
diff --git a/src/emu/cpu/alto2/a2ether.h b/src/devices/cpu/alto2/a2ether.h
similarity index 100%
rename from src/emu/cpu/alto2/a2ether.h
rename to src/devices/cpu/alto2/a2ether.h
diff --git a/src/emu/cpu/alto2/a2hw.c b/src/devices/cpu/alto2/a2hw.c
similarity index 100%
rename from src/emu/cpu/alto2/a2hw.c
rename to src/devices/cpu/alto2/a2hw.c
diff --git a/src/emu/cpu/alto2/a2hw.h b/src/devices/cpu/alto2/a2hw.h
similarity index 100%
rename from src/emu/cpu/alto2/a2hw.h
rename to src/devices/cpu/alto2/a2hw.h
diff --git a/src/emu/cpu/alto2/a2jkff.h b/src/devices/cpu/alto2/a2jkff.h
similarity index 100%
rename from src/emu/cpu/alto2/a2jkff.h
rename to src/devices/cpu/alto2/a2jkff.h
diff --git a/src/emu/cpu/alto2/a2kbd.c b/src/devices/cpu/alto2/a2kbd.c
similarity index 100%
rename from src/emu/cpu/alto2/a2kbd.c
rename to src/devices/cpu/alto2/a2kbd.c
diff --git a/src/emu/cpu/alto2/a2kbd.h b/src/devices/cpu/alto2/a2kbd.h
similarity index 100%
rename from src/emu/cpu/alto2/a2kbd.h
rename to src/devices/cpu/alto2/a2kbd.h
diff --git a/src/emu/cpu/alto2/a2ksec.c b/src/devices/cpu/alto2/a2ksec.c
similarity index 100%
rename from src/emu/cpu/alto2/a2ksec.c
rename to src/devices/cpu/alto2/a2ksec.c
diff --git a/src/emu/cpu/alto2/a2ksec.h b/src/devices/cpu/alto2/a2ksec.h
similarity index 100%
rename from src/emu/cpu/alto2/a2ksec.h
rename to src/devices/cpu/alto2/a2ksec.h
diff --git a/src/emu/cpu/alto2/a2kwd.c b/src/devices/cpu/alto2/a2kwd.c
similarity index 100%
rename from src/emu/cpu/alto2/a2kwd.c
rename to src/devices/cpu/alto2/a2kwd.c
diff --git a/src/emu/cpu/alto2/a2kwd.h b/src/devices/cpu/alto2/a2kwd.h
similarity index 100%
rename from src/emu/cpu/alto2/a2kwd.h
rename to src/devices/cpu/alto2/a2kwd.h
diff --git a/src/emu/cpu/alto2/a2mem.c b/src/devices/cpu/alto2/a2mem.c
similarity index 100%
rename from src/emu/cpu/alto2/a2mem.c
rename to src/devices/cpu/alto2/a2mem.c
diff --git a/src/emu/cpu/alto2/a2mem.h b/src/devices/cpu/alto2/a2mem.h
similarity index 100%
rename from src/emu/cpu/alto2/a2mem.h
rename to src/devices/cpu/alto2/a2mem.h
diff --git a/src/emu/cpu/alto2/a2mouse.c b/src/devices/cpu/alto2/a2mouse.c
similarity index 100%
rename from src/emu/cpu/alto2/a2mouse.c
rename to src/devices/cpu/alto2/a2mouse.c
diff --git a/src/emu/cpu/alto2/a2mouse.h b/src/devices/cpu/alto2/a2mouse.h
similarity index 100%
rename from src/emu/cpu/alto2/a2mouse.h
rename to src/devices/cpu/alto2/a2mouse.h
diff --git a/src/emu/cpu/alto2/a2mrt.c b/src/devices/cpu/alto2/a2mrt.c
similarity index 100%
rename from src/emu/cpu/alto2/a2mrt.c
rename to src/devices/cpu/alto2/a2mrt.c
diff --git a/src/emu/cpu/alto2/a2mrt.h b/src/devices/cpu/alto2/a2mrt.h
similarity index 100%
rename from src/emu/cpu/alto2/a2mrt.h
rename to src/devices/cpu/alto2/a2mrt.h
diff --git a/src/emu/cpu/alto2/a2part.c b/src/devices/cpu/alto2/a2part.c
similarity index 100%
rename from src/emu/cpu/alto2/a2part.c
rename to src/devices/cpu/alto2/a2part.c
diff --git a/src/emu/cpu/alto2/a2part.h b/src/devices/cpu/alto2/a2part.h
similarity index 100%
rename from src/emu/cpu/alto2/a2part.h
rename to src/devices/cpu/alto2/a2part.h
diff --git a/src/emu/cpu/alto2/a2ram.c b/src/devices/cpu/alto2/a2ram.c
similarity index 100%
rename from src/emu/cpu/alto2/a2ram.c
rename to src/devices/cpu/alto2/a2ram.c
diff --git a/src/emu/cpu/alto2/a2ram.h b/src/devices/cpu/alto2/a2ram.h
similarity index 100%
rename from src/emu/cpu/alto2/a2ram.h
rename to src/devices/cpu/alto2/a2ram.h
diff --git a/src/emu/cpu/alto2/a2roms.c b/src/devices/cpu/alto2/a2roms.c
similarity index 100%
rename from src/emu/cpu/alto2/a2roms.c
rename to src/devices/cpu/alto2/a2roms.c
diff --git a/src/emu/cpu/alto2/a2roms.h b/src/devices/cpu/alto2/a2roms.h
similarity index 100%
rename from src/emu/cpu/alto2/a2roms.h
rename to src/devices/cpu/alto2/a2roms.h
diff --git a/src/emu/cpu/alto2/alto2cpu.c b/src/devices/cpu/alto2/alto2cpu.c
similarity index 100%
rename from src/emu/cpu/alto2/alto2cpu.c
rename to src/devices/cpu/alto2/alto2cpu.c
diff --git a/src/emu/cpu/alto2/alto2cpu.h b/src/devices/cpu/alto2/alto2cpu.h
similarity index 100%
rename from src/emu/cpu/alto2/alto2cpu.h
rename to src/devices/cpu/alto2/alto2cpu.h
diff --git a/src/emu/cpu/alto2/alto2dsm.c b/src/devices/cpu/alto2/alto2dsm.c
similarity index 100%
rename from src/emu/cpu/alto2/alto2dsm.c
rename to src/devices/cpu/alto2/alto2dsm.c
diff --git a/src/emu/cpu/am29000/am29000.c b/src/devices/cpu/am29000/am29000.c
similarity index 100%
rename from src/emu/cpu/am29000/am29000.c
rename to src/devices/cpu/am29000/am29000.c
diff --git a/src/emu/cpu/am29000/am29000.h b/src/devices/cpu/am29000/am29000.h
similarity index 100%
rename from src/emu/cpu/am29000/am29000.h
rename to src/devices/cpu/am29000/am29000.h
diff --git a/src/emu/cpu/am29000/am29dasm.c b/src/devices/cpu/am29000/am29dasm.c
similarity index 100%
rename from src/emu/cpu/am29000/am29dasm.c
rename to src/devices/cpu/am29000/am29dasm.c
diff --git a/src/emu/cpu/am29000/am29ops.h b/src/devices/cpu/am29000/am29ops.h
similarity index 100%
rename from src/emu/cpu/am29000/am29ops.h
rename to src/devices/cpu/am29000/am29ops.h
diff --git a/src/emu/cpu/amis2000/amis2000.c b/src/devices/cpu/amis2000/amis2000.c
similarity index 100%
rename from src/emu/cpu/amis2000/amis2000.c
rename to src/devices/cpu/amis2000/amis2000.c
diff --git a/src/emu/cpu/amis2000/amis2000.h b/src/devices/cpu/amis2000/amis2000.h
similarity index 100%
rename from src/emu/cpu/amis2000/amis2000.h
rename to src/devices/cpu/amis2000/amis2000.h
diff --git a/src/emu/cpu/amis2000/amis2000d.c b/src/devices/cpu/amis2000/amis2000d.c
similarity index 100%
rename from src/emu/cpu/amis2000/amis2000d.c
rename to src/devices/cpu/amis2000/amis2000d.c
diff --git a/src/emu/cpu/amis2000/amis2000op.c b/src/devices/cpu/amis2000/amis2000op.c
similarity index 100%
rename from src/emu/cpu/amis2000/amis2000op.c
rename to src/devices/cpu/amis2000/amis2000op.c
diff --git a/src/emu/cpu/apexc/apexc.c b/src/devices/cpu/apexc/apexc.c
similarity index 100%
rename from src/emu/cpu/apexc/apexc.c
rename to src/devices/cpu/apexc/apexc.c
diff --git a/src/emu/cpu/apexc/apexc.h b/src/devices/cpu/apexc/apexc.h
similarity index 100%
rename from src/emu/cpu/apexc/apexc.h
rename to src/devices/cpu/apexc/apexc.h
diff --git a/src/emu/cpu/apexc/apexcdsm.c b/src/devices/cpu/apexc/apexcdsm.c
similarity index 100%
rename from src/emu/cpu/apexc/apexcdsm.c
rename to src/devices/cpu/apexc/apexcdsm.c
diff --git a/src/emu/cpu/arc/arc.c b/src/devices/cpu/arc/arc.c
similarity index 100%
rename from src/emu/cpu/arc/arc.c
rename to src/devices/cpu/arc/arc.c
diff --git a/src/emu/cpu/arc/arc.h b/src/devices/cpu/arc/arc.h
similarity index 100%
rename from src/emu/cpu/arc/arc.h
rename to src/devices/cpu/arc/arc.h
diff --git a/src/emu/cpu/arc/arcdasm.c b/src/devices/cpu/arc/arcdasm.c
similarity index 100%
rename from src/emu/cpu/arc/arcdasm.c
rename to src/devices/cpu/arc/arcdasm.c
diff --git a/src/emu/cpu/arcompact/arcompact.c b/src/devices/cpu/arcompact/arcompact.c
similarity index 100%
rename from src/emu/cpu/arcompact/arcompact.c
rename to src/devices/cpu/arcompact/arcompact.c
diff --git a/src/emu/cpu/arcompact/arcompact.h b/src/devices/cpu/arcompact/arcompact.h
similarity index 100%
rename from src/emu/cpu/arcompact/arcompact.h
rename to src/devices/cpu/arcompact/arcompact.h
diff --git a/src/emu/cpu/arcompact/arcompact_common.c b/src/devices/cpu/arcompact/arcompact_common.c
similarity index 100%
rename from src/emu/cpu/arcompact/arcompact_common.c
rename to src/devices/cpu/arcompact/arcompact_common.c
diff --git a/src/emu/cpu/arcompact/arcompact_common.h b/src/devices/cpu/arcompact/arcompact_common.h
similarity index 100%
rename from src/emu/cpu/arcompact/arcompact_common.h
rename to src/devices/cpu/arcompact/arcompact_common.h
diff --git a/src/emu/cpu/arcompact/arcompact_execute.c b/src/devices/cpu/arcompact/arcompact_execute.c
similarity index 100%
rename from src/emu/cpu/arcompact/arcompact_execute.c
rename to src/devices/cpu/arcompact/arcompact_execute.c
diff --git a/src/emu/cpu/arcompact/arcompact_make.py b/src/devices/cpu/arcompact/arcompact_make.py
similarity index 100%
rename from src/emu/cpu/arcompact/arcompact_make.py
rename to src/devices/cpu/arcompact/arcompact_make.py
diff --git a/src/emu/cpu/arcompact/arcompactdasm.c b/src/devices/cpu/arcompact/arcompactdasm.c
similarity index 100%
rename from src/emu/cpu/arcompact/arcompactdasm.c
rename to src/devices/cpu/arcompact/arcompactdasm.c
diff --git a/src/emu/cpu/arcompact/arcompactdasm_dispatch.c b/src/devices/cpu/arcompact/arcompactdasm_dispatch.c
similarity index 100%
rename from src/emu/cpu/arcompact/arcompactdasm_dispatch.c
rename to src/devices/cpu/arcompact/arcompactdasm_dispatch.c
diff --git a/src/emu/cpu/arcompact/arcompactdasm_dispatch.h b/src/devices/cpu/arcompact/arcompactdasm_dispatch.h
similarity index 100%
rename from src/emu/cpu/arcompact/arcompactdasm_dispatch.h
rename to src/devices/cpu/arcompact/arcompactdasm_dispatch.h
diff --git a/src/emu/cpu/arcompact/arcompactdasm_ops.c b/src/devices/cpu/arcompact/arcompactdasm_ops.c
similarity index 100%
rename from src/emu/cpu/arcompact/arcompactdasm_ops.c
rename to src/devices/cpu/arcompact/arcompactdasm_ops.c
diff --git a/src/emu/cpu/arcompact/arcompactdasm_ops.h b/src/devices/cpu/arcompact/arcompactdasm_ops.h
similarity index 100%
rename from src/emu/cpu/arcompact/arcompactdasm_ops.h
rename to src/devices/cpu/arcompact/arcompactdasm_ops.h
diff --git a/src/emu/cpu/arm/arm.c b/src/devices/cpu/arm/arm.c
similarity index 100%
rename from src/emu/cpu/arm/arm.c
rename to src/devices/cpu/arm/arm.c
diff --git a/src/emu/cpu/arm/arm.h b/src/devices/cpu/arm/arm.h
similarity index 100%
rename from src/emu/cpu/arm/arm.h
rename to src/devices/cpu/arm/arm.h
diff --git a/src/emu/cpu/arm/armdasm.c b/src/devices/cpu/arm/armdasm.c
similarity index 100%
rename from src/emu/cpu/arm/armdasm.c
rename to src/devices/cpu/arm/armdasm.c
diff --git a/src/emu/cpu/arm7/arm7.c b/src/devices/cpu/arm7/arm7.c
similarity index 100%
rename from src/emu/cpu/arm7/arm7.c
rename to src/devices/cpu/arm7/arm7.c
diff --git a/src/emu/cpu/arm7/arm7.h b/src/devices/cpu/arm7/arm7.h
similarity index 100%
rename from src/emu/cpu/arm7/arm7.h
rename to src/devices/cpu/arm7/arm7.h
diff --git a/src/emu/cpu/arm7/arm7core.h b/src/devices/cpu/arm7/arm7core.h
similarity index 100%
rename from src/emu/cpu/arm7/arm7core.h
rename to src/devices/cpu/arm7/arm7core.h
diff --git a/src/emu/cpu/arm7/arm7core.inc b/src/devices/cpu/arm7/arm7core.inc
similarity index 100%
rename from src/emu/cpu/arm7/arm7core.inc
rename to src/devices/cpu/arm7/arm7core.inc
diff --git a/src/emu/cpu/arm7/arm7dasm.c b/src/devices/cpu/arm7/arm7dasm.c
similarity index 100%
rename from src/emu/cpu/arm7/arm7dasm.c
rename to src/devices/cpu/arm7/arm7dasm.c
diff --git a/src/emu/cpu/arm7/arm7drc.inc b/src/devices/cpu/arm7/arm7drc.inc
similarity index 100%
rename from src/emu/cpu/arm7/arm7drc.inc
rename to src/devices/cpu/arm7/arm7drc.inc
diff --git a/src/emu/cpu/arm7/arm7help.h b/src/devices/cpu/arm7/arm7help.h
similarity index 100%
rename from src/emu/cpu/arm7/arm7help.h
rename to src/devices/cpu/arm7/arm7help.h
diff --git a/src/emu/cpu/arm7/arm7ops.c b/src/devices/cpu/arm7/arm7ops.c
similarity index 100%
rename from src/emu/cpu/arm7/arm7ops.c
rename to src/devices/cpu/arm7/arm7ops.c
diff --git a/src/emu/cpu/arm7/arm7tdrc.inc b/src/devices/cpu/arm7/arm7tdrc.inc
similarity index 100%
rename from src/emu/cpu/arm7/arm7tdrc.inc
rename to src/devices/cpu/arm7/arm7tdrc.inc
diff --git a/src/emu/cpu/arm7/arm7thmb.c b/src/devices/cpu/arm7/arm7thmb.c
similarity index 100%
rename from src/emu/cpu/arm7/arm7thmb.c
rename to src/devices/cpu/arm7/arm7thmb.c
diff --git a/src/emu/cpu/asap/asap.c b/src/devices/cpu/asap/asap.c
similarity index 100%
rename from src/emu/cpu/asap/asap.c
rename to src/devices/cpu/asap/asap.c
diff --git a/src/emu/cpu/asap/asap.h b/src/devices/cpu/asap/asap.h
similarity index 100%
rename from src/emu/cpu/asap/asap.h
rename to src/devices/cpu/asap/asap.h
diff --git a/src/emu/cpu/asap/asapdasm.c b/src/devices/cpu/asap/asapdasm.c
similarity index 100%
rename from src/emu/cpu/asap/asapdasm.c
rename to src/devices/cpu/asap/asapdasm.c
diff --git a/src/emu/cpu/avr8/avr8.c b/src/devices/cpu/avr8/avr8.c
similarity index 100%
rename from src/emu/cpu/avr8/avr8.c
rename to src/devices/cpu/avr8/avr8.c
diff --git a/src/emu/cpu/avr8/avr8.h b/src/devices/cpu/avr8/avr8.h
similarity index 100%
rename from src/emu/cpu/avr8/avr8.h
rename to src/devices/cpu/avr8/avr8.h
diff --git a/src/emu/cpu/avr8/avr8dasm.c b/src/devices/cpu/avr8/avr8dasm.c
similarity index 100%
rename from src/emu/cpu/avr8/avr8dasm.c
rename to src/devices/cpu/avr8/avr8dasm.c
diff --git a/src/emu/cpu/ccpu/ccpu.c b/src/devices/cpu/ccpu/ccpu.c
similarity index 100%
rename from src/emu/cpu/ccpu/ccpu.c
rename to src/devices/cpu/ccpu/ccpu.c
diff --git a/src/emu/cpu/ccpu/ccpu.h b/src/devices/cpu/ccpu/ccpu.h
similarity index 100%
rename from src/emu/cpu/ccpu/ccpu.h
rename to src/devices/cpu/ccpu/ccpu.h
diff --git a/src/emu/cpu/ccpu/ccpudasm.c b/src/devices/cpu/ccpu/ccpudasm.c
similarity index 100%
rename from src/emu/cpu/ccpu/ccpudasm.c
rename to src/devices/cpu/ccpu/ccpudasm.c
diff --git a/src/emu/cpu/cop400/cop400.c b/src/devices/cpu/cop400/cop400.c
similarity index 100%
rename from src/emu/cpu/cop400/cop400.c
rename to src/devices/cpu/cop400/cop400.c
diff --git a/src/emu/cpu/cop400/cop400.h b/src/devices/cpu/cop400/cop400.h
similarity index 100%
rename from src/emu/cpu/cop400/cop400.h
rename to src/devices/cpu/cop400/cop400.h
diff --git a/src/emu/cpu/cop400/cop400op.inc b/src/devices/cpu/cop400/cop400op.inc
similarity index 100%
rename from src/emu/cpu/cop400/cop400op.inc
rename to src/devices/cpu/cop400/cop400op.inc
diff --git a/src/emu/cpu/cop400/cop410ds.c b/src/devices/cpu/cop400/cop410ds.c
similarity index 100%
rename from src/emu/cpu/cop400/cop410ds.c
rename to src/devices/cpu/cop400/cop410ds.c
diff --git a/src/emu/cpu/cop400/cop420ds.c b/src/devices/cpu/cop400/cop420ds.c
similarity index 100%
rename from src/emu/cpu/cop400/cop420ds.c
rename to src/devices/cpu/cop400/cop420ds.c
diff --git a/src/emu/cpu/cop400/cop440ds.c b/src/devices/cpu/cop400/cop440ds.c
similarity index 100%
rename from src/emu/cpu/cop400/cop440ds.c
rename to src/devices/cpu/cop400/cop440ds.c
diff --git a/src/emu/cpu/cosmac/cosdasm.c b/src/devices/cpu/cosmac/cosdasm.c
similarity index 100%
rename from src/emu/cpu/cosmac/cosdasm.c
rename to src/devices/cpu/cosmac/cosdasm.c
diff --git a/src/emu/cpu/cosmac/cosmac.c b/src/devices/cpu/cosmac/cosmac.c
similarity index 100%
rename from src/emu/cpu/cosmac/cosmac.c
rename to src/devices/cpu/cosmac/cosmac.c
diff --git a/src/emu/cpu/cosmac/cosmac.h b/src/devices/cpu/cosmac/cosmac.h
similarity index 100%
rename from src/emu/cpu/cosmac/cosmac.h
rename to src/devices/cpu/cosmac/cosmac.h
diff --git a/src/emu/cpu/cp1610/1610dasm.c b/src/devices/cpu/cp1610/1610dasm.c
similarity index 100%
rename from src/emu/cpu/cp1610/1610dasm.c
rename to src/devices/cpu/cp1610/1610dasm.c
diff --git a/src/emu/cpu/cp1610/cp1610.c b/src/devices/cpu/cp1610/cp1610.c
similarity index 100%
rename from src/emu/cpu/cp1610/cp1610.c
rename to src/devices/cpu/cp1610/cp1610.c
diff --git a/src/emu/cpu/cp1610/cp1610.h b/src/devices/cpu/cp1610/cp1610.h
similarity index 100%
rename from src/emu/cpu/cp1610/cp1610.h
rename to src/devices/cpu/cp1610/cp1610.h
diff --git a/src/emu/cpu/cubeqcpu/cubedasm.c b/src/devices/cpu/cubeqcpu/cubedasm.c
similarity index 100%
rename from src/emu/cpu/cubeqcpu/cubedasm.c
rename to src/devices/cpu/cubeqcpu/cubedasm.c
diff --git a/src/emu/cpu/cubeqcpu/cubeqcpu.c b/src/devices/cpu/cubeqcpu/cubeqcpu.c
similarity index 100%
rename from src/emu/cpu/cubeqcpu/cubeqcpu.c
rename to src/devices/cpu/cubeqcpu/cubeqcpu.c
diff --git a/src/emu/cpu/cubeqcpu/cubeqcpu.h b/src/devices/cpu/cubeqcpu/cubeqcpu.h
similarity index 100%
rename from src/emu/cpu/cubeqcpu/cubeqcpu.h
rename to src/devices/cpu/cubeqcpu/cubeqcpu.h
diff --git a/src/emu/cpu/drcbec.c b/src/devices/cpu/drcbec.c
similarity index 100%
rename from src/emu/cpu/drcbec.c
rename to src/devices/cpu/drcbec.c
diff --git a/src/emu/cpu/drcbec.h b/src/devices/cpu/drcbec.h
similarity index 100%
rename from src/emu/cpu/drcbec.h
rename to src/devices/cpu/drcbec.h
diff --git a/src/emu/cpu/drcbeut.c b/src/devices/cpu/drcbeut.c
similarity index 100%
rename from src/emu/cpu/drcbeut.c
rename to src/devices/cpu/drcbeut.c
diff --git a/src/emu/cpu/drcbeut.h b/src/devices/cpu/drcbeut.h
similarity index 100%
rename from src/emu/cpu/drcbeut.h
rename to src/devices/cpu/drcbeut.h
diff --git a/src/emu/cpu/drcbex64.c b/src/devices/cpu/drcbex64.c
similarity index 100%
rename from src/emu/cpu/drcbex64.c
rename to src/devices/cpu/drcbex64.c
diff --git a/src/emu/cpu/drcbex64.h b/src/devices/cpu/drcbex64.h
similarity index 100%
rename from src/emu/cpu/drcbex64.h
rename to src/devices/cpu/drcbex64.h
diff --git a/src/emu/cpu/drcbex86.c b/src/devices/cpu/drcbex86.c
similarity index 100%
rename from src/emu/cpu/drcbex86.c
rename to src/devices/cpu/drcbex86.c
diff --git a/src/emu/cpu/drcbex86.h b/src/devices/cpu/drcbex86.h
similarity index 100%
rename from src/emu/cpu/drcbex86.h
rename to src/devices/cpu/drcbex86.h
diff --git a/src/emu/cpu/drccache.c b/src/devices/cpu/drccache.c
similarity index 100%
rename from src/emu/cpu/drccache.c
rename to src/devices/cpu/drccache.c
diff --git a/src/emu/cpu/drccache.h b/src/devices/cpu/drccache.h
similarity index 100%
rename from src/emu/cpu/drccache.h
rename to src/devices/cpu/drccache.h
diff --git a/src/emu/cpu/drcfe.c b/src/devices/cpu/drcfe.c
similarity index 100%
rename from src/emu/cpu/drcfe.c
rename to src/devices/cpu/drcfe.c
diff --git a/src/emu/cpu/drcfe.h b/src/devices/cpu/drcfe.h
similarity index 100%
rename from src/emu/cpu/drcfe.h
rename to src/devices/cpu/drcfe.h
diff --git a/src/emu/cpu/drcuml.c b/src/devices/cpu/drcuml.c
similarity index 100%
rename from src/emu/cpu/drcuml.c
rename to src/devices/cpu/drcuml.c
diff --git a/src/emu/cpu/drcuml.h b/src/devices/cpu/drcuml.h
similarity index 100%
rename from src/emu/cpu/drcuml.h
rename to src/devices/cpu/drcuml.h
diff --git a/src/emu/cpu/drcumlsh.h b/src/devices/cpu/drcumlsh.h
similarity index 100%
rename from src/emu/cpu/drcumlsh.h
rename to src/devices/cpu/drcumlsh.h
diff --git a/src/emu/cpu/dsp16/dsp16.c b/src/devices/cpu/dsp16/dsp16.c
similarity index 100%
rename from src/emu/cpu/dsp16/dsp16.c
rename to src/devices/cpu/dsp16/dsp16.c
diff --git a/src/emu/cpu/dsp16/dsp16.h b/src/devices/cpu/dsp16/dsp16.h
similarity index 100%
rename from src/emu/cpu/dsp16/dsp16.h
rename to src/devices/cpu/dsp16/dsp16.h
diff --git a/src/emu/cpu/dsp16/dsp16dis.c b/src/devices/cpu/dsp16/dsp16dis.c
similarity index 100%
rename from src/emu/cpu/dsp16/dsp16dis.c
rename to src/devices/cpu/dsp16/dsp16dis.c
diff --git a/src/emu/cpu/dsp16/dsp16ops.inc b/src/devices/cpu/dsp16/dsp16ops.inc
similarity index 100%
rename from src/emu/cpu/dsp16/dsp16ops.inc
rename to src/devices/cpu/dsp16/dsp16ops.inc
diff --git a/src/emu/cpu/dsp32/dsp32.c b/src/devices/cpu/dsp32/dsp32.c
similarity index 100%
rename from src/emu/cpu/dsp32/dsp32.c
rename to src/devices/cpu/dsp32/dsp32.c
diff --git a/src/emu/cpu/dsp32/dsp32.h b/src/devices/cpu/dsp32/dsp32.h
similarity index 100%
rename from src/emu/cpu/dsp32/dsp32.h
rename to src/devices/cpu/dsp32/dsp32.h
diff --git a/src/emu/cpu/dsp32/dsp32dis.c b/src/devices/cpu/dsp32/dsp32dis.c
similarity index 100%
rename from src/emu/cpu/dsp32/dsp32dis.c
rename to src/devices/cpu/dsp32/dsp32dis.c
diff --git a/src/emu/cpu/dsp32/dsp32ops.inc b/src/devices/cpu/dsp32/dsp32ops.inc
similarity index 100%
rename from src/emu/cpu/dsp32/dsp32ops.inc
rename to src/devices/cpu/dsp32/dsp32ops.inc
diff --git a/src/emu/cpu/dsp56k/dsp56def.h b/src/devices/cpu/dsp56k/dsp56def.h
similarity index 100%
rename from src/emu/cpu/dsp56k/dsp56def.h
rename to src/devices/cpu/dsp56k/dsp56def.h
diff --git a/src/emu/cpu/dsp56k/dsp56dsm.c b/src/devices/cpu/dsp56k/dsp56dsm.c
similarity index 100%
rename from src/emu/cpu/dsp56k/dsp56dsm.c
rename to src/devices/cpu/dsp56k/dsp56dsm.c
diff --git a/src/emu/cpu/dsp56k/dsp56k.c b/src/devices/cpu/dsp56k/dsp56k.c
similarity index 100%
rename from src/emu/cpu/dsp56k/dsp56k.c
rename to src/devices/cpu/dsp56k/dsp56k.c
diff --git a/src/emu/cpu/dsp56k/dsp56k.h b/src/devices/cpu/dsp56k/dsp56k.h
similarity index 100%
rename from src/emu/cpu/dsp56k/dsp56k.h
rename to src/devices/cpu/dsp56k/dsp56k.h
diff --git a/src/emu/cpu/dsp56k/dsp56mem.c b/src/devices/cpu/dsp56k/dsp56mem.c
similarity index 100%
rename from src/emu/cpu/dsp56k/dsp56mem.c
rename to src/devices/cpu/dsp56k/dsp56mem.c
diff --git a/src/emu/cpu/dsp56k/dsp56mem.h b/src/devices/cpu/dsp56k/dsp56mem.h
similarity index 100%
rename from src/emu/cpu/dsp56k/dsp56mem.h
rename to src/devices/cpu/dsp56k/dsp56mem.h
diff --git a/src/emu/cpu/dsp56k/dsp56ops.inc b/src/devices/cpu/dsp56k/dsp56ops.inc
similarity index 100%
rename from src/emu/cpu/dsp56k/dsp56ops.inc
rename to src/devices/cpu/dsp56k/dsp56ops.inc
diff --git a/src/emu/cpu/dsp56k/dsp56pcu.c b/src/devices/cpu/dsp56k/dsp56pcu.c
similarity index 100%
rename from src/emu/cpu/dsp56k/dsp56pcu.c
rename to src/devices/cpu/dsp56k/dsp56pcu.c
diff --git a/src/emu/cpu/dsp56k/dsp56pcu.h b/src/devices/cpu/dsp56k/dsp56pcu.h
similarity index 100%
rename from src/emu/cpu/dsp56k/dsp56pcu.h
rename to src/devices/cpu/dsp56k/dsp56pcu.h
diff --git a/src/emu/cpu/dsp56k/inst.c b/src/devices/cpu/dsp56k/inst.c
similarity index 100%
rename from src/emu/cpu/dsp56k/inst.c
rename to src/devices/cpu/dsp56k/inst.c
diff --git a/src/emu/cpu/dsp56k/inst.h b/src/devices/cpu/dsp56k/inst.h
similarity index 100%
rename from src/emu/cpu/dsp56k/inst.h
rename to src/devices/cpu/dsp56k/inst.h
diff --git a/src/emu/cpu/dsp56k/opcode.c b/src/devices/cpu/dsp56k/opcode.c
similarity index 100%
rename from src/emu/cpu/dsp56k/opcode.c
rename to src/devices/cpu/dsp56k/opcode.c
diff --git a/src/emu/cpu/dsp56k/opcode.h b/src/devices/cpu/dsp56k/opcode.h
similarity index 100%
rename from src/emu/cpu/dsp56k/opcode.h
rename to src/devices/cpu/dsp56k/opcode.h
diff --git a/src/emu/cpu/dsp56k/pmove.c b/src/devices/cpu/dsp56k/pmove.c
similarity index 100%
rename from src/emu/cpu/dsp56k/pmove.c
rename to src/devices/cpu/dsp56k/pmove.c
diff --git a/src/emu/cpu/dsp56k/pmove.h b/src/devices/cpu/dsp56k/pmove.h
similarity index 100%
rename from src/emu/cpu/dsp56k/pmove.h
rename to src/devices/cpu/dsp56k/pmove.h
diff --git a/src/emu/cpu/dsp56k/tables.c b/src/devices/cpu/dsp56k/tables.c
similarity index 100%
rename from src/emu/cpu/dsp56k/tables.c
rename to src/devices/cpu/dsp56k/tables.c
diff --git a/src/emu/cpu/dsp56k/tables.h b/src/devices/cpu/dsp56k/tables.h
similarity index 100%
rename from src/emu/cpu/dsp56k/tables.h
rename to src/devices/cpu/dsp56k/tables.h
diff --git a/src/emu/cpu/e0c6200/e0c6200.c b/src/devices/cpu/e0c6200/e0c6200.c
similarity index 100%
rename from src/emu/cpu/e0c6200/e0c6200.c
rename to src/devices/cpu/e0c6200/e0c6200.c
diff --git a/src/emu/cpu/e0c6200/e0c6200.h b/src/devices/cpu/e0c6200/e0c6200.h
similarity index 100%
rename from src/emu/cpu/e0c6200/e0c6200.h
rename to src/devices/cpu/e0c6200/e0c6200.h
diff --git a/src/emu/cpu/e0c6200/e0c6200d.c b/src/devices/cpu/e0c6200/e0c6200d.c
similarity index 100%
rename from src/emu/cpu/e0c6200/e0c6200d.c
rename to src/devices/cpu/e0c6200/e0c6200d.c
diff --git a/src/emu/cpu/e0c6200/e0c6200op.inc b/src/devices/cpu/e0c6200/e0c6200op.inc
similarity index 100%
rename from src/emu/cpu/e0c6200/e0c6200op.inc
rename to src/devices/cpu/e0c6200/e0c6200op.inc
diff --git a/src/emu/cpu/e0c6200/e0c6s46.c b/src/devices/cpu/e0c6200/e0c6s46.c
similarity index 100%
rename from src/emu/cpu/e0c6200/e0c6s46.c
rename to src/devices/cpu/e0c6200/e0c6s46.c
diff --git a/src/emu/cpu/e0c6200/e0c6s46.h b/src/devices/cpu/e0c6200/e0c6s46.h
similarity index 100%
rename from src/emu/cpu/e0c6200/e0c6s46.h
rename to src/devices/cpu/e0c6200/e0c6s46.h
diff --git a/src/emu/cpu/e132xs/32xsdasm.c b/src/devices/cpu/e132xs/32xsdasm.c
similarity index 100%
rename from src/emu/cpu/e132xs/32xsdasm.c
rename to src/devices/cpu/e132xs/32xsdasm.c
diff --git a/src/emu/cpu/e132xs/e132xs.c b/src/devices/cpu/e132xs/e132xs.c
similarity index 100%
rename from src/emu/cpu/e132xs/e132xs.c
rename to src/devices/cpu/e132xs/e132xs.c
diff --git a/src/emu/cpu/e132xs/e132xs.h b/src/devices/cpu/e132xs/e132xs.h
similarity index 100%
rename from src/emu/cpu/e132xs/e132xs.h
rename to src/devices/cpu/e132xs/e132xs.h
diff --git a/src/emu/cpu/e132xs/e132xsop.inc b/src/devices/cpu/e132xs/e132xsop.inc
similarity index 100%
rename from src/emu/cpu/e132xs/e132xsop.inc
rename to src/devices/cpu/e132xs/e132xsop.inc
diff --git a/src/emu/cpu/es5510/es5510.c b/src/devices/cpu/es5510/es5510.c
similarity index 100%
rename from src/emu/cpu/es5510/es5510.c
rename to src/devices/cpu/es5510/es5510.c
diff --git a/src/emu/cpu/es5510/es5510.h b/src/devices/cpu/es5510/es5510.h
similarity index 100%
rename from src/emu/cpu/es5510/es5510.h
rename to src/devices/cpu/es5510/es5510.h
diff --git a/src/emu/cpu/esrip/esrip.c b/src/devices/cpu/esrip/esrip.c
similarity index 100%
rename from src/emu/cpu/esrip/esrip.c
rename to src/devices/cpu/esrip/esrip.c
diff --git a/src/emu/cpu/esrip/esrip.h b/src/devices/cpu/esrip/esrip.h
similarity index 100%
rename from src/emu/cpu/esrip/esrip.h
rename to src/devices/cpu/esrip/esrip.h
diff --git a/src/emu/cpu/esrip/esripdsm.c b/src/devices/cpu/esrip/esripdsm.c
similarity index 100%
rename from src/emu/cpu/esrip/esripdsm.c
rename to src/devices/cpu/esrip/esripdsm.c
diff --git a/src/emu/cpu/f8/f8.c b/src/devices/cpu/f8/f8.c
similarity index 100%
rename from src/emu/cpu/f8/f8.c
rename to src/devices/cpu/f8/f8.c
diff --git a/src/emu/cpu/f8/f8.h b/src/devices/cpu/f8/f8.h
similarity index 100%
rename from src/emu/cpu/f8/f8.h
rename to src/devices/cpu/f8/f8.h
diff --git a/src/emu/cpu/f8/f8dasm.c b/src/devices/cpu/f8/f8dasm.c
similarity index 100%
rename from src/emu/cpu/f8/f8dasm.c
rename to src/devices/cpu/f8/f8dasm.c
diff --git a/src/emu/cpu/g65816/g65816.c b/src/devices/cpu/g65816/g65816.c
similarity index 100%
rename from src/emu/cpu/g65816/g65816.c
rename to src/devices/cpu/g65816/g65816.c
diff --git a/src/emu/cpu/g65816/g65816.h b/src/devices/cpu/g65816/g65816.h
similarity index 100%
rename from src/emu/cpu/g65816/g65816.h
rename to src/devices/cpu/g65816/g65816.h
diff --git a/src/emu/cpu/g65816/g65816cm.h b/src/devices/cpu/g65816/g65816cm.h
similarity index 100%
rename from src/emu/cpu/g65816/g65816cm.h
rename to src/devices/cpu/g65816/g65816cm.h
diff --git a/src/emu/cpu/g65816/g65816ds.c b/src/devices/cpu/g65816/g65816ds.c
similarity index 100%
rename from src/emu/cpu/g65816/g65816ds.c
rename to src/devices/cpu/g65816/g65816ds.c
diff --git a/src/emu/cpu/g65816/g65816ds.h b/src/devices/cpu/g65816/g65816ds.h
similarity index 100%
rename from src/emu/cpu/g65816/g65816ds.h
rename to src/devices/cpu/g65816/g65816ds.h
diff --git a/src/emu/cpu/g65816/g65816o0.c b/src/devices/cpu/g65816/g65816o0.c
similarity index 100%
rename from src/emu/cpu/g65816/g65816o0.c
rename to src/devices/cpu/g65816/g65816o0.c
diff --git a/src/emu/cpu/g65816/g65816o1.c b/src/devices/cpu/g65816/g65816o1.c
similarity index 100%
rename from src/emu/cpu/g65816/g65816o1.c
rename to src/devices/cpu/g65816/g65816o1.c
diff --git a/src/emu/cpu/g65816/g65816o2.c b/src/devices/cpu/g65816/g65816o2.c
similarity index 100%
rename from src/emu/cpu/g65816/g65816o2.c
rename to src/devices/cpu/g65816/g65816o2.c
diff --git a/src/emu/cpu/g65816/g65816o3.c b/src/devices/cpu/g65816/g65816o3.c
similarity index 100%
rename from src/emu/cpu/g65816/g65816o3.c
rename to src/devices/cpu/g65816/g65816o3.c
diff --git a/src/emu/cpu/g65816/g65816o4.c b/src/devices/cpu/g65816/g65816o4.c
similarity index 100%
rename from src/emu/cpu/g65816/g65816o4.c
rename to src/devices/cpu/g65816/g65816o4.c
diff --git a/src/emu/cpu/g65816/g65816op.h b/src/devices/cpu/g65816/g65816op.h
similarity index 100%
rename from src/emu/cpu/g65816/g65816op.h
rename to src/devices/cpu/g65816/g65816op.h
diff --git a/src/emu/cpu/h6280/6280dasm.c b/src/devices/cpu/h6280/6280dasm.c
similarity index 100%
rename from src/emu/cpu/h6280/6280dasm.c
rename to src/devices/cpu/h6280/6280dasm.c
diff --git a/src/emu/cpu/h6280/h6280.c b/src/devices/cpu/h6280/h6280.c
similarity index 100%
rename from src/emu/cpu/h6280/h6280.c
rename to src/devices/cpu/h6280/h6280.c
diff --git a/src/emu/cpu/h6280/h6280.h b/src/devices/cpu/h6280/h6280.h
similarity index 100%
rename from src/emu/cpu/h6280/h6280.h
rename to src/devices/cpu/h6280/h6280.h
diff --git a/src/emu/cpu/h8/h8.c b/src/devices/cpu/h8/h8.c
similarity index 100%
rename from src/emu/cpu/h8/h8.c
rename to src/devices/cpu/h8/h8.c
diff --git a/src/emu/cpu/h8/h8.h b/src/devices/cpu/h8/h8.h
similarity index 100%
rename from src/emu/cpu/h8/h8.h
rename to src/devices/cpu/h8/h8.h
diff --git a/src/emu/cpu/h8/h8.lst b/src/devices/cpu/h8/h8.lst
similarity index 100%
rename from src/emu/cpu/h8/h8.lst
rename to src/devices/cpu/h8/h8.lst
diff --git a/src/emu/cpu/h8/h83002.c b/src/devices/cpu/h8/h83002.c
similarity index 100%
rename from src/emu/cpu/h8/h83002.c
rename to src/devices/cpu/h8/h83002.c
diff --git a/src/emu/cpu/h8/h83002.h b/src/devices/cpu/h8/h83002.h
similarity index 100%
rename from src/emu/cpu/h8/h83002.h
rename to src/devices/cpu/h8/h83002.h
diff --git a/src/emu/cpu/h8/h83006.c b/src/devices/cpu/h8/h83006.c
similarity index 100%
rename from src/emu/cpu/h8/h83006.c
rename to src/devices/cpu/h8/h83006.c
diff --git a/src/emu/cpu/h8/h83006.h b/src/devices/cpu/h8/h83006.h
similarity index 100%
rename from src/emu/cpu/h8/h83006.h
rename to src/devices/cpu/h8/h83006.h
diff --git a/src/emu/cpu/h8/h83008.c b/src/devices/cpu/h8/h83008.c
similarity index 100%
rename from src/emu/cpu/h8/h83008.c
rename to src/devices/cpu/h8/h83008.c
diff --git a/src/emu/cpu/h8/h83008.h b/src/devices/cpu/h8/h83008.h
similarity index 100%
rename from src/emu/cpu/h8/h83008.h
rename to src/devices/cpu/h8/h83008.h
diff --git a/src/emu/cpu/h8/h83048.c b/src/devices/cpu/h8/h83048.c
similarity index 100%
rename from src/emu/cpu/h8/h83048.c
rename to src/devices/cpu/h8/h83048.c
diff --git a/src/emu/cpu/h8/h83048.h b/src/devices/cpu/h8/h83048.h
similarity index 100%
rename from src/emu/cpu/h8/h83048.h
rename to src/devices/cpu/h8/h83048.h
diff --git a/src/emu/cpu/h8/h83337.c b/src/devices/cpu/h8/h83337.c
similarity index 100%
rename from src/emu/cpu/h8/h83337.c
rename to src/devices/cpu/h8/h83337.c
diff --git a/src/emu/cpu/h8/h83337.h b/src/devices/cpu/h8/h83337.h
similarity index 100%
rename from src/emu/cpu/h8/h83337.h
rename to src/devices/cpu/h8/h83337.h
diff --git a/src/emu/cpu/h8/h8_adc.c b/src/devices/cpu/h8/h8_adc.c
similarity index 100%
rename from src/emu/cpu/h8/h8_adc.c
rename to src/devices/cpu/h8/h8_adc.c
diff --git a/src/emu/cpu/h8/h8_adc.h b/src/devices/cpu/h8/h8_adc.h
similarity index 100%
rename from src/emu/cpu/h8/h8_adc.h
rename to src/devices/cpu/h8/h8_adc.h
diff --git a/src/emu/cpu/h8/h8_intc.c b/src/devices/cpu/h8/h8_intc.c
similarity index 100%
rename from src/emu/cpu/h8/h8_intc.c
rename to src/devices/cpu/h8/h8_intc.c
diff --git a/src/emu/cpu/h8/h8_intc.h b/src/devices/cpu/h8/h8_intc.h
similarity index 100%
rename from src/emu/cpu/h8/h8_intc.h
rename to src/devices/cpu/h8/h8_intc.h
diff --git a/src/emu/cpu/h8/h8_port.c b/src/devices/cpu/h8/h8_port.c
similarity index 100%
rename from src/emu/cpu/h8/h8_port.c
rename to src/devices/cpu/h8/h8_port.c
diff --git a/src/emu/cpu/h8/h8_port.h b/src/devices/cpu/h8/h8_port.h
similarity index 100%
rename from src/emu/cpu/h8/h8_port.h
rename to src/devices/cpu/h8/h8_port.h
diff --git a/src/emu/cpu/h8/h8_sci.c b/src/devices/cpu/h8/h8_sci.c
similarity index 100%
rename from src/emu/cpu/h8/h8_sci.c
rename to src/devices/cpu/h8/h8_sci.c
diff --git a/src/emu/cpu/h8/h8_sci.h b/src/devices/cpu/h8/h8_sci.h
similarity index 100%
rename from src/emu/cpu/h8/h8_sci.h
rename to src/devices/cpu/h8/h8_sci.h
diff --git a/src/emu/cpu/h8/h8_timer16.c b/src/devices/cpu/h8/h8_timer16.c
similarity index 100%
rename from src/emu/cpu/h8/h8_timer16.c
rename to src/devices/cpu/h8/h8_timer16.c
diff --git a/src/emu/cpu/h8/h8_timer16.h b/src/devices/cpu/h8/h8_timer16.h
similarity index 100%
rename from src/emu/cpu/h8/h8_timer16.h
rename to src/devices/cpu/h8/h8_timer16.h
diff --git a/src/emu/cpu/h8/h8_timer8.c b/src/devices/cpu/h8/h8_timer8.c
similarity index 100%
rename from src/emu/cpu/h8/h8_timer8.c
rename to src/devices/cpu/h8/h8_timer8.c
diff --git a/src/emu/cpu/h8/h8_timer8.h b/src/devices/cpu/h8/h8_timer8.h
similarity index 100%
rename from src/emu/cpu/h8/h8_timer8.h
rename to src/devices/cpu/h8/h8_timer8.h
diff --git a/src/emu/cpu/h8/h8h.c b/src/devices/cpu/h8/h8h.c
similarity index 100%
rename from src/emu/cpu/h8/h8h.c
rename to src/devices/cpu/h8/h8h.c
diff --git a/src/emu/cpu/h8/h8h.h b/src/devices/cpu/h8/h8h.h
similarity index 100%
rename from src/emu/cpu/h8/h8h.h
rename to src/devices/cpu/h8/h8h.h
diff --git a/src/emu/cpu/h8/h8make.py b/src/devices/cpu/h8/h8make.py
similarity index 100%
rename from src/emu/cpu/h8/h8make.py
rename to src/devices/cpu/h8/h8make.py
diff --git a/src/emu/cpu/h8/h8s2000.c b/src/devices/cpu/h8/h8s2000.c
similarity index 100%
rename from src/emu/cpu/h8/h8s2000.c
rename to src/devices/cpu/h8/h8s2000.c
diff --git a/src/emu/cpu/h8/h8s2000.h b/src/devices/cpu/h8/h8s2000.h
similarity index 100%
rename from src/emu/cpu/h8/h8s2000.h
rename to src/devices/cpu/h8/h8s2000.h
diff --git a/src/emu/cpu/h8/h8s2245.c b/src/devices/cpu/h8/h8s2245.c
similarity index 100%
rename from src/emu/cpu/h8/h8s2245.c
rename to src/devices/cpu/h8/h8s2245.c
diff --git a/src/emu/cpu/h8/h8s2245.h b/src/devices/cpu/h8/h8s2245.h
similarity index 100%
rename from src/emu/cpu/h8/h8s2245.h
rename to src/devices/cpu/h8/h8s2245.h
diff --git a/src/emu/cpu/h8/h8s2320.c b/src/devices/cpu/h8/h8s2320.c
similarity index 100%
rename from src/emu/cpu/h8/h8s2320.c
rename to src/devices/cpu/h8/h8s2320.c
diff --git a/src/emu/cpu/h8/h8s2320.h b/src/devices/cpu/h8/h8s2320.h
similarity index 100%
rename from src/emu/cpu/h8/h8s2320.h
rename to src/devices/cpu/h8/h8s2320.h
diff --git a/src/emu/cpu/h8/h8s2357.c b/src/devices/cpu/h8/h8s2357.c
similarity index 100%
rename from src/emu/cpu/h8/h8s2357.c
rename to src/devices/cpu/h8/h8s2357.c
diff --git a/src/emu/cpu/h8/h8s2357.h b/src/devices/cpu/h8/h8s2357.h
similarity index 100%
rename from src/emu/cpu/h8/h8s2357.h
rename to src/devices/cpu/h8/h8s2357.h
diff --git a/src/emu/cpu/h8/h8s2600.c b/src/devices/cpu/h8/h8s2600.c
similarity index 100%
rename from src/emu/cpu/h8/h8s2600.c
rename to src/devices/cpu/h8/h8s2600.c
diff --git a/src/emu/cpu/h8/h8s2600.h b/src/devices/cpu/h8/h8s2600.h
similarity index 100%
rename from src/emu/cpu/h8/h8s2600.h
rename to src/devices/cpu/h8/h8s2600.h
diff --git a/src/emu/cpu/h8/h8s2655.c b/src/devices/cpu/h8/h8s2655.c
similarity index 100%
rename from src/emu/cpu/h8/h8s2655.c
rename to src/devices/cpu/h8/h8s2655.c
diff --git a/src/emu/cpu/h8/h8s2655.h b/src/devices/cpu/h8/h8s2655.h
similarity index 100%
rename from src/emu/cpu/h8/h8s2655.h
rename to src/devices/cpu/h8/h8s2655.h
diff --git a/src/emu/cpu/hcd62121/hcd62121.c b/src/devices/cpu/hcd62121/hcd62121.c
similarity index 100%
rename from src/emu/cpu/hcd62121/hcd62121.c
rename to src/devices/cpu/hcd62121/hcd62121.c
diff --git a/src/emu/cpu/hcd62121/hcd62121.h b/src/devices/cpu/hcd62121/hcd62121.h
similarity index 100%
rename from src/emu/cpu/hcd62121/hcd62121.h
rename to src/devices/cpu/hcd62121/hcd62121.h
diff --git a/src/emu/cpu/hcd62121/hcd62121_ops.h b/src/devices/cpu/hcd62121/hcd62121_ops.h
similarity index 100%
rename from src/emu/cpu/hcd62121/hcd62121_ops.h
rename to src/devices/cpu/hcd62121/hcd62121_ops.h
diff --git a/src/emu/cpu/hcd62121/hcd62121d.c b/src/devices/cpu/hcd62121/hcd62121d.c
similarity index 100%
rename from src/emu/cpu/hcd62121/hcd62121d.c
rename to src/devices/cpu/hcd62121/hcd62121d.c
diff --git a/src/emu/cpu/hd61700/hd61700.c b/src/devices/cpu/hd61700/hd61700.c
similarity index 100%
rename from src/emu/cpu/hd61700/hd61700.c
rename to src/devices/cpu/hd61700/hd61700.c
diff --git a/src/emu/cpu/hd61700/hd61700.h b/src/devices/cpu/hd61700/hd61700.h
similarity index 100%
rename from src/emu/cpu/hd61700/hd61700.h
rename to src/devices/cpu/hd61700/hd61700.h
diff --git a/src/emu/cpu/hd61700/hd61700d.c b/src/devices/cpu/hd61700/hd61700d.c
similarity index 100%
rename from src/emu/cpu/hd61700/hd61700d.c
rename to src/devices/cpu/hd61700/hd61700d.c
diff --git a/src/emu/cpu/hmcs40/hmcs40.c b/src/devices/cpu/hmcs40/hmcs40.c
similarity index 100%
rename from src/emu/cpu/hmcs40/hmcs40.c
rename to src/devices/cpu/hmcs40/hmcs40.c
diff --git a/src/emu/cpu/hmcs40/hmcs40.h b/src/devices/cpu/hmcs40/hmcs40.h
similarity index 100%
rename from src/emu/cpu/hmcs40/hmcs40.h
rename to src/devices/cpu/hmcs40/hmcs40.h
diff --git a/src/emu/cpu/hmcs40/hmcs40d.c b/src/devices/cpu/hmcs40/hmcs40d.c
similarity index 100%
rename from src/emu/cpu/hmcs40/hmcs40d.c
rename to src/devices/cpu/hmcs40/hmcs40d.c
diff --git a/src/emu/cpu/hmcs40/hmcs40op.c b/src/devices/cpu/hmcs40/hmcs40op.c
similarity index 100%
rename from src/emu/cpu/hmcs40/hmcs40op.c
rename to src/devices/cpu/hmcs40/hmcs40op.c
diff --git a/src/emu/cpu/hphybrid/hphybrid.c b/src/devices/cpu/hphybrid/hphybrid.c
similarity index 100%
rename from src/emu/cpu/hphybrid/hphybrid.c
rename to src/devices/cpu/hphybrid/hphybrid.c
diff --git a/src/emu/cpu/hphybrid/hphybrid.h b/src/devices/cpu/hphybrid/hphybrid.h
similarity index 100%
rename from src/emu/cpu/hphybrid/hphybrid.h
rename to src/devices/cpu/hphybrid/hphybrid.h
diff --git a/src/emu/cpu/hphybrid/hphybrid_dasm.c b/src/devices/cpu/hphybrid/hphybrid_dasm.c
similarity index 100%
rename from src/emu/cpu/hphybrid/hphybrid_dasm.c
rename to src/devices/cpu/hphybrid/hphybrid_dasm.c
diff --git a/src/emu/cpu/i386/cycles.h b/src/devices/cpu/i386/cycles.h
similarity index 100%
rename from src/emu/cpu/i386/cycles.h
rename to src/devices/cpu/i386/cycles.h
diff --git a/src/emu/cpu/i386/i386.c b/src/devices/cpu/i386/i386.c
similarity index 100%
rename from src/emu/cpu/i386/i386.c
rename to src/devices/cpu/i386/i386.c
diff --git a/src/emu/cpu/i386/i386.h b/src/devices/cpu/i386/i386.h
similarity index 100%
rename from src/emu/cpu/i386/i386.h
rename to src/devices/cpu/i386/i386.h
diff --git a/src/emu/cpu/i386/i386dasm.c b/src/devices/cpu/i386/i386dasm.c
similarity index 100%
rename from src/emu/cpu/i386/i386dasm.c
rename to src/devices/cpu/i386/i386dasm.c
diff --git a/src/emu/cpu/i386/i386op16.inc b/src/devices/cpu/i386/i386op16.inc
similarity index 100%
rename from src/emu/cpu/i386/i386op16.inc
rename to src/devices/cpu/i386/i386op16.inc
diff --git a/src/emu/cpu/i386/i386op32.inc b/src/devices/cpu/i386/i386op32.inc
similarity index 100%
rename from src/emu/cpu/i386/i386op32.inc
rename to src/devices/cpu/i386/i386op32.inc
diff --git a/src/emu/cpu/i386/i386ops.h b/src/devices/cpu/i386/i386ops.h
similarity index 100%
rename from src/emu/cpu/i386/i386ops.h
rename to src/devices/cpu/i386/i386ops.h
diff --git a/src/emu/cpu/i386/i386ops.inc b/src/devices/cpu/i386/i386ops.inc
similarity index 100%
rename from src/emu/cpu/i386/i386ops.inc
rename to src/devices/cpu/i386/i386ops.inc
diff --git a/src/emu/cpu/i386/i386priv.h b/src/devices/cpu/i386/i386priv.h
similarity index 100%
rename from src/emu/cpu/i386/i386priv.h
rename to src/devices/cpu/i386/i386priv.h
diff --git a/src/emu/cpu/i386/i486ops.inc b/src/devices/cpu/i386/i486ops.inc
similarity index 100%
rename from src/emu/cpu/i386/i486ops.inc
rename to src/devices/cpu/i386/i486ops.inc
diff --git a/src/emu/cpu/i386/pentops.inc b/src/devices/cpu/i386/pentops.inc
similarity index 100%
rename from src/emu/cpu/i386/pentops.inc
rename to src/devices/cpu/i386/pentops.inc
diff --git a/src/emu/cpu/i386/x87ops.inc b/src/devices/cpu/i386/x87ops.inc
similarity index 100%
rename from src/emu/cpu/i386/x87ops.inc
rename to src/devices/cpu/i386/x87ops.inc
diff --git a/src/emu/cpu/i4004/4004dasm.c b/src/devices/cpu/i4004/4004dasm.c
similarity index 100%
rename from src/emu/cpu/i4004/4004dasm.c
rename to src/devices/cpu/i4004/4004dasm.c
diff --git a/src/emu/cpu/i4004/i4004.c b/src/devices/cpu/i4004/i4004.c
similarity index 100%
rename from src/emu/cpu/i4004/i4004.c
rename to src/devices/cpu/i4004/i4004.c
diff --git a/src/emu/cpu/i4004/i4004.h b/src/devices/cpu/i4004/i4004.h
similarity index 100%
rename from src/emu/cpu/i4004/i4004.h
rename to src/devices/cpu/i4004/i4004.h
diff --git a/src/emu/cpu/i8008/8008dasm.c b/src/devices/cpu/i8008/8008dasm.c
similarity index 100%
rename from src/emu/cpu/i8008/8008dasm.c
rename to src/devices/cpu/i8008/8008dasm.c
diff --git a/src/emu/cpu/i8008/i8008.c b/src/devices/cpu/i8008/i8008.c
similarity index 100%
rename from src/emu/cpu/i8008/i8008.c
rename to src/devices/cpu/i8008/i8008.c
diff --git a/src/emu/cpu/i8008/i8008.h b/src/devices/cpu/i8008/i8008.h
similarity index 100%
rename from src/emu/cpu/i8008/i8008.h
rename to src/devices/cpu/i8008/i8008.h
diff --git a/src/emu/cpu/i8085/8085dasm.c b/src/devices/cpu/i8085/8085dasm.c
similarity index 100%
rename from src/emu/cpu/i8085/8085dasm.c
rename to src/devices/cpu/i8085/8085dasm.c
diff --git a/src/emu/cpu/i8085/i8085.c b/src/devices/cpu/i8085/i8085.c
similarity index 100%
rename from src/emu/cpu/i8085/i8085.c
rename to src/devices/cpu/i8085/i8085.c
diff --git a/src/emu/cpu/i8085/i8085.h b/src/devices/cpu/i8085/i8085.h
similarity index 100%
rename from src/emu/cpu/i8085/i8085.h
rename to src/devices/cpu/i8085/i8085.h
diff --git a/src/emu/cpu/i8085/i8085cpu.h b/src/devices/cpu/i8085/i8085cpu.h
similarity index 100%
rename from src/emu/cpu/i8085/i8085cpu.h
rename to src/devices/cpu/i8085/i8085cpu.h
diff --git a/src/emu/cpu/i8089/i8089.c b/src/devices/cpu/i8089/i8089.c
similarity index 100%
rename from src/emu/cpu/i8089/i8089.c
rename to src/devices/cpu/i8089/i8089.c
diff --git a/src/emu/cpu/i8089/i8089.h b/src/devices/cpu/i8089/i8089.h
similarity index 100%
rename from src/emu/cpu/i8089/i8089.h
rename to src/devices/cpu/i8089/i8089.h
diff --git a/src/emu/cpu/i8089/i8089_channel.c b/src/devices/cpu/i8089/i8089_channel.c
similarity index 100%
rename from src/emu/cpu/i8089/i8089_channel.c
rename to src/devices/cpu/i8089/i8089_channel.c
diff --git a/src/emu/cpu/i8089/i8089_channel.h b/src/devices/cpu/i8089/i8089_channel.h
similarity index 100%
rename from src/emu/cpu/i8089/i8089_channel.h
rename to src/devices/cpu/i8089/i8089_channel.h
diff --git a/src/emu/cpu/i8089/i8089_dasm.c b/src/devices/cpu/i8089/i8089_dasm.c
similarity index 100%
rename from src/emu/cpu/i8089/i8089_dasm.c
rename to src/devices/cpu/i8089/i8089_dasm.c
diff --git a/src/emu/cpu/i8089/i8089_ops.c b/src/devices/cpu/i8089/i8089_ops.c
similarity index 100%
rename from src/emu/cpu/i8089/i8089_ops.c
rename to src/devices/cpu/i8089/i8089_ops.c
diff --git a/src/emu/cpu/i86/i186.c b/src/devices/cpu/i86/i186.c
similarity index 100%
rename from src/emu/cpu/i86/i186.c
rename to src/devices/cpu/i86/i186.c
diff --git a/src/emu/cpu/i86/i186.h b/src/devices/cpu/i86/i186.h
similarity index 100%
rename from src/emu/cpu/i86/i186.h
rename to src/devices/cpu/i86/i186.h
diff --git a/src/emu/cpu/i86/i286.c b/src/devices/cpu/i86/i286.c
similarity index 100%
rename from src/emu/cpu/i86/i286.c
rename to src/devices/cpu/i86/i286.c
diff --git a/src/emu/cpu/i86/i286.h b/src/devices/cpu/i86/i286.h
similarity index 100%
rename from src/emu/cpu/i86/i286.h
rename to src/devices/cpu/i86/i286.h
diff --git a/src/emu/cpu/i86/i86.c b/src/devices/cpu/i86/i86.c
similarity index 100%
rename from src/emu/cpu/i86/i86.c
rename to src/devices/cpu/i86/i86.c
diff --git a/src/emu/cpu/i86/i86.h b/src/devices/cpu/i86/i86.h
similarity index 100%
rename from src/emu/cpu/i86/i86.h
rename to src/devices/cpu/i86/i86.h
diff --git a/src/emu/cpu/i86/i86.txt b/src/devices/cpu/i86/i86.txt
similarity index 100%
rename from src/emu/cpu/i86/i86.txt
rename to src/devices/cpu/i86/i86.txt
diff --git a/src/emu/cpu/i86/i86inline.h b/src/devices/cpu/i86/i86inline.h
similarity index 100%
rename from src/emu/cpu/i86/i86inline.h
rename to src/devices/cpu/i86/i86inline.h
diff --git a/src/emu/cpu/i860/i860.c b/src/devices/cpu/i860/i860.c
similarity index 100%
rename from src/emu/cpu/i860/i860.c
rename to src/devices/cpu/i860/i860.c
diff --git a/src/emu/cpu/i860/i860.h b/src/devices/cpu/i860/i860.h
similarity index 100%
rename from src/emu/cpu/i860/i860.h
rename to src/devices/cpu/i860/i860.h
diff --git a/src/emu/cpu/i860/i860dasm.c b/src/devices/cpu/i860/i860dasm.c
similarity index 100%
rename from src/emu/cpu/i860/i860dasm.c
rename to src/devices/cpu/i860/i860dasm.c
diff --git a/src/emu/cpu/i860/i860dec.inc b/src/devices/cpu/i860/i860dec.inc
similarity index 100%
rename from src/emu/cpu/i860/i860dec.inc
rename to src/devices/cpu/i860/i860dec.inc
diff --git a/src/emu/cpu/i860/i860dis.c b/src/devices/cpu/i860/i860dis.c
similarity index 100%
rename from src/emu/cpu/i860/i860dis.c
rename to src/devices/cpu/i860/i860dis.c
diff --git a/src/emu/cpu/i960/i960.c b/src/devices/cpu/i960/i960.c
similarity index 100%
rename from src/emu/cpu/i960/i960.c
rename to src/devices/cpu/i960/i960.c
diff --git a/src/emu/cpu/i960/i960.h b/src/devices/cpu/i960/i960.h
similarity index 100%
rename from src/emu/cpu/i960/i960.h
rename to src/devices/cpu/i960/i960.h
diff --git a/src/emu/cpu/i960/i960dis.c b/src/devices/cpu/i960/i960dis.c
similarity index 100%
rename from src/emu/cpu/i960/i960dis.c
rename to src/devices/cpu/i960/i960dis.c
diff --git a/src/emu/cpu/i960/i960dis.h b/src/devices/cpu/i960/i960dis.h
similarity index 100%
rename from src/emu/cpu/i960/i960dis.h
rename to src/devices/cpu/i960/i960dis.h
diff --git a/src/emu/cpu/ie15/ie15.c b/src/devices/cpu/ie15/ie15.c
similarity index 100%
rename from src/emu/cpu/ie15/ie15.c
rename to src/devices/cpu/ie15/ie15.c
diff --git a/src/emu/cpu/ie15/ie15.h b/src/devices/cpu/ie15/ie15.h
similarity index 100%
rename from src/emu/cpu/ie15/ie15.h
rename to src/devices/cpu/ie15/ie15.h
diff --git a/src/emu/cpu/ie15/ie15dasm.c b/src/devices/cpu/ie15/ie15dasm.c
similarity index 100%
rename from src/emu/cpu/ie15/ie15dasm.c
rename to src/devices/cpu/ie15/ie15dasm.c
diff --git a/src/emu/cpu/jaguar/jagdasm.c b/src/devices/cpu/jaguar/jagdasm.c
similarity index 100%
rename from src/emu/cpu/jaguar/jagdasm.c
rename to src/devices/cpu/jaguar/jagdasm.c
diff --git a/src/emu/cpu/jaguar/jaguar.c b/src/devices/cpu/jaguar/jaguar.c
similarity index 100%
rename from src/emu/cpu/jaguar/jaguar.c
rename to src/devices/cpu/jaguar/jaguar.c
diff --git a/src/emu/cpu/jaguar/jaguar.h b/src/devices/cpu/jaguar/jaguar.h
similarity index 100%
rename from src/emu/cpu/jaguar/jaguar.h
rename to src/devices/cpu/jaguar/jaguar.h
diff --git a/src/emu/cpu/lc8670/lc8670.c b/src/devices/cpu/lc8670/lc8670.c
similarity index 100%
rename from src/emu/cpu/lc8670/lc8670.c
rename to src/devices/cpu/lc8670/lc8670.c
diff --git a/src/emu/cpu/lc8670/lc8670.h b/src/devices/cpu/lc8670/lc8670.h
similarity index 100%
rename from src/emu/cpu/lc8670/lc8670.h
rename to src/devices/cpu/lc8670/lc8670.h
diff --git a/src/emu/cpu/lc8670/lc8670dsm.c b/src/devices/cpu/lc8670/lc8670dsm.c
similarity index 100%
rename from src/emu/cpu/lc8670/lc8670dsm.c
rename to src/devices/cpu/lc8670/lc8670dsm.c
diff --git a/src/emu/cpu/lh5801/5801dasm.c b/src/devices/cpu/lh5801/5801dasm.c
similarity index 100%
rename from src/emu/cpu/lh5801/5801dasm.c
rename to src/devices/cpu/lh5801/5801dasm.c
diff --git a/src/emu/cpu/lh5801/5801tbl.inc b/src/devices/cpu/lh5801/5801tbl.inc
similarity index 100%
rename from src/emu/cpu/lh5801/5801tbl.inc
rename to src/devices/cpu/lh5801/5801tbl.inc
diff --git a/src/emu/cpu/lh5801/lh5801.c b/src/devices/cpu/lh5801/lh5801.c
similarity index 100%
rename from src/emu/cpu/lh5801/lh5801.c
rename to src/devices/cpu/lh5801/lh5801.c
diff --git a/src/emu/cpu/lh5801/lh5801.h b/src/devices/cpu/lh5801/lh5801.h
similarity index 100%
rename from src/emu/cpu/lh5801/lh5801.h
rename to src/devices/cpu/lh5801/lh5801.h
diff --git a/src/emu/cpu/lr35902/lr35902.c b/src/devices/cpu/lr35902/lr35902.c
similarity index 100%
rename from src/emu/cpu/lr35902/lr35902.c
rename to src/devices/cpu/lr35902/lr35902.c
diff --git a/src/emu/cpu/lr35902/lr35902.h b/src/devices/cpu/lr35902/lr35902.h
similarity index 100%
rename from src/emu/cpu/lr35902/lr35902.h
rename to src/devices/cpu/lr35902/lr35902.h
diff --git a/src/emu/cpu/lr35902/lr35902d.c b/src/devices/cpu/lr35902/lr35902d.c
similarity index 100%
rename from src/emu/cpu/lr35902/lr35902d.c
rename to src/devices/cpu/lr35902/lr35902d.c
diff --git a/src/emu/cpu/lr35902/opc_cb.inc b/src/devices/cpu/lr35902/opc_cb.inc
similarity index 100%
rename from src/emu/cpu/lr35902/opc_cb.inc
rename to src/devices/cpu/lr35902/opc_cb.inc
diff --git a/src/emu/cpu/lr35902/opc_main.inc b/src/devices/cpu/lr35902/opc_main.inc
similarity index 100%
rename from src/emu/cpu/lr35902/opc_main.inc
rename to src/devices/cpu/lr35902/opc_main.inc
diff --git a/src/emu/cpu/m37710/m37710.c b/src/devices/cpu/m37710/m37710.c
similarity index 100%
rename from src/emu/cpu/m37710/m37710.c
rename to src/devices/cpu/m37710/m37710.c
diff --git a/src/emu/cpu/m37710/m37710.h b/src/devices/cpu/m37710/m37710.h
similarity index 100%
rename from src/emu/cpu/m37710/m37710.h
rename to src/devices/cpu/m37710/m37710.h
diff --git a/src/emu/cpu/m37710/m37710cm.h b/src/devices/cpu/m37710/m37710cm.h
similarity index 100%
rename from src/emu/cpu/m37710/m37710cm.h
rename to src/devices/cpu/m37710/m37710cm.h
diff --git a/src/emu/cpu/m37710/m37710il.h b/src/devices/cpu/m37710/m37710il.h
similarity index 100%
rename from src/emu/cpu/m37710/m37710il.h
rename to src/devices/cpu/m37710/m37710il.h
diff --git a/src/emu/cpu/m37710/m37710o0.c b/src/devices/cpu/m37710/m37710o0.c
similarity index 100%
rename from src/emu/cpu/m37710/m37710o0.c
rename to src/devices/cpu/m37710/m37710o0.c
diff --git a/src/emu/cpu/m37710/m37710o1.c b/src/devices/cpu/m37710/m37710o1.c
similarity index 100%
rename from src/emu/cpu/m37710/m37710o1.c
rename to src/devices/cpu/m37710/m37710o1.c
diff --git a/src/emu/cpu/m37710/m37710o2.c b/src/devices/cpu/m37710/m37710o2.c
similarity index 100%
rename from src/emu/cpu/m37710/m37710o2.c
rename to src/devices/cpu/m37710/m37710o2.c
diff --git a/src/emu/cpu/m37710/m37710o3.c b/src/devices/cpu/m37710/m37710o3.c
similarity index 100%
rename from src/emu/cpu/m37710/m37710o3.c
rename to src/devices/cpu/m37710/m37710o3.c
diff --git a/src/emu/cpu/m37710/m37710op.h b/src/devices/cpu/m37710/m37710op.h
similarity index 100%
rename from src/emu/cpu/m37710/m37710op.h
rename to src/devices/cpu/m37710/m37710op.h
diff --git a/src/emu/cpu/m37710/m7700ds.c b/src/devices/cpu/m37710/m7700ds.c
similarity index 100%
rename from src/emu/cpu/m37710/m7700ds.c
rename to src/devices/cpu/m37710/m7700ds.c
diff --git a/src/emu/cpu/m37710/m7700ds.h b/src/devices/cpu/m37710/m7700ds.h
similarity index 100%
rename from src/emu/cpu/m37710/m7700ds.h
rename to src/devices/cpu/m37710/m7700ds.h
diff --git a/src/emu/cpu/m6502/ddeco16.lst b/src/devices/cpu/m6502/ddeco16.lst
similarity index 100%
rename from src/emu/cpu/m6502/ddeco16.lst
rename to src/devices/cpu/m6502/ddeco16.lst
diff --git a/src/emu/cpu/m6502/deco16.c b/src/devices/cpu/m6502/deco16.c
similarity index 100%
rename from src/emu/cpu/m6502/deco16.c
rename to src/devices/cpu/m6502/deco16.c
diff --git a/src/emu/cpu/m6502/deco16.h b/src/devices/cpu/m6502/deco16.h
similarity index 100%
rename from src/emu/cpu/m6502/deco16.h
rename to src/devices/cpu/m6502/deco16.h
diff --git a/src/emu/cpu/m6502/dm4510.lst b/src/devices/cpu/m6502/dm4510.lst
similarity index 100%
rename from src/emu/cpu/m6502/dm4510.lst
rename to src/devices/cpu/m6502/dm4510.lst
diff --git a/src/emu/cpu/m6502/dm6502.lst b/src/devices/cpu/m6502/dm6502.lst
similarity index 100%
rename from src/emu/cpu/m6502/dm6502.lst
rename to src/devices/cpu/m6502/dm6502.lst
diff --git a/src/emu/cpu/m6502/dm6509.lst b/src/devices/cpu/m6502/dm6509.lst
similarity index 100%
rename from src/emu/cpu/m6502/dm6509.lst
rename to src/devices/cpu/m6502/dm6509.lst
diff --git a/src/emu/cpu/m6502/dm6510.lst b/src/devices/cpu/m6502/dm6510.lst
similarity index 100%
rename from src/emu/cpu/m6502/dm6510.lst
rename to src/devices/cpu/m6502/dm6510.lst
diff --git a/src/emu/cpu/m6502/dm65c02.lst b/src/devices/cpu/m6502/dm65c02.lst
similarity index 100%
rename from src/emu/cpu/m6502/dm65c02.lst
rename to src/devices/cpu/m6502/dm65c02.lst
diff --git a/src/emu/cpu/m6502/dm65ce02.lst b/src/devices/cpu/m6502/dm65ce02.lst
similarity index 100%
rename from src/emu/cpu/m6502/dm65ce02.lst
rename to src/devices/cpu/m6502/dm65ce02.lst
diff --git a/src/emu/cpu/m6502/dm740.lst b/src/devices/cpu/m6502/dm740.lst
similarity index 100%
rename from src/emu/cpu/m6502/dm740.lst
rename to src/devices/cpu/m6502/dm740.lst
diff --git a/src/emu/cpu/m6502/dn2a03.lst b/src/devices/cpu/m6502/dn2a03.lst
similarity index 100%
rename from src/emu/cpu/m6502/dn2a03.lst
rename to src/devices/cpu/m6502/dn2a03.lst
diff --git a/src/emu/cpu/m6502/dr65c02.lst b/src/devices/cpu/m6502/dr65c02.lst
similarity index 100%
rename from src/emu/cpu/m6502/dr65c02.lst
rename to src/devices/cpu/m6502/dr65c02.lst
diff --git a/src/emu/cpu/m6502/m3745x.c b/src/devices/cpu/m6502/m3745x.c
similarity index 100%
rename from src/emu/cpu/m6502/m3745x.c
rename to src/devices/cpu/m6502/m3745x.c
diff --git a/src/emu/cpu/m6502/m3745x.h b/src/devices/cpu/m6502/m3745x.h
similarity index 100%
rename from src/emu/cpu/m6502/m3745x.h
rename to src/devices/cpu/m6502/m3745x.h
diff --git a/src/emu/cpu/m6502/m4510.c b/src/devices/cpu/m6502/m4510.c
similarity index 100%
rename from src/emu/cpu/m6502/m4510.c
rename to src/devices/cpu/m6502/m4510.c
diff --git a/src/emu/cpu/m6502/m4510.h b/src/devices/cpu/m6502/m4510.h
similarity index 100%
rename from src/emu/cpu/m6502/m4510.h
rename to src/devices/cpu/m6502/m4510.h
diff --git a/src/emu/cpu/m6502/m5074x.c b/src/devices/cpu/m6502/m5074x.c
similarity index 100%
rename from src/emu/cpu/m6502/m5074x.c
rename to src/devices/cpu/m6502/m5074x.c
diff --git a/src/emu/cpu/m6502/m5074x.h b/src/devices/cpu/m6502/m5074x.h
similarity index 100%
rename from src/emu/cpu/m6502/m5074x.h
rename to src/devices/cpu/m6502/m5074x.h
diff --git a/src/emu/cpu/m6502/m6502.c b/src/devices/cpu/m6502/m6502.c
similarity index 100%
rename from src/emu/cpu/m6502/m6502.c
rename to src/devices/cpu/m6502/m6502.c
diff --git a/src/emu/cpu/m6502/m6502.h b/src/devices/cpu/m6502/m6502.h
similarity index 100%
rename from src/emu/cpu/m6502/m6502.h
rename to src/devices/cpu/m6502/m6502.h
diff --git a/src/emu/cpu/m6502/m6502.txt b/src/devices/cpu/m6502/m6502.txt
similarity index 100%
rename from src/emu/cpu/m6502/m6502.txt
rename to src/devices/cpu/m6502/m6502.txt
diff --git a/src/emu/cpu/m6502/m6502make.py b/src/devices/cpu/m6502/m6502make.py
similarity index 100%
rename from src/emu/cpu/m6502/m6502make.py
rename to src/devices/cpu/m6502/m6502make.py
diff --git a/src/emu/cpu/m6502/m6504.c b/src/devices/cpu/m6502/m6504.c
similarity index 100%
rename from src/emu/cpu/m6502/m6504.c
rename to src/devices/cpu/m6502/m6504.c
diff --git a/src/emu/cpu/m6502/m6504.h b/src/devices/cpu/m6502/m6504.h
similarity index 100%
rename from src/emu/cpu/m6502/m6504.h
rename to src/devices/cpu/m6502/m6504.h
diff --git a/src/emu/cpu/m6502/m6509.c b/src/devices/cpu/m6502/m6509.c
similarity index 100%
rename from src/emu/cpu/m6502/m6509.c
rename to src/devices/cpu/m6502/m6509.c
diff --git a/src/emu/cpu/m6502/m6509.h b/src/devices/cpu/m6502/m6509.h
similarity index 100%
rename from src/emu/cpu/m6502/m6509.h
rename to src/devices/cpu/m6502/m6509.h
diff --git a/src/emu/cpu/m6502/m6510.c b/src/devices/cpu/m6502/m6510.c
similarity index 100%
rename from src/emu/cpu/m6502/m6510.c
rename to src/devices/cpu/m6502/m6510.c
diff --git a/src/emu/cpu/m6502/m6510.h b/src/devices/cpu/m6502/m6510.h
similarity index 100%
rename from src/emu/cpu/m6502/m6510.h
rename to src/devices/cpu/m6502/m6510.h
diff --git a/src/emu/cpu/m6502/m6510t.c b/src/devices/cpu/m6502/m6510t.c
similarity index 100%
rename from src/emu/cpu/m6502/m6510t.c
rename to src/devices/cpu/m6502/m6510t.c
diff --git a/src/emu/cpu/m6502/m6510t.h b/src/devices/cpu/m6502/m6510t.h
similarity index 100%
rename from src/emu/cpu/m6502/m6510t.h
rename to src/devices/cpu/m6502/m6510t.h
diff --git a/src/emu/cpu/m6502/m65c02.c b/src/devices/cpu/m6502/m65c02.c
similarity index 100%
rename from src/emu/cpu/m6502/m65c02.c
rename to src/devices/cpu/m6502/m65c02.c
diff --git a/src/emu/cpu/m6502/m65c02.h b/src/devices/cpu/m6502/m65c02.h
similarity index 100%
rename from src/emu/cpu/m6502/m65c02.h
rename to src/devices/cpu/m6502/m65c02.h
diff --git a/src/emu/cpu/m6502/m65ce02.c b/src/devices/cpu/m6502/m65ce02.c
similarity index 100%
rename from src/emu/cpu/m6502/m65ce02.c
rename to src/devices/cpu/m6502/m65ce02.c
diff --git a/src/emu/cpu/m6502/m65ce02.h b/src/devices/cpu/m6502/m65ce02.h
similarity index 100%
rename from src/emu/cpu/m6502/m65ce02.h
rename to src/devices/cpu/m6502/m65ce02.h
diff --git a/src/emu/cpu/m6502/m65sc02.c b/src/devices/cpu/m6502/m65sc02.c
similarity index 100%
rename from src/emu/cpu/m6502/m65sc02.c
rename to src/devices/cpu/m6502/m65sc02.c
diff --git a/src/emu/cpu/m6502/m65sc02.h b/src/devices/cpu/m6502/m65sc02.h
similarity index 100%
rename from src/emu/cpu/m6502/m65sc02.h
rename to src/devices/cpu/m6502/m65sc02.h
diff --git a/src/emu/cpu/m6502/m740.c b/src/devices/cpu/m6502/m740.c
similarity index 100%
rename from src/emu/cpu/m6502/m740.c
rename to src/devices/cpu/m6502/m740.c
diff --git a/src/emu/cpu/m6502/m740.h b/src/devices/cpu/m6502/m740.h
similarity index 100%
rename from src/emu/cpu/m6502/m740.h
rename to src/devices/cpu/m6502/m740.h
diff --git a/src/emu/cpu/m6502/m7501.c b/src/devices/cpu/m6502/m7501.c
similarity index 100%
rename from src/emu/cpu/m6502/m7501.c
rename to src/devices/cpu/m6502/m7501.c
diff --git a/src/emu/cpu/m6502/m7501.h b/src/devices/cpu/m6502/m7501.h
similarity index 100%
rename from src/emu/cpu/m6502/m7501.h
rename to src/devices/cpu/m6502/m7501.h
diff --git a/src/emu/cpu/m6502/m8502.c b/src/devices/cpu/m6502/m8502.c
similarity index 100%
rename from src/emu/cpu/m6502/m8502.c
rename to src/devices/cpu/m6502/m8502.c
diff --git a/src/emu/cpu/m6502/m8502.h b/src/devices/cpu/m6502/m8502.h
similarity index 100%
rename from src/emu/cpu/m6502/m8502.h
rename to src/devices/cpu/m6502/m8502.h
diff --git a/src/emu/cpu/m6502/n2a03.c b/src/devices/cpu/m6502/n2a03.c
similarity index 100%
rename from src/emu/cpu/m6502/n2a03.c
rename to src/devices/cpu/m6502/n2a03.c
diff --git a/src/emu/cpu/m6502/n2a03.h b/src/devices/cpu/m6502/n2a03.h
similarity index 100%
rename from src/emu/cpu/m6502/n2a03.h
rename to src/devices/cpu/m6502/n2a03.h
diff --git a/src/emu/cpu/m6502/odeco16.lst b/src/devices/cpu/m6502/odeco16.lst
similarity index 100%
rename from src/emu/cpu/m6502/odeco16.lst
rename to src/devices/cpu/m6502/odeco16.lst
diff --git a/src/emu/cpu/m6502/om4510.lst b/src/devices/cpu/m6502/om4510.lst
similarity index 100%
rename from src/emu/cpu/m6502/om4510.lst
rename to src/devices/cpu/m6502/om4510.lst
diff --git a/src/emu/cpu/m6502/om6502.lst b/src/devices/cpu/m6502/om6502.lst
similarity index 100%
rename from src/emu/cpu/m6502/om6502.lst
rename to src/devices/cpu/m6502/om6502.lst
diff --git a/src/emu/cpu/m6502/om6509.lst b/src/devices/cpu/m6502/om6509.lst
similarity index 100%
rename from src/emu/cpu/m6502/om6509.lst
rename to src/devices/cpu/m6502/om6509.lst
diff --git a/src/emu/cpu/m6502/om6510.lst b/src/devices/cpu/m6502/om6510.lst
similarity index 100%
rename from src/emu/cpu/m6502/om6510.lst
rename to src/devices/cpu/m6502/om6510.lst
diff --git a/src/emu/cpu/m6502/om65c02.lst b/src/devices/cpu/m6502/om65c02.lst
similarity index 100%
rename from src/emu/cpu/m6502/om65c02.lst
rename to src/devices/cpu/m6502/om65c02.lst
diff --git a/src/emu/cpu/m6502/om65ce02.lst b/src/devices/cpu/m6502/om65ce02.lst
similarity index 100%
rename from src/emu/cpu/m6502/om65ce02.lst
rename to src/devices/cpu/m6502/om65ce02.lst
diff --git a/src/emu/cpu/m6502/om740.lst b/src/devices/cpu/m6502/om740.lst
similarity index 100%
rename from src/emu/cpu/m6502/om740.lst
rename to src/devices/cpu/m6502/om740.lst
diff --git a/src/emu/cpu/m6502/on2a03.lst b/src/devices/cpu/m6502/on2a03.lst
similarity index 100%
rename from src/emu/cpu/m6502/on2a03.lst
rename to src/devices/cpu/m6502/on2a03.lst
diff --git a/src/emu/cpu/m6502/r65c02.c b/src/devices/cpu/m6502/r65c02.c
similarity index 100%
rename from src/emu/cpu/m6502/r65c02.c
rename to src/devices/cpu/m6502/r65c02.c
diff --git a/src/emu/cpu/m6502/r65c02.h b/src/devices/cpu/m6502/r65c02.h
similarity index 100%
rename from src/emu/cpu/m6502/r65c02.h
rename to src/devices/cpu/m6502/r65c02.h
diff --git a/src/emu/cpu/m6800/6800dasm.c b/src/devices/cpu/m6800/6800dasm.c
similarity index 100%
rename from src/emu/cpu/m6800/6800dasm.c
rename to src/devices/cpu/m6800/6800dasm.c
diff --git a/src/emu/cpu/m6800/6800ops.inc b/src/devices/cpu/m6800/6800ops.inc
similarity index 100%
rename from src/emu/cpu/m6800/6800ops.inc
rename to src/devices/cpu/m6800/6800ops.inc
diff --git a/src/emu/cpu/m6800/6800tbl.inc b/src/devices/cpu/m6800/6800tbl.inc
similarity index 100%
rename from src/emu/cpu/m6800/6800tbl.inc
rename to src/devices/cpu/m6800/6800tbl.inc
diff --git a/src/emu/cpu/m6800/m6800.c b/src/devices/cpu/m6800/m6800.c
similarity index 100%
rename from src/emu/cpu/m6800/m6800.c
rename to src/devices/cpu/m6800/m6800.c
diff --git a/src/emu/cpu/m6800/m6800.h b/src/devices/cpu/m6800/m6800.h
similarity index 100%
rename from src/emu/cpu/m6800/m6800.h
rename to src/devices/cpu/m6800/m6800.h
diff --git a/src/emu/cpu/m68000/m68000.h b/src/devices/cpu/m68000/m68000.h
similarity index 100%
rename from src/emu/cpu/m68000/m68000.h
rename to src/devices/cpu/m68000/m68000.h
diff --git a/src/emu/cpu/m68000/m68k_in.c b/src/devices/cpu/m68000/m68k_in.c
similarity index 100%
rename from src/emu/cpu/m68000/m68k_in.c
rename to src/devices/cpu/m68000/m68k_in.c
diff --git a/src/emu/cpu/m68000/m68kcpu.c b/src/devices/cpu/m68000/m68kcpu.c
similarity index 100%
rename from src/emu/cpu/m68000/m68kcpu.c
rename to src/devices/cpu/m68000/m68kcpu.c
diff --git a/src/emu/cpu/m68000/m68kcpu.h b/src/devices/cpu/m68000/m68kcpu.h
similarity index 100%
rename from src/emu/cpu/m68000/m68kcpu.h
rename to src/devices/cpu/m68000/m68kcpu.h
diff --git a/src/emu/cpu/m68000/m68kdasm.c b/src/devices/cpu/m68000/m68kdasm.c
similarity index 100%
rename from src/emu/cpu/m68000/m68kdasm.c
rename to src/devices/cpu/m68000/m68kdasm.c
diff --git a/src/emu/cpu/m68000/m68kfpu.inc b/src/devices/cpu/m68000/m68kfpu.inc
similarity index 100%
rename from src/emu/cpu/m68000/m68kfpu.inc
rename to src/devices/cpu/m68000/m68kfpu.inc
diff --git a/src/emu/cpu/m68000/m68kmake.c b/src/devices/cpu/m68000/m68kmake.c
similarity index 100%
rename from src/emu/cpu/m68000/m68kmake.c
rename to src/devices/cpu/m68000/m68kmake.c
diff --git a/src/emu/cpu/m68000/m68kmmu.h b/src/devices/cpu/m68000/m68kmmu.h
similarity index 100%
rename from src/emu/cpu/m68000/m68kmmu.h
rename to src/devices/cpu/m68000/m68kmmu.h
diff --git a/src/emu/cpu/m68000/m68kops.c b/src/devices/cpu/m68000/m68kops.c
similarity index 100%
rename from src/emu/cpu/m68000/m68kops.c
rename to src/devices/cpu/m68000/m68kops.c
diff --git a/src/emu/cpu/m68000/m68kops.h b/src/devices/cpu/m68000/m68kops.h
similarity index 100%
rename from src/emu/cpu/m68000/m68kops.h
rename to src/devices/cpu/m68000/m68kops.h
diff --git a/src/emu/cpu/m68000/makefile b/src/devices/cpu/m68000/makefile
similarity index 100%
rename from src/emu/cpu/m68000/makefile
rename to src/devices/cpu/m68000/makefile
diff --git a/src/emu/cpu/m6805/6805dasm.c b/src/devices/cpu/m6805/6805dasm.c
similarity index 100%
rename from src/emu/cpu/m6805/6805dasm.c
rename to src/devices/cpu/m6805/6805dasm.c
diff --git a/src/emu/cpu/m6805/6805ops.inc b/src/devices/cpu/m6805/6805ops.inc
similarity index 100%
rename from src/emu/cpu/m6805/6805ops.inc
rename to src/devices/cpu/m6805/6805ops.inc
diff --git a/src/emu/cpu/m6805/m6805.c b/src/devices/cpu/m6805/m6805.c
similarity index 100%
rename from src/emu/cpu/m6805/m6805.c
rename to src/devices/cpu/m6805/m6805.c
diff --git a/src/emu/cpu/m6805/m6805.h b/src/devices/cpu/m6805/m6805.h
similarity index 100%
rename from src/emu/cpu/m6805/m6805.h
rename to src/devices/cpu/m6805/m6805.h
diff --git a/src/emu/cpu/m6809/6309dasm.c b/src/devices/cpu/m6809/6309dasm.c
similarity index 100%
rename from src/emu/cpu/m6809/6309dasm.c
rename to src/devices/cpu/m6809/6309dasm.c
diff --git a/src/emu/cpu/m6809/6809dasm.c b/src/devices/cpu/m6809/6809dasm.c
similarity index 100%
rename from src/emu/cpu/m6809/6809dasm.c
rename to src/devices/cpu/m6809/6809dasm.c
diff --git a/src/emu/cpu/m6809/base6x09.ops b/src/devices/cpu/m6809/base6x09.ops
similarity index 100%
rename from src/emu/cpu/m6809/base6x09.ops
rename to src/devices/cpu/m6809/base6x09.ops
diff --git a/src/emu/cpu/m6809/hd6309.c b/src/devices/cpu/m6809/hd6309.c
similarity index 100%
rename from src/emu/cpu/m6809/hd6309.c
rename to src/devices/cpu/m6809/hd6309.c
diff --git a/src/emu/cpu/m6809/hd6309.h b/src/devices/cpu/m6809/hd6309.h
similarity index 100%
rename from src/emu/cpu/m6809/hd6309.h
rename to src/devices/cpu/m6809/hd6309.h
diff --git a/src/emu/cpu/m6809/hd6309.ops b/src/devices/cpu/m6809/hd6309.ops
similarity index 100%
rename from src/emu/cpu/m6809/hd6309.ops
rename to src/devices/cpu/m6809/hd6309.ops
diff --git a/src/emu/cpu/m6809/knmidasm.c b/src/devices/cpu/m6809/knmidasm.c
similarity index 100%
rename from src/emu/cpu/m6809/knmidasm.c
rename to src/devices/cpu/m6809/knmidasm.c
diff --git a/src/emu/cpu/m6809/konami.c b/src/devices/cpu/m6809/konami.c
similarity index 100%
rename from src/emu/cpu/m6809/konami.c
rename to src/devices/cpu/m6809/konami.c
diff --git a/src/emu/cpu/m6809/konami.h b/src/devices/cpu/m6809/konami.h
similarity index 100%
rename from src/emu/cpu/m6809/konami.h
rename to src/devices/cpu/m6809/konami.h
diff --git a/src/emu/cpu/m6809/konami.ops b/src/devices/cpu/m6809/konami.ops
similarity index 100%
rename from src/emu/cpu/m6809/konami.ops
rename to src/devices/cpu/m6809/konami.ops
diff --git a/src/emu/cpu/m6809/m6809.c b/src/devices/cpu/m6809/m6809.c
similarity index 100%
rename from src/emu/cpu/m6809/m6809.c
rename to src/devices/cpu/m6809/m6809.c
diff --git a/src/emu/cpu/m6809/m6809.h b/src/devices/cpu/m6809/m6809.h
similarity index 100%
rename from src/emu/cpu/m6809/m6809.h
rename to src/devices/cpu/m6809/m6809.h
diff --git a/src/emu/cpu/m6809/m6809.ops b/src/devices/cpu/m6809/m6809.ops
similarity index 100%
rename from src/emu/cpu/m6809/m6809.ops
rename to src/devices/cpu/m6809/m6809.ops
diff --git a/src/emu/cpu/m6809/m6809inl.h b/src/devices/cpu/m6809/m6809inl.h
similarity index 100%
rename from src/emu/cpu/m6809/m6809inl.h
rename to src/devices/cpu/m6809/m6809inl.h
diff --git a/src/emu/cpu/m6809/m6809make.py b/src/devices/cpu/m6809/m6809make.py
similarity index 100%
rename from src/emu/cpu/m6809/m6809make.py
rename to src/devices/cpu/m6809/m6809make.py
diff --git a/src/emu/cpu/mb86233/mb86233.c b/src/devices/cpu/mb86233/mb86233.c
similarity index 100%
rename from src/emu/cpu/mb86233/mb86233.c
rename to src/devices/cpu/mb86233/mb86233.c
diff --git a/src/emu/cpu/mb86233/mb86233.h b/src/devices/cpu/mb86233/mb86233.h
similarity index 100%
rename from src/emu/cpu/mb86233/mb86233.h
rename to src/devices/cpu/mb86233/mb86233.h
diff --git a/src/emu/cpu/mb86233/mb86233d.c b/src/devices/cpu/mb86233/mb86233d.c
similarity index 100%
rename from src/emu/cpu/mb86233/mb86233d.c
rename to src/devices/cpu/mb86233/mb86233d.c
diff --git a/src/emu/cpu/mb86235/mb86235.c b/src/devices/cpu/mb86235/mb86235.c
similarity index 100%
rename from src/emu/cpu/mb86235/mb86235.c
rename to src/devices/cpu/mb86235/mb86235.c
diff --git a/src/emu/cpu/mb86235/mb86235.h b/src/devices/cpu/mb86235/mb86235.h
similarity index 100%
rename from src/emu/cpu/mb86235/mb86235.h
rename to src/devices/cpu/mb86235/mb86235.h
diff --git a/src/emu/cpu/mb86235/mb86235d.c b/src/devices/cpu/mb86235/mb86235d.c
similarity index 100%
rename from src/emu/cpu/mb86235/mb86235d.c
rename to src/devices/cpu/mb86235/mb86235d.c
diff --git a/src/emu/cpu/mb88xx/mb88dasm.c b/src/devices/cpu/mb88xx/mb88dasm.c
similarity index 100%
rename from src/emu/cpu/mb88xx/mb88dasm.c
rename to src/devices/cpu/mb88xx/mb88dasm.c
diff --git a/src/emu/cpu/mb88xx/mb88xx.c b/src/devices/cpu/mb88xx/mb88xx.c
similarity index 100%
rename from src/emu/cpu/mb88xx/mb88xx.c
rename to src/devices/cpu/mb88xx/mb88xx.c
diff --git a/src/emu/cpu/mb88xx/mb88xx.h b/src/devices/cpu/mb88xx/mb88xx.h
similarity index 100%
rename from src/emu/cpu/mb88xx/mb88xx.h
rename to src/devices/cpu/mb88xx/mb88xx.h
diff --git a/src/emu/cpu/mc68hc11/hc11dasm.c b/src/devices/cpu/mc68hc11/hc11dasm.c
similarity index 100%
rename from src/emu/cpu/mc68hc11/hc11dasm.c
rename to src/devices/cpu/mc68hc11/hc11dasm.c
diff --git a/src/emu/cpu/mc68hc11/hc11ops.h b/src/devices/cpu/mc68hc11/hc11ops.h
similarity index 100%
rename from src/emu/cpu/mc68hc11/hc11ops.h
rename to src/devices/cpu/mc68hc11/hc11ops.h
diff --git a/src/emu/cpu/mc68hc11/hc11ops.inc b/src/devices/cpu/mc68hc11/hc11ops.inc
similarity index 100%
rename from src/emu/cpu/mc68hc11/hc11ops.inc
rename to src/devices/cpu/mc68hc11/hc11ops.inc
diff --git a/src/emu/cpu/mc68hc11/mc68hc11.c b/src/devices/cpu/mc68hc11/mc68hc11.c
similarity index 100%
rename from src/emu/cpu/mc68hc11/mc68hc11.c
rename to src/devices/cpu/mc68hc11/mc68hc11.c
diff --git a/src/emu/cpu/mc68hc11/mc68hc11.h b/src/devices/cpu/mc68hc11/mc68hc11.h
similarity index 100%
rename from src/emu/cpu/mc68hc11/mc68hc11.h
rename to src/devices/cpu/mc68hc11/mc68hc11.h
diff --git a/src/emu/cpu/mcs48/mcs48.c b/src/devices/cpu/mcs48/mcs48.c
similarity index 100%
rename from src/emu/cpu/mcs48/mcs48.c
rename to src/devices/cpu/mcs48/mcs48.c
diff --git a/src/emu/cpu/mcs48/mcs48.h b/src/devices/cpu/mcs48/mcs48.h
similarity index 100%
rename from src/emu/cpu/mcs48/mcs48.h
rename to src/devices/cpu/mcs48/mcs48.h
diff --git a/src/emu/cpu/mcs48/mcs48dsm.c b/src/devices/cpu/mcs48/mcs48dsm.c
similarity index 100%
rename from src/emu/cpu/mcs48/mcs48dsm.c
rename to src/devices/cpu/mcs48/mcs48dsm.c
diff --git a/src/emu/cpu/mcs51/mcs51.c b/src/devices/cpu/mcs51/mcs51.c
similarity index 100%
rename from src/emu/cpu/mcs51/mcs51.c
rename to src/devices/cpu/mcs51/mcs51.c
diff --git a/src/emu/cpu/mcs51/mcs51.h b/src/devices/cpu/mcs51/mcs51.h
similarity index 100%
rename from src/emu/cpu/mcs51/mcs51.h
rename to src/devices/cpu/mcs51/mcs51.h
diff --git a/src/emu/cpu/mcs51/mcs51dasm.c b/src/devices/cpu/mcs51/mcs51dasm.c
similarity index 100%
rename from src/emu/cpu/mcs51/mcs51dasm.c
rename to src/devices/cpu/mcs51/mcs51dasm.c
diff --git a/src/emu/cpu/mcs51/mcs51ops.inc b/src/devices/cpu/mcs51/mcs51ops.inc
similarity index 100%
rename from src/emu/cpu/mcs51/mcs51ops.inc
rename to src/devices/cpu/mcs51/mcs51ops.inc
diff --git a/src/emu/cpu/mcs96/i8x9x.c b/src/devices/cpu/mcs96/i8x9x.c
similarity index 100%
rename from src/emu/cpu/mcs96/i8x9x.c
rename to src/devices/cpu/mcs96/i8x9x.c
diff --git a/src/emu/cpu/mcs96/i8x9x.h b/src/devices/cpu/mcs96/i8x9x.h
similarity index 100%
rename from src/emu/cpu/mcs96/i8x9x.h
rename to src/devices/cpu/mcs96/i8x9x.h
diff --git a/src/emu/cpu/mcs96/i8xc196.c b/src/devices/cpu/mcs96/i8xc196.c
similarity index 100%
rename from src/emu/cpu/mcs96/i8xc196.c
rename to src/devices/cpu/mcs96/i8xc196.c
diff --git a/src/emu/cpu/mcs96/i8xc196.h b/src/devices/cpu/mcs96/i8xc196.h
similarity index 100%
rename from src/emu/cpu/mcs96/i8xc196.h
rename to src/devices/cpu/mcs96/i8xc196.h
diff --git a/src/emu/cpu/mcs96/mcs96.c b/src/devices/cpu/mcs96/mcs96.c
similarity index 100%
rename from src/emu/cpu/mcs96/mcs96.c
rename to src/devices/cpu/mcs96/mcs96.c
diff --git a/src/emu/cpu/mcs96/mcs96.h b/src/devices/cpu/mcs96/mcs96.h
similarity index 100%
rename from src/emu/cpu/mcs96/mcs96.h
rename to src/devices/cpu/mcs96/mcs96.h
diff --git a/src/emu/cpu/mcs96/mcs96make.py b/src/devices/cpu/mcs96/mcs96make.py
similarity index 100%
rename from src/emu/cpu/mcs96/mcs96make.py
rename to src/devices/cpu/mcs96/mcs96make.py
diff --git a/src/emu/cpu/mcs96/mcs96ops.lst b/src/devices/cpu/mcs96/mcs96ops.lst
similarity index 100%
rename from src/emu/cpu/mcs96/mcs96ops.lst
rename to src/devices/cpu/mcs96/mcs96ops.lst
diff --git a/src/emu/cpu/melps4/m58846.c b/src/devices/cpu/melps4/m58846.c
similarity index 100%
rename from src/emu/cpu/melps4/m58846.c
rename to src/devices/cpu/melps4/m58846.c
diff --git a/src/emu/cpu/melps4/m58846.h b/src/devices/cpu/melps4/m58846.h
similarity index 100%
rename from src/emu/cpu/melps4/m58846.h
rename to src/devices/cpu/melps4/m58846.h
diff --git a/src/emu/cpu/melps4/melps4.c b/src/devices/cpu/melps4/melps4.c
similarity index 100%
rename from src/emu/cpu/melps4/melps4.c
rename to src/devices/cpu/melps4/melps4.c
diff --git a/src/emu/cpu/melps4/melps4.h b/src/devices/cpu/melps4/melps4.h
similarity index 100%
rename from src/emu/cpu/melps4/melps4.h
rename to src/devices/cpu/melps4/melps4.h
diff --git a/src/emu/cpu/melps4/melps4d.c b/src/devices/cpu/melps4/melps4d.c
similarity index 100%
rename from src/emu/cpu/melps4/melps4d.c
rename to src/devices/cpu/melps4/melps4d.c
diff --git a/src/emu/cpu/melps4/melps4op.c b/src/devices/cpu/melps4/melps4op.c
similarity index 100%
rename from src/emu/cpu/melps4/melps4op.c
rename to src/devices/cpu/melps4/melps4op.c
diff --git a/src/emu/cpu/minx/minx.c b/src/devices/cpu/minx/minx.c
similarity index 100%
rename from src/emu/cpu/minx/minx.c
rename to src/devices/cpu/minx/minx.c
diff --git a/src/emu/cpu/minx/minx.h b/src/devices/cpu/minx/minx.h
similarity index 100%
rename from src/emu/cpu/minx/minx.h
rename to src/devices/cpu/minx/minx.h
diff --git a/src/emu/cpu/minx/minxd.c b/src/devices/cpu/minx/minxd.c
similarity index 100%
rename from src/emu/cpu/minx/minxd.c
rename to src/devices/cpu/minx/minxd.c
diff --git a/src/emu/cpu/minx/minxfunc.h b/src/devices/cpu/minx/minxfunc.h
similarity index 100%
rename from src/emu/cpu/minx/minxfunc.h
rename to src/devices/cpu/minx/minxfunc.h
diff --git a/src/emu/cpu/minx/minxopce.h b/src/devices/cpu/minx/minxopce.h
similarity index 100%
rename from src/emu/cpu/minx/minxopce.h
rename to src/devices/cpu/minx/minxopce.h
diff --git a/src/emu/cpu/minx/minxopcf.h b/src/devices/cpu/minx/minxopcf.h
similarity index 100%
rename from src/emu/cpu/minx/minxopcf.h
rename to src/devices/cpu/minx/minxopcf.h
diff --git a/src/emu/cpu/minx/minxops.h b/src/devices/cpu/minx/minxops.h
similarity index 100%
rename from src/emu/cpu/minx/minxops.h
rename to src/devices/cpu/minx/minxops.h
diff --git a/src/emu/cpu/mips/mips3.c b/src/devices/cpu/mips/mips3.c
similarity index 100%
rename from src/emu/cpu/mips/mips3.c
rename to src/devices/cpu/mips/mips3.c
diff --git a/src/emu/cpu/mips/mips3.h b/src/devices/cpu/mips/mips3.h
similarity index 100%
rename from src/emu/cpu/mips/mips3.h
rename to src/devices/cpu/mips/mips3.h
diff --git a/src/emu/cpu/mips/mips3com.c b/src/devices/cpu/mips/mips3com.c
similarity index 100%
rename from src/emu/cpu/mips/mips3com.c
rename to src/devices/cpu/mips/mips3com.c
diff --git a/src/emu/cpu/mips/mips3com.h b/src/devices/cpu/mips/mips3com.h
similarity index 100%
rename from src/emu/cpu/mips/mips3com.h
rename to src/devices/cpu/mips/mips3com.h
diff --git a/src/emu/cpu/mips/mips3drc.c b/src/devices/cpu/mips/mips3drc.c
similarity index 100%
rename from src/emu/cpu/mips/mips3drc.c
rename to src/devices/cpu/mips/mips3drc.c
diff --git a/src/emu/cpu/mips/mips3dsm.c b/src/devices/cpu/mips/mips3dsm.c
similarity index 100%
rename from src/emu/cpu/mips/mips3dsm.c
rename to src/devices/cpu/mips/mips3dsm.c
diff --git a/src/emu/cpu/mips/mips3fe.c b/src/devices/cpu/mips/mips3fe.c
similarity index 100%
rename from src/emu/cpu/mips/mips3fe.c
rename to src/devices/cpu/mips/mips3fe.c
diff --git a/src/emu/cpu/mips/mips3fe.h b/src/devices/cpu/mips/mips3fe.h
similarity index 100%
rename from src/emu/cpu/mips/mips3fe.h
rename to src/devices/cpu/mips/mips3fe.h
diff --git a/src/emu/cpu/mips/r3000.c b/src/devices/cpu/mips/r3000.c
similarity index 100%
rename from src/emu/cpu/mips/r3000.c
rename to src/devices/cpu/mips/r3000.c
diff --git a/src/emu/cpu/mips/r3000.h b/src/devices/cpu/mips/r3000.h
similarity index 100%
rename from src/emu/cpu/mips/r3000.h
rename to src/devices/cpu/mips/r3000.h
diff --git a/src/emu/cpu/mips/r3kdasm.c b/src/devices/cpu/mips/r3kdasm.c
similarity index 100%
rename from src/emu/cpu/mips/r3kdasm.c
rename to src/devices/cpu/mips/r3kdasm.c
diff --git a/src/emu/cpu/mn10200/mn10200.c b/src/devices/cpu/mn10200/mn10200.c
similarity index 100%
rename from src/emu/cpu/mn10200/mn10200.c
rename to src/devices/cpu/mn10200/mn10200.c
diff --git a/src/emu/cpu/mn10200/mn10200.h b/src/devices/cpu/mn10200/mn10200.h
similarity index 100%
rename from src/emu/cpu/mn10200/mn10200.h
rename to src/devices/cpu/mn10200/mn10200.h
diff --git a/src/emu/cpu/mn10200/mn102dis.c b/src/devices/cpu/mn10200/mn102dis.c
similarity index 100%
rename from src/emu/cpu/mn10200/mn102dis.c
rename to src/devices/cpu/mn10200/mn102dis.c
diff --git a/src/emu/cpu/nec/nec.c b/src/devices/cpu/nec/nec.c
similarity index 100%
rename from src/emu/cpu/nec/nec.c
rename to src/devices/cpu/nec/nec.c
diff --git a/src/emu/cpu/nec/nec.h b/src/devices/cpu/nec/nec.h
similarity index 100%
rename from src/emu/cpu/nec/nec.h
rename to src/devices/cpu/nec/nec.h
diff --git a/src/emu/cpu/nec/necdasm.c b/src/devices/cpu/nec/necdasm.c
similarity index 100%
rename from src/emu/cpu/nec/necdasm.c
rename to src/devices/cpu/nec/necdasm.c
diff --git a/src/emu/cpu/nec/necea.h b/src/devices/cpu/nec/necea.h
similarity index 100%
rename from src/emu/cpu/nec/necea.h
rename to src/devices/cpu/nec/necea.h
diff --git a/src/emu/cpu/nec/necinstr.h b/src/devices/cpu/nec/necinstr.h
similarity index 100%
rename from src/emu/cpu/nec/necinstr.h
rename to src/devices/cpu/nec/necinstr.h
diff --git a/src/emu/cpu/nec/necinstr.inc b/src/devices/cpu/nec/necinstr.inc
similarity index 100%
rename from src/emu/cpu/nec/necinstr.inc
rename to src/devices/cpu/nec/necinstr.inc
diff --git a/src/emu/cpu/nec/necmacro.h b/src/devices/cpu/nec/necmacro.h
similarity index 100%
rename from src/emu/cpu/nec/necmacro.h
rename to src/devices/cpu/nec/necmacro.h
diff --git a/src/emu/cpu/nec/necmodrm.h b/src/devices/cpu/nec/necmodrm.h
similarity index 100%
rename from src/emu/cpu/nec/necmodrm.h
rename to src/devices/cpu/nec/necmodrm.h
diff --git a/src/emu/cpu/nec/necpriv.h b/src/devices/cpu/nec/necpriv.h
similarity index 100%
rename from src/emu/cpu/nec/necpriv.h
rename to src/devices/cpu/nec/necpriv.h
diff --git a/src/emu/cpu/nec/v25.c b/src/devices/cpu/nec/v25.c
similarity index 100%
rename from src/emu/cpu/nec/v25.c
rename to src/devices/cpu/nec/v25.c
diff --git a/src/emu/cpu/nec/v25.h b/src/devices/cpu/nec/v25.h
similarity index 100%
rename from src/emu/cpu/nec/v25.h
rename to src/devices/cpu/nec/v25.h
diff --git a/src/emu/cpu/nec/v25instr.h b/src/devices/cpu/nec/v25instr.h
similarity index 100%
rename from src/emu/cpu/nec/v25instr.h
rename to src/devices/cpu/nec/v25instr.h
diff --git a/src/emu/cpu/nec/v25instr.inc b/src/devices/cpu/nec/v25instr.inc
similarity index 100%
rename from src/emu/cpu/nec/v25instr.inc
rename to src/devices/cpu/nec/v25instr.inc
diff --git a/src/emu/cpu/nec/v25priv.h b/src/devices/cpu/nec/v25priv.h
similarity index 100%
rename from src/emu/cpu/nec/v25priv.h
rename to src/devices/cpu/nec/v25priv.h
diff --git a/src/emu/cpu/nec/v25sfr.c b/src/devices/cpu/nec/v25sfr.c
similarity index 100%
rename from src/emu/cpu/nec/v25sfr.c
rename to src/devices/cpu/nec/v25sfr.c
diff --git a/src/emu/cpu/nec/v53.c b/src/devices/cpu/nec/v53.c
similarity index 100%
rename from src/emu/cpu/nec/v53.c
rename to src/devices/cpu/nec/v53.c
diff --git a/src/emu/cpu/nec/v53.h b/src/devices/cpu/nec/v53.h
similarity index 100%
rename from src/emu/cpu/nec/v53.h
rename to src/devices/cpu/nec/v53.h
diff --git a/src/emu/cpu/pdp1/pdp1.c b/src/devices/cpu/pdp1/pdp1.c
similarity index 100%
rename from src/emu/cpu/pdp1/pdp1.c
rename to src/devices/cpu/pdp1/pdp1.c
diff --git a/src/emu/cpu/pdp1/pdp1.h b/src/devices/cpu/pdp1/pdp1.h
similarity index 100%
rename from src/emu/cpu/pdp1/pdp1.h
rename to src/devices/cpu/pdp1/pdp1.h
diff --git a/src/emu/cpu/pdp1/pdp1dasm.c b/src/devices/cpu/pdp1/pdp1dasm.c
similarity index 100%
rename from src/emu/cpu/pdp1/pdp1dasm.c
rename to src/devices/cpu/pdp1/pdp1dasm.c
diff --git a/src/emu/cpu/pdp1/tx0.c b/src/devices/cpu/pdp1/tx0.c
similarity index 100%
rename from src/emu/cpu/pdp1/tx0.c
rename to src/devices/cpu/pdp1/tx0.c
diff --git a/src/emu/cpu/pdp1/tx0.h b/src/devices/cpu/pdp1/tx0.h
similarity index 100%
rename from src/emu/cpu/pdp1/tx0.h
rename to src/devices/cpu/pdp1/tx0.h
diff --git a/src/emu/cpu/pdp1/tx0dasm.c b/src/devices/cpu/pdp1/tx0dasm.c
similarity index 100%
rename from src/emu/cpu/pdp1/tx0dasm.c
rename to src/devices/cpu/pdp1/tx0dasm.c
diff --git a/src/emu/cpu/pdp8/pdp8.c b/src/devices/cpu/pdp8/pdp8.c
similarity index 100%
rename from src/emu/cpu/pdp8/pdp8.c
rename to src/devices/cpu/pdp8/pdp8.c
diff --git a/src/emu/cpu/pdp8/pdp8.h b/src/devices/cpu/pdp8/pdp8.h
similarity index 100%
rename from src/emu/cpu/pdp8/pdp8.h
rename to src/devices/cpu/pdp8/pdp8.h
diff --git a/src/emu/cpu/pdp8/pdp8dasm.c b/src/devices/cpu/pdp8/pdp8dasm.c
similarity index 100%
rename from src/emu/cpu/pdp8/pdp8dasm.c
rename to src/devices/cpu/pdp8/pdp8dasm.c
diff --git a/src/emu/cpu/pic16c5x/16c5xdsm.c b/src/devices/cpu/pic16c5x/16c5xdsm.c
similarity index 100%
rename from src/emu/cpu/pic16c5x/16c5xdsm.c
rename to src/devices/cpu/pic16c5x/16c5xdsm.c
diff --git a/src/emu/cpu/pic16c5x/dis16c5x.c b/src/devices/cpu/pic16c5x/dis16c5x.c
similarity index 100%
rename from src/emu/cpu/pic16c5x/dis16c5x.c
rename to src/devices/cpu/pic16c5x/dis16c5x.c
diff --git a/src/emu/cpu/pic16c5x/pic16c5x.c b/src/devices/cpu/pic16c5x/pic16c5x.c
similarity index 100%
rename from src/emu/cpu/pic16c5x/pic16c5x.c
rename to src/devices/cpu/pic16c5x/pic16c5x.c
diff --git a/src/emu/cpu/pic16c5x/pic16c5x.h b/src/devices/cpu/pic16c5x/pic16c5x.h
similarity index 100%
rename from src/emu/cpu/pic16c5x/pic16c5x.h
rename to src/devices/cpu/pic16c5x/pic16c5x.h
diff --git a/src/emu/cpu/pic16c62x/16c62xdsm.c b/src/devices/cpu/pic16c62x/16c62xdsm.c
similarity index 100%
rename from src/emu/cpu/pic16c62x/16c62xdsm.c
rename to src/devices/cpu/pic16c62x/16c62xdsm.c
diff --git a/src/emu/cpu/pic16c62x/dis16c62x.c b/src/devices/cpu/pic16c62x/dis16c62x.c
similarity index 100%
rename from src/emu/cpu/pic16c62x/dis16c62x.c
rename to src/devices/cpu/pic16c62x/dis16c62x.c
diff --git a/src/emu/cpu/pic16c62x/pic16c62x.c b/src/devices/cpu/pic16c62x/pic16c62x.c
similarity index 100%
rename from src/emu/cpu/pic16c62x/pic16c62x.c
rename to src/devices/cpu/pic16c62x/pic16c62x.c
diff --git a/src/emu/cpu/pic16c62x/pic16c62x.h b/src/devices/cpu/pic16c62x/pic16c62x.h
similarity index 100%
rename from src/emu/cpu/pic16c62x/pic16c62x.h
rename to src/devices/cpu/pic16c62x/pic16c62x.h
diff --git a/src/emu/cpu/powerpc/drc_ops.c b/src/devices/cpu/powerpc/drc_ops.c
similarity index 100%
rename from src/emu/cpu/powerpc/drc_ops.c
rename to src/devices/cpu/powerpc/drc_ops.c
diff --git a/src/emu/cpu/powerpc/drc_ops.h b/src/devices/cpu/powerpc/drc_ops.h
similarity index 100%
rename from src/emu/cpu/powerpc/drc_ops.h
rename to src/devices/cpu/powerpc/drc_ops.h
diff --git a/src/emu/cpu/powerpc/ppc.c b/src/devices/cpu/powerpc/ppc.c
similarity index 100%
rename from src/emu/cpu/powerpc/ppc.c
rename to src/devices/cpu/powerpc/ppc.c
diff --git a/src/emu/cpu/powerpc/ppc.h b/src/devices/cpu/powerpc/ppc.h
similarity index 100%
rename from src/emu/cpu/powerpc/ppc.h
rename to src/devices/cpu/powerpc/ppc.h
diff --git a/src/emu/cpu/powerpc/ppc403.inc b/src/devices/cpu/powerpc/ppc403.inc
similarity index 100%
rename from src/emu/cpu/powerpc/ppc403.inc
rename to src/devices/cpu/powerpc/ppc403.inc
diff --git a/src/emu/cpu/powerpc/ppc602.inc b/src/devices/cpu/powerpc/ppc602.inc
similarity index 100%
rename from src/emu/cpu/powerpc/ppc602.inc
rename to src/devices/cpu/powerpc/ppc602.inc
diff --git a/src/emu/cpu/powerpc/ppc603.inc b/src/devices/cpu/powerpc/ppc603.inc
similarity index 100%
rename from src/emu/cpu/powerpc/ppc603.inc
rename to src/devices/cpu/powerpc/ppc603.inc
diff --git a/src/emu/cpu/powerpc/ppc_dasm.c b/src/devices/cpu/powerpc/ppc_dasm.c
similarity index 100%
rename from src/emu/cpu/powerpc/ppc_dasm.c
rename to src/devices/cpu/powerpc/ppc_dasm.c
diff --git a/src/emu/cpu/powerpc/ppc_mem.inc b/src/devices/cpu/powerpc/ppc_mem.inc
similarity index 100%
rename from src/emu/cpu/powerpc/ppc_mem.inc
rename to src/devices/cpu/powerpc/ppc_mem.inc
diff --git a/src/emu/cpu/powerpc/ppc_ops.h b/src/devices/cpu/powerpc/ppc_ops.h
similarity index 100%
rename from src/emu/cpu/powerpc/ppc_ops.h
rename to src/devices/cpu/powerpc/ppc_ops.h
diff --git a/src/emu/cpu/powerpc/ppc_ops.inc b/src/devices/cpu/powerpc/ppc_ops.inc
similarity index 100%
rename from src/emu/cpu/powerpc/ppc_ops.inc
rename to src/devices/cpu/powerpc/ppc_ops.inc
diff --git a/src/emu/cpu/powerpc/ppccom.c b/src/devices/cpu/powerpc/ppccom.c
similarity index 100%
rename from src/emu/cpu/powerpc/ppccom.c
rename to src/devices/cpu/powerpc/ppccom.c
diff --git a/src/emu/cpu/powerpc/ppccom.h b/src/devices/cpu/powerpc/ppccom.h
similarity index 100%
rename from src/emu/cpu/powerpc/ppccom.h
rename to src/devices/cpu/powerpc/ppccom.h
diff --git a/src/emu/cpu/powerpc/ppcdrc.c b/src/devices/cpu/powerpc/ppcdrc.c
similarity index 100%
rename from src/emu/cpu/powerpc/ppcdrc.c
rename to src/devices/cpu/powerpc/ppcdrc.c
diff --git a/src/emu/cpu/powerpc/ppcfe.c b/src/devices/cpu/powerpc/ppcfe.c
similarity index 100%
rename from src/emu/cpu/powerpc/ppcfe.c
rename to src/devices/cpu/powerpc/ppcfe.c
diff --git a/src/emu/cpu/powerpc/ppcfe.h b/src/devices/cpu/powerpc/ppcfe.h
similarity index 100%
rename from src/emu/cpu/powerpc/ppcfe.h
rename to src/devices/cpu/powerpc/ppcfe.h
diff --git a/src/emu/cpu/pps4/pps4.c b/src/devices/cpu/pps4/pps4.c
similarity index 100%
rename from src/emu/cpu/pps4/pps4.c
rename to src/devices/cpu/pps4/pps4.c
diff --git a/src/emu/cpu/pps4/pps4.h b/src/devices/cpu/pps4/pps4.h
similarity index 100%
rename from src/emu/cpu/pps4/pps4.h
rename to src/devices/cpu/pps4/pps4.h
diff --git a/src/emu/cpu/pps4/pps4dasm.c b/src/devices/cpu/pps4/pps4dasm.c
similarity index 100%
rename from src/emu/cpu/pps4/pps4dasm.c
rename to src/devices/cpu/pps4/pps4dasm.c
diff --git a/src/emu/cpu/psx/dismips.c b/src/devices/cpu/psx/dismips.c
similarity index 100%
rename from src/emu/cpu/psx/dismips.c
rename to src/devices/cpu/psx/dismips.c
diff --git a/src/emu/cpu/psx/dismips.mak b/src/devices/cpu/psx/dismips.mak
similarity index 100%
rename from src/emu/cpu/psx/dismips.mak
rename to src/devices/cpu/psx/dismips.mak
diff --git a/src/emu/cpu/psx/dma.c b/src/devices/cpu/psx/dma.c
similarity index 100%
rename from src/emu/cpu/psx/dma.c
rename to src/devices/cpu/psx/dma.c
diff --git a/src/emu/cpu/psx/dma.h b/src/devices/cpu/psx/dma.h
similarity index 100%
rename from src/emu/cpu/psx/dma.h
rename to src/devices/cpu/psx/dma.h
diff --git a/src/emu/cpu/psx/gte.c b/src/devices/cpu/psx/gte.c
similarity index 100%
rename from src/emu/cpu/psx/gte.c
rename to src/devices/cpu/psx/gte.c
diff --git a/src/emu/cpu/psx/gte.h b/src/devices/cpu/psx/gte.h
similarity index 100%
rename from src/emu/cpu/psx/gte.h
rename to src/devices/cpu/psx/gte.h
diff --git a/src/emu/cpu/psx/irq.c b/src/devices/cpu/psx/irq.c
similarity index 100%
rename from src/emu/cpu/psx/irq.c
rename to src/devices/cpu/psx/irq.c
diff --git a/src/emu/cpu/psx/irq.h b/src/devices/cpu/psx/irq.h
similarity index 100%
rename from src/emu/cpu/psx/irq.h
rename to src/devices/cpu/psx/irq.h
diff --git a/src/emu/cpu/psx/mdec.c b/src/devices/cpu/psx/mdec.c
similarity index 100%
rename from src/emu/cpu/psx/mdec.c
rename to src/devices/cpu/psx/mdec.c
diff --git a/src/emu/cpu/psx/mdec.h b/src/devices/cpu/psx/mdec.h
similarity index 100%
rename from src/emu/cpu/psx/mdec.h
rename to src/devices/cpu/psx/mdec.h
diff --git a/src/emu/cpu/psx/psx.c b/src/devices/cpu/psx/psx.c
similarity index 100%
rename from src/emu/cpu/psx/psx.c
rename to src/devices/cpu/psx/psx.c
diff --git a/src/emu/cpu/psx/psx.h b/src/devices/cpu/psx/psx.h
similarity index 100%
rename from src/emu/cpu/psx/psx.h
rename to src/devices/cpu/psx/psx.h
diff --git a/src/emu/cpu/psx/psxdasm.c b/src/devices/cpu/psx/psxdasm.c
similarity index 100%
rename from src/emu/cpu/psx/psxdasm.c
rename to src/devices/cpu/psx/psxdasm.c
diff --git a/src/emu/cpu/psx/rcnt.c b/src/devices/cpu/psx/rcnt.c
similarity index 100%
rename from src/emu/cpu/psx/rcnt.c
rename to src/devices/cpu/psx/rcnt.c
diff --git a/src/emu/cpu/psx/rcnt.h b/src/devices/cpu/psx/rcnt.h
similarity index 100%
rename from src/emu/cpu/psx/rcnt.h
rename to src/devices/cpu/psx/rcnt.h
diff --git a/src/emu/cpu/psx/sio.c b/src/devices/cpu/psx/sio.c
similarity index 100%
rename from src/emu/cpu/psx/sio.c
rename to src/devices/cpu/psx/sio.c
diff --git a/src/emu/cpu/psx/sio.h b/src/devices/cpu/psx/sio.h
similarity index 100%
rename from src/emu/cpu/psx/sio.h
rename to src/devices/cpu/psx/sio.h
diff --git a/src/emu/cpu/rsp/clamp.h b/src/devices/cpu/rsp/clamp.h
similarity index 100%
rename from src/emu/cpu/rsp/clamp.h
rename to src/devices/cpu/rsp/clamp.h
diff --git a/src/emu/cpu/rsp/rsp.c b/src/devices/cpu/rsp/rsp.c
similarity index 100%
rename from src/emu/cpu/rsp/rsp.c
rename to src/devices/cpu/rsp/rsp.c
diff --git a/src/emu/cpu/rsp/rsp.h b/src/devices/cpu/rsp/rsp.h
similarity index 100%
rename from src/emu/cpu/rsp/rsp.h
rename to src/devices/cpu/rsp/rsp.h
diff --git a/src/emu/cpu/rsp/rsp_dasm.c b/src/devices/cpu/rsp/rsp_dasm.c
similarity index 100%
rename from src/emu/cpu/rsp/rsp_dasm.c
rename to src/devices/cpu/rsp/rsp_dasm.c
diff --git a/src/emu/cpu/rsp/rspcp2.c b/src/devices/cpu/rsp/rspcp2.c
similarity index 100%
rename from src/emu/cpu/rsp/rspcp2.c
rename to src/devices/cpu/rsp/rspcp2.c
diff --git a/src/emu/cpu/rsp/rspcp2.h b/src/devices/cpu/rsp/rspcp2.h
similarity index 100%
rename from src/emu/cpu/rsp/rspcp2.h
rename to src/devices/cpu/rsp/rspcp2.h
diff --git a/src/emu/cpu/rsp/rspcp2d.c b/src/devices/cpu/rsp/rspcp2d.c
similarity index 100%
rename from src/emu/cpu/rsp/rspcp2d.c
rename to src/devices/cpu/rsp/rspcp2d.c
diff --git a/src/emu/cpu/rsp/rspcp2d.h b/src/devices/cpu/rsp/rspcp2d.h
similarity index 100%
rename from src/emu/cpu/rsp/rspcp2d.h
rename to src/devices/cpu/rsp/rspcp2d.h
diff --git a/src/emu/cpu/rsp/rspdiv.h b/src/devices/cpu/rsp/rspdiv.h
similarity index 100%
rename from src/emu/cpu/rsp/rspdiv.h
rename to src/devices/cpu/rsp/rspdiv.h
diff --git a/src/emu/cpu/rsp/rspdrc.c b/src/devices/cpu/rsp/rspdrc.c
similarity index 100%
rename from src/emu/cpu/rsp/rspdrc.c
rename to src/devices/cpu/rsp/rspdrc.c
diff --git a/src/emu/cpu/rsp/rspfe.c b/src/devices/cpu/rsp/rspfe.c
similarity index 100%
rename from src/emu/cpu/rsp/rspfe.c
rename to src/devices/cpu/rsp/rspfe.c
diff --git a/src/emu/cpu/rsp/rspfe.h b/src/devices/cpu/rsp/rspfe.h
similarity index 100%
rename from src/emu/cpu/rsp/rspfe.h
rename to src/devices/cpu/rsp/rspfe.h
diff --git a/src/emu/cpu/rsp/vabs.h b/src/devices/cpu/rsp/vabs.h
similarity index 100%
rename from src/emu/cpu/rsp/vabs.h
rename to src/devices/cpu/rsp/vabs.h
diff --git a/src/emu/cpu/rsp/vadd.h b/src/devices/cpu/rsp/vadd.h
similarity index 100%
rename from src/emu/cpu/rsp/vadd.h
rename to src/devices/cpu/rsp/vadd.h
diff --git a/src/emu/cpu/rsp/vaddc.h b/src/devices/cpu/rsp/vaddc.h
similarity index 100%
rename from src/emu/cpu/rsp/vaddc.h
rename to src/devices/cpu/rsp/vaddc.h
diff --git a/src/emu/cpu/rsp/vand.h b/src/devices/cpu/rsp/vand.h
similarity index 100%
rename from src/emu/cpu/rsp/vand.h
rename to src/devices/cpu/rsp/vand.h
diff --git a/src/emu/cpu/rsp/vch.h b/src/devices/cpu/rsp/vch.h
similarity index 100%
rename from src/emu/cpu/rsp/vch.h
rename to src/devices/cpu/rsp/vch.h
diff --git a/src/emu/cpu/rsp/vcl.h b/src/devices/cpu/rsp/vcl.h
similarity index 100%
rename from src/emu/cpu/rsp/vcl.h
rename to src/devices/cpu/rsp/vcl.h
diff --git a/src/emu/cpu/rsp/vcmp.h b/src/devices/cpu/rsp/vcmp.h
similarity index 100%
rename from src/emu/cpu/rsp/vcmp.h
rename to src/devices/cpu/rsp/vcmp.h
diff --git a/src/emu/cpu/rsp/vcr.h b/src/devices/cpu/rsp/vcr.h
similarity index 100%
rename from src/emu/cpu/rsp/vcr.h
rename to src/devices/cpu/rsp/vcr.h
diff --git a/src/emu/cpu/rsp/vdivh.h b/src/devices/cpu/rsp/vdivh.h
similarity index 100%
rename from src/emu/cpu/rsp/vdivh.h
rename to src/devices/cpu/rsp/vdivh.h
diff --git a/src/emu/cpu/rsp/vldst.h b/src/devices/cpu/rsp/vldst.h
similarity index 100%
rename from src/emu/cpu/rsp/vldst.h
rename to src/devices/cpu/rsp/vldst.h
diff --git a/src/emu/cpu/rsp/vmac.h b/src/devices/cpu/rsp/vmac.h
similarity index 100%
rename from src/emu/cpu/rsp/vmac.h
rename to src/devices/cpu/rsp/vmac.h
diff --git a/src/emu/cpu/rsp/vmov.h b/src/devices/cpu/rsp/vmov.h
similarity index 100%
rename from src/emu/cpu/rsp/vmov.h
rename to src/devices/cpu/rsp/vmov.h
diff --git a/src/emu/cpu/rsp/vmrg.h b/src/devices/cpu/rsp/vmrg.h
similarity index 100%
rename from src/emu/cpu/rsp/vmrg.h
rename to src/devices/cpu/rsp/vmrg.h
diff --git a/src/emu/cpu/rsp/vmudh.h b/src/devices/cpu/rsp/vmudh.h
similarity index 100%
rename from src/emu/cpu/rsp/vmudh.h
rename to src/devices/cpu/rsp/vmudh.h
diff --git a/src/emu/cpu/rsp/vmul.h b/src/devices/cpu/rsp/vmul.h
similarity index 100%
rename from src/emu/cpu/rsp/vmul.h
rename to src/devices/cpu/rsp/vmul.h
diff --git a/src/emu/cpu/rsp/vmulh.h b/src/devices/cpu/rsp/vmulh.h
similarity index 100%
rename from src/emu/cpu/rsp/vmulh.h
rename to src/devices/cpu/rsp/vmulh.h
diff --git a/src/emu/cpu/rsp/vmull.h b/src/devices/cpu/rsp/vmull.h
similarity index 100%
rename from src/emu/cpu/rsp/vmull.h
rename to src/devices/cpu/rsp/vmull.h
diff --git a/src/emu/cpu/rsp/vmulm.h b/src/devices/cpu/rsp/vmulm.h
similarity index 100%
rename from src/emu/cpu/rsp/vmulm.h
rename to src/devices/cpu/rsp/vmulm.h
diff --git a/src/emu/cpu/rsp/vmuln.h b/src/devices/cpu/rsp/vmuln.h
similarity index 100%
rename from src/emu/cpu/rsp/vmuln.h
rename to src/devices/cpu/rsp/vmuln.h
diff --git a/src/emu/cpu/rsp/vor.h b/src/devices/cpu/rsp/vor.h
similarity index 100%
rename from src/emu/cpu/rsp/vor.h
rename to src/devices/cpu/rsp/vor.h
diff --git a/src/emu/cpu/rsp/vrcpsq.h b/src/devices/cpu/rsp/vrcpsq.h
similarity index 100%
rename from src/emu/cpu/rsp/vrcpsq.h
rename to src/devices/cpu/rsp/vrcpsq.h
diff --git a/src/emu/cpu/rsp/vrsq.h b/src/devices/cpu/rsp/vrsq.h
similarity index 100%
rename from src/emu/cpu/rsp/vrsq.h
rename to src/devices/cpu/rsp/vrsq.h
diff --git a/src/emu/cpu/rsp/vsub.h b/src/devices/cpu/rsp/vsub.h
similarity index 100%
rename from src/emu/cpu/rsp/vsub.h
rename to src/devices/cpu/rsp/vsub.h
diff --git a/src/emu/cpu/rsp/vsubc.h b/src/devices/cpu/rsp/vsubc.h
similarity index 100%
rename from src/emu/cpu/rsp/vsubc.h
rename to src/devices/cpu/rsp/vsubc.h
diff --git a/src/emu/cpu/rsp/vxor.h b/src/devices/cpu/rsp/vxor.h
similarity index 100%
rename from src/emu/cpu/rsp/vxor.h
rename to src/devices/cpu/rsp/vxor.h
diff --git a/src/emu/cpu/s2650/2650dasm.c b/src/devices/cpu/s2650/2650dasm.c
similarity index 100%
rename from src/emu/cpu/s2650/2650dasm.c
rename to src/devices/cpu/s2650/2650dasm.c
diff --git a/src/emu/cpu/s2650/s2650.c b/src/devices/cpu/s2650/s2650.c
similarity index 100%
rename from src/emu/cpu/s2650/s2650.c
rename to src/devices/cpu/s2650/s2650.c
diff --git a/src/emu/cpu/s2650/s2650.h b/src/devices/cpu/s2650/s2650.h
similarity index 100%
rename from src/emu/cpu/s2650/s2650.h
rename to src/devices/cpu/s2650/s2650.h
diff --git a/src/emu/cpu/s2650/s2650cpu.h b/src/devices/cpu/s2650/s2650cpu.h
similarity index 100%
rename from src/emu/cpu/s2650/s2650cpu.h
rename to src/devices/cpu/s2650/s2650cpu.h
diff --git a/src/emu/cpu/saturn/satops.inc b/src/devices/cpu/saturn/satops.inc
similarity index 100%
rename from src/emu/cpu/saturn/satops.inc
rename to src/devices/cpu/saturn/satops.inc
diff --git a/src/emu/cpu/saturn/sattable.inc b/src/devices/cpu/saturn/sattable.inc
similarity index 100%
rename from src/emu/cpu/saturn/sattable.inc
rename to src/devices/cpu/saturn/sattable.inc
diff --git a/src/emu/cpu/saturn/saturn.c b/src/devices/cpu/saturn/saturn.c
similarity index 100%
rename from src/emu/cpu/saturn/saturn.c
rename to src/devices/cpu/saturn/saturn.c
diff --git a/src/emu/cpu/saturn/saturn.h b/src/devices/cpu/saturn/saturn.h
similarity index 100%
rename from src/emu/cpu/saturn/saturn.h
rename to src/devices/cpu/saturn/saturn.h
diff --git a/src/emu/cpu/saturn/saturnds.c b/src/devices/cpu/saturn/saturnds.c
similarity index 100%
rename from src/emu/cpu/saturn/saturnds.c
rename to src/devices/cpu/saturn/saturnds.c
diff --git a/src/emu/cpu/sc61860/readpc.c b/src/devices/cpu/sc61860/readpc.c
similarity index 100%
rename from src/emu/cpu/sc61860/readpc.c
rename to src/devices/cpu/sc61860/readpc.c
diff --git a/src/emu/cpu/sc61860/sc61860.c b/src/devices/cpu/sc61860/sc61860.c
similarity index 100%
rename from src/emu/cpu/sc61860/sc61860.c
rename to src/devices/cpu/sc61860/sc61860.c
diff --git a/src/emu/cpu/sc61860/sc61860.h b/src/devices/cpu/sc61860/sc61860.h
similarity index 100%
rename from src/emu/cpu/sc61860/sc61860.h
rename to src/devices/cpu/sc61860/sc61860.h
diff --git a/src/emu/cpu/sc61860/scdasm.c b/src/devices/cpu/sc61860/scdasm.c
similarity index 100%
rename from src/emu/cpu/sc61860/scdasm.c
rename to src/devices/cpu/sc61860/scdasm.c
diff --git a/src/emu/cpu/sc61860/scops.inc b/src/devices/cpu/sc61860/scops.inc
similarity index 100%
rename from src/emu/cpu/sc61860/scops.inc
rename to src/devices/cpu/sc61860/scops.inc
diff --git a/src/emu/cpu/sc61860/sctable.inc b/src/devices/cpu/sc61860/sctable.inc
similarity index 100%
rename from src/emu/cpu/sc61860/sctable.inc
rename to src/devices/cpu/sc61860/sctable.inc
diff --git a/src/emu/cpu/scmp/scmp.c b/src/devices/cpu/scmp/scmp.c
similarity index 100%
rename from src/emu/cpu/scmp/scmp.c
rename to src/devices/cpu/scmp/scmp.c
diff --git a/src/emu/cpu/scmp/scmp.h b/src/devices/cpu/scmp/scmp.h
similarity index 100%
rename from src/emu/cpu/scmp/scmp.h
rename to src/devices/cpu/scmp/scmp.h
diff --git a/src/emu/cpu/scmp/scmpdasm.c b/src/devices/cpu/scmp/scmpdasm.c
similarity index 100%
rename from src/emu/cpu/scmp/scmpdasm.c
rename to src/devices/cpu/scmp/scmpdasm.c
diff --git a/src/emu/cpu/score/score.c b/src/devices/cpu/score/score.c
similarity index 100%
rename from src/emu/cpu/score/score.c
rename to src/devices/cpu/score/score.c
diff --git a/src/emu/cpu/score/score.h b/src/devices/cpu/score/score.h
similarity index 100%
rename from src/emu/cpu/score/score.h
rename to src/devices/cpu/score/score.h
diff --git a/src/emu/cpu/score/scoredsm.c b/src/devices/cpu/score/scoredsm.c
similarity index 100%
rename from src/emu/cpu/score/scoredsm.c
rename to src/devices/cpu/score/scoredsm.c
diff --git a/src/emu/cpu/score/scorem.h b/src/devices/cpu/score/scorem.h
similarity index 100%
rename from src/emu/cpu/score/scorem.h
rename to src/devices/cpu/score/scorem.h
diff --git a/src/emu/cpu/scudsp/scudsp.c b/src/devices/cpu/scudsp/scudsp.c
similarity index 100%
rename from src/emu/cpu/scudsp/scudsp.c
rename to src/devices/cpu/scudsp/scudsp.c
diff --git a/src/emu/cpu/scudsp/scudsp.h b/src/devices/cpu/scudsp/scudsp.h
similarity index 100%
rename from src/emu/cpu/scudsp/scudsp.h
rename to src/devices/cpu/scudsp/scudsp.h
diff --git a/src/emu/cpu/scudsp/scudspdasm.c b/src/devices/cpu/scudsp/scudspdasm.c
similarity index 100%
rename from src/emu/cpu/scudsp/scudspdasm.c
rename to src/devices/cpu/scudsp/scudspdasm.c
diff --git a/src/emu/cpu/se3208/se3208.c b/src/devices/cpu/se3208/se3208.c
similarity index 100%
rename from src/emu/cpu/se3208/se3208.c
rename to src/devices/cpu/se3208/se3208.c
diff --git a/src/emu/cpu/se3208/se3208.h b/src/devices/cpu/se3208/se3208.h
similarity index 100%
rename from src/emu/cpu/se3208/se3208.h
rename to src/devices/cpu/se3208/se3208.h
diff --git a/src/emu/cpu/se3208/se3208dis.c b/src/devices/cpu/se3208/se3208dis.c
similarity index 100%
rename from src/emu/cpu/se3208/se3208dis.c
rename to src/devices/cpu/se3208/se3208dis.c
diff --git a/src/emu/cpu/sh2/sh2.c b/src/devices/cpu/sh2/sh2.c
similarity index 100%
rename from src/emu/cpu/sh2/sh2.c
rename to src/devices/cpu/sh2/sh2.c
diff --git a/src/emu/cpu/sh2/sh2.h b/src/devices/cpu/sh2/sh2.h
similarity index 100%
rename from src/emu/cpu/sh2/sh2.h
rename to src/devices/cpu/sh2/sh2.h
diff --git a/src/emu/cpu/sh2/sh2comn.c b/src/devices/cpu/sh2/sh2comn.c
similarity index 100%
rename from src/emu/cpu/sh2/sh2comn.c
rename to src/devices/cpu/sh2/sh2comn.c
diff --git a/src/emu/cpu/sh2/sh2comn.h b/src/devices/cpu/sh2/sh2comn.h
similarity index 100%
rename from src/emu/cpu/sh2/sh2comn.h
rename to src/devices/cpu/sh2/sh2comn.h
diff --git a/src/emu/cpu/sh2/sh2dasm.c b/src/devices/cpu/sh2/sh2dasm.c
similarity index 100%
rename from src/emu/cpu/sh2/sh2dasm.c
rename to src/devices/cpu/sh2/sh2dasm.c
diff --git a/src/emu/cpu/sh2/sh2drc.c b/src/devices/cpu/sh2/sh2drc.c
similarity index 100%
rename from src/emu/cpu/sh2/sh2drc.c
rename to src/devices/cpu/sh2/sh2drc.c
diff --git a/src/emu/cpu/sh2/sh2fe.c b/src/devices/cpu/sh2/sh2fe.c
similarity index 100%
rename from src/emu/cpu/sh2/sh2fe.c
rename to src/devices/cpu/sh2/sh2fe.c
diff --git a/src/emu/cpu/sh4/sh3comn.c b/src/devices/cpu/sh4/sh3comn.c
similarity index 100%
rename from src/emu/cpu/sh4/sh3comn.c
rename to src/devices/cpu/sh4/sh3comn.c
diff --git a/src/emu/cpu/sh4/sh3comn.h b/src/devices/cpu/sh4/sh3comn.h
similarity index 100%
rename from src/emu/cpu/sh4/sh3comn.h
rename to src/devices/cpu/sh4/sh3comn.h
diff --git a/src/emu/cpu/sh4/sh4.c b/src/devices/cpu/sh4/sh4.c
similarity index 100%
rename from src/emu/cpu/sh4/sh4.c
rename to src/devices/cpu/sh4/sh4.c
diff --git a/src/emu/cpu/sh4/sh4.h b/src/devices/cpu/sh4/sh4.h
similarity index 100%
rename from src/emu/cpu/sh4/sh4.h
rename to src/devices/cpu/sh4/sh4.h
diff --git a/src/emu/cpu/sh4/sh4comn.c b/src/devices/cpu/sh4/sh4comn.c
similarity index 100%
rename from src/emu/cpu/sh4/sh4comn.c
rename to src/devices/cpu/sh4/sh4comn.c
diff --git a/src/emu/cpu/sh4/sh4comn.h b/src/devices/cpu/sh4/sh4comn.h
similarity index 100%
rename from src/emu/cpu/sh4/sh4comn.h
rename to src/devices/cpu/sh4/sh4comn.h
diff --git a/src/emu/cpu/sh4/sh4dasm.c b/src/devices/cpu/sh4/sh4dasm.c
similarity index 100%
rename from src/emu/cpu/sh4/sh4dasm.c
rename to src/devices/cpu/sh4/sh4dasm.c
diff --git a/src/emu/cpu/sh4/sh4dmac.c b/src/devices/cpu/sh4/sh4dmac.c
similarity index 100%
rename from src/emu/cpu/sh4/sh4dmac.c
rename to src/devices/cpu/sh4/sh4dmac.c
diff --git a/src/emu/cpu/sh4/sh4dmac.h b/src/devices/cpu/sh4/sh4dmac.h
similarity index 100%
rename from src/emu/cpu/sh4/sh4dmac.h
rename to src/devices/cpu/sh4/sh4dmac.h
diff --git a/src/emu/cpu/sh4/sh4regs.h b/src/devices/cpu/sh4/sh4regs.h
similarity index 100%
rename from src/emu/cpu/sh4/sh4regs.h
rename to src/devices/cpu/sh4/sh4regs.h
diff --git a/src/emu/cpu/sh4/sh4tmu.c b/src/devices/cpu/sh4/sh4tmu.c
similarity index 100%
rename from src/emu/cpu/sh4/sh4tmu.c
rename to src/devices/cpu/sh4/sh4tmu.c
diff --git a/src/emu/cpu/sh4/sh4tmu.h b/src/devices/cpu/sh4/sh4tmu.h
similarity index 100%
rename from src/emu/cpu/sh4/sh4tmu.h
rename to src/devices/cpu/sh4/sh4tmu.h
diff --git a/src/emu/cpu/sharc/compute.inc b/src/devices/cpu/sharc/compute.inc
similarity index 100%
rename from src/emu/cpu/sharc/compute.inc
rename to src/devices/cpu/sharc/compute.inc
diff --git a/src/emu/cpu/sharc/sharc.c b/src/devices/cpu/sharc/sharc.c
similarity index 100%
rename from src/emu/cpu/sharc/sharc.c
rename to src/devices/cpu/sharc/sharc.c
diff --git a/src/emu/cpu/sharc/sharc.h b/src/devices/cpu/sharc/sharc.h
similarity index 100%
rename from src/emu/cpu/sharc/sharc.h
rename to src/devices/cpu/sharc/sharc.h
diff --git a/src/emu/cpu/sharc/sharcdma.inc b/src/devices/cpu/sharc/sharcdma.inc
similarity index 100%
rename from src/emu/cpu/sharc/sharcdma.inc
rename to src/devices/cpu/sharc/sharcdma.inc
diff --git a/src/emu/cpu/sharc/sharcdsm.c b/src/devices/cpu/sharc/sharcdsm.c
similarity index 100%
rename from src/emu/cpu/sharc/sharcdsm.c
rename to src/devices/cpu/sharc/sharcdsm.c
diff --git a/src/emu/cpu/sharc/sharcdsm.h b/src/devices/cpu/sharc/sharcdsm.h
similarity index 100%
rename from src/emu/cpu/sharc/sharcdsm.h
rename to src/devices/cpu/sharc/sharcdsm.h
diff --git a/src/emu/cpu/sharc/sharcmem.inc b/src/devices/cpu/sharc/sharcmem.inc
similarity index 100%
rename from src/emu/cpu/sharc/sharcmem.inc
rename to src/devices/cpu/sharc/sharcmem.inc
diff --git a/src/emu/cpu/sharc/sharcops.h b/src/devices/cpu/sharc/sharcops.h
similarity index 100%
rename from src/emu/cpu/sharc/sharcops.h
rename to src/devices/cpu/sharc/sharcops.h
diff --git a/src/emu/cpu/sharc/sharcops.inc b/src/devices/cpu/sharc/sharcops.inc
similarity index 100%
rename from src/emu/cpu/sharc/sharcops.inc
rename to src/devices/cpu/sharc/sharcops.inc
diff --git a/src/emu/cpu/sm510/sm510.c b/src/devices/cpu/sm510/sm510.c
similarity index 100%
rename from src/emu/cpu/sm510/sm510.c
rename to src/devices/cpu/sm510/sm510.c
diff --git a/src/emu/cpu/sm510/sm510.h b/src/devices/cpu/sm510/sm510.h
similarity index 100%
rename from src/emu/cpu/sm510/sm510.h
rename to src/devices/cpu/sm510/sm510.h
diff --git a/src/emu/cpu/sm510/sm510core.c b/src/devices/cpu/sm510/sm510core.c
similarity index 100%
rename from src/emu/cpu/sm510/sm510core.c
rename to src/devices/cpu/sm510/sm510core.c
diff --git a/src/emu/cpu/sm510/sm510d.c b/src/devices/cpu/sm510/sm510d.c
similarity index 100%
rename from src/emu/cpu/sm510/sm510d.c
rename to src/devices/cpu/sm510/sm510d.c
diff --git a/src/emu/cpu/sm510/sm510op.c b/src/devices/cpu/sm510/sm510op.c
similarity index 100%
rename from src/emu/cpu/sm510/sm510op.c
rename to src/devices/cpu/sm510/sm510op.c
diff --git a/src/emu/cpu/sm510/sm511core.c b/src/devices/cpu/sm510/sm511core.c
similarity index 100%
rename from src/emu/cpu/sm510/sm511core.c
rename to src/devices/cpu/sm510/sm511core.c
diff --git a/src/emu/cpu/sm8500/sm8500.c b/src/devices/cpu/sm8500/sm8500.c
similarity index 100%
rename from src/emu/cpu/sm8500/sm8500.c
rename to src/devices/cpu/sm8500/sm8500.c
diff --git a/src/emu/cpu/sm8500/sm8500.h b/src/devices/cpu/sm8500/sm8500.h
similarity index 100%
rename from src/emu/cpu/sm8500/sm8500.h
rename to src/devices/cpu/sm8500/sm8500.h
diff --git a/src/emu/cpu/sm8500/sm8500d.c b/src/devices/cpu/sm8500/sm8500d.c
similarity index 100%
rename from src/emu/cpu/sm8500/sm8500d.c
rename to src/devices/cpu/sm8500/sm8500d.c
diff --git a/src/emu/cpu/sm8500/sm85ops.h b/src/devices/cpu/sm8500/sm85ops.h
similarity index 100%
rename from src/emu/cpu/sm8500/sm85ops.h
rename to src/devices/cpu/sm8500/sm85ops.h
diff --git a/src/emu/cpu/spc700/spc700.c b/src/devices/cpu/spc700/spc700.c
similarity index 100%
rename from src/emu/cpu/spc700/spc700.c
rename to src/devices/cpu/spc700/spc700.c
diff --git a/src/emu/cpu/spc700/spc700.h b/src/devices/cpu/spc700/spc700.h
similarity index 100%
rename from src/emu/cpu/spc700/spc700.h
rename to src/devices/cpu/spc700/spc700.h
diff --git a/src/emu/cpu/spc700/spc700ds.c b/src/devices/cpu/spc700/spc700ds.c
similarity index 100%
rename from src/emu/cpu/spc700/spc700ds.c
rename to src/devices/cpu/spc700/spc700ds.c
diff --git a/src/emu/cpu/spc700/spc700ds.h b/src/devices/cpu/spc700/spc700ds.h
similarity index 100%
rename from src/emu/cpu/spc700/spc700ds.h
rename to src/devices/cpu/spc700/spc700ds.h
diff --git a/src/emu/cpu/ssem/ssem.c b/src/devices/cpu/ssem/ssem.c
similarity index 100%
rename from src/emu/cpu/ssem/ssem.c
rename to src/devices/cpu/ssem/ssem.c
diff --git a/src/emu/cpu/ssem/ssem.h b/src/devices/cpu/ssem/ssem.h
similarity index 100%
rename from src/emu/cpu/ssem/ssem.h
rename to src/devices/cpu/ssem/ssem.h
diff --git a/src/emu/cpu/ssem/ssemdasm.c b/src/devices/cpu/ssem/ssemdasm.c
similarity index 100%
rename from src/emu/cpu/ssem/ssemdasm.c
rename to src/devices/cpu/ssem/ssemdasm.c
diff --git a/src/emu/cpu/ssp1601/ssp1601.c b/src/devices/cpu/ssp1601/ssp1601.c
similarity index 100%
rename from src/emu/cpu/ssp1601/ssp1601.c
rename to src/devices/cpu/ssp1601/ssp1601.c
diff --git a/src/emu/cpu/ssp1601/ssp1601.h b/src/devices/cpu/ssp1601/ssp1601.h
similarity index 100%
rename from src/emu/cpu/ssp1601/ssp1601.h
rename to src/devices/cpu/ssp1601/ssp1601.h
diff --git a/src/emu/cpu/ssp1601/ssp1601d.c b/src/devices/cpu/ssp1601/ssp1601d.c
similarity index 100%
rename from src/emu/cpu/ssp1601/ssp1601d.c
rename to src/devices/cpu/ssp1601/ssp1601d.c
diff --git a/src/emu/cpu/superfx/sfx_dasm.c b/src/devices/cpu/superfx/sfx_dasm.c
similarity index 100%
rename from src/emu/cpu/superfx/sfx_dasm.c
rename to src/devices/cpu/superfx/sfx_dasm.c
diff --git a/src/emu/cpu/superfx/superfx.c b/src/devices/cpu/superfx/superfx.c
similarity index 100%
rename from src/emu/cpu/superfx/superfx.c
rename to src/devices/cpu/superfx/superfx.c
diff --git a/src/emu/cpu/superfx/superfx.h b/src/devices/cpu/superfx/superfx.h
similarity index 100%
rename from src/emu/cpu/superfx/superfx.h
rename to src/devices/cpu/superfx/superfx.h
diff --git a/src/emu/cpu/t11/t11.c b/src/devices/cpu/t11/t11.c
similarity index 100%
rename from src/emu/cpu/t11/t11.c
rename to src/devices/cpu/t11/t11.c
diff --git a/src/emu/cpu/t11/t11.h b/src/devices/cpu/t11/t11.h
similarity index 100%
rename from src/emu/cpu/t11/t11.h
rename to src/devices/cpu/t11/t11.h
diff --git a/src/emu/cpu/t11/t11dasm.c b/src/devices/cpu/t11/t11dasm.c
similarity index 100%
rename from src/emu/cpu/t11/t11dasm.c
rename to src/devices/cpu/t11/t11dasm.c
diff --git a/src/emu/cpu/t11/t11ops.inc b/src/devices/cpu/t11/t11ops.inc
similarity index 100%
rename from src/emu/cpu/t11/t11ops.inc
rename to src/devices/cpu/t11/t11ops.inc
diff --git a/src/emu/cpu/t11/t11table.inc b/src/devices/cpu/t11/t11table.inc
similarity index 100%
rename from src/emu/cpu/t11/t11table.inc
rename to src/devices/cpu/t11/t11table.inc
diff --git a/src/emu/cpu/tlcs90/tlcs90.c b/src/devices/cpu/tlcs90/tlcs90.c
similarity index 100%
rename from src/emu/cpu/tlcs90/tlcs90.c
rename to src/devices/cpu/tlcs90/tlcs90.c
diff --git a/src/emu/cpu/tlcs90/tlcs90.h b/src/devices/cpu/tlcs90/tlcs90.h
similarity index 100%
rename from src/emu/cpu/tlcs90/tlcs90.h
rename to src/devices/cpu/tlcs90/tlcs90.h
diff --git a/src/emu/cpu/tlcs900/900tbl.inc b/src/devices/cpu/tlcs900/900tbl.inc
similarity index 100%
rename from src/emu/cpu/tlcs900/900tbl.inc
rename to src/devices/cpu/tlcs900/900tbl.inc
diff --git a/src/emu/cpu/tlcs900/dasm900.c b/src/devices/cpu/tlcs900/dasm900.c
similarity index 100%
rename from src/emu/cpu/tlcs900/dasm900.c
rename to src/devices/cpu/tlcs900/dasm900.c
diff --git a/src/emu/cpu/tlcs900/tlcs900.c b/src/devices/cpu/tlcs900/tlcs900.c
similarity index 100%
rename from src/emu/cpu/tlcs900/tlcs900.c
rename to src/devices/cpu/tlcs900/tlcs900.c
diff --git a/src/emu/cpu/tlcs900/tlcs900.h b/src/devices/cpu/tlcs900/tlcs900.h
similarity index 100%
rename from src/emu/cpu/tlcs900/tlcs900.h
rename to src/devices/cpu/tlcs900/tlcs900.h
diff --git a/src/emu/cpu/tms0980/tms0980.c b/src/devices/cpu/tms0980/tms0980.c
similarity index 100%
rename from src/emu/cpu/tms0980/tms0980.c
rename to src/devices/cpu/tms0980/tms0980.c
diff --git a/src/emu/cpu/tms0980/tms0980.h b/src/devices/cpu/tms0980/tms0980.h
similarity index 100%
rename from src/emu/cpu/tms0980/tms0980.h
rename to src/devices/cpu/tms0980/tms0980.h
diff --git a/src/emu/cpu/tms0980/tms0980d.c b/src/devices/cpu/tms0980/tms0980d.c
similarity index 100%
rename from src/emu/cpu/tms0980/tms0980d.c
rename to src/devices/cpu/tms0980/tms0980d.c
diff --git a/src/emu/cpu/tms32010/32010dsm.c b/src/devices/cpu/tms32010/32010dsm.c
similarity index 100%
rename from src/emu/cpu/tms32010/32010dsm.c
rename to src/devices/cpu/tms32010/32010dsm.c
diff --git a/src/emu/cpu/tms32010/dis32010.c b/src/devices/cpu/tms32010/dis32010.c
similarity index 100%
rename from src/emu/cpu/tms32010/dis32010.c
rename to src/devices/cpu/tms32010/dis32010.c
diff --git a/src/emu/cpu/tms32010/tms32010.c b/src/devices/cpu/tms32010/tms32010.c
similarity index 100%
rename from src/emu/cpu/tms32010/tms32010.c
rename to src/devices/cpu/tms32010/tms32010.c
diff --git a/src/emu/cpu/tms32010/tms32010.h b/src/devices/cpu/tms32010/tms32010.h
similarity index 100%
rename from src/emu/cpu/tms32010/tms32010.h
rename to src/devices/cpu/tms32010/tms32010.h
diff --git a/src/emu/cpu/tms32025/32025dsm.c b/src/devices/cpu/tms32025/32025dsm.c
similarity index 100%
rename from src/emu/cpu/tms32025/32025dsm.c
rename to src/devices/cpu/tms32025/32025dsm.c
diff --git a/src/emu/cpu/tms32025/dis32025.c b/src/devices/cpu/tms32025/dis32025.c
similarity index 100%
rename from src/emu/cpu/tms32025/dis32025.c
rename to src/devices/cpu/tms32025/dis32025.c
diff --git a/src/emu/cpu/tms32025/tms32025.c b/src/devices/cpu/tms32025/tms32025.c
similarity index 100%
rename from src/emu/cpu/tms32025/tms32025.c
rename to src/devices/cpu/tms32025/tms32025.c
diff --git a/src/emu/cpu/tms32025/tms32025.h b/src/devices/cpu/tms32025/tms32025.h
similarity index 100%
rename from src/emu/cpu/tms32025/tms32025.h
rename to src/devices/cpu/tms32025/tms32025.h
diff --git a/src/emu/cpu/tms32031/32031ops.c b/src/devices/cpu/tms32031/32031ops.c
similarity index 100%
rename from src/emu/cpu/tms32031/32031ops.c
rename to src/devices/cpu/tms32031/32031ops.c
diff --git a/src/emu/cpu/tms32031/dis32031.c b/src/devices/cpu/tms32031/dis32031.c
similarity index 100%
rename from src/emu/cpu/tms32031/dis32031.c
rename to src/devices/cpu/tms32031/dis32031.c
diff --git a/src/emu/cpu/tms32031/tms32031.c b/src/devices/cpu/tms32031/tms32031.c
similarity index 100%
rename from src/emu/cpu/tms32031/tms32031.c
rename to src/devices/cpu/tms32031/tms32031.c
diff --git a/src/emu/cpu/tms32031/tms32031.h b/src/devices/cpu/tms32031/tms32031.h
similarity index 100%
rename from src/emu/cpu/tms32031/tms32031.h
rename to src/devices/cpu/tms32031/tms32031.h
diff --git a/src/emu/cpu/tms32051/32051ops.c b/src/devices/cpu/tms32051/32051ops.c
similarity index 100%
rename from src/emu/cpu/tms32051/32051ops.c
rename to src/devices/cpu/tms32051/32051ops.c
diff --git a/src/emu/cpu/tms32051/32051ops.h b/src/devices/cpu/tms32051/32051ops.h
similarity index 100%
rename from src/emu/cpu/tms32051/32051ops.h
rename to src/devices/cpu/tms32051/32051ops.h
diff --git a/src/emu/cpu/tms32051/dis32051.c b/src/devices/cpu/tms32051/dis32051.c
similarity index 100%
rename from src/emu/cpu/tms32051/dis32051.c
rename to src/devices/cpu/tms32051/dis32051.c
diff --git a/src/emu/cpu/tms32051/tms32051.c b/src/devices/cpu/tms32051/tms32051.c
similarity index 100%
rename from src/emu/cpu/tms32051/tms32051.c
rename to src/devices/cpu/tms32051/tms32051.c
diff --git a/src/emu/cpu/tms32051/tms32051.h b/src/devices/cpu/tms32051/tms32051.h
similarity index 100%
rename from src/emu/cpu/tms32051/tms32051.h
rename to src/devices/cpu/tms32051/tms32051.h
diff --git a/src/emu/cpu/tms32082/dis_mp.c b/src/devices/cpu/tms32082/dis_mp.c
similarity index 100%
rename from src/emu/cpu/tms32082/dis_mp.c
rename to src/devices/cpu/tms32082/dis_mp.c
diff --git a/src/emu/cpu/tms32082/dis_pp.c b/src/devices/cpu/tms32082/dis_pp.c
similarity index 100%
rename from src/emu/cpu/tms32082/dis_pp.c
rename to src/devices/cpu/tms32082/dis_pp.c
diff --git a/src/emu/cpu/tms32082/mp_ops.c b/src/devices/cpu/tms32082/mp_ops.c
similarity index 100%
rename from src/emu/cpu/tms32082/mp_ops.c
rename to src/devices/cpu/tms32082/mp_ops.c
diff --git a/src/emu/cpu/tms32082/tms32082.c b/src/devices/cpu/tms32082/tms32082.c
similarity index 100%
rename from src/emu/cpu/tms32082/tms32082.c
rename to src/devices/cpu/tms32082/tms32082.c
diff --git a/src/emu/cpu/tms32082/tms32082.h b/src/devices/cpu/tms32082/tms32082.h
similarity index 100%
rename from src/emu/cpu/tms32082/tms32082.h
rename to src/devices/cpu/tms32082/tms32082.h
diff --git a/src/emu/cpu/tms34010/34010dsm.c b/src/devices/cpu/tms34010/34010dsm.c
similarity index 100%
rename from src/emu/cpu/tms34010/34010dsm.c
rename to src/devices/cpu/tms34010/34010dsm.c
diff --git a/src/emu/cpu/tms34010/34010fld.c b/src/devices/cpu/tms34010/34010fld.c
similarity index 100%
rename from src/emu/cpu/tms34010/34010fld.c
rename to src/devices/cpu/tms34010/34010fld.c
diff --git a/src/emu/cpu/tms34010/34010gfx.c b/src/devices/cpu/tms34010/34010gfx.c
similarity index 100%
rename from src/emu/cpu/tms34010/34010gfx.c
rename to src/devices/cpu/tms34010/34010gfx.c
diff --git a/src/emu/cpu/tms34010/34010ops.c b/src/devices/cpu/tms34010/34010ops.c
similarity index 100%
rename from src/emu/cpu/tms34010/34010ops.c
rename to src/devices/cpu/tms34010/34010ops.c
diff --git a/src/emu/cpu/tms34010/34010ops.h b/src/devices/cpu/tms34010/34010ops.h
similarity index 100%
rename from src/emu/cpu/tms34010/34010ops.h
rename to src/devices/cpu/tms34010/34010ops.h
diff --git a/src/emu/cpu/tms34010/34010tbl.c b/src/devices/cpu/tms34010/34010tbl.c
similarity index 100%
rename from src/emu/cpu/tms34010/34010tbl.c
rename to src/devices/cpu/tms34010/34010tbl.c
diff --git a/src/emu/cpu/tms34010/dis34010.c b/src/devices/cpu/tms34010/dis34010.c
similarity index 100%
rename from src/emu/cpu/tms34010/dis34010.c
rename to src/devices/cpu/tms34010/dis34010.c
diff --git a/src/emu/cpu/tms34010/makefile b/src/devices/cpu/tms34010/makefile
similarity index 100%
rename from src/emu/cpu/tms34010/makefile
rename to src/devices/cpu/tms34010/makefile
diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/devices/cpu/tms34010/tms34010.c
similarity index 100%
rename from src/emu/cpu/tms34010/tms34010.c
rename to src/devices/cpu/tms34010/tms34010.c
diff --git a/src/emu/cpu/tms34010/tms34010.h b/src/devices/cpu/tms34010/tms34010.h
similarity index 100%
rename from src/emu/cpu/tms34010/tms34010.h
rename to src/devices/cpu/tms34010/tms34010.h
diff --git a/src/emu/cpu/tms57002/57002dsm.c b/src/devices/cpu/tms57002/57002dsm.c
similarity index 100%
rename from src/emu/cpu/tms57002/57002dsm.c
rename to src/devices/cpu/tms57002/57002dsm.c
diff --git a/src/emu/cpu/tms57002/tms57002.c b/src/devices/cpu/tms57002/tms57002.c
similarity index 100%
rename from src/emu/cpu/tms57002/tms57002.c
rename to src/devices/cpu/tms57002/tms57002.c
diff --git a/src/emu/cpu/tms57002/tms57002.h b/src/devices/cpu/tms57002/tms57002.h
similarity index 100%
rename from src/emu/cpu/tms57002/tms57002.h
rename to src/devices/cpu/tms57002/tms57002.h
diff --git a/src/emu/cpu/tms57002/tms57kdec.c b/src/devices/cpu/tms57002/tms57kdec.c
similarity index 100%
rename from src/emu/cpu/tms57002/tms57kdec.c
rename to src/devices/cpu/tms57002/tms57kdec.c
diff --git a/src/emu/cpu/tms57002/tmsinstr.lst b/src/devices/cpu/tms57002/tmsinstr.lst
similarity index 100%
rename from src/emu/cpu/tms57002/tmsinstr.lst
rename to src/devices/cpu/tms57002/tmsinstr.lst
diff --git a/src/emu/cpu/tms57002/tmsmake.py b/src/devices/cpu/tms57002/tmsmake.py
similarity index 100%
rename from src/emu/cpu/tms57002/tmsmake.py
rename to src/devices/cpu/tms57002/tmsmake.py
diff --git a/src/emu/cpu/tms7000/7000dasm.c b/src/devices/cpu/tms7000/7000dasm.c
similarity index 100%
rename from src/emu/cpu/tms7000/7000dasm.c
rename to src/devices/cpu/tms7000/7000dasm.c
diff --git a/src/emu/cpu/tms7000/tms7000.c b/src/devices/cpu/tms7000/tms7000.c
similarity index 100%
rename from src/emu/cpu/tms7000/tms7000.c
rename to src/devices/cpu/tms7000/tms7000.c
diff --git a/src/emu/cpu/tms7000/tms7000.h b/src/devices/cpu/tms7000/tms7000.h
similarity index 100%
rename from src/emu/cpu/tms7000/tms7000.h
rename to src/devices/cpu/tms7000/tms7000.h
diff --git a/src/emu/cpu/tms7000/tms70op.inc b/src/devices/cpu/tms7000/tms70op.inc
similarity index 100%
rename from src/emu/cpu/tms7000/tms70op.inc
rename to src/devices/cpu/tms7000/tms70op.inc
diff --git a/src/emu/cpu/tms9900/9900dasm.c b/src/devices/cpu/tms9900/9900dasm.c
similarity index 100%
rename from src/emu/cpu/tms9900/9900dasm.c
rename to src/devices/cpu/tms9900/9900dasm.c
diff --git a/src/emu/cpu/tms9900/99xxcore.h b/src/devices/cpu/tms9900/99xxcore.h
similarity index 100%
rename from src/emu/cpu/tms9900/99xxcore.h
rename to src/devices/cpu/tms9900/99xxcore.h
diff --git a/src/emu/cpu/tms9900/ti990_10.c b/src/devices/cpu/tms9900/ti990_10.c
similarity index 100%
rename from src/emu/cpu/tms9900/ti990_10.c
rename to src/devices/cpu/tms9900/ti990_10.c
diff --git a/src/emu/cpu/tms9900/ti990_10.h b/src/devices/cpu/tms9900/ti990_10.h
similarity index 100%
rename from src/emu/cpu/tms9900/ti990_10.h
rename to src/devices/cpu/tms9900/ti990_10.h
diff --git a/src/emu/cpu/tms9900/tms9900.c b/src/devices/cpu/tms9900/tms9900.c
similarity index 100%
rename from src/emu/cpu/tms9900/tms9900.c
rename to src/devices/cpu/tms9900/tms9900.c
diff --git a/src/emu/cpu/tms9900/tms9900.h b/src/devices/cpu/tms9900/tms9900.h
similarity index 100%
rename from src/emu/cpu/tms9900/tms9900.h
rename to src/devices/cpu/tms9900/tms9900.h
diff --git a/src/emu/cpu/tms9900/tms9980a.c b/src/devices/cpu/tms9900/tms9980a.c
similarity index 100%
rename from src/emu/cpu/tms9900/tms9980a.c
rename to src/devices/cpu/tms9900/tms9980a.c
diff --git a/src/emu/cpu/tms9900/tms9980a.h b/src/devices/cpu/tms9900/tms9980a.h
similarity index 100%
rename from src/emu/cpu/tms9900/tms9980a.h
rename to src/devices/cpu/tms9900/tms9980a.h
diff --git a/src/emu/cpu/tms9900/tms9995.c b/src/devices/cpu/tms9900/tms9995.c
similarity index 100%
rename from src/emu/cpu/tms9900/tms9995.c
rename to src/devices/cpu/tms9900/tms9995.c
diff --git a/src/emu/cpu/tms9900/tms9995.h b/src/devices/cpu/tms9900/tms9995.h
similarity index 100%
rename from src/emu/cpu/tms9900/tms9995.h
rename to src/devices/cpu/tms9900/tms9995.h
diff --git a/src/emu/cpu/tms9900/tms99com.h b/src/devices/cpu/tms9900/tms99com.h
similarity index 100%
rename from src/emu/cpu/tms9900/tms99com.h
rename to src/devices/cpu/tms9900/tms99com.h
diff --git a/src/emu/cpu/ucom4/ucom4.c b/src/devices/cpu/ucom4/ucom4.c
similarity index 100%
rename from src/emu/cpu/ucom4/ucom4.c
rename to src/devices/cpu/ucom4/ucom4.c
diff --git a/src/emu/cpu/ucom4/ucom4.h b/src/devices/cpu/ucom4/ucom4.h
similarity index 100%
rename from src/emu/cpu/ucom4/ucom4.h
rename to src/devices/cpu/ucom4/ucom4.h
diff --git a/src/emu/cpu/ucom4/ucom4d.c b/src/devices/cpu/ucom4/ucom4d.c
similarity index 100%
rename from src/emu/cpu/ucom4/ucom4d.c
rename to src/devices/cpu/ucom4/ucom4d.c
diff --git a/src/emu/cpu/ucom4/ucom4op.c b/src/devices/cpu/ucom4/ucom4op.c
similarity index 100%
rename from src/emu/cpu/ucom4/ucom4op.c
rename to src/devices/cpu/ucom4/ucom4op.c
diff --git a/src/emu/cpu/uml.c b/src/devices/cpu/uml.c
similarity index 100%
rename from src/emu/cpu/uml.c
rename to src/devices/cpu/uml.c
diff --git a/src/emu/cpu/uml.h b/src/devices/cpu/uml.h
similarity index 100%
rename from src/emu/cpu/uml.h
rename to src/devices/cpu/uml.h
diff --git a/src/emu/cpu/unsp/unsp.c b/src/devices/cpu/unsp/unsp.c
similarity index 100%
rename from src/emu/cpu/unsp/unsp.c
rename to src/devices/cpu/unsp/unsp.c
diff --git a/src/emu/cpu/unsp/unsp.h b/src/devices/cpu/unsp/unsp.h
similarity index 100%
rename from src/emu/cpu/unsp/unsp.h
rename to src/devices/cpu/unsp/unsp.h
diff --git a/src/emu/cpu/unsp/unspdasm.c b/src/devices/cpu/unsp/unspdasm.c
similarity index 100%
rename from src/emu/cpu/unsp/unspdasm.c
rename to src/devices/cpu/unsp/unspdasm.c
diff --git a/src/emu/cpu/upd7725/dasm7725.c b/src/devices/cpu/upd7725/dasm7725.c
similarity index 100%
rename from src/emu/cpu/upd7725/dasm7725.c
rename to src/devices/cpu/upd7725/dasm7725.c
diff --git a/src/emu/cpu/upd7725/upd7725.c b/src/devices/cpu/upd7725/upd7725.c
similarity index 100%
rename from src/emu/cpu/upd7725/upd7725.c
rename to src/devices/cpu/upd7725/upd7725.c
diff --git a/src/emu/cpu/upd7725/upd7725.h b/src/devices/cpu/upd7725/upd7725.h
similarity index 100%
rename from src/emu/cpu/upd7725/upd7725.h
rename to src/devices/cpu/upd7725/upd7725.h
diff --git a/src/emu/cpu/upd7810/upd7810.c b/src/devices/cpu/upd7810/upd7810.c
similarity index 100%
rename from src/emu/cpu/upd7810/upd7810.c
rename to src/devices/cpu/upd7810/upd7810.c
diff --git a/src/emu/cpu/upd7810/upd7810.h b/src/devices/cpu/upd7810/upd7810.h
similarity index 100%
rename from src/emu/cpu/upd7810/upd7810.h
rename to src/devices/cpu/upd7810/upd7810.h
diff --git a/src/emu/cpu/upd7810/upd7810_dasm.c b/src/devices/cpu/upd7810/upd7810_dasm.c
similarity index 100%
rename from src/emu/cpu/upd7810/upd7810_dasm.c
rename to src/devices/cpu/upd7810/upd7810_dasm.c
diff --git a/src/emu/cpu/upd7810/upd7810_macros.h b/src/devices/cpu/upd7810/upd7810_macros.h
similarity index 100%
rename from src/emu/cpu/upd7810/upd7810_macros.h
rename to src/devices/cpu/upd7810/upd7810_macros.h
diff --git a/src/emu/cpu/upd7810/upd7810_opcodes.c b/src/devices/cpu/upd7810/upd7810_opcodes.c
similarity index 100%
rename from src/emu/cpu/upd7810/upd7810_opcodes.c
rename to src/devices/cpu/upd7810/upd7810_opcodes.c
diff --git a/src/emu/cpu/upd7810/upd7810_table.c b/src/devices/cpu/upd7810/upd7810_table.c
similarity index 100%
rename from src/emu/cpu/upd7810/upd7810_table.c
rename to src/devices/cpu/upd7810/upd7810_table.c
diff --git a/src/emu/cpu/v30mz/v30mz.c b/src/devices/cpu/v30mz/v30mz.c
similarity index 100%
rename from src/emu/cpu/v30mz/v30mz.c
rename to src/devices/cpu/v30mz/v30mz.c
diff --git a/src/emu/cpu/v30mz/v30mz.h b/src/devices/cpu/v30mz/v30mz.h
similarity index 100%
rename from src/emu/cpu/v30mz/v30mz.h
rename to src/devices/cpu/v30mz/v30mz.h
diff --git a/src/emu/cpu/v60/am.inc b/src/devices/cpu/v60/am.inc
similarity index 100%
rename from src/emu/cpu/v60/am.inc
rename to src/devices/cpu/v60/am.inc
diff --git a/src/emu/cpu/v60/am1.inc b/src/devices/cpu/v60/am1.inc
similarity index 100%
rename from src/emu/cpu/v60/am1.inc
rename to src/devices/cpu/v60/am1.inc
diff --git a/src/emu/cpu/v60/am2.inc b/src/devices/cpu/v60/am2.inc
similarity index 100%
rename from src/emu/cpu/v60/am2.inc
rename to src/devices/cpu/v60/am2.inc
diff --git a/src/emu/cpu/v60/am3.inc b/src/devices/cpu/v60/am3.inc
similarity index 100%
rename from src/emu/cpu/v60/am3.inc
rename to src/devices/cpu/v60/am3.inc
diff --git a/src/emu/cpu/v60/op12.inc b/src/devices/cpu/v60/op12.inc
similarity index 100%
rename from src/emu/cpu/v60/op12.inc
rename to src/devices/cpu/v60/op12.inc
diff --git a/src/emu/cpu/v60/op2.inc b/src/devices/cpu/v60/op2.inc
similarity index 100%
rename from src/emu/cpu/v60/op2.inc
rename to src/devices/cpu/v60/op2.inc
diff --git a/src/emu/cpu/v60/op3.inc b/src/devices/cpu/v60/op3.inc
similarity index 100%
rename from src/emu/cpu/v60/op3.inc
rename to src/devices/cpu/v60/op3.inc
diff --git a/src/emu/cpu/v60/op4.inc b/src/devices/cpu/v60/op4.inc
similarity index 100%
rename from src/emu/cpu/v60/op4.inc
rename to src/devices/cpu/v60/op4.inc
diff --git a/src/emu/cpu/v60/op5.inc b/src/devices/cpu/v60/op5.inc
similarity index 100%
rename from src/emu/cpu/v60/op5.inc
rename to src/devices/cpu/v60/op5.inc
diff --git a/src/emu/cpu/v60/op6.inc b/src/devices/cpu/v60/op6.inc
similarity index 100%
rename from src/emu/cpu/v60/op6.inc
rename to src/devices/cpu/v60/op6.inc
diff --git a/src/emu/cpu/v60/op7a.inc b/src/devices/cpu/v60/op7a.inc
similarity index 100%
rename from src/emu/cpu/v60/op7a.inc
rename to src/devices/cpu/v60/op7a.inc
diff --git a/src/emu/cpu/v60/optable.inc b/src/devices/cpu/v60/optable.inc
similarity index 100%
rename from src/emu/cpu/v60/optable.inc
rename to src/devices/cpu/v60/optable.inc
diff --git a/src/emu/cpu/v60/v60.c b/src/devices/cpu/v60/v60.c
similarity index 100%
rename from src/emu/cpu/v60/v60.c
rename to src/devices/cpu/v60/v60.c
diff --git a/src/emu/cpu/v60/v60.h b/src/devices/cpu/v60/v60.h
similarity index 100%
rename from src/emu/cpu/v60/v60.h
rename to src/devices/cpu/v60/v60.h
diff --git a/src/emu/cpu/v60/v60d.c b/src/devices/cpu/v60/v60d.c
similarity index 100%
rename from src/emu/cpu/v60/v60d.c
rename to src/devices/cpu/v60/v60d.c
diff --git a/src/emu/cpu/v810/v810.c b/src/devices/cpu/v810/v810.c
similarity index 100%
rename from src/emu/cpu/v810/v810.c
rename to src/devices/cpu/v810/v810.c
diff --git a/src/emu/cpu/v810/v810.h b/src/devices/cpu/v810/v810.h
similarity index 100%
rename from src/emu/cpu/v810/v810.h
rename to src/devices/cpu/v810/v810.h
diff --git a/src/emu/cpu/v810/v810dasm.c b/src/devices/cpu/v810/v810dasm.c
similarity index 100%
rename from src/emu/cpu/v810/v810dasm.c
rename to src/devices/cpu/v810/v810dasm.c
diff --git a/src/emu/cpu/vtlb.c b/src/devices/cpu/vtlb.c
similarity index 100%
rename from src/emu/cpu/vtlb.c
rename to src/devices/cpu/vtlb.c
diff --git a/src/emu/cpu/vtlb.h b/src/devices/cpu/vtlb.h
similarity index 100%
rename from src/emu/cpu/vtlb.h
rename to src/devices/cpu/vtlb.h
diff --git a/src/emu/cpu/x86emit.h b/src/devices/cpu/x86emit.h
similarity index 100%
rename from src/emu/cpu/x86emit.h
rename to src/devices/cpu/x86emit.h
diff --git a/src/emu/cpu/x86log.c b/src/devices/cpu/x86log.c
similarity index 100%
rename from src/emu/cpu/x86log.c
rename to src/devices/cpu/x86log.c
diff --git a/src/emu/cpu/x86log.h b/src/devices/cpu/x86log.h
similarity index 100%
rename from src/emu/cpu/x86log.h
rename to src/devices/cpu/x86log.h
diff --git a/src/emu/cpu/z180/z180.c b/src/devices/cpu/z180/z180.c
similarity index 100%
rename from src/emu/cpu/z180/z180.c
rename to src/devices/cpu/z180/z180.c
diff --git a/src/emu/cpu/z180/z180.h b/src/devices/cpu/z180/z180.h
similarity index 100%
rename from src/emu/cpu/z180/z180.h
rename to src/devices/cpu/z180/z180.h
diff --git a/src/emu/cpu/z180/z180cb.inc b/src/devices/cpu/z180/z180cb.inc
similarity index 100%
rename from src/emu/cpu/z180/z180cb.inc
rename to src/devices/cpu/z180/z180cb.inc
diff --git a/src/emu/cpu/z180/z180dasm.c b/src/devices/cpu/z180/z180dasm.c
similarity index 100%
rename from src/emu/cpu/z180/z180dasm.c
rename to src/devices/cpu/z180/z180dasm.c
diff --git a/src/emu/cpu/z180/z180dd.inc b/src/devices/cpu/z180/z180dd.inc
similarity index 100%
rename from src/emu/cpu/z180/z180dd.inc
rename to src/devices/cpu/z180/z180dd.inc
diff --git a/src/emu/cpu/z180/z180ed.inc b/src/devices/cpu/z180/z180ed.inc
similarity index 100%
rename from src/emu/cpu/z180/z180ed.inc
rename to src/devices/cpu/z180/z180ed.inc
diff --git a/src/emu/cpu/z180/z180fd.inc b/src/devices/cpu/z180/z180fd.inc
similarity index 100%
rename from src/emu/cpu/z180/z180fd.inc
rename to src/devices/cpu/z180/z180fd.inc
diff --git a/src/emu/cpu/z180/z180op.inc b/src/devices/cpu/z180/z180op.inc
similarity index 100%
rename from src/emu/cpu/z180/z180op.inc
rename to src/devices/cpu/z180/z180op.inc
diff --git a/src/emu/cpu/z180/z180ops.h b/src/devices/cpu/z180/z180ops.h
similarity index 100%
rename from src/emu/cpu/z180/z180ops.h
rename to src/devices/cpu/z180/z180ops.h
diff --git a/src/emu/cpu/z180/z180tbl.h b/src/devices/cpu/z180/z180tbl.h
similarity index 100%
rename from src/emu/cpu/z180/z180tbl.h
rename to src/devices/cpu/z180/z180tbl.h
diff --git a/src/emu/cpu/z180/z180xy.inc b/src/devices/cpu/z180/z180xy.inc
similarity index 100%
rename from src/emu/cpu/z180/z180xy.inc
rename to src/devices/cpu/z180/z180xy.inc
diff --git a/src/emu/cpu/z8/z8.c b/src/devices/cpu/z8/z8.c
similarity index 100%
rename from src/emu/cpu/z8/z8.c
rename to src/devices/cpu/z8/z8.c
diff --git a/src/emu/cpu/z8/z8.h b/src/devices/cpu/z8/z8.h
similarity index 100%
rename from src/emu/cpu/z8/z8.h
rename to src/devices/cpu/z8/z8.h
diff --git a/src/emu/cpu/z8/z8dasm.c b/src/devices/cpu/z8/z8dasm.c
similarity index 100%
rename from src/emu/cpu/z8/z8dasm.c
rename to src/devices/cpu/z8/z8dasm.c
diff --git a/src/emu/cpu/z8/z8ops.inc b/src/devices/cpu/z8/z8ops.inc
similarity index 100%
rename from src/emu/cpu/z8/z8ops.inc
rename to src/devices/cpu/z8/z8ops.inc
diff --git a/src/emu/cpu/z80/kl5c80a12.c b/src/devices/cpu/z80/kl5c80a12.c
similarity index 100%
rename from src/emu/cpu/z80/kl5c80a12.c
rename to src/devices/cpu/z80/kl5c80a12.c
diff --git a/src/emu/cpu/z80/kl5c80a12.h b/src/devices/cpu/z80/kl5c80a12.h
similarity index 100%
rename from src/emu/cpu/z80/kl5c80a12.h
rename to src/devices/cpu/z80/kl5c80a12.h
diff --git a/src/emu/cpu/z80/tmpz84c011.c b/src/devices/cpu/z80/tmpz84c011.c
similarity index 100%
rename from src/emu/cpu/z80/tmpz84c011.c
rename to src/devices/cpu/z80/tmpz84c011.c
diff --git a/src/emu/cpu/z80/tmpz84c011.h b/src/devices/cpu/z80/tmpz84c011.h
similarity index 100%
rename from src/emu/cpu/z80/tmpz84c011.h
rename to src/devices/cpu/z80/tmpz84c011.h
diff --git a/src/emu/cpu/z80/tmpz84c015.c b/src/devices/cpu/z80/tmpz84c015.c
similarity index 100%
rename from src/emu/cpu/z80/tmpz84c015.c
rename to src/devices/cpu/z80/tmpz84c015.c
diff --git a/src/emu/cpu/z80/tmpz84c015.h b/src/devices/cpu/z80/tmpz84c015.h
similarity index 100%
rename from src/emu/cpu/z80/tmpz84c015.h
rename to src/devices/cpu/z80/tmpz84c015.h
diff --git a/src/emu/cpu/z80/z80.c b/src/devices/cpu/z80/z80.c
similarity index 100%
rename from src/emu/cpu/z80/z80.c
rename to src/devices/cpu/z80/z80.c
diff --git a/src/emu/cpu/z80/z80.h b/src/devices/cpu/z80/z80.h
similarity index 100%
rename from src/emu/cpu/z80/z80.h
rename to src/devices/cpu/z80/z80.h
diff --git a/src/emu/cpu/z80/z80daisy.c b/src/devices/cpu/z80/z80daisy.c
similarity index 100%
rename from src/emu/cpu/z80/z80daisy.c
rename to src/devices/cpu/z80/z80daisy.c
diff --git a/src/emu/cpu/z80/z80daisy.h b/src/devices/cpu/z80/z80daisy.h
similarity index 100%
rename from src/emu/cpu/z80/z80daisy.h
rename to src/devices/cpu/z80/z80daisy.h
diff --git a/src/emu/cpu/z80/z80dasm.c b/src/devices/cpu/z80/z80dasm.c
similarity index 100%
rename from src/emu/cpu/z80/z80dasm.c
rename to src/devices/cpu/z80/z80dasm.c
diff --git a/src/emu/cpu/z8000/8000dasm.c b/src/devices/cpu/z8000/8000dasm.c
similarity index 100%
rename from src/emu/cpu/z8000/8000dasm.c
rename to src/devices/cpu/z8000/8000dasm.c
diff --git a/src/emu/cpu/z8000/makedab.c b/src/devices/cpu/z8000/makedab.c
similarity index 100%
rename from src/emu/cpu/z8000/makedab.c
rename to src/devices/cpu/z8000/makedab.c
diff --git a/src/emu/cpu/z8000/z8000.c b/src/devices/cpu/z8000/z8000.c
similarity index 100%
rename from src/emu/cpu/z8000/z8000.c
rename to src/devices/cpu/z8000/z8000.c
diff --git a/src/emu/cpu/z8000/z8000.h b/src/devices/cpu/z8000/z8000.h
similarity index 100%
rename from src/emu/cpu/z8000/z8000.h
rename to src/devices/cpu/z8000/z8000.h
diff --git a/src/emu/cpu/z8000/z8000cpu.h b/src/devices/cpu/z8000/z8000cpu.h
similarity index 100%
rename from src/emu/cpu/z8000/z8000cpu.h
rename to src/devices/cpu/z8000/z8000cpu.h
diff --git a/src/emu/cpu/z8000/z8000dab.h b/src/devices/cpu/z8000/z8000dab.h
similarity index 100%
rename from src/emu/cpu/z8000/z8000dab.h
rename to src/devices/cpu/z8000/z8000dab.h
diff --git a/src/emu/cpu/z8000/z8000ops.inc b/src/devices/cpu/z8000/z8000ops.inc
similarity index 100%
rename from src/emu/cpu/z8000/z8000ops.inc
rename to src/devices/cpu/z8000/z8000ops.inc
diff --git a/src/emu/cpu/z8000/z8000tbl.inc b/src/devices/cpu/z8000/z8000tbl.inc
similarity index 100%
rename from src/emu/cpu/z8000/z8000tbl.inc
rename to src/devices/cpu/z8000/z8000tbl.inc
diff --git a/src/emu/imagedev/bitbngr.c b/src/devices/imagedev/bitbngr.c
similarity index 100%
rename from src/emu/imagedev/bitbngr.c
rename to src/devices/imagedev/bitbngr.c
diff --git a/src/emu/imagedev/bitbngr.h b/src/devices/imagedev/bitbngr.h
similarity index 100%
rename from src/emu/imagedev/bitbngr.h
rename to src/devices/imagedev/bitbngr.h
diff --git a/src/emu/imagedev/cassette.c b/src/devices/imagedev/cassette.c
similarity index 100%
rename from src/emu/imagedev/cassette.c
rename to src/devices/imagedev/cassette.c
diff --git a/src/emu/imagedev/cassette.h b/src/devices/imagedev/cassette.h
similarity index 100%
rename from src/emu/imagedev/cassette.h
rename to src/devices/imagedev/cassette.h
diff --git a/src/emu/imagedev/chd_cd.c b/src/devices/imagedev/chd_cd.c
similarity index 100%
rename from src/emu/imagedev/chd_cd.c
rename to src/devices/imagedev/chd_cd.c
diff --git a/src/emu/imagedev/chd_cd.h b/src/devices/imagedev/chd_cd.h
similarity index 100%
rename from src/emu/imagedev/chd_cd.h
rename to src/devices/imagedev/chd_cd.h
diff --git a/src/emu/imagedev/diablo.c b/src/devices/imagedev/diablo.c
similarity index 100%
rename from src/emu/imagedev/diablo.c
rename to src/devices/imagedev/diablo.c
diff --git a/src/emu/imagedev/diablo.h b/src/devices/imagedev/diablo.h
similarity index 100%
rename from src/emu/imagedev/diablo.h
rename to src/devices/imagedev/diablo.h
diff --git a/src/emu/imagedev/flopdrv.c b/src/devices/imagedev/flopdrv.c
similarity index 100%
rename from src/emu/imagedev/flopdrv.c
rename to src/devices/imagedev/flopdrv.c
diff --git a/src/emu/imagedev/flopdrv.h b/src/devices/imagedev/flopdrv.h
similarity index 100%
rename from src/emu/imagedev/flopdrv.h
rename to src/devices/imagedev/flopdrv.h
diff --git a/src/emu/imagedev/floppy.c b/src/devices/imagedev/floppy.c
similarity index 100%
rename from src/emu/imagedev/floppy.c
rename to src/devices/imagedev/floppy.c
diff --git a/src/emu/imagedev/floppy.h b/src/devices/imagedev/floppy.h
similarity index 100%
rename from src/emu/imagedev/floppy.h
rename to src/devices/imagedev/floppy.h
diff --git a/src/emu/imagedev/harddriv.c b/src/devices/imagedev/harddriv.c
similarity index 100%
rename from src/emu/imagedev/harddriv.c
rename to src/devices/imagedev/harddriv.c
diff --git a/src/emu/imagedev/harddriv.h b/src/devices/imagedev/harddriv.h
similarity index 100%
rename from src/emu/imagedev/harddriv.h
rename to src/devices/imagedev/harddriv.h
diff --git a/src/emu/imagedev/mfmhd.c b/src/devices/imagedev/mfmhd.c
similarity index 100%
rename from src/emu/imagedev/mfmhd.c
rename to src/devices/imagedev/mfmhd.c
diff --git a/src/emu/imagedev/mfmhd.h b/src/devices/imagedev/mfmhd.h
similarity index 100%
rename from src/emu/imagedev/mfmhd.h
rename to src/devices/imagedev/mfmhd.h
diff --git a/src/emu/imagedev/midiin.c b/src/devices/imagedev/midiin.c
similarity index 100%
rename from src/emu/imagedev/midiin.c
rename to src/devices/imagedev/midiin.c
diff --git a/src/emu/imagedev/midiin.h b/src/devices/imagedev/midiin.h
similarity index 100%
rename from src/emu/imagedev/midiin.h
rename to src/devices/imagedev/midiin.h
diff --git a/src/emu/imagedev/midiout.c b/src/devices/imagedev/midiout.c
similarity index 100%
rename from src/emu/imagedev/midiout.c
rename to src/devices/imagedev/midiout.c
diff --git a/src/emu/imagedev/midiout.h b/src/devices/imagedev/midiout.h
similarity index 100%
rename from src/emu/imagedev/midiout.h
rename to src/devices/imagedev/midiout.h
diff --git a/src/emu/imagedev/printer.c b/src/devices/imagedev/printer.c
similarity index 100%
rename from src/emu/imagedev/printer.c
rename to src/devices/imagedev/printer.c
diff --git a/src/emu/imagedev/printer.h b/src/devices/imagedev/printer.h
similarity index 100%
rename from src/emu/imagedev/printer.h
rename to src/devices/imagedev/printer.h
diff --git a/src/emu/imagedev/snapquik.c b/src/devices/imagedev/snapquik.c
similarity index 100%
rename from src/emu/imagedev/snapquik.c
rename to src/devices/imagedev/snapquik.c
diff --git a/src/emu/imagedev/snapquik.h b/src/devices/imagedev/snapquik.h
similarity index 100%
rename from src/emu/imagedev/snapquik.h
rename to src/devices/imagedev/snapquik.h
diff --git a/src/emu/machine/40105.c b/src/devices/machine/40105.c
similarity index 100%
rename from src/emu/machine/40105.c
rename to src/devices/machine/40105.c
diff --git a/src/emu/machine/40105.h b/src/devices/machine/40105.h
similarity index 100%
rename from src/emu/machine/40105.h
rename to src/devices/machine/40105.h
diff --git a/src/emu/machine/53c7xx.c b/src/devices/machine/53c7xx.c
similarity index 100%
rename from src/emu/machine/53c7xx.c
rename to src/devices/machine/53c7xx.c
diff --git a/src/emu/machine/53c7xx.h b/src/devices/machine/53c7xx.h
similarity index 100%
rename from src/emu/machine/53c7xx.h
rename to src/devices/machine/53c7xx.h
diff --git a/src/emu/machine/53c810.c b/src/devices/machine/53c810.c
similarity index 100%
rename from src/emu/machine/53c810.c
rename to src/devices/machine/53c810.c
diff --git a/src/emu/machine/53c810.h b/src/devices/machine/53c810.h
similarity index 100%
rename from src/emu/machine/53c810.h
rename to src/devices/machine/53c810.h
diff --git a/src/emu/machine/64h156.c b/src/devices/machine/64h156.c
similarity index 100%
rename from src/emu/machine/64h156.c
rename to src/devices/machine/64h156.c
diff --git a/src/emu/machine/64h156.h b/src/devices/machine/64h156.h
similarity index 100%
rename from src/emu/machine/64h156.h
rename to src/devices/machine/64h156.h
diff --git a/src/emu/machine/6522via.c b/src/devices/machine/6522via.c
similarity index 100%
rename from src/emu/machine/6522via.c
rename to src/devices/machine/6522via.c
diff --git a/src/emu/machine/6522via.h b/src/devices/machine/6522via.h
similarity index 100%
rename from src/emu/machine/6522via.h
rename to src/devices/machine/6522via.h
diff --git a/src/emu/machine/6525tpi.c b/src/devices/machine/6525tpi.c
similarity index 100%
rename from src/emu/machine/6525tpi.c
rename to src/devices/machine/6525tpi.c
diff --git a/src/emu/machine/6525tpi.h b/src/devices/machine/6525tpi.h
similarity index 100%
rename from src/emu/machine/6525tpi.h
rename to src/devices/machine/6525tpi.h
diff --git a/src/emu/machine/6532riot.c b/src/devices/machine/6532riot.c
similarity index 100%
rename from src/emu/machine/6532riot.c
rename to src/devices/machine/6532riot.c
diff --git a/src/emu/machine/6532riot.h b/src/devices/machine/6532riot.h
similarity index 100%
rename from src/emu/machine/6532riot.h
rename to src/devices/machine/6532riot.h
diff --git a/src/emu/machine/6821pia.c b/src/devices/machine/6821pia.c
similarity index 100%
rename from src/emu/machine/6821pia.c
rename to src/devices/machine/6821pia.c
diff --git a/src/emu/machine/6821pia.h b/src/devices/machine/6821pia.h
similarity index 100%
rename from src/emu/machine/6821pia.h
rename to src/devices/machine/6821pia.h
diff --git a/src/emu/machine/68230pit.c b/src/devices/machine/68230pit.c
similarity index 100%
rename from src/emu/machine/68230pit.c
rename to src/devices/machine/68230pit.c
diff --git a/src/emu/machine/68230pit.h b/src/devices/machine/68230pit.h
similarity index 100%
rename from src/emu/machine/68230pit.h
rename to src/devices/machine/68230pit.h
diff --git a/src/emu/machine/68307.c b/src/devices/machine/68307.c
similarity index 100%
rename from src/emu/machine/68307.c
rename to src/devices/machine/68307.c
diff --git a/src/emu/machine/68307.h b/src/devices/machine/68307.h
similarity index 100%
rename from src/emu/machine/68307.h
rename to src/devices/machine/68307.h
diff --git a/src/emu/machine/68307bus.c b/src/devices/machine/68307bus.c
similarity index 100%
rename from src/emu/machine/68307bus.c
rename to src/devices/machine/68307bus.c
diff --git a/src/emu/machine/68307bus.h b/src/devices/machine/68307bus.h
similarity index 100%
rename from src/emu/machine/68307bus.h
rename to src/devices/machine/68307bus.h
diff --git a/src/emu/machine/68307sim.c b/src/devices/machine/68307sim.c
similarity index 100%
rename from src/emu/machine/68307sim.c
rename to src/devices/machine/68307sim.c
diff --git a/src/emu/machine/68307sim.h b/src/devices/machine/68307sim.h
similarity index 100%
rename from src/emu/machine/68307sim.h
rename to src/devices/machine/68307sim.h
diff --git a/src/emu/machine/68307tmu.c b/src/devices/machine/68307tmu.c
similarity index 100%
rename from src/emu/machine/68307tmu.c
rename to src/devices/machine/68307tmu.c
diff --git a/src/emu/machine/68307tmu.h b/src/devices/machine/68307tmu.h
similarity index 100%
rename from src/emu/machine/68307tmu.h
rename to src/devices/machine/68307tmu.h
diff --git a/src/emu/machine/68340.c b/src/devices/machine/68340.c
similarity index 100%
rename from src/emu/machine/68340.c
rename to src/devices/machine/68340.c
diff --git a/src/emu/machine/68340.h b/src/devices/machine/68340.h
similarity index 100%
rename from src/emu/machine/68340.h
rename to src/devices/machine/68340.h
diff --git a/src/emu/machine/68340dma.c b/src/devices/machine/68340dma.c
similarity index 100%
rename from src/emu/machine/68340dma.c
rename to src/devices/machine/68340dma.c
diff --git a/src/emu/machine/68340dma.h b/src/devices/machine/68340dma.h
similarity index 100%
rename from src/emu/machine/68340dma.h
rename to src/devices/machine/68340dma.h
diff --git a/src/emu/machine/68340ser.c b/src/devices/machine/68340ser.c
similarity index 100%
rename from src/emu/machine/68340ser.c
rename to src/devices/machine/68340ser.c
diff --git a/src/emu/machine/68340ser.h b/src/devices/machine/68340ser.h
similarity index 100%
rename from src/emu/machine/68340ser.h
rename to src/devices/machine/68340ser.h
diff --git a/src/emu/machine/68340sim.c b/src/devices/machine/68340sim.c
similarity index 100%
rename from src/emu/machine/68340sim.c
rename to src/devices/machine/68340sim.c
diff --git a/src/emu/machine/68340sim.h b/src/devices/machine/68340sim.h
similarity index 100%
rename from src/emu/machine/68340sim.h
rename to src/devices/machine/68340sim.h
diff --git a/src/emu/machine/68340tmu.c b/src/devices/machine/68340tmu.c
similarity index 100%
rename from src/emu/machine/68340tmu.c
rename to src/devices/machine/68340tmu.c
diff --git a/src/emu/machine/68340tmu.h b/src/devices/machine/68340tmu.h
similarity index 100%
rename from src/emu/machine/68340tmu.h
rename to src/devices/machine/68340tmu.h
diff --git a/src/emu/machine/6840ptm.c b/src/devices/machine/6840ptm.c
similarity index 100%
rename from src/emu/machine/6840ptm.c
rename to src/devices/machine/6840ptm.c
diff --git a/src/emu/machine/6840ptm.h b/src/devices/machine/6840ptm.h
similarity index 100%
rename from src/emu/machine/6840ptm.h
rename to src/devices/machine/6840ptm.h
diff --git a/src/emu/machine/6850acia.c b/src/devices/machine/6850acia.c
similarity index 100%
rename from src/emu/machine/6850acia.c
rename to src/devices/machine/6850acia.c
diff --git a/src/emu/machine/6850acia.h b/src/devices/machine/6850acia.h
similarity index 100%
rename from src/emu/machine/6850acia.h
rename to src/devices/machine/6850acia.h
diff --git a/src/emu/machine/68561mpcc.c b/src/devices/machine/68561mpcc.c
similarity index 100%
rename from src/emu/machine/68561mpcc.c
rename to src/devices/machine/68561mpcc.c
diff --git a/src/emu/machine/68561mpcc.h b/src/devices/machine/68561mpcc.h
similarity index 100%
rename from src/emu/machine/68561mpcc.h
rename to src/devices/machine/68561mpcc.h
diff --git a/src/emu/machine/7200fifo.c b/src/devices/machine/7200fifo.c
similarity index 100%
rename from src/emu/machine/7200fifo.c
rename to src/devices/machine/7200fifo.c
diff --git a/src/emu/machine/7200fifo.h b/src/devices/machine/7200fifo.h
similarity index 100%
rename from src/emu/machine/7200fifo.h
rename to src/devices/machine/7200fifo.h
diff --git a/src/emu/machine/74123.c b/src/devices/machine/74123.c
similarity index 100%
rename from src/emu/machine/74123.c
rename to src/devices/machine/74123.c
diff --git a/src/emu/machine/74123.h b/src/devices/machine/74123.h
similarity index 100%
rename from src/emu/machine/74123.h
rename to src/devices/machine/74123.h
diff --git a/src/emu/machine/74145.c b/src/devices/machine/74145.c
similarity index 100%
rename from src/emu/machine/74145.c
rename to src/devices/machine/74145.c
diff --git a/src/emu/machine/74145.h b/src/devices/machine/74145.h
similarity index 100%
rename from src/emu/machine/74145.h
rename to src/devices/machine/74145.h
diff --git a/src/emu/machine/74148.c b/src/devices/machine/74148.c
similarity index 100%
rename from src/emu/machine/74148.c
rename to src/devices/machine/74148.c
diff --git a/src/emu/machine/74148.h b/src/devices/machine/74148.h
similarity index 100%
rename from src/emu/machine/74148.h
rename to src/devices/machine/74148.h
diff --git a/src/emu/machine/74153.c b/src/devices/machine/74153.c
similarity index 100%
rename from src/emu/machine/74153.c
rename to src/devices/machine/74153.c
diff --git a/src/emu/machine/74153.h b/src/devices/machine/74153.h
similarity index 100%
rename from src/emu/machine/74153.h
rename to src/devices/machine/74153.h
diff --git a/src/emu/machine/74181.c b/src/devices/machine/74181.c
similarity index 100%
rename from src/emu/machine/74181.c
rename to src/devices/machine/74181.c
diff --git a/src/emu/machine/74181.h b/src/devices/machine/74181.h
similarity index 100%
rename from src/emu/machine/74181.h
rename to src/devices/machine/74181.h
diff --git a/src/emu/machine/7474.c b/src/devices/machine/7474.c
similarity index 100%
rename from src/emu/machine/7474.c
rename to src/devices/machine/7474.c
diff --git a/src/emu/machine/7474.h b/src/devices/machine/7474.h
similarity index 100%
rename from src/emu/machine/7474.h
rename to src/devices/machine/7474.h
diff --git a/src/emu/machine/8042kbdc.c b/src/devices/machine/8042kbdc.c
similarity index 100%
rename from src/emu/machine/8042kbdc.c
rename to src/devices/machine/8042kbdc.c
diff --git a/src/emu/machine/8042kbdc.h b/src/devices/machine/8042kbdc.h
similarity index 100%
rename from src/emu/machine/8042kbdc.h
rename to src/devices/machine/8042kbdc.h
diff --git a/src/emu/machine/8530scc.c b/src/devices/machine/8530scc.c
similarity index 100%
rename from src/emu/machine/8530scc.c
rename to src/devices/machine/8530scc.c
diff --git a/src/emu/machine/8530scc.h b/src/devices/machine/8530scc.h
similarity index 100%
rename from src/emu/machine/8530scc.h
rename to src/devices/machine/8530scc.h
diff --git a/src/emu/machine/aakart.c b/src/devices/machine/aakart.c
similarity index 100%
rename from src/emu/machine/aakart.c
rename to src/devices/machine/aakart.c
diff --git a/src/emu/machine/aakart.h b/src/devices/machine/aakart.h
similarity index 100%
rename from src/emu/machine/aakart.h
rename to src/devices/machine/aakart.h
diff --git a/src/emu/machine/adc0808.c b/src/devices/machine/adc0808.c
similarity index 100%
rename from src/emu/machine/adc0808.c
rename to src/devices/machine/adc0808.c
diff --git a/src/emu/machine/adc0808.h b/src/devices/machine/adc0808.h
similarity index 100%
rename from src/emu/machine/adc0808.h
rename to src/devices/machine/adc0808.h
diff --git a/src/emu/machine/adc083x.c b/src/devices/machine/adc083x.c
similarity index 100%
rename from src/emu/machine/adc083x.c
rename to src/devices/machine/adc083x.c
diff --git a/src/emu/machine/adc083x.h b/src/devices/machine/adc083x.h
similarity index 100%
rename from src/emu/machine/adc083x.h
rename to src/devices/machine/adc083x.h
diff --git a/src/emu/machine/adc1038.c b/src/devices/machine/adc1038.c
similarity index 100%
rename from src/emu/machine/adc1038.c
rename to src/devices/machine/adc1038.c
diff --git a/src/emu/machine/adc1038.h b/src/devices/machine/adc1038.h
similarity index 100%
rename from src/emu/machine/adc1038.h
rename to src/devices/machine/adc1038.h
diff --git a/src/emu/machine/adc1213x.c b/src/devices/machine/adc1213x.c
similarity index 100%
rename from src/emu/machine/adc1213x.c
rename to src/devices/machine/adc1213x.c
diff --git a/src/emu/machine/adc1213x.h b/src/devices/machine/adc1213x.h
similarity index 100%
rename from src/emu/machine/adc1213x.h
rename to src/devices/machine/adc1213x.h
diff --git a/src/emu/machine/aicartc.c b/src/devices/machine/aicartc.c
similarity index 100%
rename from src/emu/machine/aicartc.c
rename to src/devices/machine/aicartc.c
diff --git a/src/emu/machine/aicartc.h b/src/devices/machine/aicartc.h
similarity index 100%
rename from src/emu/machine/aicartc.h
rename to src/devices/machine/aicartc.h
diff --git a/src/emu/machine/akiko.c b/src/devices/machine/akiko.c
similarity index 100%
rename from src/emu/machine/akiko.c
rename to src/devices/machine/akiko.c
diff --git a/src/emu/machine/akiko.h b/src/devices/machine/akiko.h
similarity index 100%
rename from src/emu/machine/akiko.h
rename to src/devices/machine/akiko.h
diff --git a/src/emu/machine/am53cf96.c b/src/devices/machine/am53cf96.c
similarity index 100%
rename from src/emu/machine/am53cf96.c
rename to src/devices/machine/am53cf96.c
diff --git a/src/emu/machine/am53cf96.h b/src/devices/machine/am53cf96.h
similarity index 100%
rename from src/emu/machine/am53cf96.h
rename to src/devices/machine/am53cf96.h
diff --git a/src/emu/machine/am9517a.c b/src/devices/machine/am9517a.c
similarity index 100%
rename from src/emu/machine/am9517a.c
rename to src/devices/machine/am9517a.c
diff --git a/src/emu/machine/am9517a.h b/src/devices/machine/am9517a.h
similarity index 100%
rename from src/emu/machine/am9517a.h
rename to src/devices/machine/am9517a.h
diff --git a/src/emu/machine/amigafdc.c b/src/devices/machine/amigafdc.c
similarity index 100%
rename from src/emu/machine/amigafdc.c
rename to src/devices/machine/amigafdc.c
diff --git a/src/emu/machine/amigafdc.h b/src/devices/machine/amigafdc.h
similarity index 100%
rename from src/emu/machine/amigafdc.h
rename to src/devices/machine/amigafdc.h
diff --git a/src/emu/machine/at28c16.c b/src/devices/machine/at28c16.c
similarity index 100%
rename from src/emu/machine/at28c16.c
rename to src/devices/machine/at28c16.c
diff --git a/src/emu/machine/at28c16.h b/src/devices/machine/at28c16.h
similarity index 100%
rename from src/emu/machine/at28c16.h
rename to src/devices/machine/at28c16.h
diff --git a/src/emu/machine/at29x.c b/src/devices/machine/at29x.c
similarity index 100%
rename from src/emu/machine/at29x.c
rename to src/devices/machine/at29x.c
diff --git a/src/emu/machine/at29x.h b/src/devices/machine/at29x.h
similarity index 100%
rename from src/emu/machine/at29x.h
rename to src/devices/machine/at29x.h
diff --git a/src/emu/machine/at45dbxx.c b/src/devices/machine/at45dbxx.c
similarity index 100%
rename from src/emu/machine/at45dbxx.c
rename to src/devices/machine/at45dbxx.c
diff --git a/src/emu/machine/at45dbxx.h b/src/devices/machine/at45dbxx.h
similarity index 100%
rename from src/emu/machine/at45dbxx.h
rename to src/devices/machine/at45dbxx.h
diff --git a/src/emu/machine/at_keybc.c b/src/devices/machine/at_keybc.c
similarity index 100%
rename from src/emu/machine/at_keybc.c
rename to src/devices/machine/at_keybc.c
diff --git a/src/emu/machine/at_keybc.h b/src/devices/machine/at_keybc.h
similarity index 100%
rename from src/emu/machine/at_keybc.h
rename to src/devices/machine/at_keybc.h
diff --git a/src/emu/machine/atadev.c b/src/devices/machine/atadev.c
similarity index 100%
rename from src/emu/machine/atadev.c
rename to src/devices/machine/atadev.c
diff --git a/src/emu/machine/atadev.h b/src/devices/machine/atadev.h
similarity index 100%
rename from src/emu/machine/atadev.h
rename to src/devices/machine/atadev.h
diff --git a/src/emu/machine/ataflash.c b/src/devices/machine/ataflash.c
similarity index 100%
rename from src/emu/machine/ataflash.c
rename to src/devices/machine/ataflash.c
diff --git a/src/emu/machine/ataflash.h b/src/devices/machine/ataflash.h
similarity index 100%
rename from src/emu/machine/ataflash.h
rename to src/devices/machine/ataflash.h
diff --git a/src/emu/machine/atahle.c b/src/devices/machine/atahle.c
similarity index 100%
rename from src/emu/machine/atahle.c
rename to src/devices/machine/atahle.c
diff --git a/src/emu/machine/atahle.h b/src/devices/machine/atahle.h
similarity index 100%
rename from src/emu/machine/atahle.h
rename to src/devices/machine/atahle.h
diff --git a/src/emu/machine/ataintf.c b/src/devices/machine/ataintf.c
similarity index 100%
rename from src/emu/machine/ataintf.c
rename to src/devices/machine/ataintf.c
diff --git a/src/emu/machine/ataintf.h b/src/devices/machine/ataintf.h
similarity index 100%
rename from src/emu/machine/ataintf.h
rename to src/devices/machine/ataintf.h
diff --git a/src/emu/machine/atapicdr.c b/src/devices/machine/atapicdr.c
similarity index 100%
rename from src/emu/machine/atapicdr.c
rename to src/devices/machine/atapicdr.c
diff --git a/src/emu/machine/atapicdr.h b/src/devices/machine/atapicdr.h
similarity index 100%
rename from src/emu/machine/atapicdr.h
rename to src/devices/machine/atapicdr.h
diff --git a/src/emu/machine/atapihle.c b/src/devices/machine/atapihle.c
similarity index 100%
rename from src/emu/machine/atapihle.c
rename to src/devices/machine/atapihle.c
diff --git a/src/emu/machine/atapihle.h b/src/devices/machine/atapihle.h
similarity index 100%
rename from src/emu/machine/atapihle.h
rename to src/devices/machine/atapihle.h
diff --git a/src/emu/machine/autoconfig.c b/src/devices/machine/autoconfig.c
similarity index 100%
rename from src/emu/machine/autoconfig.c
rename to src/devices/machine/autoconfig.c
diff --git a/src/emu/machine/autoconfig.h b/src/devices/machine/autoconfig.h
similarity index 100%
rename from src/emu/machine/autoconfig.h
rename to src/devices/machine/autoconfig.h
diff --git a/src/emu/machine/ay31015.c b/src/devices/machine/ay31015.c
similarity index 100%
rename from src/emu/machine/ay31015.c
rename to src/devices/machine/ay31015.c
diff --git a/src/emu/machine/ay31015.h b/src/devices/machine/ay31015.h
similarity index 100%
rename from src/emu/machine/ay31015.h
rename to src/devices/machine/ay31015.h
diff --git a/src/emu/machine/bankdev.c b/src/devices/machine/bankdev.c
similarity index 100%
rename from src/emu/machine/bankdev.c
rename to src/devices/machine/bankdev.c
diff --git a/src/emu/machine/bankdev.h b/src/devices/machine/bankdev.h
similarity index 100%
rename from src/emu/machine/bankdev.h
rename to src/devices/machine/bankdev.h
diff --git a/src/emu/machine/bcreader.c b/src/devices/machine/bcreader.c
similarity index 100%
rename from src/emu/machine/bcreader.c
rename to src/devices/machine/bcreader.c
diff --git a/src/emu/machine/bcreader.h b/src/devices/machine/bcreader.h
similarity index 100%
rename from src/emu/machine/bcreader.h
rename to src/devices/machine/bcreader.h
diff --git a/src/emu/machine/buffer.c b/src/devices/machine/buffer.c
similarity index 100%
rename from src/emu/machine/buffer.c
rename to src/devices/machine/buffer.c
diff --git a/src/emu/machine/buffer.h b/src/devices/machine/buffer.h
similarity index 100%
rename from src/emu/machine/buffer.h
rename to src/devices/machine/buffer.h
diff --git a/src/emu/machine/cdp1852.c b/src/devices/machine/cdp1852.c
similarity index 100%
rename from src/emu/machine/cdp1852.c
rename to src/devices/machine/cdp1852.c
diff --git a/src/emu/machine/cdp1852.h b/src/devices/machine/cdp1852.h
similarity index 100%
rename from src/emu/machine/cdp1852.h
rename to src/devices/machine/cdp1852.h
diff --git a/src/emu/machine/cdp1871.c b/src/devices/machine/cdp1871.c
similarity index 100%
rename from src/emu/machine/cdp1871.c
rename to src/devices/machine/cdp1871.c
diff --git a/src/emu/machine/cdp1871.h b/src/devices/machine/cdp1871.h
similarity index 100%
rename from src/emu/machine/cdp1871.h
rename to src/devices/machine/cdp1871.h
diff --git a/src/emu/machine/clock.c b/src/devices/machine/clock.c
similarity index 100%
rename from src/emu/machine/clock.c
rename to src/devices/machine/clock.c
diff --git a/src/emu/machine/clock.h b/src/devices/machine/clock.h
similarity index 100%
rename from src/emu/machine/clock.h
rename to src/devices/machine/clock.h
diff --git a/src/emu/machine/com8116.c b/src/devices/machine/com8116.c
similarity index 100%
rename from src/emu/machine/com8116.c
rename to src/devices/machine/com8116.c
diff --git a/src/emu/machine/com8116.h b/src/devices/machine/com8116.h
similarity index 100%
rename from src/emu/machine/com8116.h
rename to src/devices/machine/com8116.h
diff --git a/src/emu/machine/corvushd.c b/src/devices/machine/corvushd.c
similarity index 100%
rename from src/emu/machine/corvushd.c
rename to src/devices/machine/corvushd.c
diff --git a/src/emu/machine/corvushd.h b/src/devices/machine/corvushd.h
similarity index 100%
rename from src/emu/machine/corvushd.h
rename to src/devices/machine/corvushd.h
diff --git a/src/emu/machine/cr511b.c b/src/devices/machine/cr511b.c
similarity index 100%
rename from src/emu/machine/cr511b.c
rename to src/devices/machine/cr511b.c
diff --git a/src/emu/machine/cr511b.h b/src/devices/machine/cr511b.h
similarity index 100%
rename from src/emu/machine/cr511b.h
rename to src/devices/machine/cr511b.h
diff --git a/src/emu/machine/cr589.c b/src/devices/machine/cr589.c
similarity index 100%
rename from src/emu/machine/cr589.c
rename to src/devices/machine/cr589.c
diff --git a/src/emu/machine/cr589.h b/src/devices/machine/cr589.h
similarity index 100%
rename from src/emu/machine/cr589.h
rename to src/devices/machine/cr589.h
diff --git a/src/emu/machine/cs4031.c b/src/devices/machine/cs4031.c
similarity index 100%
rename from src/emu/machine/cs4031.c
rename to src/devices/machine/cs4031.c
diff --git a/src/emu/machine/cs4031.h b/src/devices/machine/cs4031.h
similarity index 100%
rename from src/emu/machine/cs4031.h
rename to src/devices/machine/cs4031.h
diff --git a/src/emu/machine/cs8221.c b/src/devices/machine/cs8221.c
similarity index 100%
rename from src/emu/machine/cs8221.c
rename to src/devices/machine/cs8221.c
diff --git a/src/emu/machine/cs8221.h b/src/devices/machine/cs8221.h
similarity index 100%
rename from src/emu/machine/cs8221.h
rename to src/devices/machine/cs8221.h
diff --git a/src/emu/machine/diablo_hd.c b/src/devices/machine/diablo_hd.c
similarity index 100%
rename from src/emu/machine/diablo_hd.c
rename to src/devices/machine/diablo_hd.c
diff --git a/src/emu/machine/diablo_hd.h b/src/devices/machine/diablo_hd.h
similarity index 100%
rename from src/emu/machine/diablo_hd.h
rename to src/devices/machine/diablo_hd.h
diff --git a/src/emu/machine/dmac.c b/src/devices/machine/dmac.c
similarity index 100%
rename from src/emu/machine/dmac.c
rename to src/devices/machine/dmac.c
diff --git a/src/emu/machine/dmac.h b/src/devices/machine/dmac.h
similarity index 100%
rename from src/emu/machine/dmac.h
rename to src/devices/machine/dmac.h
diff --git a/src/emu/machine/dp8390.c b/src/devices/machine/dp8390.c
similarity index 100%
rename from src/emu/machine/dp8390.c
rename to src/devices/machine/dp8390.c
diff --git a/src/emu/machine/dp8390.h b/src/devices/machine/dp8390.h
similarity index 100%
rename from src/emu/machine/dp8390.h
rename to src/devices/machine/dp8390.h
diff --git a/src/emu/machine/ds1204.c b/src/devices/machine/ds1204.c
similarity index 100%
rename from src/emu/machine/ds1204.c
rename to src/devices/machine/ds1204.c
diff --git a/src/emu/machine/ds1204.h b/src/devices/machine/ds1204.h
similarity index 100%
rename from src/emu/machine/ds1204.h
rename to src/devices/machine/ds1204.h
diff --git a/src/emu/machine/ds128x.c b/src/devices/machine/ds128x.c
similarity index 100%
rename from src/emu/machine/ds128x.c
rename to src/devices/machine/ds128x.c
diff --git a/src/emu/machine/ds128x.h b/src/devices/machine/ds128x.h
similarity index 100%
rename from src/emu/machine/ds128x.h
rename to src/devices/machine/ds128x.h
diff --git a/src/emu/machine/ds1302.c b/src/devices/machine/ds1302.c
similarity index 100%
rename from src/emu/machine/ds1302.c
rename to src/devices/machine/ds1302.c
diff --git a/src/emu/machine/ds1302.h b/src/devices/machine/ds1302.h
similarity index 100%
rename from src/emu/machine/ds1302.h
rename to src/devices/machine/ds1302.h
diff --git a/src/emu/machine/ds1315.c b/src/devices/machine/ds1315.c
similarity index 100%
rename from src/emu/machine/ds1315.c
rename to src/devices/machine/ds1315.c
diff --git a/src/emu/machine/ds1315.h b/src/devices/machine/ds1315.h
similarity index 100%
rename from src/emu/machine/ds1315.h
rename to src/devices/machine/ds1315.h
diff --git a/src/emu/machine/ds2401.c b/src/devices/machine/ds2401.c
similarity index 100%
rename from src/emu/machine/ds2401.c
rename to src/devices/machine/ds2401.c
diff --git a/src/emu/machine/ds2401.h b/src/devices/machine/ds2401.h
similarity index 100%
rename from src/emu/machine/ds2401.h
rename to src/devices/machine/ds2401.h
diff --git a/src/emu/machine/ds2404.c b/src/devices/machine/ds2404.c
similarity index 100%
rename from src/emu/machine/ds2404.c
rename to src/devices/machine/ds2404.c
diff --git a/src/emu/machine/ds2404.h b/src/devices/machine/ds2404.h
similarity index 100%
rename from src/emu/machine/ds2404.h
rename to src/devices/machine/ds2404.h
diff --git a/src/emu/machine/ds75160a.c b/src/devices/machine/ds75160a.c
similarity index 100%
rename from src/emu/machine/ds75160a.c
rename to src/devices/machine/ds75160a.c
diff --git a/src/emu/machine/ds75160a.h b/src/devices/machine/ds75160a.h
similarity index 100%
rename from src/emu/machine/ds75160a.h
rename to src/devices/machine/ds75160a.h
diff --git a/src/emu/machine/ds75161a.c b/src/devices/machine/ds75161a.c
similarity index 100%
rename from src/emu/machine/ds75161a.c
rename to src/devices/machine/ds75161a.c
diff --git a/src/emu/machine/ds75161a.h b/src/devices/machine/ds75161a.h
similarity index 100%
rename from src/emu/machine/ds75161a.h
rename to src/devices/machine/ds75161a.h
diff --git a/src/emu/machine/e0516.c b/src/devices/machine/e0516.c
similarity index 100%
rename from src/emu/machine/e0516.c
rename to src/devices/machine/e0516.c
diff --git a/src/emu/machine/e0516.h b/src/devices/machine/e0516.h
similarity index 100%
rename from src/emu/machine/e0516.h
rename to src/devices/machine/e0516.h
diff --git a/src/emu/machine/e05a03.c b/src/devices/machine/e05a03.c
similarity index 100%
rename from src/emu/machine/e05a03.c
rename to src/devices/machine/e05a03.c
diff --git a/src/emu/machine/e05a03.h b/src/devices/machine/e05a03.h
similarity index 100%
rename from src/emu/machine/e05a03.h
rename to src/devices/machine/e05a03.h
diff --git a/src/emu/machine/e05a30.c b/src/devices/machine/e05a30.c
similarity index 100%
rename from src/emu/machine/e05a30.c
rename to src/devices/machine/e05a30.c
diff --git a/src/emu/machine/e05a30.h b/src/devices/machine/e05a30.h
similarity index 100%
rename from src/emu/machine/e05a30.h
rename to src/devices/machine/e05a30.h
diff --git a/src/emu/machine/eeprom.c b/src/devices/machine/eeprom.c
similarity index 100%
rename from src/emu/machine/eeprom.c
rename to src/devices/machine/eeprom.c
diff --git a/src/emu/machine/eeprom.h b/src/devices/machine/eeprom.h
similarity index 100%
rename from src/emu/machine/eeprom.h
rename to src/devices/machine/eeprom.h
diff --git a/src/emu/machine/eeprompar.c b/src/devices/machine/eeprompar.c
similarity index 100%
rename from src/emu/machine/eeprompar.c
rename to src/devices/machine/eeprompar.c
diff --git a/src/emu/machine/eeprompar.h b/src/devices/machine/eeprompar.h
similarity index 100%
rename from src/emu/machine/eeprompar.h
rename to src/devices/machine/eeprompar.h
diff --git a/src/emu/machine/eepromser.c b/src/devices/machine/eepromser.c
similarity index 100%
rename from src/emu/machine/eepromser.c
rename to src/devices/machine/eepromser.c
diff --git a/src/emu/machine/eepromser.h b/src/devices/machine/eepromser.h
similarity index 100%
rename from src/emu/machine/eepromser.h
rename to src/devices/machine/eepromser.h
diff --git a/src/emu/machine/er2055.c b/src/devices/machine/er2055.c
similarity index 100%
rename from src/emu/machine/er2055.c
rename to src/devices/machine/er2055.c
diff --git a/src/emu/machine/er2055.h b/src/devices/machine/er2055.h
similarity index 100%
rename from src/emu/machine/er2055.h
rename to src/devices/machine/er2055.h
diff --git a/src/emu/machine/f3853.c b/src/devices/machine/f3853.c
similarity index 100%
rename from src/emu/machine/f3853.c
rename to src/devices/machine/f3853.c
diff --git a/src/emu/machine/f3853.h b/src/devices/machine/f3853.h
similarity index 100%
rename from src/emu/machine/f3853.h
rename to src/devices/machine/f3853.h
diff --git a/src/emu/machine/fdc37c665gt.c b/src/devices/machine/fdc37c665gt.c
similarity index 100%
rename from src/emu/machine/fdc37c665gt.c
rename to src/devices/machine/fdc37c665gt.c
diff --git a/src/emu/machine/fdc37c665gt.h b/src/devices/machine/fdc37c665gt.h
similarity index 100%
rename from src/emu/machine/fdc37c665gt.h
rename to src/devices/machine/fdc37c665gt.h
diff --git a/src/emu/machine/fdc_pll.c b/src/devices/machine/fdc_pll.c
similarity index 100%
rename from src/emu/machine/fdc_pll.c
rename to src/devices/machine/fdc_pll.c
diff --git a/src/emu/machine/fdc_pll.h b/src/devices/machine/fdc_pll.h
similarity index 100%
rename from src/emu/machine/fdc_pll.h
rename to src/devices/machine/fdc_pll.h
diff --git a/src/emu/machine/gayle.c b/src/devices/machine/gayle.c
similarity index 100%
rename from src/emu/machine/gayle.c
rename to src/devices/machine/gayle.c
diff --git a/src/emu/machine/gayle.h b/src/devices/machine/gayle.h
similarity index 100%
rename from src/emu/machine/gayle.h
rename to src/devices/machine/gayle.h
diff --git a/src/emu/machine/generic.c b/src/devices/machine/generic.c
similarity index 100%
rename from src/emu/machine/generic.c
rename to src/devices/machine/generic.c
diff --git a/src/emu/machine/generic.h b/src/devices/machine/generic.h
similarity index 100%
rename from src/emu/machine/generic.h
rename to src/devices/machine/generic.h
diff --git a/src/emu/machine/hd63450.c b/src/devices/machine/hd63450.c
similarity index 100%
rename from src/emu/machine/hd63450.c
rename to src/devices/machine/hd63450.c
diff --git a/src/emu/machine/hd63450.h b/src/devices/machine/hd63450.h
similarity index 100%
rename from src/emu/machine/hd63450.h
rename to src/devices/machine/hd63450.h
diff --git a/src/emu/machine/hd64610.c b/src/devices/machine/hd64610.c
similarity index 100%
rename from src/emu/machine/hd64610.c
rename to src/devices/machine/hd64610.c
diff --git a/src/emu/machine/hd64610.h b/src/devices/machine/hd64610.h
similarity index 100%
rename from src/emu/machine/hd64610.h
rename to src/devices/machine/hd64610.h
diff --git a/src/emu/machine/hdc92x4.c b/src/devices/machine/hdc92x4.c
similarity index 100%
rename from src/emu/machine/hdc92x4.c
rename to src/devices/machine/hdc92x4.c
diff --git a/src/emu/machine/hdc92x4.h b/src/devices/machine/hdc92x4.h
similarity index 100%
rename from src/emu/machine/hdc92x4.h
rename to src/devices/machine/hdc92x4.h
diff --git a/src/emu/machine/i2cmem.c b/src/devices/machine/i2cmem.c
similarity index 100%
rename from src/emu/machine/i2cmem.c
rename to src/devices/machine/i2cmem.c
diff --git a/src/emu/machine/i2cmem.h b/src/devices/machine/i2cmem.h
similarity index 100%
rename from src/emu/machine/i2cmem.h
rename to src/devices/machine/i2cmem.h
diff --git a/src/emu/machine/i6300esb.c b/src/devices/machine/i6300esb.c
similarity index 100%
rename from src/emu/machine/i6300esb.c
rename to src/devices/machine/i6300esb.c
diff --git a/src/emu/machine/i6300esb.h b/src/devices/machine/i6300esb.h
similarity index 100%
rename from src/emu/machine/i6300esb.h
rename to src/devices/machine/i6300esb.h
diff --git a/src/emu/machine/i80130.c b/src/devices/machine/i80130.c
similarity index 100%
rename from src/emu/machine/i80130.c
rename to src/devices/machine/i80130.c
diff --git a/src/emu/machine/i80130.h b/src/devices/machine/i80130.h
similarity index 100%
rename from src/emu/machine/i80130.h
rename to src/devices/machine/i80130.h
diff --git a/src/emu/machine/i8155.c b/src/devices/machine/i8155.c
similarity index 100%
rename from src/emu/machine/i8155.c
rename to src/devices/machine/i8155.c
diff --git a/src/emu/machine/i8155.h b/src/devices/machine/i8155.h
similarity index 100%
rename from src/emu/machine/i8155.h
rename to src/devices/machine/i8155.h
diff --git a/src/emu/machine/i8212.c b/src/devices/machine/i8212.c
similarity index 100%
rename from src/emu/machine/i8212.c
rename to src/devices/machine/i8212.c
diff --git a/src/emu/machine/i8212.h b/src/devices/machine/i8212.h
similarity index 100%
rename from src/emu/machine/i8212.h
rename to src/devices/machine/i8212.h
diff --git a/src/emu/machine/i8214.c b/src/devices/machine/i8214.c
similarity index 100%
rename from src/emu/machine/i8214.c
rename to src/devices/machine/i8214.c
diff --git a/src/emu/machine/i8214.h b/src/devices/machine/i8214.h
similarity index 100%
rename from src/emu/machine/i8214.h
rename to src/devices/machine/i8214.h
diff --git a/src/emu/machine/i8243.c b/src/devices/machine/i8243.c
similarity index 100%
rename from src/emu/machine/i8243.c
rename to src/devices/machine/i8243.c
diff --git a/src/emu/machine/i8243.h b/src/devices/machine/i8243.h
similarity index 100%
rename from src/emu/machine/i8243.h
rename to src/devices/machine/i8243.h
diff --git a/src/emu/machine/i8251.c b/src/devices/machine/i8251.c
similarity index 100%
rename from src/emu/machine/i8251.c
rename to src/devices/machine/i8251.c
diff --git a/src/emu/machine/i8251.h b/src/devices/machine/i8251.h
similarity index 100%
rename from src/emu/machine/i8251.h
rename to src/devices/machine/i8251.h
diff --git a/src/emu/machine/i82541.c b/src/devices/machine/i82541.c
similarity index 100%
rename from src/emu/machine/i82541.c
rename to src/devices/machine/i82541.c
diff --git a/src/emu/machine/i82541.h b/src/devices/machine/i82541.h
similarity index 100%
rename from src/emu/machine/i82541.h
rename to src/devices/machine/i82541.h
diff --git a/src/emu/machine/i8255.c b/src/devices/machine/i8255.c
similarity index 100%
rename from src/emu/machine/i8255.c
rename to src/devices/machine/i8255.c
diff --git a/src/emu/machine/i8255.h b/src/devices/machine/i8255.h
similarity index 100%
rename from src/emu/machine/i8255.h
rename to src/devices/machine/i8255.h
diff --git a/src/emu/machine/i8257.c b/src/devices/machine/i8257.c
similarity index 100%
rename from src/emu/machine/i8257.c
rename to src/devices/machine/i8257.c
diff --git a/src/emu/machine/i8257.h b/src/devices/machine/i8257.h
similarity index 100%
rename from src/emu/machine/i8257.h
rename to src/devices/machine/i8257.h
diff --git a/src/emu/machine/i8271.c b/src/devices/machine/i8271.c
similarity index 100%
rename from src/emu/machine/i8271.c
rename to src/devices/machine/i8271.c
diff --git a/src/emu/machine/i8271.h b/src/devices/machine/i8271.h
similarity index 100%
rename from src/emu/machine/i8271.h
rename to src/devices/machine/i8271.h
diff --git a/src/emu/machine/i8279.c b/src/devices/machine/i8279.c
similarity index 100%
rename from src/emu/machine/i8279.c
rename to src/devices/machine/i8279.c
diff --git a/src/emu/machine/i8279.h b/src/devices/machine/i8279.h
similarity index 100%
rename from src/emu/machine/i8279.h
rename to src/devices/machine/i8279.h
diff --git a/src/emu/machine/i82875p.c b/src/devices/machine/i82875p.c
similarity index 100%
rename from src/emu/machine/i82875p.c
rename to src/devices/machine/i82875p.c
diff --git a/src/emu/machine/i82875p.h b/src/devices/machine/i82875p.h
similarity index 100%
rename from src/emu/machine/i82875p.h
rename to src/devices/machine/i82875p.h
diff --git a/src/emu/machine/i8355.c b/src/devices/machine/i8355.c
similarity index 100%
rename from src/emu/machine/i8355.c
rename to src/devices/machine/i8355.c
diff --git a/src/emu/machine/i8355.h b/src/devices/machine/i8355.h
similarity index 100%
rename from src/emu/machine/i8355.h
rename to src/devices/machine/i8355.h
diff --git a/src/emu/machine/idectrl.c b/src/devices/machine/idectrl.c
similarity index 100%
rename from src/emu/machine/idectrl.c
rename to src/devices/machine/idectrl.c
diff --git a/src/emu/machine/idectrl.h b/src/devices/machine/idectrl.h
similarity index 100%
rename from src/emu/machine/idectrl.h
rename to src/devices/machine/idectrl.h
diff --git a/src/emu/machine/idehd.c b/src/devices/machine/idehd.c
similarity index 100%
rename from src/emu/machine/idehd.c
rename to src/devices/machine/idehd.c
diff --git a/src/emu/machine/idehd.h b/src/devices/machine/idehd.h
similarity index 100%
rename from src/emu/machine/idehd.h
rename to src/devices/machine/idehd.h
diff --git a/src/emu/machine/im6402.c b/src/devices/machine/im6402.c
similarity index 100%
rename from src/emu/machine/im6402.c
rename to src/devices/machine/im6402.c
diff --git a/src/emu/machine/im6402.h b/src/devices/machine/im6402.h
similarity index 100%
rename from src/emu/machine/im6402.h
rename to src/devices/machine/im6402.h
diff --git a/src/emu/machine/ins8154.c b/src/devices/machine/ins8154.c
similarity index 100%
rename from src/emu/machine/ins8154.c
rename to src/devices/machine/ins8154.c
diff --git a/src/emu/machine/ins8154.h b/src/devices/machine/ins8154.h
similarity index 100%
rename from src/emu/machine/ins8154.h
rename to src/devices/machine/ins8154.h
diff --git a/src/emu/machine/ins8250.c b/src/devices/machine/ins8250.c
similarity index 100%
rename from src/emu/machine/ins8250.c
rename to src/devices/machine/ins8250.c
diff --git a/src/emu/machine/ins8250.h b/src/devices/machine/ins8250.h
similarity index 100%
rename from src/emu/machine/ins8250.h
rename to src/devices/machine/ins8250.h
diff --git a/src/emu/machine/intelfsh.c b/src/devices/machine/intelfsh.c
similarity index 100%
rename from src/emu/machine/intelfsh.c
rename to src/devices/machine/intelfsh.c
diff --git a/src/emu/machine/intelfsh.h b/src/devices/machine/intelfsh.h
similarity index 100%
rename from src/emu/machine/intelfsh.h
rename to src/devices/machine/intelfsh.h
diff --git a/src/emu/machine/jvsdev.c b/src/devices/machine/jvsdev.c
similarity index 100%
rename from src/emu/machine/jvsdev.c
rename to src/devices/machine/jvsdev.c
diff --git a/src/emu/machine/jvsdev.h b/src/devices/machine/jvsdev.h
similarity index 100%
rename from src/emu/machine/jvsdev.h
rename to src/devices/machine/jvsdev.h
diff --git a/src/emu/machine/jvshost.c b/src/devices/machine/jvshost.c
similarity index 100%
rename from src/emu/machine/jvshost.c
rename to src/devices/machine/jvshost.c
diff --git a/src/emu/machine/jvshost.h b/src/devices/machine/jvshost.h
similarity index 100%
rename from src/emu/machine/jvshost.h
rename to src/devices/machine/jvshost.h
diff --git a/src/emu/machine/k033906.c b/src/devices/machine/k033906.c
similarity index 100%
rename from src/emu/machine/k033906.c
rename to src/devices/machine/k033906.c
diff --git a/src/emu/machine/k033906.h b/src/devices/machine/k033906.h
similarity index 100%
rename from src/emu/machine/k033906.h
rename to src/devices/machine/k033906.h
diff --git a/src/emu/machine/k053252.c b/src/devices/machine/k053252.c
similarity index 100%
rename from src/emu/machine/k053252.c
rename to src/devices/machine/k053252.c
diff --git a/src/emu/machine/k053252.h b/src/devices/machine/k053252.h
similarity index 100%
rename from src/emu/machine/k053252.h
rename to src/devices/machine/k053252.h
diff --git a/src/emu/machine/k056230.c b/src/devices/machine/k056230.c
similarity index 100%
rename from src/emu/machine/k056230.c
rename to src/devices/machine/k056230.c
diff --git a/src/emu/machine/k056230.h b/src/devices/machine/k056230.h
similarity index 100%
rename from src/emu/machine/k056230.h
rename to src/devices/machine/k056230.h
diff --git a/src/emu/machine/kb3600.c b/src/devices/machine/kb3600.c
similarity index 100%
rename from src/emu/machine/kb3600.c
rename to src/devices/machine/kb3600.c
diff --git a/src/emu/machine/kb3600.h b/src/devices/machine/kb3600.h
similarity index 100%
rename from src/emu/machine/kb3600.h
rename to src/devices/machine/kb3600.h
diff --git a/src/emu/machine/keyboard.c b/src/devices/machine/keyboard.c
similarity index 100%
rename from src/emu/machine/keyboard.c
rename to src/devices/machine/keyboard.c
diff --git a/src/emu/machine/keyboard.h b/src/devices/machine/keyboard.h
similarity index 100%
rename from src/emu/machine/keyboard.h
rename to src/devices/machine/keyboard.h
diff --git a/src/emu/machine/kr2376.c b/src/devices/machine/kr2376.c
similarity index 100%
rename from src/emu/machine/kr2376.c
rename to src/devices/machine/kr2376.c
diff --git a/src/emu/machine/kr2376.h b/src/devices/machine/kr2376.h
similarity index 100%
rename from src/emu/machine/kr2376.h
rename to src/devices/machine/kr2376.h
diff --git a/src/emu/machine/laserdsc.c b/src/devices/machine/laserdsc.c
similarity index 100%
rename from src/emu/machine/laserdsc.c
rename to src/devices/machine/laserdsc.c
diff --git a/src/emu/machine/laserdsc.h b/src/devices/machine/laserdsc.h
similarity index 100%
rename from src/emu/machine/laserdsc.h
rename to src/devices/machine/laserdsc.h
diff --git a/src/emu/machine/latch.c b/src/devices/machine/latch.c
similarity index 100%
rename from src/emu/machine/latch.c
rename to src/devices/machine/latch.c
diff --git a/src/emu/machine/latch.h b/src/devices/machine/latch.h
similarity index 100%
rename from src/emu/machine/latch.h
rename to src/devices/machine/latch.h
diff --git a/src/emu/machine/latch8.c b/src/devices/machine/latch8.c
similarity index 100%
rename from src/emu/machine/latch8.c
rename to src/devices/machine/latch8.c
diff --git a/src/emu/machine/latch8.h b/src/devices/machine/latch8.h
similarity index 100%
rename from src/emu/machine/latch8.h
rename to src/devices/machine/latch8.h
diff --git a/src/emu/machine/lc89510.c b/src/devices/machine/lc89510.c
similarity index 100%
rename from src/emu/machine/lc89510.c
rename to src/devices/machine/lc89510.c
diff --git a/src/emu/machine/lc89510.h b/src/devices/machine/lc89510.h
similarity index 100%
rename from src/emu/machine/lc89510.h
rename to src/devices/machine/lc89510.h
diff --git a/src/emu/machine/ldpr8210.c b/src/devices/machine/ldpr8210.c
similarity index 100%
rename from src/emu/machine/ldpr8210.c
rename to src/devices/machine/ldpr8210.c
diff --git a/src/emu/machine/ldpr8210.h b/src/devices/machine/ldpr8210.h
similarity index 100%
rename from src/emu/machine/ldpr8210.h
rename to src/devices/machine/ldpr8210.h
diff --git a/src/emu/machine/ldstub.c b/src/devices/machine/ldstub.c
similarity index 100%
rename from src/emu/machine/ldstub.c
rename to src/devices/machine/ldstub.c
diff --git a/src/emu/machine/ldstub.h b/src/devices/machine/ldstub.h
similarity index 100%
rename from src/emu/machine/ldstub.h
rename to src/devices/machine/ldstub.h
diff --git a/src/emu/machine/ldv1000.c b/src/devices/machine/ldv1000.c
similarity index 100%
rename from src/emu/machine/ldv1000.c
rename to src/devices/machine/ldv1000.c
diff --git a/src/emu/machine/ldv1000.h b/src/devices/machine/ldv1000.h
similarity index 100%
rename from src/emu/machine/ldv1000.h
rename to src/devices/machine/ldv1000.h
diff --git a/src/emu/machine/ldvp931.c b/src/devices/machine/ldvp931.c
similarity index 100%
rename from src/emu/machine/ldvp931.c
rename to src/devices/machine/ldvp931.c
diff --git a/src/emu/machine/ldvp931.h b/src/devices/machine/ldvp931.h
similarity index 100%
rename from src/emu/machine/ldvp931.h
rename to src/devices/machine/ldvp931.h
diff --git a/src/emu/machine/legscsi.c b/src/devices/machine/legscsi.c
similarity index 100%
rename from src/emu/machine/legscsi.c
rename to src/devices/machine/legscsi.c
diff --git a/src/emu/machine/legscsi.h b/src/devices/machine/legscsi.h
similarity index 100%
rename from src/emu/machine/legscsi.h
rename to src/devices/machine/legscsi.h
diff --git a/src/emu/machine/lh5810.c b/src/devices/machine/lh5810.c
similarity index 100%
rename from src/emu/machine/lh5810.c
rename to src/devices/machine/lh5810.c
diff --git a/src/emu/machine/lh5810.h b/src/devices/machine/lh5810.h
similarity index 100%
rename from src/emu/machine/lh5810.h
rename to src/devices/machine/lh5810.h
diff --git a/src/emu/machine/linflash.c b/src/devices/machine/linflash.c
similarity index 100%
rename from src/emu/machine/linflash.c
rename to src/devices/machine/linflash.c
diff --git a/src/emu/machine/linflash.h b/src/devices/machine/linflash.h
similarity index 100%
rename from src/emu/machine/linflash.h
rename to src/devices/machine/linflash.h
diff --git a/src/emu/machine/lpc-acpi.c b/src/devices/machine/lpc-acpi.c
similarity index 100%
rename from src/emu/machine/lpc-acpi.c
rename to src/devices/machine/lpc-acpi.c
diff --git a/src/emu/machine/lpc-acpi.h b/src/devices/machine/lpc-acpi.h
similarity index 100%
rename from src/emu/machine/lpc-acpi.h
rename to src/devices/machine/lpc-acpi.h
diff --git a/src/emu/machine/lpc-pit.c b/src/devices/machine/lpc-pit.c
similarity index 100%
rename from src/emu/machine/lpc-pit.c
rename to src/devices/machine/lpc-pit.c
diff --git a/src/emu/machine/lpc-pit.h b/src/devices/machine/lpc-pit.h
similarity index 100%
rename from src/emu/machine/lpc-pit.h
rename to src/devices/machine/lpc-pit.h
diff --git a/src/emu/machine/lpc-rtc.c b/src/devices/machine/lpc-rtc.c
similarity index 100%
rename from src/emu/machine/lpc-rtc.c
rename to src/devices/machine/lpc-rtc.c
diff --git a/src/emu/machine/lpc-rtc.h b/src/devices/machine/lpc-rtc.h
similarity index 100%
rename from src/emu/machine/lpc-rtc.h
rename to src/devices/machine/lpc-rtc.h
diff --git a/src/emu/machine/lpc.c b/src/devices/machine/lpc.c
similarity index 100%
rename from src/emu/machine/lpc.c
rename to src/devices/machine/lpc.c
diff --git a/src/emu/machine/lpc.h b/src/devices/machine/lpc.h
similarity index 100%
rename from src/emu/machine/lpc.h
rename to src/devices/machine/lpc.h
diff --git a/src/emu/machine/lpci.c b/src/devices/machine/lpci.c
similarity index 100%
rename from src/emu/machine/lpci.c
rename to src/devices/machine/lpci.c
diff --git a/src/emu/machine/lpci.h b/src/devices/machine/lpci.h
similarity index 100%
rename from src/emu/machine/lpci.h
rename to src/devices/machine/lpci.h
diff --git a/src/emu/machine/m6m80011ap.c b/src/devices/machine/m6m80011ap.c
similarity index 100%
rename from src/emu/machine/m6m80011ap.c
rename to src/devices/machine/m6m80011ap.c
diff --git a/src/emu/machine/m6m80011ap.h b/src/devices/machine/m6m80011ap.h
similarity index 100%
rename from src/emu/machine/m6m80011ap.h
rename to src/devices/machine/m6m80011ap.h
diff --git a/src/emu/machine/matsucd.c b/src/devices/machine/matsucd.c
similarity index 100%
rename from src/emu/machine/matsucd.c
rename to src/devices/machine/matsucd.c
diff --git a/src/emu/machine/matsucd.h b/src/devices/machine/matsucd.h
similarity index 100%
rename from src/emu/machine/matsucd.h
rename to src/devices/machine/matsucd.h
diff --git a/src/emu/machine/mb14241.c b/src/devices/machine/mb14241.c
similarity index 100%
rename from src/emu/machine/mb14241.c
rename to src/devices/machine/mb14241.c
diff --git a/src/emu/machine/mb14241.h b/src/devices/machine/mb14241.h
similarity index 100%
rename from src/emu/machine/mb14241.h
rename to src/devices/machine/mb14241.h
diff --git a/src/emu/machine/mb3773.c b/src/devices/machine/mb3773.c
similarity index 100%
rename from src/emu/machine/mb3773.c
rename to src/devices/machine/mb3773.c
diff --git a/src/emu/machine/mb3773.h b/src/devices/machine/mb3773.h
similarity index 100%
rename from src/emu/machine/mb3773.h
rename to src/devices/machine/mb3773.h
diff --git a/src/emu/machine/mb8421.c b/src/devices/machine/mb8421.c
similarity index 100%
rename from src/emu/machine/mb8421.c
rename to src/devices/machine/mb8421.c
diff --git a/src/emu/machine/mb8421.h b/src/devices/machine/mb8421.h
similarity index 100%
rename from src/emu/machine/mb8421.h
rename to src/devices/machine/mb8421.h
diff --git a/src/emu/machine/mb87078.c b/src/devices/machine/mb87078.c
similarity index 100%
rename from src/emu/machine/mb87078.c
rename to src/devices/machine/mb87078.c
diff --git a/src/emu/machine/mb87078.h b/src/devices/machine/mb87078.h
similarity index 100%
rename from src/emu/machine/mb87078.h
rename to src/devices/machine/mb87078.h
diff --git a/src/emu/machine/mb8795.c b/src/devices/machine/mb8795.c
similarity index 100%
rename from src/emu/machine/mb8795.c
rename to src/devices/machine/mb8795.c
diff --git a/src/emu/machine/mb8795.h b/src/devices/machine/mb8795.h
similarity index 100%
rename from src/emu/machine/mb8795.h
rename to src/devices/machine/mb8795.h
diff --git a/src/emu/machine/mb89352.c b/src/devices/machine/mb89352.c
similarity index 100%
rename from src/emu/machine/mb89352.c
rename to src/devices/machine/mb89352.c
diff --git a/src/emu/machine/mb89352.h b/src/devices/machine/mb89352.h
similarity index 100%
rename from src/emu/machine/mb89352.h
rename to src/devices/machine/mb89352.h
diff --git a/src/emu/machine/mb89363b.c b/src/devices/machine/mb89363b.c
similarity index 100%
rename from src/emu/machine/mb89363b.c
rename to src/devices/machine/mb89363b.c
diff --git a/src/emu/machine/mb89363b.h b/src/devices/machine/mb89363b.h
similarity index 100%
rename from src/emu/machine/mb89363b.h
rename to src/devices/machine/mb89363b.h
diff --git a/src/emu/machine/mb89371.c b/src/devices/machine/mb89371.c
similarity index 100%
rename from src/emu/machine/mb89371.c
rename to src/devices/machine/mb89371.c
diff --git a/src/emu/machine/mb89371.h b/src/devices/machine/mb89371.h
similarity index 100%
rename from src/emu/machine/mb89371.h
rename to src/devices/machine/mb89371.h
diff --git a/src/emu/machine/mc146818.c b/src/devices/machine/mc146818.c
similarity index 100%
rename from src/emu/machine/mc146818.c
rename to src/devices/machine/mc146818.c
diff --git a/src/emu/machine/mc146818.h b/src/devices/machine/mc146818.h
similarity index 100%
rename from src/emu/machine/mc146818.h
rename to src/devices/machine/mc146818.h
diff --git a/src/emu/machine/mc2661.c b/src/devices/machine/mc2661.c
similarity index 100%
rename from src/emu/machine/mc2661.c
rename to src/devices/machine/mc2661.c
diff --git a/src/emu/machine/mc2661.h b/src/devices/machine/mc2661.h
similarity index 100%
rename from src/emu/machine/mc2661.h
rename to src/devices/machine/mc2661.h
diff --git a/src/emu/machine/mc68328.c b/src/devices/machine/mc68328.c
similarity index 100%
rename from src/emu/machine/mc68328.c
rename to src/devices/machine/mc68328.c
diff --git a/src/emu/machine/mc68328.h b/src/devices/machine/mc68328.h
similarity index 100%
rename from src/emu/machine/mc68328.h
rename to src/devices/machine/mc68328.h
diff --git a/src/emu/machine/mc6843.c b/src/devices/machine/mc6843.c
similarity index 100%
rename from src/emu/machine/mc6843.c
rename to src/devices/machine/mc6843.c
diff --git a/src/emu/machine/mc6843.h b/src/devices/machine/mc6843.h
similarity index 100%
rename from src/emu/machine/mc6843.h
rename to src/devices/machine/mc6843.h
diff --git a/src/emu/machine/mc6846.c b/src/devices/machine/mc6846.c
similarity index 100%
rename from src/emu/machine/mc6846.c
rename to src/devices/machine/mc6846.c
diff --git a/src/emu/machine/mc6846.h b/src/devices/machine/mc6846.h
similarity index 100%
rename from src/emu/machine/mc6846.h
rename to src/devices/machine/mc6846.h
diff --git a/src/emu/machine/mc6852.c b/src/devices/machine/mc6852.c
similarity index 100%
rename from src/emu/machine/mc6852.c
rename to src/devices/machine/mc6852.c
diff --git a/src/emu/machine/mc6852.h b/src/devices/machine/mc6852.h
similarity index 100%
rename from src/emu/machine/mc6852.h
rename to src/devices/machine/mc6852.h
diff --git a/src/emu/machine/mc6854.c b/src/devices/machine/mc6854.c
similarity index 100%
rename from src/emu/machine/mc6854.c
rename to src/devices/machine/mc6854.c
diff --git a/src/emu/machine/mc6854.h b/src/devices/machine/mc6854.h
similarity index 100%
rename from src/emu/machine/mc6854.h
rename to src/devices/machine/mc6854.h
diff --git a/src/emu/machine/mc68681.c b/src/devices/machine/mc68681.c
similarity index 100%
rename from src/emu/machine/mc68681.c
rename to src/devices/machine/mc68681.c
diff --git a/src/emu/machine/mc68681.h b/src/devices/machine/mc68681.h
similarity index 100%
rename from src/emu/machine/mc68681.h
rename to src/devices/machine/mc68681.h
diff --git a/src/emu/machine/mc68901.c b/src/devices/machine/mc68901.c
similarity index 100%
rename from src/emu/machine/mc68901.c
rename to src/devices/machine/mc68901.c
diff --git a/src/emu/machine/mc68901.h b/src/devices/machine/mc68901.h
similarity index 100%
rename from src/emu/machine/mc68901.h
rename to src/devices/machine/mc68901.h
diff --git a/src/emu/machine/mccs1850.c b/src/devices/machine/mccs1850.c
similarity index 100%
rename from src/emu/machine/mccs1850.c
rename to src/devices/machine/mccs1850.c
diff --git a/src/emu/machine/mccs1850.h b/src/devices/machine/mccs1850.h
similarity index 100%
rename from src/emu/machine/mccs1850.h
rename to src/devices/machine/mccs1850.h
diff --git a/src/emu/machine/mcf5206e.c b/src/devices/machine/mcf5206e.c
similarity index 100%
rename from src/emu/machine/mcf5206e.c
rename to src/devices/machine/mcf5206e.c
diff --git a/src/emu/machine/mcf5206e.h b/src/devices/machine/mcf5206e.h
similarity index 100%
rename from src/emu/machine/mcf5206e.h
rename to src/devices/machine/mcf5206e.h
diff --git a/src/emu/machine/microtch.c b/src/devices/machine/microtch.c
similarity index 100%
rename from src/emu/machine/microtch.c
rename to src/devices/machine/microtch.c
diff --git a/src/emu/machine/microtch.h b/src/devices/machine/microtch.h
similarity index 100%
rename from src/emu/machine/microtch.h
rename to src/devices/machine/microtch.h
diff --git a/src/emu/machine/mm58167.c b/src/devices/machine/mm58167.c
similarity index 100%
rename from src/emu/machine/mm58167.c
rename to src/devices/machine/mm58167.c
diff --git a/src/emu/machine/mm58167.h b/src/devices/machine/mm58167.h
similarity index 100%
rename from src/emu/machine/mm58167.h
rename to src/devices/machine/mm58167.h
diff --git a/src/emu/machine/mm58274c.c b/src/devices/machine/mm58274c.c
similarity index 100%
rename from src/emu/machine/mm58274c.c
rename to src/devices/machine/mm58274c.c
diff --git a/src/emu/machine/mm58274c.h b/src/devices/machine/mm58274c.h
similarity index 100%
rename from src/emu/machine/mm58274c.h
rename to src/devices/machine/mm58274c.h
diff --git a/src/emu/machine/mm74c922.c b/src/devices/machine/mm74c922.c
similarity index 100%
rename from src/emu/machine/mm74c922.c
rename to src/devices/machine/mm74c922.c
diff --git a/src/emu/machine/mm74c922.h b/src/devices/machine/mm74c922.h
similarity index 100%
rename from src/emu/machine/mm74c922.h
rename to src/devices/machine/mm74c922.h
diff --git a/src/emu/machine/mos6526.c b/src/devices/machine/mos6526.c
similarity index 100%
rename from src/emu/machine/mos6526.c
rename to src/devices/machine/mos6526.c
diff --git a/src/emu/machine/mos6526.h b/src/devices/machine/mos6526.h
similarity index 100%
rename from src/emu/machine/mos6526.h
rename to src/devices/machine/mos6526.h
diff --git a/src/emu/machine/mos6529.c b/src/devices/machine/mos6529.c
similarity index 100%
rename from src/emu/machine/mos6529.c
rename to src/devices/machine/mos6529.c
diff --git a/src/emu/machine/mos6529.h b/src/devices/machine/mos6529.h
similarity index 100%
rename from src/emu/machine/mos6529.h
rename to src/devices/machine/mos6529.h
diff --git a/src/emu/machine/mos6530.c b/src/devices/machine/mos6530.c
similarity index 100%
rename from src/emu/machine/mos6530.c
rename to src/devices/machine/mos6530.c
diff --git a/src/emu/machine/mos6530.h b/src/devices/machine/mos6530.h
similarity index 100%
rename from src/emu/machine/mos6530.h
rename to src/devices/machine/mos6530.h
diff --git a/src/emu/machine/mos6530n.c b/src/devices/machine/mos6530n.c
similarity index 100%
rename from src/emu/machine/mos6530n.c
rename to src/devices/machine/mos6530n.c
diff --git a/src/emu/machine/mos6530n.h b/src/devices/machine/mos6530n.h
similarity index 100%
rename from src/emu/machine/mos6530n.h
rename to src/devices/machine/mos6530n.h
diff --git a/src/emu/machine/mos6551.c b/src/devices/machine/mos6551.c
similarity index 100%
rename from src/emu/machine/mos6551.c
rename to src/devices/machine/mos6551.c
diff --git a/src/emu/machine/mos6551.h b/src/devices/machine/mos6551.h
similarity index 100%
rename from src/emu/machine/mos6551.h
rename to src/devices/machine/mos6551.h
diff --git a/src/emu/machine/mos6702.c b/src/devices/machine/mos6702.c
similarity index 100%
rename from src/emu/machine/mos6702.c
rename to src/devices/machine/mos6702.c
diff --git a/src/emu/machine/mos6702.h b/src/devices/machine/mos6702.h
similarity index 100%
rename from src/emu/machine/mos6702.h
rename to src/devices/machine/mos6702.h
diff --git a/src/emu/machine/mos8706.c b/src/devices/machine/mos8706.c
similarity index 100%
rename from src/emu/machine/mos8706.c
rename to src/devices/machine/mos8706.c
diff --git a/src/emu/machine/mos8706.h b/src/devices/machine/mos8706.h
similarity index 100%
rename from src/emu/machine/mos8706.h
rename to src/devices/machine/mos8706.h
diff --git a/src/emu/machine/mos8722.c b/src/devices/machine/mos8722.c
similarity index 100%
rename from src/emu/machine/mos8722.c
rename to src/devices/machine/mos8722.c
diff --git a/src/emu/machine/mos8722.h b/src/devices/machine/mos8722.h
similarity index 100%
rename from src/emu/machine/mos8722.h
rename to src/devices/machine/mos8722.h
diff --git a/src/emu/machine/mos8726.c b/src/devices/machine/mos8726.c
similarity index 100%
rename from src/emu/machine/mos8726.c
rename to src/devices/machine/mos8726.c
diff --git a/src/emu/machine/mos8726.h b/src/devices/machine/mos8726.h
similarity index 100%
rename from src/emu/machine/mos8726.h
rename to src/devices/machine/mos8726.h
diff --git a/src/emu/machine/mpu401.c b/src/devices/machine/mpu401.c
similarity index 100%
rename from src/emu/machine/mpu401.c
rename to src/devices/machine/mpu401.c
diff --git a/src/emu/machine/mpu401.h b/src/devices/machine/mpu401.h
similarity index 100%
rename from src/emu/machine/mpu401.h
rename to src/devices/machine/mpu401.h
diff --git a/src/emu/machine/msm5832.c b/src/devices/machine/msm5832.c
similarity index 100%
rename from src/emu/machine/msm5832.c
rename to src/devices/machine/msm5832.c
diff --git a/src/emu/machine/msm5832.h b/src/devices/machine/msm5832.h
similarity index 100%
rename from src/emu/machine/msm5832.h
rename to src/devices/machine/msm5832.h
diff --git a/src/emu/machine/msm58321.c b/src/devices/machine/msm58321.c
similarity index 100%
rename from src/emu/machine/msm58321.c
rename to src/devices/machine/msm58321.c
diff --git a/src/emu/machine/msm58321.h b/src/devices/machine/msm58321.h
similarity index 100%
rename from src/emu/machine/msm58321.h
rename to src/devices/machine/msm58321.h
diff --git a/src/emu/machine/msm6242.c b/src/devices/machine/msm6242.c
similarity index 100%
rename from src/emu/machine/msm6242.c
rename to src/devices/machine/msm6242.c
diff --git a/src/emu/machine/msm6242.h b/src/devices/machine/msm6242.h
similarity index 100%
rename from src/emu/machine/msm6242.h
rename to src/devices/machine/msm6242.h
diff --git a/src/emu/machine/ncr5380.c b/src/devices/machine/ncr5380.c
similarity index 100%
rename from src/emu/machine/ncr5380.c
rename to src/devices/machine/ncr5380.c
diff --git a/src/emu/machine/ncr5380.h b/src/devices/machine/ncr5380.h
similarity index 100%
rename from src/emu/machine/ncr5380.h
rename to src/devices/machine/ncr5380.h
diff --git a/src/emu/machine/ncr5380n.c b/src/devices/machine/ncr5380n.c
similarity index 100%
rename from src/emu/machine/ncr5380n.c
rename to src/devices/machine/ncr5380n.c
diff --git a/src/emu/machine/ncr5380n.h b/src/devices/machine/ncr5380n.h
similarity index 100%
rename from src/emu/machine/ncr5380n.h
rename to src/devices/machine/ncr5380n.h
diff --git a/src/emu/machine/ncr5390.c b/src/devices/machine/ncr5390.c
similarity index 100%
rename from src/emu/machine/ncr5390.c
rename to src/devices/machine/ncr5390.c
diff --git a/src/emu/machine/ncr5390.h b/src/devices/machine/ncr5390.h
similarity index 100%
rename from src/emu/machine/ncr5390.h
rename to src/devices/machine/ncr5390.h
diff --git a/src/emu/machine/ncr539x.c b/src/devices/machine/ncr539x.c
similarity index 100%
rename from src/emu/machine/ncr539x.c
rename to src/devices/machine/ncr539x.c
diff --git a/src/emu/machine/ncr539x.h b/src/devices/machine/ncr539x.h
similarity index 100%
rename from src/emu/machine/ncr539x.h
rename to src/devices/machine/ncr539x.h
diff --git a/src/emu/machine/netlist.c b/src/devices/machine/netlist.c
similarity index 100%
rename from src/emu/machine/netlist.c
rename to src/devices/machine/netlist.c
diff --git a/src/emu/machine/netlist.h b/src/devices/machine/netlist.h
similarity index 100%
rename from src/emu/machine/netlist.h
rename to src/devices/machine/netlist.h
diff --git a/src/emu/machine/nmc9306.c b/src/devices/machine/nmc9306.c
similarity index 100%
rename from src/emu/machine/nmc9306.c
rename to src/devices/machine/nmc9306.c
diff --git a/src/emu/machine/nmc9306.h b/src/devices/machine/nmc9306.h
similarity index 100%
rename from src/emu/machine/nmc9306.h
rename to src/devices/machine/nmc9306.h
diff --git a/src/emu/machine/nsc810.c b/src/devices/machine/nsc810.c
similarity index 100%
rename from src/emu/machine/nsc810.c
rename to src/devices/machine/nsc810.c
diff --git a/src/emu/machine/nsc810.h b/src/devices/machine/nsc810.h
similarity index 100%
rename from src/emu/machine/nsc810.h
rename to src/devices/machine/nsc810.h
diff --git a/src/emu/machine/nscsi_bus.c b/src/devices/machine/nscsi_bus.c
similarity index 100%
rename from src/emu/machine/nscsi_bus.c
rename to src/devices/machine/nscsi_bus.c
diff --git a/src/emu/machine/nscsi_bus.h b/src/devices/machine/nscsi_bus.h
similarity index 100%
rename from src/emu/machine/nscsi_bus.h
rename to src/devices/machine/nscsi_bus.h
diff --git a/src/emu/machine/nscsi_cb.c b/src/devices/machine/nscsi_cb.c
similarity index 100%
rename from src/emu/machine/nscsi_cb.c
rename to src/devices/machine/nscsi_cb.c
diff --git a/src/emu/machine/nscsi_cb.h b/src/devices/machine/nscsi_cb.h
similarity index 100%
rename from src/emu/machine/nscsi_cb.h
rename to src/devices/machine/nscsi_cb.h
diff --git a/src/emu/machine/nscsi_cd.c b/src/devices/machine/nscsi_cd.c
similarity index 100%
rename from src/emu/machine/nscsi_cd.c
rename to src/devices/machine/nscsi_cd.c
diff --git a/src/emu/machine/nscsi_cd.h b/src/devices/machine/nscsi_cd.h
similarity index 100%
rename from src/emu/machine/nscsi_cd.h
rename to src/devices/machine/nscsi_cd.h
diff --git a/src/emu/machine/nscsi_hd.c b/src/devices/machine/nscsi_hd.c
similarity index 100%
rename from src/emu/machine/nscsi_hd.c
rename to src/devices/machine/nscsi_hd.c
diff --git a/src/emu/machine/nscsi_hd.h b/src/devices/machine/nscsi_hd.h
similarity index 100%
rename from src/emu/machine/nscsi_hd.h
rename to src/devices/machine/nscsi_hd.h
diff --git a/src/emu/machine/nscsi_s1410.c b/src/devices/machine/nscsi_s1410.c
similarity index 100%
rename from src/emu/machine/nscsi_s1410.c
rename to src/devices/machine/nscsi_s1410.c
diff --git a/src/emu/machine/nscsi_s1410.h b/src/devices/machine/nscsi_s1410.h
similarity index 100%
rename from src/emu/machine/nscsi_s1410.h
rename to src/devices/machine/nscsi_s1410.h
diff --git a/src/emu/machine/nvram.c b/src/devices/machine/nvram.c
similarity index 100%
rename from src/emu/machine/nvram.c
rename to src/devices/machine/nvram.c
diff --git a/src/emu/machine/nvram.h b/src/devices/machine/nvram.h
similarity index 100%
rename from src/emu/machine/nvram.h
rename to src/devices/machine/nvram.h
diff --git a/src/emu/machine/pc_fdc.c b/src/devices/machine/pc_fdc.c
similarity index 100%
rename from src/emu/machine/pc_fdc.c
rename to src/devices/machine/pc_fdc.c
diff --git a/src/emu/machine/pc_fdc.h b/src/devices/machine/pc_fdc.h
similarity index 100%
rename from src/emu/machine/pc_fdc.h
rename to src/devices/machine/pc_fdc.h
diff --git a/src/emu/machine/pc_lpt.c b/src/devices/machine/pc_lpt.c
similarity index 100%
rename from src/emu/machine/pc_lpt.c
rename to src/devices/machine/pc_lpt.c
diff --git a/src/emu/machine/pc_lpt.h b/src/devices/machine/pc_lpt.h
similarity index 100%
rename from src/emu/machine/pc_lpt.h
rename to src/devices/machine/pc_lpt.h
diff --git a/src/emu/machine/pccard.c b/src/devices/machine/pccard.c
similarity index 100%
rename from src/emu/machine/pccard.c
rename to src/devices/machine/pccard.c
diff --git a/src/emu/machine/pccard.h b/src/devices/machine/pccard.h
similarity index 100%
rename from src/emu/machine/pccard.h
rename to src/devices/machine/pccard.h
diff --git a/src/emu/machine/pcf8593.c b/src/devices/machine/pcf8593.c
similarity index 100%
rename from src/emu/machine/pcf8593.c
rename to src/devices/machine/pcf8593.c
diff --git a/src/emu/machine/pcf8593.h b/src/devices/machine/pcf8593.h
similarity index 100%
rename from src/emu/machine/pcf8593.h
rename to src/devices/machine/pcf8593.h
diff --git a/src/emu/machine/pci-apic.c b/src/devices/machine/pci-apic.c
similarity index 100%
rename from src/emu/machine/pci-apic.c
rename to src/devices/machine/pci-apic.c
diff --git a/src/emu/machine/pci-apic.h b/src/devices/machine/pci-apic.h
similarity index 100%
rename from src/emu/machine/pci-apic.h
rename to src/devices/machine/pci-apic.h
diff --git a/src/emu/machine/pci-sata.c b/src/devices/machine/pci-sata.c
similarity index 100%
rename from src/emu/machine/pci-sata.c
rename to src/devices/machine/pci-sata.c
diff --git a/src/emu/machine/pci-sata.h b/src/devices/machine/pci-sata.h
similarity index 100%
rename from src/emu/machine/pci-sata.h
rename to src/devices/machine/pci-sata.h
diff --git a/src/emu/machine/pci-smbus.c b/src/devices/machine/pci-smbus.c
similarity index 100%
rename from src/emu/machine/pci-smbus.c
rename to src/devices/machine/pci-smbus.c
diff --git a/src/emu/machine/pci-smbus.h b/src/devices/machine/pci-smbus.h
similarity index 100%
rename from src/emu/machine/pci-smbus.h
rename to src/devices/machine/pci-smbus.h
diff --git a/src/emu/machine/pci-usb.c b/src/devices/machine/pci-usb.c
similarity index 100%
rename from src/emu/machine/pci-usb.c
rename to src/devices/machine/pci-usb.c
diff --git a/src/emu/machine/pci-usb.h b/src/devices/machine/pci-usb.h
similarity index 100%
rename from src/emu/machine/pci-usb.h
rename to src/devices/machine/pci-usb.h
diff --git a/src/emu/machine/pci.c b/src/devices/machine/pci.c
similarity index 100%
rename from src/emu/machine/pci.c
rename to src/devices/machine/pci.c
diff --git a/src/emu/machine/pci.h b/src/devices/machine/pci.h
similarity index 100%
rename from src/emu/machine/pci.h
rename to src/devices/machine/pci.h
diff --git a/src/emu/machine/pci9050.c b/src/devices/machine/pci9050.c
similarity index 100%
rename from src/emu/machine/pci9050.c
rename to src/devices/machine/pci9050.c
diff --git a/src/emu/machine/pci9050.h b/src/devices/machine/pci9050.h
similarity index 100%
rename from src/emu/machine/pci9050.h
rename to src/devices/machine/pci9050.h
diff --git a/src/emu/machine/pckeybrd.c b/src/devices/machine/pckeybrd.c
similarity index 100%
rename from src/emu/machine/pckeybrd.c
rename to src/devices/machine/pckeybrd.c
diff --git a/src/emu/machine/pckeybrd.h b/src/devices/machine/pckeybrd.h
similarity index 100%
rename from src/emu/machine/pckeybrd.h
rename to src/devices/machine/pckeybrd.h
diff --git a/src/emu/machine/pic8259.c b/src/devices/machine/pic8259.c
similarity index 100%
rename from src/emu/machine/pic8259.c
rename to src/devices/machine/pic8259.c
diff --git a/src/emu/machine/pic8259.h b/src/devices/machine/pic8259.h
similarity index 100%
rename from src/emu/machine/pic8259.h
rename to src/devices/machine/pic8259.h
diff --git a/src/emu/machine/pit8253.c b/src/devices/machine/pit8253.c
similarity index 100%
rename from src/emu/machine/pit8253.c
rename to src/devices/machine/pit8253.c
diff --git a/src/emu/machine/pit8253.h b/src/devices/machine/pit8253.h
similarity index 100%
rename from src/emu/machine/pit8253.h
rename to src/devices/machine/pit8253.h
diff --git a/src/emu/machine/pla.c b/src/devices/machine/pla.c
similarity index 100%
rename from src/emu/machine/pla.c
rename to src/devices/machine/pla.c
diff --git a/src/emu/machine/pla.h b/src/devices/machine/pla.h
similarity index 100%
rename from src/emu/machine/pla.h
rename to src/devices/machine/pla.h
diff --git a/src/emu/machine/r10696.c b/src/devices/machine/r10696.c
similarity index 100%
rename from src/emu/machine/r10696.c
rename to src/devices/machine/r10696.c
diff --git a/src/emu/machine/r10696.h b/src/devices/machine/r10696.h
similarity index 100%
rename from src/emu/machine/r10696.h
rename to src/devices/machine/r10696.h
diff --git a/src/emu/machine/r10788.c b/src/devices/machine/r10788.c
similarity index 100%
rename from src/emu/machine/r10788.c
rename to src/devices/machine/r10788.c
diff --git a/src/emu/machine/r10788.h b/src/devices/machine/r10788.h
similarity index 100%
rename from src/emu/machine/r10788.h
rename to src/devices/machine/r10788.h
diff --git a/src/emu/machine/ra17xx.c b/src/devices/machine/ra17xx.c
similarity index 100%
rename from src/emu/machine/ra17xx.c
rename to src/devices/machine/ra17xx.c
diff --git a/src/emu/machine/ra17xx.h b/src/devices/machine/ra17xx.h
similarity index 100%
rename from src/emu/machine/ra17xx.h
rename to src/devices/machine/ra17xx.h
diff --git a/src/emu/machine/ram.c b/src/devices/machine/ram.c
similarity index 100%
rename from src/emu/machine/ram.c
rename to src/devices/machine/ram.c
diff --git a/src/emu/machine/ram.h b/src/devices/machine/ram.h
similarity index 100%
rename from src/emu/machine/ram.h
rename to src/devices/machine/ram.h
diff --git a/src/emu/machine/rescap.h b/src/devices/machine/rescap.h
similarity index 100%
rename from src/emu/machine/rescap.h
rename to src/devices/machine/rescap.h
diff --git a/src/emu/machine/rf5c296.c b/src/devices/machine/rf5c296.c
similarity index 100%
rename from src/emu/machine/rf5c296.c
rename to src/devices/machine/rf5c296.c
diff --git a/src/emu/machine/rf5c296.h b/src/devices/machine/rf5c296.h
similarity index 100%
rename from src/emu/machine/rf5c296.h
rename to src/devices/machine/rf5c296.h
diff --git a/src/emu/machine/roc10937.c b/src/devices/machine/roc10937.c
similarity index 100%
rename from src/emu/machine/roc10937.c
rename to src/devices/machine/roc10937.c
diff --git a/src/emu/machine/roc10937.h b/src/devices/machine/roc10937.h
similarity index 100%
rename from src/emu/machine/roc10937.h
rename to src/devices/machine/roc10937.h
diff --git a/src/emu/machine/rp5c01.c b/src/devices/machine/rp5c01.c
similarity index 100%
rename from src/emu/machine/rp5c01.c
rename to src/devices/machine/rp5c01.c
diff --git a/src/emu/machine/rp5c01.h b/src/devices/machine/rp5c01.h
similarity index 100%
rename from src/emu/machine/rp5c01.h
rename to src/devices/machine/rp5c01.h
diff --git a/src/emu/machine/rp5c15.c b/src/devices/machine/rp5c15.c
similarity index 100%
rename from src/emu/machine/rp5c15.c
rename to src/devices/machine/rp5c15.c
diff --git a/src/emu/machine/rp5c15.h b/src/devices/machine/rp5c15.h
similarity index 100%
rename from src/emu/machine/rp5c15.h
rename to src/devices/machine/rp5c15.h
diff --git a/src/emu/machine/rp5h01.c b/src/devices/machine/rp5h01.c
similarity index 100%
rename from src/emu/machine/rp5h01.c
rename to src/devices/machine/rp5h01.c
diff --git a/src/emu/machine/rp5h01.h b/src/devices/machine/rp5h01.h
similarity index 100%
rename from src/emu/machine/rp5h01.h
rename to src/devices/machine/rp5h01.h
diff --git a/src/emu/machine/rtc4543.c b/src/devices/machine/rtc4543.c
similarity index 100%
rename from src/emu/machine/rtc4543.c
rename to src/devices/machine/rtc4543.c
diff --git a/src/emu/machine/rtc4543.h b/src/devices/machine/rtc4543.h
similarity index 100%
rename from src/emu/machine/rtc4543.h
rename to src/devices/machine/rtc4543.h
diff --git a/src/emu/machine/rtc65271.c b/src/devices/machine/rtc65271.c
similarity index 100%
rename from src/emu/machine/rtc65271.c
rename to src/devices/machine/rtc65271.c
diff --git a/src/emu/machine/rtc65271.h b/src/devices/machine/rtc65271.h
similarity index 100%
rename from src/emu/machine/rtc65271.h
rename to src/devices/machine/rtc65271.h
diff --git a/src/emu/machine/rtc9701.c b/src/devices/machine/rtc9701.c
similarity index 100%
rename from src/emu/machine/rtc9701.c
rename to src/devices/machine/rtc9701.c
diff --git a/src/emu/machine/rtc9701.h b/src/devices/machine/rtc9701.h
similarity index 100%
rename from src/emu/machine/rtc9701.h
rename to src/devices/machine/rtc9701.h
diff --git a/src/emu/machine/s2636.c b/src/devices/machine/s2636.c
similarity index 100%
rename from src/emu/machine/s2636.c
rename to src/devices/machine/s2636.c
diff --git a/src/emu/machine/s2636.h b/src/devices/machine/s2636.h
similarity index 100%
rename from src/emu/machine/s2636.h
rename to src/devices/machine/s2636.h
diff --git a/src/emu/machine/s3520cf.c b/src/devices/machine/s3520cf.c
similarity index 100%
rename from src/emu/machine/s3520cf.c
rename to src/devices/machine/s3520cf.c
diff --git a/src/emu/machine/s3520cf.h b/src/devices/machine/s3520cf.h
similarity index 100%
rename from src/emu/machine/s3520cf.h
rename to src/devices/machine/s3520cf.h
diff --git a/src/emu/machine/s3c2400.c b/src/devices/machine/s3c2400.c
similarity index 100%
rename from src/emu/machine/s3c2400.c
rename to src/devices/machine/s3c2400.c
diff --git a/src/emu/machine/s3c2400.h b/src/devices/machine/s3c2400.h
similarity index 100%
rename from src/emu/machine/s3c2400.h
rename to src/devices/machine/s3c2400.h
diff --git a/src/emu/machine/s3c2410.c b/src/devices/machine/s3c2410.c
similarity index 100%
rename from src/emu/machine/s3c2410.c
rename to src/devices/machine/s3c2410.c
diff --git a/src/emu/machine/s3c2410.h b/src/devices/machine/s3c2410.h
similarity index 100%
rename from src/emu/machine/s3c2410.h
rename to src/devices/machine/s3c2410.h
diff --git a/src/emu/machine/s3c2440.c b/src/devices/machine/s3c2440.c
similarity index 100%
rename from src/emu/machine/s3c2440.c
rename to src/devices/machine/s3c2440.c
diff --git a/src/emu/machine/s3c2440.h b/src/devices/machine/s3c2440.h
similarity index 100%
rename from src/emu/machine/s3c2440.h
rename to src/devices/machine/s3c2440.h
diff --git a/src/emu/machine/s3c24xx.inc b/src/devices/machine/s3c24xx.inc
similarity index 100%
rename from src/emu/machine/s3c24xx.inc
rename to src/devices/machine/s3c24xx.inc
diff --git a/src/emu/machine/s3c44b0.c b/src/devices/machine/s3c44b0.c
similarity index 100%
rename from src/emu/machine/s3c44b0.c
rename to src/devices/machine/s3c44b0.c
diff --git a/src/emu/machine/s3c44b0.h b/src/devices/machine/s3c44b0.h
similarity index 100%
rename from src/emu/machine/s3c44b0.h
rename to src/devices/machine/s3c44b0.h
diff --git a/src/emu/machine/saturn.c b/src/devices/machine/saturn.c
similarity index 100%
rename from src/emu/machine/saturn.c
rename to src/devices/machine/saturn.c
diff --git a/src/emu/machine/serflash.c b/src/devices/machine/serflash.c
similarity index 100%
rename from src/emu/machine/serflash.c
rename to src/devices/machine/serflash.c
diff --git a/src/emu/machine/serflash.h b/src/devices/machine/serflash.h
similarity index 100%
rename from src/emu/machine/serflash.h
rename to src/devices/machine/serflash.h
diff --git a/src/emu/machine/smc91c9x.c b/src/devices/machine/smc91c9x.c
similarity index 100%
rename from src/emu/machine/smc91c9x.c
rename to src/devices/machine/smc91c9x.c
diff --git a/src/emu/machine/smc91c9x.h b/src/devices/machine/smc91c9x.h
similarity index 100%
rename from src/emu/machine/smc91c9x.h
rename to src/devices/machine/smc91c9x.h
diff --git a/src/emu/machine/smpc.c b/src/devices/machine/smpc.c
similarity index 100%
rename from src/emu/machine/smpc.c
rename to src/devices/machine/smpc.c
diff --git a/src/emu/machine/smpc.h b/src/devices/machine/smpc.h
similarity index 100%
rename from src/emu/machine/smpc.h
rename to src/devices/machine/smpc.h
diff --git a/src/emu/machine/spchrom.c b/src/devices/machine/spchrom.c
similarity index 100%
rename from src/emu/machine/spchrom.c
rename to src/devices/machine/spchrom.c
diff --git a/src/emu/machine/spchrom.h b/src/devices/machine/spchrom.h
similarity index 100%
rename from src/emu/machine/spchrom.h
rename to src/devices/machine/spchrom.h
diff --git a/src/emu/machine/steppers.c b/src/devices/machine/steppers.c
similarity index 100%
rename from src/emu/machine/steppers.c
rename to src/devices/machine/steppers.c
diff --git a/src/emu/machine/steppers.h b/src/devices/machine/steppers.h
similarity index 100%
rename from src/emu/machine/steppers.h
rename to src/devices/machine/steppers.h
diff --git a/src/emu/machine/strata.c b/src/devices/machine/strata.c
similarity index 100%
rename from src/emu/machine/strata.c
rename to src/devices/machine/strata.c
diff --git a/src/emu/machine/strata.h b/src/devices/machine/strata.h
similarity index 100%
rename from src/emu/machine/strata.h
rename to src/devices/machine/strata.h
diff --git a/src/emu/machine/stvcd.c b/src/devices/machine/stvcd.c
similarity index 100%
rename from src/emu/machine/stvcd.c
rename to src/devices/machine/stvcd.c
diff --git a/src/emu/machine/t10mmc.c b/src/devices/machine/t10mmc.c
similarity index 100%
rename from src/emu/machine/t10mmc.c
rename to src/devices/machine/t10mmc.c
diff --git a/src/emu/machine/t10mmc.h b/src/devices/machine/t10mmc.h
similarity index 100%
rename from src/emu/machine/t10mmc.h
rename to src/devices/machine/t10mmc.h
diff --git a/src/emu/machine/t10sbc.c b/src/devices/machine/t10sbc.c
similarity index 100%
rename from src/emu/machine/t10sbc.c
rename to src/devices/machine/t10sbc.c
diff --git a/src/emu/machine/t10sbc.h b/src/devices/machine/t10sbc.h
similarity index 100%
rename from src/emu/machine/t10sbc.h
rename to src/devices/machine/t10sbc.h
diff --git a/src/emu/machine/t10spc.c b/src/devices/machine/t10spc.c
similarity index 100%
rename from src/emu/machine/t10spc.c
rename to src/devices/machine/t10spc.c
diff --git a/src/emu/machine/t10spc.h b/src/devices/machine/t10spc.h
similarity index 100%
rename from src/emu/machine/t10spc.h
rename to src/devices/machine/t10spc.h
diff --git a/src/emu/machine/tc009xlvc.c b/src/devices/machine/tc009xlvc.c
similarity index 100%
rename from src/emu/machine/tc009xlvc.c
rename to src/devices/machine/tc009xlvc.c
diff --git a/src/emu/machine/tc009xlvc.h b/src/devices/machine/tc009xlvc.h
similarity index 100%
rename from src/emu/machine/tc009xlvc.h
rename to src/devices/machine/tc009xlvc.h
diff --git a/src/emu/machine/terminal.c b/src/devices/machine/terminal.c
similarity index 100%
rename from src/emu/machine/terminal.c
rename to src/devices/machine/terminal.c
diff --git a/src/emu/machine/terminal.h b/src/devices/machine/terminal.h
similarity index 100%
rename from src/emu/machine/terminal.h
rename to src/devices/machine/terminal.h
diff --git a/src/emu/machine/timekpr.c b/src/devices/machine/timekpr.c
similarity index 100%
rename from src/emu/machine/timekpr.c
rename to src/devices/machine/timekpr.c
diff --git a/src/emu/machine/timekpr.h b/src/devices/machine/timekpr.h
similarity index 100%
rename from src/emu/machine/timekpr.h
rename to src/devices/machine/timekpr.h
diff --git a/src/emu/machine/tmp68301.c b/src/devices/machine/tmp68301.c
similarity index 100%
rename from src/emu/machine/tmp68301.c
rename to src/devices/machine/tmp68301.c
diff --git a/src/emu/machine/tmp68301.h b/src/devices/machine/tmp68301.h
similarity index 100%
rename from src/emu/machine/tmp68301.h
rename to src/devices/machine/tmp68301.h
diff --git a/src/emu/machine/tms1024.c b/src/devices/machine/tms1024.c
similarity index 100%
rename from src/emu/machine/tms1024.c
rename to src/devices/machine/tms1024.c
diff --git a/src/emu/machine/tms1024.h b/src/devices/machine/tms1024.h
similarity index 100%
rename from src/emu/machine/tms1024.h
rename to src/devices/machine/tms1024.h
diff --git a/src/emu/machine/tms5501.c b/src/devices/machine/tms5501.c
similarity index 100%
rename from src/emu/machine/tms5501.c
rename to src/devices/machine/tms5501.c
diff --git a/src/emu/machine/tms5501.h b/src/devices/machine/tms5501.h
similarity index 100%
rename from src/emu/machine/tms5501.h
rename to src/devices/machine/tms5501.h
diff --git a/src/emu/machine/tms6100.c b/src/devices/machine/tms6100.c
similarity index 100%
rename from src/emu/machine/tms6100.c
rename to src/devices/machine/tms6100.c
diff --git a/src/emu/machine/tms6100.h b/src/devices/machine/tms6100.h
similarity index 100%
rename from src/emu/machine/tms6100.h
rename to src/devices/machine/tms6100.h
diff --git a/src/emu/machine/tms9901.c b/src/devices/machine/tms9901.c
similarity index 100%
rename from src/emu/machine/tms9901.c
rename to src/devices/machine/tms9901.c
diff --git a/src/emu/machine/tms9901.h b/src/devices/machine/tms9901.h
similarity index 100%
rename from src/emu/machine/tms9901.h
rename to src/devices/machine/tms9901.h
diff --git a/src/emu/machine/tms9902.c b/src/devices/machine/tms9902.c
similarity index 100%
rename from src/emu/machine/tms9902.c
rename to src/devices/machine/tms9902.c
diff --git a/src/emu/machine/tms9902.h b/src/devices/machine/tms9902.h
similarity index 100%
rename from src/emu/machine/tms9902.h
rename to src/devices/machine/tms9902.h
diff --git a/src/emu/machine/upd1990a.c b/src/devices/machine/upd1990a.c
similarity index 100%
rename from src/emu/machine/upd1990a.c
rename to src/devices/machine/upd1990a.c
diff --git a/src/emu/machine/upd1990a.h b/src/devices/machine/upd1990a.h
similarity index 100%
rename from src/emu/machine/upd1990a.h
rename to src/devices/machine/upd1990a.h
diff --git a/src/emu/machine/upd4701.c b/src/devices/machine/upd4701.c
similarity index 100%
rename from src/emu/machine/upd4701.c
rename to src/devices/machine/upd4701.c
diff --git a/src/emu/machine/upd4701.h b/src/devices/machine/upd4701.h
similarity index 100%
rename from src/emu/machine/upd4701.h
rename to src/devices/machine/upd4701.h
diff --git a/src/emu/machine/upd4992.c b/src/devices/machine/upd4992.c
similarity index 100%
rename from src/emu/machine/upd4992.c
rename to src/devices/machine/upd4992.c
diff --git a/src/emu/machine/upd4992.h b/src/devices/machine/upd4992.h
similarity index 100%
rename from src/emu/machine/upd4992.h
rename to src/devices/machine/upd4992.h
diff --git a/src/emu/machine/upd7002.c b/src/devices/machine/upd7002.c
similarity index 100%
rename from src/emu/machine/upd7002.c
rename to src/devices/machine/upd7002.c
diff --git a/src/emu/machine/upd7002.h b/src/devices/machine/upd7002.h
similarity index 100%
rename from src/emu/machine/upd7002.h
rename to src/devices/machine/upd7002.h
diff --git a/src/emu/machine/upd71071.c b/src/devices/machine/upd71071.c
similarity index 100%
rename from src/emu/machine/upd71071.c
rename to src/devices/machine/upd71071.c
diff --git a/src/emu/machine/upd71071.h b/src/devices/machine/upd71071.h
similarity index 100%
rename from src/emu/machine/upd71071.h
rename to src/devices/machine/upd71071.h
diff --git a/src/emu/machine/upd765.c b/src/devices/machine/upd765.c
similarity index 100%
rename from src/emu/machine/upd765.c
rename to src/devices/machine/upd765.c
diff --git a/src/emu/machine/upd765.h b/src/devices/machine/upd765.h
similarity index 100%
rename from src/emu/machine/upd765.h
rename to src/devices/machine/upd765.h
diff --git a/src/emu/machine/v3021.c b/src/devices/machine/v3021.c
similarity index 100%
rename from src/emu/machine/v3021.c
rename to src/devices/machine/v3021.c
diff --git a/src/emu/machine/v3021.h b/src/devices/machine/v3021.h
similarity index 100%
rename from src/emu/machine/v3021.h
rename to src/devices/machine/v3021.h
diff --git a/src/emu/machine/vrc4373.c b/src/devices/machine/vrc4373.c
similarity index 100%
rename from src/emu/machine/vrc4373.c
rename to src/devices/machine/vrc4373.c
diff --git a/src/emu/machine/vrc4373.h b/src/devices/machine/vrc4373.h
similarity index 100%
rename from src/emu/machine/vrc4373.h
rename to src/devices/machine/vrc4373.h
diff --git a/src/emu/machine/vt83c461.c b/src/devices/machine/vt83c461.c
similarity index 100%
rename from src/emu/machine/vt83c461.c
rename to src/devices/machine/vt83c461.c
diff --git a/src/emu/machine/vt83c461.h b/src/devices/machine/vt83c461.h
similarity index 100%
rename from src/emu/machine/vt83c461.h
rename to src/devices/machine/vt83c461.h
diff --git a/src/emu/machine/wd11c00_17.c b/src/devices/machine/wd11c00_17.c
similarity index 100%
rename from src/emu/machine/wd11c00_17.c
rename to src/devices/machine/wd11c00_17.c
diff --git a/src/emu/machine/wd11c00_17.h b/src/devices/machine/wd11c00_17.h
similarity index 100%
rename from src/emu/machine/wd11c00_17.h
rename to src/devices/machine/wd11c00_17.h
diff --git a/src/emu/machine/wd2010.c b/src/devices/machine/wd2010.c
similarity index 100%
rename from src/emu/machine/wd2010.c
rename to src/devices/machine/wd2010.c
diff --git a/src/emu/machine/wd2010.h b/src/devices/machine/wd2010.h
similarity index 100%
rename from src/emu/machine/wd2010.h
rename to src/devices/machine/wd2010.h
diff --git a/src/emu/machine/wd33c93.c b/src/devices/machine/wd33c93.c
similarity index 100%
rename from src/emu/machine/wd33c93.c
rename to src/devices/machine/wd33c93.c
diff --git a/src/emu/machine/wd33c93.h b/src/devices/machine/wd33c93.h
similarity index 100%
rename from src/emu/machine/wd33c93.h
rename to src/devices/machine/wd33c93.h
diff --git a/src/emu/machine/wd7600.c b/src/devices/machine/wd7600.c
similarity index 100%
rename from src/emu/machine/wd7600.c
rename to src/devices/machine/wd7600.c
diff --git a/src/emu/machine/wd7600.h b/src/devices/machine/wd7600.h
similarity index 100%
rename from src/emu/machine/wd7600.h
rename to src/devices/machine/wd7600.h
diff --git a/src/emu/machine/wd_fdc.c b/src/devices/machine/wd_fdc.c
similarity index 100%
rename from src/emu/machine/wd_fdc.c
rename to src/devices/machine/wd_fdc.c
diff --git a/src/emu/machine/wd_fdc.h b/src/devices/machine/wd_fdc.h
similarity index 100%
rename from src/emu/machine/wd_fdc.h
rename to src/devices/machine/wd_fdc.h
diff --git a/src/emu/machine/wozfdc.c b/src/devices/machine/wozfdc.c
similarity index 100%
rename from src/emu/machine/wozfdc.c
rename to src/devices/machine/wozfdc.c
diff --git a/src/emu/machine/wozfdc.h b/src/devices/machine/wozfdc.h
similarity index 100%
rename from src/emu/machine/wozfdc.h
rename to src/devices/machine/wozfdc.h
diff --git a/src/emu/machine/x2212.c b/src/devices/machine/x2212.c
similarity index 100%
rename from src/emu/machine/x2212.c
rename to src/devices/machine/x2212.c
diff --git a/src/emu/machine/x2212.h b/src/devices/machine/x2212.h
similarity index 100%
rename from src/emu/machine/x2212.h
rename to src/devices/machine/x2212.h
diff --git a/src/emu/machine/x76f041.c b/src/devices/machine/x76f041.c
similarity index 100%
rename from src/emu/machine/x76f041.c
rename to src/devices/machine/x76f041.c
diff --git a/src/emu/machine/x76f041.h b/src/devices/machine/x76f041.h
similarity index 100%
rename from src/emu/machine/x76f041.h
rename to src/devices/machine/x76f041.h
diff --git a/src/emu/machine/x76f100.c b/src/devices/machine/x76f100.c
similarity index 100%
rename from src/emu/machine/x76f100.c
rename to src/devices/machine/x76f100.c
diff --git a/src/emu/machine/x76f100.h b/src/devices/machine/x76f100.h
similarity index 100%
rename from src/emu/machine/x76f100.h
rename to src/devices/machine/x76f100.h
diff --git a/src/emu/machine/ym2148.c b/src/devices/machine/ym2148.c
similarity index 100%
rename from src/emu/machine/ym2148.c
rename to src/devices/machine/ym2148.c
diff --git a/src/emu/machine/ym2148.h b/src/devices/machine/ym2148.h
similarity index 100%
rename from src/emu/machine/ym2148.h
rename to src/devices/machine/ym2148.h
diff --git a/src/emu/machine/z80ctc.c b/src/devices/machine/z80ctc.c
similarity index 100%
rename from src/emu/machine/z80ctc.c
rename to src/devices/machine/z80ctc.c
diff --git a/src/emu/machine/z80ctc.h b/src/devices/machine/z80ctc.h
similarity index 100%
rename from src/emu/machine/z80ctc.h
rename to src/devices/machine/z80ctc.h
diff --git a/src/emu/machine/z80dart.c b/src/devices/machine/z80dart.c
similarity index 100%
rename from src/emu/machine/z80dart.c
rename to src/devices/machine/z80dart.c
diff --git a/src/emu/machine/z80dart.h b/src/devices/machine/z80dart.h
similarity index 100%
rename from src/emu/machine/z80dart.h
rename to src/devices/machine/z80dart.h
diff --git a/src/emu/machine/z80dma.c b/src/devices/machine/z80dma.c
similarity index 100%
rename from src/emu/machine/z80dma.c
rename to src/devices/machine/z80dma.c
diff --git a/src/emu/machine/z80dma.h b/src/devices/machine/z80dma.h
similarity index 100%
rename from src/emu/machine/z80dma.h
rename to src/devices/machine/z80dma.h
diff --git a/src/emu/machine/z80pio.c b/src/devices/machine/z80pio.c
similarity index 100%
rename from src/emu/machine/z80pio.c
rename to src/devices/machine/z80pio.c
diff --git a/src/emu/machine/z80pio.h b/src/devices/machine/z80pio.h
similarity index 100%
rename from src/emu/machine/z80pio.h
rename to src/devices/machine/z80pio.h
diff --git a/src/emu/machine/z80sti.c b/src/devices/machine/z80sti.c
similarity index 100%
rename from src/emu/machine/z80sti.c
rename to src/devices/machine/z80sti.c
diff --git a/src/emu/machine/z80sti.h b/src/devices/machine/z80sti.h
similarity index 100%
rename from src/emu/machine/z80sti.h
rename to src/devices/machine/z80sti.h
diff --git a/src/emu/machine/z8536.c b/src/devices/machine/z8536.c
similarity index 100%
rename from src/emu/machine/z8536.c
rename to src/devices/machine/z8536.c
diff --git a/src/emu/machine/z8536.h b/src/devices/machine/z8536.h
similarity index 100%
rename from src/emu/machine/z8536.h
rename to src/devices/machine/z8536.h
diff --git a/src/emu/sound/2151intf.c b/src/devices/sound/2151intf.c
similarity index 100%
rename from src/emu/sound/2151intf.c
rename to src/devices/sound/2151intf.c
diff --git a/src/emu/sound/2151intf.h b/src/devices/sound/2151intf.h
similarity index 100%
rename from src/emu/sound/2151intf.h
rename to src/devices/sound/2151intf.h
diff --git a/src/emu/sound/2203intf.c b/src/devices/sound/2203intf.c
similarity index 100%
rename from src/emu/sound/2203intf.c
rename to src/devices/sound/2203intf.c
diff --git a/src/emu/sound/2203intf.h b/src/devices/sound/2203intf.h
similarity index 100%
rename from src/emu/sound/2203intf.h
rename to src/devices/sound/2203intf.h
diff --git a/src/emu/sound/2413intf.c b/src/devices/sound/2413intf.c
similarity index 100%
rename from src/emu/sound/2413intf.c
rename to src/devices/sound/2413intf.c
diff --git a/src/emu/sound/2413intf.h b/src/devices/sound/2413intf.h
similarity index 100%
rename from src/emu/sound/2413intf.h
rename to src/devices/sound/2413intf.h
diff --git a/src/emu/sound/2608intf.c b/src/devices/sound/2608intf.c
similarity index 100%
rename from src/emu/sound/2608intf.c
rename to src/devices/sound/2608intf.c
diff --git a/src/emu/sound/2608intf.h b/src/devices/sound/2608intf.h
similarity index 100%
rename from src/emu/sound/2608intf.h
rename to src/devices/sound/2608intf.h
diff --git a/src/emu/sound/2610intf.c b/src/devices/sound/2610intf.c
similarity index 100%
rename from src/emu/sound/2610intf.c
rename to src/devices/sound/2610intf.c
diff --git a/src/emu/sound/2610intf.h b/src/devices/sound/2610intf.h
similarity index 100%
rename from src/emu/sound/2610intf.h
rename to src/devices/sound/2610intf.h
diff --git a/src/emu/sound/2612intf.c b/src/devices/sound/2612intf.c
similarity index 100%
rename from src/emu/sound/2612intf.c
rename to src/devices/sound/2612intf.c
diff --git a/src/emu/sound/2612intf.h b/src/devices/sound/2612intf.h
similarity index 100%
rename from src/emu/sound/2612intf.h
rename to src/devices/sound/2612intf.h
diff --git a/src/emu/sound/262intf.c b/src/devices/sound/262intf.c
similarity index 100%
rename from src/emu/sound/262intf.c
rename to src/devices/sound/262intf.c
diff --git a/src/emu/sound/262intf.h b/src/devices/sound/262intf.h
similarity index 100%
rename from src/emu/sound/262intf.h
rename to src/devices/sound/262intf.h
diff --git a/src/emu/sound/315-5641.c b/src/devices/sound/315-5641.c
similarity index 100%
rename from src/emu/sound/315-5641.c
rename to src/devices/sound/315-5641.c
diff --git a/src/emu/sound/315-5641.h b/src/devices/sound/315-5641.h
similarity index 100%
rename from src/emu/sound/315-5641.h
rename to src/devices/sound/315-5641.h
diff --git a/src/emu/sound/3526intf.c b/src/devices/sound/3526intf.c
similarity index 100%
rename from src/emu/sound/3526intf.c
rename to src/devices/sound/3526intf.c
diff --git a/src/emu/sound/3526intf.h b/src/devices/sound/3526intf.h
similarity index 100%
rename from src/emu/sound/3526intf.h
rename to src/devices/sound/3526intf.h
diff --git a/src/emu/sound/3812intf.c b/src/devices/sound/3812intf.c
similarity index 100%
rename from src/emu/sound/3812intf.c
rename to src/devices/sound/3812intf.c
diff --git a/src/emu/sound/3812intf.h b/src/devices/sound/3812intf.h
similarity index 100%
rename from src/emu/sound/3812intf.h
rename to src/devices/sound/3812intf.h
diff --git a/src/emu/sound/8950intf.c b/src/devices/sound/8950intf.c
similarity index 100%
rename from src/emu/sound/8950intf.c
rename to src/devices/sound/8950intf.c
diff --git a/src/emu/sound/8950intf.h b/src/devices/sound/8950intf.h
similarity index 100%
rename from src/emu/sound/8950intf.h
rename to src/devices/sound/8950intf.h
diff --git a/src/emu/sound/aica.c b/src/devices/sound/aica.c
similarity index 100%
rename from src/emu/sound/aica.c
rename to src/devices/sound/aica.c
diff --git a/src/emu/sound/aica.h b/src/devices/sound/aica.h
similarity index 100%
rename from src/emu/sound/aica.h
rename to src/devices/sound/aica.h
diff --git a/src/emu/sound/aicadsp.c b/src/devices/sound/aicadsp.c
similarity index 100%
rename from src/emu/sound/aicadsp.c
rename to src/devices/sound/aicadsp.c
diff --git a/src/emu/sound/aicadsp.h b/src/devices/sound/aicadsp.h
similarity index 100%
rename from src/emu/sound/aicadsp.h
rename to src/devices/sound/aicadsp.h
diff --git a/src/emu/sound/amiga.c b/src/devices/sound/amiga.c
similarity index 100%
rename from src/emu/sound/amiga.c
rename to src/devices/sound/amiga.c
diff --git a/src/emu/sound/amiga.h b/src/devices/sound/amiga.h
similarity index 100%
rename from src/emu/sound/amiga.h
rename to src/devices/sound/amiga.h
diff --git a/src/emu/sound/asc.c b/src/devices/sound/asc.c
similarity index 100%
rename from src/emu/sound/asc.c
rename to src/devices/sound/asc.c
diff --git a/src/emu/sound/asc.h b/src/devices/sound/asc.h
similarity index 100%
rename from src/emu/sound/asc.h
rename to src/devices/sound/asc.h
diff --git a/src/emu/sound/astrocde.c b/src/devices/sound/astrocde.c
similarity index 100%
rename from src/emu/sound/astrocde.c
rename to src/devices/sound/astrocde.c
diff --git a/src/emu/sound/astrocde.h b/src/devices/sound/astrocde.h
similarity index 100%
rename from src/emu/sound/astrocde.h
rename to src/devices/sound/astrocde.h
diff --git a/src/emu/sound/awacs.c b/src/devices/sound/awacs.c
similarity index 100%
rename from src/emu/sound/awacs.c
rename to src/devices/sound/awacs.c
diff --git a/src/emu/sound/awacs.h b/src/devices/sound/awacs.h
similarity index 100%
rename from src/emu/sound/awacs.h
rename to src/devices/sound/awacs.h
diff --git a/src/emu/sound/ay8910.c b/src/devices/sound/ay8910.c
similarity index 100%
rename from src/emu/sound/ay8910.c
rename to src/devices/sound/ay8910.c
diff --git a/src/emu/sound/ay8910.h b/src/devices/sound/ay8910.h
similarity index 100%
rename from src/emu/sound/ay8910.h
rename to src/devices/sound/ay8910.h
diff --git a/src/emu/sound/beep.c b/src/devices/sound/beep.c
similarity index 100%
rename from src/emu/sound/beep.c
rename to src/devices/sound/beep.c
diff --git a/src/emu/sound/beep.h b/src/devices/sound/beep.h
similarity index 100%
rename from src/emu/sound/beep.h
rename to src/devices/sound/beep.h
diff --git a/src/emu/sound/bsmt2000.c b/src/devices/sound/bsmt2000.c
similarity index 100%
rename from src/emu/sound/bsmt2000.c
rename to src/devices/sound/bsmt2000.c
diff --git a/src/emu/sound/bsmt2000.h b/src/devices/sound/bsmt2000.h
similarity index 100%
rename from src/emu/sound/bsmt2000.h
rename to src/devices/sound/bsmt2000.h
diff --git a/src/emu/sound/c140.c b/src/devices/sound/c140.c
similarity index 100%
rename from src/emu/sound/c140.c
rename to src/devices/sound/c140.c
diff --git a/src/emu/sound/c140.h b/src/devices/sound/c140.h
similarity index 100%
rename from src/emu/sound/c140.h
rename to src/devices/sound/c140.h
diff --git a/src/emu/sound/c352.c b/src/devices/sound/c352.c
similarity index 100%
rename from src/emu/sound/c352.c
rename to src/devices/sound/c352.c
diff --git a/src/emu/sound/c352.h b/src/devices/sound/c352.h
similarity index 100%
rename from src/emu/sound/c352.h
rename to src/devices/sound/c352.h
diff --git a/src/emu/sound/c6280.c b/src/devices/sound/c6280.c
similarity index 100%
rename from src/emu/sound/c6280.c
rename to src/devices/sound/c6280.c
diff --git a/src/emu/sound/c6280.h b/src/devices/sound/c6280.h
similarity index 100%
rename from src/emu/sound/c6280.h
rename to src/devices/sound/c6280.h
diff --git a/src/emu/sound/cdda.c b/src/devices/sound/cdda.c
similarity index 100%
rename from src/emu/sound/cdda.c
rename to src/devices/sound/cdda.c
diff --git a/src/emu/sound/cdda.h b/src/devices/sound/cdda.h
similarity index 100%
rename from src/emu/sound/cdda.h
rename to src/devices/sound/cdda.h
diff --git a/src/emu/sound/cdp1863.c b/src/devices/sound/cdp1863.c
similarity index 100%
rename from src/emu/sound/cdp1863.c
rename to src/devices/sound/cdp1863.c
diff --git a/src/emu/sound/cdp1863.h b/src/devices/sound/cdp1863.h
similarity index 100%
rename from src/emu/sound/cdp1863.h
rename to src/devices/sound/cdp1863.h
diff --git a/src/emu/sound/cdp1864.c b/src/devices/sound/cdp1864.c
similarity index 100%
rename from src/emu/sound/cdp1864.c
rename to src/devices/sound/cdp1864.c
diff --git a/src/emu/sound/cdp1864.h b/src/devices/sound/cdp1864.h
similarity index 100%
rename from src/emu/sound/cdp1864.h
rename to src/devices/sound/cdp1864.h
diff --git a/src/emu/sound/cdp1869.c b/src/devices/sound/cdp1869.c
similarity index 100%
rename from src/emu/sound/cdp1869.c
rename to src/devices/sound/cdp1869.c
diff --git a/src/emu/sound/cdp1869.h b/src/devices/sound/cdp1869.h
similarity index 100%
rename from src/emu/sound/cdp1869.h
rename to src/devices/sound/cdp1869.h
diff --git a/src/emu/sound/cem3394.c b/src/devices/sound/cem3394.c
similarity index 100%
rename from src/emu/sound/cem3394.c
rename to src/devices/sound/cem3394.c
diff --git a/src/emu/sound/cem3394.h b/src/devices/sound/cem3394.h
similarity index 100%
rename from src/emu/sound/cem3394.h
rename to src/devices/sound/cem3394.h
diff --git a/src/emu/sound/dac.c b/src/devices/sound/dac.c
similarity index 100%
rename from src/emu/sound/dac.c
rename to src/devices/sound/dac.c
diff --git a/src/emu/sound/dac.h b/src/devices/sound/dac.h
similarity index 100%
rename from src/emu/sound/dac.h
rename to src/devices/sound/dac.h
diff --git a/src/emu/sound/digitalk.c b/src/devices/sound/digitalk.c
similarity index 100%
rename from src/emu/sound/digitalk.c
rename to src/devices/sound/digitalk.c
diff --git a/src/emu/sound/digitalk.h b/src/devices/sound/digitalk.h
similarity index 100%
rename from src/emu/sound/digitalk.h
rename to src/devices/sound/digitalk.h
diff --git a/src/emu/sound/disc_cls.h b/src/devices/sound/disc_cls.h
similarity index 100%
rename from src/emu/sound/disc_cls.h
rename to src/devices/sound/disc_cls.h
diff --git a/src/emu/sound/disc_dev.h b/src/devices/sound/disc_dev.h
similarity index 100%
rename from src/emu/sound/disc_dev.h
rename to src/devices/sound/disc_dev.h
diff --git a/src/emu/sound/disc_dev.inc b/src/devices/sound/disc_dev.inc
similarity index 100%
rename from src/emu/sound/disc_dev.inc
rename to src/devices/sound/disc_dev.inc
diff --git a/src/emu/sound/disc_flt.h b/src/devices/sound/disc_flt.h
similarity index 100%
rename from src/emu/sound/disc_flt.h
rename to src/devices/sound/disc_flt.h
diff --git a/src/emu/sound/disc_flt.inc b/src/devices/sound/disc_flt.inc
similarity index 100%
rename from src/emu/sound/disc_flt.inc
rename to src/devices/sound/disc_flt.inc
diff --git a/src/emu/sound/disc_inp.inc b/src/devices/sound/disc_inp.inc
similarity index 100%
rename from src/emu/sound/disc_inp.inc
rename to src/devices/sound/disc_inp.inc
diff --git a/src/emu/sound/disc_mth.h b/src/devices/sound/disc_mth.h
similarity index 100%
rename from src/emu/sound/disc_mth.h
rename to src/devices/sound/disc_mth.h
diff --git a/src/emu/sound/disc_mth.inc b/src/devices/sound/disc_mth.inc
similarity index 100%
rename from src/emu/sound/disc_mth.inc
rename to src/devices/sound/disc_mth.inc
diff --git a/src/emu/sound/disc_sys.inc b/src/devices/sound/disc_sys.inc
similarity index 100%
rename from src/emu/sound/disc_sys.inc
rename to src/devices/sound/disc_sys.inc
diff --git a/src/emu/sound/disc_wav.h b/src/devices/sound/disc_wav.h
similarity index 100%
rename from src/emu/sound/disc_wav.h
rename to src/devices/sound/disc_wav.h
diff --git a/src/emu/sound/disc_wav.inc b/src/devices/sound/disc_wav.inc
similarity index 100%
rename from src/emu/sound/disc_wav.inc
rename to src/devices/sound/disc_wav.inc
diff --git a/src/emu/sound/discrete.c b/src/devices/sound/discrete.c
similarity index 100%
rename from src/emu/sound/discrete.c
rename to src/devices/sound/discrete.c
diff --git a/src/emu/sound/discrete.h b/src/devices/sound/discrete.h
similarity index 100%
rename from src/emu/sound/discrete.h
rename to src/devices/sound/discrete.h
diff --git a/src/emu/sound/dmadac.c b/src/devices/sound/dmadac.c
similarity index 100%
rename from src/emu/sound/dmadac.c
rename to src/devices/sound/dmadac.c
diff --git a/src/emu/sound/dmadac.h b/src/devices/sound/dmadac.h
similarity index 100%
rename from src/emu/sound/dmadac.h
rename to src/devices/sound/dmadac.h
diff --git a/src/emu/sound/es1373.c b/src/devices/sound/es1373.c
similarity index 100%
rename from src/emu/sound/es1373.c
rename to src/devices/sound/es1373.c
diff --git a/src/emu/sound/es1373.h b/src/devices/sound/es1373.h
similarity index 100%
rename from src/emu/sound/es1373.h
rename to src/devices/sound/es1373.h
diff --git a/src/emu/sound/es5503.c b/src/devices/sound/es5503.c
similarity index 100%
rename from src/emu/sound/es5503.c
rename to src/devices/sound/es5503.c
diff --git a/src/emu/sound/es5503.h b/src/devices/sound/es5503.h
similarity index 100%
rename from src/emu/sound/es5503.h
rename to src/devices/sound/es5503.h
diff --git a/src/emu/sound/es5506.c b/src/devices/sound/es5506.c
similarity index 100%
rename from src/emu/sound/es5506.c
rename to src/devices/sound/es5506.c
diff --git a/src/emu/sound/es5506.h b/src/devices/sound/es5506.h
similarity index 100%
rename from src/emu/sound/es5506.h
rename to src/devices/sound/es5506.h
diff --git a/src/emu/sound/es8712.c b/src/devices/sound/es8712.c
similarity index 100%
rename from src/emu/sound/es8712.c
rename to src/devices/sound/es8712.c
diff --git a/src/emu/sound/es8712.h b/src/devices/sound/es8712.h
similarity index 100%
rename from src/emu/sound/es8712.h
rename to src/devices/sound/es8712.h
diff --git a/src/emu/sound/esqpump.c b/src/devices/sound/esqpump.c
similarity index 100%
rename from src/emu/sound/esqpump.c
rename to src/devices/sound/esqpump.c
diff --git a/src/emu/sound/esqpump.h b/src/devices/sound/esqpump.h
similarity index 100%
rename from src/emu/sound/esqpump.h
rename to src/devices/sound/esqpump.h
diff --git a/src/emu/sound/filter.c b/src/devices/sound/filter.c
similarity index 100%
rename from src/emu/sound/filter.c
rename to src/devices/sound/filter.c
diff --git a/src/emu/sound/filter.h b/src/devices/sound/filter.h
similarity index 100%
rename from src/emu/sound/filter.h
rename to src/devices/sound/filter.h
diff --git a/src/emu/sound/flt_rc.c b/src/devices/sound/flt_rc.c
similarity index 100%
rename from src/emu/sound/flt_rc.c
rename to src/devices/sound/flt_rc.c
diff --git a/src/emu/sound/flt_rc.h b/src/devices/sound/flt_rc.h
similarity index 100%
rename from src/emu/sound/flt_rc.h
rename to src/devices/sound/flt_rc.h
diff --git a/src/emu/sound/flt_vol.c b/src/devices/sound/flt_vol.c
similarity index 100%
rename from src/emu/sound/flt_vol.c
rename to src/devices/sound/flt_vol.c
diff --git a/src/emu/sound/flt_vol.h b/src/devices/sound/flt_vol.h
similarity index 100%
rename from src/emu/sound/flt_vol.h
rename to src/devices/sound/flt_vol.h
diff --git a/src/emu/sound/fm.c b/src/devices/sound/fm.c
similarity index 100%
rename from src/emu/sound/fm.c
rename to src/devices/sound/fm.c
diff --git a/src/emu/sound/fm.h b/src/devices/sound/fm.h
similarity index 100%
rename from src/emu/sound/fm.h
rename to src/devices/sound/fm.h
diff --git a/src/emu/sound/fm2612.c b/src/devices/sound/fm2612.c
similarity index 100%
rename from src/emu/sound/fm2612.c
rename to src/devices/sound/fm2612.c
diff --git a/src/emu/sound/fmopl.c b/src/devices/sound/fmopl.c
similarity index 100%
rename from src/emu/sound/fmopl.c
rename to src/devices/sound/fmopl.c
diff --git a/src/emu/sound/fmopl.h b/src/devices/sound/fmopl.h
similarity index 100%
rename from src/emu/sound/fmopl.h
rename to src/devices/sound/fmopl.h
diff --git a/src/emu/sound/gaelco.c b/src/devices/sound/gaelco.c
similarity index 100%
rename from src/emu/sound/gaelco.c
rename to src/devices/sound/gaelco.c
diff --git a/src/emu/sound/gaelco.h b/src/devices/sound/gaelco.h
similarity index 100%
rename from src/emu/sound/gaelco.h
rename to src/devices/sound/gaelco.h
diff --git a/src/emu/sound/hc55516.c b/src/devices/sound/hc55516.c
similarity index 100%
rename from src/emu/sound/hc55516.c
rename to src/devices/sound/hc55516.c
diff --git a/src/emu/sound/hc55516.h b/src/devices/sound/hc55516.h
similarity index 100%
rename from src/emu/sound/hc55516.h
rename to src/devices/sound/hc55516.h
diff --git a/src/emu/sound/i5000.c b/src/devices/sound/i5000.c
similarity index 100%
rename from src/emu/sound/i5000.c
rename to src/devices/sound/i5000.c
diff --git a/src/emu/sound/i5000.h b/src/devices/sound/i5000.h
similarity index 100%
rename from src/emu/sound/i5000.h
rename to src/devices/sound/i5000.h
diff --git a/src/emu/sound/ics2115.c b/src/devices/sound/ics2115.c
similarity index 100%
rename from src/emu/sound/ics2115.c
rename to src/devices/sound/ics2115.c
diff --git a/src/emu/sound/ics2115.h b/src/devices/sound/ics2115.h
similarity index 100%
rename from src/emu/sound/ics2115.h
rename to src/devices/sound/ics2115.h
diff --git a/src/emu/sound/iremga20.c b/src/devices/sound/iremga20.c
similarity index 100%
rename from src/emu/sound/iremga20.c
rename to src/devices/sound/iremga20.c
diff --git a/src/emu/sound/iremga20.h b/src/devices/sound/iremga20.h
similarity index 100%
rename from src/emu/sound/iremga20.h
rename to src/devices/sound/iremga20.h
diff --git a/src/emu/sound/k005289.c b/src/devices/sound/k005289.c
similarity index 100%
rename from src/emu/sound/k005289.c
rename to src/devices/sound/k005289.c
diff --git a/src/emu/sound/k005289.h b/src/devices/sound/k005289.h
similarity index 100%
rename from src/emu/sound/k005289.h
rename to src/devices/sound/k005289.h
diff --git a/src/emu/sound/k007232.c b/src/devices/sound/k007232.c
similarity index 100%
rename from src/emu/sound/k007232.c
rename to src/devices/sound/k007232.c
diff --git a/src/emu/sound/k007232.h b/src/devices/sound/k007232.h
similarity index 100%
rename from src/emu/sound/k007232.h
rename to src/devices/sound/k007232.h
diff --git a/src/emu/sound/k051649.c b/src/devices/sound/k051649.c
similarity index 100%
rename from src/emu/sound/k051649.c
rename to src/devices/sound/k051649.c
diff --git a/src/emu/sound/k051649.h b/src/devices/sound/k051649.h
similarity index 100%
rename from src/emu/sound/k051649.h
rename to src/devices/sound/k051649.h
diff --git a/src/emu/sound/k053260.c b/src/devices/sound/k053260.c
similarity index 100%
rename from src/emu/sound/k053260.c
rename to src/devices/sound/k053260.c
diff --git a/src/emu/sound/k053260.h b/src/devices/sound/k053260.h
similarity index 100%
rename from src/emu/sound/k053260.h
rename to src/devices/sound/k053260.h
diff --git a/src/emu/sound/k054539.c b/src/devices/sound/k054539.c
similarity index 100%
rename from src/emu/sound/k054539.c
rename to src/devices/sound/k054539.c
diff --git a/src/emu/sound/k054539.h b/src/devices/sound/k054539.h
similarity index 100%
rename from src/emu/sound/k054539.h
rename to src/devices/sound/k054539.h
diff --git a/src/emu/sound/k056800.c b/src/devices/sound/k056800.c
similarity index 100%
rename from src/emu/sound/k056800.c
rename to src/devices/sound/k056800.c
diff --git a/src/emu/sound/k056800.h b/src/devices/sound/k056800.h
similarity index 100%
rename from src/emu/sound/k056800.h
rename to src/devices/sound/k056800.h
diff --git a/src/emu/sound/l7a1045_l6028_dsp_a.c b/src/devices/sound/l7a1045_l6028_dsp_a.c
similarity index 100%
rename from src/emu/sound/l7a1045_l6028_dsp_a.c
rename to src/devices/sound/l7a1045_l6028_dsp_a.c
diff --git a/src/emu/sound/l7a1045_l6028_dsp_a.h b/src/devices/sound/l7a1045_l6028_dsp_a.h
similarity index 100%
rename from src/emu/sound/l7a1045_l6028_dsp_a.h
rename to src/devices/sound/l7a1045_l6028_dsp_a.h
diff --git a/src/emu/sound/lmc1992.c b/src/devices/sound/lmc1992.c
similarity index 100%
rename from src/emu/sound/lmc1992.c
rename to src/devices/sound/lmc1992.c
diff --git a/src/emu/sound/lmc1992.h b/src/devices/sound/lmc1992.h
similarity index 100%
rename from src/emu/sound/lmc1992.h
rename to src/devices/sound/lmc1992.h
diff --git a/src/emu/sound/mas3507d.c b/src/devices/sound/mas3507d.c
similarity index 100%
rename from src/emu/sound/mas3507d.c
rename to src/devices/sound/mas3507d.c
diff --git a/src/emu/sound/mas3507d.h b/src/devices/sound/mas3507d.h
similarity index 100%
rename from src/emu/sound/mas3507d.h
rename to src/devices/sound/mas3507d.h
diff --git a/src/emu/sound/mos6560.c b/src/devices/sound/mos6560.c
similarity index 100%
rename from src/emu/sound/mos6560.c
rename to src/devices/sound/mos6560.c
diff --git a/src/emu/sound/mos6560.h b/src/devices/sound/mos6560.h
similarity index 100%
rename from src/emu/sound/mos6560.h
rename to src/devices/sound/mos6560.h
diff --git a/src/emu/sound/mos6581.c b/src/devices/sound/mos6581.c
similarity index 100%
rename from src/emu/sound/mos6581.c
rename to src/devices/sound/mos6581.c
diff --git a/src/emu/sound/mos6581.h b/src/devices/sound/mos6581.h
similarity index 100%
rename from src/emu/sound/mos6581.h
rename to src/devices/sound/mos6581.h
diff --git a/src/emu/sound/mos7360.c b/src/devices/sound/mos7360.c
similarity index 100%
rename from src/emu/sound/mos7360.c
rename to src/devices/sound/mos7360.c
diff --git a/src/emu/sound/mos7360.h b/src/devices/sound/mos7360.h
similarity index 100%
rename from src/emu/sound/mos7360.h
rename to src/devices/sound/mos7360.h
diff --git a/src/emu/sound/mpeg_audio.c b/src/devices/sound/mpeg_audio.c
similarity index 100%
rename from src/emu/sound/mpeg_audio.c
rename to src/devices/sound/mpeg_audio.c
diff --git a/src/emu/sound/mpeg_audio.h b/src/devices/sound/mpeg_audio.h
similarity index 100%
rename from src/emu/sound/mpeg_audio.h
rename to src/devices/sound/mpeg_audio.h
diff --git a/src/emu/sound/msm5205.c b/src/devices/sound/msm5205.c
similarity index 100%
rename from src/emu/sound/msm5205.c
rename to src/devices/sound/msm5205.c
diff --git a/src/emu/sound/msm5205.h b/src/devices/sound/msm5205.h
similarity index 100%
rename from src/emu/sound/msm5205.h
rename to src/devices/sound/msm5205.h
diff --git a/src/emu/sound/msm5232.c b/src/devices/sound/msm5232.c
similarity index 100%
rename from src/emu/sound/msm5232.c
rename to src/devices/sound/msm5232.c
diff --git a/src/emu/sound/msm5232.h b/src/devices/sound/msm5232.h
similarity index 100%
rename from src/emu/sound/msm5232.h
rename to src/devices/sound/msm5232.h
diff --git a/src/emu/sound/multipcm.c b/src/devices/sound/multipcm.c
similarity index 100%
rename from src/emu/sound/multipcm.c
rename to src/devices/sound/multipcm.c
diff --git a/src/emu/sound/multipcm.h b/src/devices/sound/multipcm.h
similarity index 100%
rename from src/emu/sound/multipcm.h
rename to src/devices/sound/multipcm.h
diff --git a/src/emu/sound/n63701x.c b/src/devices/sound/n63701x.c
similarity index 100%
rename from src/emu/sound/n63701x.c
rename to src/devices/sound/n63701x.c
diff --git a/src/emu/sound/n63701x.h b/src/devices/sound/n63701x.h
similarity index 100%
rename from src/emu/sound/n63701x.h
rename to src/devices/sound/n63701x.h
diff --git a/src/emu/sound/namco.c b/src/devices/sound/namco.c
similarity index 100%
rename from src/emu/sound/namco.c
rename to src/devices/sound/namco.c
diff --git a/src/emu/sound/namco.h b/src/devices/sound/namco.h
similarity index 100%
rename from src/emu/sound/namco.h
rename to src/devices/sound/namco.h
diff --git a/src/emu/sound/nes_apu.c b/src/devices/sound/nes_apu.c
similarity index 100%
rename from src/emu/sound/nes_apu.c
rename to src/devices/sound/nes_apu.c
diff --git a/src/emu/sound/nes_apu.h b/src/devices/sound/nes_apu.h
similarity index 100%
rename from src/emu/sound/nes_apu.h
rename to src/devices/sound/nes_apu.h
diff --git a/src/emu/sound/nes_defs.h b/src/devices/sound/nes_defs.h
similarity index 100%
rename from src/emu/sound/nes_defs.h
rename to src/devices/sound/nes_defs.h
diff --git a/src/emu/sound/nile.c b/src/devices/sound/nile.c
similarity index 100%
rename from src/emu/sound/nile.c
rename to src/devices/sound/nile.c
diff --git a/src/emu/sound/nile.h b/src/devices/sound/nile.h
similarity index 100%
rename from src/emu/sound/nile.h
rename to src/devices/sound/nile.h
diff --git a/src/emu/sound/okiadpcm.c b/src/devices/sound/okiadpcm.c
similarity index 100%
rename from src/emu/sound/okiadpcm.c
rename to src/devices/sound/okiadpcm.c
diff --git a/src/emu/sound/okiadpcm.h b/src/devices/sound/okiadpcm.h
similarity index 100%
rename from src/emu/sound/okiadpcm.h
rename to src/devices/sound/okiadpcm.h
diff --git a/src/emu/sound/okim6258.c b/src/devices/sound/okim6258.c
similarity index 100%
rename from src/emu/sound/okim6258.c
rename to src/devices/sound/okim6258.c
diff --git a/src/emu/sound/okim6258.h b/src/devices/sound/okim6258.h
similarity index 100%
rename from src/emu/sound/okim6258.h
rename to src/devices/sound/okim6258.h
diff --git a/src/emu/sound/okim6295.c b/src/devices/sound/okim6295.c
similarity index 100%
rename from src/emu/sound/okim6295.c
rename to src/devices/sound/okim6295.c
diff --git a/src/emu/sound/okim6295.h b/src/devices/sound/okim6295.h
similarity index 100%
rename from src/emu/sound/okim6295.h
rename to src/devices/sound/okim6295.h
diff --git a/src/emu/sound/okim6376.c b/src/devices/sound/okim6376.c
similarity index 100%
rename from src/emu/sound/okim6376.c
rename to src/devices/sound/okim6376.c
diff --git a/src/emu/sound/okim6376.h b/src/devices/sound/okim6376.h
similarity index 100%
rename from src/emu/sound/okim6376.h
rename to src/devices/sound/okim6376.h
diff --git a/src/emu/sound/okim9810.c b/src/devices/sound/okim9810.c
similarity index 100%
rename from src/emu/sound/okim9810.c
rename to src/devices/sound/okim9810.c
diff --git a/src/emu/sound/okim9810.h b/src/devices/sound/okim9810.h
similarity index 100%
rename from src/emu/sound/okim9810.h
rename to src/devices/sound/okim9810.h
diff --git a/src/emu/sound/pci-ac97.c b/src/devices/sound/pci-ac97.c
similarity index 100%
rename from src/emu/sound/pci-ac97.c
rename to src/devices/sound/pci-ac97.c
diff --git a/src/emu/sound/pci-ac97.h b/src/devices/sound/pci-ac97.h
similarity index 100%
rename from src/emu/sound/pci-ac97.h
rename to src/devices/sound/pci-ac97.h
diff --git a/src/emu/sound/pokey.c b/src/devices/sound/pokey.c
similarity index 100%
rename from src/emu/sound/pokey.c
rename to src/devices/sound/pokey.c
diff --git a/src/emu/sound/pokey.h b/src/devices/sound/pokey.h
similarity index 100%
rename from src/emu/sound/pokey.h
rename to src/devices/sound/pokey.h
diff --git a/src/emu/sound/pokey.txt b/src/devices/sound/pokey.txt
similarity index 100%
rename from src/emu/sound/pokey.txt
rename to src/devices/sound/pokey.txt
diff --git a/src/emu/sound/qs1000.c b/src/devices/sound/qs1000.c
similarity index 100%
rename from src/emu/sound/qs1000.c
rename to src/devices/sound/qs1000.c
diff --git a/src/emu/sound/qs1000.h b/src/devices/sound/qs1000.h
similarity index 100%
rename from src/emu/sound/qs1000.h
rename to src/devices/sound/qs1000.h
diff --git a/src/emu/sound/qsound.c b/src/devices/sound/qsound.c
similarity index 100%
rename from src/emu/sound/qsound.c
rename to src/devices/sound/qsound.c
diff --git a/src/emu/sound/qsound.h b/src/devices/sound/qsound.h
similarity index 100%
rename from src/emu/sound/qsound.h
rename to src/devices/sound/qsound.h
diff --git a/src/emu/sound/rf5c400.c b/src/devices/sound/rf5c400.c
similarity index 100%
rename from src/emu/sound/rf5c400.c
rename to src/devices/sound/rf5c400.c
diff --git a/src/emu/sound/rf5c400.h b/src/devices/sound/rf5c400.h
similarity index 100%
rename from src/emu/sound/rf5c400.h
rename to src/devices/sound/rf5c400.h
diff --git a/src/emu/sound/rf5c68.c b/src/devices/sound/rf5c68.c
similarity index 100%
rename from src/emu/sound/rf5c68.c
rename to src/devices/sound/rf5c68.c
diff --git a/src/emu/sound/rf5c68.h b/src/devices/sound/rf5c68.h
similarity index 100%
rename from src/emu/sound/rf5c68.h
rename to src/devices/sound/rf5c68.h
diff --git a/src/emu/sound/s14001a.c b/src/devices/sound/s14001a.c
similarity index 100%
rename from src/emu/sound/s14001a.c
rename to src/devices/sound/s14001a.c
diff --git a/src/emu/sound/s14001a.h b/src/devices/sound/s14001a.h
similarity index 100%
rename from src/emu/sound/s14001a.h
rename to src/devices/sound/s14001a.h
diff --git a/src/emu/sound/saa1099.c b/src/devices/sound/saa1099.c
similarity index 100%
rename from src/emu/sound/saa1099.c
rename to src/devices/sound/saa1099.c
diff --git a/src/emu/sound/saa1099.h b/src/devices/sound/saa1099.h
similarity index 100%
rename from src/emu/sound/saa1099.h
rename to src/devices/sound/saa1099.h
diff --git a/src/emu/sound/samples.c b/src/devices/sound/samples.c
similarity index 100%
rename from src/emu/sound/samples.c
rename to src/devices/sound/samples.c
diff --git a/src/emu/sound/samples.h b/src/devices/sound/samples.h
similarity index 100%
rename from src/emu/sound/samples.h
rename to src/devices/sound/samples.h
diff --git a/src/emu/sound/sb0400.c b/src/devices/sound/sb0400.c
similarity index 100%
rename from src/emu/sound/sb0400.c
rename to src/devices/sound/sb0400.c
diff --git a/src/emu/sound/sb0400.h b/src/devices/sound/sb0400.h
similarity index 100%
rename from src/emu/sound/sb0400.h
rename to src/devices/sound/sb0400.h
diff --git a/src/emu/sound/scsp.c b/src/devices/sound/scsp.c
similarity index 100%
rename from src/emu/sound/scsp.c
rename to src/devices/sound/scsp.c
diff --git a/src/emu/sound/scsp.h b/src/devices/sound/scsp.h
similarity index 100%
rename from src/emu/sound/scsp.h
rename to src/devices/sound/scsp.h
diff --git a/src/emu/sound/scspdsp.c b/src/devices/sound/scspdsp.c
similarity index 100%
rename from src/emu/sound/scspdsp.c
rename to src/devices/sound/scspdsp.c
diff --git a/src/emu/sound/scspdsp.h b/src/devices/sound/scspdsp.h
similarity index 100%
rename from src/emu/sound/scspdsp.h
rename to src/devices/sound/scspdsp.h
diff --git a/src/emu/sound/segapcm.c b/src/devices/sound/segapcm.c
similarity index 100%
rename from src/emu/sound/segapcm.c
rename to src/devices/sound/segapcm.c
diff --git a/src/emu/sound/segapcm.h b/src/devices/sound/segapcm.h
similarity index 100%
rename from src/emu/sound/segapcm.h
rename to src/devices/sound/segapcm.h
diff --git a/src/emu/sound/sid.c b/src/devices/sound/sid.c
similarity index 100%
rename from src/emu/sound/sid.c
rename to src/devices/sound/sid.c
diff --git a/src/emu/sound/sid.h b/src/devices/sound/sid.h
similarity index 100%
rename from src/emu/sound/sid.h
rename to src/devices/sound/sid.h
diff --git a/src/emu/sound/side6581.h b/src/devices/sound/side6581.h
similarity index 100%
rename from src/emu/sound/side6581.h
rename to src/devices/sound/side6581.h
diff --git a/src/emu/sound/sidenvel.c b/src/devices/sound/sidenvel.c
similarity index 100%
rename from src/emu/sound/sidenvel.c
rename to src/devices/sound/sidenvel.c
diff --git a/src/emu/sound/sidenvel.h b/src/devices/sound/sidenvel.h
similarity index 100%
rename from src/emu/sound/sidenvel.h
rename to src/devices/sound/sidenvel.h
diff --git a/src/emu/sound/sidvoice.c b/src/devices/sound/sidvoice.c
similarity index 100%
rename from src/emu/sound/sidvoice.c
rename to src/devices/sound/sidvoice.c
diff --git a/src/emu/sound/sidvoice.h b/src/devices/sound/sidvoice.h
similarity index 100%
rename from src/emu/sound/sidvoice.h
rename to src/devices/sound/sidvoice.h
diff --git a/src/emu/sound/sidw6581.h b/src/devices/sound/sidw6581.h
similarity index 100%
rename from src/emu/sound/sidw6581.h
rename to src/devices/sound/sidw6581.h
diff --git a/src/emu/sound/sidw8580.h b/src/devices/sound/sidw8580.h
similarity index 100%
rename from src/emu/sound/sidw8580.h
rename to src/devices/sound/sidw8580.h
diff --git a/src/emu/sound/sn76477.c b/src/devices/sound/sn76477.c
similarity index 100%
rename from src/emu/sound/sn76477.c
rename to src/devices/sound/sn76477.c
diff --git a/src/emu/sound/sn76477.h b/src/devices/sound/sn76477.h
similarity index 100%
rename from src/emu/sound/sn76477.h
rename to src/devices/sound/sn76477.h
diff --git a/src/emu/sound/sn76496.c b/src/devices/sound/sn76496.c
similarity index 100%
rename from src/emu/sound/sn76496.c
rename to src/devices/sound/sn76496.c
diff --git a/src/emu/sound/sn76496.h b/src/devices/sound/sn76496.h
similarity index 100%
rename from src/emu/sound/sn76496.h
rename to src/devices/sound/sn76496.h
diff --git a/src/emu/sound/snkwave.c b/src/devices/sound/snkwave.c
similarity index 100%
rename from src/emu/sound/snkwave.c
rename to src/devices/sound/snkwave.c
diff --git a/src/emu/sound/snkwave.h b/src/devices/sound/snkwave.h
similarity index 100%
rename from src/emu/sound/snkwave.h
rename to src/devices/sound/snkwave.h
diff --git a/src/emu/sound/sp0250.c b/src/devices/sound/sp0250.c
similarity index 100%
rename from src/emu/sound/sp0250.c
rename to src/devices/sound/sp0250.c
diff --git a/src/emu/sound/sp0250.h b/src/devices/sound/sp0250.h
similarity index 100%
rename from src/emu/sound/sp0250.h
rename to src/devices/sound/sp0250.h
diff --git a/src/emu/sound/sp0256.c b/src/devices/sound/sp0256.c
similarity index 100%
rename from src/emu/sound/sp0256.c
rename to src/devices/sound/sp0256.c
diff --git a/src/emu/sound/sp0256.h b/src/devices/sound/sp0256.h
similarity index 100%
rename from src/emu/sound/sp0256.h
rename to src/devices/sound/sp0256.h
diff --git a/src/emu/sound/speaker.c b/src/devices/sound/speaker.c
similarity index 100%
rename from src/emu/sound/speaker.c
rename to src/devices/sound/speaker.c
diff --git a/src/emu/sound/speaker.h b/src/devices/sound/speaker.h
similarity index 100%
rename from src/emu/sound/speaker.h
rename to src/devices/sound/speaker.h
diff --git a/src/emu/sound/spu.c b/src/devices/sound/spu.c
similarity index 100%
rename from src/emu/sound/spu.c
rename to src/devices/sound/spu.c
diff --git a/src/emu/sound/spu.h b/src/devices/sound/spu.h
similarity index 100%
rename from src/emu/sound/spu.h
rename to src/devices/sound/spu.h
diff --git a/src/emu/sound/spu_tables.c b/src/devices/sound/spu_tables.c
similarity index 100%
rename from src/emu/sound/spu_tables.c
rename to src/devices/sound/spu_tables.c
diff --git a/src/emu/sound/spureverb.c b/src/devices/sound/spureverb.c
similarity index 100%
rename from src/emu/sound/spureverb.c
rename to src/devices/sound/spureverb.c
diff --git a/src/emu/sound/spureverb.h b/src/devices/sound/spureverb.h
similarity index 100%
rename from src/emu/sound/spureverb.h
rename to src/devices/sound/spureverb.h
diff --git a/src/emu/sound/st0016.c b/src/devices/sound/st0016.c
similarity index 100%
rename from src/emu/sound/st0016.c
rename to src/devices/sound/st0016.c
diff --git a/src/emu/sound/st0016.h b/src/devices/sound/st0016.h
similarity index 100%
rename from src/emu/sound/st0016.h
rename to src/devices/sound/st0016.h
diff --git a/src/emu/sound/t6721a.c b/src/devices/sound/t6721a.c
similarity index 100%
rename from src/emu/sound/t6721a.c
rename to src/devices/sound/t6721a.c
diff --git a/src/emu/sound/t6721a.h b/src/devices/sound/t6721a.h
similarity index 100%
rename from src/emu/sound/t6721a.h
rename to src/devices/sound/t6721a.h
diff --git a/src/emu/sound/t6w28.c b/src/devices/sound/t6w28.c
similarity index 100%
rename from src/emu/sound/t6w28.c
rename to src/devices/sound/t6w28.c
diff --git a/src/emu/sound/t6w28.h b/src/devices/sound/t6w28.h
similarity index 100%
rename from src/emu/sound/t6w28.h
rename to src/devices/sound/t6w28.h
diff --git a/src/emu/sound/tc8830f.c b/src/devices/sound/tc8830f.c
similarity index 100%
rename from src/emu/sound/tc8830f.c
rename to src/devices/sound/tc8830f.c
diff --git a/src/emu/sound/tc8830f.h b/src/devices/sound/tc8830f.h
similarity index 100%
rename from src/emu/sound/tc8830f.h
rename to src/devices/sound/tc8830f.h
diff --git a/src/emu/sound/tiaintf.c b/src/devices/sound/tiaintf.c
similarity index 100%
rename from src/emu/sound/tiaintf.c
rename to src/devices/sound/tiaintf.c
diff --git a/src/emu/sound/tiaintf.h b/src/devices/sound/tiaintf.h
similarity index 100%
rename from src/emu/sound/tiaintf.h
rename to src/devices/sound/tiaintf.h
diff --git a/src/emu/sound/tiasound.c b/src/devices/sound/tiasound.c
similarity index 100%
rename from src/emu/sound/tiasound.c
rename to src/devices/sound/tiasound.c
diff --git a/src/emu/sound/tiasound.h b/src/devices/sound/tiasound.h
similarity index 100%
rename from src/emu/sound/tiasound.h
rename to src/devices/sound/tiasound.h
diff --git a/src/emu/sound/tms3615.c b/src/devices/sound/tms3615.c
similarity index 100%
rename from src/emu/sound/tms3615.c
rename to src/devices/sound/tms3615.c
diff --git a/src/emu/sound/tms3615.h b/src/devices/sound/tms3615.h
similarity index 100%
rename from src/emu/sound/tms3615.h
rename to src/devices/sound/tms3615.h
diff --git a/src/emu/sound/tms36xx.c b/src/devices/sound/tms36xx.c
similarity index 100%
rename from src/emu/sound/tms36xx.c
rename to src/devices/sound/tms36xx.c
diff --git a/src/emu/sound/tms36xx.h b/src/devices/sound/tms36xx.h
similarity index 100%
rename from src/emu/sound/tms36xx.h
rename to src/devices/sound/tms36xx.h
diff --git a/src/emu/sound/tms5110.c b/src/devices/sound/tms5110.c
similarity index 100%
rename from src/emu/sound/tms5110.c
rename to src/devices/sound/tms5110.c
diff --git a/src/emu/sound/tms5110.h b/src/devices/sound/tms5110.h
similarity index 100%
rename from src/emu/sound/tms5110.h
rename to src/devices/sound/tms5110.h
diff --git a/src/emu/sound/tms5110r.inc b/src/devices/sound/tms5110r.inc
similarity index 100%
rename from src/emu/sound/tms5110r.inc
rename to src/devices/sound/tms5110r.inc
diff --git a/src/emu/sound/tms5220.c b/src/devices/sound/tms5220.c
similarity index 100%
rename from src/emu/sound/tms5220.c
rename to src/devices/sound/tms5220.c
diff --git a/src/emu/sound/tms5220.h b/src/devices/sound/tms5220.h
similarity index 100%
rename from src/emu/sound/tms5220.h
rename to src/devices/sound/tms5220.h
diff --git a/src/emu/sound/tms5220.txt b/src/devices/sound/tms5220.txt
similarity index 100%
rename from src/emu/sound/tms5220.txt
rename to src/devices/sound/tms5220.txt
diff --git a/src/emu/sound/upd7752.c b/src/devices/sound/upd7752.c
similarity index 100%
rename from src/emu/sound/upd7752.c
rename to src/devices/sound/upd7752.c
diff --git a/src/emu/sound/upd7752.h b/src/devices/sound/upd7752.h
similarity index 100%
rename from src/emu/sound/upd7752.h
rename to src/devices/sound/upd7752.h
diff --git a/src/emu/sound/upd7759.c b/src/devices/sound/upd7759.c
similarity index 100%
rename from src/emu/sound/upd7759.c
rename to src/devices/sound/upd7759.c
diff --git a/src/emu/sound/upd7759.h b/src/devices/sound/upd7759.h
similarity index 100%
rename from src/emu/sound/upd7759.h
rename to src/devices/sound/upd7759.h
diff --git a/src/emu/sound/vlm5030.c b/src/devices/sound/vlm5030.c
similarity index 100%
rename from src/emu/sound/vlm5030.c
rename to src/devices/sound/vlm5030.c
diff --git a/src/emu/sound/vlm5030.h b/src/devices/sound/vlm5030.h
similarity index 100%
rename from src/emu/sound/vlm5030.h
rename to src/devices/sound/vlm5030.h
diff --git a/src/emu/sound/votrax.c b/src/devices/sound/votrax.c
similarity index 100%
rename from src/emu/sound/votrax.c
rename to src/devices/sound/votrax.c
diff --git a/src/emu/sound/votrax.h b/src/devices/sound/votrax.h
similarity index 100%
rename from src/emu/sound/votrax.h
rename to src/devices/sound/votrax.h
diff --git a/src/emu/sound/vrc6.c b/src/devices/sound/vrc6.c
similarity index 100%
rename from src/emu/sound/vrc6.c
rename to src/devices/sound/vrc6.c
diff --git a/src/emu/sound/vrc6.h b/src/devices/sound/vrc6.h
similarity index 100%
rename from src/emu/sound/vrc6.h
rename to src/devices/sound/vrc6.h
diff --git a/src/emu/sound/vrender0.c b/src/devices/sound/vrender0.c
similarity index 100%
rename from src/emu/sound/vrender0.c
rename to src/devices/sound/vrender0.c
diff --git a/src/emu/sound/vrender0.h b/src/devices/sound/vrender0.h
similarity index 100%
rename from src/emu/sound/vrender0.h
rename to src/devices/sound/vrender0.h
diff --git a/src/emu/sound/wave.c b/src/devices/sound/wave.c
similarity index 100%
rename from src/emu/sound/wave.c
rename to src/devices/sound/wave.c
diff --git a/src/emu/sound/wave.h b/src/devices/sound/wave.h
similarity index 100%
rename from src/emu/sound/wave.h
rename to src/devices/sound/wave.h
diff --git a/src/emu/sound/wavwrite.c b/src/devices/sound/wavwrite.c
similarity index 100%
rename from src/emu/sound/wavwrite.c
rename to src/devices/sound/wavwrite.c
diff --git a/src/emu/sound/wavwrite.h b/src/devices/sound/wavwrite.h
similarity index 100%
rename from src/emu/sound/wavwrite.h
rename to src/devices/sound/wavwrite.h
diff --git a/src/emu/sound/x1_010.c b/src/devices/sound/x1_010.c
similarity index 100%
rename from src/emu/sound/x1_010.c
rename to src/devices/sound/x1_010.c
diff --git a/src/emu/sound/x1_010.h b/src/devices/sound/x1_010.h
similarity index 100%
rename from src/emu/sound/x1_010.h
rename to src/devices/sound/x1_010.h
diff --git a/src/emu/sound/ym2151.c b/src/devices/sound/ym2151.c
similarity index 100%
rename from src/emu/sound/ym2151.c
rename to src/devices/sound/ym2151.c
diff --git a/src/emu/sound/ym2151.h b/src/devices/sound/ym2151.h
similarity index 100%
rename from src/emu/sound/ym2151.h
rename to src/devices/sound/ym2151.h
diff --git a/src/emu/sound/ym2151.txt b/src/devices/sound/ym2151.txt
similarity index 100%
rename from src/emu/sound/ym2151.txt
rename to src/devices/sound/ym2151.txt
diff --git a/src/emu/sound/ym2413.c b/src/devices/sound/ym2413.c
similarity index 100%
rename from src/emu/sound/ym2413.c
rename to src/devices/sound/ym2413.c
diff --git a/src/emu/sound/ym2413.h b/src/devices/sound/ym2413.h
similarity index 100%
rename from src/emu/sound/ym2413.h
rename to src/devices/sound/ym2413.h
diff --git a/src/emu/sound/ymdeltat.c b/src/devices/sound/ymdeltat.c
similarity index 100%
rename from src/emu/sound/ymdeltat.c
rename to src/devices/sound/ymdeltat.c
diff --git a/src/emu/sound/ymdeltat.h b/src/devices/sound/ymdeltat.h
similarity index 100%
rename from src/emu/sound/ymdeltat.h
rename to src/devices/sound/ymdeltat.h
diff --git a/src/emu/sound/ymf262.c b/src/devices/sound/ymf262.c
similarity index 100%
rename from src/emu/sound/ymf262.c
rename to src/devices/sound/ymf262.c
diff --git a/src/emu/sound/ymf262.h b/src/devices/sound/ymf262.h
similarity index 100%
rename from src/emu/sound/ymf262.h
rename to src/devices/sound/ymf262.h
diff --git a/src/emu/sound/ymf271.c b/src/devices/sound/ymf271.c
similarity index 100%
rename from src/emu/sound/ymf271.c
rename to src/devices/sound/ymf271.c
diff --git a/src/emu/sound/ymf271.h b/src/devices/sound/ymf271.h
similarity index 100%
rename from src/emu/sound/ymf271.h
rename to src/devices/sound/ymf271.h
diff --git a/src/emu/sound/ymf278b.c b/src/devices/sound/ymf278b.c
similarity index 100%
rename from src/emu/sound/ymf278b.c
rename to src/devices/sound/ymf278b.c
diff --git a/src/emu/sound/ymf278b.h b/src/devices/sound/ymf278b.h
similarity index 100%
rename from src/emu/sound/ymf278b.h
rename to src/devices/sound/ymf278b.h
diff --git a/src/emu/sound/ymz280b.c b/src/devices/sound/ymz280b.c
similarity index 100%
rename from src/emu/sound/ymz280b.c
rename to src/devices/sound/ymz280b.c
diff --git a/src/emu/sound/ymz280b.h b/src/devices/sound/ymz280b.h
similarity index 100%
rename from src/emu/sound/ymz280b.h
rename to src/devices/sound/ymz280b.h
diff --git a/src/emu/sound/ymz770.c b/src/devices/sound/ymz770.c
similarity index 100%
rename from src/emu/sound/ymz770.c
rename to src/devices/sound/ymz770.c
diff --git a/src/emu/sound/ymz770.h b/src/devices/sound/ymz770.h
similarity index 100%
rename from src/emu/sound/ymz770.h
rename to src/devices/sound/ymz770.h
diff --git a/src/emu/sound/zsg2.c b/src/devices/sound/zsg2.c
similarity index 100%
rename from src/emu/sound/zsg2.c
rename to src/devices/sound/zsg2.c
diff --git a/src/emu/sound/zsg2.h b/src/devices/sound/zsg2.h
similarity index 100%
rename from src/emu/sound/zsg2.h
rename to src/devices/sound/zsg2.h
diff --git a/src/emu/video/315_5124.c b/src/devices/video/315_5124.c
similarity index 100%
rename from src/emu/video/315_5124.c
rename to src/devices/video/315_5124.c
diff --git a/src/emu/video/315_5124.h b/src/devices/video/315_5124.h
similarity index 100%
rename from src/emu/video/315_5124.h
rename to src/devices/video/315_5124.h
diff --git a/src/emu/video/315_5313.c b/src/devices/video/315_5313.c
similarity index 100%
rename from src/emu/video/315_5313.c
rename to src/devices/video/315_5313.c
diff --git a/src/emu/video/315_5313.h b/src/devices/video/315_5313.h
similarity index 100%
rename from src/emu/video/315_5313.h
rename to src/devices/video/315_5313.h
diff --git a/src/emu/video/bufsprite.c b/src/devices/video/bufsprite.c
similarity index 100%
rename from src/emu/video/bufsprite.c
rename to src/devices/video/bufsprite.c
diff --git a/src/emu/video/bufsprite.h b/src/devices/video/bufsprite.h
similarity index 100%
rename from src/emu/video/bufsprite.h
rename to src/devices/video/bufsprite.h
diff --git a/src/emu/video/cdp1861.c b/src/devices/video/cdp1861.c
similarity index 100%
rename from src/emu/video/cdp1861.c
rename to src/devices/video/cdp1861.c
diff --git a/src/emu/video/cdp1861.h b/src/devices/video/cdp1861.h
similarity index 100%
rename from src/emu/video/cdp1861.h
rename to src/devices/video/cdp1861.h
diff --git a/src/emu/video/cdp1862.c b/src/devices/video/cdp1862.c
similarity index 100%
rename from src/emu/video/cdp1862.c
rename to src/devices/video/cdp1862.c
diff --git a/src/emu/video/cdp1862.h b/src/devices/video/cdp1862.h
similarity index 100%
rename from src/emu/video/cdp1862.h
rename to src/devices/video/cdp1862.h
diff --git a/src/emu/video/cgapal.c b/src/devices/video/cgapal.c
similarity index 100%
rename from src/emu/video/cgapal.c
rename to src/devices/video/cgapal.c
diff --git a/src/emu/video/cgapal.h b/src/devices/video/cgapal.h
similarity index 100%
rename from src/emu/video/cgapal.h
rename to src/devices/video/cgapal.h
diff --git a/src/emu/video/clgd542x.c b/src/devices/video/clgd542x.c
similarity index 100%
rename from src/emu/video/clgd542x.c
rename to src/devices/video/clgd542x.c
diff --git a/src/emu/video/clgd542x.h b/src/devices/video/clgd542x.h
similarity index 100%
rename from src/emu/video/clgd542x.h
rename to src/devices/video/clgd542x.h
diff --git a/src/emu/video/crt9007.c b/src/devices/video/crt9007.c
similarity index 100%
rename from src/emu/video/crt9007.c
rename to src/devices/video/crt9007.c
diff --git a/src/emu/video/crt9007.h b/src/devices/video/crt9007.h
similarity index 100%
rename from src/emu/video/crt9007.h
rename to src/devices/video/crt9007.h
diff --git a/src/emu/video/crt9021.c b/src/devices/video/crt9021.c
similarity index 100%
rename from src/emu/video/crt9021.c
rename to src/devices/video/crt9021.c
diff --git a/src/emu/video/crt9021.h b/src/devices/video/crt9021.h
similarity index 100%
rename from src/emu/video/crt9021.h
rename to src/devices/video/crt9021.h
diff --git a/src/emu/video/crt9212.c b/src/devices/video/crt9212.c
similarity index 100%
rename from src/emu/video/crt9212.c
rename to src/devices/video/crt9212.c
diff --git a/src/emu/video/crt9212.h b/src/devices/video/crt9212.h
similarity index 100%
rename from src/emu/video/crt9212.h
rename to src/devices/video/crt9212.h
diff --git a/src/emu/video/crtc_ega.c b/src/devices/video/crtc_ega.c
similarity index 100%
rename from src/emu/video/crtc_ega.c
rename to src/devices/video/crtc_ega.c
diff --git a/src/emu/video/crtc_ega.h b/src/devices/video/crtc_ega.h
similarity index 100%
rename from src/emu/video/crtc_ega.h
rename to src/devices/video/crtc_ega.h
diff --git a/src/emu/video/dl1416.c b/src/devices/video/dl1416.c
similarity index 100%
rename from src/emu/video/dl1416.c
rename to src/devices/video/dl1416.c
diff --git a/src/emu/video/dl1416.h b/src/devices/video/dl1416.h
similarity index 100%
rename from src/emu/video/dl1416.h
rename to src/devices/video/dl1416.h
diff --git a/src/emu/video/dm9368.c b/src/devices/video/dm9368.c
similarity index 100%
rename from src/emu/video/dm9368.c
rename to src/devices/video/dm9368.c
diff --git a/src/emu/video/dm9368.h b/src/devices/video/dm9368.h
similarity index 100%
rename from src/emu/video/dm9368.h
rename to src/devices/video/dm9368.h
diff --git a/src/emu/video/ef9340_1.c b/src/devices/video/ef9340_1.c
similarity index 100%
rename from src/emu/video/ef9340_1.c
rename to src/devices/video/ef9340_1.c
diff --git a/src/emu/video/ef9340_1.h b/src/devices/video/ef9340_1.h
similarity index 100%
rename from src/emu/video/ef9340_1.h
rename to src/devices/video/ef9340_1.h
diff --git a/src/emu/video/ef9341_chargen.h b/src/devices/video/ef9341_chargen.h
similarity index 100%
rename from src/emu/video/ef9341_chargen.h
rename to src/devices/video/ef9341_chargen.h
diff --git a/src/emu/video/ef9345.c b/src/devices/video/ef9345.c
similarity index 100%
rename from src/emu/video/ef9345.c
rename to src/devices/video/ef9345.c
diff --git a/src/emu/video/ef9345.h b/src/devices/video/ef9345.h
similarity index 100%
rename from src/emu/video/ef9345.h
rename to src/devices/video/ef9345.h
diff --git a/src/emu/video/epic12.c b/src/devices/video/epic12.c
similarity index 100%
rename from src/emu/video/epic12.c
rename to src/devices/video/epic12.c
diff --git a/src/emu/video/epic12.h b/src/devices/video/epic12.h
similarity index 100%
rename from src/emu/video/epic12.h
rename to src/devices/video/epic12.h
diff --git a/src/emu/video/epic12_blit0.c b/src/devices/video/epic12_blit0.c
similarity index 100%
rename from src/emu/video/epic12_blit0.c
rename to src/devices/video/epic12_blit0.c
diff --git a/src/emu/video/epic12_blit1.c b/src/devices/video/epic12_blit1.c
similarity index 100%
rename from src/emu/video/epic12_blit1.c
rename to src/devices/video/epic12_blit1.c
diff --git a/src/emu/video/epic12_blit2.c b/src/devices/video/epic12_blit2.c
similarity index 100%
rename from src/emu/video/epic12_blit2.c
rename to src/devices/video/epic12_blit2.c
diff --git a/src/emu/video/epic12_blit3.c b/src/devices/video/epic12_blit3.c
similarity index 100%
rename from src/emu/video/epic12_blit3.c
rename to src/devices/video/epic12_blit3.c
diff --git a/src/emu/video/epic12_blit4.c b/src/devices/video/epic12_blit4.c
similarity index 100%
rename from src/emu/video/epic12_blit4.c
rename to src/devices/video/epic12_blit4.c
diff --git a/src/emu/video/epic12_blit5.c b/src/devices/video/epic12_blit5.c
similarity index 100%
rename from src/emu/video/epic12_blit5.c
rename to src/devices/video/epic12_blit5.c
diff --git a/src/emu/video/epic12_blit6.c b/src/devices/video/epic12_blit6.c
similarity index 100%
rename from src/emu/video/epic12_blit6.c
rename to src/devices/video/epic12_blit6.c
diff --git a/src/emu/video/epic12_blit7.c b/src/devices/video/epic12_blit7.c
similarity index 100%
rename from src/emu/video/epic12_blit7.c
rename to src/devices/video/epic12_blit7.c
diff --git a/src/emu/video/epic12_blit8.c b/src/devices/video/epic12_blit8.c
similarity index 100%
rename from src/emu/video/epic12_blit8.c
rename to src/devices/video/epic12_blit8.c
diff --git a/src/emu/video/epic12in.inc b/src/devices/video/epic12in.inc
similarity index 100%
rename from src/emu/video/epic12in.inc
rename to src/devices/video/epic12in.inc
diff --git a/src/emu/video/epic12pixel.inc b/src/devices/video/epic12pixel.inc
similarity index 100%
rename from src/emu/video/epic12pixel.inc
rename to src/devices/video/epic12pixel.inc
diff --git a/src/emu/video/fixfreq.c b/src/devices/video/fixfreq.c
similarity index 100%
rename from src/emu/video/fixfreq.c
rename to src/devices/video/fixfreq.c
diff --git a/src/emu/video/fixfreq.h b/src/devices/video/fixfreq.h
similarity index 100%
rename from src/emu/video/fixfreq.h
rename to src/devices/video/fixfreq.h
diff --git a/src/emu/video/generic.c b/src/devices/video/generic.c
similarity index 100%
rename from src/emu/video/generic.c
rename to src/devices/video/generic.c
diff --git a/src/emu/video/generic.h b/src/devices/video/generic.h
similarity index 100%
rename from src/emu/video/generic.h
rename to src/devices/video/generic.h
diff --git a/src/emu/video/gf4500.c b/src/devices/video/gf4500.c
similarity index 100%
rename from src/emu/video/gf4500.c
rename to src/devices/video/gf4500.c
diff --git a/src/emu/video/gf4500.h b/src/devices/video/gf4500.h
similarity index 100%
rename from src/emu/video/gf4500.h
rename to src/devices/video/gf4500.h
diff --git a/src/emu/video/gf7600gs.c b/src/devices/video/gf7600gs.c
similarity index 100%
rename from src/emu/video/gf7600gs.c
rename to src/devices/video/gf7600gs.c
diff --git a/src/emu/video/gf7600gs.h b/src/devices/video/gf7600gs.h
similarity index 100%
rename from src/emu/video/gf7600gs.h
rename to src/devices/video/gf7600gs.h
diff --git a/src/emu/video/h63484.c b/src/devices/video/h63484.c
similarity index 100%
rename from src/emu/video/h63484.c
rename to src/devices/video/h63484.c
diff --git a/src/emu/video/h63484.h b/src/devices/video/h63484.h
similarity index 100%
rename from src/emu/video/h63484.h
rename to src/devices/video/h63484.h
diff --git a/src/emu/video/hd44102.c b/src/devices/video/hd44102.c
similarity index 100%
rename from src/emu/video/hd44102.c
rename to src/devices/video/hd44102.c
diff --git a/src/emu/video/hd44102.h b/src/devices/video/hd44102.h
similarity index 100%
rename from src/emu/video/hd44102.h
rename to src/devices/video/hd44102.h
diff --git a/src/emu/video/hd44352.c b/src/devices/video/hd44352.c
similarity index 100%
rename from src/emu/video/hd44352.c
rename to src/devices/video/hd44352.c
diff --git a/src/emu/video/hd44352.h b/src/devices/video/hd44352.h
similarity index 100%
rename from src/emu/video/hd44352.h
rename to src/devices/video/hd44352.h
diff --git a/src/emu/video/hd44780.c b/src/devices/video/hd44780.c
similarity index 100%
rename from src/emu/video/hd44780.c
rename to src/devices/video/hd44780.c
diff --git a/src/emu/video/hd44780.h b/src/devices/video/hd44780.h
similarity index 100%
rename from src/emu/video/hd44780.h
rename to src/devices/video/hd44780.h
diff --git a/src/emu/video/hd61830.c b/src/devices/video/hd61830.c
similarity index 100%
rename from src/emu/video/hd61830.c
rename to src/devices/video/hd61830.c
diff --git a/src/emu/video/hd61830.h b/src/devices/video/hd61830.h
similarity index 100%
rename from src/emu/video/hd61830.h
rename to src/devices/video/hd61830.h
diff --git a/src/emu/video/hd63484.c b/src/devices/video/hd63484.c
similarity index 100%
rename from src/emu/video/hd63484.c
rename to src/devices/video/hd63484.c
diff --git a/src/emu/video/hd63484.h b/src/devices/video/hd63484.h
similarity index 100%
rename from src/emu/video/hd63484.h
rename to src/devices/video/hd63484.h
diff --git a/src/emu/video/hd66421.c b/src/devices/video/hd66421.c
similarity index 100%
rename from src/emu/video/hd66421.c
rename to src/devices/video/hd66421.c
diff --git a/src/emu/video/hd66421.h b/src/devices/video/hd66421.h
similarity index 100%
rename from src/emu/video/hd66421.h
rename to src/devices/video/hd66421.h
diff --git a/src/emu/video/huc6202.c b/src/devices/video/huc6202.c
similarity index 100%
rename from src/emu/video/huc6202.c
rename to src/devices/video/huc6202.c
diff --git a/src/emu/video/huc6202.h b/src/devices/video/huc6202.h
similarity index 100%
rename from src/emu/video/huc6202.h
rename to src/devices/video/huc6202.h
diff --git a/src/emu/video/huc6260.c b/src/devices/video/huc6260.c
similarity index 100%
rename from src/emu/video/huc6260.c
rename to src/devices/video/huc6260.c
diff --git a/src/emu/video/huc6260.h b/src/devices/video/huc6260.h
similarity index 100%
rename from src/emu/video/huc6260.h
rename to src/devices/video/huc6260.h
diff --git a/src/emu/video/huc6261.c b/src/devices/video/huc6261.c
similarity index 100%
rename from src/emu/video/huc6261.c
rename to src/devices/video/huc6261.c
diff --git a/src/emu/video/huc6261.h b/src/devices/video/huc6261.h
similarity index 100%
rename from src/emu/video/huc6261.h
rename to src/devices/video/huc6261.h
diff --git a/src/emu/video/huc6270.c b/src/devices/video/huc6270.c
similarity index 100%
rename from src/emu/video/huc6270.c
rename to src/devices/video/huc6270.c
diff --git a/src/emu/video/huc6270.h b/src/devices/video/huc6270.h
similarity index 100%
rename from src/emu/video/huc6270.h
rename to src/devices/video/huc6270.h
diff --git a/src/emu/video/huc6272.c b/src/devices/video/huc6272.c
similarity index 100%
rename from src/emu/video/huc6272.c
rename to src/devices/video/huc6272.c
diff --git a/src/emu/video/huc6272.h b/src/devices/video/huc6272.h
similarity index 100%
rename from src/emu/video/huc6272.h
rename to src/devices/video/huc6272.h
diff --git a/src/emu/video/i8244.c b/src/devices/video/i8244.c
similarity index 100%
rename from src/emu/video/i8244.c
rename to src/devices/video/i8244.c
diff --git a/src/emu/video/i8244.h b/src/devices/video/i8244.h
similarity index 100%
rename from src/emu/video/i8244.h
rename to src/devices/video/i8244.h
diff --git a/src/emu/video/i82730.c b/src/devices/video/i82730.c
similarity index 100%
rename from src/emu/video/i82730.c
rename to src/devices/video/i82730.c
diff --git a/src/emu/video/i82730.h b/src/devices/video/i82730.h
similarity index 100%
rename from src/emu/video/i82730.h
rename to src/devices/video/i82730.h
diff --git a/src/emu/video/i8275.c b/src/devices/video/i8275.c
similarity index 100%
rename from src/emu/video/i8275.c
rename to src/devices/video/i8275.c
diff --git a/src/emu/video/i8275.h b/src/devices/video/i8275.h
similarity index 100%
rename from src/emu/video/i8275.h
rename to src/devices/video/i8275.h
diff --git a/src/emu/video/m50458.c b/src/devices/video/m50458.c
similarity index 100%
rename from src/emu/video/m50458.c
rename to src/devices/video/m50458.c
diff --git a/src/emu/video/m50458.h b/src/devices/video/m50458.h
similarity index 100%
rename from src/emu/video/m50458.h
rename to src/devices/video/m50458.h
diff --git a/src/emu/video/mb90082.c b/src/devices/video/mb90082.c
similarity index 100%
rename from src/emu/video/mb90082.c
rename to src/devices/video/mb90082.c
diff --git a/src/emu/video/mb90082.h b/src/devices/video/mb90082.h
similarity index 100%
rename from src/emu/video/mb90082.h
rename to src/devices/video/mb90082.h
diff --git a/src/emu/video/mb_vcu.c b/src/devices/video/mb_vcu.c
similarity index 100%
rename from src/emu/video/mb_vcu.c
rename to src/devices/video/mb_vcu.c
diff --git a/src/emu/video/mb_vcu.h b/src/devices/video/mb_vcu.h
similarity index 100%
rename from src/emu/video/mb_vcu.h
rename to src/devices/video/mb_vcu.h
diff --git a/src/emu/video/mc6845.c b/src/devices/video/mc6845.c
similarity index 100%
rename from src/emu/video/mc6845.c
rename to src/devices/video/mc6845.c
diff --git a/src/emu/video/mc6845.h b/src/devices/video/mc6845.h
similarity index 100%
rename from src/emu/video/mc6845.h
rename to src/devices/video/mc6845.h
diff --git a/src/emu/video/mc6847.c b/src/devices/video/mc6847.c
similarity index 100%
rename from src/emu/video/mc6847.c
rename to src/devices/video/mc6847.c
diff --git a/src/emu/video/mc6847.h b/src/devices/video/mc6847.h
similarity index 100%
rename from src/emu/video/mc6847.h
rename to src/devices/video/mc6847.h
diff --git a/src/emu/video/mos6566.c b/src/devices/video/mos6566.c
similarity index 100%
rename from src/emu/video/mos6566.c
rename to src/devices/video/mos6566.c
diff --git a/src/emu/video/mos6566.h b/src/devices/video/mos6566.h
similarity index 100%
rename from src/emu/video/mos6566.h
rename to src/devices/video/mos6566.h
diff --git a/src/emu/video/msm6222b.c b/src/devices/video/msm6222b.c
similarity index 100%
rename from src/emu/video/msm6222b.c
rename to src/devices/video/msm6222b.c
diff --git a/src/emu/video/msm6222b.h b/src/devices/video/msm6222b.h
similarity index 100%
rename from src/emu/video/msm6222b.h
rename to src/devices/video/msm6222b.h
diff --git a/src/emu/video/msm6255.c b/src/devices/video/msm6255.c
similarity index 100%
rename from src/emu/video/msm6255.c
rename to src/devices/video/msm6255.c
diff --git a/src/emu/video/msm6255.h b/src/devices/video/msm6255.h
similarity index 100%
rename from src/emu/video/msm6255.h
rename to src/devices/video/msm6255.h
diff --git a/src/emu/video/pc_vga.c b/src/devices/video/pc_vga.c
similarity index 100%
rename from src/emu/video/pc_vga.c
rename to src/devices/video/pc_vga.c
diff --git a/src/emu/video/pc_vga.h b/src/devices/video/pc_vga.h
similarity index 100%
rename from src/emu/video/pc_vga.h
rename to src/devices/video/pc_vga.h
diff --git a/src/emu/video/poly.h b/src/devices/video/poly.h
similarity index 100%
rename from src/emu/video/poly.h
rename to src/devices/video/poly.h
diff --git a/src/emu/video/polylgcy.c b/src/devices/video/polylgcy.c
similarity index 100%
rename from src/emu/video/polylgcy.c
rename to src/devices/video/polylgcy.c
diff --git a/src/emu/video/polylgcy.h b/src/devices/video/polylgcy.h
similarity index 100%
rename from src/emu/video/polylgcy.h
rename to src/devices/video/polylgcy.h
diff --git a/src/emu/video/psx.c b/src/devices/video/psx.c
similarity index 100%
rename from src/emu/video/psx.c
rename to src/devices/video/psx.c
diff --git a/src/emu/video/psx.h b/src/devices/video/psx.h
similarity index 100%
rename from src/emu/video/psx.h
rename to src/devices/video/psx.h
diff --git a/src/emu/video/ramdac.c b/src/devices/video/ramdac.c
similarity index 100%
rename from src/emu/video/ramdac.c
rename to src/devices/video/ramdac.c
diff --git a/src/emu/video/ramdac.h b/src/devices/video/ramdac.h
similarity index 100%
rename from src/emu/video/ramdac.h
rename to src/devices/video/ramdac.h
diff --git a/src/emu/video/resnet.c b/src/devices/video/resnet.c
similarity index 100%
rename from src/emu/video/resnet.c
rename to src/devices/video/resnet.c
diff --git a/src/emu/video/resnet.h b/src/devices/video/resnet.h
similarity index 100%
rename from src/emu/video/resnet.h
rename to src/devices/video/resnet.h
diff --git a/src/emu/video/rgbgen.c b/src/devices/video/rgbgen.c
similarity index 100%
rename from src/emu/video/rgbgen.c
rename to src/devices/video/rgbgen.c
diff --git a/src/emu/video/rgbgen.h b/src/devices/video/rgbgen.h
similarity index 100%
rename from src/emu/video/rgbgen.h
rename to src/devices/video/rgbgen.h
diff --git a/src/emu/video/rgbsse.c b/src/devices/video/rgbsse.c
similarity index 100%
rename from src/emu/video/rgbsse.c
rename to src/devices/video/rgbsse.c
diff --git a/src/emu/video/rgbsse.h b/src/devices/video/rgbsse.h
similarity index 100%
rename from src/emu/video/rgbsse.h
rename to src/devices/video/rgbsse.h
diff --git a/src/emu/video/rgbutil.h b/src/devices/video/rgbutil.h
similarity index 100%
rename from src/emu/video/rgbutil.h
rename to src/devices/video/rgbutil.h
diff --git a/src/emu/video/rgbvmx.c b/src/devices/video/rgbvmx.c
similarity index 100%
rename from src/emu/video/rgbvmx.c
rename to src/devices/video/rgbvmx.c
diff --git a/src/emu/video/rgbvmx.h b/src/devices/video/rgbvmx.h
similarity index 100%
rename from src/emu/video/rgbvmx.h
rename to src/devices/video/rgbvmx.h
diff --git a/src/emu/video/saa5050.c b/src/devices/video/saa5050.c
similarity index 100%
rename from src/emu/video/saa5050.c
rename to src/devices/video/saa5050.c
diff --git a/src/emu/video/saa5050.h b/src/devices/video/saa5050.h
similarity index 100%
rename from src/emu/video/saa5050.h
rename to src/devices/video/saa5050.h
diff --git a/src/emu/video/scn2674.c b/src/devices/video/scn2674.c
similarity index 100%
rename from src/emu/video/scn2674.c
rename to src/devices/video/scn2674.c
diff --git a/src/emu/video/scn2674.h b/src/devices/video/scn2674.h
similarity index 100%
rename from src/emu/video/scn2674.h
rename to src/devices/video/scn2674.h
diff --git a/src/emu/video/sed1200.c b/src/devices/video/sed1200.c
similarity index 100%
rename from src/emu/video/sed1200.c
rename to src/devices/video/sed1200.c
diff --git a/src/emu/video/sed1200.h b/src/devices/video/sed1200.h
similarity index 100%
rename from src/emu/video/sed1200.h
rename to src/devices/video/sed1200.h
diff --git a/src/emu/video/sed1330.c b/src/devices/video/sed1330.c
similarity index 100%
rename from src/emu/video/sed1330.c
rename to src/devices/video/sed1330.c
diff --git a/src/emu/video/sed1330.h b/src/devices/video/sed1330.h
similarity index 100%
rename from src/emu/video/sed1330.h
rename to src/devices/video/sed1330.h
diff --git a/src/emu/video/sed1520.c b/src/devices/video/sed1520.c
similarity index 100%
rename from src/emu/video/sed1520.c
rename to src/devices/video/sed1520.c
diff --git a/src/emu/video/sed1520.h b/src/devices/video/sed1520.h
similarity index 100%
rename from src/emu/video/sed1520.h
rename to src/devices/video/sed1520.h
diff --git a/src/emu/video/snes_ppu.c b/src/devices/video/snes_ppu.c
similarity index 100%
rename from src/emu/video/snes_ppu.c
rename to src/devices/video/snes_ppu.c
diff --git a/src/emu/video/snes_ppu.h b/src/devices/video/snes_ppu.h
similarity index 100%
rename from src/emu/video/snes_ppu.h
rename to src/devices/video/snes_ppu.h
diff --git a/src/emu/video/stvvdp1.c b/src/devices/video/stvvdp1.c
similarity index 100%
rename from src/emu/video/stvvdp1.c
rename to src/devices/video/stvvdp1.c
diff --git a/src/emu/video/stvvdp2.c b/src/devices/video/stvvdp2.c
similarity index 100%
rename from src/emu/video/stvvdp2.c
rename to src/devices/video/stvvdp2.c
diff --git a/src/emu/video/t6a04.c b/src/devices/video/t6a04.c
similarity index 100%
rename from src/emu/video/t6a04.c
rename to src/devices/video/t6a04.c
diff --git a/src/emu/video/t6a04.h b/src/devices/video/t6a04.h
similarity index 100%
rename from src/emu/video/t6a04.h
rename to src/devices/video/t6a04.h
diff --git a/src/emu/video/tea1002.c b/src/devices/video/tea1002.c
similarity index 100%
rename from src/emu/video/tea1002.c
rename to src/devices/video/tea1002.c
diff --git a/src/emu/video/tea1002.h b/src/devices/video/tea1002.h
similarity index 100%
rename from src/emu/video/tea1002.h
rename to src/devices/video/tea1002.h
diff --git a/src/emu/video/tlc34076.c b/src/devices/video/tlc34076.c
similarity index 100%
rename from src/emu/video/tlc34076.c
rename to src/devices/video/tlc34076.c
diff --git a/src/emu/video/tlc34076.h b/src/devices/video/tlc34076.h
similarity index 100%
rename from src/emu/video/tlc34076.h
rename to src/devices/video/tlc34076.h
diff --git a/src/emu/video/tms34061.c b/src/devices/video/tms34061.c
similarity index 100%
rename from src/emu/video/tms34061.c
rename to src/devices/video/tms34061.c
diff --git a/src/emu/video/tms34061.h b/src/devices/video/tms34061.h
similarity index 100%
rename from src/emu/video/tms34061.h
rename to src/devices/video/tms34061.h
diff --git a/src/emu/video/tms3556.c b/src/devices/video/tms3556.c
similarity index 100%
rename from src/emu/video/tms3556.c
rename to src/devices/video/tms3556.c
diff --git a/src/emu/video/tms3556.h b/src/devices/video/tms3556.h
similarity index 100%
rename from src/emu/video/tms3556.h
rename to src/devices/video/tms3556.h
diff --git a/src/emu/video/tms9927.c b/src/devices/video/tms9927.c
similarity index 100%
rename from src/emu/video/tms9927.c
rename to src/devices/video/tms9927.c
diff --git a/src/emu/video/tms9927.h b/src/devices/video/tms9927.h
similarity index 100%
rename from src/emu/video/tms9927.h
rename to src/devices/video/tms9927.h
diff --git a/src/emu/video/tms9928a.c b/src/devices/video/tms9928a.c
similarity index 100%
rename from src/emu/video/tms9928a.c
rename to src/devices/video/tms9928a.c
diff --git a/src/emu/video/tms9928a.h b/src/devices/video/tms9928a.h
similarity index 100%
rename from src/emu/video/tms9928a.h
rename to src/devices/video/tms9928a.h
diff --git a/src/emu/video/upd3301.c b/src/devices/video/upd3301.c
similarity index 100%
rename from src/emu/video/upd3301.c
rename to src/devices/video/upd3301.c
diff --git a/src/emu/video/upd3301.h b/src/devices/video/upd3301.h
similarity index 100%
rename from src/emu/video/upd3301.h
rename to src/devices/video/upd3301.h
diff --git a/src/emu/video/upd7220.c b/src/devices/video/upd7220.c
similarity index 100%
rename from src/emu/video/upd7220.c
rename to src/devices/video/upd7220.c
diff --git a/src/emu/video/upd7220.h b/src/devices/video/upd7220.h
similarity index 100%
rename from src/emu/video/upd7220.h
rename to src/devices/video/upd7220.h
diff --git a/src/emu/video/upd7227.c b/src/devices/video/upd7227.c
similarity index 100%
rename from src/emu/video/upd7227.c
rename to src/devices/video/upd7227.c
diff --git a/src/emu/video/upd7227.h b/src/devices/video/upd7227.h
similarity index 100%
rename from src/emu/video/upd7227.h
rename to src/devices/video/upd7227.h
diff --git a/src/emu/video/v9938.c b/src/devices/video/v9938.c
similarity index 100%
rename from src/emu/video/v9938.c
rename to src/devices/video/v9938.c
diff --git a/src/emu/video/v9938.h b/src/devices/video/v9938.h
similarity index 100%
rename from src/emu/video/v9938.h
rename to src/devices/video/v9938.h
diff --git a/src/emu/video/vector.c b/src/devices/video/vector.c
similarity index 100%
rename from src/emu/video/vector.c
rename to src/devices/video/vector.c
diff --git a/src/emu/video/vector.h b/src/devices/video/vector.h
similarity index 100%
rename from src/emu/video/vector.h
rename to src/devices/video/vector.h
diff --git a/src/emu/video/vic4567.c b/src/devices/video/vic4567.c
similarity index 100%
rename from src/emu/video/vic4567.c
rename to src/devices/video/vic4567.c
diff --git a/src/emu/video/vic4567.h b/src/devices/video/vic4567.h
similarity index 100%
rename from src/emu/video/vic4567.h
rename to src/devices/video/vic4567.h
diff --git a/src/emu/video/vooddefs.h b/src/devices/video/vooddefs.h
similarity index 100%
rename from src/emu/video/vooddefs.h
rename to src/devices/video/vooddefs.h
diff --git a/src/emu/video/voodoo.c b/src/devices/video/voodoo.c
similarity index 100%
rename from src/emu/video/voodoo.c
rename to src/devices/video/voodoo.c
diff --git a/src/emu/video/voodoo.h b/src/devices/video/voodoo.h
similarity index 100%
rename from src/emu/video/voodoo.h
rename to src/devices/video/voodoo.h
diff --git a/src/emu/video/voodoo_pci.c b/src/devices/video/voodoo_pci.c
similarity index 100%
rename from src/emu/video/voodoo_pci.c
rename to src/devices/video/voodoo_pci.c
diff --git a/src/emu/video/voodoo_pci.h b/src/devices/video/voodoo_pci.h
similarity index 100%
rename from src/emu/video/voodoo_pci.h
rename to src/devices/video/voodoo_pci.h