diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..7415346
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+shopt -s extglob
+cd "$(dirname "$0")"
+mkdir build
+cd build
+
+cp -R ../3rdparty/ .
+
+mkdir -p src/tools
+cp ../src/chdman.cpp src/tools/.
+cp -R -t src/ ../src/!("chdman.cpp"|"version.cpp")
+
+mkdir -p build/generated
+cp ../src/version.cpp build/generated/.
+
+mkdir -p build/1/2/3/4
+cp -t build/1/2/3/4 ../make_files/*.make
+cp -t build/1/2/3/4 ../make_files/3rdparty/*.make
+
+cd build/1/2/3/4
+
+for mkfile in !("chdman.make"); do make -f "$mkfile" -j$(nproc) config=release64; done
+
+make -f "chdman.make" -j$(nproc) config=release64
diff --git a/src/icludes/emu/addrmap.cpp b/src/emu/addrmap.cpp
similarity index 100%
rename from src/icludes/emu/addrmap.cpp
rename to src/emu/addrmap.cpp
diff --git a/src/icludes/emu/addrmap.h b/src/emu/addrmap.h
similarity index 100%
rename from src/icludes/emu/addrmap.h
rename to src/emu/addrmap.h
diff --git a/src/icludes/emu/attotime.cpp b/src/emu/attotime.cpp
similarity index 100%
rename from src/icludes/emu/attotime.cpp
rename to src/emu/attotime.cpp
diff --git a/src/icludes/emu/attotime.h b/src/emu/attotime.h
similarity index 100%
rename from src/icludes/emu/attotime.h
rename to src/emu/attotime.h
diff --git a/src/icludes/emu/bookkeeping.cpp b/src/emu/bookkeeping.cpp
similarity index 100%
rename from src/icludes/emu/bookkeeping.cpp
rename to src/emu/bookkeeping.cpp
diff --git a/src/icludes/emu/bookkeeping.h b/src/emu/bookkeeping.h
similarity index 100%
rename from src/icludes/emu/bookkeeping.h
rename to src/emu/bookkeeping.h
diff --git a/src/icludes/emu/config.cpp b/src/emu/config.cpp
similarity index 100%
rename from src/icludes/emu/config.cpp
rename to src/emu/config.cpp
diff --git a/src/icludes/emu/crsshair.cpp b/src/emu/crsshair.cpp
similarity index 100%
rename from src/icludes/emu/crsshair.cpp
rename to src/emu/crsshair.cpp
diff --git a/src/icludes/emu/crsshair.h b/src/emu/crsshair.h
similarity index 100%
rename from src/icludes/emu/crsshair.h
rename to src/emu/crsshair.h
diff --git a/src/icludes/emu/debug/debugbuf.cpp b/src/emu/debug/debugbuf.cpp
similarity index 100%
rename from src/icludes/emu/debug/debugbuf.cpp
rename to src/emu/debug/debugbuf.cpp
diff --git a/src/icludes/emu/debug/debugbuf.h b/src/emu/debug/debugbuf.h
similarity index 100%
rename from src/icludes/emu/debug/debugbuf.h
rename to src/emu/debug/debugbuf.h
diff --git a/src/icludes/emu/debug/debugcmd.cpp b/src/emu/debug/debugcmd.cpp
similarity index 100%
rename from src/icludes/emu/debug/debugcmd.cpp
rename to src/emu/debug/debugcmd.cpp
diff --git a/src/icludes/emu/debug/debugcmd.h b/src/emu/debug/debugcmd.h
similarity index 100%
rename from src/icludes/emu/debug/debugcmd.h
rename to src/emu/debug/debugcmd.h
diff --git a/src/icludes/emu/debug/debugcon.cpp b/src/emu/debug/debugcon.cpp
similarity index 100%
rename from src/icludes/emu/debug/debugcon.cpp
rename to src/emu/debug/debugcon.cpp
diff --git a/src/icludes/emu/debug/debugcon.h b/src/emu/debug/debugcon.h
similarity index 100%
rename from src/icludes/emu/debug/debugcon.h
rename to src/emu/debug/debugcon.h
diff --git a/src/icludes/emu/debug/debugcpu.cpp b/src/emu/debug/debugcpu.cpp
similarity index 100%
rename from src/icludes/emu/debug/debugcpu.cpp
rename to src/emu/debug/debugcpu.cpp
diff --git a/src/icludes/emu/debug/debugcpu.h b/src/emu/debug/debugcpu.h
similarity index 100%
rename from src/icludes/emu/debug/debugcpu.h
rename to src/emu/debug/debugcpu.h
diff --git a/src/icludes/emu/debug/debughlp.cpp b/src/emu/debug/debughlp.cpp
similarity index 100%
rename from src/icludes/emu/debug/debughlp.cpp
rename to src/emu/debug/debughlp.cpp
diff --git a/src/icludes/emu/debug/debughlp.h b/src/emu/debug/debughlp.h
similarity index 100%
rename from src/icludes/emu/debug/debughlp.h
rename to src/emu/debug/debughlp.h
diff --git a/src/icludes/emu/debug/debugvw.cpp b/src/emu/debug/debugvw.cpp
similarity index 100%
rename from src/icludes/emu/debug/debugvw.cpp
rename to src/emu/debug/debugvw.cpp
diff --git a/src/icludes/emu/debug/debugvw.h b/src/emu/debug/debugvw.h
similarity index 100%
rename from src/icludes/emu/debug/debugvw.h
rename to src/emu/debug/debugvw.h
diff --git a/src/icludes/emu/debug/dvbpoints.cpp b/src/emu/debug/dvbpoints.cpp
similarity index 100%
rename from src/icludes/emu/debug/dvbpoints.cpp
rename to src/emu/debug/dvbpoints.cpp
diff --git a/src/icludes/emu/debug/dvbpoints.h b/src/emu/debug/dvbpoints.h
similarity index 100%
rename from src/icludes/emu/debug/dvbpoints.h
rename to src/emu/debug/dvbpoints.h
diff --git a/src/icludes/emu/debug/dvdisasm.cpp b/src/emu/debug/dvdisasm.cpp
similarity index 100%
rename from src/icludes/emu/debug/dvdisasm.cpp
rename to src/emu/debug/dvdisasm.cpp
diff --git a/src/icludes/emu/debug/dvdisasm.h b/src/emu/debug/dvdisasm.h
similarity index 100%
rename from src/icludes/emu/debug/dvdisasm.h
rename to src/emu/debug/dvdisasm.h
diff --git a/src/icludes/emu/debug/dvmemory.cpp b/src/emu/debug/dvmemory.cpp
similarity index 100%
rename from src/icludes/emu/debug/dvmemory.cpp
rename to src/emu/debug/dvmemory.cpp
diff --git a/src/icludes/emu/debug/dvmemory.h b/src/emu/debug/dvmemory.h
similarity index 100%
rename from src/icludes/emu/debug/dvmemory.h
rename to src/emu/debug/dvmemory.h
diff --git a/src/icludes/emu/debug/dvrpoints.cpp b/src/emu/debug/dvrpoints.cpp
similarity index 100%
rename from src/icludes/emu/debug/dvrpoints.cpp
rename to src/emu/debug/dvrpoints.cpp
diff --git a/src/icludes/emu/debug/dvrpoints.h b/src/emu/debug/dvrpoints.h
similarity index 100%
rename from src/icludes/emu/debug/dvrpoints.h
rename to src/emu/debug/dvrpoints.h
diff --git a/src/icludes/emu/debug/dvstate.cpp b/src/emu/debug/dvstate.cpp
similarity index 100%
rename from src/icludes/emu/debug/dvstate.cpp
rename to src/emu/debug/dvstate.cpp
diff --git a/src/icludes/emu/debug/dvstate.h b/src/emu/debug/dvstate.h
similarity index 100%
rename from src/icludes/emu/debug/dvstate.h
rename to src/emu/debug/dvstate.h
diff --git a/src/icludes/emu/debug/dvtext.cpp b/src/emu/debug/dvtext.cpp
similarity index 100%
rename from src/icludes/emu/debug/dvtext.cpp
rename to src/emu/debug/dvtext.cpp
diff --git a/src/icludes/emu/debug/dvtext.h b/src/emu/debug/dvtext.h
similarity index 100%
rename from src/icludes/emu/debug/dvtext.h
rename to src/emu/debug/dvtext.h
diff --git a/src/icludes/emu/debug/dvwpoints.cpp b/src/emu/debug/dvwpoints.cpp
similarity index 100%
rename from src/icludes/emu/debug/dvwpoints.cpp
rename to src/emu/debug/dvwpoints.cpp
diff --git a/src/icludes/emu/debug/dvwpoints.h b/src/emu/debug/dvwpoints.h
similarity index 100%
rename from src/icludes/emu/debug/dvwpoints.h
rename to src/emu/debug/dvwpoints.h
diff --git a/src/icludes/emu/debug/express.cpp b/src/emu/debug/express.cpp
similarity index 100%
rename from src/icludes/emu/debug/express.cpp
rename to src/emu/debug/express.cpp
diff --git a/src/icludes/emu/debug/express.h b/src/emu/debug/express.h
similarity index 100%
rename from src/icludes/emu/debug/express.h
rename to src/emu/debug/express.h
diff --git a/src/icludes/emu/debug/points.cpp b/src/emu/debug/points.cpp
similarity index 100%
rename from src/icludes/emu/debug/points.cpp
rename to src/emu/debug/points.cpp
diff --git a/src/icludes/emu/debug/points.h b/src/emu/debug/points.h
similarity index 100%
rename from src/icludes/emu/debug/points.h
rename to src/emu/debug/points.h
diff --git a/src/icludes/emu/debug/textbuf.cpp b/src/emu/debug/textbuf.cpp
similarity index 100%
rename from src/icludes/emu/debug/textbuf.cpp
rename to src/emu/debug/textbuf.cpp
diff --git a/src/icludes/emu/debug/textbuf.h b/src/emu/debug/textbuf.h
similarity index 100%
rename from src/icludes/emu/debug/textbuf.h
rename to src/emu/debug/textbuf.h
diff --git a/src/icludes/emu/debugger.cpp b/src/emu/debugger.cpp
similarity index 100%
rename from src/icludes/emu/debugger.cpp
rename to src/emu/debugger.cpp
diff --git a/src/icludes/emu/debugger.h b/src/emu/debugger.h
similarity index 100%
rename from src/icludes/emu/debugger.h
rename to src/emu/debugger.h
diff --git a/src/icludes/emu/devcb.cpp b/src/emu/devcb.cpp
similarity index 100%
rename from src/icludes/emu/devcb.cpp
rename to src/emu/devcb.cpp
diff --git a/src/icludes/emu/devcb.h b/src/emu/devcb.h
similarity index 100%
rename from src/icludes/emu/devcb.h
rename to src/emu/devcb.h
diff --git a/src/icludes/emu/devcpu.cpp b/src/emu/devcpu.cpp
similarity index 100%
rename from src/icludes/emu/devcpu.cpp
rename to src/emu/devcpu.cpp
diff --git a/src/icludes/emu/devcpu.h b/src/emu/devcpu.h
similarity index 100%
rename from src/icludes/emu/devcpu.h
rename to src/emu/devcpu.h
diff --git a/src/icludes/emu/devdelegate.cpp b/src/emu/devdelegate.cpp
similarity index 100%
rename from src/icludes/emu/devdelegate.cpp
rename to src/emu/devdelegate.cpp
diff --git a/src/icludes/emu/devdelegate.h b/src/emu/devdelegate.h
similarity index 100%
rename from src/icludes/emu/devdelegate.h
rename to src/emu/devdelegate.h
diff --git a/src/icludes/emu/devfind.cpp b/src/emu/devfind.cpp
similarity index 100%
rename from src/icludes/emu/devfind.cpp
rename to src/emu/devfind.cpp
diff --git a/src/icludes/emu/devfind.h b/src/emu/devfind.h
similarity index 100%
rename from src/icludes/emu/devfind.h
rename to src/emu/devfind.h
diff --git a/src/icludes/emu/device.cpp b/src/emu/device.cpp
similarity index 100%
rename from src/icludes/emu/device.cpp
rename to src/emu/device.cpp
diff --git a/src/icludes/emu/device.h b/src/emu/device.h
similarity index 100%
rename from src/icludes/emu/device.h
rename to src/emu/device.h
diff --git a/src/icludes/emu/device.ipp b/src/emu/device.ipp
similarity index 100%
rename from src/icludes/emu/device.ipp
rename to src/emu/device.ipp
diff --git a/src/icludes/emu/didisasm.cpp b/src/emu/didisasm.cpp
similarity index 100%
rename from src/icludes/emu/didisasm.cpp
rename to src/emu/didisasm.cpp
diff --git a/src/icludes/emu/didisasm.h b/src/emu/didisasm.h
similarity index 100%
rename from src/icludes/emu/didisasm.h
rename to src/emu/didisasm.h
diff --git a/src/icludes/emu/diexec.cpp b/src/emu/diexec.cpp
similarity index 100%
rename from src/icludes/emu/diexec.cpp
rename to src/emu/diexec.cpp
diff --git a/src/icludes/emu/diexec.h b/src/emu/diexec.h
similarity index 100%
rename from src/icludes/emu/diexec.h
rename to src/emu/diexec.h
diff --git a/src/icludes/emu/digfx.cpp b/src/emu/digfx.cpp
similarity index 100%
rename from src/icludes/emu/digfx.cpp
rename to src/emu/digfx.cpp
diff --git a/src/icludes/emu/digfx.h b/src/emu/digfx.h
similarity index 100%
rename from src/icludes/emu/digfx.h
rename to src/emu/digfx.h
diff --git a/src/icludes/emu/diimage.cpp b/src/emu/diimage.cpp
similarity index 100%
rename from src/icludes/emu/diimage.cpp
rename to src/emu/diimage.cpp
diff --git a/src/icludes/emu/diimage.h b/src/emu/diimage.h
similarity index 100%
rename from src/icludes/emu/diimage.h
rename to src/emu/diimage.h
diff --git a/src/icludes/emu/dimemory.cpp b/src/emu/dimemory.cpp
similarity index 100%
rename from src/icludes/emu/dimemory.cpp
rename to src/emu/dimemory.cpp
diff --git a/src/icludes/emu/dimemory.h b/src/emu/dimemory.h
similarity index 100%
rename from src/icludes/emu/dimemory.h
rename to src/emu/dimemory.h
diff --git a/src/icludes/emu/dinetwork.cpp b/src/emu/dinetwork.cpp
similarity index 100%
rename from src/icludes/emu/dinetwork.cpp
rename to src/emu/dinetwork.cpp
diff --git a/src/icludes/emu/dinetwork.h b/src/emu/dinetwork.h
similarity index 100%
rename from src/icludes/emu/dinetwork.h
rename to src/emu/dinetwork.h
diff --git a/src/icludes/emu/dinvram.cpp b/src/emu/dinvram.cpp
similarity index 100%
rename from src/icludes/emu/dinvram.cpp
rename to src/emu/dinvram.cpp
diff --git a/src/icludes/emu/dinvram.h b/src/emu/dinvram.h
similarity index 100%
rename from src/icludes/emu/dinvram.h
rename to src/emu/dinvram.h
diff --git a/src/icludes/emu/dipalette.cpp b/src/emu/dipalette.cpp
similarity index 100%
rename from src/icludes/emu/dipalette.cpp
rename to src/emu/dipalette.cpp
diff --git a/src/icludes/emu/dipalette.h b/src/emu/dipalette.h
similarity index 100%
rename from src/icludes/emu/dipalette.h
rename to src/emu/dipalette.h
diff --git a/src/icludes/emu/dipty.cpp b/src/emu/dipty.cpp
similarity index 100%
rename from src/icludes/emu/dipty.cpp
rename to src/emu/dipty.cpp
diff --git a/src/icludes/emu/dipty.h b/src/emu/dipty.h
similarity index 100%
rename from src/icludes/emu/dipty.h
rename to src/emu/dipty.h
diff --git a/src/icludes/emu/dirom.h b/src/emu/dirom.h
similarity index 100%
rename from src/icludes/emu/dirom.h
rename to src/emu/dirom.h
diff --git a/src/icludes/emu/dirom.ipp b/src/emu/dirom.ipp
similarity index 100%
rename from src/icludes/emu/dirom.ipp
rename to src/emu/dirom.ipp
diff --git a/src/icludes/emu/dirtc.cpp b/src/emu/dirtc.cpp
similarity index 100%
rename from src/icludes/emu/dirtc.cpp
rename to src/emu/dirtc.cpp
diff --git a/src/icludes/emu/dirtc.h b/src/emu/dirtc.h
similarity index 100%
rename from src/icludes/emu/dirtc.h
rename to src/emu/dirtc.h
diff --git a/src/icludes/emu/diserial.cpp b/src/emu/diserial.cpp
similarity index 100%
rename from src/icludes/emu/diserial.cpp
rename to src/emu/diserial.cpp
diff --git a/src/icludes/emu/diserial.h b/src/emu/diserial.h
similarity index 100%
rename from src/icludes/emu/diserial.h
rename to src/emu/diserial.h
diff --git a/src/icludes/emu/dislot.cpp b/src/emu/dislot.cpp
similarity index 100%
rename from src/icludes/emu/dislot.cpp
rename to src/emu/dislot.cpp
diff --git a/src/icludes/emu/dislot.h b/src/emu/dislot.h
similarity index 100%
rename from src/icludes/emu/dislot.h
rename to src/emu/dislot.h
diff --git a/src/icludes/emu/disound.cpp b/src/emu/disound.cpp
similarity index 100%
rename from src/icludes/emu/disound.cpp
rename to src/emu/disound.cpp
diff --git a/src/icludes/emu/disound.h b/src/emu/disound.h
similarity index 100%
rename from src/icludes/emu/disound.h
rename to src/emu/disound.h
diff --git a/src/icludes/emu/distate.cpp b/src/emu/distate.cpp
similarity index 100%
rename from src/icludes/emu/distate.cpp
rename to src/emu/distate.cpp
diff --git a/src/icludes/emu/distate.h b/src/emu/distate.h
similarity index 100%
rename from src/icludes/emu/distate.h
rename to src/emu/distate.h
diff --git a/src/icludes/emu/divideo.cpp b/src/emu/divideo.cpp
similarity index 100%
rename from src/icludes/emu/divideo.cpp
rename to src/emu/divideo.cpp
diff --git a/src/icludes/emu/divideo.h b/src/emu/divideo.h
similarity index 100%
rename from src/icludes/emu/divideo.h
rename to src/emu/divideo.h
diff --git a/src/icludes/emu/divtlb.cpp b/src/emu/divtlb.cpp
similarity index 100%
rename from src/icludes/emu/divtlb.cpp
rename to src/emu/divtlb.cpp
diff --git a/src/icludes/emu/divtlb.h b/src/emu/divtlb.h
similarity index 100%
rename from src/icludes/emu/divtlb.h
rename to src/emu/divtlb.h
diff --git a/src/icludes/emu/drawgfx.cpp b/src/emu/drawgfx.cpp
similarity index 100%
rename from src/icludes/emu/drawgfx.cpp
rename to src/emu/drawgfx.cpp
diff --git a/src/icludes/emu/drawgfx.h b/src/emu/drawgfx.h
similarity index 100%
rename from src/icludes/emu/drawgfx.h
rename to src/emu/drawgfx.h
diff --git a/src/icludes/emu/drawgfxt.ipp b/src/emu/drawgfxt.ipp
similarity index 100%
rename from src/icludes/emu/drawgfxt.ipp
rename to src/emu/drawgfxt.ipp
diff --git a/src/icludes/emu/drivenum.cpp b/src/emu/drivenum.cpp
similarity index 100%
rename from src/icludes/emu/drivenum.cpp
rename to src/emu/drivenum.cpp
diff --git a/src/icludes/emu/drivenum.h b/src/emu/drivenum.h
similarity index 100%
rename from src/icludes/emu/drivenum.h
rename to src/emu/drivenum.h
diff --git a/src/icludes/emu/driver.cpp b/src/emu/driver.cpp
similarity index 100%
rename from src/icludes/emu/driver.cpp
rename to src/emu/driver.cpp
diff --git a/src/icludes/emu/driver.h b/src/emu/driver.h
similarity index 100%
rename from src/icludes/emu/driver.h
rename to src/emu/driver.h
diff --git a/src/icludes/emu/drivers/empty.cpp b/src/emu/drivers/empty.cpp
similarity index 100%
rename from src/icludes/emu/drivers/empty.cpp
rename to src/emu/drivers/empty.cpp
diff --git a/src/icludes/emu/drivers/testcpu.cpp b/src/emu/drivers/testcpu.cpp
similarity index 100%
rename from src/icludes/emu/drivers/testcpu.cpp
rename to src/emu/drivers/testcpu.cpp
diff --git a/src/icludes/emu/emu.h b/src/emu/emu.h
similarity index 100%
rename from src/icludes/emu/emu.h
rename to src/emu/emu.h
diff --git a/src/icludes/emu/emucore.cpp b/src/emu/emucore.cpp
similarity index 100%
rename from src/icludes/emu/emucore.cpp
rename to src/emu/emucore.cpp
diff --git a/src/icludes/emu/emucore.h b/src/emu/emucore.h
similarity index 100%
rename from src/icludes/emu/emucore.h
rename to src/emu/emucore.h
diff --git a/src/icludes/emu/emufwd.h b/src/emu/emufwd.h
similarity index 100%
rename from src/icludes/emu/emufwd.h
rename to src/emu/emufwd.h
diff --git a/src/icludes/emu/emumem.cpp b/src/emu/emumem.cpp
similarity index 100%
rename from src/icludes/emu/emumem.cpp
rename to src/emu/emumem.cpp
diff --git a/src/icludes/emu/emumem.h b/src/emu/emumem.h
similarity index 100%
rename from src/icludes/emu/emumem.h
rename to src/emu/emumem.h
diff --git a/src/icludes/emu/emumem_aspace.cpp b/src/emu/emumem_aspace.cpp
similarity index 100%
rename from src/icludes/emu/emumem_aspace.cpp
rename to src/emu/emumem_aspace.cpp
diff --git a/src/icludes/emu/emumem_hea.h b/src/emu/emumem_hea.h
similarity index 100%
rename from src/icludes/emu/emumem_hea.h
rename to src/emu/emumem_hea.h
diff --git a/src/icludes/emu/emumem_hedp.cpp b/src/emu/emumem_hedp.cpp
similarity index 100%
rename from src/icludes/emu/emumem_hedp.cpp
rename to src/emu/emumem_hedp.cpp
diff --git a/src/icludes/emu/emumem_hedp.h b/src/emu/emumem_hedp.h
similarity index 100%
rename from src/icludes/emu/emumem_hedp.h
rename to src/emu/emumem_hedp.h
diff --git a/src/icludes/emu/emumem_hedr.h b/src/emu/emumem_hedr.h
similarity index 100%
rename from src/icludes/emu/emumem_hedr.h
rename to src/emu/emumem_hedr.h
diff --git a/src/icludes/emu/emumem_hedr.ipp b/src/emu/emumem_hedr.ipp
similarity index 100%
rename from src/icludes/emu/emumem_hedr.ipp
rename to src/emu/emumem_hedr.ipp
diff --git a/src/icludes/emu/emumem_hedr0.cpp b/src/emu/emumem_hedr0.cpp
similarity index 100%
rename from src/icludes/emu/emumem_hedr0.cpp
rename to src/emu/emumem_hedr0.cpp
diff --git a/src/icludes/emu/emumem_hedr1.cpp b/src/emu/emumem_hedr1.cpp
similarity index 100%
rename from src/icludes/emu/emumem_hedr1.cpp
rename to src/emu/emumem_hedr1.cpp
diff --git a/src/icludes/emu/emumem_hedr2.cpp b/src/emu/emumem_hedr2.cpp
similarity index 100%
rename from src/icludes/emu/emumem_hedr2.cpp
rename to src/emu/emumem_hedr2.cpp
diff --git a/src/icludes/emu/emumem_hedr3.cpp b/src/emu/emumem_hedr3.cpp
similarity index 100%
rename from src/icludes/emu/emumem_hedr3.cpp
rename to src/emu/emumem_hedr3.cpp
diff --git a/src/icludes/emu/emumem_hedw.h b/src/emu/emumem_hedw.h
similarity index 100%
rename from src/icludes/emu/emumem_hedw.h
rename to src/emu/emumem_hedw.h
diff --git a/src/icludes/emu/emumem_hedw.ipp b/src/emu/emumem_hedw.ipp
similarity index 100%
rename from src/icludes/emu/emumem_hedw.ipp
rename to src/emu/emumem_hedw.ipp
diff --git a/src/icludes/emu/emumem_hedw0.cpp b/src/emu/emumem_hedw0.cpp
similarity index 100%
rename from src/icludes/emu/emumem_hedw0.cpp
rename to src/emu/emumem_hedw0.cpp
diff --git a/src/icludes/emu/emumem_hedw1.cpp b/src/emu/emumem_hedw1.cpp
similarity index 100%
rename from src/icludes/emu/emumem_hedw1.cpp
rename to src/emu/emumem_hedw1.cpp
diff --git a/src/icludes/emu/emumem_hedw2.cpp b/src/emu/emumem_hedw2.cpp
similarity index 100%
rename from src/icludes/emu/emumem_hedw2.cpp
rename to src/emu/emumem_hedw2.cpp
diff --git a/src/icludes/emu/emumem_hedw3.cpp b/src/emu/emumem_hedw3.cpp
similarity index 100%
rename from src/icludes/emu/emumem_hedw3.cpp
rename to src/emu/emumem_hedw3.cpp
diff --git a/src/icludes/emu/emumem_hem.cpp b/src/emu/emumem_hem.cpp
similarity index 100%
rename from src/icludes/emu/emumem_hem.cpp
rename to src/emu/emumem_hem.cpp
diff --git a/src/icludes/emu/emumem_hem.h b/src/emu/emumem_hem.h
similarity index 100%
rename from src/icludes/emu/emumem_hem.h
rename to src/emu/emumem_hem.h
diff --git a/src/icludes/emu/emumem_hep.cpp b/src/emu/emumem_hep.cpp
similarity index 100%
rename from src/icludes/emu/emumem_hep.cpp
rename to src/emu/emumem_hep.cpp
diff --git a/src/icludes/emu/emumem_hep.h b/src/emu/emumem_hep.h
similarity index 100%
rename from src/icludes/emu/emumem_hep.h
rename to src/emu/emumem_hep.h
diff --git a/src/icludes/emu/emumem_het.cpp b/src/emu/emumem_het.cpp
similarity index 100%
rename from src/icludes/emu/emumem_het.cpp
rename to src/emu/emumem_het.cpp
diff --git a/src/icludes/emu/emumem_het.h b/src/emu/emumem_het.h
similarity index 100%
rename from src/icludes/emu/emumem_het.h
rename to src/emu/emumem_het.h
diff --git a/src/icludes/emu/emumem_heu.cpp b/src/emu/emumem_heu.cpp
similarity index 100%
rename from src/icludes/emu/emumem_heu.cpp
rename to src/emu/emumem_heu.cpp
diff --git a/src/icludes/emu/emumem_heu.h b/src/emu/emumem_heu.h
similarity index 100%
rename from src/icludes/emu/emumem_heu.h
rename to src/emu/emumem_heu.h
diff --git a/src/icludes/emu/emumem_heun.cpp b/src/emu/emumem_heun.cpp
similarity index 100%
rename from src/icludes/emu/emumem_heun.cpp
rename to src/emu/emumem_heun.cpp
diff --git a/src/icludes/emu/emumem_heun.h b/src/emu/emumem_heun.h
similarity index 100%
rename from src/icludes/emu/emumem_heun.h
rename to src/emu/emumem_heun.h
diff --git a/src/icludes/emu/emumem_mud.cpp b/src/emu/emumem_mud.cpp
similarity index 100%
rename from src/icludes/emu/emumem_mud.cpp
rename to src/emu/emumem_mud.cpp
diff --git a/src/icludes/emu/emumem_mud.h b/src/emu/emumem_mud.h
similarity index 100%
rename from src/icludes/emu/emumem_mud.h
rename to src/emu/emumem_mud.h
diff --git a/src/icludes/emu/emumem_mview.cpp b/src/emu/emumem_mview.cpp
similarity index 100%
rename from src/icludes/emu/emumem_mview.cpp
rename to src/emu/emumem_mview.cpp
diff --git a/src/icludes/emu/emuopts.cpp b/src/emu/emuopts.cpp
similarity index 100%
rename from src/icludes/emu/emuopts.cpp
rename to src/emu/emuopts.cpp
diff --git a/src/icludes/emu/emuopts.h b/src/emu/emuopts.h
similarity index 100%
rename from src/icludes/emu/emuopts.h
rename to src/emu/emuopts.h
diff --git a/src/icludes/emu/emupal.cpp b/src/emu/emupal.cpp
similarity index 100%
rename from src/icludes/emu/emupal.cpp
rename to src/emu/emupal.cpp
diff --git a/src/icludes/emu/emupal.h b/src/emu/emupal.h
similarity index 100%
rename from src/icludes/emu/emupal.h
rename to src/emu/emupal.h
diff --git a/src/icludes/emu/fileio.cpp b/src/emu/fileio.cpp
similarity index 100%
rename from src/icludes/emu/fileio.cpp
rename to src/emu/fileio.cpp
diff --git a/src/icludes/emu/fileio.h b/src/emu/fileio.h
similarity index 100%
rename from src/icludes/emu/fileio.h
rename to src/emu/fileio.h
diff --git a/src/icludes/emu/gamedrv.h b/src/emu/gamedrv.h
similarity index 100%
rename from src/icludes/emu/gamedrv.h
rename to src/emu/gamedrv.h
diff --git a/src/icludes/emu/hashfile.cpp b/src/emu/hashfile.cpp
similarity index 100%
rename from src/icludes/emu/hashfile.cpp
rename to src/emu/hashfile.cpp
diff --git a/src/icludes/emu/hashfile.h b/src/emu/hashfile.h
similarity index 100%
rename from src/icludes/emu/hashfile.h
rename to src/emu/hashfile.h
diff --git a/src/icludes/emu/http.cpp b/src/emu/http.cpp
similarity index 100%
rename from src/icludes/emu/http.cpp
rename to src/emu/http.cpp
diff --git a/src/icludes/emu/http.h b/src/emu/http.h
similarity index 100%
rename from src/icludes/emu/http.h
rename to src/emu/http.h
diff --git a/src/icludes/emu/image.cpp b/src/emu/image.cpp
similarity index 100%
rename from src/icludes/emu/image.cpp
rename to src/emu/image.cpp
diff --git a/src/icludes/emu/image.h b/src/emu/image.h
similarity index 100%
rename from src/icludes/emu/image.h
rename to src/emu/image.h
diff --git a/src/icludes/emu/inpttype.ipp b/src/emu/inpttype.ipp
similarity index 100%
rename from src/icludes/emu/inpttype.ipp
rename to src/emu/inpttype.ipp
diff --git a/src/icludes/emu/input.cpp b/src/emu/input.cpp
similarity index 100%
rename from src/icludes/emu/input.cpp
rename to src/emu/input.cpp
diff --git a/src/icludes/emu/input.h b/src/emu/input.h
similarity index 100%
rename from src/icludes/emu/input.h
rename to src/emu/input.h
diff --git a/src/icludes/emu/inputdev.cpp b/src/emu/inputdev.cpp
similarity index 100%
rename from src/icludes/emu/inputdev.cpp
rename to src/emu/inputdev.cpp
diff --git a/src/icludes/emu/inputdev.h b/src/emu/inputdev.h
similarity index 100%
rename from src/icludes/emu/inputdev.h
rename to src/emu/inputdev.h
diff --git a/src/icludes/emu/ioport.cpp b/src/emu/ioport.cpp
similarity index 100%
rename from src/icludes/emu/ioport.cpp
rename to src/emu/ioport.cpp
diff --git a/src/icludes/emu/ioport.h b/src/emu/ioport.h
similarity index 100%
rename from src/icludes/emu/ioport.h
rename to src/emu/ioport.h
diff --git a/src/icludes/emu/layout/README.md b/src/emu/layout/README.md
similarity index 100%
rename from src/icludes/emu/layout/README.md
rename to src/emu/layout/README.md
diff --git a/src/icludes/emu/layout/dualhovu.lay b/src/emu/layout/dualhovu.lay
similarity index 100%
rename from src/icludes/emu/layout/dualhovu.lay
rename to src/emu/layout/dualhovu.lay
diff --git a/src/icludes/emu/layout/dualhsxs.lay b/src/emu/layout/dualhsxs.lay
similarity index 100%
rename from src/icludes/emu/layout/dualhsxs.lay
rename to src/emu/layout/dualhsxs.lay
diff --git a/src/icludes/emu/layout/dualhuov.lay b/src/emu/layout/dualhuov.lay
similarity index 100%
rename from src/icludes/emu/layout/dualhuov.lay
rename to src/emu/layout/dualhuov.lay
diff --git a/src/icludes/emu/layout/ex800.lay b/src/emu/layout/ex800.lay
similarity index 100%
rename from src/icludes/emu/layout/ex800.lay
rename to src/emu/layout/ex800.lay
diff --git a/src/icludes/emu/layout/exorterm155.lay b/src/emu/layout/exorterm155.lay
similarity index 100%
rename from src/icludes/emu/layout/exorterm155.lay
rename to src/emu/layout/exorterm155.lay
diff --git a/src/icludes/emu/layout/generic.h b/src/emu/layout/generic.h
similarity index 100%
rename from src/icludes/emu/layout/generic.h
rename to src/emu/layout/generic.h
diff --git a/src/icludes/emu/layout/hp9122c.lay b/src/emu/layout/hp9122c.lay
similarity index 100%
rename from src/icludes/emu/layout/hp9122c.lay
rename to src/emu/layout/hp9122c.lay
diff --git a/src/icludes/emu/layout/ie15.lay b/src/emu/layout/ie15.lay
similarity index 100%
rename from src/icludes/emu/layout/ie15.lay
rename to src/emu/layout/ie15.lay
diff --git a/src/icludes/emu/layout/lx800.lay b/src/emu/layout/lx800.lay
similarity index 100%
rename from src/icludes/emu/layout/lx800.lay
rename to src/emu/layout/lx800.lay
diff --git a/src/icludes/emu/layout/noscreens.lay b/src/emu/layout/noscreens.lay
similarity index 100%
rename from src/icludes/emu/layout/noscreens.lay
rename to src/emu/layout/noscreens.lay
diff --git a/src/icludes/emu/layout/quadhsxs.lay b/src/emu/layout/quadhsxs.lay
similarity index 100%
rename from src/icludes/emu/layout/quadhsxs.lay
rename to src/emu/layout/quadhsxs.lay
diff --git a/src/icludes/emu/layout/smartboard.lay b/src/emu/layout/smartboard.lay
similarity index 100%
rename from src/icludes/emu/layout/smartboard.lay
rename to src/emu/layout/smartboard.lay
diff --git a/src/icludes/emu/layout/triphsxs.lay b/src/emu/layout/triphsxs.lay
similarity index 100%
rename from src/icludes/emu/layout/triphsxs.lay
rename to src/emu/layout/triphsxs.lay
diff --git a/src/icludes/emu/logmacro.h b/src/emu/logmacro.h
similarity index 100%
rename from src/icludes/emu/logmacro.h
rename to src/emu/logmacro.h
diff --git a/src/icludes/emu/machine.cpp b/src/emu/machine.cpp
similarity index 100%
rename from src/icludes/emu/machine.cpp
rename to src/emu/machine.cpp
diff --git a/src/icludes/emu/machine.h b/src/emu/machine.h
similarity index 100%
rename from src/icludes/emu/machine.h
rename to src/emu/machine.h
diff --git a/src/icludes/emu/main.cpp b/src/emu/main.cpp
similarity index 100%
rename from src/icludes/emu/main.cpp
rename to src/emu/main.cpp
diff --git a/src/icludes/emu/main.h b/src/emu/main.h
similarity index 100%
rename from src/icludes/emu/main.h
rename to src/emu/main.h
diff --git a/src/icludes/emu/mconfig.cpp b/src/emu/mconfig.cpp
similarity index 100%
rename from src/icludes/emu/mconfig.cpp
rename to src/emu/mconfig.cpp
diff --git a/src/icludes/emu/mconfig.h b/src/emu/mconfig.h
similarity index 100%
rename from src/icludes/emu/mconfig.h
rename to src/emu/mconfig.h
diff --git a/src/icludes/emu/memarray.cpp b/src/emu/memarray.cpp
similarity index 100%
rename from src/icludes/emu/memarray.cpp
rename to src/emu/memarray.cpp
diff --git a/src/icludes/emu/memarray.h b/src/emu/memarray.h
similarity index 100%
rename from src/icludes/emu/memarray.h
rename to src/emu/memarray.h
diff --git a/src/icludes/emu/natkeyboard.cpp b/src/emu/natkeyboard.cpp
similarity index 100%
rename from src/icludes/emu/natkeyboard.cpp
rename to src/emu/natkeyboard.cpp
diff --git a/src/icludes/emu/natkeyboard.h b/src/emu/natkeyboard.h
similarity index 100%
rename from src/icludes/emu/natkeyboard.h
rename to src/emu/natkeyboard.h
diff --git a/src/icludes/emu/network.cpp b/src/emu/network.cpp
similarity index 100%
rename from src/icludes/emu/network.cpp
rename to src/emu/network.cpp
diff --git a/src/icludes/emu/network.h b/src/emu/network.h
similarity index 100%
rename from src/icludes/emu/network.h
rename to src/emu/network.h
diff --git a/src/icludes/emu/output.cpp b/src/emu/output.cpp
similarity index 100%
rename from src/icludes/emu/output.cpp
rename to src/emu/output.cpp
diff --git a/src/icludes/emu/output.h b/src/emu/output.h
similarity index 100%
rename from src/icludes/emu/output.h
rename to src/emu/output.h
diff --git a/src/icludes/emu/parameters.cpp b/src/emu/parameters.cpp
similarity index 100%
rename from src/icludes/emu/parameters.cpp
rename to src/emu/parameters.cpp
diff --git a/src/icludes/emu/parameters.h b/src/emu/parameters.h
similarity index 100%
rename from src/icludes/emu/parameters.h
rename to src/emu/parameters.h
diff --git a/src/icludes/emu/profiler.cpp b/src/emu/profiler.cpp
similarity index 100%
rename from src/icludes/emu/profiler.cpp
rename to src/emu/profiler.cpp
diff --git a/src/icludes/emu/profiler.h b/src/emu/profiler.h
similarity index 100%
rename from src/icludes/emu/profiler.h
rename to src/emu/profiler.h
diff --git a/src/icludes/emu/recording.cpp b/src/emu/recording.cpp
similarity index 100%
rename from src/icludes/emu/recording.cpp
rename to src/emu/recording.cpp
diff --git a/src/icludes/emu/recording.h b/src/emu/recording.h
similarity index 100%
rename from src/icludes/emu/recording.h
rename to src/emu/recording.h
diff --git a/src/icludes/emu/render.cpp b/src/emu/render.cpp
similarity index 100%
rename from src/icludes/emu/render.cpp
rename to src/emu/render.cpp
diff --git a/src/icludes/emu/render.h b/src/emu/render.h
similarity index 100%
rename from src/icludes/emu/render.h
rename to src/emu/render.h
diff --git a/src/icludes/emu/rendersw.hxx b/src/emu/rendersw.hxx
similarity index 100%
rename from src/icludes/emu/rendersw.hxx
rename to src/emu/rendersw.hxx
diff --git a/src/icludes/emu/rendertypes.h b/src/emu/rendertypes.h
similarity index 100%
rename from src/icludes/emu/rendertypes.h
rename to src/emu/rendertypes.h
diff --git a/src/icludes/emu/rendfont.cpp b/src/emu/rendfont.cpp
similarity index 100%
rename from src/icludes/emu/rendfont.cpp
rename to src/emu/rendfont.cpp
diff --git a/src/icludes/emu/rendfont.h b/src/emu/rendfont.h
similarity index 100%
rename from src/icludes/emu/rendfont.h
rename to src/emu/rendfont.h
diff --git a/src/icludes/emu/rendlay.cpp b/src/emu/rendlay.cpp
similarity index 100%
rename from src/icludes/emu/rendlay.cpp
rename to src/emu/rendlay.cpp
diff --git a/src/icludes/emu/rendlay.h b/src/emu/rendlay.h
similarity index 100%
rename from src/icludes/emu/rendlay.h
rename to src/emu/rendlay.h
diff --git a/src/icludes/emu/rendutil.cpp b/src/emu/rendutil.cpp
similarity index 100%
rename from src/icludes/emu/rendutil.cpp
rename to src/emu/rendutil.cpp
diff --git a/src/icludes/emu/rendutil.h b/src/emu/rendutil.h
similarity index 100%
rename from src/icludes/emu/rendutil.h
rename to src/emu/rendutil.h
diff --git a/src/icludes/emu/romentry.cpp b/src/emu/romentry.cpp
similarity index 100%
rename from src/icludes/emu/romentry.cpp
rename to src/emu/romentry.cpp
diff --git a/src/icludes/emu/romentry.h b/src/emu/romentry.h
similarity index 100%
rename from src/icludes/emu/romentry.h
rename to src/emu/romentry.h
diff --git a/src/icludes/emu/romload.cpp b/src/emu/romload.cpp
similarity index 100%
rename from src/icludes/emu/romload.cpp
rename to src/emu/romload.cpp
diff --git a/src/icludes/emu/romload.h b/src/emu/romload.h
similarity index 100%
rename from src/icludes/emu/romload.h
rename to src/emu/romload.h
diff --git a/src/icludes/emu/save.cpp b/src/emu/save.cpp
similarity index 100%
rename from src/icludes/emu/save.cpp
rename to src/emu/save.cpp
diff --git a/src/icludes/emu/save.h b/src/emu/save.h
similarity index 100%
rename from src/icludes/emu/save.h
rename to src/emu/save.h
diff --git a/src/icludes/emu/schedule.cpp b/src/emu/schedule.cpp
similarity index 100%
rename from src/icludes/emu/schedule.cpp
rename to src/emu/schedule.cpp
diff --git a/src/icludes/emu/schedule.h b/src/emu/schedule.h
similarity index 100%
rename from src/icludes/emu/schedule.h
rename to src/emu/schedule.h
diff --git a/src/icludes/emu/screen.cpp b/src/emu/screen.cpp
similarity index 100%
rename from src/icludes/emu/screen.cpp
rename to src/emu/screen.cpp
diff --git a/src/icludes/emu/screen.h b/src/emu/screen.h
similarity index 100%
rename from src/icludes/emu/screen.h
rename to src/emu/screen.h
diff --git a/src/icludes/emu/softlist.cpp b/src/emu/softlist.cpp
similarity index 100%
rename from src/icludes/emu/softlist.cpp
rename to src/emu/softlist.cpp
diff --git a/src/icludes/emu/softlist.h b/src/emu/softlist.h
similarity index 100%
rename from src/icludes/emu/softlist.h
rename to src/emu/softlist.h
diff --git a/src/icludes/emu/softlist_dev.cpp b/src/emu/softlist_dev.cpp
similarity index 100%
rename from src/icludes/emu/softlist_dev.cpp
rename to src/emu/softlist_dev.cpp
diff --git a/src/icludes/emu/softlist_dev.h b/src/emu/softlist_dev.h
similarity index 100%
rename from src/icludes/emu/softlist_dev.h
rename to src/emu/softlist_dev.h
diff --git a/src/icludes/emu/sound.cpp b/src/emu/sound.cpp
similarity index 100%
rename from src/icludes/emu/sound.cpp
rename to src/emu/sound.cpp
diff --git a/src/icludes/emu/sound.h b/src/emu/sound.h
similarity index 100%
rename from src/icludes/emu/sound.h
rename to src/emu/sound.h
diff --git a/src/icludes/emu/speaker.cpp b/src/emu/speaker.cpp
similarity index 100%
rename from src/icludes/emu/speaker.cpp
rename to src/emu/speaker.cpp
diff --git a/src/icludes/emu/speaker.h b/src/emu/speaker.h
similarity index 100%
rename from src/icludes/emu/speaker.h
rename to src/emu/speaker.h
diff --git a/src/icludes/emu/tilemap.cpp b/src/emu/tilemap.cpp
similarity index 100%
rename from src/icludes/emu/tilemap.cpp
rename to src/emu/tilemap.cpp
diff --git a/src/icludes/emu/tilemap.h b/src/emu/tilemap.h
similarity index 100%
rename from src/icludes/emu/tilemap.h
rename to src/emu/tilemap.h
diff --git a/src/icludes/emu/ui/cmddata.h b/src/emu/ui/cmddata.h
similarity index 100%
rename from src/icludes/emu/ui/cmddata.h
rename to src/emu/ui/cmddata.h
diff --git a/src/icludes/emu/ui/uimain.h b/src/emu/ui/uimain.h
similarity index 100%
rename from src/icludes/emu/ui/uimain.h
rename to src/emu/ui/uimain.h
diff --git a/src/icludes/emu/uiinput.cpp b/src/emu/uiinput.cpp
similarity index 100%
rename from src/icludes/emu/uiinput.cpp
rename to src/emu/uiinput.cpp
diff --git a/src/icludes/emu/uiinput.h b/src/emu/uiinput.h
similarity index 100%
rename from src/icludes/emu/uiinput.h
rename to src/emu/uiinput.h
diff --git a/src/icludes/emu/validity.cpp b/src/emu/validity.cpp
similarity index 100%
rename from src/icludes/emu/validity.cpp
rename to src/emu/validity.cpp
diff --git a/src/icludes/emu/validity.h b/src/emu/validity.h
similarity index 100%
rename from src/icludes/emu/validity.h
rename to src/emu/validity.h
diff --git a/src/icludes/emu/video.cpp b/src/emu/video.cpp
similarity index 100%
rename from src/icludes/emu/video.cpp
rename to src/emu/video.cpp
diff --git a/src/icludes/emu/video.h b/src/emu/video.h
similarity index 100%
rename from src/icludes/emu/video.h
rename to src/emu/video.h
diff --git a/src/icludes/emu/video/generic.cpp b/src/emu/video/generic.cpp
similarity index 100%
rename from src/icludes/emu/video/generic.cpp
rename to src/emu/video/generic.cpp
diff --git a/src/icludes/emu/video/generic.h b/src/emu/video/generic.h
similarity index 100%
rename from src/icludes/emu/video/generic.h
rename to src/emu/video/generic.h
diff --git a/src/icludes/emu/video/resnet.cpp b/src/emu/video/resnet.cpp
similarity index 100%
rename from src/icludes/emu/video/resnet.cpp
rename to src/emu/video/resnet.cpp
diff --git a/src/icludes/emu/video/resnet.h b/src/emu/video/resnet.h
similarity index 100%
rename from src/icludes/emu/video/resnet.h
rename to src/emu/video/resnet.h
diff --git a/src/icludes/emu/video/rgbgen.cpp b/src/emu/video/rgbgen.cpp
similarity index 100%
rename from src/icludes/emu/video/rgbgen.cpp
rename to src/emu/video/rgbgen.cpp
diff --git a/src/icludes/emu/video/rgbgen.h b/src/emu/video/rgbgen.h
similarity index 100%
rename from src/icludes/emu/video/rgbgen.h
rename to src/emu/video/rgbgen.h
diff --git a/src/icludes/emu/video/rgbsse.cpp b/src/emu/video/rgbsse.cpp
similarity index 100%
rename from src/icludes/emu/video/rgbsse.cpp
rename to src/emu/video/rgbsse.cpp
diff --git a/src/icludes/emu/video/rgbsse.h b/src/emu/video/rgbsse.h
similarity index 100%
rename from src/icludes/emu/video/rgbsse.h
rename to src/emu/video/rgbsse.h
diff --git a/src/icludes/emu/video/rgbutil.h b/src/emu/video/rgbutil.h
similarity index 100%
rename from src/icludes/emu/video/rgbutil.h
rename to src/emu/video/rgbutil.h
diff --git a/src/icludes/emu/video/rgbvmx.cpp b/src/emu/video/rgbvmx.cpp
similarity index 100%
rename from src/icludes/emu/video/rgbvmx.cpp
rename to src/emu/video/rgbvmx.cpp
diff --git a/src/icludes/emu/video/rgbvmx.h b/src/emu/video/rgbvmx.h
similarity index 100%
rename from src/icludes/emu/video/rgbvmx.h
rename to src/emu/video/rgbvmx.h
diff --git a/src/icludes/emu/xtal.cpp b/src/emu/xtal.cpp
similarity index 100%
rename from src/icludes/emu/xtal.cpp
rename to src/emu/xtal.cpp
diff --git a/src/icludes/emu/xtal.h b/src/emu/xtal.h
similarity index 100%
rename from src/icludes/emu/xtal.h
rename to src/emu/xtal.h
diff --git a/src/icludes/frontend/mame/audit.cpp b/src/frontend/mame/audit.cpp
similarity index 100%
rename from src/icludes/frontend/mame/audit.cpp
rename to src/frontend/mame/audit.cpp
diff --git a/src/icludes/frontend/mame/audit.h b/src/frontend/mame/audit.h
similarity index 100%
rename from src/icludes/frontend/mame/audit.h
rename to src/frontend/mame/audit.h
diff --git a/src/icludes/frontend/mame/cheat.cpp b/src/frontend/mame/cheat.cpp
similarity index 100%
rename from src/icludes/frontend/mame/cheat.cpp
rename to src/frontend/mame/cheat.cpp
diff --git a/src/icludes/frontend/mame/cheat.h b/src/frontend/mame/cheat.h
similarity index 100%
rename from src/icludes/frontend/mame/cheat.h
rename to src/frontend/mame/cheat.h
diff --git a/src/icludes/frontend/mame/clifront.cpp b/src/frontend/mame/clifront.cpp
similarity index 100%
rename from src/icludes/frontend/mame/clifront.cpp
rename to src/frontend/mame/clifront.cpp
diff --git a/src/icludes/frontend/mame/clifront.h b/src/frontend/mame/clifront.h
similarity index 100%
rename from src/icludes/frontend/mame/clifront.h
rename to src/frontend/mame/clifront.h
diff --git a/src/icludes/frontend/mame/infoxml.cpp b/src/frontend/mame/infoxml.cpp
similarity index 100%
rename from src/icludes/frontend/mame/infoxml.cpp
rename to src/frontend/mame/infoxml.cpp
diff --git a/src/icludes/frontend/mame/infoxml.h b/src/frontend/mame/infoxml.h
similarity index 100%
rename from src/icludes/frontend/mame/infoxml.h
rename to src/frontend/mame/infoxml.h
diff --git a/src/icludes/frontend/mame/iptseqpoll.cpp b/src/frontend/mame/iptseqpoll.cpp
similarity index 100%
rename from src/icludes/frontend/mame/iptseqpoll.cpp
rename to src/frontend/mame/iptseqpoll.cpp
diff --git a/src/icludes/frontend/mame/iptseqpoll.h b/src/frontend/mame/iptseqpoll.h
similarity index 100%
rename from src/icludes/frontend/mame/iptseqpoll.h
rename to src/frontend/mame/iptseqpoll.h
diff --git a/src/icludes/frontend/mame/language.cpp b/src/frontend/mame/language.cpp
similarity index 100%
rename from src/icludes/frontend/mame/language.cpp
rename to src/frontend/mame/language.cpp
diff --git a/src/icludes/frontend/mame/language.h b/src/frontend/mame/language.h
similarity index 100%
rename from src/icludes/frontend/mame/language.h
rename to src/frontend/mame/language.h
diff --git a/src/icludes/frontend/mame/luaengine.cpp b/src/frontend/mame/luaengine.cpp
similarity index 100%
rename from src/icludes/frontend/mame/luaengine.cpp
rename to src/frontend/mame/luaengine.cpp
diff --git a/src/icludes/frontend/mame/luaengine.h b/src/frontend/mame/luaengine.h
similarity index 100%
rename from src/icludes/frontend/mame/luaengine.h
rename to src/frontend/mame/luaengine.h
diff --git a/src/icludes/frontend/mame/luaengine.ipp b/src/frontend/mame/luaengine.ipp
similarity index 100%
rename from src/icludes/frontend/mame/luaengine.ipp
rename to src/frontend/mame/luaengine.ipp
diff --git a/src/icludes/frontend/mame/luaengine_debug.cpp b/src/frontend/mame/luaengine_debug.cpp
similarity index 100%
rename from src/icludes/frontend/mame/luaengine_debug.cpp
rename to src/frontend/mame/luaengine_debug.cpp
diff --git a/src/icludes/frontend/mame/luaengine_input.cpp b/src/frontend/mame/luaengine_input.cpp
similarity index 100%
rename from src/icludes/frontend/mame/luaengine_input.cpp
rename to src/frontend/mame/luaengine_input.cpp
diff --git a/src/icludes/frontend/mame/luaengine_mem.cpp b/src/frontend/mame/luaengine_mem.cpp
similarity index 100%
rename from src/icludes/frontend/mame/luaengine_mem.cpp
rename to src/frontend/mame/luaengine_mem.cpp
diff --git a/src/icludes/frontend/mame/luaengine_render.cpp b/src/frontend/mame/luaengine_render.cpp
similarity index 100%
rename from src/icludes/frontend/mame/luaengine_render.cpp
rename to src/frontend/mame/luaengine_render.cpp
diff --git a/src/icludes/frontend/mame/mame.cpp b/src/frontend/mame/mame.cpp
similarity index 100%
rename from src/icludes/frontend/mame/mame.cpp
rename to src/frontend/mame/mame.cpp
diff --git a/src/icludes/frontend/mame/mame.h b/src/frontend/mame/mame.h
similarity index 100%
rename from src/icludes/frontend/mame/mame.h
rename to src/frontend/mame/mame.h
diff --git a/src/icludes/frontend/mame/mameopts.cpp b/src/frontend/mame/mameopts.cpp
similarity index 100%
rename from src/icludes/frontend/mame/mameopts.cpp
rename to src/frontend/mame/mameopts.cpp
diff --git a/src/icludes/frontend/mame/mameopts.h b/src/frontend/mame/mameopts.h
similarity index 100%
rename from src/icludes/frontend/mame/mameopts.h
rename to src/frontend/mame/mameopts.h
diff --git a/src/icludes/frontend/mame/media_ident.cpp b/src/frontend/mame/media_ident.cpp
similarity index 100%
rename from src/icludes/frontend/mame/media_ident.cpp
rename to src/frontend/mame/media_ident.cpp
diff --git a/src/icludes/frontend/mame/media_ident.h b/src/frontend/mame/media_ident.h
similarity index 100%
rename from src/icludes/frontend/mame/media_ident.h
rename to src/frontend/mame/media_ident.h
diff --git a/src/icludes/frontend/mame/pluginopts.cpp b/src/frontend/mame/pluginopts.cpp
similarity index 100%
rename from src/icludes/frontend/mame/pluginopts.cpp
rename to src/frontend/mame/pluginopts.cpp
diff --git a/src/icludes/frontend/mame/pluginopts.h b/src/frontend/mame/pluginopts.h
similarity index 100%
rename from src/icludes/frontend/mame/pluginopts.h
rename to src/frontend/mame/pluginopts.h
diff --git a/src/icludes/frontend/mame/ui/about.cpp b/src/frontend/mame/ui/about.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/about.cpp
rename to src/frontend/mame/ui/about.cpp
diff --git a/src/icludes/frontend/mame/ui/about.h b/src/frontend/mame/ui/about.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/about.h
rename to src/frontend/mame/ui/about.h
diff --git a/src/icludes/frontend/mame/ui/analogipt.cpp b/src/frontend/mame/ui/analogipt.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/analogipt.cpp
rename to src/frontend/mame/ui/analogipt.cpp
diff --git a/src/icludes/frontend/mame/ui/analogipt.h b/src/frontend/mame/ui/analogipt.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/analogipt.h
rename to src/frontend/mame/ui/analogipt.h
diff --git a/src/icludes/frontend/mame/ui/auditmenu.cpp b/src/frontend/mame/ui/auditmenu.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/auditmenu.cpp
rename to src/frontend/mame/ui/auditmenu.cpp
diff --git a/src/icludes/frontend/mame/ui/auditmenu.h b/src/frontend/mame/ui/auditmenu.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/auditmenu.h
rename to src/frontend/mame/ui/auditmenu.h
diff --git a/src/icludes/frontend/mame/ui/barcode.cpp b/src/frontend/mame/ui/barcode.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/barcode.cpp
rename to src/frontend/mame/ui/barcode.cpp
diff --git a/src/icludes/frontend/mame/ui/barcode.h b/src/frontend/mame/ui/barcode.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/barcode.h
rename to src/frontend/mame/ui/barcode.h
diff --git a/src/icludes/frontend/mame/ui/cheatopt.cpp b/src/frontend/mame/ui/cheatopt.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/cheatopt.cpp
rename to src/frontend/mame/ui/cheatopt.cpp
diff --git a/src/icludes/frontend/mame/ui/cheatopt.h b/src/frontend/mame/ui/cheatopt.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/cheatopt.h
rename to src/frontend/mame/ui/cheatopt.h
diff --git a/src/icludes/frontend/mame/ui/confswitch.cpp b/src/frontend/mame/ui/confswitch.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/confswitch.cpp
rename to src/frontend/mame/ui/confswitch.cpp
diff --git a/src/icludes/frontend/mame/ui/confswitch.h b/src/frontend/mame/ui/confswitch.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/confswitch.h
rename to src/frontend/mame/ui/confswitch.h
diff --git a/src/icludes/frontend/mame/ui/custui.cpp b/src/frontend/mame/ui/custui.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/custui.cpp
rename to src/frontend/mame/ui/custui.cpp
diff --git a/src/icludes/frontend/mame/ui/custui.h b/src/frontend/mame/ui/custui.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/custui.h
rename to src/frontend/mame/ui/custui.h
diff --git a/src/icludes/frontend/mame/ui/datmenu.cpp b/src/frontend/mame/ui/datmenu.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/datmenu.cpp
rename to src/frontend/mame/ui/datmenu.cpp
diff --git a/src/icludes/frontend/mame/ui/datmenu.h b/src/frontend/mame/ui/datmenu.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/datmenu.h
rename to src/frontend/mame/ui/datmenu.h
diff --git a/src/icludes/frontend/mame/ui/defimg.ipp b/src/frontend/mame/ui/defimg.ipp
similarity index 100%
rename from src/icludes/frontend/mame/ui/defimg.ipp
rename to src/frontend/mame/ui/defimg.ipp
diff --git a/src/icludes/frontend/mame/ui/devctrl.h b/src/frontend/mame/ui/devctrl.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/devctrl.h
rename to src/frontend/mame/ui/devctrl.h
diff --git a/src/icludes/frontend/mame/ui/devopt.cpp b/src/frontend/mame/ui/devopt.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/devopt.cpp
rename to src/frontend/mame/ui/devopt.cpp
diff --git a/src/icludes/frontend/mame/ui/devopt.h b/src/frontend/mame/ui/devopt.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/devopt.h
rename to src/frontend/mame/ui/devopt.h
diff --git a/src/icludes/frontend/mame/ui/dirmenu.cpp b/src/frontend/mame/ui/dirmenu.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/dirmenu.cpp
rename to src/frontend/mame/ui/dirmenu.cpp
diff --git a/src/icludes/frontend/mame/ui/dirmenu.h b/src/frontend/mame/ui/dirmenu.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/dirmenu.h
rename to src/frontend/mame/ui/dirmenu.h
diff --git a/src/icludes/frontend/mame/ui/filecreate.cpp b/src/frontend/mame/ui/filecreate.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/filecreate.cpp
rename to src/frontend/mame/ui/filecreate.cpp
diff --git a/src/icludes/frontend/mame/ui/filecreate.h b/src/frontend/mame/ui/filecreate.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/filecreate.h
rename to src/frontend/mame/ui/filecreate.h
diff --git a/src/icludes/frontend/mame/ui/filemngr.cpp b/src/frontend/mame/ui/filemngr.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/filemngr.cpp
rename to src/frontend/mame/ui/filemngr.cpp
diff --git a/src/icludes/frontend/mame/ui/filemngr.h b/src/frontend/mame/ui/filemngr.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/filemngr.h
rename to src/frontend/mame/ui/filemngr.h
diff --git a/src/icludes/frontend/mame/ui/filesel.cpp b/src/frontend/mame/ui/filesel.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/filesel.cpp
rename to src/frontend/mame/ui/filesel.cpp
diff --git a/src/icludes/frontend/mame/ui/filesel.h b/src/frontend/mame/ui/filesel.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/filesel.h
rename to src/frontend/mame/ui/filesel.h
diff --git a/src/icludes/frontend/mame/ui/floppycntrl.cpp b/src/frontend/mame/ui/floppycntrl.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/floppycntrl.cpp
rename to src/frontend/mame/ui/floppycntrl.cpp
diff --git a/src/icludes/frontend/mame/ui/floppycntrl.h b/src/frontend/mame/ui/floppycntrl.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/floppycntrl.h
rename to src/frontend/mame/ui/floppycntrl.h
diff --git a/src/icludes/frontend/mame/ui/icorender.cpp b/src/frontend/mame/ui/icorender.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/icorender.cpp
rename to src/frontend/mame/ui/icorender.cpp
diff --git a/src/icludes/frontend/mame/ui/icorender.h b/src/frontend/mame/ui/icorender.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/icorender.h
rename to src/frontend/mame/ui/icorender.h
diff --git a/src/icludes/frontend/mame/ui/imgcntrl.cpp b/src/frontend/mame/ui/imgcntrl.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/imgcntrl.cpp
rename to src/frontend/mame/ui/imgcntrl.cpp
diff --git a/src/icludes/frontend/mame/ui/imgcntrl.h b/src/frontend/mame/ui/imgcntrl.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/imgcntrl.h
rename to src/frontend/mame/ui/imgcntrl.h
diff --git a/src/icludes/frontend/mame/ui/info.cpp b/src/frontend/mame/ui/info.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/info.cpp
rename to src/frontend/mame/ui/info.cpp
diff --git a/src/icludes/frontend/mame/ui/info.h b/src/frontend/mame/ui/info.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/info.h
rename to src/frontend/mame/ui/info.h
diff --git a/src/icludes/frontend/mame/ui/info_pty.cpp b/src/frontend/mame/ui/info_pty.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/info_pty.cpp
rename to src/frontend/mame/ui/info_pty.cpp
diff --git a/src/icludes/frontend/mame/ui/info_pty.h b/src/frontend/mame/ui/info_pty.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/info_pty.h
rename to src/frontend/mame/ui/info_pty.h
diff --git a/src/icludes/frontend/mame/ui/inifile.cpp b/src/frontend/mame/ui/inifile.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/inifile.cpp
rename to src/frontend/mame/ui/inifile.cpp
diff --git a/src/icludes/frontend/mame/ui/inifile.h b/src/frontend/mame/ui/inifile.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/inifile.h
rename to src/frontend/mame/ui/inifile.h
diff --git a/src/icludes/frontend/mame/ui/inputmap.cpp b/src/frontend/mame/ui/inputmap.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/inputmap.cpp
rename to src/frontend/mame/ui/inputmap.cpp
diff --git a/src/icludes/frontend/mame/ui/inputmap.h b/src/frontend/mame/ui/inputmap.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/inputmap.h
rename to src/frontend/mame/ui/inputmap.h
diff --git a/src/icludes/frontend/mame/ui/keyboard.cpp b/src/frontend/mame/ui/keyboard.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/keyboard.cpp
rename to src/frontend/mame/ui/keyboard.cpp
diff --git a/src/icludes/frontend/mame/ui/keyboard.h b/src/frontend/mame/ui/keyboard.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/keyboard.h
rename to src/frontend/mame/ui/keyboard.h
diff --git a/src/icludes/frontend/mame/ui/mainmenu.cpp b/src/frontend/mame/ui/mainmenu.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/mainmenu.cpp
rename to src/frontend/mame/ui/mainmenu.cpp
diff --git a/src/icludes/frontend/mame/ui/mainmenu.h b/src/frontend/mame/ui/mainmenu.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/mainmenu.h
rename to src/frontend/mame/ui/mainmenu.h
diff --git a/src/icludes/frontend/mame/ui/menu.cpp b/src/frontend/mame/ui/menu.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/menu.cpp
rename to src/frontend/mame/ui/menu.cpp
diff --git a/src/icludes/frontend/mame/ui/menu.h b/src/frontend/mame/ui/menu.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/menu.h
rename to src/frontend/mame/ui/menu.h
diff --git a/src/icludes/frontend/mame/ui/menuitem.h b/src/frontend/mame/ui/menuitem.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/menuitem.h
rename to src/frontend/mame/ui/menuitem.h
diff --git a/src/icludes/frontend/mame/ui/miscmenu.cpp b/src/frontend/mame/ui/miscmenu.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/miscmenu.cpp
rename to src/frontend/mame/ui/miscmenu.cpp
diff --git a/src/icludes/frontend/mame/ui/miscmenu.h b/src/frontend/mame/ui/miscmenu.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/miscmenu.h
rename to src/frontend/mame/ui/miscmenu.h
diff --git a/src/icludes/frontend/mame/ui/moptions.cpp b/src/frontend/mame/ui/moptions.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/moptions.cpp
rename to src/frontend/mame/ui/moptions.cpp
diff --git a/src/icludes/frontend/mame/ui/moptions.h b/src/frontend/mame/ui/moptions.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/moptions.h
rename to src/frontend/mame/ui/moptions.h
diff --git a/src/icludes/frontend/mame/ui/optsmenu.cpp b/src/frontend/mame/ui/optsmenu.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/optsmenu.cpp
rename to src/frontend/mame/ui/optsmenu.cpp
diff --git a/src/icludes/frontend/mame/ui/optsmenu.h b/src/frontend/mame/ui/optsmenu.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/optsmenu.h
rename to src/frontend/mame/ui/optsmenu.h
diff --git a/src/icludes/frontend/mame/ui/pluginopt.cpp b/src/frontend/mame/ui/pluginopt.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/pluginopt.cpp
rename to src/frontend/mame/ui/pluginopt.cpp
diff --git a/src/icludes/frontend/mame/ui/pluginopt.h b/src/frontend/mame/ui/pluginopt.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/pluginopt.h
rename to src/frontend/mame/ui/pluginopt.h
diff --git a/src/icludes/frontend/mame/ui/quitmenu.cpp b/src/frontend/mame/ui/quitmenu.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/quitmenu.cpp
rename to src/frontend/mame/ui/quitmenu.cpp
diff --git a/src/icludes/frontend/mame/ui/quitmenu.h b/src/frontend/mame/ui/quitmenu.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/quitmenu.h
rename to src/frontend/mame/ui/quitmenu.h
diff --git a/src/icludes/frontend/mame/ui/selector.cpp b/src/frontend/mame/ui/selector.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/selector.cpp
rename to src/frontend/mame/ui/selector.cpp
diff --git a/src/icludes/frontend/mame/ui/selector.h b/src/frontend/mame/ui/selector.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/selector.h
rename to src/frontend/mame/ui/selector.h
diff --git a/src/icludes/frontend/mame/ui/selgame.cpp b/src/frontend/mame/ui/selgame.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/selgame.cpp
rename to src/frontend/mame/ui/selgame.cpp
diff --git a/src/icludes/frontend/mame/ui/selgame.h b/src/frontend/mame/ui/selgame.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/selgame.h
rename to src/frontend/mame/ui/selgame.h
diff --git a/src/icludes/frontend/mame/ui/selmenu.cpp b/src/frontend/mame/ui/selmenu.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/selmenu.cpp
rename to src/frontend/mame/ui/selmenu.cpp
diff --git a/src/icludes/frontend/mame/ui/selmenu.h b/src/frontend/mame/ui/selmenu.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/selmenu.h
rename to src/frontend/mame/ui/selmenu.h
diff --git a/src/icludes/frontend/mame/ui/selsoft.cpp b/src/frontend/mame/ui/selsoft.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/selsoft.cpp
rename to src/frontend/mame/ui/selsoft.cpp
diff --git a/src/icludes/frontend/mame/ui/selsoft.h b/src/frontend/mame/ui/selsoft.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/selsoft.h
rename to src/frontend/mame/ui/selsoft.h
diff --git a/src/icludes/frontend/mame/ui/simpleselgame.cpp b/src/frontend/mame/ui/simpleselgame.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/simpleselgame.cpp
rename to src/frontend/mame/ui/simpleselgame.cpp
diff --git a/src/icludes/frontend/mame/ui/simpleselgame.h b/src/frontend/mame/ui/simpleselgame.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/simpleselgame.h
rename to src/frontend/mame/ui/simpleselgame.h
diff --git a/src/icludes/frontend/mame/ui/slider.cpp b/src/frontend/mame/ui/slider.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/slider.cpp
rename to src/frontend/mame/ui/slider.cpp
diff --git a/src/icludes/frontend/mame/ui/slider.h b/src/frontend/mame/ui/slider.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/slider.h
rename to src/frontend/mame/ui/slider.h
diff --git a/src/icludes/frontend/mame/ui/sliders.cpp b/src/frontend/mame/ui/sliders.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/sliders.cpp
rename to src/frontend/mame/ui/sliders.cpp
diff --git a/src/icludes/frontend/mame/ui/sliders.h b/src/frontend/mame/ui/sliders.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/sliders.h
rename to src/frontend/mame/ui/sliders.h
diff --git a/src/icludes/frontend/mame/ui/slotopt.cpp b/src/frontend/mame/ui/slotopt.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/slotopt.cpp
rename to src/frontend/mame/ui/slotopt.cpp
diff --git a/src/icludes/frontend/mame/ui/slotopt.h b/src/frontend/mame/ui/slotopt.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/slotopt.h
rename to src/frontend/mame/ui/slotopt.h
diff --git a/src/icludes/frontend/mame/ui/sndmenu.cpp b/src/frontend/mame/ui/sndmenu.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/sndmenu.cpp
rename to src/frontend/mame/ui/sndmenu.cpp
diff --git a/src/icludes/frontend/mame/ui/sndmenu.h b/src/frontend/mame/ui/sndmenu.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/sndmenu.h
rename to src/frontend/mame/ui/sndmenu.h
diff --git a/src/icludes/frontend/mame/ui/state.cpp b/src/frontend/mame/ui/state.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/state.cpp
rename to src/frontend/mame/ui/state.cpp
diff --git a/src/icludes/frontend/mame/ui/state.h b/src/frontend/mame/ui/state.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/state.h
rename to src/frontend/mame/ui/state.h
diff --git a/src/icludes/frontend/mame/ui/submenu.cpp b/src/frontend/mame/ui/submenu.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/submenu.cpp
rename to src/frontend/mame/ui/submenu.cpp
diff --git a/src/icludes/frontend/mame/ui/submenu.h b/src/frontend/mame/ui/submenu.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/submenu.h
rename to src/frontend/mame/ui/submenu.h
diff --git a/src/icludes/frontend/mame/ui/swlist.cpp b/src/frontend/mame/ui/swlist.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/swlist.cpp
rename to src/frontend/mame/ui/swlist.cpp
diff --git a/src/icludes/frontend/mame/ui/swlist.h b/src/frontend/mame/ui/swlist.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/swlist.h
rename to src/frontend/mame/ui/swlist.h
diff --git a/src/icludes/frontend/mame/ui/systemlist.cpp b/src/frontend/mame/ui/systemlist.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/systemlist.cpp
rename to src/frontend/mame/ui/systemlist.cpp
diff --git a/src/icludes/frontend/mame/ui/systemlist.h b/src/frontend/mame/ui/systemlist.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/systemlist.h
rename to src/frontend/mame/ui/systemlist.h
diff --git a/src/icludes/frontend/mame/ui/tapectrl.cpp b/src/frontend/mame/ui/tapectrl.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/tapectrl.cpp
rename to src/frontend/mame/ui/tapectrl.cpp
diff --git a/src/icludes/frontend/mame/ui/tapectrl.h b/src/frontend/mame/ui/tapectrl.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/tapectrl.h
rename to src/frontend/mame/ui/tapectrl.h
diff --git a/src/icludes/frontend/mame/ui/text.cpp b/src/frontend/mame/ui/text.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/text.cpp
rename to src/frontend/mame/ui/text.cpp
diff --git a/src/icludes/frontend/mame/ui/text.h b/src/frontend/mame/ui/text.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/text.h
rename to src/frontend/mame/ui/text.h
diff --git a/src/icludes/frontend/mame/ui/textbox.cpp b/src/frontend/mame/ui/textbox.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/textbox.cpp
rename to src/frontend/mame/ui/textbox.cpp
diff --git a/src/icludes/frontend/mame/ui/textbox.h b/src/frontend/mame/ui/textbox.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/textbox.h
rename to src/frontend/mame/ui/textbox.h
diff --git a/src/icludes/frontend/mame/ui/toolbar.ipp b/src/frontend/mame/ui/toolbar.ipp
similarity index 100%
rename from src/icludes/frontend/mame/ui/toolbar.ipp
rename to src/frontend/mame/ui/toolbar.ipp
diff --git a/src/icludes/frontend/mame/ui/ui.cpp b/src/frontend/mame/ui/ui.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/ui.cpp
rename to src/frontend/mame/ui/ui.cpp
diff --git a/src/icludes/frontend/mame/ui/ui.h b/src/frontend/mame/ui/ui.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/ui.h
rename to src/frontend/mame/ui/ui.h
diff --git a/src/icludes/frontend/mame/ui/uicmd14.png b/src/frontend/mame/ui/uicmd14.png
similarity index 100%
rename from src/icludes/frontend/mame/ui/uicmd14.png
rename to src/frontend/mame/ui/uicmd14.png
diff --git a/src/icludes/frontend/mame/ui/utils.cpp b/src/frontend/mame/ui/utils.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/utils.cpp
rename to src/frontend/mame/ui/utils.cpp
diff --git a/src/icludes/frontend/mame/ui/utils.h b/src/frontend/mame/ui/utils.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/utils.h
rename to src/frontend/mame/ui/utils.h
diff --git a/src/icludes/frontend/mame/ui/videoopt.cpp b/src/frontend/mame/ui/videoopt.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/videoopt.cpp
rename to src/frontend/mame/ui/videoopt.cpp
diff --git a/src/icludes/frontend/mame/ui/videoopt.h b/src/frontend/mame/ui/videoopt.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/videoopt.h
rename to src/frontend/mame/ui/videoopt.h
diff --git a/src/icludes/frontend/mame/ui/viewgfx.cpp b/src/frontend/mame/ui/viewgfx.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/viewgfx.cpp
rename to src/frontend/mame/ui/viewgfx.cpp
diff --git a/src/icludes/frontend/mame/ui/viewgfx.h b/src/frontend/mame/ui/viewgfx.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/viewgfx.h
rename to src/frontend/mame/ui/viewgfx.h
diff --git a/src/icludes/frontend/mame/ui/widgets.cpp b/src/frontend/mame/ui/widgets.cpp
similarity index 100%
rename from src/icludes/frontend/mame/ui/widgets.cpp
rename to src/frontend/mame/ui/widgets.cpp
diff --git a/src/icludes/frontend/mame/ui/widgets.h b/src/frontend/mame/ui/widgets.h
similarity index 100%
rename from src/icludes/frontend/mame/ui/widgets.h
rename to src/frontend/mame/ui/widgets.h
diff --git a/src/icludes/emu/config.h b/src/icludes/emu/config.h
deleted file mode 100644
index 2a273ba..0000000
--- a/src/icludes/emu/config.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Nicola Salmoria, Aaron Giles
-/***************************************************************************
-
-    config.h
-
-    Wrappers for handling MAME configuration files
-
-***************************************************************************/
-
-#ifndef MAME_EMU_CONFIG_H
-#define MAME_EMU_CONFIG_H
-
-#pragma once
-
-#include "xmlfile.h"
-
-
-enum class config_type : int
-{
-	INIT,           // opportunity to initialize things first
-	CONTROLLER,     // loading from controller file
-	DEFAULT,        // loading from default.cfg
-	SYSTEM,         // loading from system.cfg
-	FINAL           // opportunity to finish initialization
-};
-
-enum class config_level : int
-{
-	DEFAULT,
-	SOURCE,
-	BIOS,
-	PARENT,
-	SYSTEM
-};
-
-
-class configuration_manager
-{
-public:
-	typedef delegate<void (config_type, config_level, util::xml::data_node const *)> load_delegate;
-	typedef delegate<void (config_type, util::xml::data_node *)> save_delegate;
-
-	static inline constexpr int CONFIG_VERSION = 10;
-
-	// construction/destruction
-	configuration_manager(running_machine &machine);
-
-	void config_register(const char *nodename, load_delegate load, save_delegate save);
-	bool load_settings();
-	void save_settings();
-
-	// getters
-	running_machine &machine() const { return m_machine; }
-
-private:
-	struct config_element
-	{
-		std::string     name;              // node name
-		load_delegate   load;              // load callback
-		save_delegate   save;              // save callback
-	};
-
-	bool load_xml(emu_file &file, config_type which_type);
-	bool save_xml(emu_file &file, config_type which_type);
-
-	// internal state
-	running_machine &   m_machine;                  // reference to our machine
-	std::vector<config_element> m_typelist;
-};
-
-#endif // MAME_EMU_CONFIG_H
diff --git a/src/icludes/lib/formats/2d_dsk.cpp b/src/lib/formats/2d_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/2d_dsk.cpp
rename to src/lib/formats/2d_dsk.cpp
diff --git a/src/icludes/lib/formats/2d_dsk.h b/src/lib/formats/2d_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/2d_dsk.h
rename to src/lib/formats/2d_dsk.h
diff --git a/src/icludes/lib/formats/a26_cas.cpp b/src/lib/formats/a26_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/a26_cas.cpp
rename to src/lib/formats/a26_cas.cpp
diff --git a/src/icludes/lib/formats/a26_cas.h b/src/lib/formats/a26_cas.h
similarity index 100%
rename from src/icludes/lib/formats/a26_cas.h
rename to src/lib/formats/a26_cas.h
diff --git a/src/icludes/lib/formats/a5105_dsk.cpp b/src/lib/formats/a5105_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/a5105_dsk.cpp
rename to src/lib/formats/a5105_dsk.cpp
diff --git a/src/icludes/lib/formats/a5105_dsk.h b/src/lib/formats/a5105_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/a5105_dsk.h
rename to src/lib/formats/a5105_dsk.h
diff --git a/src/icludes/lib/formats/abc800_dsk.cpp b/src/lib/formats/abc800_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/abc800_dsk.cpp
rename to src/lib/formats/abc800_dsk.cpp
diff --git a/src/icludes/lib/formats/abc800_dsk.h b/src/lib/formats/abc800_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/abc800_dsk.h
rename to src/lib/formats/abc800_dsk.h
diff --git a/src/icludes/lib/formats/abcfd2_dsk.cpp b/src/lib/formats/abcfd2_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/abcfd2_dsk.cpp
rename to src/lib/formats/abcfd2_dsk.cpp
diff --git a/src/icludes/lib/formats/abcfd2_dsk.h b/src/lib/formats/abcfd2_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/abcfd2_dsk.h
rename to src/lib/formats/abcfd2_dsk.h
diff --git a/src/icludes/lib/formats/ace_tap.cpp b/src/lib/formats/ace_tap.cpp
similarity index 100%
rename from src/icludes/lib/formats/ace_tap.cpp
rename to src/lib/formats/ace_tap.cpp
diff --git a/src/icludes/lib/formats/ace_tap.h b/src/lib/formats/ace_tap.h
similarity index 100%
rename from src/icludes/lib/formats/ace_tap.h
rename to src/lib/formats/ace_tap.h
diff --git a/src/icludes/lib/formats/acorn_dsk.cpp b/src/lib/formats/acorn_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/acorn_dsk.cpp
rename to src/lib/formats/acorn_dsk.cpp
diff --git a/src/icludes/lib/formats/acorn_dsk.h b/src/lib/formats/acorn_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/acorn_dsk.h
rename to src/lib/formats/acorn_dsk.h
diff --git a/src/icludes/lib/formats/adam_cas.cpp b/src/lib/formats/adam_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/adam_cas.cpp
rename to src/lib/formats/adam_cas.cpp
diff --git a/src/icludes/lib/formats/adam_cas.h b/src/lib/formats/adam_cas.h
similarity index 100%
rename from src/icludes/lib/formats/adam_cas.h
rename to src/lib/formats/adam_cas.h
diff --git a/src/icludes/lib/formats/adam_dsk.cpp b/src/lib/formats/adam_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/adam_dsk.cpp
rename to src/lib/formats/adam_dsk.cpp
diff --git a/src/icludes/lib/formats/adam_dsk.h b/src/lib/formats/adam_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/adam_dsk.h
rename to src/lib/formats/adam_dsk.h
diff --git a/src/icludes/lib/formats/afs_dsk.cpp b/src/lib/formats/afs_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/afs_dsk.cpp
rename to src/lib/formats/afs_dsk.cpp
diff --git a/src/icludes/lib/formats/afs_dsk.h b/src/lib/formats/afs_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/afs_dsk.h
rename to src/lib/formats/afs_dsk.h
diff --git a/src/icludes/lib/formats/agat840k_hle_dsk.cpp b/src/lib/formats/agat840k_hle_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/agat840k_hle_dsk.cpp
rename to src/lib/formats/agat840k_hle_dsk.cpp
diff --git a/src/icludes/lib/formats/agat840k_hle_dsk.h b/src/lib/formats/agat840k_hle_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/agat840k_hle_dsk.h
rename to src/lib/formats/agat840k_hle_dsk.h
diff --git a/src/icludes/lib/formats/aim_dsk.cpp b/src/lib/formats/aim_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/aim_dsk.cpp
rename to src/lib/formats/aim_dsk.cpp
diff --git a/src/icludes/lib/formats/aim_dsk.h b/src/lib/formats/aim_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/aim_dsk.h
rename to src/lib/formats/aim_dsk.h
diff --git a/src/icludes/lib/formats/all.cpp b/src/lib/formats/all.cpp
similarity index 100%
rename from src/icludes/lib/formats/all.cpp
rename to src/lib/formats/all.cpp
diff --git a/src/icludes/lib/formats/all.h b/src/lib/formats/all.h
similarity index 100%
rename from src/icludes/lib/formats/all.h
rename to src/lib/formats/all.h
diff --git a/src/icludes/lib/formats/ami_dsk.cpp b/src/lib/formats/ami_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/ami_dsk.cpp
rename to src/lib/formats/ami_dsk.cpp
diff --git a/src/icludes/lib/formats/ami_dsk.h b/src/lib/formats/ami_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/ami_dsk.h
rename to src/lib/formats/ami_dsk.h
diff --git a/src/icludes/lib/formats/ap2_dsk.cpp b/src/lib/formats/ap2_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/ap2_dsk.cpp
rename to src/lib/formats/ap2_dsk.cpp
diff --git a/src/icludes/lib/formats/ap2_dsk.h b/src/lib/formats/ap2_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/ap2_dsk.h
rename to src/lib/formats/ap2_dsk.h
diff --git a/src/icludes/lib/formats/ap_dsk35.cpp b/src/lib/formats/ap_dsk35.cpp
similarity index 100%
rename from src/icludes/lib/formats/ap_dsk35.cpp
rename to src/lib/formats/ap_dsk35.cpp
diff --git a/src/icludes/lib/formats/ap_dsk35.h b/src/lib/formats/ap_dsk35.h
similarity index 100%
rename from src/icludes/lib/formats/ap_dsk35.h
rename to src/lib/formats/ap_dsk35.h
diff --git a/src/icludes/lib/formats/apd_dsk.cpp b/src/lib/formats/apd_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/apd_dsk.cpp
rename to src/lib/formats/apd_dsk.cpp
diff --git a/src/icludes/lib/formats/apd_dsk.h b/src/lib/formats/apd_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/apd_dsk.h
rename to src/lib/formats/apd_dsk.h
diff --git a/src/icludes/lib/formats/apf_apt.cpp b/src/lib/formats/apf_apt.cpp
similarity index 100%
rename from src/icludes/lib/formats/apf_apt.cpp
rename to src/lib/formats/apf_apt.cpp
diff --git a/src/icludes/lib/formats/apf_apt.h b/src/lib/formats/apf_apt.h
similarity index 100%
rename from src/icludes/lib/formats/apf_apt.h
rename to src/lib/formats/apf_apt.h
diff --git a/src/icludes/lib/formats/apollo_dsk.cpp b/src/lib/formats/apollo_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/apollo_dsk.cpp
rename to src/lib/formats/apollo_dsk.cpp
diff --git a/src/icludes/lib/formats/apollo_dsk.h b/src/lib/formats/apollo_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/apollo_dsk.h
rename to src/lib/formats/apollo_dsk.h
diff --git a/src/icludes/lib/formats/applix_dsk.cpp b/src/lib/formats/applix_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/applix_dsk.cpp
rename to src/lib/formats/applix_dsk.cpp
diff --git a/src/icludes/lib/formats/applix_dsk.h b/src/lib/formats/applix_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/applix_dsk.h
rename to src/lib/formats/applix_dsk.h
diff --git a/src/icludes/lib/formats/apridisk.cpp b/src/lib/formats/apridisk.cpp
similarity index 100%
rename from src/icludes/lib/formats/apridisk.cpp
rename to src/lib/formats/apridisk.cpp
diff --git a/src/icludes/lib/formats/apridisk.h b/src/lib/formats/apridisk.h
similarity index 100%
rename from src/icludes/lib/formats/apridisk.h
rename to src/lib/formats/apridisk.h
diff --git a/src/icludes/lib/formats/aquarius_caq.cpp b/src/lib/formats/aquarius_caq.cpp
similarity index 100%
rename from src/icludes/lib/formats/aquarius_caq.cpp
rename to src/lib/formats/aquarius_caq.cpp
diff --git a/src/icludes/lib/formats/aquarius_caq.h b/src/lib/formats/aquarius_caq.h
similarity index 100%
rename from src/icludes/lib/formats/aquarius_caq.h
rename to src/lib/formats/aquarius_caq.h
diff --git a/src/icludes/lib/formats/asst128_dsk.cpp b/src/lib/formats/asst128_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/asst128_dsk.cpp
rename to src/lib/formats/asst128_dsk.cpp
diff --git a/src/icludes/lib/formats/asst128_dsk.h b/src/lib/formats/asst128_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/asst128_dsk.h
rename to src/lib/formats/asst128_dsk.h
diff --git a/src/icludes/lib/formats/atari_dsk.cpp b/src/lib/formats/atari_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/atari_dsk.cpp
rename to src/lib/formats/atari_dsk.cpp
diff --git a/src/icludes/lib/formats/atari_dsk.h b/src/lib/formats/atari_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/atari_dsk.h
rename to src/lib/formats/atari_dsk.h
diff --git a/src/icludes/lib/formats/atom_dsk.cpp b/src/lib/formats/atom_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/atom_dsk.cpp
rename to src/lib/formats/atom_dsk.cpp
diff --git a/src/icludes/lib/formats/atom_dsk.h b/src/lib/formats/atom_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/atom_dsk.h
rename to src/lib/formats/atom_dsk.h
diff --git a/src/icludes/lib/formats/atom_tap.cpp b/src/lib/formats/atom_tap.cpp
similarity index 100%
rename from src/icludes/lib/formats/atom_tap.cpp
rename to src/lib/formats/atom_tap.cpp
diff --git a/src/icludes/lib/formats/atom_tap.h b/src/lib/formats/atom_tap.h
similarity index 100%
rename from src/icludes/lib/formats/atom_tap.h
rename to src/lib/formats/atom_tap.h
diff --git a/src/icludes/lib/formats/basicdsk.cpp b/src/lib/formats/basicdsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/basicdsk.cpp
rename to src/lib/formats/basicdsk.cpp
diff --git a/src/icludes/lib/formats/basicdsk.h b/src/lib/formats/basicdsk.h
similarity index 100%
rename from src/icludes/lib/formats/basicdsk.h
rename to src/lib/formats/basicdsk.h
diff --git a/src/icludes/lib/formats/bw12_dsk.cpp b/src/lib/formats/bw12_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/bw12_dsk.cpp
rename to src/lib/formats/bw12_dsk.cpp
diff --git a/src/icludes/lib/formats/bw12_dsk.h b/src/lib/formats/bw12_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/bw12_dsk.h
rename to src/lib/formats/bw12_dsk.h
diff --git a/src/icludes/lib/formats/bw2_dsk.cpp b/src/lib/formats/bw2_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/bw2_dsk.cpp
rename to src/lib/formats/bw2_dsk.cpp
diff --git a/src/icludes/lib/formats/bw2_dsk.h b/src/lib/formats/bw2_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/bw2_dsk.h
rename to src/lib/formats/bw2_dsk.h
diff --git a/src/icludes/lib/formats/c3040_dsk.cpp b/src/lib/formats/c3040_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/c3040_dsk.cpp
rename to src/lib/formats/c3040_dsk.cpp
diff --git a/src/icludes/lib/formats/c3040_dsk.h b/src/lib/formats/c3040_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/c3040_dsk.h
rename to src/lib/formats/c3040_dsk.h
diff --git a/src/icludes/lib/formats/c4040_dsk.cpp b/src/lib/formats/c4040_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/c4040_dsk.cpp
rename to src/lib/formats/c4040_dsk.cpp
diff --git a/src/icludes/lib/formats/c4040_dsk.h b/src/lib/formats/c4040_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/c4040_dsk.h
rename to src/lib/formats/c4040_dsk.h
diff --git a/src/icludes/lib/formats/c8280_dsk.cpp b/src/lib/formats/c8280_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/c8280_dsk.cpp
rename to src/lib/formats/c8280_dsk.cpp
diff --git a/src/icludes/lib/formats/c8280_dsk.h b/src/lib/formats/c8280_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/c8280_dsk.h
rename to src/lib/formats/c8280_dsk.h
diff --git a/src/icludes/lib/formats/camplynx_cas.cpp b/src/lib/formats/camplynx_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/camplynx_cas.cpp
rename to src/lib/formats/camplynx_cas.cpp
diff --git a/src/icludes/lib/formats/camplynx_cas.h b/src/lib/formats/camplynx_cas.h
similarity index 100%
rename from src/icludes/lib/formats/camplynx_cas.h
rename to src/lib/formats/camplynx_cas.h
diff --git a/src/icludes/lib/formats/camplynx_dsk.cpp b/src/lib/formats/camplynx_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/camplynx_dsk.cpp
rename to src/lib/formats/camplynx_dsk.cpp
diff --git a/src/icludes/lib/formats/camplynx_dsk.h b/src/lib/formats/camplynx_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/camplynx_dsk.h
rename to src/lib/formats/camplynx_dsk.h
diff --git a/src/icludes/lib/formats/cassimg.cpp b/src/lib/formats/cassimg.cpp
similarity index 100%
rename from src/icludes/lib/formats/cassimg.cpp
rename to src/lib/formats/cassimg.cpp
diff --git a/src/icludes/lib/formats/cassimg.h b/src/lib/formats/cassimg.h
similarity index 100%
rename from src/icludes/lib/formats/cassimg.h
rename to src/lib/formats/cassimg.h
diff --git a/src/icludes/lib/formats/cbm_crt.cpp b/src/lib/formats/cbm_crt.cpp
similarity index 100%
rename from src/icludes/lib/formats/cbm_crt.cpp
rename to src/lib/formats/cbm_crt.cpp
diff --git a/src/icludes/lib/formats/cbm_crt.h b/src/lib/formats/cbm_crt.h
similarity index 100%
rename from src/icludes/lib/formats/cbm_crt.h
rename to src/lib/formats/cbm_crt.h
diff --git a/src/icludes/lib/formats/cbm_tap.cpp b/src/lib/formats/cbm_tap.cpp
similarity index 100%
rename from src/icludes/lib/formats/cbm_tap.cpp
rename to src/lib/formats/cbm_tap.cpp
diff --git a/src/icludes/lib/formats/cbm_tap.h b/src/lib/formats/cbm_tap.h
similarity index 100%
rename from src/icludes/lib/formats/cbm_tap.h
rename to src/lib/formats/cbm_tap.h
diff --git a/src/icludes/lib/formats/ccvf_dsk.cpp b/src/lib/formats/ccvf_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/ccvf_dsk.cpp
rename to src/lib/formats/ccvf_dsk.cpp
diff --git a/src/icludes/lib/formats/ccvf_dsk.h b/src/lib/formats/ccvf_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/ccvf_dsk.h
rename to src/lib/formats/ccvf_dsk.h
diff --git a/src/icludes/lib/formats/cd90_640_dsk.cpp b/src/lib/formats/cd90_640_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/cd90_640_dsk.cpp
rename to src/lib/formats/cd90_640_dsk.cpp
diff --git a/src/icludes/lib/formats/cd90_640_dsk.h b/src/lib/formats/cd90_640_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/cd90_640_dsk.h
rename to src/lib/formats/cd90_640_dsk.h
diff --git a/src/icludes/lib/formats/cgen_cas.cpp b/src/lib/formats/cgen_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/cgen_cas.cpp
rename to src/lib/formats/cgen_cas.cpp
diff --git a/src/icludes/lib/formats/cgen_cas.h b/src/lib/formats/cgen_cas.h
similarity index 100%
rename from src/icludes/lib/formats/cgen_cas.h
rename to src/lib/formats/cgen_cas.h
diff --git a/src/icludes/lib/formats/cgenie_dsk.cpp b/src/lib/formats/cgenie_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/cgenie_dsk.cpp
rename to src/lib/formats/cgenie_dsk.cpp
diff --git a/src/icludes/lib/formats/cgenie_dsk.h b/src/lib/formats/cgenie_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/cgenie_dsk.h
rename to src/lib/formats/cgenie_dsk.h
diff --git a/src/icludes/lib/formats/coco_cas.cpp b/src/lib/formats/coco_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/coco_cas.cpp
rename to src/lib/formats/coco_cas.cpp
diff --git a/src/icludes/lib/formats/coco_cas.h b/src/lib/formats/coco_cas.h
similarity index 100%
rename from src/icludes/lib/formats/coco_cas.h
rename to src/lib/formats/coco_cas.h
diff --git a/src/icludes/lib/formats/comx35_dsk.cpp b/src/lib/formats/comx35_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/comx35_dsk.cpp
rename to src/lib/formats/comx35_dsk.cpp
diff --git a/src/icludes/lib/formats/comx35_dsk.h b/src/lib/formats/comx35_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/comx35_dsk.h
rename to src/lib/formats/comx35_dsk.h
diff --git a/src/icludes/lib/formats/concept_dsk.cpp b/src/lib/formats/concept_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/concept_dsk.cpp
rename to src/lib/formats/concept_dsk.cpp
diff --git a/src/icludes/lib/formats/concept_dsk.h b/src/lib/formats/concept_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/concept_dsk.h
rename to src/lib/formats/concept_dsk.h
diff --git a/src/icludes/lib/formats/coupedsk.cpp b/src/lib/formats/coupedsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/coupedsk.cpp
rename to src/lib/formats/coupedsk.cpp
diff --git a/src/icludes/lib/formats/coupedsk.h b/src/lib/formats/coupedsk.h
similarity index 100%
rename from src/icludes/lib/formats/coupedsk.h
rename to src/lib/formats/coupedsk.h
diff --git a/src/icludes/lib/formats/cpis_dsk.cpp b/src/lib/formats/cpis_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/cpis_dsk.cpp
rename to src/lib/formats/cpis_dsk.cpp
diff --git a/src/icludes/lib/formats/cpis_dsk.h b/src/lib/formats/cpis_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/cpis_dsk.h
rename to src/lib/formats/cpis_dsk.h
diff --git a/src/icludes/lib/formats/cqm_dsk.cpp b/src/lib/formats/cqm_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/cqm_dsk.cpp
rename to src/lib/formats/cqm_dsk.cpp
diff --git a/src/icludes/lib/formats/cqm_dsk.h b/src/lib/formats/cqm_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/cqm_dsk.h
rename to src/lib/formats/cqm_dsk.h
diff --git a/src/icludes/lib/formats/csw_cas.cpp b/src/lib/formats/csw_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/csw_cas.cpp
rename to src/lib/formats/csw_cas.cpp
diff --git a/src/icludes/lib/formats/csw_cas.h b/src/lib/formats/csw_cas.h
similarity index 100%
rename from src/icludes/lib/formats/csw_cas.h
rename to src/lib/formats/csw_cas.h
diff --git a/src/icludes/lib/formats/d64_dsk.cpp b/src/lib/formats/d64_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/d64_dsk.cpp
rename to src/lib/formats/d64_dsk.cpp
diff --git a/src/icludes/lib/formats/d64_dsk.h b/src/lib/formats/d64_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/d64_dsk.h
rename to src/lib/formats/d64_dsk.h
diff --git a/src/icludes/lib/formats/d71_dsk.cpp b/src/lib/formats/d71_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/d71_dsk.cpp
rename to src/lib/formats/d71_dsk.cpp
diff --git a/src/icludes/lib/formats/d71_dsk.h b/src/lib/formats/d71_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/d71_dsk.h
rename to src/lib/formats/d71_dsk.h
diff --git a/src/icludes/lib/formats/d80_dsk.cpp b/src/lib/formats/d80_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/d80_dsk.cpp
rename to src/lib/formats/d80_dsk.cpp
diff --git a/src/icludes/lib/formats/d80_dsk.h b/src/lib/formats/d80_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/d80_dsk.h
rename to src/lib/formats/d80_dsk.h
diff --git a/src/icludes/lib/formats/d81_dsk.cpp b/src/lib/formats/d81_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/d81_dsk.cpp
rename to src/lib/formats/d81_dsk.cpp
diff --git a/src/icludes/lib/formats/d81_dsk.h b/src/lib/formats/d81_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/d81_dsk.h
rename to src/lib/formats/d81_dsk.h
diff --git a/src/icludes/lib/formats/d82_dsk.cpp b/src/lib/formats/d82_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/d82_dsk.cpp
rename to src/lib/formats/d82_dsk.cpp
diff --git a/src/icludes/lib/formats/d82_dsk.h b/src/lib/formats/d82_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/d82_dsk.h
rename to src/lib/formats/d82_dsk.h
diff --git a/src/icludes/lib/formats/d88_dsk.cpp b/src/lib/formats/d88_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/d88_dsk.cpp
rename to src/lib/formats/d88_dsk.cpp
diff --git a/src/icludes/lib/formats/d88_dsk.h b/src/lib/formats/d88_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/d88_dsk.h
rename to src/lib/formats/d88_dsk.h
diff --git a/src/icludes/lib/formats/dcp_dsk.cpp b/src/lib/formats/dcp_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/dcp_dsk.cpp
rename to src/lib/formats/dcp_dsk.cpp
diff --git a/src/icludes/lib/formats/dcp_dsk.h b/src/lib/formats/dcp_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/dcp_dsk.h
rename to src/lib/formats/dcp_dsk.h
diff --git a/src/icludes/lib/formats/dfi_dsk.cpp b/src/lib/formats/dfi_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/dfi_dsk.cpp
rename to src/lib/formats/dfi_dsk.cpp
diff --git a/src/icludes/lib/formats/dfi_dsk.h b/src/lib/formats/dfi_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/dfi_dsk.h
rename to src/lib/formats/dfi_dsk.h
diff --git a/src/icludes/lib/formats/dim_dsk.cpp b/src/lib/formats/dim_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/dim_dsk.cpp
rename to src/lib/formats/dim_dsk.cpp
diff --git a/src/icludes/lib/formats/dim_dsk.h b/src/lib/formats/dim_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/dim_dsk.h
rename to src/lib/formats/dim_dsk.h
diff --git a/src/icludes/lib/formats/dip_dsk.cpp b/src/lib/formats/dip_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/dip_dsk.cpp
rename to src/lib/formats/dip_dsk.cpp
diff --git a/src/icludes/lib/formats/dip_dsk.h b/src/lib/formats/dip_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/dip_dsk.h
rename to src/lib/formats/dip_dsk.h
diff --git a/src/icludes/lib/formats/dmk_dsk.cpp b/src/lib/formats/dmk_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/dmk_dsk.cpp
rename to src/lib/formats/dmk_dsk.cpp
diff --git a/src/icludes/lib/formats/dmk_dsk.h b/src/lib/formats/dmk_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/dmk_dsk.h
rename to src/lib/formats/dmk_dsk.h
diff --git a/src/icludes/lib/formats/dmv_dsk.cpp b/src/lib/formats/dmv_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/dmv_dsk.cpp
rename to src/lib/formats/dmv_dsk.cpp
diff --git a/src/icludes/lib/formats/dmv_dsk.h b/src/lib/formats/dmv_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/dmv_dsk.h
rename to src/lib/formats/dmv_dsk.h
diff --git a/src/icludes/lib/formats/ds9_dsk.cpp b/src/lib/formats/ds9_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/ds9_dsk.cpp
rename to src/lib/formats/ds9_dsk.cpp
diff --git a/src/icludes/lib/formats/ds9_dsk.h b/src/lib/formats/ds9_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/ds9_dsk.h
rename to src/lib/formats/ds9_dsk.h
diff --git a/src/icludes/lib/formats/dsk_dsk.cpp b/src/lib/formats/dsk_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/dsk_dsk.cpp
rename to src/lib/formats/dsk_dsk.cpp
diff --git a/src/icludes/lib/formats/dsk_dsk.h b/src/lib/formats/dsk_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/dsk_dsk.h
rename to src/lib/formats/dsk_dsk.h
diff --git a/src/icludes/lib/formats/dvk_mx_dsk.cpp b/src/lib/formats/dvk_mx_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/dvk_mx_dsk.cpp
rename to src/lib/formats/dvk_mx_dsk.cpp
diff --git a/src/icludes/lib/formats/dvk_mx_dsk.h b/src/lib/formats/dvk_mx_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/dvk_mx_dsk.h
rename to src/lib/formats/dvk_mx_dsk.h
diff --git a/src/icludes/lib/formats/ep64_dsk.cpp b/src/lib/formats/ep64_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/ep64_dsk.cpp
rename to src/lib/formats/ep64_dsk.cpp
diff --git a/src/icludes/lib/formats/ep64_dsk.h b/src/lib/formats/ep64_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/ep64_dsk.h
rename to src/lib/formats/ep64_dsk.h
diff --git a/src/icludes/lib/formats/esq16_dsk.cpp b/src/lib/formats/esq16_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/esq16_dsk.cpp
rename to src/lib/formats/esq16_dsk.cpp
diff --git a/src/icludes/lib/formats/esq16_dsk.h b/src/lib/formats/esq16_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/esq16_dsk.h
rename to src/lib/formats/esq16_dsk.h
diff --git a/src/icludes/lib/formats/esq8_dsk.cpp b/src/lib/formats/esq8_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/esq8_dsk.cpp
rename to src/lib/formats/esq8_dsk.cpp
diff --git a/src/icludes/lib/formats/esq8_dsk.h b/src/lib/formats/esq8_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/esq8_dsk.h
rename to src/lib/formats/esq8_dsk.h
diff --git a/src/icludes/lib/formats/excali64_dsk.cpp b/src/lib/formats/excali64_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/excali64_dsk.cpp
rename to src/lib/formats/excali64_dsk.cpp
diff --git a/src/icludes/lib/formats/excali64_dsk.h b/src/lib/formats/excali64_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/excali64_dsk.h
rename to src/lib/formats/excali64_dsk.h
diff --git a/src/icludes/lib/formats/fc100_cas.cpp b/src/lib/formats/fc100_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/fc100_cas.cpp
rename to src/lib/formats/fc100_cas.cpp
diff --git a/src/icludes/lib/formats/fc100_cas.h b/src/lib/formats/fc100_cas.h
similarity index 100%
rename from src/icludes/lib/formats/fc100_cas.h
rename to src/lib/formats/fc100_cas.h
diff --git a/src/icludes/lib/formats/fdd_dsk.cpp b/src/lib/formats/fdd_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/fdd_dsk.cpp
rename to src/lib/formats/fdd_dsk.cpp
diff --git a/src/icludes/lib/formats/fdd_dsk.h b/src/lib/formats/fdd_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/fdd_dsk.h
rename to src/lib/formats/fdd_dsk.h
diff --git a/src/icludes/lib/formats/fdi_dsk.cpp b/src/lib/formats/fdi_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/fdi_dsk.cpp
rename to src/lib/formats/fdi_dsk.cpp
diff --git a/src/icludes/lib/formats/fl1_dsk.cpp b/src/lib/formats/fl1_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/fl1_dsk.cpp
rename to src/lib/formats/fl1_dsk.cpp
diff --git a/src/icludes/lib/formats/fl1_dsk.h b/src/lib/formats/fl1_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/fl1_dsk.h
rename to src/lib/formats/fl1_dsk.h
diff --git a/src/icludes/lib/formats/flex_dsk.cpp b/src/lib/formats/flex_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/flex_dsk.cpp
rename to src/lib/formats/flex_dsk.cpp
diff --git a/src/icludes/lib/formats/flex_dsk.h b/src/lib/formats/flex_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/flex_dsk.h
rename to src/lib/formats/flex_dsk.h
diff --git a/src/icludes/lib/formats/flopimg.cpp b/src/lib/formats/flopimg.cpp
similarity index 100%
rename from src/icludes/lib/formats/flopimg.cpp
rename to src/lib/formats/flopimg.cpp
diff --git a/src/icludes/lib/formats/flopimg.h b/src/lib/formats/flopimg.h
similarity index 100%
rename from src/icludes/lib/formats/flopimg.h
rename to src/lib/formats/flopimg.h
diff --git a/src/icludes/lib/formats/flopimg_legacy.cpp b/src/lib/formats/flopimg_legacy.cpp
similarity index 100%
rename from src/icludes/lib/formats/flopimg_legacy.cpp
rename to src/lib/formats/flopimg_legacy.cpp
diff --git a/src/icludes/lib/formats/flopimg_legacy.h b/src/lib/formats/flopimg_legacy.h
similarity index 100%
rename from src/icludes/lib/formats/flopimg_legacy.h
rename to src/lib/formats/flopimg_legacy.h
diff --git a/src/icludes/lib/formats/fm7_cas.cpp b/src/lib/formats/fm7_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/fm7_cas.cpp
rename to src/lib/formats/fm7_cas.cpp
diff --git a/src/icludes/lib/formats/fm7_cas.h b/src/lib/formats/fm7_cas.h
similarity index 100%
rename from src/icludes/lib/formats/fm7_cas.h
rename to src/lib/formats/fm7_cas.h
diff --git a/src/icludes/lib/formats/fmsx_cas.cpp b/src/lib/formats/fmsx_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/fmsx_cas.cpp
rename to src/lib/formats/fmsx_cas.cpp
diff --git a/src/icludes/lib/formats/fmsx_cas.h b/src/lib/formats/fmsx_cas.h
similarity index 100%
rename from src/icludes/lib/formats/fmsx_cas.h
rename to src/lib/formats/fmsx_cas.h
diff --git a/src/icludes/lib/formats/fmtowns_dsk.cpp b/src/lib/formats/fmtowns_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/fmtowns_dsk.cpp
rename to src/lib/formats/fmtowns_dsk.cpp
diff --git a/src/icludes/lib/formats/fmtowns_dsk.h b/src/lib/formats/fmtowns_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/fmtowns_dsk.h
rename to src/lib/formats/fmtowns_dsk.h
diff --git a/src/icludes/lib/formats/fs_oric_jasmin.cpp b/src/lib/formats/fs_oric_jasmin.cpp
similarity index 100%
rename from src/icludes/lib/formats/fs_oric_jasmin.cpp
rename to src/lib/formats/fs_oric_jasmin.cpp
diff --git a/src/icludes/lib/formats/fs_oric_jasmin.h b/src/lib/formats/fs_oric_jasmin.h
similarity index 100%
rename from src/icludes/lib/formats/fs_oric_jasmin.h
rename to src/lib/formats/fs_oric_jasmin.h
diff --git a/src/icludes/lib/formats/fs_prodos.cpp b/src/lib/formats/fs_prodos.cpp
similarity index 100%
rename from src/icludes/lib/formats/fs_prodos.cpp
rename to src/lib/formats/fs_prodos.cpp
diff --git a/src/icludes/lib/formats/fs_prodos.h b/src/lib/formats/fs_prodos.h
similarity index 100%
rename from src/icludes/lib/formats/fs_prodos.h
rename to src/lib/formats/fs_prodos.h
diff --git a/src/icludes/lib/formats/fs_unformatted.cpp b/src/lib/formats/fs_unformatted.cpp
similarity index 100%
rename from src/icludes/lib/formats/fs_unformatted.cpp
rename to src/lib/formats/fs_unformatted.cpp
diff --git a/src/icludes/lib/formats/fs_unformatted.h b/src/lib/formats/fs_unformatted.h
similarity index 100%
rename from src/icludes/lib/formats/fs_unformatted.h
rename to src/lib/formats/fs_unformatted.h
diff --git a/src/icludes/lib/formats/fs_vtech.cpp b/src/lib/formats/fs_vtech.cpp
similarity index 100%
rename from src/icludes/lib/formats/fs_vtech.cpp
rename to src/lib/formats/fs_vtech.cpp
diff --git a/src/icludes/lib/formats/fs_vtech.h b/src/lib/formats/fs_vtech.h
similarity index 100%
rename from src/icludes/lib/formats/fs_vtech.h
rename to src/lib/formats/fs_vtech.h
diff --git a/src/icludes/lib/formats/fsblk_vec.cpp b/src/lib/formats/fsblk_vec.cpp
similarity index 100%
rename from src/icludes/lib/formats/fsblk_vec.cpp
rename to src/lib/formats/fsblk_vec.cpp
diff --git a/src/icludes/lib/formats/fsblk_vec.h b/src/lib/formats/fsblk_vec.h
similarity index 100%
rename from src/icludes/lib/formats/fsblk_vec.h
rename to src/lib/formats/fsblk_vec.h
diff --git a/src/icludes/lib/formats/fsd_dsk.cpp b/src/lib/formats/fsd_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/fsd_dsk.cpp
rename to src/lib/formats/fsd_dsk.cpp
diff --git a/src/icludes/lib/formats/fsd_dsk.h b/src/lib/formats/fsd_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/fsd_dsk.h
rename to src/lib/formats/fsd_dsk.h
diff --git a/src/icludes/lib/formats/fsmgr.cpp b/src/lib/formats/fsmgr.cpp
similarity index 100%
rename from src/icludes/lib/formats/fsmgr.cpp
rename to src/lib/formats/fsmgr.cpp
diff --git a/src/icludes/lib/formats/fsmgr.h b/src/lib/formats/fsmgr.h
similarity index 100%
rename from src/icludes/lib/formats/fsmgr.h
rename to src/lib/formats/fsmgr.h
diff --git a/src/icludes/lib/formats/g64_dsk.cpp b/src/lib/formats/g64_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/g64_dsk.cpp
rename to src/lib/formats/g64_dsk.cpp
diff --git a/src/icludes/lib/formats/g64_dsk.h b/src/lib/formats/g64_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/g64_dsk.h
rename to src/lib/formats/g64_dsk.h
diff --git a/src/icludes/lib/formats/gtp_cas.cpp b/src/lib/formats/gtp_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/gtp_cas.cpp
rename to src/lib/formats/gtp_cas.cpp
diff --git a/src/icludes/lib/formats/gtp_cas.h b/src/lib/formats/gtp_cas.h
similarity index 100%
rename from src/icludes/lib/formats/gtp_cas.h
rename to src/lib/formats/gtp_cas.h
diff --git a/src/icludes/lib/formats/guab_dsk.cpp b/src/lib/formats/guab_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/guab_dsk.cpp
rename to src/lib/formats/guab_dsk.cpp
diff --git a/src/icludes/lib/formats/guab_dsk.h b/src/lib/formats/guab_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/guab_dsk.h
rename to src/lib/formats/guab_dsk.h
diff --git a/src/icludes/lib/formats/h8_cas.cpp b/src/lib/formats/h8_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/h8_cas.cpp
rename to src/lib/formats/h8_cas.cpp
diff --git a/src/icludes/lib/formats/h8_cas.h b/src/lib/formats/h8_cas.h
similarity index 100%
rename from src/icludes/lib/formats/h8_cas.h
rename to src/lib/formats/h8_cas.h
diff --git a/src/icludes/lib/formats/hect_dsk.cpp b/src/lib/formats/hect_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/hect_dsk.cpp
rename to src/lib/formats/hect_dsk.cpp
diff --git a/src/icludes/lib/formats/hect_dsk.h b/src/lib/formats/hect_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/hect_dsk.h
rename to src/lib/formats/hect_dsk.h
diff --git a/src/icludes/lib/formats/hect_tap.cpp b/src/lib/formats/hect_tap.cpp
similarity index 100%
rename from src/icludes/lib/formats/hect_tap.cpp
rename to src/lib/formats/hect_tap.cpp
diff --git a/src/icludes/lib/formats/hect_tap.h b/src/lib/formats/hect_tap.h
similarity index 100%
rename from src/icludes/lib/formats/hect_tap.h
rename to src/lib/formats/hect_tap.h
diff --git a/src/icludes/lib/formats/hector_minidisc.cpp b/src/lib/formats/hector_minidisc.cpp
similarity index 100%
rename from src/icludes/lib/formats/hector_minidisc.cpp
rename to src/lib/formats/hector_minidisc.cpp
diff --git a/src/icludes/lib/formats/hector_minidisc.h b/src/lib/formats/hector_minidisc.h
similarity index 100%
rename from src/icludes/lib/formats/hector_minidisc.h
rename to src/lib/formats/hector_minidisc.h
diff --git a/src/icludes/lib/formats/hp_ipc_dsk.cpp b/src/lib/formats/hp_ipc_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/hp_ipc_dsk.cpp
rename to src/lib/formats/hp_ipc_dsk.cpp
diff --git a/src/icludes/lib/formats/hp_ipc_dsk.h b/src/lib/formats/hp_ipc_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/hp_ipc_dsk.h
rename to src/lib/formats/hp_ipc_dsk.h
diff --git a/src/icludes/lib/formats/hpi_dsk.cpp b/src/lib/formats/hpi_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/hpi_dsk.cpp
rename to src/lib/formats/hpi_dsk.cpp
diff --git a/src/icludes/lib/formats/hpi_dsk.h b/src/lib/formats/hpi_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/hpi_dsk.h
rename to src/lib/formats/hpi_dsk.h
diff --git a/src/icludes/lib/formats/hti_tape.cpp b/src/lib/formats/hti_tape.cpp
similarity index 100%
rename from src/icludes/lib/formats/hti_tape.cpp
rename to src/lib/formats/hti_tape.cpp
diff --git a/src/icludes/lib/formats/hti_tape.h b/src/lib/formats/hti_tape.h
similarity index 100%
rename from src/icludes/lib/formats/hti_tape.h
rename to src/lib/formats/hti_tape.h
diff --git a/src/icludes/lib/formats/hxchfe_dsk.cpp b/src/lib/formats/hxchfe_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/hxchfe_dsk.cpp
rename to src/lib/formats/hxchfe_dsk.cpp
diff --git a/src/icludes/lib/formats/hxchfe_dsk.h b/src/lib/formats/hxchfe_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/hxchfe_dsk.h
rename to src/lib/formats/hxchfe_dsk.h
diff --git a/src/icludes/lib/formats/hxcmfm_dsk.cpp b/src/lib/formats/hxcmfm_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/hxcmfm_dsk.cpp
rename to src/lib/formats/hxcmfm_dsk.cpp
diff --git a/src/icludes/lib/formats/hxcmfm_dsk.h b/src/lib/formats/hxcmfm_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/hxcmfm_dsk.h
rename to src/lib/formats/hxcmfm_dsk.h
diff --git a/src/icludes/lib/formats/ibmxdf_dsk.cpp b/src/lib/formats/ibmxdf_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/ibmxdf_dsk.cpp
rename to src/lib/formats/ibmxdf_dsk.cpp
diff --git a/src/icludes/lib/formats/ibmxdf_dsk.h b/src/lib/formats/ibmxdf_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/ibmxdf_dsk.h
rename to src/lib/formats/ibmxdf_dsk.h
diff --git a/src/icludes/lib/formats/imageutl.cpp b/src/lib/formats/imageutl.cpp
similarity index 100%
rename from src/icludes/lib/formats/imageutl.cpp
rename to src/lib/formats/imageutl.cpp
diff --git a/src/icludes/lib/formats/imageutl.h b/src/lib/formats/imageutl.h
similarity index 100%
rename from src/icludes/lib/formats/imageutl.h
rename to src/lib/formats/imageutl.h
diff --git a/src/icludes/lib/formats/imd_dsk.cpp b/src/lib/formats/imd_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/imd_dsk.cpp
rename to src/lib/formats/imd_dsk.cpp
diff --git a/src/icludes/lib/formats/imd_dsk.h b/src/lib/formats/imd_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/imd_dsk.h
rename to src/lib/formats/imd_dsk.h
diff --git a/src/icludes/lib/formats/img_dsk.cpp b/src/lib/formats/img_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/img_dsk.cpp
rename to src/lib/formats/img_dsk.cpp
diff --git a/src/icludes/lib/formats/img_dsk.h b/src/lib/formats/img_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/img_dsk.h
rename to src/lib/formats/img_dsk.h
diff --git a/src/icludes/lib/formats/ipf_dsk.cpp b/src/lib/formats/ipf_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/ipf_dsk.cpp
rename to src/lib/formats/ipf_dsk.cpp
diff --git a/src/icludes/lib/formats/ipf_dsk.h b/src/lib/formats/ipf_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/ipf_dsk.h
rename to src/lib/formats/ipf_dsk.h
diff --git a/src/icludes/lib/formats/iq151_dsk.cpp b/src/lib/formats/iq151_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/iq151_dsk.cpp
rename to src/lib/formats/iq151_dsk.cpp
diff --git a/src/icludes/lib/formats/iq151_dsk.h b/src/lib/formats/iq151_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/iq151_dsk.h
rename to src/lib/formats/iq151_dsk.h
diff --git a/src/icludes/lib/formats/itt3030_dsk.cpp b/src/lib/formats/itt3030_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/itt3030_dsk.cpp
rename to src/lib/formats/itt3030_dsk.cpp
diff --git a/src/icludes/lib/formats/itt3030_dsk.h b/src/lib/formats/itt3030_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/itt3030_dsk.h
rename to src/lib/formats/itt3030_dsk.h
diff --git a/src/icludes/lib/formats/jfd_dsk.cpp b/src/lib/formats/jfd_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/jfd_dsk.cpp
rename to src/lib/formats/jfd_dsk.cpp
diff --git a/src/icludes/lib/formats/jfd_dsk.h b/src/lib/formats/jfd_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/jfd_dsk.h
rename to src/lib/formats/jfd_dsk.h
diff --git a/src/icludes/lib/formats/juku_dsk.cpp b/src/lib/formats/juku_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/juku_dsk.cpp
rename to src/lib/formats/juku_dsk.cpp
diff --git a/src/icludes/lib/formats/juku_dsk.h b/src/lib/formats/juku_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/juku_dsk.h
rename to src/lib/formats/juku_dsk.h
diff --git a/src/icludes/lib/formats/jvc_dsk.cpp b/src/lib/formats/jvc_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/jvc_dsk.cpp
rename to src/lib/formats/jvc_dsk.cpp
diff --git a/src/icludes/lib/formats/jvc_dsk.h b/src/lib/formats/jvc_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/jvc_dsk.h
rename to src/lib/formats/jvc_dsk.h
diff --git a/src/icludes/lib/formats/kaypro_dsk.cpp b/src/lib/formats/kaypro_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/kaypro_dsk.cpp
rename to src/lib/formats/kaypro_dsk.cpp
diff --git a/src/icludes/lib/formats/kaypro_dsk.h b/src/lib/formats/kaypro_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/kaypro_dsk.h
rename to src/lib/formats/kaypro_dsk.h
diff --git a/src/icludes/lib/formats/kc85_dsk.cpp b/src/lib/formats/kc85_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/kc85_dsk.cpp
rename to src/lib/formats/kc85_dsk.cpp
diff --git a/src/icludes/lib/formats/kc85_dsk.h b/src/lib/formats/kc85_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/kc85_dsk.h
rename to src/lib/formats/kc85_dsk.h
diff --git a/src/icludes/lib/formats/kc_cas.cpp b/src/lib/formats/kc_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/kc_cas.cpp
rename to src/lib/formats/kc_cas.cpp
diff --git a/src/icludes/lib/formats/kc_cas.h b/src/lib/formats/kc_cas.h
similarity index 100%
rename from src/icludes/lib/formats/kc_cas.h
rename to src/lib/formats/kc_cas.h
diff --git a/src/icludes/lib/formats/kim1_cas.cpp b/src/lib/formats/kim1_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/kim1_cas.cpp
rename to src/lib/formats/kim1_cas.cpp
diff --git a/src/icludes/lib/formats/kim1_cas.h b/src/lib/formats/kim1_cas.h
similarity index 100%
rename from src/icludes/lib/formats/kim1_cas.h
rename to src/lib/formats/kim1_cas.h
diff --git a/src/icludes/lib/formats/lviv_lvt.cpp b/src/lib/formats/lviv_lvt.cpp
similarity index 100%
rename from src/icludes/lib/formats/lviv_lvt.cpp
rename to src/lib/formats/lviv_lvt.cpp
diff --git a/src/icludes/lib/formats/lviv_lvt.h b/src/lib/formats/lviv_lvt.h
similarity index 100%
rename from src/icludes/lib/formats/lviv_lvt.h
rename to src/lib/formats/lviv_lvt.h
diff --git a/src/icludes/lib/formats/m20_dsk.cpp b/src/lib/formats/m20_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/m20_dsk.cpp
rename to src/lib/formats/m20_dsk.cpp
diff --git a/src/icludes/lib/formats/m20_dsk.h b/src/lib/formats/m20_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/m20_dsk.h
rename to src/lib/formats/m20_dsk.h
diff --git a/src/icludes/lib/formats/m5_dsk.cpp b/src/lib/formats/m5_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/m5_dsk.cpp
rename to src/lib/formats/m5_dsk.cpp
diff --git a/src/icludes/lib/formats/m5_dsk.h b/src/lib/formats/m5_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/m5_dsk.h
rename to src/lib/formats/m5_dsk.h
diff --git a/src/icludes/lib/formats/mbee_cas.cpp b/src/lib/formats/mbee_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/mbee_cas.cpp
rename to src/lib/formats/mbee_cas.cpp
diff --git a/src/icludes/lib/formats/mbee_cas.h b/src/lib/formats/mbee_cas.h
similarity index 100%
rename from src/icludes/lib/formats/mbee_cas.h
rename to src/lib/formats/mbee_cas.h
diff --git a/src/icludes/lib/formats/mdos_dsk.cpp b/src/lib/formats/mdos_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/mdos_dsk.cpp
rename to src/lib/formats/mdos_dsk.cpp
diff --git a/src/icludes/lib/formats/mdos_dsk.h b/src/lib/formats/mdos_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/mdos_dsk.h
rename to src/lib/formats/mdos_dsk.h
diff --git a/src/icludes/lib/formats/mfi_dsk.cpp b/src/lib/formats/mfi_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/mfi_dsk.cpp
rename to src/lib/formats/mfi_dsk.cpp
diff --git a/src/icludes/lib/formats/mfi_dsk.h b/src/lib/formats/mfi_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/mfi_dsk.h
rename to src/lib/formats/mfi_dsk.h
diff --git a/src/icludes/lib/formats/mfm_hd.cpp b/src/lib/formats/mfm_hd.cpp
similarity index 100%
rename from src/icludes/lib/formats/mfm_hd.cpp
rename to src/lib/formats/mfm_hd.cpp
diff --git a/src/icludes/lib/formats/mfm_hd.h b/src/lib/formats/mfm_hd.h
similarity index 100%
rename from src/icludes/lib/formats/mfm_hd.h
rename to src/lib/formats/mfm_hd.h
diff --git a/src/icludes/lib/formats/mm_dsk.cpp b/src/lib/formats/mm_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/mm_dsk.cpp
rename to src/lib/formats/mm_dsk.cpp
diff --git a/src/icludes/lib/formats/mm_dsk.h b/src/lib/formats/mm_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/mm_dsk.h
rename to src/lib/formats/mm_dsk.h
diff --git a/src/icludes/lib/formats/ms0515_dsk.cpp b/src/lib/formats/ms0515_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/ms0515_dsk.cpp
rename to src/lib/formats/ms0515_dsk.cpp
diff --git a/src/icludes/lib/formats/ms0515_dsk.h b/src/lib/formats/ms0515_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/ms0515_dsk.h
rename to src/lib/formats/ms0515_dsk.h
diff --git a/src/icludes/lib/formats/msx_dsk.cpp b/src/lib/formats/msx_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/msx_dsk.cpp
rename to src/lib/formats/msx_dsk.cpp
diff --git a/src/icludes/lib/formats/msx_dsk.h b/src/lib/formats/msx_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/msx_dsk.h
rename to src/lib/formats/msx_dsk.h
diff --git a/src/icludes/lib/formats/mtx_dsk.cpp b/src/lib/formats/mtx_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/mtx_dsk.cpp
rename to src/lib/formats/mtx_dsk.cpp
diff --git a/src/icludes/lib/formats/mtx_dsk.h b/src/lib/formats/mtx_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/mtx_dsk.h
rename to src/lib/formats/mtx_dsk.h
diff --git a/src/icludes/lib/formats/mz_cas.cpp b/src/lib/formats/mz_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/mz_cas.cpp
rename to src/lib/formats/mz_cas.cpp
diff --git a/src/icludes/lib/formats/mz_cas.h b/src/lib/formats/mz_cas.h
similarity index 100%
rename from src/icludes/lib/formats/mz_cas.h
rename to src/lib/formats/mz_cas.h
diff --git a/src/icludes/lib/formats/nanos_dsk.cpp b/src/lib/formats/nanos_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/nanos_dsk.cpp
rename to src/lib/formats/nanos_dsk.cpp
diff --git a/src/icludes/lib/formats/nanos_dsk.h b/src/lib/formats/nanos_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/nanos_dsk.h
rename to src/lib/formats/nanos_dsk.h
diff --git a/src/icludes/lib/formats/nascom_dsk.cpp b/src/lib/formats/nascom_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/nascom_dsk.cpp
rename to src/lib/formats/nascom_dsk.cpp
diff --git a/src/icludes/lib/formats/nascom_dsk.h b/src/lib/formats/nascom_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/nascom_dsk.h
rename to src/lib/formats/nascom_dsk.h
diff --git a/src/icludes/lib/formats/naslite_dsk.cpp b/src/lib/formats/naslite_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/naslite_dsk.cpp
rename to src/lib/formats/naslite_dsk.cpp
diff --git a/src/icludes/lib/formats/naslite_dsk.h b/src/lib/formats/naslite_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/naslite_dsk.h
rename to src/lib/formats/naslite_dsk.h
diff --git a/src/icludes/lib/formats/nes_dsk.cpp b/src/lib/formats/nes_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/nes_dsk.cpp
rename to src/lib/formats/nes_dsk.cpp
diff --git a/src/icludes/lib/formats/nes_dsk.h b/src/lib/formats/nes_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/nes_dsk.h
rename to src/lib/formats/nes_dsk.h
diff --git a/src/icludes/lib/formats/nfd_dsk.cpp b/src/lib/formats/nfd_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/nfd_dsk.cpp
rename to src/lib/formats/nfd_dsk.cpp
diff --git a/src/icludes/lib/formats/nfd_dsk.h b/src/lib/formats/nfd_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/nfd_dsk.h
rename to src/lib/formats/nfd_dsk.h
diff --git a/src/icludes/lib/formats/opd_dsk.cpp b/src/lib/formats/opd_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/opd_dsk.cpp
rename to src/lib/formats/opd_dsk.cpp
diff --git a/src/icludes/lib/formats/opd_dsk.h b/src/lib/formats/opd_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/opd_dsk.h
rename to src/lib/formats/opd_dsk.h
diff --git a/src/icludes/lib/formats/orao_cas.cpp b/src/lib/formats/orao_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/orao_cas.cpp
rename to src/lib/formats/orao_cas.cpp
diff --git a/src/icludes/lib/formats/orao_cas.h b/src/lib/formats/orao_cas.h
similarity index 100%
rename from src/icludes/lib/formats/orao_cas.h
rename to src/lib/formats/orao_cas.h
diff --git a/src/icludes/lib/formats/oric_dsk.cpp b/src/lib/formats/oric_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/oric_dsk.cpp
rename to src/lib/formats/oric_dsk.cpp
diff --git a/src/icludes/lib/formats/oric_dsk.h b/src/lib/formats/oric_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/oric_dsk.h
rename to src/lib/formats/oric_dsk.h
diff --git a/src/icludes/lib/formats/oric_tap.cpp b/src/lib/formats/oric_tap.cpp
similarity index 100%
rename from src/icludes/lib/formats/oric_tap.cpp
rename to src/lib/formats/oric_tap.cpp
diff --git a/src/icludes/lib/formats/oric_tap.h b/src/lib/formats/oric_tap.h
similarity index 100%
rename from src/icludes/lib/formats/oric_tap.h
rename to src/lib/formats/oric_tap.h
diff --git a/src/icludes/lib/formats/os9_dsk.cpp b/src/lib/formats/os9_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/os9_dsk.cpp
rename to src/lib/formats/os9_dsk.cpp
diff --git a/src/icludes/lib/formats/os9_dsk.h b/src/lib/formats/os9_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/os9_dsk.h
rename to src/lib/formats/os9_dsk.h
diff --git a/src/icludes/lib/formats/p2000t_cas.cpp b/src/lib/formats/p2000t_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/p2000t_cas.cpp
rename to src/lib/formats/p2000t_cas.cpp
diff --git a/src/icludes/lib/formats/p2000t_cas.h b/src/lib/formats/p2000t_cas.h
similarity index 100%
rename from src/icludes/lib/formats/p2000t_cas.h
rename to src/lib/formats/p2000t_cas.h
diff --git a/src/icludes/lib/formats/p6001_cas.cpp b/src/lib/formats/p6001_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/p6001_cas.cpp
rename to src/lib/formats/p6001_cas.cpp
diff --git a/src/icludes/lib/formats/p6001_cas.h b/src/lib/formats/p6001_cas.h
similarity index 100%
rename from src/icludes/lib/formats/p6001_cas.h
rename to src/lib/formats/p6001_cas.h
diff --git a/src/icludes/lib/formats/pasti_dsk.cpp b/src/lib/formats/pasti_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/pasti_dsk.cpp
rename to src/lib/formats/pasti_dsk.cpp
diff --git a/src/icludes/lib/formats/pasti_dsk.h b/src/lib/formats/pasti_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/pasti_dsk.h
rename to src/lib/formats/pasti_dsk.h
diff --git a/src/icludes/lib/formats/pc98_dsk.cpp b/src/lib/formats/pc98_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/pc98_dsk.cpp
rename to src/lib/formats/pc98_dsk.cpp
diff --git a/src/icludes/lib/formats/pc98_dsk.h b/src/lib/formats/pc98_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/pc98_dsk.h
rename to src/lib/formats/pc98_dsk.h
diff --git a/src/icludes/lib/formats/pc98fdi_dsk.cpp b/src/lib/formats/pc98fdi_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/pc98fdi_dsk.cpp
rename to src/lib/formats/pc98fdi_dsk.cpp
diff --git a/src/icludes/lib/formats/pc98fdi_dsk.h b/src/lib/formats/pc98fdi_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/pc98fdi_dsk.h
rename to src/lib/formats/pc98fdi_dsk.h
diff --git a/src/icludes/lib/formats/pc_dsk.cpp b/src/lib/formats/pc_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/pc_dsk.cpp
rename to src/lib/formats/pc_dsk.cpp
diff --git a/src/icludes/lib/formats/pc_dsk.h b/src/lib/formats/pc_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/pc_dsk.h
rename to src/lib/formats/pc_dsk.h
diff --git a/src/icludes/lib/formats/phc25_cas.cpp b/src/lib/formats/phc25_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/phc25_cas.cpp
rename to src/lib/formats/phc25_cas.cpp
diff --git a/src/icludes/lib/formats/phc25_cas.h b/src/lib/formats/phc25_cas.h
similarity index 100%
rename from src/icludes/lib/formats/phc25_cas.h
rename to src/lib/formats/phc25_cas.h
diff --git a/src/icludes/lib/formats/pk8020_dsk.cpp b/src/lib/formats/pk8020_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/pk8020_dsk.cpp
rename to src/lib/formats/pk8020_dsk.cpp
diff --git a/src/icludes/lib/formats/pk8020_dsk.h b/src/lib/formats/pk8020_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/pk8020_dsk.h
rename to src/lib/formats/pk8020_dsk.h
diff --git a/src/icludes/lib/formats/pmd_cas.cpp b/src/lib/formats/pmd_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/pmd_cas.cpp
rename to src/lib/formats/pmd_cas.cpp
diff --git a/src/icludes/lib/formats/pmd_cas.h b/src/lib/formats/pmd_cas.h
similarity index 100%
rename from src/icludes/lib/formats/pmd_cas.h
rename to src/lib/formats/pmd_cas.h
diff --git a/src/icludes/lib/formats/poly_dsk.cpp b/src/lib/formats/poly_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/poly_dsk.cpp
rename to src/lib/formats/poly_dsk.cpp
diff --git a/src/icludes/lib/formats/poly_dsk.h b/src/lib/formats/poly_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/poly_dsk.h
rename to src/lib/formats/poly_dsk.h
diff --git a/src/icludes/lib/formats/ppg_dsk.cpp b/src/lib/formats/ppg_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/ppg_dsk.cpp
rename to src/lib/formats/ppg_dsk.cpp
diff --git a/src/icludes/lib/formats/ppg_dsk.h b/src/lib/formats/ppg_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/ppg_dsk.h
rename to src/lib/formats/ppg_dsk.h
diff --git a/src/icludes/lib/formats/primoptp.cpp b/src/lib/formats/primoptp.cpp
similarity index 100%
rename from src/icludes/lib/formats/primoptp.cpp
rename to src/lib/formats/primoptp.cpp
diff --git a/src/icludes/lib/formats/primoptp.h b/src/lib/formats/primoptp.h
similarity index 100%
rename from src/icludes/lib/formats/primoptp.h
rename to src/lib/formats/primoptp.h
diff --git a/src/icludes/lib/formats/pyldin_dsk.cpp b/src/lib/formats/pyldin_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/pyldin_dsk.cpp
rename to src/lib/formats/pyldin_dsk.cpp
diff --git a/src/icludes/lib/formats/pyldin_dsk.h b/src/lib/formats/pyldin_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/pyldin_dsk.h
rename to src/lib/formats/pyldin_dsk.h
diff --git a/src/icludes/lib/formats/ql_dsk.cpp b/src/lib/formats/ql_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/ql_dsk.cpp
rename to src/lib/formats/ql_dsk.cpp
diff --git a/src/icludes/lib/formats/ql_dsk.h b/src/lib/formats/ql_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/ql_dsk.h
rename to src/lib/formats/ql_dsk.h
diff --git a/src/icludes/lib/formats/rc759_dsk.cpp b/src/lib/formats/rc759_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/rc759_dsk.cpp
rename to src/lib/formats/rc759_dsk.cpp
diff --git a/src/icludes/lib/formats/rc759_dsk.h b/src/lib/formats/rc759_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/rc759_dsk.h
rename to src/lib/formats/rc759_dsk.h
diff --git a/src/icludes/lib/formats/rk_cas.cpp b/src/lib/formats/rk_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/rk_cas.cpp
rename to src/lib/formats/rk_cas.cpp
diff --git a/src/icludes/lib/formats/rk_cas.h b/src/lib/formats/rk_cas.h
similarity index 100%
rename from src/icludes/lib/formats/rk_cas.h
rename to src/lib/formats/rk_cas.h
diff --git a/src/icludes/lib/formats/rpk.cpp b/src/lib/formats/rpk.cpp
similarity index 100%
rename from src/icludes/lib/formats/rpk.cpp
rename to src/lib/formats/rpk.cpp
diff --git a/src/icludes/lib/formats/rpk.h b/src/lib/formats/rpk.h
similarity index 100%
rename from src/icludes/lib/formats/rpk.h
rename to src/lib/formats/rpk.h
diff --git a/src/icludes/lib/formats/rx50_dsk.cpp b/src/lib/formats/rx50_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/rx50_dsk.cpp
rename to src/lib/formats/rx50_dsk.cpp
diff --git a/src/icludes/lib/formats/rx50_dsk.h b/src/lib/formats/rx50_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/rx50_dsk.h
rename to src/lib/formats/rx50_dsk.h
diff --git a/src/icludes/lib/formats/sc3000_bit.cpp b/src/lib/formats/sc3000_bit.cpp
similarity index 100%
rename from src/icludes/lib/formats/sc3000_bit.cpp
rename to src/lib/formats/sc3000_bit.cpp
diff --git a/src/icludes/lib/formats/sc3000_bit.h b/src/lib/formats/sc3000_bit.h
similarity index 100%
rename from src/icludes/lib/formats/sc3000_bit.h
rename to src/lib/formats/sc3000_bit.h
diff --git a/src/icludes/lib/formats/sdd_dsk.cpp b/src/lib/formats/sdd_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/sdd_dsk.cpp
rename to src/lib/formats/sdd_dsk.cpp
diff --git a/src/icludes/lib/formats/sdd_dsk.h b/src/lib/formats/sdd_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/sdd_dsk.h
rename to src/lib/formats/sdd_dsk.h
diff --git a/src/icludes/lib/formats/sdf_dsk.cpp b/src/lib/formats/sdf_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/sdf_dsk.cpp
rename to src/lib/formats/sdf_dsk.cpp
diff --git a/src/icludes/lib/formats/sdf_dsk.h b/src/lib/formats/sdf_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/sdf_dsk.h
rename to src/lib/formats/sdf_dsk.h
diff --git a/src/icludes/lib/formats/sf7000_dsk.cpp b/src/lib/formats/sf7000_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/sf7000_dsk.cpp
rename to src/lib/formats/sf7000_dsk.cpp
diff --git a/src/icludes/lib/formats/sf7000_dsk.h b/src/lib/formats/sf7000_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/sf7000_dsk.h
rename to src/lib/formats/sf7000_dsk.h
diff --git a/src/icludes/lib/formats/smx_dsk.cpp b/src/lib/formats/smx_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/smx_dsk.cpp
rename to src/lib/formats/smx_dsk.cpp
diff --git a/src/icludes/lib/formats/smx_dsk.h b/src/lib/formats/smx_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/smx_dsk.h
rename to src/lib/formats/smx_dsk.h
diff --git a/src/icludes/lib/formats/sol_cas.cpp b/src/lib/formats/sol_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/sol_cas.cpp
rename to src/lib/formats/sol_cas.cpp
diff --git a/src/icludes/lib/formats/sol_cas.h b/src/lib/formats/sol_cas.h
similarity index 100%
rename from src/icludes/lib/formats/sol_cas.h
rename to src/lib/formats/sol_cas.h
diff --git a/src/icludes/lib/formats/sorc_cas.cpp b/src/lib/formats/sorc_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/sorc_cas.cpp
rename to src/lib/formats/sorc_cas.cpp
diff --git a/src/icludes/lib/formats/sorc_cas.h b/src/lib/formats/sorc_cas.h
similarity index 100%
rename from src/icludes/lib/formats/sorc_cas.h
rename to src/lib/formats/sorc_cas.h
diff --git a/src/icludes/lib/formats/sorc_dsk.cpp b/src/lib/formats/sorc_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/sorc_dsk.cpp
rename to src/lib/formats/sorc_dsk.cpp
diff --git a/src/icludes/lib/formats/sorc_dsk.h b/src/lib/formats/sorc_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/sorc_dsk.h
rename to src/lib/formats/sorc_dsk.h
diff --git a/src/icludes/lib/formats/sord_cas.cpp b/src/lib/formats/sord_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/sord_cas.cpp
rename to src/lib/formats/sord_cas.cpp
diff --git a/src/icludes/lib/formats/sord_cas.h b/src/lib/formats/sord_cas.h
similarity index 100%
rename from src/icludes/lib/formats/sord_cas.h
rename to src/lib/formats/sord_cas.h
diff --git a/src/icludes/lib/formats/spc1000_cas.cpp b/src/lib/formats/spc1000_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/spc1000_cas.cpp
rename to src/lib/formats/spc1000_cas.cpp
diff --git a/src/icludes/lib/formats/spc1000_cas.h b/src/lib/formats/spc1000_cas.h
similarity index 100%
rename from src/icludes/lib/formats/spc1000_cas.h
rename to src/lib/formats/spc1000_cas.h
diff --git a/src/icludes/lib/formats/st_dsk.cpp b/src/lib/formats/st_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/st_dsk.cpp
rename to src/lib/formats/st_dsk.cpp
diff --git a/src/icludes/lib/formats/st_dsk.h b/src/lib/formats/st_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/st_dsk.h
rename to src/lib/formats/st_dsk.h
diff --git a/src/icludes/lib/formats/svi_cas.cpp b/src/lib/formats/svi_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/svi_cas.cpp
rename to src/lib/formats/svi_cas.cpp
diff --git a/src/icludes/lib/formats/svi_cas.h b/src/lib/formats/svi_cas.h
similarity index 100%
rename from src/icludes/lib/formats/svi_cas.h
rename to src/lib/formats/svi_cas.h
diff --git a/src/icludes/lib/formats/svi_dsk.cpp b/src/lib/formats/svi_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/svi_dsk.cpp
rename to src/lib/formats/svi_dsk.cpp
diff --git a/src/icludes/lib/formats/svi_dsk.h b/src/lib/formats/svi_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/svi_dsk.h
rename to src/lib/formats/svi_dsk.h
diff --git a/src/icludes/lib/formats/swd_dsk.cpp b/src/lib/formats/swd_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/swd_dsk.cpp
rename to src/lib/formats/swd_dsk.cpp
diff --git a/src/icludes/lib/formats/swd_dsk.h b/src/lib/formats/swd_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/swd_dsk.h
rename to src/lib/formats/swd_dsk.h
diff --git a/src/icludes/lib/formats/tandy2k_dsk.cpp b/src/lib/formats/tandy2k_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/tandy2k_dsk.cpp
rename to src/lib/formats/tandy2k_dsk.cpp
diff --git a/src/icludes/lib/formats/tandy2k_dsk.h b/src/lib/formats/tandy2k_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/tandy2k_dsk.h
rename to src/lib/formats/tandy2k_dsk.h
diff --git a/src/icludes/lib/formats/td0_dsk.cpp b/src/lib/formats/td0_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/td0_dsk.cpp
rename to src/lib/formats/td0_dsk.cpp
diff --git a/src/icludes/lib/formats/td0_dsk.h b/src/lib/formats/td0_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/td0_dsk.h
rename to src/lib/formats/td0_dsk.h
diff --git a/src/icludes/lib/formats/thom_cas.cpp b/src/lib/formats/thom_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/thom_cas.cpp
rename to src/lib/formats/thom_cas.cpp
diff --git a/src/icludes/lib/formats/thom_cas.h b/src/lib/formats/thom_cas.h
similarity index 100%
rename from src/icludes/lib/formats/thom_cas.h
rename to src/lib/formats/thom_cas.h
diff --git a/src/icludes/lib/formats/thom_dsk.cpp b/src/lib/formats/thom_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/thom_dsk.cpp
rename to src/lib/formats/thom_dsk.cpp
diff --git a/src/icludes/lib/formats/thom_dsk.h b/src/lib/formats/thom_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/thom_dsk.h
rename to src/lib/formats/thom_dsk.h
diff --git a/src/icludes/lib/formats/ti99_dsk.cpp b/src/lib/formats/ti99_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/ti99_dsk.cpp
rename to src/lib/formats/ti99_dsk.cpp
diff --git a/src/icludes/lib/formats/ti99_dsk.h b/src/lib/formats/ti99_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/ti99_dsk.h
rename to src/lib/formats/ti99_dsk.h
diff --git a/src/icludes/lib/formats/tiki100_dsk.cpp b/src/lib/formats/tiki100_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/tiki100_dsk.cpp
rename to src/lib/formats/tiki100_dsk.cpp
diff --git a/src/icludes/lib/formats/tiki100_dsk.h b/src/lib/formats/tiki100_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/tiki100_dsk.h
rename to src/lib/formats/tiki100_dsk.h
diff --git a/src/icludes/lib/formats/trd_dsk.cpp b/src/lib/formats/trd_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/trd_dsk.cpp
rename to src/lib/formats/trd_dsk.cpp
diff --git a/src/icludes/lib/formats/trd_dsk.h b/src/lib/formats/trd_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/trd_dsk.h
rename to src/lib/formats/trd_dsk.h
diff --git a/src/icludes/lib/formats/trs80_dsk.cpp b/src/lib/formats/trs80_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/trs80_dsk.cpp
rename to src/lib/formats/trs80_dsk.cpp
diff --git a/src/icludes/lib/formats/trs80_dsk.h b/src/lib/formats/trs80_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/trs80_dsk.h
rename to src/lib/formats/trs80_dsk.h
diff --git a/src/icludes/lib/formats/trs_cas.cpp b/src/lib/formats/trs_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/trs_cas.cpp
rename to src/lib/formats/trs_cas.cpp
diff --git a/src/icludes/lib/formats/trs_cas.h b/src/lib/formats/trs_cas.h
similarity index 100%
rename from src/icludes/lib/formats/trs_cas.h
rename to src/lib/formats/trs_cas.h
diff --git a/src/icludes/lib/formats/tvc_cas.cpp b/src/lib/formats/tvc_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/tvc_cas.cpp
rename to src/lib/formats/tvc_cas.cpp
diff --git a/src/icludes/lib/formats/tvc_cas.h b/src/lib/formats/tvc_cas.h
similarity index 100%
rename from src/icludes/lib/formats/tvc_cas.h
rename to src/lib/formats/tvc_cas.h
diff --git a/src/icludes/lib/formats/tvc_dsk.cpp b/src/lib/formats/tvc_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/tvc_dsk.cpp
rename to src/lib/formats/tvc_dsk.cpp
diff --git a/src/icludes/lib/formats/tvc_dsk.h b/src/lib/formats/tvc_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/tvc_dsk.h
rename to src/lib/formats/tvc_dsk.h
diff --git a/src/icludes/lib/formats/tzx_cas.cpp b/src/lib/formats/tzx_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/tzx_cas.cpp
rename to src/lib/formats/tzx_cas.cpp
diff --git a/src/icludes/lib/formats/tzx_cas.h b/src/lib/formats/tzx_cas.h
similarity index 100%
rename from src/icludes/lib/formats/tzx_cas.h
rename to src/lib/formats/tzx_cas.h
diff --git a/src/icludes/lib/formats/uef_cas.cpp b/src/lib/formats/uef_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/uef_cas.cpp
rename to src/lib/formats/uef_cas.cpp
diff --git a/src/icludes/lib/formats/uef_cas.h b/src/lib/formats/uef_cas.h
similarity index 100%
rename from src/icludes/lib/formats/uef_cas.h
rename to src/lib/formats/uef_cas.h
diff --git a/src/icludes/lib/formats/uniflex_dsk.cpp b/src/lib/formats/uniflex_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/uniflex_dsk.cpp
rename to src/lib/formats/uniflex_dsk.cpp
diff --git a/src/icludes/lib/formats/uniflex_dsk.h b/src/lib/formats/uniflex_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/uniflex_dsk.h
rename to src/lib/formats/uniflex_dsk.h
diff --git a/src/icludes/lib/formats/upd765_dsk.cpp b/src/lib/formats/upd765_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/upd765_dsk.cpp
rename to src/lib/formats/upd765_dsk.cpp
diff --git a/src/icludes/lib/formats/upd765_dsk.h b/src/lib/formats/upd765_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/upd765_dsk.h
rename to src/lib/formats/upd765_dsk.h
diff --git a/src/icludes/lib/formats/vdk_dsk.cpp b/src/lib/formats/vdk_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/vdk_dsk.cpp
rename to src/lib/formats/vdk_dsk.cpp
diff --git a/src/icludes/lib/formats/vdk_dsk.h b/src/lib/formats/vdk_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/vdk_dsk.h
rename to src/lib/formats/vdk_dsk.h
diff --git a/src/icludes/lib/formats/vector06_dsk.cpp b/src/lib/formats/vector06_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/vector06_dsk.cpp
rename to src/lib/formats/vector06_dsk.cpp
diff --git a/src/icludes/lib/formats/vector06_dsk.h b/src/lib/formats/vector06_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/vector06_dsk.h
rename to src/lib/formats/vector06_dsk.h
diff --git a/src/icludes/lib/formats/vg5k_cas.cpp b/src/lib/formats/vg5k_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/vg5k_cas.cpp
rename to src/lib/formats/vg5k_cas.cpp
diff --git a/src/icludes/lib/formats/vg5k_cas.h b/src/lib/formats/vg5k_cas.h
similarity index 100%
rename from src/icludes/lib/formats/vg5k_cas.h
rename to src/lib/formats/vg5k_cas.h
diff --git a/src/icludes/lib/formats/victor9k_dsk.cpp b/src/lib/formats/victor9k_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/victor9k_dsk.cpp
rename to src/lib/formats/victor9k_dsk.cpp
diff --git a/src/icludes/lib/formats/victor9k_dsk.h b/src/lib/formats/victor9k_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/victor9k_dsk.h
rename to src/lib/formats/victor9k_dsk.h
diff --git a/src/icludes/lib/formats/vt_cas.cpp b/src/lib/formats/vt_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/vt_cas.cpp
rename to src/lib/formats/vt_cas.cpp
diff --git a/src/icludes/lib/formats/vt_cas.h b/src/lib/formats/vt_cas.h
similarity index 100%
rename from src/icludes/lib/formats/vt_cas.h
rename to src/lib/formats/vt_cas.h
diff --git a/src/icludes/lib/formats/vt_dsk.cpp b/src/lib/formats/vt_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/vt_dsk.cpp
rename to src/lib/formats/vt_dsk.cpp
diff --git a/src/icludes/lib/formats/vt_dsk.h b/src/lib/formats/vt_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/vt_dsk.h
rename to src/lib/formats/vt_dsk.h
diff --git a/src/icludes/lib/formats/wavfile.cpp b/src/lib/formats/wavfile.cpp
similarity index 100%
rename from src/icludes/lib/formats/wavfile.cpp
rename to src/lib/formats/wavfile.cpp
diff --git a/src/icludes/lib/formats/wavfile.h b/src/lib/formats/wavfile.h
similarity index 100%
rename from src/icludes/lib/formats/wavfile.h
rename to src/lib/formats/wavfile.h
diff --git a/src/icludes/lib/formats/wd177x_dsk.cpp b/src/lib/formats/wd177x_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/wd177x_dsk.cpp
rename to src/lib/formats/wd177x_dsk.cpp
diff --git a/src/icludes/lib/formats/wd177x_dsk.h b/src/lib/formats/wd177x_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/wd177x_dsk.h
rename to src/lib/formats/wd177x_dsk.h
diff --git a/src/icludes/lib/formats/x07_cas.cpp b/src/lib/formats/x07_cas.cpp
similarity index 100%
rename from src/icludes/lib/formats/x07_cas.cpp
rename to src/lib/formats/x07_cas.cpp
diff --git a/src/icludes/lib/formats/x07_cas.h b/src/lib/formats/x07_cas.h
similarity index 100%
rename from src/icludes/lib/formats/x07_cas.h
rename to src/lib/formats/x07_cas.h
diff --git a/src/icludes/lib/formats/x1_tap.cpp b/src/lib/formats/x1_tap.cpp
similarity index 100%
rename from src/icludes/lib/formats/x1_tap.cpp
rename to src/lib/formats/x1_tap.cpp
diff --git a/src/icludes/lib/formats/x1_tap.h b/src/lib/formats/x1_tap.h
similarity index 100%
rename from src/icludes/lib/formats/x1_tap.h
rename to src/lib/formats/x1_tap.h
diff --git a/src/icludes/lib/formats/xdf_dsk.cpp b/src/lib/formats/xdf_dsk.cpp
similarity index 100%
rename from src/icludes/lib/formats/xdf_dsk.cpp
rename to src/lib/formats/xdf_dsk.cpp
diff --git a/src/icludes/lib/formats/xdf_dsk.h b/src/lib/formats/xdf_dsk.h
similarity index 100%
rename from src/icludes/lib/formats/xdf_dsk.h
rename to src/lib/formats/xdf_dsk.h
diff --git a/src/icludes/lib/formats/zx81_p.cpp b/src/lib/formats/zx81_p.cpp
similarity index 100%
rename from src/icludes/lib/formats/zx81_p.cpp
rename to src/lib/formats/zx81_p.cpp
diff --git a/src/icludes/lib/formats/zx81_p.h b/src/lib/formats/zx81_p.h
similarity index 100%
rename from src/icludes/lib/formats/zx81_p.h
rename to src/lib/formats/zx81_p.h
diff --git a/src/icludes/lib/netlist/.clang-tidy b/src/lib/netlist/.clang-tidy
similarity index 100%
rename from src/icludes/lib/netlist/.clang-tidy
rename to src/lib/netlist/.clang-tidy
diff --git a/src/icludes/lib/netlist/.gitignore b/src/lib/netlist/.gitignore
similarity index 100%
rename from src/icludes/lib/netlist/.gitignore
rename to src/lib/netlist/.gitignore
diff --git a/src/icludes/lib/netlist/adding_devices.md b/src/lib/netlist/adding_devices.md
similarity index 100%
rename from src/icludes/lib/netlist/adding_devices.md
rename to src/lib/netlist/adding_devices.md
diff --git a/src/icludes/lib/netlist/analog/nld_bjt.cpp b/src/lib/netlist/analog/nld_bjt.cpp
similarity index 100%
rename from src/icludes/lib/netlist/analog/nld_bjt.cpp
rename to src/lib/netlist/analog/nld_bjt.cpp
diff --git a/src/icludes/lib/netlist/analog/nld_generic_models.h b/src/lib/netlist/analog/nld_generic_models.h
similarity index 100%
rename from src/icludes/lib/netlist/analog/nld_generic_models.h
rename to src/lib/netlist/analog/nld_generic_models.h
diff --git a/src/icludes/lib/netlist/analog/nld_mosfet.cpp b/src/lib/netlist/analog/nld_mosfet.cpp
similarity index 100%
rename from src/icludes/lib/netlist/analog/nld_mosfet.cpp
rename to src/lib/netlist/analog/nld_mosfet.cpp
diff --git a/src/icludes/lib/netlist/analog/nld_opamps.cpp b/src/lib/netlist/analog/nld_opamps.cpp
similarity index 100%
rename from src/icludes/lib/netlist/analog/nld_opamps.cpp
rename to src/lib/netlist/analog/nld_opamps.cpp
diff --git a/src/icludes/lib/netlist/analog/nld_switches.cpp b/src/lib/netlist/analog/nld_switches.cpp
similarity index 100%
rename from src/icludes/lib/netlist/analog/nld_switches.cpp
rename to src/lib/netlist/analog/nld_switches.cpp
diff --git a/src/icludes/lib/netlist/analog/nlid_fourterm.cpp b/src/lib/netlist/analog/nlid_fourterm.cpp
similarity index 100%
rename from src/icludes/lib/netlist/analog/nlid_fourterm.cpp
rename to src/lib/netlist/analog/nlid_fourterm.cpp
diff --git a/src/icludes/lib/netlist/analog/nlid_fourterm.h b/src/lib/netlist/analog/nlid_fourterm.h
similarity index 100%
rename from src/icludes/lib/netlist/analog/nlid_fourterm.h
rename to src/lib/netlist/analog/nlid_fourterm.h
diff --git a/src/icludes/lib/netlist/analog/nlid_twoterm.cpp b/src/lib/netlist/analog/nlid_twoterm.cpp
similarity index 100%
rename from src/icludes/lib/netlist/analog/nlid_twoterm.cpp
rename to src/lib/netlist/analog/nlid_twoterm.cpp
diff --git a/src/icludes/lib/netlist/analog/nlid_twoterm.h b/src/lib/netlist/analog/nlid_twoterm.h
similarity index 100%
rename from src/icludes/lib/netlist/analog/nlid_twoterm.h
rename to src/lib/netlist/analog/nlid_twoterm.h
diff --git a/src/icludes/lib/netlist/build/create_devinc.py b/src/lib/netlist/build/create_devinc.py
similarity index 100%
rename from src/icludes/lib/netlist/build/create_devinc.py
rename to src/lib/netlist/build/create_devinc.py
diff --git a/src/icludes/lib/netlist/build/create_lib_entries.py b/src/lib/netlist/build/create_lib_entries.py
similarity index 100%
rename from src/icludes/lib/netlist/build/create_lib_entries.py
rename to src/lib/netlist/build/create_lib_entries.py
diff --git a/src/icludes/lib/netlist/build/create_modules.py b/src/lib/netlist/build/create_modules.py
similarity index 100%
rename from src/icludes/lib/netlist/build/create_modules.py
rename to src/lib/netlist/build/create_modules.py
diff --git a/src/icludes/lib/netlist/build/doxygen.conf b/src/lib/netlist/build/doxygen.conf
similarity index 100%
rename from src/icludes/lib/netlist/build/doxygen.conf
rename to src/lib/netlist/build/doxygen.conf
diff --git a/src/icludes/lib/netlist/build/makefile b/src/lib/netlist/build/makefile
similarity index 100%
rename from src/icludes/lib/netlist/build/makefile
rename to src/lib/netlist/build/makefile
diff --git a/src/icludes/lib/netlist/build/nltool.help2man b/src/lib/netlist/build/nltool.help2man
similarity index 100%
rename from src/icludes/lib/netlist/build/nltool.help2man
rename to src/lib/netlist/build/nltool.help2man
diff --git a/src/icludes/lib/netlist/build/nlwav.help2man b/src/lib/netlist/build/nlwav.help2man
similarity index 100%
rename from src/icludes/lib/netlist/build/nlwav.help2man
rename to src/lib/netlist/build/nlwav.help2man
diff --git a/src/icludes/lib/netlist/buildVS/netlist.sln b/src/lib/netlist/buildVS/netlist.sln
similarity index 100%
rename from src/icludes/lib/netlist/buildVS/netlist.sln
rename to src/lib/netlist/buildVS/netlist.sln
diff --git a/src/icludes/lib/netlist/buildVS/netlistlib.vcxproj b/src/lib/netlist/buildVS/netlistlib.vcxproj
similarity index 100%
rename from src/icludes/lib/netlist/buildVS/netlistlib.vcxproj
rename to src/lib/netlist/buildVS/netlistlib.vcxproj
diff --git a/src/icludes/lib/netlist/buildVS/netlistlib.vcxproj.filters b/src/lib/netlist/buildVS/netlistlib.vcxproj.filters
similarity index 100%
rename from src/icludes/lib/netlist/buildVS/netlistlib.vcxproj.filters
rename to src/lib/netlist/buildVS/netlistlib.vcxproj.filters
diff --git a/src/icludes/lib/netlist/buildVS/nltool.vcxproj b/src/lib/netlist/buildVS/nltool.vcxproj
similarity index 100%
rename from src/icludes/lib/netlist/buildVS/nltool.vcxproj
rename to src/lib/netlist/buildVS/nltool.vcxproj
diff --git a/src/icludes/lib/netlist/buildVS/nltool.vcxproj.filters b/src/lib/netlist/buildVS/nltool.vcxproj.filters
similarity index 100%
rename from src/icludes/lib/netlist/buildVS/nltool.vcxproj.filters
rename to src/lib/netlist/buildVS/nltool.vcxproj.filters
diff --git a/src/icludes/lib/netlist/buildVS/nlwav.vcxproj b/src/lib/netlist/buildVS/nlwav.vcxproj
similarity index 100%
rename from src/icludes/lib/netlist/buildVS/nlwav.vcxproj
rename to src/lib/netlist/buildVS/nlwav.vcxproj
diff --git a/src/icludes/lib/netlist/buildVS/nlwav.vcxproj.filters b/src/lib/netlist/buildVS/nlwav.vcxproj.filters
similarity index 100%
rename from src/icludes/lib/netlist/buildVS/nlwav.vcxproj.filters
rename to src/lib/netlist/buildVS/nlwav.vcxproj.filters
diff --git a/src/icludes/lib/netlist/core/analog.h b/src/lib/netlist/core/analog.h
similarity index 100%
rename from src/icludes/lib/netlist/core/analog.h
rename to src/lib/netlist/core/analog.h
diff --git a/src/icludes/lib/netlist/core/base_objects.h b/src/lib/netlist/core/base_objects.h
similarity index 100%
rename from src/icludes/lib/netlist/core/base_objects.h
rename to src/lib/netlist/core/base_objects.h
diff --git a/src/icludes/lib/netlist/core/core_device.h b/src/lib/netlist/core/core_device.h
similarity index 100%
rename from src/icludes/lib/netlist/core/core_device.h
rename to src/lib/netlist/core/core_device.h
diff --git a/src/icludes/lib/netlist/core/device.h b/src/lib/netlist/core/device.h
similarity index 100%
rename from src/icludes/lib/netlist/core/device.h
rename to src/lib/netlist/core/device.h
diff --git a/src/icludes/lib/netlist/core/device_macros.h b/src/lib/netlist/core/device_macros.h
similarity index 100%
rename from src/icludes/lib/netlist/core/device_macros.h
rename to src/lib/netlist/core/device_macros.h
diff --git a/src/icludes/lib/netlist/core/devices.h b/src/lib/netlist/core/devices.h
similarity index 100%
rename from src/icludes/lib/netlist/core/devices.h
rename to src/lib/netlist/core/devices.h
diff --git a/src/icludes/lib/netlist/core/exec.h b/src/lib/netlist/core/exec.h
similarity index 100%
rename from src/icludes/lib/netlist/core/exec.h
rename to src/lib/netlist/core/exec.h
diff --git a/src/icludes/lib/netlist/core/logic.h b/src/lib/netlist/core/logic.h
similarity index 100%
rename from src/icludes/lib/netlist/core/logic.h
rename to src/lib/netlist/core/logic.h
diff --git a/src/icludes/lib/netlist/core/logic_family.h b/src/lib/netlist/core/logic_family.h
similarity index 100%
rename from src/icludes/lib/netlist/core/logic_family.h
rename to src/lib/netlist/core/logic_family.h
diff --git a/src/icludes/lib/netlist/core/netlist_state.h b/src/lib/netlist/core/netlist_state.h
similarity index 100%
rename from src/icludes/lib/netlist/core/netlist_state.h
rename to src/lib/netlist/core/netlist_state.h
diff --git a/src/icludes/lib/netlist/core/nets.h b/src/lib/netlist/core/nets.h
similarity index 100%
rename from src/icludes/lib/netlist/core/nets.h
rename to src/lib/netlist/core/nets.h
diff --git a/src/icludes/lib/netlist/core/object_array.h b/src/lib/netlist/core/object_array.h
similarity index 100%
rename from src/icludes/lib/netlist/core/object_array.h
rename to src/lib/netlist/core/object_array.h
diff --git a/src/icludes/lib/netlist/core/param.h b/src/lib/netlist/core/param.h
similarity index 100%
rename from src/icludes/lib/netlist/core/param.h
rename to src/lib/netlist/core/param.h
diff --git a/src/icludes/lib/netlist/core/queue.h b/src/lib/netlist/core/queue.h
similarity index 100%
rename from src/icludes/lib/netlist/core/queue.h
rename to src/lib/netlist/core/queue.h
diff --git a/src/icludes/lib/netlist/core/setup.h b/src/lib/netlist/core/setup.h
similarity index 100%
rename from src/icludes/lib/netlist/core/setup.h
rename to src/lib/netlist/core/setup.h
diff --git a/src/icludes/lib/netlist/core/state_var.h b/src/lib/netlist/core/state_var.h
similarity index 100%
rename from src/icludes/lib/netlist/core/state_var.h
rename to src/lib/netlist/core/state_var.h
diff --git a/src/icludes/lib/netlist/devices/net_lib.cpp b/src/lib/netlist/devices/net_lib.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/net_lib.cpp
rename to src/lib/netlist/devices/net_lib.cpp
diff --git a/src/icludes/lib/netlist/devices/net_lib.h b/src/lib/netlist/devices/net_lib.h
similarity index 100%
rename from src/icludes/lib/netlist/devices/net_lib.h
rename to src/lib/netlist/devices/net_lib.h
diff --git a/src/icludes/lib/netlist/devices/nld_2102a.cpp b/src/lib/netlist/devices/nld_2102a.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_2102a.cpp
rename to src/lib/netlist/devices/nld_2102a.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_4006.cpp b/src/lib/netlist/devices/nld_4006.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_4006.cpp
rename to src/lib/netlist/devices/nld_4006.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_4013.cpp b/src/lib/netlist/devices/nld_4013.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_4013.cpp
rename to src/lib/netlist/devices/nld_4013.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_4017.cpp b/src/lib/netlist/devices/nld_4017.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_4017.cpp
rename to src/lib/netlist/devices/nld_4017.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_4020.cpp b/src/lib/netlist/devices/nld_4020.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_4020.cpp
rename to src/lib/netlist/devices/nld_4020.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_4029.cpp b/src/lib/netlist/devices/nld_4029.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_4029.cpp
rename to src/lib/netlist/devices/nld_4029.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_4042.cpp b/src/lib/netlist/devices/nld_4042.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_4042.cpp
rename to src/lib/netlist/devices/nld_4042.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_4053.cpp b/src/lib/netlist/devices/nld_4053.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_4053.cpp
rename to src/lib/netlist/devices/nld_4053.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_4066.cpp b/src/lib/netlist/devices/nld_4066.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_4066.cpp
rename to src/lib/netlist/devices/nld_4066.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_4076.cpp b/src/lib/netlist/devices/nld_4076.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_4076.cpp
rename to src/lib/netlist/devices/nld_4076.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_4316.cpp b/src/lib/netlist/devices/nld_4316.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_4316.cpp
rename to src/lib/netlist/devices/nld_4316.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_74107.cpp b/src/lib/netlist/devices/nld_74107.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_74107.cpp
rename to src/lib/netlist/devices/nld_74107.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_74113.cpp b/src/lib/netlist/devices/nld_74113.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_74113.cpp
rename to src/lib/netlist/devices/nld_74113.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_74123.cpp b/src/lib/netlist/devices/nld_74123.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_74123.cpp
rename to src/lib/netlist/devices/nld_74123.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_74125.cpp b/src/lib/netlist/devices/nld_74125.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_74125.cpp
rename to src/lib/netlist/devices/nld_74125.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_74153.cpp b/src/lib/netlist/devices/nld_74153.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_74153.cpp
rename to src/lib/netlist/devices/nld_74153.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_74161.cpp b/src/lib/netlist/devices/nld_74161.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_74161.cpp
rename to src/lib/netlist/devices/nld_74161.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_74163.cpp b/src/lib/netlist/devices/nld_74163.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_74163.cpp
rename to src/lib/netlist/devices/nld_74163.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_74164.cpp b/src/lib/netlist/devices/nld_74164.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_74164.cpp
rename to src/lib/netlist/devices/nld_74164.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_74165.cpp b/src/lib/netlist/devices/nld_74165.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_74165.cpp
rename to src/lib/netlist/devices/nld_74165.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_74166.cpp b/src/lib/netlist/devices/nld_74166.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_74166.cpp
rename to src/lib/netlist/devices/nld_74166.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_74174.cpp b/src/lib/netlist/devices/nld_74174.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_74174.cpp
rename to src/lib/netlist/devices/nld_74174.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_74175.cpp b/src/lib/netlist/devices/nld_74175.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_74175.cpp
rename to src/lib/netlist/devices/nld_74175.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_74192.cpp b/src/lib/netlist/devices/nld_74192.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_74192.cpp
rename to src/lib/netlist/devices/nld_74192.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_74193.cpp b/src/lib/netlist/devices/nld_74193.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_74193.cpp
rename to src/lib/netlist/devices/nld_74193.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_74194.cpp b/src/lib/netlist/devices/nld_74194.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_74194.cpp
rename to src/lib/netlist/devices/nld_74194.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_74365.cpp b/src/lib/netlist/devices/nld_74365.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_74365.cpp
rename to src/lib/netlist/devices/nld_74365.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_74377.cpp b/src/lib/netlist/devices/nld_74377.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_74377.cpp
rename to src/lib/netlist/devices/nld_74377.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_74393.cpp b/src/lib/netlist/devices/nld_74393.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_74393.cpp
rename to src/lib/netlist/devices/nld_74393.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_7448.cpp b/src/lib/netlist/devices/nld_7448.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_7448.cpp
rename to src/lib/netlist/devices/nld_7448.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_7450.cpp b/src/lib/netlist/devices/nld_7450.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_7450.cpp
rename to src/lib/netlist/devices/nld_7450.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_7473.cpp b/src/lib/netlist/devices/nld_7473.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_7473.cpp
rename to src/lib/netlist/devices/nld_7473.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_7474.cpp b/src/lib/netlist/devices/nld_7474.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_7474.cpp
rename to src/lib/netlist/devices/nld_7474.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_7475.cpp b/src/lib/netlist/devices/nld_7475.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_7475.cpp
rename to src/lib/netlist/devices/nld_7475.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_7483.cpp b/src/lib/netlist/devices/nld_7483.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_7483.cpp
rename to src/lib/netlist/devices/nld_7483.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_7485.cpp b/src/lib/netlist/devices/nld_7485.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_7485.cpp
rename to src/lib/netlist/devices/nld_7485.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_7490.cpp b/src/lib/netlist/devices/nld_7490.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_7490.cpp
rename to src/lib/netlist/devices/nld_7490.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_7492.cpp b/src/lib/netlist/devices/nld_7492.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_7492.cpp
rename to src/lib/netlist/devices/nld_7492.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_7493.cpp b/src/lib/netlist/devices/nld_7493.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_7493.cpp
rename to src/lib/netlist/devices/nld_7493.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_7497.cpp b/src/lib/netlist/devices/nld_7497.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_7497.cpp
rename to src/lib/netlist/devices/nld_7497.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_74ls629.cpp b/src/lib/netlist/devices/nld_74ls629.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_74ls629.cpp
rename to src/lib/netlist/devices/nld_74ls629.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_8277.cpp b/src/lib/netlist/devices/nld_8277.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_8277.cpp
rename to src/lib/netlist/devices/nld_8277.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_82s115.cpp b/src/lib/netlist/devices/nld_82s115.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_82s115.cpp
rename to src/lib/netlist/devices/nld_82s115.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_82s16.cpp b/src/lib/netlist/devices/nld_82s16.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_82s16.cpp
rename to src/lib/netlist/devices/nld_82s16.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_9310.cpp b/src/lib/netlist/devices/nld_9310.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_9310.cpp
rename to src/lib/netlist/devices/nld_9310.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_9316.cpp b/src/lib/netlist/devices/nld_9316.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_9316.cpp
rename to src/lib/netlist/devices/nld_9316.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_9316_base.hxx b/src/lib/netlist/devices/nld_9316_base.hxx
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_9316_base.hxx
rename to src/lib/netlist/devices/nld_9316_base.hxx
diff --git a/src/icludes/lib/netlist/devices/nld_9321.cpp b/src/lib/netlist/devices/nld_9321.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_9321.cpp
rename to src/lib/netlist/devices/nld_9321.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_9322.cpp b/src/lib/netlist/devices/nld_9322.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_9322.cpp
rename to src/lib/netlist/devices/nld_9322.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_am2847.cpp b/src/lib/netlist/devices/nld_am2847.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_am2847.cpp
rename to src/lib/netlist/devices/nld_am2847.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_dm9314.cpp b/src/lib/netlist/devices/nld_dm9314.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_dm9314.cpp
rename to src/lib/netlist/devices/nld_dm9314.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_dm9334.cpp b/src/lib/netlist/devices/nld_dm9334.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_dm9334.cpp
rename to src/lib/netlist/devices/nld_dm9334.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_legacy.cpp b/src/lib/netlist/devices/nld_legacy.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_legacy.cpp
rename to src/lib/netlist/devices/nld_legacy.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_log.cpp b/src/lib/netlist/devices/nld_log.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_log.cpp
rename to src/lib/netlist/devices/nld_log.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_mm5837.cpp b/src/lib/netlist/devices/nld_mm5837.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_mm5837.cpp
rename to src/lib/netlist/devices/nld_mm5837.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_ne555.cpp b/src/lib/netlist/devices/nld_ne555.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_ne555.cpp
rename to src/lib/netlist/devices/nld_ne555.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_r2r_dac.cpp b/src/lib/netlist/devices/nld_r2r_dac.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_r2r_dac.cpp
rename to src/lib/netlist/devices/nld_r2r_dac.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_roms.cpp b/src/lib/netlist/devices/nld_roms.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_roms.cpp
rename to src/lib/netlist/devices/nld_roms.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_schmitt.cpp b/src/lib/netlist/devices/nld_schmitt.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_schmitt.cpp
rename to src/lib/netlist/devices/nld_schmitt.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_system.cpp b/src/lib/netlist/devices/nld_system.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_system.cpp
rename to src/lib/netlist/devices/nld_system.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_tms4800.cpp b/src/lib/netlist/devices/nld_tms4800.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_tms4800.cpp
rename to src/lib/netlist/devices/nld_tms4800.cpp
diff --git a/src/icludes/lib/netlist/devices/nld_tristate.cpp b/src/lib/netlist/devices/nld_tristate.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nld_tristate.cpp
rename to src/lib/netlist/devices/nld_tristate.cpp
diff --git a/src/icludes/lib/netlist/devices/nlid_proxy.cpp b/src/lib/netlist/devices/nlid_proxy.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nlid_proxy.cpp
rename to src/lib/netlist/devices/nlid_proxy.cpp
diff --git a/src/icludes/lib/netlist/devices/nlid_proxy.h b/src/lib/netlist/devices/nlid_proxy.h
similarity index 100%
rename from src/icludes/lib/netlist/devices/nlid_proxy.h
rename to src/lib/netlist/devices/nlid_proxy.h
diff --git a/src/icludes/lib/netlist/devices/nlid_system.h b/src/lib/netlist/devices/nlid_system.h
similarity index 100%
rename from src/icludes/lib/netlist/devices/nlid_system.h
rename to src/lib/netlist/devices/nlid_system.h
diff --git a/src/icludes/lib/netlist/devices/nlid_truthtable.cpp b/src/lib/netlist/devices/nlid_truthtable.cpp
similarity index 100%
rename from src/icludes/lib/netlist/devices/nlid_truthtable.cpp
rename to src/lib/netlist/devices/nlid_truthtable.cpp
diff --git a/src/icludes/lib/netlist/devices/nlid_truthtable.h b/src/lib/netlist/devices/nlid_truthtable.h
similarity index 100%
rename from src/icludes/lib/netlist/devices/nlid_truthtable.h
rename to src/lib/netlist/devices/nlid_truthtable.h
diff --git a/src/icludes/lib/netlist/documentation/doc.css b/src/lib/netlist/documentation/doc.css
similarity index 100%
rename from src/icludes/lib/netlist/documentation/doc.css
rename to src/lib/netlist/documentation/doc.css
diff --git a/src/icludes/lib/netlist/documentation/mainpage.dox.h b/src/lib/netlist/documentation/mainpage.dox.h
similarity index 100%
rename from src/icludes/lib/netlist/documentation/mainpage.dox.h
rename to src/lib/netlist/documentation/mainpage.dox.h
diff --git a/src/icludes/lib/netlist/documentation/primer_1.dox.h b/src/lib/netlist/documentation/primer_1.dox.h
similarity index 100%
rename from src/icludes/lib/netlist/documentation/primer_1.dox.h
rename to src/lib/netlist/documentation/primer_1.dox.h
diff --git a/src/icludes/lib/netlist/documentation/structure.dox.h b/src/lib/netlist/documentation/structure.dox.h
similarity index 100%
rename from src/icludes/lib/netlist/documentation/structure.dox.h
rename to src/lib/netlist/documentation/structure.dox.h
diff --git a/src/icludes/lib/netlist/documentation/test1-50r.svg b/src/lib/netlist/documentation/test1-50r.svg
similarity index 100%
rename from src/icludes/lib/netlist/documentation/test1-50r.svg
rename to src/lib/netlist/documentation/test1-50r.svg
diff --git a/src/icludes/lib/netlist/examples/2n6027.cpp b/src/lib/netlist/examples/2n6027.cpp
similarity index 100%
rename from src/icludes/lib/netlist/examples/2n6027.cpp
rename to src/lib/netlist/examples/2n6027.cpp
diff --git a/src/icludes/lib/netlist/examples/7400_astable.c b/src/lib/netlist/examples/7400_astable.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/7400_astable.c
rename to src/lib/netlist/examples/7400_astable.c
diff --git a/src/icludes/lib/netlist/examples/74123_mstable.c b/src/lib/netlist/examples/74123_mstable.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/74123_mstable.c
rename to src/lib/netlist/examples/74123_mstable.c
diff --git a/src/icludes/lib/netlist/examples/74125.cpp b/src/lib/netlist/examples/74125.cpp
similarity index 100%
rename from src/icludes/lib/netlist/examples/74125.cpp
rename to src/lib/netlist/examples/74125.cpp
diff --git a/src/icludes/lib/netlist/examples/7414.cpp b/src/lib/netlist/examples/7414.cpp
similarity index 100%
rename from src/icludes/lib/netlist/examples/7414.cpp
rename to src/lib/netlist/examples/7414.cpp
diff --git a/src/icludes/lib/netlist/examples/9602_mstable.c b/src/lib/netlist/examples/9602_mstable.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/9602_mstable.c
rename to src/lib/netlist/examples/9602_mstable.c
diff --git a/src/icludes/lib/netlist/examples/bjt.c b/src/lib/netlist/examples/bjt.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/bjt.c
rename to src/lib/netlist/examples/bjt.c
diff --git a/src/icludes/lib/netlist/examples/bjt_eb.c b/src/lib/netlist/examples/bjt_eb.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/bjt_eb.c
rename to src/lib/netlist/examples/bjt_eb.c
diff --git a/src/icludes/lib/netlist/examples/bjt_eb_pnp.c b/src/lib/netlist/examples/bjt_eb_pnp.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/bjt_eb_pnp.c
rename to src/lib/netlist/examples/bjt_eb_pnp.c
diff --git a/src/icludes/lib/netlist/examples/cccs.cpp b/src/lib/netlist/examples/cccs.cpp
similarity index 100%
rename from src/icludes/lib/netlist/examples/cccs.cpp
rename to src/lib/netlist/examples/cccs.cpp
diff --git a/src/icludes/lib/netlist/examples/cd4066.c b/src/lib/netlist/examples/cd4066.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/cd4066.c
rename to src/lib/netlist/examples/cd4066.c
diff --git a/src/icludes/lib/netlist/examples/cdelay.c b/src/lib/netlist/examples/cdelay.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/cdelay.c
rename to src/lib/netlist/examples/cdelay.c
diff --git a/src/icludes/lib/netlist/examples/cmos_inverter.cpp b/src/lib/netlist/examples/cmos_inverter.cpp
similarity index 100%
rename from src/icludes/lib/netlist/examples/cmos_inverter.cpp
rename to src/lib/netlist/examples/cmos_inverter.cpp
diff --git a/src/icludes/lib/netlist/examples/cmos_inverter_clk.cpp b/src/lib/netlist/examples/cmos_inverter_clk.cpp
similarity index 100%
rename from src/icludes/lib/netlist/examples/cmos_inverter_clk.cpp
rename to src/lib/netlist/examples/cmos_inverter_clk.cpp
diff --git a/src/icludes/lib/netlist/examples/congo_bongo.cpp b/src/lib/netlist/examples/congo_bongo.cpp
similarity index 100%
rename from src/icludes/lib/netlist/examples/congo_bongo.cpp
rename to src/lib/netlist/examples/congo_bongo.cpp
diff --git a/src/icludes/lib/netlist/examples/congo_bongo.csv b/src/lib/netlist/examples/congo_bongo.csv
similarity index 100%
rename from src/icludes/lib/netlist/examples/congo_bongo.csv
rename to src/lib/netlist/examples/congo_bongo.csv
diff --git a/src/icludes/lib/netlist/examples/cs.cpp b/src/lib/netlist/examples/cs.cpp
similarity index 100%
rename from src/icludes/lib/netlist/examples/cs.cpp
rename to src/lib/netlist/examples/cs.cpp
diff --git a/src/icludes/lib/netlist/examples/diode.c b/src/lib/netlist/examples/diode.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/diode.c
rename to src/lib/netlist/examples/diode.c
diff --git a/src/icludes/lib/netlist/examples/lm3900_test.cpp b/src/lib/netlist/examples/lm3900_test.cpp
similarity index 100%
rename from src/icludes/lib/netlist/examples/lm3900_test.cpp
rename to src/lib/netlist/examples/lm3900_test.cpp
diff --git a/src/icludes/lib/netlist/examples/lostfound.cpp b/src/lib/netlist/examples/lostfound.cpp
similarity index 100%
rename from src/icludes/lib/netlist/examples/lostfound.cpp
rename to src/lib/netlist/examples/lostfound.cpp
diff --git a/src/icludes/lib/netlist/examples/mm5837_noise.c b/src/lib/netlist/examples/mm5837_noise.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/mm5837_noise.c
rename to src/lib/netlist/examples/mm5837_noise.c
diff --git a/src/icludes/lib/netlist/examples/msx_mixer_stage.c b/src/lib/netlist/examples/msx_mixer_stage.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/msx_mixer_stage.c
rename to src/lib/netlist/examples/msx_mixer_stage.c
diff --git a/src/icludes/lib/netlist/examples/ne555_astable.c b/src/lib/netlist/examples/ne555_astable.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/ne555_astable.c
rename to src/lib/netlist/examples/ne555_astable.c
diff --git a/src/icludes/lib/netlist/examples/ne566.cpp b/src/lib/netlist/examples/ne566.cpp
similarity index 100%
rename from src/icludes/lib/netlist/examples/ne566.cpp
rename to src/lib/netlist/examples/ne566.cpp
diff --git a/src/icludes/lib/netlist/examples/nld_74393_test.c b/src/lib/netlist/examples/nld_74393_test.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/nld_74393_test.c
rename to src/lib/netlist/examples/nld_74393_test.c
diff --git a/src/icludes/lib/netlist/examples/nmos_fet.cpp b/src/lib/netlist/examples/nmos_fet.cpp
similarity index 100%
rename from src/icludes/lib/netlist/examples/nmos_fet.cpp
rename to src/lib/netlist/examples/nmos_fet.cpp
diff --git a/src/icludes/lib/netlist/examples/noise.cpp b/src/lib/netlist/examples/noise.cpp
similarity index 100%
rename from src/icludes/lib/netlist/examples/noise.cpp
rename to src/lib/netlist/examples/noise.cpp
diff --git a/src/icludes/lib/netlist/examples/norton_opamp.c b/src/lib/netlist/examples/norton_opamp.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/norton_opamp.c
rename to src/lib/netlist/examples/norton_opamp.c
diff --git a/src/icludes/lib/netlist/examples/opamp.c b/src/lib/netlist/examples/opamp.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/opamp.c
rename to src/lib/netlist/examples/opamp.c
diff --git a/src/icludes/lib/netlist/examples/opamp_amplification_curve.cpp b/src/lib/netlist/examples/opamp_amplification_curve.cpp
similarity index 100%
rename from src/icludes/lib/netlist/examples/opamp_amplification_curve.cpp
rename to src/lib/netlist/examples/opamp_amplification_curve.cpp
diff --git a/src/icludes/lib/netlist/examples/rc.c b/src/lib/netlist/examples/rc.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/rc.c
rename to src/lib/netlist/examples/rc.c
diff --git a/src/icludes/lib/netlist/examples/rl.c b/src/lib/netlist/examples/rl.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/rl.c
rename to src/lib/netlist/examples/rl.c
diff --git a/src/icludes/lib/netlist/examples/sn74ls629_osc.c b/src/lib/netlist/examples/sn74ls629_osc.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/sn74ls629_osc.c
rename to src/lib/netlist/examples/sn74ls629_osc.c
diff --git a/src/icludes/lib/netlist/examples/test.c b/src/lib/netlist/examples/test.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/test.c
rename to src/lib/netlist/examples/test.c
diff --git a/src/icludes/lib/netlist/examples/todo.c b/src/lib/netlist/examples/todo.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/todo.c
rename to src/lib/netlist/examples/todo.c
diff --git a/src/icludes/lib/netlist/examples/turkey_shoot.cpp b/src/lib/netlist/examples/turkey_shoot.cpp
similarity index 100%
rename from src/icludes/lib/netlist/examples/turkey_shoot.cpp
rename to src/lib/netlist/examples/turkey_shoot.cpp
diff --git a/src/icludes/lib/netlist/examples/turkey_shoot.csv b/src/lib/netlist/examples/turkey_shoot.csv
similarity index 100%
rename from src/icludes/lib/netlist/examples/turkey_shoot.csv
rename to src/lib/netlist/examples/turkey_shoot.csv
diff --git a/src/icludes/lib/netlist/examples/vccs.c b/src/lib/netlist/examples/vccs.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/vccs.c
rename to src/lib/netlist/examples/vccs.c
diff --git a/src/icludes/lib/netlist/examples/vccs1.c b/src/lib/netlist/examples/vccs1.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/vccs1.c
rename to src/lib/netlist/examples/vccs1.c
diff --git a/src/icludes/lib/netlist/examples/vs_cs.c b/src/lib/netlist/examples/vs_cs.c
similarity index 100%
rename from src/icludes/lib/netlist/examples/vs_cs.c
rename to src/lib/netlist/examples/vs_cs.c
diff --git a/src/icludes/lib/netlist/examples/zdiode.cpp b/src/lib/netlist/examples/zdiode.cpp
similarity index 100%
rename from src/icludes/lib/netlist/examples/zdiode.cpp
rename to src/lib/netlist/examples/zdiode.cpp
diff --git a/src/icludes/lib/netlist/generated/lib_entries.hxx b/src/lib/netlist/generated/lib_entries.hxx
similarity index 100%
rename from src/icludes/lib/netlist/generated/lib_entries.hxx
rename to src/lib/netlist/generated/lib_entries.hxx
diff --git a/src/icludes/lib/netlist/generated/nld_devinc.h b/src/lib/netlist/generated/nld_devinc.h
similarity index 100%
rename from src/icludes/lib/netlist/generated/nld_devinc.h
rename to src/lib/netlist/generated/nld_devinc.h
diff --git a/src/icludes/lib/netlist/generated/nlm_modules_lib.cpp b/src/lib/netlist/generated/nlm_modules_lib.cpp
similarity index 100%
rename from src/icludes/lib/netlist/generated/nlm_modules_lib.cpp
rename to src/lib/netlist/generated/nlm_modules_lib.cpp
diff --git a/src/icludes/lib/netlist/generated/static_solvers.cpp b/src/lib/netlist/generated/static_solvers.cpp
similarity index 100%
rename from src/icludes/lib/netlist/generated/static_solvers.cpp
rename to src/lib/netlist/generated/static_solvers.cpp
diff --git a/src/icludes/lib/netlist/macro/modules/nlmod_icl8038_dip.cpp b/src/lib/netlist/macro/modules/nlmod_icl8038_dip.cpp
similarity index 100%
rename from src/icludes/lib/netlist/macro/modules/nlmod_icl8038_dip.cpp
rename to src/lib/netlist/macro/modules/nlmod_icl8038_dip.cpp
diff --git a/src/icludes/lib/netlist/macro/modules/nlmod_ne556_dip.cpp b/src/lib/netlist/macro/modules/nlmod_ne556_dip.cpp
similarity index 100%
rename from src/icludes/lib/netlist/macro/modules/nlmod_ne556_dip.cpp
rename to src/lib/netlist/macro/modules/nlmod_ne556_dip.cpp
diff --git a/src/icludes/lib/netlist/macro/modules/nlmod_rtest.cpp b/src/lib/netlist/macro/modules/nlmod_rtest.cpp
similarity index 100%
rename from src/icludes/lib/netlist/macro/modules/nlmod_rtest.cpp
rename to src/lib/netlist/macro/modules/nlmod_rtest.cpp
diff --git a/src/icludes/lib/netlist/macro/nlm_base_lib.cpp b/src/lib/netlist/macro/nlm_base_lib.cpp
similarity index 100%
rename from src/icludes/lib/netlist/macro/nlm_base_lib.cpp
rename to src/lib/netlist/macro/nlm_base_lib.cpp
diff --git a/src/icludes/lib/netlist/macro/nlm_cd4xxx_lib.cpp b/src/lib/netlist/macro/nlm_cd4xxx_lib.cpp
similarity index 100%
rename from src/icludes/lib/netlist/macro/nlm_cd4xxx_lib.cpp
rename to src/lib/netlist/macro/nlm_cd4xxx_lib.cpp
diff --git a/src/icludes/lib/netlist/macro/nlm_opamp_lib.cpp b/src/lib/netlist/macro/nlm_opamp_lib.cpp
similarity index 100%
rename from src/icludes/lib/netlist/macro/nlm_opamp_lib.cpp
rename to src/lib/netlist/macro/nlm_opamp_lib.cpp
diff --git a/src/icludes/lib/netlist/macro/nlm_otheric_lib.cpp b/src/lib/netlist/macro/nlm_otheric_lib.cpp
similarity index 100%
rename from src/icludes/lib/netlist/macro/nlm_otheric_lib.cpp
rename to src/lib/netlist/macro/nlm_otheric_lib.cpp
diff --git a/src/icludes/lib/netlist/macro/nlm_roms_lib.cpp b/src/lib/netlist/macro/nlm_roms_lib.cpp
similarity index 100%
rename from src/icludes/lib/netlist/macro/nlm_roms_lib.cpp
rename to src/lib/netlist/macro/nlm_roms_lib.cpp
diff --git a/src/icludes/lib/netlist/macro/nlm_ttl74xx_lib.cpp b/src/lib/netlist/macro/nlm_ttl74xx_lib.cpp
similarity index 100%
rename from src/icludes/lib/netlist/macro/nlm_ttl74xx_lib.cpp
rename to src/lib/netlist/macro/nlm_ttl74xx_lib.cpp
diff --git a/src/icludes/lib/netlist/netlist.cppcheck b/src/lib/netlist/netlist.cppcheck
similarity index 100%
rename from src/icludes/lib/netlist/netlist.cppcheck
rename to src/lib/netlist/netlist.cppcheck
diff --git a/src/icludes/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
similarity index 100%
rename from src/icludes/lib/netlist/nl_base.cpp
rename to src/lib/netlist/nl_base.cpp
diff --git a/src/icludes/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
similarity index 100%
rename from src/icludes/lib/netlist/nl_base.h
rename to src/lib/netlist/nl_base.h
diff --git a/src/icludes/lib/netlist/nl_config.h b/src/lib/netlist/nl_config.h
similarity index 100%
rename from src/icludes/lib/netlist/nl_config.h
rename to src/lib/netlist/nl_config.h
diff --git a/src/icludes/lib/netlist/nl_create_mame_solvers.sh b/src/lib/netlist/nl_create_mame_solvers.sh
similarity index 100%
rename from src/icludes/lib/netlist/nl_create_mame_solvers.sh
rename to src/lib/netlist/nl_create_mame_solvers.sh
diff --git a/src/icludes/lib/netlist/nl_dice_compat.h b/src/lib/netlist/nl_dice_compat.h
similarity index 100%
rename from src/icludes/lib/netlist/nl_dice_compat.h
rename to src/lib/netlist/nl_dice_compat.h
diff --git a/src/icludes/lib/netlist/nl_errstr.h b/src/lib/netlist/nl_errstr.h
similarity index 100%
rename from src/icludes/lib/netlist/nl_errstr.h
rename to src/lib/netlist/nl_errstr.h
diff --git a/src/icludes/lib/netlist/nl_factory.cpp b/src/lib/netlist/nl_factory.cpp
similarity index 100%
rename from src/icludes/lib/netlist/nl_factory.cpp
rename to src/lib/netlist/nl_factory.cpp
diff --git a/src/icludes/lib/netlist/nl_factory.h b/src/lib/netlist/nl_factory.h
similarity index 100%
rename from src/icludes/lib/netlist/nl_factory.h
rename to src/lib/netlist/nl_factory.h
diff --git a/src/icludes/lib/netlist/nl_interface.h b/src/lib/netlist/nl_interface.h
similarity index 100%
rename from src/icludes/lib/netlist/nl_interface.h
rename to src/lib/netlist/nl_interface.h
diff --git a/src/icludes/lib/netlist/nl_parser.cpp b/src/lib/netlist/nl_parser.cpp
similarity index 100%
rename from src/icludes/lib/netlist/nl_parser.cpp
rename to src/lib/netlist/nl_parser.cpp
diff --git a/src/icludes/lib/netlist/nl_parser.h b/src/lib/netlist/nl_parser.h
similarity index 100%
rename from src/icludes/lib/netlist/nl_parser.h
rename to src/lib/netlist/nl_parser.h
diff --git a/src/icludes/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp
similarity index 100%
rename from src/icludes/lib/netlist/nl_setup.cpp
rename to src/lib/netlist/nl_setup.cpp
diff --git a/src/icludes/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h
similarity index 100%
rename from src/icludes/lib/netlist/nl_setup.h
rename to src/lib/netlist/nl_setup.h
diff --git a/src/icludes/lib/netlist/nltypes.h b/src/lib/netlist/nltypes.h
similarity index 100%
rename from src/icludes/lib/netlist/nltypes.h
rename to src/lib/netlist/nltypes.h
diff --git a/src/icludes/lib/netlist/plib/gmres.h b/src/lib/netlist/plib/gmres.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/gmres.h
rename to src/lib/netlist/plib/gmres.h
diff --git a/src/icludes/lib/netlist/plib/palloc.h b/src/lib/netlist/plib/palloc.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/palloc.h
rename to src/lib/netlist/plib/palloc.h
diff --git a/src/icludes/lib/netlist/plib/parray.h b/src/lib/netlist/plib/parray.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/parray.h
rename to src/lib/netlist/plib/parray.h
diff --git a/src/icludes/lib/netlist/plib/pchrono.h b/src/lib/netlist/plib/pchrono.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/pchrono.h
rename to src/lib/netlist/plib/pchrono.h
diff --git a/src/icludes/lib/netlist/plib/pconfig.h b/src/lib/netlist/plib/pconfig.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/pconfig.h
rename to src/lib/netlist/plib/pconfig.h
diff --git a/src/icludes/lib/netlist/plib/pdynlib.cpp b/src/lib/netlist/plib/pdynlib.cpp
similarity index 100%
rename from src/icludes/lib/netlist/plib/pdynlib.cpp
rename to src/lib/netlist/plib/pdynlib.cpp
diff --git a/src/icludes/lib/netlist/plib/pdynlib.h b/src/lib/netlist/plib/pdynlib.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/pdynlib.h
rename to src/lib/netlist/plib/pdynlib.h
diff --git a/src/icludes/lib/netlist/plib/penum.h b/src/lib/netlist/plib/penum.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/penum.h
rename to src/lib/netlist/plib/penum.h
diff --git a/src/icludes/lib/netlist/plib/pexception.cpp b/src/lib/netlist/plib/pexception.cpp
similarity index 100%
rename from src/icludes/lib/netlist/plib/pexception.cpp
rename to src/lib/netlist/plib/pexception.cpp
diff --git a/src/icludes/lib/netlist/plib/pexception.h b/src/lib/netlist/plib/pexception.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/pexception.h
rename to src/lib/netlist/plib/pexception.h
diff --git a/src/icludes/lib/netlist/plib/pfmtlog.cpp b/src/lib/netlist/plib/pfmtlog.cpp
similarity index 100%
rename from src/icludes/lib/netlist/plib/pfmtlog.cpp
rename to src/lib/netlist/plib/pfmtlog.cpp
diff --git a/src/icludes/lib/netlist/plib/pfmtlog.h b/src/lib/netlist/plib/pfmtlog.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/pfmtlog.h
rename to src/lib/netlist/plib/pfmtlog.h
diff --git a/src/icludes/lib/netlist/plib/pfunction.cpp b/src/lib/netlist/plib/pfunction.cpp
similarity index 100%
rename from src/icludes/lib/netlist/plib/pfunction.cpp
rename to src/lib/netlist/plib/pfunction.cpp
diff --git a/src/icludes/lib/netlist/plib/pfunction.h b/src/lib/netlist/plib/pfunction.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/pfunction.h
rename to src/lib/netlist/plib/pfunction.h
diff --git a/src/icludes/lib/netlist/plib/pgsl.h b/src/lib/netlist/plib/pgsl.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/pgsl.h
rename to src/lib/netlist/plib/pgsl.h
diff --git a/src/icludes/lib/netlist/plib/plists.h b/src/lib/netlist/plib/plists.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/plists.h
rename to src/lib/netlist/plib/plists.h
diff --git a/src/icludes/lib/netlist/plib/pmain.cpp b/src/lib/netlist/plib/pmain.cpp
similarity index 100%
rename from src/icludes/lib/netlist/plib/pmain.cpp
rename to src/lib/netlist/plib/pmain.cpp
diff --git a/src/icludes/lib/netlist/plib/pmain.h b/src/lib/netlist/plib/pmain.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/pmain.h
rename to src/lib/netlist/plib/pmain.h
diff --git a/src/icludes/lib/netlist/plib/pmath.h b/src/lib/netlist/plib/pmath.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/pmath.h
rename to src/lib/netlist/plib/pmath.h
diff --git a/src/icludes/lib/netlist/plib/pmatrix2d.h b/src/lib/netlist/plib/pmatrix2d.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/pmatrix2d.h
rename to src/lib/netlist/plib/pmatrix2d.h
diff --git a/src/icludes/lib/netlist/plib/pmatrix_cr.h b/src/lib/netlist/plib/pmatrix_cr.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/pmatrix_cr.h
rename to src/lib/netlist/plib/pmatrix_cr.h
diff --git a/src/icludes/lib/netlist/plib/pmempool.h b/src/lib/netlist/plib/pmempool.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/pmempool.h
rename to src/lib/netlist/plib/pmempool.h
diff --git a/src/icludes/lib/netlist/plib/pmulti_threading.h b/src/lib/netlist/plib/pmulti_threading.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/pmulti_threading.h
rename to src/lib/netlist/plib/pmulti_threading.h
diff --git a/src/icludes/lib/netlist/plib/pomp.h b/src/lib/netlist/plib/pomp.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/pomp.h
rename to src/lib/netlist/plib/pomp.h
diff --git a/src/icludes/lib/netlist/plib/poptions.cpp b/src/lib/netlist/plib/poptions.cpp
similarity index 100%
rename from src/icludes/lib/netlist/plib/poptions.cpp
rename to src/lib/netlist/plib/poptions.cpp
diff --git a/src/icludes/lib/netlist/plib/poptions.h b/src/lib/netlist/plib/poptions.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/poptions.h
rename to src/lib/netlist/plib/poptions.h
diff --git a/src/icludes/lib/netlist/plib/ppmf.h b/src/lib/netlist/plib/ppmf.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/ppmf.h
rename to src/lib/netlist/plib/ppmf.h
diff --git a/src/icludes/lib/netlist/plib/ppreprocessor.cpp b/src/lib/netlist/plib/ppreprocessor.cpp
similarity index 100%
rename from src/icludes/lib/netlist/plib/ppreprocessor.cpp
rename to src/lib/netlist/plib/ppreprocessor.cpp
diff --git a/src/icludes/lib/netlist/plib/ppreprocessor.h b/src/lib/netlist/plib/ppreprocessor.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/ppreprocessor.h
rename to src/lib/netlist/plib/ppreprocessor.h
diff --git a/src/icludes/lib/netlist/plib/prandom.h b/src/lib/netlist/plib/prandom.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/prandom.h
rename to src/lib/netlist/plib/prandom.h
diff --git a/src/icludes/lib/netlist/plib/psource.h b/src/lib/netlist/plib/psource.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/psource.h
rename to src/lib/netlist/plib/psource.h
diff --git a/src/icludes/lib/netlist/plib/pstate.h b/src/lib/netlist/plib/pstate.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/pstate.h
rename to src/lib/netlist/plib/pstate.h
diff --git a/src/icludes/lib/netlist/plib/pstonum.h b/src/lib/netlist/plib/pstonum.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/pstonum.h
rename to src/lib/netlist/plib/pstonum.h
diff --git a/src/icludes/lib/netlist/plib/pstream.h b/src/lib/netlist/plib/pstream.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/pstream.h
rename to src/lib/netlist/plib/pstream.h
diff --git a/src/icludes/lib/netlist/plib/pstring.cpp b/src/lib/netlist/plib/pstring.cpp
similarity index 100%
rename from src/icludes/lib/netlist/plib/pstring.cpp
rename to src/lib/netlist/plib/pstring.cpp
diff --git a/src/icludes/lib/netlist/plib/pstring.h b/src/lib/netlist/plib/pstring.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/pstring.h
rename to src/lib/netlist/plib/pstring.h
diff --git a/src/icludes/lib/netlist/plib/pstrutil.h b/src/lib/netlist/plib/pstrutil.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/pstrutil.h
rename to src/lib/netlist/plib/pstrutil.h
diff --git a/src/icludes/lib/netlist/plib/ptests.h b/src/lib/netlist/plib/ptests.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/ptests.h
rename to src/lib/netlist/plib/ptests.h
diff --git a/src/icludes/lib/netlist/plib/ptime.h b/src/lib/netlist/plib/ptime.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/ptime.h
rename to src/lib/netlist/plib/ptime.h
diff --git a/src/icludes/lib/netlist/plib/ptimed_queue.h b/src/lib/netlist/plib/ptimed_queue.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/ptimed_queue.h
rename to src/lib/netlist/plib/ptimed_queue.h
diff --git a/src/icludes/lib/netlist/plib/ptokenizer.cpp b/src/lib/netlist/plib/ptokenizer.cpp
similarity index 100%
rename from src/icludes/lib/netlist/plib/ptokenizer.cpp
rename to src/lib/netlist/plib/ptokenizer.cpp
diff --git a/src/icludes/lib/netlist/plib/ptokenizer.h b/src/lib/netlist/plib/ptokenizer.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/ptokenizer.h
rename to src/lib/netlist/plib/ptokenizer.h
diff --git a/src/icludes/lib/netlist/plib/ptypes.h b/src/lib/netlist/plib/ptypes.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/ptypes.h
rename to src/lib/netlist/plib/ptypes.h
diff --git a/src/icludes/lib/netlist/plib/putil.cpp b/src/lib/netlist/plib/putil.cpp
similarity index 100%
rename from src/icludes/lib/netlist/plib/putil.cpp
rename to src/lib/netlist/plib/putil.cpp
diff --git a/src/icludes/lib/netlist/plib/putil.h b/src/lib/netlist/plib/putil.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/putil.h
rename to src/lib/netlist/plib/putil.h
diff --git a/src/icludes/lib/netlist/plib/vector_ops.h b/src/lib/netlist/plib/vector_ops.h
similarity index 100%
rename from src/icludes/lib/netlist/plib/vector_ops.h
rename to src/lib/netlist/plib/vector_ops.h
diff --git a/src/icludes/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp
similarity index 100%
rename from src/icludes/lib/netlist/prg/nltool.cpp
rename to src/lib/netlist/prg/nltool.cpp
diff --git a/src/icludes/lib/netlist/prg/nlwav.cpp b/src/lib/netlist/prg/nlwav.cpp
similarity index 100%
rename from src/icludes/lib/netlist/prg/nlwav.cpp
rename to src/lib/netlist/prg/nlwav.cpp
diff --git a/src/icludes/lib/netlist/solver/nld_matrix_solver.cpp b/src/lib/netlist/solver/nld_matrix_solver.cpp
similarity index 100%
rename from src/icludes/lib/netlist/solver/nld_matrix_solver.cpp
rename to src/lib/netlist/solver/nld_matrix_solver.cpp
diff --git a/src/icludes/lib/netlist/solver/nld_matrix_solver.h b/src/lib/netlist/solver/nld_matrix_solver.h
similarity index 100%
rename from src/icludes/lib/netlist/solver/nld_matrix_solver.h
rename to src/lib/netlist/solver/nld_matrix_solver.h
diff --git a/src/icludes/lib/netlist/solver/nld_matrix_solver_ext.h b/src/lib/netlist/solver/nld_matrix_solver_ext.h
similarity index 100%
rename from src/icludes/lib/netlist/solver/nld_matrix_solver_ext.h
rename to src/lib/netlist/solver/nld_matrix_solver_ext.h
diff --git a/src/icludes/lib/netlist/solver/nld_ms_direct.h b/src/lib/netlist/solver/nld_ms_direct.h
similarity index 100%
rename from src/icludes/lib/netlist/solver/nld_ms_direct.h
rename to src/lib/netlist/solver/nld_ms_direct.h
diff --git a/src/icludes/lib/netlist/solver/nld_ms_direct1.h b/src/lib/netlist/solver/nld_ms_direct1.h
similarity index 100%
rename from src/icludes/lib/netlist/solver/nld_ms_direct1.h
rename to src/lib/netlist/solver/nld_ms_direct1.h
diff --git a/src/icludes/lib/netlist/solver/nld_ms_direct2.h b/src/lib/netlist/solver/nld_ms_direct2.h
similarity index 100%
rename from src/icludes/lib/netlist/solver/nld_ms_direct2.h
rename to src/lib/netlist/solver/nld_ms_direct2.h
diff --git a/src/icludes/lib/netlist/solver/nld_ms_direct_lu.h b/src/lib/netlist/solver/nld_ms_direct_lu.h
similarity index 100%
rename from src/icludes/lib/netlist/solver/nld_ms_direct_lu.h
rename to src/lib/netlist/solver/nld_ms_direct_lu.h
diff --git a/src/icludes/lib/netlist/solver/nld_ms_gcr.h b/src/lib/netlist/solver/nld_ms_gcr.h
similarity index 100%
rename from src/icludes/lib/netlist/solver/nld_ms_gcr.h
rename to src/lib/netlist/solver/nld_ms_gcr.h
diff --git a/src/icludes/lib/netlist/solver/nld_ms_gmres.h b/src/lib/netlist/solver/nld_ms_gmres.h
similarity index 100%
rename from src/icludes/lib/netlist/solver/nld_ms_gmres.h
rename to src/lib/netlist/solver/nld_ms_gmres.h
diff --git a/src/icludes/lib/netlist/solver/nld_ms_sm.h b/src/lib/netlist/solver/nld_ms_sm.h
similarity index 100%
rename from src/icludes/lib/netlist/solver/nld_ms_sm.h
rename to src/lib/netlist/solver/nld_ms_sm.h
diff --git a/src/icludes/lib/netlist/solver/nld_ms_sor.h b/src/lib/netlist/solver/nld_ms_sor.h
similarity index 100%
rename from src/icludes/lib/netlist/solver/nld_ms_sor.h
rename to src/lib/netlist/solver/nld_ms_sor.h
diff --git a/src/icludes/lib/netlist/solver/nld_ms_sor_mat.h b/src/lib/netlist/solver/nld_ms_sor_mat.h
similarity index 100%
rename from src/icludes/lib/netlist/solver/nld_ms_sor_mat.h
rename to src/lib/netlist/solver/nld_ms_sor_mat.h
diff --git a/src/icludes/lib/netlist/solver/nld_ms_w.h b/src/lib/netlist/solver/nld_ms_w.h
similarity index 100%
rename from src/icludes/lib/netlist/solver/nld_ms_w.h
rename to src/lib/netlist/solver/nld_ms_w.h
diff --git a/src/icludes/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp
similarity index 100%
rename from src/icludes/lib/netlist/solver/nld_solver.cpp
rename to src/lib/netlist/solver/nld_solver.cpp
diff --git a/src/icludes/lib/netlist/solver/nld_solver.h b/src/lib/netlist/solver/nld_solver.h
similarity index 100%
rename from src/icludes/lib/netlist/solver/nld_solver.h
rename to src/lib/netlist/solver/nld_solver.h
diff --git a/src/icludes/lib/netlist/tests/test_pfunction.cpp b/src/lib/netlist/tests/test_pfunction.cpp
similarity index 100%
rename from src/icludes/lib/netlist/tests/test_pfunction.cpp
rename to src/lib/netlist/tests/test_pfunction.cpp
diff --git a/src/icludes/lib/netlist/tests/test_pstring.cpp b/src/lib/netlist/tests/test_pstring.cpp
similarity index 100%
rename from src/icludes/lib/netlist/tests/test_pstring.cpp
rename to src/lib/netlist/tests/test_pstring.cpp
diff --git a/src/icludes/lib/netlist/tools/nl_convert.cpp b/src/lib/netlist/tools/nl_convert.cpp
similarity index 100%
rename from src/icludes/lib/netlist/tools/nl_convert.cpp
rename to src/lib/netlist/tools/nl_convert.cpp
diff --git a/src/icludes/lib/netlist/tools/nl_convert.h b/src/lib/netlist/tools/nl_convert.h
similarity index 100%
rename from src/icludes/lib/netlist/tools/nl_convert.h
rename to src/lib/netlist/tools/nl_convert.h
diff --git a/src/icludes/lib/util/abi.h b/src/lib/util/abi.h
similarity index 100%
rename from src/icludes/lib/util/abi.h
rename to src/lib/util/abi.h
diff --git a/src/icludes/lib/util/avhuff.cpp b/src/lib/util/avhuff.cpp
similarity index 100%
rename from src/icludes/lib/util/avhuff.cpp
rename to src/lib/util/avhuff.cpp
diff --git a/src/icludes/lib/util/avhuff.h b/src/lib/util/avhuff.h
similarity index 100%
rename from src/icludes/lib/util/avhuff.h
rename to src/lib/util/avhuff.h
diff --git a/src/icludes/lib/util/aviio.cpp b/src/lib/util/aviio.cpp
similarity index 100%
rename from src/icludes/lib/util/aviio.cpp
rename to src/lib/util/aviio.cpp
diff --git a/src/icludes/lib/util/aviio.h b/src/lib/util/aviio.h
similarity index 100%
rename from src/icludes/lib/util/aviio.h
rename to src/lib/util/aviio.h
diff --git a/src/icludes/lib/util/base64.hpp b/src/lib/util/base64.hpp
similarity index 100%
rename from src/icludes/lib/util/base64.hpp
rename to src/lib/util/base64.hpp
diff --git a/src/icludes/lib/util/bitmap.cpp b/src/lib/util/bitmap.cpp
similarity index 100%
rename from src/icludes/lib/util/bitmap.cpp
rename to src/lib/util/bitmap.cpp
diff --git a/src/icludes/lib/util/bitmap.h b/src/lib/util/bitmap.h
similarity index 100%
rename from src/icludes/lib/util/bitmap.h
rename to src/lib/util/bitmap.h
diff --git a/src/icludes/lib/util/bitstream.h b/src/lib/util/bitstream.h
similarity index 100%
rename from src/icludes/lib/util/bitstream.h
rename to src/lib/util/bitstream.h
diff --git a/src/icludes/lib/util/cdrom.cpp b/src/lib/util/cdrom.cpp
similarity index 100%
rename from src/icludes/lib/util/cdrom.cpp
rename to src/lib/util/cdrom.cpp
diff --git a/src/icludes/lib/util/cdrom.h b/src/lib/util/cdrom.h
similarity index 100%
rename from src/icludes/lib/util/cdrom.h
rename to src/lib/util/cdrom.h
diff --git a/src/icludes/lib/util/chd.cpp b/src/lib/util/chd.cpp
similarity index 100%
rename from src/icludes/lib/util/chd.cpp
rename to src/lib/util/chd.cpp
diff --git a/src/icludes/lib/util/chd.h b/src/lib/util/chd.h
similarity index 100%
rename from src/icludes/lib/util/chd.h
rename to src/lib/util/chd.h
diff --git a/src/icludes/lib/util/chdcd.cpp b/src/lib/util/chdcd.cpp
similarity index 100%
rename from src/icludes/lib/util/chdcd.cpp
rename to src/lib/util/chdcd.cpp
diff --git a/src/icludes/lib/util/chdcd.h b/src/lib/util/chdcd.h
similarity index 100%
rename from src/icludes/lib/util/chdcd.h
rename to src/lib/util/chdcd.h
diff --git a/src/icludes/lib/util/chdcodec.cpp b/src/lib/util/chdcodec.cpp
similarity index 100%
rename from src/icludes/lib/util/chdcodec.cpp
rename to src/lib/util/chdcodec.cpp
diff --git a/src/icludes/lib/util/chdcodec.h b/src/lib/util/chdcodec.h
similarity index 100%
rename from src/icludes/lib/util/chdcodec.h
rename to src/lib/util/chdcodec.h
diff --git a/src/icludes/lib/util/client_http.hpp b/src/lib/util/client_http.hpp
similarity index 100%
rename from src/icludes/lib/util/client_http.hpp
rename to src/lib/util/client_http.hpp
diff --git a/src/icludes/lib/util/client_https.hpp b/src/lib/util/client_https.hpp
similarity index 100%
rename from src/icludes/lib/util/client_https.hpp
rename to src/lib/util/client_https.hpp
diff --git a/src/icludes/lib/util/client_ws.hpp b/src/lib/util/client_ws.hpp
similarity index 100%
rename from src/icludes/lib/util/client_ws.hpp
rename to src/lib/util/client_ws.hpp
diff --git a/src/icludes/lib/util/client_wss.hpp b/src/lib/util/client_wss.hpp
similarity index 100%
rename from src/icludes/lib/util/client_wss.hpp
rename to src/lib/util/client_wss.hpp
diff --git a/src/icludes/lib/util/corealloc.cpp b/src/lib/util/corealloc.cpp
similarity index 100%
rename from src/icludes/lib/util/corealloc.cpp
rename to src/lib/util/corealloc.cpp
diff --git a/src/icludes/lib/util/corealloc.h b/src/lib/util/corealloc.h
similarity index 100%
rename from src/icludes/lib/util/corealloc.h
rename to src/lib/util/corealloc.h
diff --git a/src/icludes/lib/util/corefile.cpp b/src/lib/util/corefile.cpp
similarity index 100%
rename from src/icludes/lib/util/corefile.cpp
rename to src/lib/util/corefile.cpp
diff --git a/src/icludes/lib/util/corefile.h b/src/lib/util/corefile.h
similarity index 100%
rename from src/icludes/lib/util/corefile.h
rename to src/lib/util/corefile.h
diff --git a/src/icludes/lib/util/corestr.cpp b/src/lib/util/corestr.cpp
similarity index 100%
rename from src/icludes/lib/util/corestr.cpp
rename to src/lib/util/corestr.cpp
diff --git a/src/icludes/lib/util/corestr.h b/src/lib/util/corestr.h
similarity index 100%
rename from src/icludes/lib/util/corestr.h
rename to src/lib/util/corestr.h
diff --git a/src/icludes/lib/util/coretmpl.h b/src/lib/util/coretmpl.h
similarity index 100%
rename from src/icludes/lib/util/coretmpl.h
rename to src/lib/util/coretmpl.h
diff --git a/src/icludes/lib/util/coreutil.cpp b/src/lib/util/coreutil.cpp
similarity index 100%
rename from src/icludes/lib/util/coreutil.cpp
rename to src/lib/util/coreutil.cpp
diff --git a/src/icludes/lib/util/coreutil.h b/src/lib/util/coreutil.h
similarity index 100%
rename from src/icludes/lib/util/coreutil.h
rename to src/lib/util/coreutil.h
diff --git a/src/icludes/lib/util/crypto.hpp b/src/lib/util/crypto.hpp
similarity index 100%
rename from src/icludes/lib/util/crypto.hpp
rename to src/lib/util/crypto.hpp
diff --git a/src/icludes/lib/util/delegate.cpp b/src/lib/util/delegate.cpp
similarity index 100%
rename from src/icludes/lib/util/delegate.cpp
rename to src/lib/util/delegate.cpp
diff --git a/src/icludes/lib/util/delegate.h b/src/lib/util/delegate.h
similarity index 100%
rename from src/icludes/lib/util/delegate.h
rename to src/lib/util/delegate.h
diff --git a/src/icludes/lib/util/disasmintf.cpp b/src/lib/util/disasmintf.cpp
similarity index 100%
rename from src/icludes/lib/util/disasmintf.cpp
rename to src/lib/util/disasmintf.cpp
diff --git a/src/icludes/lib/util/disasmintf.h b/src/lib/util/disasmintf.h
similarity index 100%
rename from src/icludes/lib/util/disasmintf.h
rename to src/lib/util/disasmintf.h
diff --git a/src/icludes/lib/util/dynamicclass.cpp b/src/lib/util/dynamicclass.cpp
similarity index 100%
rename from src/icludes/lib/util/dynamicclass.cpp
rename to src/lib/util/dynamicclass.cpp
diff --git a/src/icludes/lib/util/dynamicclass.h b/src/lib/util/dynamicclass.h
similarity index 100%
rename from src/icludes/lib/util/dynamicclass.h
rename to src/lib/util/dynamicclass.h
diff --git a/src/icludes/lib/util/dynamicclass.ipp b/src/lib/util/dynamicclass.ipp
similarity index 100%
rename from src/icludes/lib/util/dynamicclass.ipp
rename to src/lib/util/dynamicclass.ipp
diff --git a/src/icludes/lib/util/endianness.h b/src/lib/util/endianness.h
similarity index 100%
rename from src/icludes/lib/util/endianness.h
rename to src/lib/util/endianness.h
diff --git a/src/icludes/lib/util/flac.cpp b/src/lib/util/flac.cpp
similarity index 100%
rename from src/icludes/lib/util/flac.cpp
rename to src/lib/util/flac.cpp
diff --git a/src/icludes/lib/util/flac.h b/src/lib/util/flac.h
similarity index 100%
rename from src/icludes/lib/util/flac.h
rename to src/lib/util/flac.h
diff --git a/src/icludes/lib/util/harddisk.cpp b/src/lib/util/harddisk.cpp
similarity index 100%
rename from src/icludes/lib/util/harddisk.cpp
rename to src/lib/util/harddisk.cpp
diff --git a/src/icludes/lib/util/harddisk.h b/src/lib/util/harddisk.h
similarity index 100%
rename from src/icludes/lib/util/harddisk.h
rename to src/lib/util/harddisk.h
diff --git a/src/icludes/lib/util/hash.cpp b/src/lib/util/hash.cpp
similarity index 100%
rename from src/icludes/lib/util/hash.cpp
rename to src/lib/util/hash.cpp
diff --git a/src/icludes/lib/util/hash.h b/src/lib/util/hash.h
similarity index 100%
rename from src/icludes/lib/util/hash.h
rename to src/lib/util/hash.h
diff --git a/src/icludes/lib/util/hashing.cpp b/src/lib/util/hashing.cpp
similarity index 100%
rename from src/icludes/lib/util/hashing.cpp
rename to src/lib/util/hashing.cpp
diff --git a/src/icludes/lib/util/hashing.h b/src/lib/util/hashing.h
similarity index 100%
rename from src/icludes/lib/util/hashing.h
rename to src/lib/util/hashing.h
diff --git a/src/icludes/lib/util/huffman.cpp b/src/lib/util/huffman.cpp
similarity index 100%
rename from src/icludes/lib/util/huffman.cpp
rename to src/lib/util/huffman.cpp
diff --git a/src/icludes/lib/util/huffman.h b/src/lib/util/huffman.h
similarity index 100%
rename from src/icludes/lib/util/huffman.h
rename to src/lib/util/huffman.h
diff --git a/src/icludes/lib/util/ioprocs.cpp b/src/lib/util/ioprocs.cpp
similarity index 100%
rename from src/icludes/lib/util/ioprocs.cpp
rename to src/lib/util/ioprocs.cpp
diff --git a/src/icludes/lib/util/ioprocs.h b/src/lib/util/ioprocs.h
similarity index 100%
rename from src/icludes/lib/util/ioprocs.h
rename to src/lib/util/ioprocs.h
diff --git a/src/icludes/lib/util/ioprocsfill.h b/src/lib/util/ioprocsfill.h
similarity index 100%
rename from src/icludes/lib/util/ioprocsfill.h
rename to src/lib/util/ioprocsfill.h
diff --git a/src/icludes/lib/util/ioprocsfilter.cpp b/src/lib/util/ioprocsfilter.cpp
similarity index 100%
rename from src/icludes/lib/util/ioprocsfilter.cpp
rename to src/lib/util/ioprocsfilter.cpp
diff --git a/src/icludes/lib/util/ioprocsfilter.h b/src/lib/util/ioprocsfilter.h
similarity index 100%
rename from src/icludes/lib/util/ioprocsfilter.h
rename to src/lib/util/ioprocsfilter.h
diff --git a/src/icludes/lib/util/ioprocsvec.h b/src/lib/util/ioprocsvec.h
similarity index 100%
rename from src/icludes/lib/util/ioprocsvec.h
rename to src/lib/util/ioprocsvec.h
diff --git a/src/icludes/lib/util/jedparse.cpp b/src/lib/util/jedparse.cpp
similarity index 100%
rename from src/icludes/lib/util/jedparse.cpp
rename to src/lib/util/jedparse.cpp
diff --git a/src/icludes/lib/util/jedparse.h b/src/lib/util/jedparse.h
similarity index 100%
rename from src/icludes/lib/util/jedparse.h
rename to src/lib/util/jedparse.h
diff --git a/src/icludes/lib/util/language.cpp b/src/lib/util/language.cpp
similarity index 100%
rename from src/icludes/lib/util/language.cpp
rename to src/lib/util/language.cpp
diff --git a/src/icludes/lib/util/language.h b/src/lib/util/language.h
similarity index 100%
rename from src/icludes/lib/util/language.h
rename to src/lib/util/language.h
diff --git a/src/icludes/lib/util/lrucache.h b/src/lib/util/lrucache.h
similarity index 100%
rename from src/icludes/lib/util/lrucache.h
rename to src/lib/util/lrucache.h
diff --git a/src/icludes/lib/util/md5.cpp b/src/lib/util/md5.cpp
similarity index 100%
rename from src/icludes/lib/util/md5.cpp
rename to src/lib/util/md5.cpp
diff --git a/src/icludes/lib/util/md5.h b/src/lib/util/md5.h
similarity index 100%
rename from src/icludes/lib/util/md5.h
rename to src/lib/util/md5.h
diff --git a/src/icludes/lib/util/msdib.cpp b/src/lib/util/msdib.cpp
similarity index 100%
rename from src/icludes/lib/util/msdib.cpp
rename to src/lib/util/msdib.cpp
diff --git a/src/icludes/lib/util/msdib.h b/src/lib/util/msdib.h
similarity index 100%
rename from src/icludes/lib/util/msdib.h
rename to src/lib/util/msdib.h
diff --git a/src/icludes/lib/util/nanosvg.cpp b/src/lib/util/nanosvg.cpp
similarity index 100%
rename from src/icludes/lib/util/nanosvg.cpp
rename to src/lib/util/nanosvg.cpp
diff --git a/src/icludes/lib/util/nanosvg.h b/src/lib/util/nanosvg.h
similarity index 100%
rename from src/icludes/lib/util/nanosvg.h
rename to src/lib/util/nanosvg.h
diff --git a/src/icludes/lib/util/opresolv.cpp b/src/lib/util/opresolv.cpp
similarity index 100%
rename from src/icludes/lib/util/opresolv.cpp
rename to src/lib/util/opresolv.cpp
diff --git a/src/icludes/lib/util/opresolv.h b/src/lib/util/opresolv.h
similarity index 100%
rename from src/icludes/lib/util/opresolv.h
rename to src/lib/util/opresolv.h
diff --git a/src/icludes/lib/util/options.cpp b/src/lib/util/options.cpp
similarity index 100%
rename from src/icludes/lib/util/options.cpp
rename to src/lib/util/options.cpp
diff --git a/src/icludes/lib/util/options.h b/src/lib/util/options.h
similarity index 100%
rename from src/icludes/lib/util/options.h
rename to src/lib/util/options.h
diff --git a/src/icludes/lib/util/palette.cpp b/src/lib/util/palette.cpp
similarity index 100%
rename from src/icludes/lib/util/palette.cpp
rename to src/lib/util/palette.cpp
diff --git a/src/icludes/lib/util/palette.h b/src/lib/util/palette.h
similarity index 100%
rename from src/icludes/lib/util/palette.h
rename to src/lib/util/palette.h
diff --git a/src/icludes/lib/util/path.cpp b/src/lib/util/path.cpp
similarity index 100%
rename from src/icludes/lib/util/path.cpp
rename to src/lib/util/path.cpp
diff --git a/src/icludes/lib/util/path.h b/src/lib/util/path.h
similarity index 100%
rename from src/icludes/lib/util/path.h
rename to src/lib/util/path.h
diff --git a/src/icludes/lib/util/path_to_regex.cpp b/src/lib/util/path_to_regex.cpp
similarity index 100%
rename from src/icludes/lib/util/path_to_regex.cpp
rename to src/lib/util/path_to_regex.cpp
diff --git a/src/icludes/lib/util/path_to_regex.hpp b/src/lib/util/path_to_regex.hpp
similarity index 100%
rename from src/icludes/lib/util/path_to_regex.hpp
rename to src/lib/util/path_to_regex.hpp
diff --git a/src/icludes/lib/util/plaparse.cpp b/src/lib/util/plaparse.cpp
similarity index 100%
rename from src/icludes/lib/util/plaparse.cpp
rename to src/lib/util/plaparse.cpp
diff --git a/src/icludes/lib/util/plaparse.h b/src/lib/util/plaparse.h
similarity index 100%
rename from src/icludes/lib/util/plaparse.h
rename to src/lib/util/plaparse.h
diff --git a/src/icludes/lib/util/png.cpp b/src/lib/util/png.cpp
similarity index 100%
rename from src/icludes/lib/util/png.cpp
rename to src/lib/util/png.cpp
diff --git a/src/icludes/lib/util/png.h b/src/lib/util/png.h
similarity index 100%
rename from src/icludes/lib/util/png.h
rename to src/lib/util/png.h
diff --git a/src/icludes/lib/util/server_http.hpp b/src/lib/util/server_http.hpp
similarity index 100%
rename from src/icludes/lib/util/server_http.hpp
rename to src/lib/util/server_http.hpp
diff --git a/src/icludes/lib/util/server_http_impl.hpp b/src/lib/util/server_http_impl.hpp
similarity index 100%
rename from src/icludes/lib/util/server_http_impl.hpp
rename to src/lib/util/server_http_impl.hpp
diff --git a/src/icludes/lib/util/server_https.hpp b/src/lib/util/server_https.hpp
similarity index 100%
rename from src/icludes/lib/util/server_https.hpp
rename to src/lib/util/server_https.hpp
diff --git a/src/icludes/lib/util/server_ws.hpp b/src/lib/util/server_ws.hpp
similarity index 100%
rename from src/icludes/lib/util/server_ws.hpp
rename to src/lib/util/server_ws.hpp
diff --git a/src/icludes/lib/util/server_ws_impl.hpp b/src/lib/util/server_ws_impl.hpp
similarity index 100%
rename from src/icludes/lib/util/server_ws_impl.hpp
rename to src/lib/util/server_ws_impl.hpp
diff --git a/src/icludes/lib/util/server_wss.hpp b/src/lib/util/server_wss.hpp
similarity index 100%
rename from src/icludes/lib/util/server_wss.hpp
rename to src/lib/util/server_wss.hpp
diff --git a/src/icludes/lib/util/strformat.cpp b/src/lib/util/strformat.cpp
similarity index 100%
rename from src/icludes/lib/util/strformat.cpp
rename to src/lib/util/strformat.cpp
diff --git a/src/icludes/lib/util/strformat.h b/src/lib/util/strformat.h
similarity index 100%
rename from src/icludes/lib/util/strformat.h
rename to src/lib/util/strformat.h
diff --git a/src/icludes/lib/util/timeconv.cpp b/src/lib/util/timeconv.cpp
similarity index 100%
rename from src/icludes/lib/util/timeconv.cpp
rename to src/lib/util/timeconv.cpp
diff --git a/src/icludes/lib/util/timeconv.h b/src/lib/util/timeconv.h
similarity index 100%
rename from src/icludes/lib/util/timeconv.h
rename to src/lib/util/timeconv.h
diff --git a/src/icludes/lib/util/un7z.cpp b/src/lib/util/un7z.cpp
similarity index 100%
rename from src/icludes/lib/util/un7z.cpp
rename to src/lib/util/un7z.cpp
diff --git a/src/icludes/lib/util/unicode.cpp b/src/lib/util/unicode.cpp
similarity index 100%
rename from src/icludes/lib/util/unicode.cpp
rename to src/lib/util/unicode.cpp
diff --git a/src/icludes/lib/util/unicode.h b/src/lib/util/unicode.h
similarity index 100%
rename from src/icludes/lib/util/unicode.h
rename to src/lib/util/unicode.h
diff --git a/src/icludes/lib/util/unzip.cpp b/src/lib/util/unzip.cpp
similarity index 100%
rename from src/icludes/lib/util/unzip.cpp
rename to src/lib/util/unzip.cpp
diff --git a/src/icludes/lib/util/unzip.h b/src/lib/util/unzip.h
similarity index 100%
rename from src/icludes/lib/util/unzip.h
rename to src/lib/util/unzip.h
diff --git a/src/icludes/lib/util/utilfwd.h b/src/lib/util/utilfwd.h
similarity index 100%
rename from src/icludes/lib/util/utilfwd.h
rename to src/lib/util/utilfwd.h
diff --git a/src/icludes/lib/util/vbiparse.cpp b/src/lib/util/vbiparse.cpp
similarity index 100%
rename from src/icludes/lib/util/vbiparse.cpp
rename to src/lib/util/vbiparse.cpp
diff --git a/src/icludes/lib/util/vbiparse.h b/src/lib/util/vbiparse.h
similarity index 100%
rename from src/icludes/lib/util/vbiparse.h
rename to src/lib/util/vbiparse.h
diff --git a/src/icludes/lib/util/vecstream.cpp b/src/lib/util/vecstream.cpp
similarity index 100%
rename from src/icludes/lib/util/vecstream.cpp
rename to src/lib/util/vecstream.cpp
diff --git a/src/icludes/lib/util/vecstream.h b/src/lib/util/vecstream.h
similarity index 100%
rename from src/icludes/lib/util/vecstream.h
rename to src/lib/util/vecstream.h
diff --git a/src/icludes/lib/util/wavwrite.cpp b/src/lib/util/wavwrite.cpp
similarity index 100%
rename from src/icludes/lib/util/wavwrite.cpp
rename to src/lib/util/wavwrite.cpp
diff --git a/src/icludes/lib/util/wavwrite.h b/src/lib/util/wavwrite.h
similarity index 100%
rename from src/icludes/lib/util/wavwrite.h
rename to src/lib/util/wavwrite.h
diff --git a/src/icludes/lib/util/xmlfile.cpp b/src/lib/util/xmlfile.cpp
similarity index 100%
rename from src/icludes/lib/util/xmlfile.cpp
rename to src/lib/util/xmlfile.cpp
diff --git a/src/icludes/lib/util/xmlfile.h b/src/lib/util/xmlfile.h
similarity index 100%
rename from src/icludes/lib/util/xmlfile.h
rename to src/lib/util/xmlfile.h
diff --git a/src/icludes/lib/util/zippath.cpp b/src/lib/util/zippath.cpp
similarity index 100%
rename from src/icludes/lib/util/zippath.cpp
rename to src/lib/util/zippath.cpp
diff --git a/src/icludes/lib/util/zippath.h b/src/lib/util/zippath.h
similarity index 100%
rename from src/icludes/lib/util/zippath.h
rename to src/lib/util/zippath.h
diff --git a/src/icludes/osd/asio.h b/src/osd/asio.h
similarity index 100%
rename from src/icludes/osd/asio.h
rename to src/osd/asio.h
diff --git a/src/icludes/osd/eigcc.h b/src/osd/eigcc.h
similarity index 100%
rename from src/icludes/osd/eigcc.h
rename to src/osd/eigcc.h
diff --git a/src/icludes/osd/eigccarm.h b/src/osd/eigccarm.h
similarity index 100%
rename from src/icludes/osd/eigccarm.h
rename to src/osd/eigccarm.h
diff --git a/src/icludes/osd/eigccppc.h b/src/osd/eigccppc.h
similarity index 100%
rename from src/icludes/osd/eigccppc.h
rename to src/osd/eigccppc.h
diff --git a/src/icludes/osd/eigccx86.h b/src/osd/eigccx86.h
similarity index 100%
rename from src/icludes/osd/eigccx86.h
rename to src/osd/eigccx86.h
diff --git a/src/icludes/osd/eivc.h b/src/osd/eivc.h
similarity index 100%
rename from src/icludes/osd/eivc.h
rename to src/osd/eivc.h
diff --git a/src/icludes/osd/eivcarm.h b/src/osd/eivcarm.h
similarity index 100%
rename from src/icludes/osd/eivcarm.h
rename to src/osd/eivcarm.h
diff --git a/src/icludes/osd/eivcx86.h b/src/osd/eivcx86.h
similarity index 100%
rename from src/icludes/osd/eivcx86.h
rename to src/osd/eivcx86.h
diff --git a/src/icludes/osd/eminline.h b/src/osd/eminline.h
similarity index 100%
rename from src/icludes/osd/eminline.h
rename to src/osd/eminline.h
diff --git a/src/icludes/osd/mac/appdelegate.h b/src/osd/mac/appdelegate.h
similarity index 100%
rename from src/icludes/osd/mac/appdelegate.h
rename to src/osd/mac/appdelegate.h
diff --git a/src/icludes/osd/mac/appdelegate.mm b/src/osd/mac/appdelegate.mm
similarity index 100%
rename from src/icludes/osd/mac/appdelegate.mm
rename to src/osd/mac/appdelegate.mm
diff --git a/src/icludes/osd/mac/macmain.cpp b/src/osd/mac/macmain.cpp
similarity index 100%
rename from src/icludes/osd/mac/macmain.cpp
rename to src/osd/mac/macmain.cpp
diff --git a/src/icludes/osd/mac/main.mm b/src/osd/mac/main.mm
similarity index 100%
rename from src/icludes/osd/mac/main.mm
rename to src/osd/mac/main.mm
diff --git a/src/icludes/osd/mac/mamefswindow.h b/src/osd/mac/mamefswindow.h
similarity index 100%
rename from src/icludes/osd/mac/mamefswindow.h
rename to src/osd/mac/mamefswindow.h
diff --git a/src/icludes/osd/mac/mamefswindow.mm b/src/osd/mac/mamefswindow.mm
similarity index 100%
rename from src/icludes/osd/mac/mamefswindow.mm
rename to src/osd/mac/mamefswindow.mm
diff --git a/src/icludes/osd/mac/oglview.h b/src/osd/mac/oglview.h
similarity index 100%
rename from src/icludes/osd/mac/oglview.h
rename to src/osd/mac/oglview.h
diff --git a/src/icludes/osd/mac/oglview.mm b/src/osd/mac/oglview.mm
similarity index 100%
rename from src/icludes/osd/mac/oglview.mm
rename to src/osd/mac/oglview.mm
diff --git a/src/icludes/osd/mac/osdmac.h b/src/osd/mac/osdmac.h
similarity index 100%
rename from src/icludes/osd/mac/osdmac.h
rename to src/osd/mac/osdmac.h
diff --git a/src/icludes/osd/mac/video.cpp b/src/osd/mac/video.cpp
similarity index 100%
rename from src/icludes/osd/mac/video.cpp
rename to src/osd/mac/video.cpp
diff --git a/src/icludes/osd/mac/window.cpp b/src/osd/mac/window.cpp
similarity index 100%
rename from src/icludes/osd/mac/window.cpp
rename to src/osd/mac/window.cpp
diff --git a/src/icludes/osd/mac/window.h b/src/osd/mac/window.h
similarity index 100%
rename from src/icludes/osd/mac/window.h
rename to src/osd/mac/window.h
diff --git a/src/icludes/osd/mac/windowcontroller.h b/src/osd/mac/windowcontroller.h
similarity index 100%
rename from src/icludes/osd/mac/windowcontroller.h
rename to src/osd/mac/windowcontroller.h
diff --git a/src/icludes/osd/mac/windowcontroller.mm b/src/osd/mac/windowcontroller.mm
similarity index 100%
rename from src/icludes/osd/mac/windowcontroller.mm
rename to src/osd/mac/windowcontroller.mm
diff --git a/src/icludes/osd/modules/debugger/debug_module.h b/src/osd/modules/debugger/debug_module.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/debug_module.h
rename to src/osd/modules/debugger/debug_module.h
diff --git a/src/icludes/osd/modules/debugger/debuggdbstub.cpp b/src/osd/modules/debugger/debuggdbstub.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/debuggdbstub.cpp
rename to src/osd/modules/debugger/debuggdbstub.cpp
diff --git a/src/icludes/osd/modules/debugger/debugimgui.cpp b/src/osd/modules/debugger/debugimgui.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/debugimgui.cpp
rename to src/osd/modules/debugger/debugimgui.cpp
diff --git a/src/icludes/osd/modules/debugger/debugosx.mm b/src/osd/modules/debugger/debugosx.mm
similarity index 100%
rename from src/icludes/osd/modules/debugger/debugosx.mm
rename to src/osd/modules/debugger/debugosx.mm
diff --git a/src/icludes/osd/modules/debugger/debugqt.cpp b/src/osd/modules/debugger/debugqt.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/debugqt.cpp
rename to src/osd/modules/debugger/debugqt.cpp
diff --git a/src/icludes/osd/modules/debugger/debugwin.cpp b/src/osd/modules/debugger/debugwin.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/debugwin.cpp
rename to src/osd/modules/debugger/debugwin.cpp
diff --git a/src/icludes/osd/modules/debugger/none.cpp b/src/osd/modules/debugger/none.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/none.cpp
rename to src/osd/modules/debugger/none.cpp
diff --git a/src/icludes/osd/modules/debugger/osx/breakpointsview.h b/src/osd/modules/debugger/osx/breakpointsview.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/breakpointsview.h
rename to src/osd/modules/debugger/osx/breakpointsview.h
diff --git a/src/icludes/osd/modules/debugger/osx/breakpointsview.mm b/src/osd/modules/debugger/osx/breakpointsview.mm
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/breakpointsview.mm
rename to src/osd/modules/debugger/osx/breakpointsview.mm
diff --git a/src/icludes/osd/modules/debugger/osx/consoleview.h b/src/osd/modules/debugger/osx/consoleview.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/consoleview.h
rename to src/osd/modules/debugger/osx/consoleview.h
diff --git a/src/icludes/osd/modules/debugger/osx/consoleview.mm b/src/osd/modules/debugger/osx/consoleview.mm
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/consoleview.mm
rename to src/osd/modules/debugger/osx/consoleview.mm
diff --git a/src/icludes/osd/modules/debugger/osx/debugcommandhistory.h b/src/osd/modules/debugger/osx/debugcommandhistory.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/debugcommandhistory.h
rename to src/osd/modules/debugger/osx/debugcommandhistory.h
diff --git a/src/icludes/osd/modules/debugger/osx/debugcommandhistory.mm b/src/osd/modules/debugger/osx/debugcommandhistory.mm
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/debugcommandhistory.mm
rename to src/osd/modules/debugger/osx/debugcommandhistory.mm
diff --git a/src/icludes/osd/modules/debugger/osx/debugconsole.h b/src/osd/modules/debugger/osx/debugconsole.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/debugconsole.h
rename to src/osd/modules/debugger/osx/debugconsole.h
diff --git a/src/icludes/osd/modules/debugger/osx/debugconsole.mm b/src/osd/modules/debugger/osx/debugconsole.mm
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/debugconsole.mm
rename to src/osd/modules/debugger/osx/debugconsole.mm
diff --git a/src/icludes/osd/modules/debugger/osx/debugosx.h b/src/osd/modules/debugger/osx/debugosx.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/debugosx.h
rename to src/osd/modules/debugger/osx/debugosx.h
diff --git a/src/icludes/osd/modules/debugger/osx/debugview.h b/src/osd/modules/debugger/osx/debugview.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/debugview.h
rename to src/osd/modules/debugger/osx/debugview.h
diff --git a/src/icludes/osd/modules/debugger/osx/debugview.mm b/src/osd/modules/debugger/osx/debugview.mm
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/debugview.mm
rename to src/osd/modules/debugger/osx/debugview.mm
diff --git a/src/icludes/osd/modules/debugger/osx/debugwindowhandler.h b/src/osd/modules/debugger/osx/debugwindowhandler.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/debugwindowhandler.h
rename to src/osd/modules/debugger/osx/debugwindowhandler.h
diff --git a/src/icludes/osd/modules/debugger/osx/debugwindowhandler.mm b/src/osd/modules/debugger/osx/debugwindowhandler.mm
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/debugwindowhandler.mm
rename to src/osd/modules/debugger/osx/debugwindowhandler.mm
diff --git a/src/icludes/osd/modules/debugger/osx/deviceinfoviewer.h b/src/osd/modules/debugger/osx/deviceinfoviewer.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/deviceinfoviewer.h
rename to src/osd/modules/debugger/osx/deviceinfoviewer.h
diff --git a/src/icludes/osd/modules/debugger/osx/deviceinfoviewer.mm b/src/osd/modules/debugger/osx/deviceinfoviewer.mm
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/deviceinfoviewer.mm
rename to src/osd/modules/debugger/osx/deviceinfoviewer.mm
diff --git a/src/icludes/osd/modules/debugger/osx/devicesviewer.h b/src/osd/modules/debugger/osx/devicesviewer.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/devicesviewer.h
rename to src/osd/modules/debugger/osx/devicesviewer.h
diff --git a/src/icludes/osd/modules/debugger/osx/devicesviewer.mm b/src/osd/modules/debugger/osx/devicesviewer.mm
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/devicesviewer.mm
rename to src/osd/modules/debugger/osx/devicesviewer.mm
diff --git a/src/icludes/osd/modules/debugger/osx/disassemblyview.h b/src/osd/modules/debugger/osx/disassemblyview.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/disassemblyview.h
rename to src/osd/modules/debugger/osx/disassemblyview.h
diff --git a/src/icludes/osd/modules/debugger/osx/disassemblyview.mm b/src/osd/modules/debugger/osx/disassemblyview.mm
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/disassemblyview.mm
rename to src/osd/modules/debugger/osx/disassemblyview.mm
diff --git a/src/icludes/osd/modules/debugger/osx/disassemblyviewer.h b/src/osd/modules/debugger/osx/disassemblyviewer.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/disassemblyviewer.h
rename to src/osd/modules/debugger/osx/disassemblyviewer.h
diff --git a/src/icludes/osd/modules/debugger/osx/disassemblyviewer.mm b/src/osd/modules/debugger/osx/disassemblyviewer.mm
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/disassemblyviewer.mm
rename to src/osd/modules/debugger/osx/disassemblyviewer.mm
diff --git a/src/icludes/osd/modules/debugger/osx/errorlogview.h b/src/osd/modules/debugger/osx/errorlogview.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/errorlogview.h
rename to src/osd/modules/debugger/osx/errorlogview.h
diff --git a/src/icludes/osd/modules/debugger/osx/errorlogview.mm b/src/osd/modules/debugger/osx/errorlogview.mm
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/errorlogview.mm
rename to src/osd/modules/debugger/osx/errorlogview.mm
diff --git a/src/icludes/osd/modules/debugger/osx/errorlogviewer.h b/src/osd/modules/debugger/osx/errorlogviewer.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/errorlogviewer.h
rename to src/osd/modules/debugger/osx/errorlogviewer.h
diff --git a/src/icludes/osd/modules/debugger/osx/errorlogviewer.mm b/src/osd/modules/debugger/osx/errorlogviewer.mm
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/errorlogviewer.mm
rename to src/osd/modules/debugger/osx/errorlogviewer.mm
diff --git a/src/icludes/osd/modules/debugger/osx/memoryview.h b/src/osd/modules/debugger/osx/memoryview.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/memoryview.h
rename to src/osd/modules/debugger/osx/memoryview.h
diff --git a/src/icludes/osd/modules/debugger/osx/memoryview.mm b/src/osd/modules/debugger/osx/memoryview.mm
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/memoryview.mm
rename to src/osd/modules/debugger/osx/memoryview.mm
diff --git a/src/icludes/osd/modules/debugger/osx/memoryviewer.h b/src/osd/modules/debugger/osx/memoryviewer.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/memoryviewer.h
rename to src/osd/modules/debugger/osx/memoryviewer.h
diff --git a/src/icludes/osd/modules/debugger/osx/memoryviewer.mm b/src/osd/modules/debugger/osx/memoryviewer.mm
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/memoryviewer.mm
rename to src/osd/modules/debugger/osx/memoryviewer.mm
diff --git a/src/icludes/osd/modules/debugger/osx/pointsviewer.h b/src/osd/modules/debugger/osx/pointsviewer.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/pointsviewer.h
rename to src/osd/modules/debugger/osx/pointsviewer.h
diff --git a/src/icludes/osd/modules/debugger/osx/pointsviewer.mm b/src/osd/modules/debugger/osx/pointsviewer.mm
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/pointsviewer.mm
rename to src/osd/modules/debugger/osx/pointsviewer.mm
diff --git a/src/icludes/osd/modules/debugger/osx/registerpointsview.h b/src/osd/modules/debugger/osx/registerpointsview.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/registerpointsview.h
rename to src/osd/modules/debugger/osx/registerpointsview.h
diff --git a/src/icludes/osd/modules/debugger/osx/registerpointsview.mm b/src/osd/modules/debugger/osx/registerpointsview.mm
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/registerpointsview.mm
rename to src/osd/modules/debugger/osx/registerpointsview.mm
diff --git a/src/icludes/osd/modules/debugger/osx/registersview.h b/src/osd/modules/debugger/osx/registersview.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/registersview.h
rename to src/osd/modules/debugger/osx/registersview.h
diff --git a/src/icludes/osd/modules/debugger/osx/registersview.mm b/src/osd/modules/debugger/osx/registersview.mm
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/registersview.mm
rename to src/osd/modules/debugger/osx/registersview.mm
diff --git a/src/icludes/osd/modules/debugger/osx/watchpointsview.h b/src/osd/modules/debugger/osx/watchpointsview.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/watchpointsview.h
rename to src/osd/modules/debugger/osx/watchpointsview.h
diff --git a/src/icludes/osd/modules/debugger/osx/watchpointsview.mm b/src/osd/modules/debugger/osx/watchpointsview.mm
similarity index 100%
rename from src/icludes/osd/modules/debugger/osx/watchpointsview.mm
rename to src/osd/modules/debugger/osx/watchpointsview.mm
diff --git a/src/icludes/osd/modules/debugger/qt/breakpointswindow.cpp b/src/osd/modules/debugger/qt/breakpointswindow.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/qt/breakpointswindow.cpp
rename to src/osd/modules/debugger/qt/breakpointswindow.cpp
diff --git a/src/icludes/osd/modules/debugger/qt/breakpointswindow.h b/src/osd/modules/debugger/qt/breakpointswindow.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/qt/breakpointswindow.h
rename to src/osd/modules/debugger/qt/breakpointswindow.h
diff --git a/src/icludes/osd/modules/debugger/qt/dasmwindow.cpp b/src/osd/modules/debugger/qt/dasmwindow.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/qt/dasmwindow.cpp
rename to src/osd/modules/debugger/qt/dasmwindow.cpp
diff --git a/src/icludes/osd/modules/debugger/qt/dasmwindow.h b/src/osd/modules/debugger/qt/dasmwindow.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/qt/dasmwindow.h
rename to src/osd/modules/debugger/qt/dasmwindow.h
diff --git a/src/icludes/osd/modules/debugger/qt/debuggerview.cpp b/src/osd/modules/debugger/qt/debuggerview.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/qt/debuggerview.cpp
rename to src/osd/modules/debugger/qt/debuggerview.cpp
diff --git a/src/icludes/osd/modules/debugger/qt/debuggerview.h b/src/osd/modules/debugger/qt/debuggerview.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/qt/debuggerview.h
rename to src/osd/modules/debugger/qt/debuggerview.h
diff --git a/src/icludes/osd/modules/debugger/qt/deviceinformationwindow.cpp b/src/osd/modules/debugger/qt/deviceinformationwindow.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/qt/deviceinformationwindow.cpp
rename to src/osd/modules/debugger/qt/deviceinformationwindow.cpp
diff --git a/src/icludes/osd/modules/debugger/qt/deviceinformationwindow.h b/src/osd/modules/debugger/qt/deviceinformationwindow.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/qt/deviceinformationwindow.h
rename to src/osd/modules/debugger/qt/deviceinformationwindow.h
diff --git a/src/icludes/osd/modules/debugger/qt/deviceswindow.cpp b/src/osd/modules/debugger/qt/deviceswindow.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/qt/deviceswindow.cpp
rename to src/osd/modules/debugger/qt/deviceswindow.cpp
diff --git a/src/icludes/osd/modules/debugger/qt/deviceswindow.h b/src/osd/modules/debugger/qt/deviceswindow.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/qt/deviceswindow.h
rename to src/osd/modules/debugger/qt/deviceswindow.h
diff --git a/src/icludes/osd/modules/debugger/qt/logwindow.cpp b/src/osd/modules/debugger/qt/logwindow.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/qt/logwindow.cpp
rename to src/osd/modules/debugger/qt/logwindow.cpp
diff --git a/src/icludes/osd/modules/debugger/qt/logwindow.h b/src/osd/modules/debugger/qt/logwindow.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/qt/logwindow.h
rename to src/osd/modules/debugger/qt/logwindow.h
diff --git a/src/icludes/osd/modules/debugger/qt/mainwindow.cpp b/src/osd/modules/debugger/qt/mainwindow.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/qt/mainwindow.cpp
rename to src/osd/modules/debugger/qt/mainwindow.cpp
diff --git a/src/icludes/osd/modules/debugger/qt/mainwindow.h b/src/osd/modules/debugger/qt/mainwindow.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/qt/mainwindow.h
rename to src/osd/modules/debugger/qt/mainwindow.h
diff --git a/src/icludes/osd/modules/debugger/qt/memorywindow.cpp b/src/osd/modules/debugger/qt/memorywindow.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/qt/memorywindow.cpp
rename to src/osd/modules/debugger/qt/memorywindow.cpp
diff --git a/src/icludes/osd/modules/debugger/qt/memorywindow.h b/src/osd/modules/debugger/qt/memorywindow.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/qt/memorywindow.h
rename to src/osd/modules/debugger/qt/memorywindow.h
diff --git a/src/icludes/osd/modules/debugger/qt/windowqt.cpp b/src/osd/modules/debugger/qt/windowqt.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/qt/windowqt.cpp
rename to src/osd/modules/debugger/qt/windowqt.cpp
diff --git a/src/icludes/osd/modules/debugger/qt/windowqt.h b/src/osd/modules/debugger/qt/windowqt.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/qt/windowqt.h
rename to src/osd/modules/debugger/qt/windowqt.h
diff --git a/src/icludes/osd/modules/debugger/win/consolewininfo.cpp b/src/osd/modules/debugger/win/consolewininfo.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/consolewininfo.cpp
rename to src/osd/modules/debugger/win/consolewininfo.cpp
diff --git a/src/icludes/osd/modules/debugger/win/consolewininfo.h b/src/osd/modules/debugger/win/consolewininfo.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/consolewininfo.h
rename to src/osd/modules/debugger/win/consolewininfo.h
diff --git a/src/icludes/osd/modules/debugger/win/debugbaseinfo.cpp b/src/osd/modules/debugger/win/debugbaseinfo.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/debugbaseinfo.cpp
rename to src/osd/modules/debugger/win/debugbaseinfo.cpp
diff --git a/src/icludes/osd/modules/debugger/win/debugbaseinfo.h b/src/osd/modules/debugger/win/debugbaseinfo.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/debugbaseinfo.h
rename to src/osd/modules/debugger/win/debugbaseinfo.h
diff --git a/src/icludes/osd/modules/debugger/win/debugviewinfo.cpp b/src/osd/modules/debugger/win/debugviewinfo.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/debugviewinfo.cpp
rename to src/osd/modules/debugger/win/debugviewinfo.cpp
diff --git a/src/icludes/osd/modules/debugger/win/debugviewinfo.h b/src/osd/modules/debugger/win/debugviewinfo.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/debugviewinfo.h
rename to src/osd/modules/debugger/win/debugviewinfo.h
diff --git a/src/icludes/osd/modules/debugger/win/debugwin.h b/src/osd/modules/debugger/win/debugwin.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/debugwin.h
rename to src/osd/modules/debugger/win/debugwin.h
diff --git a/src/icludes/osd/modules/debugger/win/debugwininfo.cpp b/src/osd/modules/debugger/win/debugwininfo.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/debugwininfo.cpp
rename to src/osd/modules/debugger/win/debugwininfo.cpp
diff --git a/src/icludes/osd/modules/debugger/win/debugwininfo.h b/src/osd/modules/debugger/win/debugwininfo.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/debugwininfo.h
rename to src/osd/modules/debugger/win/debugwininfo.h
diff --git a/src/icludes/osd/modules/debugger/win/disasmbasewininfo.cpp b/src/osd/modules/debugger/win/disasmbasewininfo.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/disasmbasewininfo.cpp
rename to src/osd/modules/debugger/win/disasmbasewininfo.cpp
diff --git a/src/icludes/osd/modules/debugger/win/disasmbasewininfo.h b/src/osd/modules/debugger/win/disasmbasewininfo.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/disasmbasewininfo.h
rename to src/osd/modules/debugger/win/disasmbasewininfo.h
diff --git a/src/icludes/osd/modules/debugger/win/disasmviewinfo.cpp b/src/osd/modules/debugger/win/disasmviewinfo.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/disasmviewinfo.cpp
rename to src/osd/modules/debugger/win/disasmviewinfo.cpp
diff --git a/src/icludes/osd/modules/debugger/win/disasmviewinfo.h b/src/osd/modules/debugger/win/disasmviewinfo.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/disasmviewinfo.h
rename to src/osd/modules/debugger/win/disasmviewinfo.h
diff --git a/src/icludes/osd/modules/debugger/win/disasmwininfo.cpp b/src/osd/modules/debugger/win/disasmwininfo.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/disasmwininfo.cpp
rename to src/osd/modules/debugger/win/disasmwininfo.cpp
diff --git a/src/icludes/osd/modules/debugger/win/disasmwininfo.h b/src/osd/modules/debugger/win/disasmwininfo.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/disasmwininfo.h
rename to src/osd/modules/debugger/win/disasmwininfo.h
diff --git a/src/icludes/osd/modules/debugger/win/editwininfo.cpp b/src/osd/modules/debugger/win/editwininfo.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/editwininfo.cpp
rename to src/osd/modules/debugger/win/editwininfo.cpp
diff --git a/src/icludes/osd/modules/debugger/win/editwininfo.h b/src/osd/modules/debugger/win/editwininfo.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/editwininfo.h
rename to src/osd/modules/debugger/win/editwininfo.h
diff --git a/src/icludes/osd/modules/debugger/win/logviewinfo.cpp b/src/osd/modules/debugger/win/logviewinfo.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/logviewinfo.cpp
rename to src/osd/modules/debugger/win/logviewinfo.cpp
diff --git a/src/icludes/osd/modules/debugger/win/logviewinfo.h b/src/osd/modules/debugger/win/logviewinfo.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/logviewinfo.h
rename to src/osd/modules/debugger/win/logviewinfo.h
diff --git a/src/icludes/osd/modules/debugger/win/logwininfo.cpp b/src/osd/modules/debugger/win/logwininfo.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/logwininfo.cpp
rename to src/osd/modules/debugger/win/logwininfo.cpp
diff --git a/src/icludes/osd/modules/debugger/win/logwininfo.h b/src/osd/modules/debugger/win/logwininfo.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/logwininfo.h
rename to src/osd/modules/debugger/win/logwininfo.h
diff --git a/src/icludes/osd/modules/debugger/win/memoryviewinfo.cpp b/src/osd/modules/debugger/win/memoryviewinfo.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/memoryviewinfo.cpp
rename to src/osd/modules/debugger/win/memoryviewinfo.cpp
diff --git a/src/icludes/osd/modules/debugger/win/memoryviewinfo.h b/src/osd/modules/debugger/win/memoryviewinfo.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/memoryviewinfo.h
rename to src/osd/modules/debugger/win/memoryviewinfo.h
diff --git a/src/icludes/osd/modules/debugger/win/memorywininfo.cpp b/src/osd/modules/debugger/win/memorywininfo.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/memorywininfo.cpp
rename to src/osd/modules/debugger/win/memorywininfo.cpp
diff --git a/src/icludes/osd/modules/debugger/win/memorywininfo.h b/src/osd/modules/debugger/win/memorywininfo.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/memorywininfo.h
rename to src/osd/modules/debugger/win/memorywininfo.h
diff --git a/src/icludes/osd/modules/debugger/win/pointswininfo.cpp b/src/osd/modules/debugger/win/pointswininfo.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/pointswininfo.cpp
rename to src/osd/modules/debugger/win/pointswininfo.cpp
diff --git a/src/icludes/osd/modules/debugger/win/pointswininfo.h b/src/osd/modules/debugger/win/pointswininfo.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/pointswininfo.h
rename to src/osd/modules/debugger/win/pointswininfo.h
diff --git a/src/icludes/osd/modules/debugger/win/uimetrics.cpp b/src/osd/modules/debugger/win/uimetrics.cpp
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/uimetrics.cpp
rename to src/osd/modules/debugger/win/uimetrics.cpp
diff --git a/src/icludes/osd/modules/debugger/win/uimetrics.h b/src/osd/modules/debugger/win/uimetrics.h
similarity index 100%
rename from src/icludes/osd/modules/debugger/win/uimetrics.h
rename to src/osd/modules/debugger/win/uimetrics.h
diff --git a/src/icludes/osd/modules/diagnostics/diagnostics_module.h b/src/osd/modules/diagnostics/diagnostics_module.h
similarity index 100%
rename from src/icludes/osd/modules/diagnostics/diagnostics_module.h
rename to src/osd/modules/diagnostics/diagnostics_module.h
diff --git a/src/icludes/osd/modules/diagnostics/diagnostics_win32.cpp b/src/osd/modules/diagnostics/diagnostics_win32.cpp
similarity index 100%
rename from src/icludes/osd/modules/diagnostics/diagnostics_win32.cpp
rename to src/osd/modules/diagnostics/diagnostics_win32.cpp
diff --git a/src/icludes/osd/modules/diagnostics/none.cpp b/src/osd/modules/diagnostics/none.cpp
similarity index 100%
rename from src/icludes/osd/modules/diagnostics/none.cpp
rename to src/osd/modules/diagnostics/none.cpp
diff --git a/src/icludes/osd/modules/file/posixdir.cpp b/src/osd/modules/file/posixdir.cpp
similarity index 100%
rename from src/icludes/osd/modules/file/posixdir.cpp
rename to src/osd/modules/file/posixdir.cpp
diff --git a/src/icludes/osd/modules/file/posixfile.cpp b/src/osd/modules/file/posixfile.cpp
similarity index 100%
rename from src/icludes/osd/modules/file/posixfile.cpp
rename to src/osd/modules/file/posixfile.cpp
diff --git a/src/icludes/osd/modules/file/posixfile.h b/src/osd/modules/file/posixfile.h
similarity index 100%
rename from src/icludes/osd/modules/file/posixfile.h
rename to src/osd/modules/file/posixfile.h
diff --git a/src/icludes/osd/modules/file/posixptty.cpp b/src/osd/modules/file/posixptty.cpp
similarity index 100%
rename from src/icludes/osd/modules/file/posixptty.cpp
rename to src/osd/modules/file/posixptty.cpp
diff --git a/src/icludes/osd/modules/file/posixsocket.cpp b/src/osd/modules/file/posixsocket.cpp
similarity index 100%
rename from src/icludes/osd/modules/file/posixsocket.cpp
rename to src/osd/modules/file/posixsocket.cpp
diff --git a/src/icludes/osd/modules/file/stdfile.cpp b/src/osd/modules/file/stdfile.cpp
similarity index 100%
rename from src/icludes/osd/modules/file/stdfile.cpp
rename to src/osd/modules/file/stdfile.cpp
diff --git a/src/icludes/osd/modules/file/windir.cpp b/src/osd/modules/file/windir.cpp
similarity index 100%
rename from src/icludes/osd/modules/file/windir.cpp
rename to src/osd/modules/file/windir.cpp
diff --git a/src/icludes/osd/modules/file/winfile.cpp b/src/osd/modules/file/winfile.cpp
similarity index 100%
rename from src/icludes/osd/modules/file/winfile.cpp
rename to src/osd/modules/file/winfile.cpp
diff --git a/src/icludes/osd/modules/file/winfile.h b/src/osd/modules/file/winfile.h
similarity index 100%
rename from src/icludes/osd/modules/file/winfile.h
rename to src/osd/modules/file/winfile.h
diff --git a/src/icludes/osd/modules/file/winptty.cpp b/src/osd/modules/file/winptty.cpp
similarity index 100%
rename from src/icludes/osd/modules/file/winptty.cpp
rename to src/osd/modules/file/winptty.cpp
diff --git a/src/icludes/osd/modules/file/winrtdir.cpp b/src/osd/modules/file/winrtdir.cpp
similarity index 100%
rename from src/icludes/osd/modules/file/winrtdir.cpp
rename to src/osd/modules/file/winrtdir.cpp
diff --git a/src/icludes/osd/modules/file/winrtfile.cpp b/src/osd/modules/file/winrtfile.cpp
similarity index 100%
rename from src/icludes/osd/modules/file/winrtfile.cpp
rename to src/osd/modules/file/winrtfile.cpp
diff --git a/src/icludes/osd/modules/file/winrtfile.h b/src/osd/modules/file/winrtfile.h
similarity index 100%
rename from src/icludes/osd/modules/file/winrtfile.h
rename to src/osd/modules/file/winrtfile.h
diff --git a/src/icludes/osd/modules/file/winrtptty.cpp b/src/osd/modules/file/winrtptty.cpp
similarity index 100%
rename from src/icludes/osd/modules/file/winrtptty.cpp
rename to src/osd/modules/file/winrtptty.cpp
diff --git a/src/icludes/osd/modules/file/winrtsocket.cpp b/src/osd/modules/file/winrtsocket.cpp
similarity index 100%
rename from src/icludes/osd/modules/file/winrtsocket.cpp
rename to src/osd/modules/file/winrtsocket.cpp
diff --git a/src/icludes/osd/modules/file/winsocket.cpp b/src/osd/modules/file/winsocket.cpp
similarity index 100%
rename from src/icludes/osd/modules/file/winsocket.cpp
rename to src/osd/modules/file/winsocket.cpp
diff --git a/src/icludes/osd/modules/font/font_dwrite.cpp b/src/osd/modules/font/font_dwrite.cpp
similarity index 100%
rename from src/icludes/osd/modules/font/font_dwrite.cpp
rename to src/osd/modules/font/font_dwrite.cpp
diff --git a/src/icludes/osd/modules/font/font_module.h b/src/osd/modules/font/font_module.h
similarity index 100%
rename from src/icludes/osd/modules/font/font_module.h
rename to src/osd/modules/font/font_module.h
diff --git a/src/icludes/osd/modules/font/font_none.cpp b/src/osd/modules/font/font_none.cpp
similarity index 100%
rename from src/icludes/osd/modules/font/font_none.cpp
rename to src/osd/modules/font/font_none.cpp
diff --git a/src/icludes/osd/modules/font/font_osx.cpp b/src/osd/modules/font/font_osx.cpp
similarity index 100%
rename from src/icludes/osd/modules/font/font_osx.cpp
rename to src/osd/modules/font/font_osx.cpp
diff --git a/src/icludes/osd/modules/font/font_sdl.cpp b/src/osd/modules/font/font_sdl.cpp
similarity index 100%
rename from src/icludes/osd/modules/font/font_sdl.cpp
rename to src/osd/modules/font/font_sdl.cpp
diff --git a/src/icludes/osd/modules/font/font_windows.cpp b/src/osd/modules/font/font_windows.cpp
similarity index 100%
rename from src/icludes/osd/modules/font/font_windows.cpp
rename to src/osd/modules/font/font_windows.cpp
diff --git a/src/icludes/osd/modules/input/input_common.cpp b/src/osd/modules/input/input_common.cpp
similarity index 100%
rename from src/icludes/osd/modules/input/input_common.cpp
rename to src/osd/modules/input/input_common.cpp
diff --git a/src/icludes/osd/modules/input/input_common.h b/src/osd/modules/input/input_common.h
similarity index 100%
rename from src/icludes/osd/modules/input/input_common.h
rename to src/osd/modules/input/input_common.h
diff --git a/src/icludes/osd/modules/input/input_dinput.cpp b/src/osd/modules/input/input_dinput.cpp
similarity index 100%
rename from src/icludes/osd/modules/input/input_dinput.cpp
rename to src/osd/modules/input/input_dinput.cpp
diff --git a/src/icludes/osd/modules/input/input_dinput.h b/src/osd/modules/input/input_dinput.h
similarity index 100%
rename from src/icludes/osd/modules/input/input_dinput.h
rename to src/osd/modules/input/input_dinput.h
diff --git a/src/icludes/osd/modules/input/input_mac.cpp b/src/osd/modules/input/input_mac.cpp
similarity index 100%
rename from src/icludes/osd/modules/input/input_mac.cpp
rename to src/osd/modules/input/input_mac.cpp
diff --git a/src/icludes/osd/modules/input/input_module.h b/src/osd/modules/input/input_module.h
similarity index 100%
rename from src/icludes/osd/modules/input/input_module.h
rename to src/osd/modules/input/input_module.h
diff --git a/src/icludes/osd/modules/input/input_none.cpp b/src/osd/modules/input/input_none.cpp
similarity index 100%
rename from src/icludes/osd/modules/input/input_none.cpp
rename to src/osd/modules/input/input_none.cpp
diff --git a/src/icludes/osd/modules/input/input_rawinput.cpp b/src/osd/modules/input/input_rawinput.cpp
similarity index 100%
rename from src/icludes/osd/modules/input/input_rawinput.cpp
rename to src/osd/modules/input/input_rawinput.cpp
diff --git a/src/icludes/osd/modules/input/input_sdl.cpp b/src/osd/modules/input/input_sdl.cpp
similarity index 100%
rename from src/icludes/osd/modules/input/input_sdl.cpp
rename to src/osd/modules/input/input_sdl.cpp
diff --git a/src/icludes/osd/modules/input/input_sdlcommon.cpp b/src/osd/modules/input/input_sdlcommon.cpp
similarity index 100%
rename from src/icludes/osd/modules/input/input_sdlcommon.cpp
rename to src/osd/modules/input/input_sdlcommon.cpp
diff --git a/src/icludes/osd/modules/input/input_sdlcommon.h b/src/osd/modules/input/input_sdlcommon.h
similarity index 100%
rename from src/icludes/osd/modules/input/input_sdlcommon.h
rename to src/osd/modules/input/input_sdlcommon.h
diff --git a/src/icludes/osd/modules/input/input_win32.cpp b/src/osd/modules/input/input_win32.cpp
similarity index 100%
rename from src/icludes/osd/modules/input/input_win32.cpp
rename to src/osd/modules/input/input_win32.cpp
diff --git a/src/icludes/osd/modules/input/input_windows.cpp b/src/osd/modules/input/input_windows.cpp
similarity index 100%
rename from src/icludes/osd/modules/input/input_windows.cpp
rename to src/osd/modules/input/input_windows.cpp
diff --git a/src/icludes/osd/modules/input/input_windows.h b/src/osd/modules/input/input_windows.h
similarity index 100%
rename from src/icludes/osd/modules/input/input_windows.h
rename to src/osd/modules/input/input_windows.h
diff --git a/src/icludes/osd/modules/input/input_winhybrid.cpp b/src/osd/modules/input/input_winhybrid.cpp
similarity index 100%
rename from src/icludes/osd/modules/input/input_winhybrid.cpp
rename to src/osd/modules/input/input_winhybrid.cpp
diff --git a/src/icludes/osd/modules/input/input_x11.cpp b/src/osd/modules/input/input_x11.cpp
similarity index 100%
rename from src/icludes/osd/modules/input/input_x11.cpp
rename to src/osd/modules/input/input_x11.cpp
diff --git a/src/icludes/osd/modules/input/input_xinput.cpp b/src/osd/modules/input/input_xinput.cpp
similarity index 100%
rename from src/icludes/osd/modules/input/input_xinput.cpp
rename to src/osd/modules/input/input_xinput.cpp
diff --git a/src/icludes/osd/modules/input/input_xinput.h b/src/osd/modules/input/input_xinput.h
similarity index 100%
rename from src/icludes/osd/modules/input/input_xinput.h
rename to src/osd/modules/input/input_xinput.h
diff --git a/src/icludes/osd/modules/lib/osdlib.h b/src/osd/modules/lib/osdlib.h
similarity index 100%
rename from src/icludes/osd/modules/lib/osdlib.h
rename to src/osd/modules/lib/osdlib.h
diff --git a/src/icludes/osd/modules/lib/osdlib_macosx.cpp b/src/osd/modules/lib/osdlib_macosx.cpp
similarity index 100%
rename from src/icludes/osd/modules/lib/osdlib_macosx.cpp
rename to src/osd/modules/lib/osdlib_macosx.cpp
diff --git a/src/icludes/osd/modules/lib/osdlib_unix.cpp b/src/osd/modules/lib/osdlib_unix.cpp
similarity index 100%
rename from src/icludes/osd/modules/lib/osdlib_unix.cpp
rename to src/osd/modules/lib/osdlib_unix.cpp
diff --git a/src/icludes/osd/modules/lib/osdlib_win32.cpp b/src/osd/modules/lib/osdlib_win32.cpp
similarity index 100%
rename from src/icludes/osd/modules/lib/osdlib_win32.cpp
rename to src/osd/modules/lib/osdlib_win32.cpp
diff --git a/src/icludes/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp
similarity index 100%
rename from src/icludes/osd/modules/lib/osdobj_common.cpp
rename to src/osd/modules/lib/osdobj_common.cpp
diff --git a/src/icludes/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h
similarity index 100%
rename from src/icludes/osd/modules/lib/osdobj_common.h
rename to src/osd/modules/lib/osdobj_common.h
diff --git a/src/icludes/osd/modules/midi/midi_module.h b/src/osd/modules/midi/midi_module.h
similarity index 100%
rename from src/icludes/osd/modules/midi/midi_module.h
rename to src/osd/modules/midi/midi_module.h
diff --git a/src/icludes/osd/modules/midi/none.cpp b/src/osd/modules/midi/none.cpp
similarity index 100%
rename from src/icludes/osd/modules/midi/none.cpp
rename to src/osd/modules/midi/none.cpp
diff --git a/src/icludes/osd/modules/midi/portmidi.cpp b/src/osd/modules/midi/portmidi.cpp
similarity index 100%
rename from src/icludes/osd/modules/midi/portmidi.cpp
rename to src/osd/modules/midi/portmidi.cpp
diff --git a/src/icludes/osd/modules/monitor/monitor_common.cpp b/src/osd/modules/monitor/monitor_common.cpp
similarity index 100%
rename from src/icludes/osd/modules/monitor/monitor_common.cpp
rename to src/osd/modules/monitor/monitor_common.cpp
diff --git a/src/icludes/osd/modules/monitor/monitor_common.h b/src/osd/modules/monitor/monitor_common.h
similarity index 100%
rename from src/icludes/osd/modules/monitor/monitor_common.h
rename to src/osd/modules/monitor/monitor_common.h
diff --git a/src/icludes/osd/modules/monitor/monitor_dxgi.cpp b/src/osd/modules/monitor/monitor_dxgi.cpp
similarity index 100%
rename from src/icludes/osd/modules/monitor/monitor_dxgi.cpp
rename to src/osd/modules/monitor/monitor_dxgi.cpp
diff --git a/src/icludes/osd/modules/monitor/monitor_mac.cpp b/src/osd/modules/monitor/monitor_mac.cpp
similarity index 100%
rename from src/icludes/osd/modules/monitor/monitor_mac.cpp
rename to src/osd/modules/monitor/monitor_mac.cpp
diff --git a/src/icludes/osd/modules/monitor/monitor_module.h b/src/osd/modules/monitor/monitor_module.h
similarity index 100%
rename from src/icludes/osd/modules/monitor/monitor_module.h
rename to src/osd/modules/monitor/monitor_module.h
diff --git a/src/icludes/osd/modules/monitor/monitor_sdl.cpp b/src/osd/modules/monitor/monitor_sdl.cpp
similarity index 100%
rename from src/icludes/osd/modules/monitor/monitor_sdl.cpp
rename to src/osd/modules/monitor/monitor_sdl.cpp
diff --git a/src/icludes/osd/modules/monitor/monitor_win32.cpp b/src/osd/modules/monitor/monitor_win32.cpp
similarity index 100%
rename from src/icludes/osd/modules/monitor/monitor_win32.cpp
rename to src/osd/modules/monitor/monitor_win32.cpp
diff --git a/src/icludes/osd/modules/netdev/netdev_module.h b/src/osd/modules/netdev/netdev_module.h
similarity index 100%
rename from src/icludes/osd/modules/netdev/netdev_module.h
rename to src/osd/modules/netdev/netdev_module.h
diff --git a/src/icludes/osd/modules/netdev/none.cpp b/src/osd/modules/netdev/none.cpp
similarity index 100%
rename from src/icludes/osd/modules/netdev/none.cpp
rename to src/osd/modules/netdev/none.cpp
diff --git a/src/icludes/osd/modules/netdev/pcap.cpp b/src/osd/modules/netdev/pcap.cpp
similarity index 100%
rename from src/icludes/osd/modules/netdev/pcap.cpp
rename to src/osd/modules/netdev/pcap.cpp
diff --git a/src/icludes/osd/modules/netdev/taptun.cpp b/src/osd/modules/netdev/taptun.cpp
similarity index 100%
rename from src/icludes/osd/modules/netdev/taptun.cpp
rename to src/osd/modules/netdev/taptun.cpp
diff --git a/src/icludes/osd/modules/opengl/gl_shader_mgr.cpp b/src/osd/modules/opengl/gl_shader_mgr.cpp
similarity index 100%
rename from src/icludes/osd/modules/opengl/gl_shader_mgr.cpp
rename to src/osd/modules/opengl/gl_shader_mgr.cpp
diff --git a/src/icludes/osd/modules/opengl/gl_shader_mgr.h b/src/osd/modules/opengl/gl_shader_mgr.h
similarity index 100%
rename from src/icludes/osd/modules/opengl/gl_shader_mgr.h
rename to src/osd/modules/opengl/gl_shader_mgr.h
diff --git a/src/icludes/osd/modules/opengl/gl_shader_tool.cpp b/src/osd/modules/opengl/gl_shader_tool.cpp
similarity index 100%
rename from src/icludes/osd/modules/opengl/gl_shader_tool.cpp
rename to src/osd/modules/opengl/gl_shader_tool.cpp
diff --git a/src/icludes/osd/modules/opengl/gl_shader_tool.h b/src/osd/modules/opengl/gl_shader_tool.h
similarity index 100%
rename from src/icludes/osd/modules/opengl/gl_shader_tool.h
rename to src/osd/modules/opengl/gl_shader_tool.h
diff --git a/src/icludes/osd/modules/opengl/osd_opengl.h b/src/osd/modules/opengl/osd_opengl.h
similarity index 100%
rename from src/icludes/osd/modules/opengl/osd_opengl.h
rename to src/osd/modules/opengl/osd_opengl.h
diff --git a/src/icludes/osd/modules/opengl/shader/genc.sh b/src/osd/modules/opengl/shader/genc.sh
similarity index 100%
rename from src/icludes/osd/modules/opengl/shader/genc.sh
rename to src/osd/modules/opengl/shader/genc.sh
diff --git a/src/icludes/osd/modules/opengl/shader/glsl_bicubic_rgb32_dir.fsh b/src/osd/modules/opengl/shader/glsl_bicubic_rgb32_dir.fsh
similarity index 100%
rename from src/icludes/osd/modules/opengl/shader/glsl_bicubic_rgb32_dir.fsh
rename to src/osd/modules/opengl/shader/glsl_bicubic_rgb32_dir.fsh
diff --git a/src/icludes/osd/modules/opengl/shader/glsl_bicubic_rgb32_dir.fsh.c b/src/osd/modules/opengl/shader/glsl_bicubic_rgb32_dir.fsh.c
similarity index 100%
rename from src/icludes/osd/modules/opengl/shader/glsl_bicubic_rgb32_dir.fsh.c
rename to src/osd/modules/opengl/shader/glsl_bicubic_rgb32_dir.fsh.c
diff --git a/src/icludes/osd/modules/opengl/shader/glsl_bilinear.vsh b/src/osd/modules/opengl/shader/glsl_bilinear.vsh
similarity index 100%
rename from src/icludes/osd/modules/opengl/shader/glsl_bilinear.vsh
rename to src/osd/modules/opengl/shader/glsl_bilinear.vsh
diff --git a/src/icludes/osd/modules/opengl/shader/glsl_bilinear_idx16_lut.fsh b/src/osd/modules/opengl/shader/glsl_bilinear_idx16_lut.fsh
similarity index 100%
rename from src/icludes/osd/modules/opengl/shader/glsl_bilinear_idx16_lut.fsh
rename to src/osd/modules/opengl/shader/glsl_bilinear_idx16_lut.fsh
diff --git a/src/icludes/osd/modules/opengl/shader/glsl_bilinear_idx16_lut.fsh.c b/src/osd/modules/opengl/shader/glsl_bilinear_idx16_lut.fsh.c
similarity index 100%
rename from src/icludes/osd/modules/opengl/shader/glsl_bilinear_idx16_lut.fsh.c
rename to src/osd/modules/opengl/shader/glsl_bilinear_idx16_lut.fsh.c
diff --git a/src/icludes/osd/modules/opengl/shader/glsl_bilinear_rgb32_dir.fsh b/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_dir.fsh
similarity index 100%
rename from src/icludes/osd/modules/opengl/shader/glsl_bilinear_rgb32_dir.fsh
rename to src/osd/modules/opengl/shader/glsl_bilinear_rgb32_dir.fsh
diff --git a/src/icludes/osd/modules/opengl/shader/glsl_bilinear_rgb32_dir.fsh.c b/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_dir.fsh.c
similarity index 100%
rename from src/icludes/osd/modules/opengl/shader/glsl_bilinear_rgb32_dir.fsh.c
rename to src/osd/modules/opengl/shader/glsl_bilinear_rgb32_dir.fsh.c
diff --git a/src/icludes/osd/modules/opengl/shader/glsl_bilinear_rgb32_lut.fsh b/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_lut.fsh
similarity index 100%
rename from src/icludes/osd/modules/opengl/shader/glsl_bilinear_rgb32_lut.fsh
rename to src/osd/modules/opengl/shader/glsl_bilinear_rgb32_lut.fsh
diff --git a/src/icludes/osd/modules/opengl/shader/glsl_bilinear_rgb32_lut.fsh.c b/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_lut.fsh.c
similarity index 100%
rename from src/icludes/osd/modules/opengl/shader/glsl_bilinear_rgb32_lut.fsh.c
rename to src/osd/modules/opengl/shader/glsl_bilinear_rgb32_lut.fsh.c
diff --git a/src/icludes/osd/modules/opengl/shader/glsl_general.vsh b/src/osd/modules/opengl/shader/glsl_general.vsh
similarity index 100%
rename from src/icludes/osd/modules/opengl/shader/glsl_general.vsh
rename to src/osd/modules/opengl/shader/glsl_general.vsh
diff --git a/src/icludes/osd/modules/opengl/shader/glsl_general.vsh.c b/src/osd/modules/opengl/shader/glsl_general.vsh.c
similarity index 100%
rename from src/icludes/osd/modules/opengl/shader/glsl_general.vsh.c
rename to src/osd/modules/opengl/shader/glsl_general.vsh.c
diff --git a/src/icludes/osd/modules/opengl/shader/glsl_plain.vsh b/src/osd/modules/opengl/shader/glsl_plain.vsh
similarity index 100%
rename from src/icludes/osd/modules/opengl/shader/glsl_plain.vsh
rename to src/osd/modules/opengl/shader/glsl_plain.vsh
diff --git a/src/icludes/osd/modules/opengl/shader/glsl_plain_idx16_lut.fsh b/src/osd/modules/opengl/shader/glsl_plain_idx16_lut.fsh
similarity index 100%
rename from src/icludes/osd/modules/opengl/shader/glsl_plain_idx16_lut.fsh
rename to src/osd/modules/opengl/shader/glsl_plain_idx16_lut.fsh
diff --git a/src/icludes/osd/modules/opengl/shader/glsl_plain_idx16_lut.fsh.c b/src/osd/modules/opengl/shader/glsl_plain_idx16_lut.fsh.c
similarity index 100%
rename from src/icludes/osd/modules/opengl/shader/glsl_plain_idx16_lut.fsh.c
rename to src/osd/modules/opengl/shader/glsl_plain_idx16_lut.fsh.c
diff --git a/src/icludes/osd/modules/opengl/shader/glsl_plain_rgb32_dir.fsh b/src/osd/modules/opengl/shader/glsl_plain_rgb32_dir.fsh
similarity index 100%
rename from src/icludes/osd/modules/opengl/shader/glsl_plain_rgb32_dir.fsh
rename to src/osd/modules/opengl/shader/glsl_plain_rgb32_dir.fsh
diff --git a/src/icludes/osd/modules/opengl/shader/glsl_plain_rgb32_dir.fsh.c b/src/osd/modules/opengl/shader/glsl_plain_rgb32_dir.fsh.c
similarity index 100%
rename from src/icludes/osd/modules/opengl/shader/glsl_plain_rgb32_dir.fsh.c
rename to src/osd/modules/opengl/shader/glsl_plain_rgb32_dir.fsh.c
diff --git a/src/icludes/osd/modules/opengl/shader/glsl_plain_rgb32_lut.fsh b/src/osd/modules/opengl/shader/glsl_plain_rgb32_lut.fsh
similarity index 100%
rename from src/icludes/osd/modules/opengl/shader/glsl_plain_rgb32_lut.fsh
rename to src/osd/modules/opengl/shader/glsl_plain_rgb32_lut.fsh
diff --git a/src/icludes/osd/modules/opengl/shader/glsl_plain_rgb32_lut.fsh.c b/src/osd/modules/opengl/shader/glsl_plain_rgb32_lut.fsh.c
similarity index 100%
rename from src/icludes/osd/modules/opengl/shader/glsl_plain_rgb32_lut.fsh.c
rename to src/osd/modules/opengl/shader/glsl_plain_rgb32_lut.fsh.c
diff --git a/src/icludes/osd/modules/osdhelper.h b/src/osd/modules/osdhelper.h
similarity index 100%
rename from src/icludes/osd/modules/osdhelper.h
rename to src/osd/modules/osdhelper.h
diff --git a/src/icludes/osd/modules/osdmodule.cpp b/src/osd/modules/osdmodule.cpp
similarity index 100%
rename from src/icludes/osd/modules/osdmodule.cpp
rename to src/osd/modules/osdmodule.cpp
diff --git a/src/icludes/osd/modules/osdmodule.h b/src/osd/modules/osdmodule.h
similarity index 100%
rename from src/icludes/osd/modules/osdmodule.h
rename to src/osd/modules/osdmodule.h
diff --git a/src/icludes/osd/modules/osdwindow.cpp b/src/osd/modules/osdwindow.cpp
similarity index 100%
rename from src/icludes/osd/modules/osdwindow.cpp
rename to src/osd/modules/osdwindow.cpp
diff --git a/src/icludes/osd/modules/osdwindow.h b/src/osd/modules/osdwindow.h
similarity index 100%
rename from src/icludes/osd/modules/osdwindow.h
rename to src/osd/modules/osdwindow.h
diff --git a/src/icludes/osd/modules/output/console.cpp b/src/osd/modules/output/console.cpp
similarity index 100%
rename from src/icludes/osd/modules/output/console.cpp
rename to src/osd/modules/output/console.cpp
diff --git a/src/icludes/osd/modules/output/network.cpp b/src/osd/modules/output/network.cpp
similarity index 100%
rename from src/icludes/osd/modules/output/network.cpp
rename to src/osd/modules/output/network.cpp
diff --git a/src/icludes/osd/modules/output/none.cpp b/src/osd/modules/output/none.cpp
similarity index 100%
rename from src/icludes/osd/modules/output/none.cpp
rename to src/osd/modules/output/none.cpp
diff --git a/src/icludes/osd/modules/output/output_module.h b/src/osd/modules/output/output_module.h
similarity index 100%
rename from src/icludes/osd/modules/output/output_module.h
rename to src/osd/modules/output/output_module.h
diff --git a/src/icludes/osd/modules/output/win32_output.cpp b/src/osd/modules/output/win32_output.cpp
similarity index 100%
rename from src/icludes/osd/modules/output/win32_output.cpp
rename to src/osd/modules/output/win32_output.cpp
diff --git a/src/icludes/osd/modules/output/win32_output.h b/src/osd/modules/output/win32_output.h
similarity index 100%
rename from src/icludes/osd/modules/output/win32_output.h
rename to src/osd/modules/output/win32_output.h
diff --git a/src/icludes/osd/modules/render/aviwrite.cpp b/src/osd/modules/render/aviwrite.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/aviwrite.cpp
rename to src/osd/modules/render/aviwrite.cpp
diff --git a/src/icludes/osd/modules/render/aviwrite.h b/src/osd/modules/render/aviwrite.h
similarity index 100%
rename from src/icludes/osd/modules/render/aviwrite.h
rename to src/osd/modules/render/aviwrite.h
diff --git a/src/icludes/osd/modules/render/bgfx/blendreader.cpp b/src/osd/modules/render/bgfx/blendreader.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/blendreader.cpp
rename to src/osd/modules/render/bgfx/blendreader.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/blendreader.h b/src/osd/modules/render/bgfx/blendreader.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/blendreader.h
rename to src/osd/modules/render/bgfx/blendreader.h
diff --git a/src/icludes/osd/modules/render/bgfx/chain.cpp b/src/osd/modules/render/bgfx/chain.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/chain.cpp
rename to src/osd/modules/render/bgfx/chain.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/chain.h b/src/osd/modules/render/bgfx/chain.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/chain.h
rename to src/osd/modules/render/bgfx/chain.h
diff --git a/src/icludes/osd/modules/render/bgfx/chainentry.cpp b/src/osd/modules/render/bgfx/chainentry.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/chainentry.cpp
rename to src/osd/modules/render/bgfx/chainentry.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/chainentry.h b/src/osd/modules/render/bgfx/chainentry.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/chainentry.h
rename to src/osd/modules/render/bgfx/chainentry.h
diff --git a/src/icludes/osd/modules/render/bgfx/chainentryreader.cpp b/src/osd/modules/render/bgfx/chainentryreader.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/chainentryreader.cpp
rename to src/osd/modules/render/bgfx/chainentryreader.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/chainentryreader.h b/src/osd/modules/render/bgfx/chainentryreader.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/chainentryreader.h
rename to src/osd/modules/render/bgfx/chainentryreader.h
diff --git a/src/icludes/osd/modules/render/bgfx/chainmanager.cpp b/src/osd/modules/render/bgfx/chainmanager.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/chainmanager.cpp
rename to src/osd/modules/render/bgfx/chainmanager.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/chainmanager.h b/src/osd/modules/render/bgfx/chainmanager.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/chainmanager.h
rename to src/osd/modules/render/bgfx/chainmanager.h
diff --git a/src/icludes/osd/modules/render/bgfx/chainreader.cpp b/src/osd/modules/render/bgfx/chainreader.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/chainreader.cpp
rename to src/osd/modules/render/bgfx/chainreader.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/chainreader.h b/src/osd/modules/render/bgfx/chainreader.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/chainreader.h
rename to src/osd/modules/render/bgfx/chainreader.h
diff --git a/src/icludes/osd/modules/render/bgfx/clear.cpp b/src/osd/modules/render/bgfx/clear.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/clear.cpp
rename to src/osd/modules/render/bgfx/clear.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/clear.h b/src/osd/modules/render/bgfx/clear.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/clear.h
rename to src/osd/modules/render/bgfx/clear.h
diff --git a/src/icludes/osd/modules/render/bgfx/clearreader.cpp b/src/osd/modules/render/bgfx/clearreader.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/clearreader.cpp
rename to src/osd/modules/render/bgfx/clearreader.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/clearreader.h b/src/osd/modules/render/bgfx/clearreader.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/clearreader.h
rename to src/osd/modules/render/bgfx/clearreader.h
diff --git a/src/icludes/osd/modules/render/bgfx/cullreader.cpp b/src/osd/modules/render/bgfx/cullreader.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/cullreader.cpp
rename to src/osd/modules/render/bgfx/cullreader.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/cullreader.h b/src/osd/modules/render/bgfx/cullreader.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/cullreader.h
rename to src/osd/modules/render/bgfx/cullreader.h
diff --git a/src/icludes/osd/modules/render/bgfx/depthreader.cpp b/src/osd/modules/render/bgfx/depthreader.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/depthreader.cpp
rename to src/osd/modules/render/bgfx/depthreader.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/depthreader.h b/src/osd/modules/render/bgfx/depthreader.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/depthreader.h
rename to src/osd/modules/render/bgfx/depthreader.h
diff --git a/src/icludes/osd/modules/render/bgfx/effect.cpp b/src/osd/modules/render/bgfx/effect.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/effect.cpp
rename to src/osd/modules/render/bgfx/effect.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/effect.h b/src/osd/modules/render/bgfx/effect.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/effect.h
rename to src/osd/modules/render/bgfx/effect.h
diff --git a/src/icludes/osd/modules/render/bgfx/effectmanager.cpp b/src/osd/modules/render/bgfx/effectmanager.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/effectmanager.cpp
rename to src/osd/modules/render/bgfx/effectmanager.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/effectmanager.h b/src/osd/modules/render/bgfx/effectmanager.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/effectmanager.h
rename to src/osd/modules/render/bgfx/effectmanager.h
diff --git a/src/icludes/osd/modules/render/bgfx/effectreader.cpp b/src/osd/modules/render/bgfx/effectreader.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/effectreader.cpp
rename to src/osd/modules/render/bgfx/effectreader.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/effectreader.h b/src/osd/modules/render/bgfx/effectreader.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/effectreader.h
rename to src/osd/modules/render/bgfx/effectreader.h
diff --git a/src/icludes/osd/modules/render/bgfx/entryuniform.h b/src/osd/modules/render/bgfx/entryuniform.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/entryuniform.h
rename to src/osd/modules/render/bgfx/entryuniform.h
diff --git a/src/icludes/osd/modules/render/bgfx/entryuniformreader.cpp b/src/osd/modules/render/bgfx/entryuniformreader.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/entryuniformreader.cpp
rename to src/osd/modules/render/bgfx/entryuniformreader.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/entryuniformreader.h b/src/osd/modules/render/bgfx/entryuniformreader.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/entryuniformreader.h
rename to src/osd/modules/render/bgfx/entryuniformreader.h
diff --git a/src/icludes/osd/modules/render/bgfx/frameparameter.cpp b/src/osd/modules/render/bgfx/frameparameter.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/frameparameter.cpp
rename to src/osd/modules/render/bgfx/frameparameter.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/frameparameter.h b/src/osd/modules/render/bgfx/frameparameter.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/frameparameter.h
rename to src/osd/modules/render/bgfx/frameparameter.h
diff --git a/src/icludes/osd/modules/render/bgfx/inputpair.cpp b/src/osd/modules/render/bgfx/inputpair.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/inputpair.cpp
rename to src/osd/modules/render/bgfx/inputpair.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/inputpair.h b/src/osd/modules/render/bgfx/inputpair.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/inputpair.h
rename to src/osd/modules/render/bgfx/inputpair.h
diff --git a/src/icludes/osd/modules/render/bgfx/parameter.h b/src/osd/modules/render/bgfx/parameter.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/parameter.h
rename to src/osd/modules/render/bgfx/parameter.h
diff --git a/src/icludes/osd/modules/render/bgfx/paramreader.cpp b/src/osd/modules/render/bgfx/paramreader.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/paramreader.cpp
rename to src/osd/modules/render/bgfx/paramreader.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/paramreader.h b/src/osd/modules/render/bgfx/paramreader.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/paramreader.h
rename to src/osd/modules/render/bgfx/paramreader.h
diff --git a/src/icludes/osd/modules/render/bgfx/paramuniform.cpp b/src/osd/modules/render/bgfx/paramuniform.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/paramuniform.cpp
rename to src/osd/modules/render/bgfx/paramuniform.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/paramuniform.h b/src/osd/modules/render/bgfx/paramuniform.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/paramuniform.h
rename to src/osd/modules/render/bgfx/paramuniform.h
diff --git a/src/icludes/osd/modules/render/bgfx/paramuniformreader.cpp b/src/osd/modules/render/bgfx/paramuniformreader.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/paramuniformreader.cpp
rename to src/osd/modules/render/bgfx/paramuniformreader.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/paramuniformreader.h b/src/osd/modules/render/bgfx/paramuniformreader.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/paramuniformreader.h
rename to src/osd/modules/render/bgfx/paramuniformreader.h
diff --git a/src/icludes/osd/modules/render/bgfx/shadermanager.cpp b/src/osd/modules/render/bgfx/shadermanager.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shadermanager.cpp
rename to src/osd/modules/render/bgfx/shadermanager.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/shadermanager.h b/src/osd/modules/render/bgfx/shadermanager.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shadermanager.h
rename to src/osd/modules/render/bgfx/shadermanager.h
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/blurs/fs_smart-blur.sc b/src/osd/modules/render/bgfx/shaders/chains/blurs/fs_smart-blur.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/blurs/fs_smart-blur.sc
rename to src/osd/modules/render/bgfx/shaders/chains/blurs/fs_smart-blur.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/blurs/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/blurs/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/blurs/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/chains/blurs/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/blurs/vs_smart-blur.sc b/src/osd/modules/render/bgfx/shaders/chains/blurs/vs_smart-blur.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/blurs/vs_smart-blur.sc
rename to src/osd/modules/render/bgfx/shaders/chains/blurs/vs_smart-blur.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_crt-geom-deluxe.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_crt-geom-deluxe.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_crt-geom-deluxe.sc
rename to src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_crt-geom-deluxe.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_crt-geom.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_crt-geom.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_crt-geom.sc
rename to src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_crt-geom.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_gaussx.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_gaussx.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_gaussx.sc
rename to src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_gaussx.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_gaussy.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_gaussy.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_gaussy.sc
rename to src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_gaussy.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_lowpass.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_lowpass.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_lowpass.sc
rename to src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_lowpass.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_mipmap8.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_mipmap8.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_mipmap8.sc
rename to src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_mipmap8.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_phosphor_apply.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_phosphor_apply.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_phosphor_apply.sc
rename to src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_phosphor_apply.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_phosphor_update.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_phosphor_update.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_phosphor_update.sc
rename to src/osd/modules/render/bgfx/shaders/chains/crt-geom/fs_phosphor_update.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/chains/crt-geom/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_crt-geom.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_crt-geom.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_crt-geom.sc
rename to src/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_crt-geom.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_gaussx.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_gaussx.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_gaussx.sc
rename to src/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_gaussx.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_gaussy.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_gaussy.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_gaussy.sc
rename to src/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_gaussy.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_lowpass.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_lowpass.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_lowpass.sc
rename to src/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_lowpass.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_mipmap8.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_mipmap8.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_mipmap8.sc
rename to src/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_mipmap8.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_phosphor_apply.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_phosphor_apply.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_phosphor_apply.sc
rename to src/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_phosphor_apply.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_phosphor_update.sc b/src/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_phosphor_update.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_phosphor_update.sc
rename to src/osd/modules/render/bgfx/shaders/chains/crt-geom/vs_phosphor_update.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/crt/fs_crt-caligari.sc b/src/osd/modules/render/bgfx/shaders/chains/crt/fs_crt-caligari.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/crt/fs_crt-caligari.sc
rename to src/osd/modules/render/bgfx/shaders/chains/crt/fs_crt-caligari.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/crt/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/crt/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/crt/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/chains/crt/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/crt/vs_crt-caligari.sc b/src/osd/modules/render/bgfx/shaders/chains/crt/vs_crt-caligari.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/crt/vs_crt-caligari.sc
rename to src/osd/modules/render/bgfx/shaders/chains/crt/vs_crt-caligari.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/default/fs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/default/fs_blit.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/default/fs_blit.sc
rename to src/osd/modules/render/bgfx/shaders/chains/default/fs_blit.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/default/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/default/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/default/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/chains/default/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/default/vs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/default/vs_blit.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/default/vs_blit.sc
rename to src/osd/modules/render/bgfx/shaders/chains/default/vs_blit.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/eagle/fs_eagle.sc b/src/osd/modules/render/bgfx/shaders/chains/eagle/fs_eagle.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/eagle/fs_eagle.sc
rename to src/osd/modules/render/bgfx/shaders/chains/eagle/fs_eagle.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/eagle/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/eagle/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/eagle/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/chains/eagle/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/eagle/vs_eagle.sc b/src/osd/modules/render/bgfx/shaders/chains/eagle/vs_eagle.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/eagle/vs_eagle.sc
rename to src/osd/modules/render/bgfx/shaders/chains/eagle/vs_eagle.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_chroma.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_chroma.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_chroma.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_chroma.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_color.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_color.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_color.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_color.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_deconverge.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_deconverge.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_deconverge.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_deconverge.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_defocus.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_defocus.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_defocus.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_defocus.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_distortion.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_distortion.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_distortion.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_distortion.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_ntsc_decode.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_ntsc_decode.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_ntsc_decode.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_ntsc_decode.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_ntsc_encode.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_ntsc_encode.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_ntsc_encode.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_ntsc_encode.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_phosphor.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_phosphor.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_phosphor.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_phosphor.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_post.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_post.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_post.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_post.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_prescale.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_prescale.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_prescale.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_prescale.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_scanline.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_scanline.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/fs_scanline.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_scanline.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_chroma.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_chroma.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_chroma.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_chroma.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_color.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_color.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_color.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_color.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_deconverge.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_deconverge.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_deconverge.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_deconverge.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_defocus.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_defocus.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_defocus.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_defocus.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_distortion.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_distortion.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_distortion.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_distortion.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_ntsc_decode.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_ntsc_decode.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_ntsc_decode.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_ntsc_decode.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_ntsc_encode.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_ntsc_encode.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_ntsc_encode.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_ntsc_encode.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_phosphor.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_phosphor.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_phosphor.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_phosphor.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_post.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_post.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_post.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_post.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_prescale.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_prescale.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_prescale.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_prescale.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_scanline.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_scanline.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hlsl/vs_scanline.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hlsl/vs_scanline.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq2x.sc b/src/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq2x.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq2x.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq2x.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq3x.sc b/src/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq3x.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq3x.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq3x.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq4x.sc b/src/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq4x.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq4x.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hqx/fs_hq4x.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hqx/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/hqx/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hqx/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hqx/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq2x.sc b/src/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq2x.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq2x.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq2x.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq3x.sc b/src/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq3x.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq3x.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq3x.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq4x.sc b/src/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq4x.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq4x.sc
rename to src/osd/modules/render/bgfx/shaders/chains/hqx/vs_hq4x.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/lcd-grid/fs_lcd-grid.sc b/src/osd/modules/render/bgfx/shaders/chains/lcd-grid/fs_lcd-grid.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/lcd-grid/fs_lcd-grid.sc
rename to src/osd/modules/render/bgfx/shaders/chains/lcd-grid/fs_lcd-grid.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/lcd-grid/fs_persistence.sc b/src/osd/modules/render/bgfx/shaders/chains/lcd-grid/fs_persistence.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/lcd-grid/fs_persistence.sc
rename to src/osd/modules/render/bgfx/shaders/chains/lcd-grid/fs_persistence.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/lcd-grid/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/lcd-grid/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/lcd-grid/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/chains/lcd-grid/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/lcd-grid/vs_lcd-grid.sc b/src/osd/modules/render/bgfx/shaders/chains/lcd-grid/vs_lcd-grid.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/lcd-grid/vs_lcd-grid.sc
rename to src/osd/modules/render/bgfx/shaders/chains/lcd-grid/vs_lcd-grid.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/lcd-grid/vs_persistence.sc b/src/osd/modules/render/bgfx/shaders/chains/lcd-grid/vs_persistence.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/lcd-grid/vs_persistence.sc
rename to src/osd/modules/render/bgfx/shaders/chains/lcd-grid/vs_persistence.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/misc/fs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/fs_blit.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/misc/fs_blit.sc
rename to src/osd/modules/render/bgfx/shaders/chains/misc/fs_blit.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/misc/fs_blit_bcg.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/fs_blit_bcg.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/misc/fs_blit_bcg.sc
rename to src/osd/modules/render/bgfx/shaders/chains/misc/fs_blit_bcg.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/misc/fs_blit_palette16.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/fs_blit_palette16.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/misc/fs_blit_palette16.sc
rename to src/osd/modules/render/bgfx/shaders/chains/misc/fs_blit_palette16.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/misc/fs_blit_rgb32.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/fs_blit_rgb32.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/misc/fs_blit_rgb32.sc
rename to src/osd/modules/render/bgfx/shaders/chains/misc/fs_blit_rgb32.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/misc/fs_blit_yuy16.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/fs_blit_yuy16.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/misc/fs_blit_yuy16.sc
rename to src/osd/modules/render/bgfx/shaders/chains/misc/fs_blit_yuy16.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/misc/fs_bob-and-ghost-deinterlace.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/fs_bob-and-ghost-deinterlace.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/misc/fs_bob-and-ghost-deinterlace.sc
rename to src/osd/modules/render/bgfx/shaders/chains/misc/fs_bob-and-ghost-deinterlace.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/misc/fs_deposterize-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/fs_deposterize-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/misc/fs_deposterize-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/misc/fs_deposterize-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/misc/fs_deposterize-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/fs_deposterize-pass1.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/misc/fs_deposterize-pass1.sc
rename to src/osd/modules/render/bgfx/shaders/chains/misc/fs_deposterize-pass1.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/misc/fs_lut.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/fs_lut.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/misc/fs_lut.sc
rename to src/osd/modules/render/bgfx/shaders/chains/misc/fs_lut.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/misc/fs_saturation.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/fs_saturation.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/misc/fs_saturation.sc
rename to src/osd/modules/render/bgfx/shaders/chains/misc/fs_saturation.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/misc/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/misc/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/chains/misc/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/misc/vs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/vs_blit.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/misc/vs_blit.sc
rename to src/osd/modules/render/bgfx/shaders/chains/misc/vs_blit.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/misc/vs_bob-and-ghost-deinterlace.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/vs_bob-and-ghost-deinterlace.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/misc/vs_bob-and-ghost-deinterlace.sc
rename to src/osd/modules/render/bgfx/shaders/chains/misc/vs_bob-and-ghost-deinterlace.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/misc/vs_deposterize-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/vs_deposterize-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/misc/vs_deposterize-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/misc/vs_deposterize-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/misc/vs_deposterize-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/vs_deposterize-pass1.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/misc/vs_deposterize-pass1.sc
rename to src/osd/modules/render/bgfx/shaders/chains/misc/vs_deposterize-pass1.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/misc/vs_lut.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/vs_lut.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/misc/vs_lut.sc
rename to src/osd/modules/render/bgfx/shaders/chains/misc/vs_lut.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/misc/vs_saturation.sc b/src/osd/modules/render/bgfx/shaders/chains/misc/vs_saturation.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/misc/vs_saturation.sc
rename to src/osd/modules/render/bgfx/shaders/chains/misc/vs_saturation.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_gaussian.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_gaussian.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_gaussian.sc
rename to src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_gaussian.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_offset_sat.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_offset_sat.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_offset_sat.sc
rename to src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/fs_offset_sat.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_gaussian.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_gaussian.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_gaussian.sc
rename to src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_gaussian.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_offset_sat.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_offset_sat.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_offset_sat.sc
rename to src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_offset_sat.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_gaussian.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_gaussian.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_gaussian.sc
rename to src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_gaussian.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_offset_sat.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_offset_sat.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_offset_sat.sc
rename to src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/fs_offset_sat.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_gaussian.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_gaussian.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_gaussian.sc
rename to src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_gaussian.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_offset_sat.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_offset_sat.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_offset_sat.sc
rename to src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_offset_sat.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_gaussian.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_gaussian.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_gaussian.sc
rename to src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_gaussian.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_offset_sat.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_offset_sat.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_offset_sat.sc
rename to src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/fs_offset_sat.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_gaussian.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_gaussian.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_gaussian.sc
rename to src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_gaussian.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_offset_sat.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_offset_sat.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_offset_sat.sc
rename to src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_offset_sat.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_gaussian.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_gaussian.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_gaussian.sc
rename to src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_gaussian.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_offset_sat.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_offset_sat.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_offset_sat.sc
rename to src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/fs_offset_sat.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_gaussian.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_gaussian.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_gaussian.sc
rename to src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_gaussian.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_offset_sat.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_offset_sat.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_offset_sat.sc
rename to src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_offset_sat.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/unfiltered/fs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/unfiltered/fs_blit.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/unfiltered/fs_blit.sc
rename to src/osd/modules/render/bgfx/shaders/chains/unfiltered/fs_blit.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/unfiltered/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/unfiltered/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/unfiltered/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/chains/unfiltered/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/unfiltered/vs_blit.sc b/src/osd/modules/render/bgfx/shaders/chains/unfiltered/vs_blit.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/unfiltered/vs_blit.sc
rename to src/osd/modules/render/bgfx/shaders/chains/unfiltered/vs_blit.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/warp/fs_dilation-horizontal-fast.sc b/src/osd/modules/render/bgfx/shaders/chains/warp/fs_dilation-horizontal-fast.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/warp/fs_dilation-horizontal-fast.sc
rename to src/osd/modules/render/bgfx/shaders/chains/warp/fs_dilation-horizontal-fast.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/warp/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/warp/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/warp/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/chains/warp/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/warp/vs_dilation-horizontal-fast.sc b/src/osd/modules/render/bgfx/shaders/chains/warp/vs_dilation-horizontal-fast.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/warp/vs_dilation-horizontal-fast.sc
rename to src/osd/modules/render/bgfx/shaders/chains/warp/vs_dilation-horizontal-fast.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv1-noblend.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv1-noblend.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv1-noblend.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv1-noblend.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-3d.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-3d.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-3d.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-3d.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-fast.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-fast.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-fast.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-fast.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-noblend.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-noblend.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-noblend.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2-noblend.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv2.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv3-noblend.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv3-noblend.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv3-noblend.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv3-noblend.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv3.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv3.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv3.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/fs_xbr-lv3.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_custom-jinc2-sharper.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_custom-jinc2-sharper.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_custom-jinc2-sharper.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_custom-jinc2-sharper.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass1.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass1.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass1.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass2.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass2.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-2xbr-3d-pass2.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass1.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass1.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass1.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass1f.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass1f.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass1f.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass1f.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass2.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass2.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass2.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass3.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass3.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass3.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass3.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass3f.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass3f.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass3f.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-4xbr-3d-pass3f.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass1.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass1.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass1.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass2.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass2.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-fast-pass2.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass1.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass1.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass1.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass2.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass2.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/fs_super-xbr-pass2.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_custom-jinc2-sharper.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_custom-jinc2-sharper.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_custom-jinc2-sharper.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_custom-jinc2-sharper.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-2xbr-3d-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-2xbr-3d-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-2xbr-3d-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-2xbr-3d-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-2xbr-3d-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-2xbr-3d-pass1.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-2xbr-3d-pass1.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-2xbr-3d-pass1.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-2xbr-3d-pass2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-2xbr-3d-pass2.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-2xbr-3d-pass2.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-2xbr-3d-pass2.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass1.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass1.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass1.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass1f.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass1f.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass1f.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass1f.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass2.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass2.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass2.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass3.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass3.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass3.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass3.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass3f.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass3f.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass3f.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-4xbr-3d-pass3f.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass1.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass1.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass1.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass2.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass2.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-fast-pass2.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass1.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass1.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass1.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass2.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass2.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass2.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass3.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass3.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass3.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/super-xbr/vs_super-xbr-pass3.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv1-noblend.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv1-noblend.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv1-noblend.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv1-noblend.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv2-3d.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv2-3d.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv2-3d.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv2-3d.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv2-fast.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv2-fast.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv2-fast.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv2-fast.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv2-noblend.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv2-noblend.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv2-noblend.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv2-noblend.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv2.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv2.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv2.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv3-noblend.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv3-noblend.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv3-noblend.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv3-noblend.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv3.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv3.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv3.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/vs_xbr-lv3.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-sharp.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-sharp.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-sharp.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-sharp.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v2-gamma.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v2-gamma.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v2-gamma.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v2-gamma.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v2.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v2.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v2.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4-gamma.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4-gamma.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4-gamma.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4-gamma.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4b.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4b.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4b.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v4b.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v5-gamma.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v5-gamma.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v5-gamma.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid-v5-gamma.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/fs_2xbr-hybrid.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-sharp.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-sharp.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-sharp.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-sharp.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v2-gamma.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v2-gamma.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v2-gamma.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v2-gamma.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v2.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v2.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v2.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4-gamma.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4-gamma.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4-gamma.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4-gamma.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4b.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4b.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4b.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v4b.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v5-gamma.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v5-gamma.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v5-gamma.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid-v5-gamma.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-hybrid/vs_2xbr-hybrid.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-a-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-a-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-a-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-a-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-accuracy-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-accuracy-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-accuracy-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-accuracy-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-accuracy-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-accuracy-pass1.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-accuracy-pass1.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-accuracy-pass1.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-b-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-b-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-b-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-b-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-d-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-d-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-d-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-d-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-noblend-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-noblend-pass1.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-noblend-pass1.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-noblend-pass1.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-a-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-a-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-a-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-a-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-accuracy-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-accuracy-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-accuracy-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-accuracy-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-accuracy-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-accuracy-pass1.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-accuracy-pass1.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-accuracy-pass1.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-b-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-b-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-b-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-b-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-c-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-c-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-c-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-c-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-d-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-d-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-d-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-d-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-noblend-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-noblend-pass1.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-noblend-pass1.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-noblend-pass1.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-pass1.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-pass1.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/vs_xbr-lv2-pass1.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/fs_xbr-lv3-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/fs_xbr-lv3-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/fs_xbr-lv3-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/fs_xbr-lv3-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/fs_xbr-lv3-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/fs_xbr-lv3-pass1.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/fs_xbr-lv3-pass1.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/fs_xbr-lv3-pass1.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/vs_xbr-lv3-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/vs_xbr-lv3-pass0.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/vs_xbr-lv3-pass0.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/vs_xbr-lv3-pass0.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/vs_xbr-lv3-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/vs_xbr-lv3-pass1.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/vs_xbr-lv3-pass1.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv3-multipass/vs_xbr-lv3-pass1.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass1.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass1.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass1.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass2.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass2.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass2.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass3.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass3.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass3.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass3.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass4.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass4.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass4.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/fs_xbr-mlv4-pass4.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/varying.def.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass1.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass1.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass1.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass2.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass2.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass2.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass2.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass3.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass3.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass3.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass3.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass4.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass4.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass4.sc
rename to src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-mlv4-multipass/vs_xbr-mlv4-pass4.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/fs_gui.sc b/src/osd/modules/render/bgfx/shaders/fs_gui.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/fs_gui.sc
rename to src/osd/modules/render/bgfx/shaders/fs_gui.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/fs_screen.sc b/src/osd/modules/render/bgfx/shaders/fs_screen.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/fs_screen.sc
rename to src/osd/modules/render/bgfx/shaders/fs_screen.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/makefile b/src/osd/modules/render/bgfx/shaders/makefile
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/makefile
rename to src/osd/modules/render/bgfx/shaders/makefile
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/shader.mk b/src/osd/modules/render/bgfx/shaders/shader.mk
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/shader.mk
rename to src/osd/modules/render/bgfx/shaders/shader.mk
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/varying.def.sc b/src/osd/modules/render/bgfx/shaders/varying.def.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/varying.def.sc
rename to src/osd/modules/render/bgfx/shaders/varying.def.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/vs_gui.sc b/src/osd/modules/render/bgfx/shaders/vs_gui.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/vs_gui.sc
rename to src/osd/modules/render/bgfx/shaders/vs_gui.sc
diff --git a/src/icludes/osd/modules/render/bgfx/shaders/vs_screen.sc b/src/osd/modules/render/bgfx/shaders/vs_screen.sc
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/shaders/vs_screen.sc
rename to src/osd/modules/render/bgfx/shaders/vs_screen.sc
diff --git a/src/icludes/osd/modules/render/bgfx/slider.cpp b/src/osd/modules/render/bgfx/slider.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/slider.cpp
rename to src/osd/modules/render/bgfx/slider.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/slider.h b/src/osd/modules/render/bgfx/slider.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/slider.h
rename to src/osd/modules/render/bgfx/slider.h
diff --git a/src/icludes/osd/modules/render/bgfx/sliderreader.cpp b/src/osd/modules/render/bgfx/sliderreader.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/sliderreader.cpp
rename to src/osd/modules/render/bgfx/sliderreader.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/sliderreader.h b/src/osd/modules/render/bgfx/sliderreader.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/sliderreader.h
rename to src/osd/modules/render/bgfx/sliderreader.h
diff --git a/src/icludes/osd/modules/render/bgfx/slideruniform.cpp b/src/osd/modules/render/bgfx/slideruniform.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/slideruniform.cpp
rename to src/osd/modules/render/bgfx/slideruniform.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/slideruniform.h b/src/osd/modules/render/bgfx/slideruniform.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/slideruniform.h
rename to src/osd/modules/render/bgfx/slideruniform.h
diff --git a/src/icludes/osd/modules/render/bgfx/slideruniformreader.cpp b/src/osd/modules/render/bgfx/slideruniformreader.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/slideruniformreader.cpp
rename to src/osd/modules/render/bgfx/slideruniformreader.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/slideruniformreader.h b/src/osd/modules/render/bgfx/slideruniformreader.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/slideruniformreader.h
rename to src/osd/modules/render/bgfx/slideruniformreader.h
diff --git a/src/icludes/osd/modules/render/bgfx/statereader.cpp b/src/osd/modules/render/bgfx/statereader.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/statereader.cpp
rename to src/osd/modules/render/bgfx/statereader.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/statereader.h b/src/osd/modules/render/bgfx/statereader.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/statereader.h
rename to src/osd/modules/render/bgfx/statereader.h
diff --git a/src/icludes/osd/modules/render/bgfx/suppressor.cpp b/src/osd/modules/render/bgfx/suppressor.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/suppressor.cpp
rename to src/osd/modules/render/bgfx/suppressor.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/suppressor.h b/src/osd/modules/render/bgfx/suppressor.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/suppressor.h
rename to src/osd/modules/render/bgfx/suppressor.h
diff --git a/src/icludes/osd/modules/render/bgfx/suppressorreader.cpp b/src/osd/modules/render/bgfx/suppressorreader.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/suppressorreader.cpp
rename to src/osd/modules/render/bgfx/suppressorreader.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/suppressorreader.h b/src/osd/modules/render/bgfx/suppressorreader.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/suppressorreader.h
rename to src/osd/modules/render/bgfx/suppressorreader.h
diff --git a/src/icludes/osd/modules/render/bgfx/target.cpp b/src/osd/modules/render/bgfx/target.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/target.cpp
rename to src/osd/modules/render/bgfx/target.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/target.h b/src/osd/modules/render/bgfx/target.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/target.h
rename to src/osd/modules/render/bgfx/target.h
diff --git a/src/icludes/osd/modules/render/bgfx/targetmanager.cpp b/src/osd/modules/render/bgfx/targetmanager.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/targetmanager.cpp
rename to src/osd/modules/render/bgfx/targetmanager.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/targetmanager.h b/src/osd/modules/render/bgfx/targetmanager.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/targetmanager.h
rename to src/osd/modules/render/bgfx/targetmanager.h
diff --git a/src/icludes/osd/modules/render/bgfx/targetreader.cpp b/src/osd/modules/render/bgfx/targetreader.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/targetreader.cpp
rename to src/osd/modules/render/bgfx/targetreader.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/targetreader.h b/src/osd/modules/render/bgfx/targetreader.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/targetreader.h
rename to src/osd/modules/render/bgfx/targetreader.h
diff --git a/src/icludes/osd/modules/render/bgfx/texture.cpp b/src/osd/modules/render/bgfx/texture.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/texture.cpp
rename to src/osd/modules/render/bgfx/texture.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/texture.h b/src/osd/modules/render/bgfx/texture.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/texture.h
rename to src/osd/modules/render/bgfx/texture.h
diff --git a/src/icludes/osd/modules/render/bgfx/texturehandleprovider.h b/src/osd/modules/render/bgfx/texturehandleprovider.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/texturehandleprovider.h
rename to src/osd/modules/render/bgfx/texturehandleprovider.h
diff --git a/src/icludes/osd/modules/render/bgfx/texturemanager.cpp b/src/osd/modules/render/bgfx/texturemanager.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/texturemanager.cpp
rename to src/osd/modules/render/bgfx/texturemanager.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/texturemanager.h b/src/osd/modules/render/bgfx/texturemanager.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/texturemanager.h
rename to src/osd/modules/render/bgfx/texturemanager.h
diff --git a/src/icludes/osd/modules/render/bgfx/timeparameter.cpp b/src/osd/modules/render/bgfx/timeparameter.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/timeparameter.cpp
rename to src/osd/modules/render/bgfx/timeparameter.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/timeparameter.h b/src/osd/modules/render/bgfx/timeparameter.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/timeparameter.h
rename to src/osd/modules/render/bgfx/timeparameter.h
diff --git a/src/icludes/osd/modules/render/bgfx/uniform.cpp b/src/osd/modules/render/bgfx/uniform.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/uniform.cpp
rename to src/osd/modules/render/bgfx/uniform.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/uniform.h b/src/osd/modules/render/bgfx/uniform.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/uniform.h
rename to src/osd/modules/render/bgfx/uniform.h
diff --git a/src/icludes/osd/modules/render/bgfx/uniformreader.cpp b/src/osd/modules/render/bgfx/uniformreader.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/uniformreader.cpp
rename to src/osd/modules/render/bgfx/uniformreader.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/uniformreader.h b/src/osd/modules/render/bgfx/uniformreader.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/uniformreader.h
rename to src/osd/modules/render/bgfx/uniformreader.h
diff --git a/src/icludes/osd/modules/render/bgfx/valueuniform.cpp b/src/osd/modules/render/bgfx/valueuniform.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/valueuniform.cpp
rename to src/osd/modules/render/bgfx/valueuniform.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/valueuniform.h b/src/osd/modules/render/bgfx/valueuniform.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/valueuniform.h
rename to src/osd/modules/render/bgfx/valueuniform.h
diff --git a/src/icludes/osd/modules/render/bgfx/valueuniformreader.cpp b/src/osd/modules/render/bgfx/valueuniformreader.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/valueuniformreader.cpp
rename to src/osd/modules/render/bgfx/valueuniformreader.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/valueuniformreader.h b/src/osd/modules/render/bgfx/valueuniformreader.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/valueuniformreader.h
rename to src/osd/modules/render/bgfx/valueuniformreader.h
diff --git a/src/icludes/osd/modules/render/bgfx/vertex.h b/src/osd/modules/render/bgfx/vertex.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/vertex.h
rename to src/osd/modules/render/bgfx/vertex.h
diff --git a/src/icludes/osd/modules/render/bgfx/view.cpp b/src/osd/modules/render/bgfx/view.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/view.cpp
rename to src/osd/modules/render/bgfx/view.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/view.h b/src/osd/modules/render/bgfx/view.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/view.h
rename to src/osd/modules/render/bgfx/view.h
diff --git a/src/icludes/osd/modules/render/bgfx/windowparameter.h b/src/osd/modules/render/bgfx/windowparameter.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/windowparameter.h
rename to src/osd/modules/render/bgfx/windowparameter.h
diff --git a/src/icludes/osd/modules/render/bgfx/writereader.cpp b/src/osd/modules/render/bgfx/writereader.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/writereader.cpp
rename to src/osd/modules/render/bgfx/writereader.cpp
diff --git a/src/icludes/osd/modules/render/bgfx/writereader.h b/src/osd/modules/render/bgfx/writereader.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfx/writereader.h
rename to src/osd/modules/render/bgfx/writereader.h
diff --git a/src/icludes/osd/modules/render/bgfxutil.cpp b/src/osd/modules/render/bgfxutil.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/bgfxutil.cpp
rename to src/osd/modules/render/bgfxutil.cpp
diff --git a/src/icludes/osd/modules/render/bgfxutil.h b/src/osd/modules/render/bgfxutil.h
similarity index 100%
rename from src/icludes/osd/modules/render/bgfxutil.h
rename to src/osd/modules/render/bgfxutil.h
diff --git a/src/icludes/osd/modules/render/binpacker.cpp b/src/osd/modules/render/binpacker.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/binpacker.cpp
rename to src/osd/modules/render/binpacker.cpp
diff --git a/src/icludes/osd/modules/render/binpacker.h b/src/osd/modules/render/binpacker.h
similarity index 100%
rename from src/icludes/osd/modules/render/binpacker.h
rename to src/osd/modules/render/binpacker.h
diff --git a/src/icludes/osd/modules/render/blit13.h b/src/osd/modules/render/blit13.h
similarity index 100%
rename from src/icludes/osd/modules/render/blit13.h
rename to src/osd/modules/render/blit13.h
diff --git a/src/icludes/osd/modules/render/copyutil.h b/src/osd/modules/render/copyutil.h
similarity index 100%
rename from src/icludes/osd/modules/render/copyutil.h
rename to src/osd/modules/render/copyutil.h
diff --git a/src/icludes/osd/modules/render/d3d/d3dcomm.h b/src/osd/modules/render/d3d/d3dcomm.h
similarity index 100%
rename from src/icludes/osd/modules/render/d3d/d3dcomm.h
rename to src/osd/modules/render/d3d/d3dcomm.h
diff --git a/src/icludes/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/d3d/d3dhlsl.cpp
rename to src/osd/modules/render/d3d/d3dhlsl.cpp
diff --git a/src/icludes/osd/modules/render/d3d/d3dhlsl.h b/src/osd/modules/render/d3d/d3dhlsl.h
similarity index 100%
rename from src/icludes/osd/modules/render/d3d/d3dhlsl.h
rename to src/osd/modules/render/d3d/d3dhlsl.h
diff --git a/src/icludes/osd/modules/render/draw13.cpp b/src/osd/modules/render/draw13.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/draw13.cpp
rename to src/osd/modules/render/draw13.cpp
diff --git a/src/icludes/osd/modules/render/draw13.h b/src/osd/modules/render/draw13.h
similarity index 100%
rename from src/icludes/osd/modules/render/draw13.h
rename to src/osd/modules/render/draw13.h
diff --git a/src/icludes/osd/modules/render/drawbgfx.cpp b/src/osd/modules/render/drawbgfx.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/drawbgfx.cpp
rename to src/osd/modules/render/drawbgfx.cpp
diff --git a/src/icludes/osd/modules/render/drawbgfx.h b/src/osd/modules/render/drawbgfx.h
similarity index 100%
rename from src/icludes/osd/modules/render/drawbgfx.h
rename to src/osd/modules/render/drawbgfx.h
diff --git a/src/icludes/osd/modules/render/drawd3d.cpp b/src/osd/modules/render/drawd3d.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/drawd3d.cpp
rename to src/osd/modules/render/drawd3d.cpp
diff --git a/src/icludes/osd/modules/render/drawd3d.h b/src/osd/modules/render/drawd3d.h
similarity index 100%
rename from src/icludes/osd/modules/render/drawd3d.h
rename to src/osd/modules/render/drawd3d.h
diff --git a/src/icludes/osd/modules/render/drawgdi.cpp b/src/osd/modules/render/drawgdi.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/drawgdi.cpp
rename to src/osd/modules/render/drawgdi.cpp
diff --git a/src/icludes/osd/modules/render/drawgdi.h b/src/osd/modules/render/drawgdi.h
similarity index 100%
rename from src/icludes/osd/modules/render/drawgdi.h
rename to src/osd/modules/render/drawgdi.h
diff --git a/src/icludes/osd/modules/render/drawnone.cpp b/src/osd/modules/render/drawnone.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/drawnone.cpp
rename to src/osd/modules/render/drawnone.cpp
diff --git a/src/icludes/osd/modules/render/drawnone.h b/src/osd/modules/render/drawnone.h
similarity index 100%
rename from src/icludes/osd/modules/render/drawnone.h
rename to src/osd/modules/render/drawnone.h
diff --git a/src/icludes/osd/modules/render/drawogl.cpp b/src/osd/modules/render/drawogl.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/drawogl.cpp
rename to src/osd/modules/render/drawogl.cpp
diff --git a/src/icludes/osd/modules/render/drawogl.h b/src/osd/modules/render/drawogl.h
similarity index 100%
rename from src/icludes/osd/modules/render/drawogl.h
rename to src/osd/modules/render/drawogl.h
diff --git a/src/icludes/osd/modules/render/drawsdl.cpp b/src/osd/modules/render/drawsdl.cpp
similarity index 100%
rename from src/icludes/osd/modules/render/drawsdl.cpp
rename to src/osd/modules/render/drawsdl.cpp
diff --git a/src/icludes/osd/modules/render/drawsdl.h b/src/osd/modules/render/drawsdl.h
similarity index 100%
rename from src/icludes/osd/modules/render/drawsdl.h
rename to src/osd/modules/render/drawsdl.h
diff --git a/src/icludes/osd/modules/render/sdlglcontext.h b/src/osd/modules/render/sdlglcontext.h
similarity index 100%
rename from src/icludes/osd/modules/render/sdlglcontext.h
rename to src/osd/modules/render/sdlglcontext.h
diff --git a/src/icludes/osd/modules/render/sliderdirtynotifier.h b/src/osd/modules/render/sliderdirtynotifier.h
similarity index 100%
rename from src/icludes/osd/modules/render/sliderdirtynotifier.h
rename to src/osd/modules/render/sliderdirtynotifier.h
diff --git a/src/icludes/osd/modules/render/winglcontext.h b/src/osd/modules/render/winglcontext.h
similarity index 100%
rename from src/icludes/osd/modules/render/winglcontext.h
rename to src/osd/modules/render/winglcontext.h
diff --git a/src/icludes/osd/modules/sound/coreaudio_sound.cpp b/src/osd/modules/sound/coreaudio_sound.cpp
similarity index 100%
rename from src/icludes/osd/modules/sound/coreaudio_sound.cpp
rename to src/osd/modules/sound/coreaudio_sound.cpp
diff --git a/src/icludes/osd/modules/sound/direct_sound.cpp b/src/osd/modules/sound/direct_sound.cpp
similarity index 100%
rename from src/icludes/osd/modules/sound/direct_sound.cpp
rename to src/osd/modules/sound/direct_sound.cpp
diff --git a/src/icludes/osd/modules/sound/js_sound.cpp b/src/osd/modules/sound/js_sound.cpp
similarity index 100%
rename from src/icludes/osd/modules/sound/js_sound.cpp
rename to src/osd/modules/sound/js_sound.cpp
diff --git a/src/icludes/osd/modules/sound/js_sound.js b/src/osd/modules/sound/js_sound.js
similarity index 100%
rename from src/icludes/osd/modules/sound/js_sound.js
rename to src/osd/modules/sound/js_sound.js
diff --git a/src/icludes/osd/modules/sound/none.cpp b/src/osd/modules/sound/none.cpp
similarity index 100%
rename from src/icludes/osd/modules/sound/none.cpp
rename to src/osd/modules/sound/none.cpp
diff --git a/src/icludes/osd/modules/sound/pa_sound.cpp b/src/osd/modules/sound/pa_sound.cpp
similarity index 100%
rename from src/icludes/osd/modules/sound/pa_sound.cpp
rename to src/osd/modules/sound/pa_sound.cpp
diff --git a/src/icludes/osd/modules/sound/pulse_sound.cpp b/src/osd/modules/sound/pulse_sound.cpp
similarity index 100%
rename from src/icludes/osd/modules/sound/pulse_sound.cpp
rename to src/osd/modules/sound/pulse_sound.cpp
diff --git a/src/icludes/osd/modules/sound/sdl_sound.cpp b/src/osd/modules/sound/sdl_sound.cpp
similarity index 100%
rename from src/icludes/osd/modules/sound/sdl_sound.cpp
rename to src/osd/modules/sound/sdl_sound.cpp
diff --git a/src/icludes/osd/modules/sound/sound_module.h b/src/osd/modules/sound/sound_module.h
similarity index 100%
rename from src/icludes/osd/modules/sound/sound_module.h
rename to src/osd/modules/sound/sound_module.h
diff --git a/src/icludes/osd/modules/sound/xaudio2_sound.cpp b/src/osd/modules/sound/xaudio2_sound.cpp
similarity index 100%
rename from src/icludes/osd/modules/sound/xaudio2_sound.cpp
rename to src/osd/modules/sound/xaudio2_sound.cpp
diff --git a/src/icludes/osd/osdcomm.h b/src/osd/osdcomm.h
similarity index 100%
rename from src/icludes/osd/osdcomm.h
rename to src/osd/osdcomm.h
diff --git a/src/icludes/osd/osdcore.cpp b/src/osd/osdcore.cpp
similarity index 100%
rename from src/icludes/osd/osdcore.cpp
rename to src/osd/osdcore.cpp
diff --git a/src/icludes/osd/osdcore.h b/src/osd/osdcore.h
similarity index 100%
rename from src/icludes/osd/osdcore.h
rename to src/osd/osdcore.h
diff --git a/src/icludes/osd/osdepend.h b/src/osd/osdepend.h
similarity index 100%
rename from src/icludes/osd/osdepend.h
rename to src/osd/osdepend.h
diff --git a/src/icludes/osd/osdfile.h b/src/osd/osdfile.h
similarity index 100%
rename from src/icludes/osd/osdfile.h
rename to src/osd/osdfile.h
diff --git a/src/icludes/osd/osdnet.cpp b/src/osd/osdnet.cpp
similarity index 100%
rename from src/icludes/osd/osdnet.cpp
rename to src/osd/osdnet.cpp
diff --git a/src/icludes/osd/osdnet.h b/src/osd/osdnet.h
similarity index 100%
rename from src/icludes/osd/osdnet.h
rename to src/osd/osdnet.h
diff --git a/src/icludes/osd/osdsync.cpp b/src/osd/osdsync.cpp
similarity index 100%
rename from src/icludes/osd/osdsync.cpp
rename to src/osd/osdsync.cpp
diff --git a/src/icludes/osd/osdsync.h b/src/osd/osdsync.h
similarity index 100%
rename from src/icludes/osd/osdsync.h
rename to src/osd/osdsync.h
diff --git a/src/icludes/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h
similarity index 100%
rename from src/icludes/osd/sdl/osdsdl.h
rename to src/osd/sdl/osdsdl.h
diff --git a/src/icludes/osd/sdl/sdlmain.cpp b/src/osd/sdl/sdlmain.cpp
similarity index 100%
rename from src/icludes/osd/sdl/sdlmain.cpp
rename to src/osd/sdl/sdlmain.cpp
diff --git a/src/icludes/osd/sdl/sdlprefix.h b/src/osd/sdl/sdlprefix.h
similarity index 100%
rename from src/icludes/osd/sdl/sdlprefix.h
rename to src/osd/sdl/sdlprefix.h
diff --git a/src/icludes/osd/sdl/taputil.sh b/src/osd/sdl/taputil.sh
similarity index 100%
rename from src/icludes/osd/sdl/taputil.sh
rename to src/osd/sdl/taputil.sh
diff --git a/src/icludes/osd/sdl/video.cpp b/src/osd/sdl/video.cpp
similarity index 100%
rename from src/icludes/osd/sdl/video.cpp
rename to src/osd/sdl/video.cpp
diff --git a/src/icludes/osd/sdl/window.cpp b/src/osd/sdl/window.cpp
similarity index 100%
rename from src/icludes/osd/sdl/window.cpp
rename to src/osd/sdl/window.cpp
diff --git a/src/icludes/osd/sdl/window.h b/src/osd/sdl/window.h
similarity index 100%
rename from src/icludes/osd/sdl/window.h
rename to src/osd/sdl/window.h
diff --git a/src/icludes/osd/strconv.cpp b/src/osd/strconv.cpp
similarity index 100%
rename from src/icludes/osd/strconv.cpp
rename to src/osd/strconv.cpp
diff --git a/src/icludes/osd/strconv.h b/src/osd/strconv.h
similarity index 100%
rename from src/icludes/osd/strconv.h
rename to src/osd/strconv.h
diff --git a/src/icludes/osd/watchdog.cpp b/src/osd/watchdog.cpp
similarity index 100%
rename from src/icludes/osd/watchdog.cpp
rename to src/osd/watchdog.cpp
diff --git a/src/icludes/osd/watchdog.h b/src/osd/watchdog.h
similarity index 100%
rename from src/icludes/osd/watchdog.h
rename to src/osd/watchdog.h
diff --git a/src/icludes/osd/windows/ledutil.cpp b/src/osd/windows/ledutil.cpp
similarity index 100%
rename from src/icludes/osd/windows/ledutil.cpp
rename to src/osd/windows/ledutil.cpp
diff --git a/src/icludes/osd/windows/video.cpp b/src/osd/windows/video.cpp
similarity index 100%
rename from src/icludes/osd/windows/video.cpp
rename to src/osd/windows/video.cpp
diff --git a/src/icludes/osd/windows/video.h b/src/osd/windows/video.h
similarity index 100%
rename from src/icludes/osd/windows/video.h
rename to src/osd/windows/video.h
diff --git a/src/icludes/osd/windows/window.cpp b/src/osd/windows/window.cpp
similarity index 100%
rename from src/icludes/osd/windows/window.cpp
rename to src/osd/windows/window.cpp
diff --git a/src/icludes/osd/windows/window.h b/src/osd/windows/window.h
similarity index 100%
rename from src/icludes/osd/windows/window.h
rename to src/osd/windows/window.h
diff --git a/src/icludes/osd/windows/winmain.cpp b/src/osd/windows/winmain.cpp
similarity index 100%
rename from src/icludes/osd/windows/winmain.cpp
rename to src/osd/windows/winmain.cpp
diff --git a/src/icludes/osd/windows/winmain.h b/src/osd/windows/winmain.h
similarity index 100%
rename from src/icludes/osd/windows/winmain.h
rename to src/osd/windows/winmain.h
diff --git a/src/icludes/osd/windows/winmenu.cpp b/src/osd/windows/winmenu.cpp
similarity index 100%
rename from src/icludes/osd/windows/winmenu.cpp
rename to src/osd/windows/winmenu.cpp
diff --git a/src/icludes/osd/windows/winutf8.cpp b/src/osd/windows/winutf8.cpp
similarity index 100%
rename from src/icludes/osd/windows/winutf8.cpp
rename to src/osd/windows/winutf8.cpp
diff --git a/src/icludes/osd/windows/winutf8.h b/src/osd/windows/winutf8.h
similarity index 100%
rename from src/icludes/osd/windows/winutf8.h
rename to src/osd/windows/winutf8.h
diff --git a/src/icludes/osd/windows/winutil.cpp b/src/osd/windows/winutil.cpp
similarity index 100%
rename from src/icludes/osd/windows/winutil.cpp
rename to src/osd/windows/winutil.cpp
diff --git a/src/icludes/osd/windows/winutil.h b/src/osd/windows/winutil.h
similarity index 100%
rename from src/icludes/osd/windows/winutil.h
rename to src/osd/windows/winutil.h