diff --git a/.dockerignore b/src/spice2x/.dockerignore
similarity index 100%
rename from .dockerignore
rename to src/spice2x/.dockerignore
diff --git a/CMakeLists.txt b/src/spice2x/CMakeLists.txt
similarity index 100%
rename from CMakeLists.txt
rename to src/spice2x/CMakeLists.txt
diff --git a/Dockerfile b/src/spice2x/Dockerfile
similarity index 100%
rename from Dockerfile
rename to src/spice2x/Dockerfile
diff --git a/acio/acio.cpp b/src/spice2x/acio/acio.cpp
similarity index 100%
rename from acio/acio.cpp
rename to src/spice2x/acio/acio.cpp
diff --git a/acio/acio.h b/src/spice2x/acio/acio.h
similarity index 100%
rename from acio/acio.h
rename to src/spice2x/acio/acio.h
diff --git a/acio/bi2a/bi2a.cpp b/src/spice2x/acio/bi2a/bi2a.cpp
similarity index 100%
rename from acio/bi2a/bi2a.cpp
rename to src/spice2x/acio/bi2a/bi2a.cpp
diff --git a/acio/bi2a/bi2a.h b/src/spice2x/acio/bi2a/bi2a.h
similarity index 100%
rename from acio/bi2a/bi2a.h
rename to src/spice2x/acio/bi2a/bi2a.h
diff --git a/acio/bmpu/bmpu.cpp b/src/spice2x/acio/bmpu/bmpu.cpp
similarity index 100%
rename from acio/bmpu/bmpu.cpp
rename to src/spice2x/acio/bmpu/bmpu.cpp
diff --git a/acio/bmpu/bmpu.h b/src/spice2x/acio/bmpu/bmpu.h
similarity index 100%
rename from acio/bmpu/bmpu.h
rename to src/spice2x/acio/bmpu/bmpu.h
diff --git a/acio/core/core.cpp b/src/spice2x/acio/core/core.cpp
similarity index 100%
rename from acio/core/core.cpp
rename to src/spice2x/acio/core/core.cpp
diff --git a/acio/core/core.h b/src/spice2x/acio/core/core.h
similarity index 100%
rename from acio/core/core.h
rename to src/spice2x/acio/core/core.h
diff --git a/acio/hbhi/hbhi.cpp b/src/spice2x/acio/hbhi/hbhi.cpp
similarity index 100%
rename from acio/hbhi/hbhi.cpp
rename to src/spice2x/acio/hbhi/hbhi.cpp
diff --git a/acio/hbhi/hbhi.h b/src/spice2x/acio/hbhi/hbhi.h
similarity index 100%
rename from acio/hbhi/hbhi.h
rename to src/spice2x/acio/hbhi/hbhi.h
diff --git a/acio/hdxs/hdxs.cpp b/src/spice2x/acio/hdxs/hdxs.cpp
similarity index 100%
rename from acio/hdxs/hdxs.cpp
rename to src/spice2x/acio/hdxs/hdxs.cpp
diff --git a/acio/hdxs/hdxs.h b/src/spice2x/acio/hdxs/hdxs.h
similarity index 100%
rename from acio/hdxs/hdxs.h
rename to src/spice2x/acio/hdxs/hdxs.h
diff --git a/acio/hgth/hgth.cpp b/src/spice2x/acio/hgth/hgth.cpp
similarity index 100%
rename from acio/hgth/hgth.cpp
rename to src/spice2x/acio/hgth/hgth.cpp
diff --git a/acio/hgth/hgth.h b/src/spice2x/acio/hgth/hgth.h
similarity index 100%
rename from acio/hgth/hgth.h
rename to src/spice2x/acio/hgth/hgth.h
diff --git a/acio/i36g/i36g.cpp b/src/spice2x/acio/i36g/i36g.cpp
similarity index 100%
rename from acio/i36g/i36g.cpp
rename to src/spice2x/acio/i36g/i36g.cpp
diff --git a/acio/i36g/i36g.h b/src/spice2x/acio/i36g/i36g.h
similarity index 100%
rename from acio/i36g/i36g.h
rename to src/spice2x/acio/i36g/i36g.h
diff --git a/acio/i36i/i36i.cpp b/src/spice2x/acio/i36i/i36i.cpp
similarity index 100%
rename from acio/i36i/i36i.cpp
rename to src/spice2x/acio/i36i/i36i.cpp
diff --git a/acio/i36i/i36i.h b/src/spice2x/acio/i36i/i36i.h
similarity index 100%
rename from acio/i36i/i36i.h
rename to src/spice2x/acio/i36i/i36i.h
diff --git a/acio/icca/icca.cpp b/src/spice2x/acio/icca/icca.cpp
similarity index 100%
rename from acio/icca/icca.cpp
rename to src/spice2x/acio/icca/icca.cpp
diff --git a/acio/icca/icca.h b/src/spice2x/acio/icca/icca.h
similarity index 100%
rename from acio/icca/icca.h
rename to src/spice2x/acio/icca/icca.h
diff --git a/acio/j32d/j32d.cpp b/src/spice2x/acio/j32d/j32d.cpp
similarity index 100%
rename from acio/j32d/j32d.cpp
rename to src/spice2x/acio/j32d/j32d.cpp
diff --git a/acio/j32d/j32d.h b/src/spice2x/acio/j32d/j32d.h
similarity index 100%
rename from acio/j32d/j32d.h
rename to src/spice2x/acio/j32d/j32d.h
diff --git a/acio/kfca/kfca.cpp b/src/spice2x/acio/kfca/kfca.cpp
similarity index 100%
rename from acio/kfca/kfca.cpp
rename to src/spice2x/acio/kfca/kfca.cpp
diff --git a/acio/kfca/kfca.h b/src/spice2x/acio/kfca/kfca.h
similarity index 100%
rename from acio/kfca/kfca.h
rename to src/spice2x/acio/kfca/kfca.h
diff --git a/acio/klpa/klpa.cpp b/src/spice2x/acio/klpa/klpa.cpp
similarity index 100%
rename from acio/klpa/klpa.cpp
rename to src/spice2x/acio/klpa/klpa.cpp
diff --git a/acio/klpa/klpa.h b/src/spice2x/acio/klpa/klpa.h
similarity index 100%
rename from acio/klpa/klpa.h
rename to src/spice2x/acio/klpa/klpa.h
diff --git a/acio/la9a/la9a.cpp b/src/spice2x/acio/la9a/la9a.cpp
similarity index 100%
rename from acio/la9a/la9a.cpp
rename to src/spice2x/acio/la9a/la9a.cpp
diff --git a/acio/la9a/la9a.h b/src/spice2x/acio/la9a/la9a.h
similarity index 100%
rename from acio/la9a/la9a.h
rename to src/spice2x/acio/la9a/la9a.h
diff --git a/acio/mdxf/mdxf.cpp b/src/spice2x/acio/mdxf/mdxf.cpp
similarity index 100%
rename from acio/mdxf/mdxf.cpp
rename to src/spice2x/acio/mdxf/mdxf.cpp
diff --git a/acio/mdxf/mdxf.h b/src/spice2x/acio/mdxf/mdxf.h
similarity index 100%
rename from acio/mdxf/mdxf.h
rename to src/spice2x/acio/mdxf/mdxf.h
diff --git a/acio/mdxf/mdxf_poll.h b/src/spice2x/acio/mdxf/mdxf_poll.h
similarity index 100%
rename from acio/mdxf/mdxf_poll.h
rename to src/spice2x/acio/mdxf/mdxf_poll.h
diff --git a/acio/module.cpp b/src/spice2x/acio/module.cpp
similarity index 100%
rename from acio/module.cpp
rename to src/spice2x/acio/module.cpp
diff --git a/acio/module.h b/src/spice2x/acio/module.h
similarity index 100%
rename from acio/module.h
rename to src/spice2x/acio/module.h
diff --git a/acio/nddb/nddb.cpp b/src/spice2x/acio/nddb/nddb.cpp
similarity index 100%
rename from acio/nddb/nddb.cpp
rename to src/spice2x/acio/nddb/nddb.cpp
diff --git a/acio/nddb/nddb.h b/src/spice2x/acio/nddb/nddb.h
similarity index 100%
rename from acio/nddb/nddb.h
rename to src/spice2x/acio/nddb/nddb.h
diff --git a/acio/panb/panb.cpp b/src/spice2x/acio/panb/panb.cpp
similarity index 100%
rename from acio/panb/panb.cpp
rename to src/spice2x/acio/panb/panb.cpp
diff --git a/acio/panb/panb.h b/src/spice2x/acio/panb/panb.h
similarity index 100%
rename from acio/panb/panb.h
rename to src/spice2x/acio/panb/panb.h
diff --git a/acio/pix/pix.cpp b/src/spice2x/acio/pix/pix.cpp
similarity index 100%
rename from acio/pix/pix.cpp
rename to src/spice2x/acio/pix/pix.cpp
diff --git a/acio/pix/pix.h b/src/spice2x/acio/pix/pix.h
similarity index 100%
rename from acio/pix/pix.h
rename to src/spice2x/acio/pix/pix.h
diff --git a/acio/pjec/pjec.cpp b/src/spice2x/acio/pjec/pjec.cpp
similarity index 100%
rename from acio/pjec/pjec.cpp
rename to src/spice2x/acio/pjec/pjec.cpp
diff --git a/acio/pjec/pjec.h b/src/spice2x/acio/pjec/pjec.h
similarity index 100%
rename from acio/pjec/pjec.h
rename to src/spice2x/acio/pjec/pjec.h
diff --git a/acio/pjei/pjei.cpp b/src/spice2x/acio/pjei/pjei.cpp
similarity index 100%
rename from acio/pjei/pjei.cpp
rename to src/spice2x/acio/pjei/pjei.cpp
diff --git a/acio/pjei/pjei.h b/src/spice2x/acio/pjei/pjei.h
similarity index 100%
rename from acio/pjei/pjei.h
rename to src/spice2x/acio/pjei/pjei.h
diff --git a/acio2emu/firmware/bi2x.cpp b/src/spice2x/acio2emu/firmware/bi2x.cpp
similarity index 100%
rename from acio2emu/firmware/bi2x.cpp
rename to src/spice2x/acio2emu/firmware/bi2x.cpp
diff --git a/acio2emu/firmware/bi2x.h b/src/spice2x/acio2emu/firmware/bi2x.h
similarity index 100%
rename from acio2emu/firmware/bi2x.h
rename to src/spice2x/acio2emu/firmware/bi2x.h
diff --git a/acio2emu/handle.cpp b/src/spice2x/acio2emu/handle.cpp
similarity index 100%
rename from acio2emu/handle.cpp
rename to src/spice2x/acio2emu/handle.cpp
diff --git a/acio2emu/handle.h b/src/spice2x/acio2emu/handle.h
similarity index 100%
rename from acio2emu/handle.h
rename to src/spice2x/acio2emu/handle.h
diff --git a/acio2emu/internal/crc.h b/src/spice2x/acio2emu/internal/crc.h
similarity index 100%
rename from acio2emu/internal/crc.h
rename to src/spice2x/acio2emu/internal/crc.h
diff --git a/acio2emu/internal/lz.h b/src/spice2x/acio2emu/internal/lz.h
similarity index 100%
rename from acio2emu/internal/lz.h
rename to src/spice2x/acio2emu/internal/lz.h
diff --git a/acio2emu/node.h b/src/spice2x/acio2emu/node.h
similarity index 100%
rename from acio2emu/node.h
rename to src/spice2x/acio2emu/node.h
diff --git a/acio2emu/packet.cpp b/src/spice2x/acio2emu/packet.cpp
similarity index 100%
rename from acio2emu/packet.cpp
rename to src/spice2x/acio2emu/packet.cpp
diff --git a/acio2emu/packet.h b/src/spice2x/acio2emu/packet.h
similarity index 100%
rename from acio2emu/packet.h
rename to src/spice2x/acio2emu/packet.h
diff --git a/acioemu/acioemu.cpp b/src/spice2x/acioemu/acioemu.cpp
similarity index 100%
rename from acioemu/acioemu.cpp
rename to src/spice2x/acioemu/acioemu.cpp
diff --git a/acioemu/acioemu.h b/src/spice2x/acioemu/acioemu.h
similarity index 100%
rename from acioemu/acioemu.h
rename to src/spice2x/acioemu/acioemu.h
diff --git a/acioemu/bi2a.h b/src/spice2x/acioemu/bi2a.h
similarity index 100%
rename from acioemu/bi2a.h
rename to src/spice2x/acioemu/bi2a.h
diff --git a/acioemu/device.cpp b/src/spice2x/acioemu/device.cpp
similarity index 100%
rename from acioemu/device.cpp
rename to src/spice2x/acioemu/device.cpp
diff --git a/acioemu/device.h b/src/spice2x/acioemu/device.h
similarity index 100%
rename from acioemu/device.h
rename to src/spice2x/acioemu/device.h
diff --git a/acioemu/handle.cpp b/src/spice2x/acioemu/handle.cpp
similarity index 100%
rename from acioemu/handle.cpp
rename to src/spice2x/acioemu/handle.cpp
diff --git a/acioemu/handle.h b/src/spice2x/acioemu/handle.h
similarity index 100%
rename from acioemu/handle.h
rename to src/spice2x/acioemu/handle.h
diff --git a/acioemu/icca.cpp b/src/spice2x/acioemu/icca.cpp
similarity index 100%
rename from acioemu/icca.cpp
rename to src/spice2x/acioemu/icca.cpp
diff --git a/acioemu/icca.h b/src/spice2x/acioemu/icca.h
similarity index 100%
rename from acioemu/icca.h
rename to src/spice2x/acioemu/icca.h
diff --git a/api/controller.cpp b/src/spice2x/api/controller.cpp
similarity index 100%
rename from api/controller.cpp
rename to src/spice2x/api/controller.cpp
diff --git a/api/controller.h b/src/spice2x/api/controller.h
similarity index 100%
rename from api/controller.h
rename to src/spice2x/api/controller.h
diff --git a/api/module.cpp b/src/spice2x/api/module.cpp
similarity index 100%
rename from api/module.cpp
rename to src/spice2x/api/module.cpp
diff --git a/api/module.h b/src/spice2x/api/module.h
similarity index 100%
rename from api/module.h
rename to src/spice2x/api/module.h
diff --git a/api/modules/analogs.cpp b/src/spice2x/api/modules/analogs.cpp
similarity index 100%
rename from api/modules/analogs.cpp
rename to src/spice2x/api/modules/analogs.cpp
diff --git a/api/modules/analogs.h b/src/spice2x/api/modules/analogs.h
similarity index 100%
rename from api/modules/analogs.h
rename to src/spice2x/api/modules/analogs.h
diff --git a/api/modules/buttons.cpp b/src/spice2x/api/modules/buttons.cpp
similarity index 100%
rename from api/modules/buttons.cpp
rename to src/spice2x/api/modules/buttons.cpp
diff --git a/api/modules/buttons.h b/src/spice2x/api/modules/buttons.h
similarity index 100%
rename from api/modules/buttons.h
rename to src/spice2x/api/modules/buttons.h
diff --git a/api/modules/capture.cpp b/src/spice2x/api/modules/capture.cpp
similarity index 100%
rename from api/modules/capture.cpp
rename to src/spice2x/api/modules/capture.cpp
diff --git a/api/modules/capture.h b/src/spice2x/api/modules/capture.h
similarity index 100%
rename from api/modules/capture.h
rename to src/spice2x/api/modules/capture.h
diff --git a/api/modules/card.cpp b/src/spice2x/api/modules/card.cpp
similarity index 100%
rename from api/modules/card.cpp
rename to src/spice2x/api/modules/card.cpp
diff --git a/api/modules/card.h b/src/spice2x/api/modules/card.h
similarity index 100%
rename from api/modules/card.h
rename to src/spice2x/api/modules/card.h
diff --git a/api/modules/coin.cpp b/src/spice2x/api/modules/coin.cpp
similarity index 100%
rename from api/modules/coin.cpp
rename to src/spice2x/api/modules/coin.cpp
diff --git a/api/modules/coin.h b/src/spice2x/api/modules/coin.h
similarity index 100%
rename from api/modules/coin.h
rename to src/spice2x/api/modules/coin.h
diff --git a/api/modules/control.cpp b/src/spice2x/api/modules/control.cpp
similarity index 100%
rename from api/modules/control.cpp
rename to src/spice2x/api/modules/control.cpp
diff --git a/api/modules/control.h b/src/spice2x/api/modules/control.h
similarity index 100%
rename from api/modules/control.h
rename to src/spice2x/api/modules/control.h
diff --git a/api/modules/ddr.cpp b/src/spice2x/api/modules/ddr.cpp
similarity index 100%
rename from api/modules/ddr.cpp
rename to src/spice2x/api/modules/ddr.cpp
diff --git a/api/modules/ddr.h b/src/spice2x/api/modules/ddr.h
similarity index 100%
rename from api/modules/ddr.h
rename to src/spice2x/api/modules/ddr.h
diff --git a/api/modules/drs.cpp b/src/spice2x/api/modules/drs.cpp
similarity index 100%
rename from api/modules/drs.cpp
rename to src/spice2x/api/modules/drs.cpp
diff --git a/api/modules/drs.h b/src/spice2x/api/modules/drs.h
similarity index 100%
rename from api/modules/drs.h
rename to src/spice2x/api/modules/drs.h
diff --git a/api/modules/iidx.cpp b/src/spice2x/api/modules/iidx.cpp
similarity index 100%
rename from api/modules/iidx.cpp
rename to src/spice2x/api/modules/iidx.cpp
diff --git a/api/modules/iidx.h b/src/spice2x/api/modules/iidx.h
similarity index 100%
rename from api/modules/iidx.h
rename to src/spice2x/api/modules/iidx.h
diff --git a/api/modules/info.cpp b/src/spice2x/api/modules/info.cpp
similarity index 100%
rename from api/modules/info.cpp
rename to src/spice2x/api/modules/info.cpp
diff --git a/api/modules/info.h b/src/spice2x/api/modules/info.h
similarity index 100%
rename from api/modules/info.h
rename to src/spice2x/api/modules/info.h
diff --git a/api/modules/keypads.cpp b/src/spice2x/api/modules/keypads.cpp
similarity index 100%
rename from api/modules/keypads.cpp
rename to src/spice2x/api/modules/keypads.cpp
diff --git a/api/modules/keypads.h b/src/spice2x/api/modules/keypads.h
similarity index 100%
rename from api/modules/keypads.h
rename to src/spice2x/api/modules/keypads.h
diff --git a/api/modules/lcd.cpp b/src/spice2x/api/modules/lcd.cpp
similarity index 100%
rename from api/modules/lcd.cpp
rename to src/spice2x/api/modules/lcd.cpp
diff --git a/api/modules/lcd.h b/src/spice2x/api/modules/lcd.h
similarity index 100%
rename from api/modules/lcd.h
rename to src/spice2x/api/modules/lcd.h
diff --git a/api/modules/lights.cpp b/src/spice2x/api/modules/lights.cpp
similarity index 100%
rename from api/modules/lights.cpp
rename to src/spice2x/api/modules/lights.cpp
diff --git a/api/modules/lights.h b/src/spice2x/api/modules/lights.h
similarity index 100%
rename from api/modules/lights.h
rename to src/spice2x/api/modules/lights.h
diff --git a/api/modules/memory.cpp b/src/spice2x/api/modules/memory.cpp
similarity index 100%
rename from api/modules/memory.cpp
rename to src/spice2x/api/modules/memory.cpp
diff --git a/api/modules/memory.h b/src/spice2x/api/modules/memory.h
similarity index 100%
rename from api/modules/memory.h
rename to src/spice2x/api/modules/memory.h
diff --git a/api/modules/resize.cpp b/src/spice2x/api/modules/resize.cpp
similarity index 100%
rename from api/modules/resize.cpp
rename to src/spice2x/api/modules/resize.cpp
diff --git a/api/modules/resize.h b/src/spice2x/api/modules/resize.h
similarity index 100%
rename from api/modules/resize.h
rename to src/spice2x/api/modules/resize.h
diff --git a/api/modules/touch.cpp b/src/spice2x/api/modules/touch.cpp
similarity index 100%
rename from api/modules/touch.cpp
rename to src/spice2x/api/modules/touch.cpp
diff --git a/api/modules/touch.h b/src/spice2x/api/modules/touch.h
similarity index 100%
rename from api/modules/touch.h
rename to src/spice2x/api/modules/touch.h
diff --git a/api/request.cpp b/src/spice2x/api/request.cpp
similarity index 100%
rename from api/request.cpp
rename to src/spice2x/api/request.cpp
diff --git a/api/request.h b/src/spice2x/api/request.h
similarity index 100%
rename from api/request.h
rename to src/spice2x/api/request.h
diff --git a/api/resources/arduino/README.md b/src/spice2x/api/resources/arduino/README.md
similarity index 100%
rename from api/resources/arduino/README.md
rename to src/spice2x/api/resources/arduino/README.md
diff --git a/api/resources/arduino/spiceapi/connection.h b/src/spice2x/api/resources/arduino/spiceapi/connection.h
similarity index 100%
rename from api/resources/arduino/spiceapi/connection.h
rename to src/spice2x/api/resources/arduino/spiceapi/connection.h
diff --git a/api/resources/arduino/spiceapi/rc4.h b/src/spice2x/api/resources/arduino/spiceapi/rc4.h
similarity index 100%
rename from api/resources/arduino/spiceapi/rc4.h
rename to src/spice2x/api/resources/arduino/spiceapi/rc4.h
diff --git a/api/resources/arduino/spiceapi/spiceapi.ino b/src/spice2x/api/resources/arduino/spiceapi/spiceapi.ino
similarity index 100%
rename from api/resources/arduino/spiceapi/spiceapi.ino
rename to src/spice2x/api/resources/arduino/spiceapi/spiceapi.ino
diff --git a/api/resources/arduino/spiceapi/wrappers.h b/src/spice2x/api/resources/arduino/spiceapi/wrappers.h
similarity index 100%
rename from api/resources/arduino/spiceapi/wrappers.h
rename to src/spice2x/api/resources/arduino/spiceapi/wrappers.h
diff --git a/api/resources/cpp/README.md b/src/spice2x/api/resources/cpp/README.md
similarity index 100%
rename from api/resources/cpp/README.md
rename to src/spice2x/api/resources/cpp/README.md
diff --git a/api/resources/cpp/spiceapi/LICENSE b/src/spice2x/api/resources/cpp/spiceapi/LICENSE
similarity index 100%
rename from api/resources/cpp/spiceapi/LICENSE
rename to src/spice2x/api/resources/cpp/spiceapi/LICENSE
diff --git a/api/resources/cpp/spiceapi/connection.cpp b/src/spice2x/api/resources/cpp/spiceapi/connection.cpp
similarity index 100%
rename from api/resources/cpp/spiceapi/connection.cpp
rename to src/spice2x/api/resources/cpp/spiceapi/connection.cpp
diff --git a/api/resources/cpp/spiceapi/connection.h b/src/spice2x/api/resources/cpp/spiceapi/connection.h
similarity index 100%
rename from api/resources/cpp/spiceapi/connection.h
rename to src/spice2x/api/resources/cpp/spiceapi/connection.h
diff --git a/api/resources/cpp/spiceapi/rc4.cpp b/src/spice2x/api/resources/cpp/spiceapi/rc4.cpp
similarity index 100%
rename from api/resources/cpp/spiceapi/rc4.cpp
rename to src/spice2x/api/resources/cpp/spiceapi/rc4.cpp
diff --git a/api/resources/cpp/spiceapi/rc4.h b/src/spice2x/api/resources/cpp/spiceapi/rc4.h
similarity index 100%
rename from api/resources/cpp/spiceapi/rc4.h
rename to src/spice2x/api/resources/cpp/spiceapi/rc4.h
diff --git a/api/resources/cpp/spiceapi/wrappers.cpp b/src/spice2x/api/resources/cpp/spiceapi/wrappers.cpp
similarity index 100%
rename from api/resources/cpp/spiceapi/wrappers.cpp
rename to src/spice2x/api/resources/cpp/spiceapi/wrappers.cpp
diff --git a/api/resources/cpp/spiceapi/wrappers.h b/src/spice2x/api/resources/cpp/spiceapi/wrappers.h
similarity index 100%
rename from api/resources/cpp/spiceapi/wrappers.h
rename to src/spice2x/api/resources/cpp/spiceapi/wrappers.h
diff --git a/api/resources/dart/spiceapi-websocket/LICENSE b/src/spice2x/api/resources/dart/spiceapi-websocket/LICENSE
similarity index 100%
rename from api/resources/dart/spiceapi-websocket/LICENSE
rename to src/spice2x/api/resources/dart/spiceapi-websocket/LICENSE
diff --git a/api/resources/dart/spiceapi-websocket/spiceapi.dart b/src/spice2x/api/resources/dart/spiceapi-websocket/spiceapi.dart
similarity index 100%
rename from api/resources/dart/spiceapi-websocket/spiceapi.dart
rename to src/spice2x/api/resources/dart/spiceapi-websocket/spiceapi.dart
diff --git a/api/resources/dart/spiceapi-websocket/src/connection.dart b/src/spice2x/api/resources/dart/spiceapi-websocket/src/connection.dart
similarity index 100%
rename from api/resources/dart/spiceapi-websocket/src/connection.dart
rename to src/spice2x/api/resources/dart/spiceapi-websocket/src/connection.dart
diff --git a/api/resources/dart/spiceapi-websocket/src/exceptions.dart b/src/spice2x/api/resources/dart/spiceapi-websocket/src/exceptions.dart
similarity index 100%
rename from api/resources/dart/spiceapi-websocket/src/exceptions.dart
rename to src/spice2x/api/resources/dart/spiceapi-websocket/src/exceptions.dart
diff --git a/api/resources/dart/spiceapi-websocket/src/rc4.dart b/src/spice2x/api/resources/dart/spiceapi-websocket/src/rc4.dart
similarity index 100%
rename from api/resources/dart/spiceapi-websocket/src/rc4.dart
rename to src/spice2x/api/resources/dart/spiceapi-websocket/src/rc4.dart
diff --git a/api/resources/dart/spiceapi-websocket/src/request.dart b/src/spice2x/api/resources/dart/spiceapi-websocket/src/request.dart
similarity index 100%
rename from api/resources/dart/spiceapi-websocket/src/request.dart
rename to src/spice2x/api/resources/dart/spiceapi-websocket/src/request.dart
diff --git a/api/resources/dart/spiceapi-websocket/src/response.dart b/src/spice2x/api/resources/dart/spiceapi-websocket/src/response.dart
similarity index 100%
rename from api/resources/dart/spiceapi-websocket/src/response.dart
rename to src/spice2x/api/resources/dart/spiceapi-websocket/src/response.dart
diff --git a/api/resources/dart/spiceapi-websocket/src/wrappers/analogs.dart b/src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/analogs.dart
similarity index 100%
rename from api/resources/dart/spiceapi-websocket/src/wrappers/analogs.dart
rename to src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/analogs.dart
diff --git a/api/resources/dart/spiceapi-websocket/src/wrappers/buttons.dart b/src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/buttons.dart
similarity index 100%
rename from api/resources/dart/spiceapi-websocket/src/wrappers/buttons.dart
rename to src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/buttons.dart
diff --git a/api/resources/dart/spiceapi-websocket/src/wrappers/card.dart b/src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/card.dart
similarity index 100%
rename from api/resources/dart/spiceapi-websocket/src/wrappers/card.dart
rename to src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/card.dart
diff --git a/api/resources/dart/spiceapi-websocket/src/wrappers/coin.dart b/src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/coin.dart
similarity index 100%
rename from api/resources/dart/spiceapi-websocket/src/wrappers/coin.dart
rename to src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/coin.dart
diff --git a/api/resources/dart/spiceapi-websocket/src/wrappers/control.dart b/src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/control.dart
similarity index 100%
rename from api/resources/dart/spiceapi-websocket/src/wrappers/control.dart
rename to src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/control.dart
diff --git a/api/resources/dart/spiceapi-websocket/src/wrappers/iidx.dart b/src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/iidx.dart
similarity index 100%
rename from api/resources/dart/spiceapi-websocket/src/wrappers/iidx.dart
rename to src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/iidx.dart
diff --git a/api/resources/dart/spiceapi-websocket/src/wrappers/info.dart b/src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/info.dart
similarity index 100%
rename from api/resources/dart/spiceapi-websocket/src/wrappers/info.dart
rename to src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/info.dart
diff --git a/api/resources/dart/spiceapi-websocket/src/wrappers/keypads.dart b/src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/keypads.dart
similarity index 100%
rename from api/resources/dart/spiceapi-websocket/src/wrappers/keypads.dart
rename to src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/keypads.dart
diff --git a/api/resources/dart/spiceapi-websocket/src/wrappers/lights.dart b/src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/lights.dart
similarity index 100%
rename from api/resources/dart/spiceapi-websocket/src/wrappers/lights.dart
rename to src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/lights.dart
diff --git a/api/resources/dart/spiceapi-websocket/src/wrappers/memory.dart b/src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/memory.dart
similarity index 100%
rename from api/resources/dart/spiceapi-websocket/src/wrappers/memory.dart
rename to src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/memory.dart
diff --git a/api/resources/dart/spiceapi-websocket/src/wrappers/touch.dart b/src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/touch.dart
similarity index 100%
rename from api/resources/dart/spiceapi-websocket/src/wrappers/touch.dart
rename to src/spice2x/api/resources/dart/spiceapi-websocket/src/wrappers/touch.dart
diff --git a/api/resources/dart/spiceapi/LICENSE b/src/spice2x/api/resources/dart/spiceapi/LICENSE
similarity index 100%
rename from api/resources/dart/spiceapi/LICENSE
rename to src/spice2x/api/resources/dart/spiceapi/LICENSE
diff --git a/api/resources/dart/spiceapi/spiceapi.dart b/src/spice2x/api/resources/dart/spiceapi/spiceapi.dart
similarity index 100%
rename from api/resources/dart/spiceapi/spiceapi.dart
rename to src/spice2x/api/resources/dart/spiceapi/spiceapi.dart
diff --git a/api/resources/dart/spiceapi/src/connection.dart b/src/spice2x/api/resources/dart/spiceapi/src/connection.dart
similarity index 100%
rename from api/resources/dart/spiceapi/src/connection.dart
rename to src/spice2x/api/resources/dart/spiceapi/src/connection.dart
diff --git a/api/resources/dart/spiceapi/src/exceptions.dart b/src/spice2x/api/resources/dart/spiceapi/src/exceptions.dart
similarity index 100%
rename from api/resources/dart/spiceapi/src/exceptions.dart
rename to src/spice2x/api/resources/dart/spiceapi/src/exceptions.dart
diff --git a/api/resources/dart/spiceapi/src/rc4.dart b/src/spice2x/api/resources/dart/spiceapi/src/rc4.dart
similarity index 100%
rename from api/resources/dart/spiceapi/src/rc4.dart
rename to src/spice2x/api/resources/dart/spiceapi/src/rc4.dart
diff --git a/api/resources/dart/spiceapi/src/request.dart b/src/spice2x/api/resources/dart/spiceapi/src/request.dart
similarity index 100%
rename from api/resources/dart/spiceapi/src/request.dart
rename to src/spice2x/api/resources/dart/spiceapi/src/request.dart
diff --git a/api/resources/dart/spiceapi/src/response.dart b/src/spice2x/api/resources/dart/spiceapi/src/response.dart
similarity index 100%
rename from api/resources/dart/spiceapi/src/response.dart
rename to src/spice2x/api/resources/dart/spiceapi/src/response.dart
diff --git a/api/resources/dart/spiceapi/src/wrappers/analogs.dart b/src/spice2x/api/resources/dart/spiceapi/src/wrappers/analogs.dart
similarity index 100%
rename from api/resources/dart/spiceapi/src/wrappers/analogs.dart
rename to src/spice2x/api/resources/dart/spiceapi/src/wrappers/analogs.dart
diff --git a/api/resources/dart/spiceapi/src/wrappers/buttons.dart b/src/spice2x/api/resources/dart/spiceapi/src/wrappers/buttons.dart
similarity index 100%
rename from api/resources/dart/spiceapi/src/wrappers/buttons.dart
rename to src/spice2x/api/resources/dart/spiceapi/src/wrappers/buttons.dart
diff --git a/api/resources/dart/spiceapi/src/wrappers/capture.dart b/src/spice2x/api/resources/dart/spiceapi/src/wrappers/capture.dart
similarity index 100%
rename from api/resources/dart/spiceapi/src/wrappers/capture.dart
rename to src/spice2x/api/resources/dart/spiceapi/src/wrappers/capture.dart
diff --git a/api/resources/dart/spiceapi/src/wrappers/card.dart b/src/spice2x/api/resources/dart/spiceapi/src/wrappers/card.dart
similarity index 100%
rename from api/resources/dart/spiceapi/src/wrappers/card.dart
rename to src/spice2x/api/resources/dart/spiceapi/src/wrappers/card.dart
diff --git a/api/resources/dart/spiceapi/src/wrappers/coin.dart b/src/spice2x/api/resources/dart/spiceapi/src/wrappers/coin.dart
similarity index 100%
rename from api/resources/dart/spiceapi/src/wrappers/coin.dart
rename to src/spice2x/api/resources/dart/spiceapi/src/wrappers/coin.dart
diff --git a/api/resources/dart/spiceapi/src/wrappers/control.dart b/src/spice2x/api/resources/dart/spiceapi/src/wrappers/control.dart
similarity index 100%
rename from api/resources/dart/spiceapi/src/wrappers/control.dart
rename to src/spice2x/api/resources/dart/spiceapi/src/wrappers/control.dart
diff --git a/api/resources/dart/spiceapi/src/wrappers/iidx.dart b/src/spice2x/api/resources/dart/spiceapi/src/wrappers/iidx.dart
similarity index 100%
rename from api/resources/dart/spiceapi/src/wrappers/iidx.dart
rename to src/spice2x/api/resources/dart/spiceapi/src/wrappers/iidx.dart
diff --git a/api/resources/dart/spiceapi/src/wrappers/info.dart b/src/spice2x/api/resources/dart/spiceapi/src/wrappers/info.dart
similarity index 100%
rename from api/resources/dart/spiceapi/src/wrappers/info.dart
rename to src/spice2x/api/resources/dart/spiceapi/src/wrappers/info.dart
diff --git a/api/resources/dart/spiceapi/src/wrappers/keypads.dart b/src/spice2x/api/resources/dart/spiceapi/src/wrappers/keypads.dart
similarity index 100%
rename from api/resources/dart/spiceapi/src/wrappers/keypads.dart
rename to src/spice2x/api/resources/dart/spiceapi/src/wrappers/keypads.dart
diff --git a/api/resources/dart/spiceapi/src/wrappers/lights.dart b/src/spice2x/api/resources/dart/spiceapi/src/wrappers/lights.dart
similarity index 100%
rename from api/resources/dart/spiceapi/src/wrappers/lights.dart
rename to src/spice2x/api/resources/dart/spiceapi/src/wrappers/lights.dart
diff --git a/api/resources/dart/spiceapi/src/wrappers/memory.dart b/src/spice2x/api/resources/dart/spiceapi/src/wrappers/memory.dart
similarity index 100%
rename from api/resources/dart/spiceapi/src/wrappers/memory.dart
rename to src/spice2x/api/resources/dart/spiceapi/src/wrappers/memory.dart
diff --git a/api/resources/dart/spiceapi/src/wrappers/touch.dart b/src/spice2x/api/resources/dart/spiceapi/src/wrappers/touch.dart
similarity index 100%
rename from api/resources/dart/spiceapi/src/wrappers/touch.dart
rename to src/spice2x/api/resources/dart/spiceapi/src/wrappers/touch.dart
diff --git a/api/resources/python/.gitignore b/src/spice2x/api/resources/python/.gitignore
similarity index 100%
rename from api/resources/python/.gitignore
rename to src/spice2x/api/resources/python/.gitignore
diff --git a/api/resources/python/spiceapi/LICENSE b/src/spice2x/api/resources/python/spiceapi/LICENSE
similarity index 100%
rename from api/resources/python/spiceapi/LICENSE
rename to src/spice2x/api/resources/python/spiceapi/LICENSE
diff --git a/api/resources/python/spiceapi/__init__.py b/src/spice2x/api/resources/python/spiceapi/__init__.py
similarity index 100%
rename from api/resources/python/spiceapi/__init__.py
rename to src/spice2x/api/resources/python/spiceapi/__init__.py
diff --git a/api/resources/python/spiceapi/analogs.py b/src/spice2x/api/resources/python/spiceapi/analogs.py
similarity index 100%
rename from api/resources/python/spiceapi/analogs.py
rename to src/spice2x/api/resources/python/spiceapi/analogs.py
diff --git a/api/resources/python/spiceapi/buttons.py b/src/spice2x/api/resources/python/spiceapi/buttons.py
similarity index 100%
rename from api/resources/python/spiceapi/buttons.py
rename to src/spice2x/api/resources/python/spiceapi/buttons.py
diff --git a/api/resources/python/spiceapi/card.py b/src/spice2x/api/resources/python/spiceapi/card.py
similarity index 100%
rename from api/resources/python/spiceapi/card.py
rename to src/spice2x/api/resources/python/spiceapi/card.py
diff --git a/api/resources/python/spiceapi/coin.py b/src/spice2x/api/resources/python/spiceapi/coin.py
similarity index 100%
rename from api/resources/python/spiceapi/coin.py
rename to src/spice2x/api/resources/python/spiceapi/coin.py
diff --git a/api/resources/python/spiceapi/connection.py b/src/spice2x/api/resources/python/spiceapi/connection.py
similarity index 100%
rename from api/resources/python/spiceapi/connection.py
rename to src/spice2x/api/resources/python/spiceapi/connection.py
diff --git a/api/resources/python/spiceapi/control.py b/src/spice2x/api/resources/python/spiceapi/control.py
similarity index 100%
rename from api/resources/python/spiceapi/control.py
rename to src/spice2x/api/resources/python/spiceapi/control.py
diff --git a/api/resources/python/spiceapi/exceptions.py b/src/spice2x/api/resources/python/spiceapi/exceptions.py
similarity index 100%
rename from api/resources/python/spiceapi/exceptions.py
rename to src/spice2x/api/resources/python/spiceapi/exceptions.py
diff --git a/api/resources/python/spiceapi/iidx.py b/src/spice2x/api/resources/python/spiceapi/iidx.py
similarity index 100%
rename from api/resources/python/spiceapi/iidx.py
rename to src/spice2x/api/resources/python/spiceapi/iidx.py
diff --git a/api/resources/python/spiceapi/info.py b/src/spice2x/api/resources/python/spiceapi/info.py
similarity index 100%
rename from api/resources/python/spiceapi/info.py
rename to src/spice2x/api/resources/python/spiceapi/info.py
diff --git a/api/resources/python/spiceapi/keypads.py b/src/spice2x/api/resources/python/spiceapi/keypads.py
similarity index 100%
rename from api/resources/python/spiceapi/keypads.py
rename to src/spice2x/api/resources/python/spiceapi/keypads.py
diff --git a/api/resources/python/spiceapi/lights.py b/src/spice2x/api/resources/python/spiceapi/lights.py
similarity index 100%
rename from api/resources/python/spiceapi/lights.py
rename to src/spice2x/api/resources/python/spiceapi/lights.py
diff --git a/api/resources/python/spiceapi/memory.py b/src/spice2x/api/resources/python/spiceapi/memory.py
similarity index 100%
rename from api/resources/python/spiceapi/memory.py
rename to src/spice2x/api/resources/python/spiceapi/memory.py
diff --git a/api/resources/python/spiceapi/rc4.py b/src/spice2x/api/resources/python/spiceapi/rc4.py
similarity index 100%
rename from api/resources/python/spiceapi/rc4.py
rename to src/spice2x/api/resources/python/spiceapi/rc4.py
diff --git a/api/resources/python/spiceapi/request.py b/src/spice2x/api/resources/python/spiceapi/request.py
similarity index 100%
rename from api/resources/python/spiceapi/request.py
rename to src/spice2x/api/resources/python/spiceapi/request.py
diff --git a/api/resources/python/spiceapi/resize.py b/src/spice2x/api/resources/python/spiceapi/resize.py
similarity index 100%
rename from api/resources/python/spiceapi/resize.py
rename to src/spice2x/api/resources/python/spiceapi/resize.py
diff --git a/api/resources/python/spiceapi/response.py b/src/spice2x/api/resources/python/spiceapi/response.py
similarity index 100%
rename from api/resources/python/spiceapi/response.py
rename to src/spice2x/api/resources/python/spiceapi/response.py
diff --git a/api/resources/python/spiceapi/touch.py b/src/spice2x/api/resources/python/spiceapi/touch.py
similarity index 100%
rename from api/resources/python/spiceapi/touch.py
rename to src/spice2x/api/resources/python/spiceapi/touch.py
diff --git a/api/resources/python/spiceremote.py b/src/spice2x/api/resources/python/spiceremote.py
similarity index 100%
rename from api/resources/python/spiceremote.py
rename to src/spice2x/api/resources/python/spiceremote.py
diff --git a/api/resources/python/stringreplace.py b/src/spice2x/api/resources/python/stringreplace.py
similarity index 100%
rename from api/resources/python/stringreplace.py
rename to src/spice2x/api/resources/python/stringreplace.py
diff --git a/api/response.cpp b/src/spice2x/api/response.cpp
similarity index 100%
rename from api/response.cpp
rename to src/spice2x/api/response.cpp
diff --git a/api/response.h b/src/spice2x/api/response.h
similarity index 100%
rename from api/response.h
rename to src/spice2x/api/response.h
diff --git a/api/serial.cpp b/src/spice2x/api/serial.cpp
similarity index 100%
rename from api/serial.cpp
rename to src/spice2x/api/serial.cpp
diff --git a/api/serial.h b/src/spice2x/api/serial.h
similarity index 100%
rename from api/serial.h
rename to src/spice2x/api/serial.h
diff --git a/api/websocket.cpp b/src/spice2x/api/websocket.cpp
similarity index 100%
rename from api/websocket.cpp
rename to src/spice2x/api/websocket.cpp
diff --git a/api/websocket.h b/src/spice2x/api/websocket.h
similarity index 100%
rename from api/websocket.h
rename to src/spice2x/api/websocket.h
diff --git a/avs/automap.cpp b/src/spice2x/avs/automap.cpp
similarity index 100%
rename from avs/automap.cpp
rename to src/spice2x/avs/automap.cpp
diff --git a/avs/automap.h b/src/spice2x/avs/automap.h
similarity index 100%
rename from avs/automap.h
rename to src/spice2x/avs/automap.h
diff --git a/avs/core.cpp b/src/spice2x/avs/core.cpp
similarity index 100%
rename from avs/core.cpp
rename to src/spice2x/avs/core.cpp
diff --git a/avs/core.h b/src/spice2x/avs/core.h
similarity index 100%
rename from avs/core.h
rename to src/spice2x/avs/core.h
diff --git a/avs/ea3.cpp b/src/spice2x/avs/ea3.cpp
similarity index 100%
rename from avs/ea3.cpp
rename to src/spice2x/avs/ea3.cpp
diff --git a/avs/ea3.h b/src/spice2x/avs/ea3.h
similarity index 100%
rename from avs/ea3.h
rename to src/spice2x/avs/ea3.h
diff --git a/avs/game.cpp b/src/spice2x/avs/game.cpp
similarity index 100%
rename from avs/game.cpp
rename to src/spice2x/avs/game.cpp
diff --git a/avs/game.h b/src/spice2x/avs/game.h
similarity index 100%
rename from avs/game.h
rename to src/spice2x/avs/game.h
diff --git a/avs/ssl.cpp b/src/spice2x/avs/ssl.cpp
similarity index 100%
rename from avs/ssl.cpp
rename to src/spice2x/avs/ssl.cpp
diff --git a/avs/ssl.h b/src/spice2x/avs/ssl.h
similarity index 100%
rename from avs/ssl.h
rename to src/spice2x/avs/ssl.h
diff --git a/build/blob.rc b/src/spice2x/build/blob.rc
similarity index 100%
rename from build/blob.rc
rename to src/spice2x/build/blob.rc
diff --git a/build/defs.cpp b/src/spice2x/build/defs.cpp
similarity index 100%
rename from build/defs.cpp
rename to src/spice2x/build/defs.cpp
diff --git a/build/defs.h b/src/spice2x/build/defs.h
similarity index 100%
rename from build/defs.h
rename to src/spice2x/build/defs.h
diff --git a/build/icon.h b/src/spice2x/build/icon.h
similarity index 100%
rename from build/icon.h
rename to src/spice2x/build/icon.h
diff --git a/build/icon.ico b/src/spice2x/build/icon.ico
similarity index 100%
rename from build/icon.ico
rename to src/spice2x/build/icon.ico
diff --git a/build/icon.rc b/src/spice2x/build/icon.rc
similarity index 100%
rename from build/icon.rc
rename to src/spice2x/build/icon.rc
diff --git a/build/manifest.h b/src/spice2x/build/manifest.h
similarity index 100%
rename from build/manifest.h
rename to src/spice2x/build/manifest.h
diff --git a/build/manifest.manifest b/src/spice2x/build/manifest.manifest
similarity index 100%
rename from build/manifest.manifest
rename to src/spice2x/build/manifest.manifest
diff --git a/build/manifest.rc b/src/spice2x/build/manifest.rc
similarity index 100%
rename from build/manifest.rc
rename to src/spice2x/build/manifest.rc
diff --git a/build/manifest64.rc b/src/spice2x/build/manifest64.rc
similarity index 100%
rename from build/manifest64.rc
rename to src/spice2x/build/manifest64.rc
diff --git a/build/patches.json b/src/spice2x/build/patches.json
similarity index 100%
rename from build/patches.json
rename to src/spice2x/build/patches.json
diff --git a/build/resource.h b/src/spice2x/build/resource.h
similarity index 100%
rename from build/resource.h
rename to src/spice2x/build/resource.h
diff --git a/build/version_num.h b/src/spice2x/build/version_num.h
similarity index 100%
rename from build/version_num.h
rename to src/spice2x/build/version_num.h
diff --git a/build_all.sh b/src/spice2x/build_all.sh
similarity index 100%
rename from build_all.sh
rename to src/spice2x/build_all.sh
diff --git a/build_docker.bat b/src/spice2x/build_docker.bat
similarity index 100%
rename from build_docker.bat
rename to src/spice2x/build_docker.bat
diff --git a/build_docker.sh b/src/spice2x/build_docker.sh
similarity index 100%
rename from build_docker.sh
rename to src/spice2x/build_docker.sh
diff --git a/build_release.bat b/src/spice2x/build_release.bat
similarity index 100%
rename from build_release.bat
rename to src/spice2x/build_release.bat
diff --git a/cfg/Win32D.rc b/src/spice2x/cfg/Win32D.rc
similarity index 100%
rename from cfg/Win32D.rc
rename to src/spice2x/cfg/Win32D.rc
diff --git a/cfg/analog.cpp b/src/spice2x/cfg/analog.cpp
similarity index 100%
rename from cfg/analog.cpp
rename to src/spice2x/cfg/analog.cpp
diff --git a/cfg/analog.h b/src/spice2x/cfg/analog.h
similarity index 100%
rename from cfg/analog.h
rename to src/spice2x/cfg/analog.h
diff --git a/cfg/api.cpp b/src/spice2x/cfg/api.cpp
similarity index 100%
rename from cfg/api.cpp
rename to src/spice2x/cfg/api.cpp
diff --git a/cfg/api.h b/src/spice2x/cfg/api.h
similarity index 100%
rename from cfg/api.h
rename to src/spice2x/cfg/api.h
diff --git a/cfg/button.cpp b/src/spice2x/cfg/button.cpp
similarity index 100%
rename from cfg/button.cpp
rename to src/spice2x/cfg/button.cpp
diff --git a/cfg/button.h b/src/spice2x/cfg/button.h
similarity index 100%
rename from cfg/button.h
rename to src/spice2x/cfg/button.h
diff --git a/cfg/config.cpp b/src/spice2x/cfg/config.cpp
similarity index 100%
rename from cfg/config.cpp
rename to src/spice2x/cfg/config.cpp
diff --git a/cfg/config.h b/src/spice2x/cfg/config.h
similarity index 100%
rename from cfg/config.h
rename to src/spice2x/cfg/config.h
diff --git a/cfg/configurator.cpp b/src/spice2x/cfg/configurator.cpp
similarity index 100%
rename from cfg/configurator.cpp
rename to src/spice2x/cfg/configurator.cpp
diff --git a/cfg/configurator.h b/src/spice2x/cfg/configurator.h
similarity index 100%
rename from cfg/configurator.h
rename to src/spice2x/cfg/configurator.h
diff --git a/cfg/configurator_wnd.cpp b/src/spice2x/cfg/configurator_wnd.cpp
similarity index 100%
rename from cfg/configurator_wnd.cpp
rename to src/spice2x/cfg/configurator_wnd.cpp
diff --git a/cfg/configurator_wnd.h b/src/spice2x/cfg/configurator_wnd.h
similarity index 100%
rename from cfg/configurator_wnd.h
rename to src/spice2x/cfg/configurator_wnd.h
diff --git a/cfg/game.cpp b/src/spice2x/cfg/game.cpp
similarity index 100%
rename from cfg/game.cpp
rename to src/spice2x/cfg/game.cpp
diff --git a/cfg/game.h b/src/spice2x/cfg/game.h
similarity index 100%
rename from cfg/game.h
rename to src/spice2x/cfg/game.h
diff --git a/cfg/icon.h b/src/spice2x/cfg/icon.h
similarity index 100%
rename from cfg/icon.h
rename to src/spice2x/cfg/icon.h
diff --git a/cfg/icon.ico b/src/spice2x/cfg/icon.ico
similarity index 100%
rename from cfg/icon.ico
rename to src/spice2x/cfg/icon.ico
diff --git a/cfg/icon.rc b/src/spice2x/cfg/icon.rc
similarity index 100%
rename from cfg/icon.rc
rename to src/spice2x/cfg/icon.rc
diff --git a/cfg/light.cpp b/src/spice2x/cfg/light.cpp
similarity index 100%
rename from cfg/light.cpp
rename to src/spice2x/cfg/light.cpp
diff --git a/cfg/light.h b/src/spice2x/cfg/light.h
similarity index 100%
rename from cfg/light.h
rename to src/spice2x/cfg/light.h
diff --git a/cfg/manifest.h b/src/spice2x/cfg/manifest.h
similarity index 100%
rename from cfg/manifest.h
rename to src/spice2x/cfg/manifest.h
diff --git a/cfg/manifest.manifest b/src/spice2x/cfg/manifest.manifest
similarity index 100%
rename from cfg/manifest.manifest
rename to src/spice2x/cfg/manifest.manifest
diff --git a/cfg/manifest.rc b/src/spice2x/cfg/manifest.rc
similarity index 100%
rename from cfg/manifest.rc
rename to src/spice2x/cfg/manifest.rc
diff --git a/cfg/option.cpp b/src/spice2x/cfg/option.cpp
similarity index 100%
rename from cfg/option.cpp
rename to src/spice2x/cfg/option.cpp
diff --git a/cfg/option.h b/src/spice2x/cfg/option.h
similarity index 100%
rename from cfg/option.h
rename to src/spice2x/cfg/option.h
diff --git a/cfg/resource.h b/src/spice2x/cfg/resource.h
similarity index 100%
rename from cfg/resource.h
rename to src/spice2x/cfg/resource.h
diff --git a/cfg/screen_resize.cpp b/src/spice2x/cfg/screen_resize.cpp
similarity index 100%
rename from cfg/screen_resize.cpp
rename to src/spice2x/cfg/screen_resize.cpp
diff --git a/cfg/screen_resize.h b/src/spice2x/cfg/screen_resize.h
similarity index 100%
rename from cfg/screen_resize.h
rename to src/spice2x/cfg/screen_resize.h
diff --git a/cfg/spicecfg.cpp b/src/spice2x/cfg/spicecfg.cpp
similarity index 100%
rename from cfg/spicecfg.cpp
rename to src/spice2x/cfg/spicecfg.cpp
diff --git a/cfg/spicecfg.h b/src/spice2x/cfg/spicecfg.h
similarity index 100%
rename from cfg/spicecfg.h
rename to src/spice2x/cfg/spicecfg.h
diff --git a/cmake.sh b/src/spice2x/cmake.sh
similarity index 100%
rename from cmake.sh
rename to src/spice2x/cmake.sh
diff --git a/easrv/easrv.cpp b/src/spice2x/easrv/easrv.cpp
similarity index 100%
rename from easrv/easrv.cpp
rename to src/spice2x/easrv/easrv.cpp
diff --git a/easrv/easrv.h b/src/spice2x/easrv/easrv.h
similarity index 100%
rename from easrv/easrv.h
rename to src/spice2x/easrv/easrv.h
diff --git a/easrv/responses/bs_info2_common.h b/src/spice2x/easrv/responses/bs_info2_common.h
similarity index 100%
rename from easrv/responses/bs_info2_common.h
rename to src/spice2x/easrv/responses/bs_info2_common.h
diff --git a/easrv/responses/bs_pcb2_boot.h b/src/spice2x/easrv/responses/bs_pcb2_boot.h
similarity index 100%
rename from easrv/responses/bs_pcb2_boot.h
rename to src/spice2x/easrv/responses/bs_pcb2_boot.h
diff --git a/easrv/responses/bs_pcb2_error.h b/src/spice2x/easrv/responses/bs_pcb2_error.h
similarity index 100%
rename from easrv/responses/bs_pcb2_error.h
rename to src/spice2x/easrv/responses/bs_pcb2_error.h
diff --git a/easrv/responses/op2_common_get_music_info.h b/src/spice2x/easrv/responses/op2_common_get_music_info.h
similarity index 100%
rename from easrv/responses/op2_common_get_music_info.h
rename to src/spice2x/easrv/responses/op2_common_get_music_info.h
diff --git a/easrv/responses/pcbtracker_alive.h b/src/spice2x/easrv/responses/pcbtracker_alive.h
similarity index 100%
rename from easrv/responses/pcbtracker_alive.h
rename to src/spice2x/easrv/responses/pcbtracker_alive.h
diff --git a/easrv/responses_raw/bs_info2_common.bin b/src/spice2x/easrv/responses_raw/bs_info2_common.bin
similarity index 100%
rename from easrv/responses_raw/bs_info2_common.bin
rename to src/spice2x/easrv/responses_raw/bs_info2_common.bin
diff --git a/easrv/responses_raw/bs_pcb2_boot.bin b/src/spice2x/easrv/responses_raw/bs_pcb2_boot.bin
similarity index 100%
rename from easrv/responses_raw/bs_pcb2_boot.bin
rename to src/spice2x/easrv/responses_raw/bs_pcb2_boot.bin
diff --git a/easrv/responses_raw/bs_pcb2_error.bin b/src/spice2x/easrv/responses_raw/bs_pcb2_error.bin
similarity index 100%
rename from easrv/responses_raw/bs_pcb2_error.bin
rename to src/spice2x/easrv/responses_raw/bs_pcb2_error.bin
diff --git a/easrv/responses_raw/op2_common_get_music_info.bin b/src/spice2x/easrv/responses_raw/op2_common_get_music_info.bin
similarity index 100%
rename from easrv/responses_raw/op2_common_get_music_info.bin
rename to src/spice2x/easrv/responses_raw/op2_common_get_music_info.bin
diff --git a/easrv/responses_raw/pcbtracker_alive.bin b/src/spice2x/easrv/responses_raw/pcbtracker_alive.bin
similarity index 100%
rename from easrv/responses_raw/pcbtracker_alive.bin
rename to src/spice2x/easrv/responses_raw/pcbtracker_alive.bin
diff --git a/easrv/responses_raw/update_responses.sh b/src/spice2x/easrv/responses_raw/update_responses.sh
similarity index 100%
rename from easrv/responses_raw/update_responses.sh
rename to src/spice2x/easrv/responses_raw/update_responses.sh
diff --git a/easrv/smartea.cpp b/src/spice2x/easrv/smartea.cpp
similarity index 100%
rename from easrv/smartea.cpp
rename to src/spice2x/easrv/smartea.cpp
diff --git a/easrv/smartea.h b/src/spice2x/easrv/smartea.h
similarity index 100%
rename from easrv/smartea.h
rename to src/spice2x/easrv/smartea.h
diff --git a/external/asio/asio.h b/src/spice2x/external/asio/asio.h
similarity index 100%
rename from external/asio/asio.h
rename to src/spice2x/external/asio/asio.h
diff --git a/external/asio/asiolist.cpp b/src/spice2x/external/asio/asiolist.cpp
similarity index 100%
rename from external/asio/asiolist.cpp
rename to src/spice2x/external/asio/asiolist.cpp
diff --git a/external/asio/asiolist.h b/src/spice2x/external/asio/asiolist.h
similarity index 100%
rename from external/asio/asiolist.h
rename to src/spice2x/external/asio/asiolist.h
diff --git a/external/asio/asiosys.h b/src/spice2x/external/asio/asiosys.h
similarity index 100%
rename from external/asio/asiosys.h
rename to src/spice2x/external/asio/asiosys.h
diff --git a/external/asio/changes.txt b/src/spice2x/external/asio/changes.txt
similarity index 100%
rename from external/asio/changes.txt
rename to src/spice2x/external/asio/changes.txt
diff --git a/external/asio/iasiodrv.h b/src/spice2x/external/asio/iasiodrv.h
similarity index 100%
rename from external/asio/iasiodrv.h
rename to src/spice2x/external/asio/iasiodrv.h
diff --git a/external/cardio/cardio_hid.cpp b/src/spice2x/external/cardio/cardio_hid.cpp
similarity index 100%
rename from external/cardio/cardio_hid.cpp
rename to src/spice2x/external/cardio/cardio_hid.cpp
diff --git a/external/cardio/cardio_hid.h b/src/spice2x/external/cardio/cardio_hid.h
similarity index 100%
rename from external/cardio/cardio_hid.h
rename to src/spice2x/external/cardio/cardio_hid.h
diff --git a/external/cardio/cardio_runner.cpp b/src/spice2x/external/cardio/cardio_runner.cpp
similarity index 100%
rename from external/cardio/cardio_runner.cpp
rename to src/spice2x/external/cardio/cardio_runner.cpp
diff --git a/external/cardio/cardio_runner.h b/src/spice2x/external/cardio/cardio_runner.h
similarity index 100%
rename from external/cardio/cardio_runner.h
rename to src/spice2x/external/cardio/cardio_runner.h
diff --git a/external/cardio/cardio_window.cpp b/src/spice2x/external/cardio/cardio_window.cpp
similarity index 100%
rename from external/cardio/cardio_window.cpp
rename to src/spice2x/external/cardio/cardio_window.cpp
diff --git a/external/cardio/cardio_window.h b/src/spice2x/external/cardio/cardio_window.h
similarity index 100%
rename from external/cardio/cardio_window.h
rename to src/spice2x/external/cardio/cardio_window.h
diff --git a/external/cpu_features/.clang-format b/src/spice2x/external/cpu_features/.clang-format
similarity index 100%
rename from external/cpu_features/.clang-format
rename to src/spice2x/external/cpu_features/.clang-format
diff --git a/external/cpu_features/.dockerignore b/src/spice2x/external/cpu_features/.dockerignore
similarity index 100%
rename from external/cpu_features/.dockerignore
rename to src/spice2x/external/cpu_features/.dockerignore
diff --git a/external/cpu_features/.gitignore b/src/spice2x/external/cpu_features/.gitignore
similarity index 100%
rename from external/cpu_features/.gitignore
rename to src/spice2x/external/cpu_features/.gitignore
diff --git a/external/cpu_features/.grenrc.yml b/src/spice2x/external/cpu_features/.grenrc.yml
similarity index 100%
rename from external/cpu_features/.grenrc.yml
rename to src/spice2x/external/cpu_features/.grenrc.yml
diff --git a/external/cpu_features/BUILD.bazel b/src/spice2x/external/cpu_features/BUILD.bazel
similarity index 100%
rename from external/cpu_features/BUILD.bazel
rename to src/spice2x/external/cpu_features/BUILD.bazel
diff --git a/external/cpu_features/CMakeLists.txt b/src/spice2x/external/cpu_features/CMakeLists.txt
similarity index 100%
rename from external/cpu_features/CMakeLists.txt
rename to src/spice2x/external/cpu_features/CMakeLists.txt
diff --git a/external/cpu_features/CONTRIBUTING.md b/src/spice2x/external/cpu_features/CONTRIBUTING.md
similarity index 100%
rename from external/cpu_features/CONTRIBUTING.md
rename to src/spice2x/external/cpu_features/CONTRIBUTING.md
diff --git a/external/cpu_features/LICENSE b/src/spice2x/external/cpu_features/LICENSE
similarity index 100%
rename from external/cpu_features/LICENSE
rename to src/spice2x/external/cpu_features/LICENSE
diff --git a/external/cpu_features/README.md b/src/spice2x/external/cpu_features/README.md
similarity index 100%
rename from external/cpu_features/README.md
rename to src/spice2x/external/cpu_features/README.md
diff --git a/external/cpu_features/WORKSPACE b/src/spice2x/external/cpu_features/WORKSPACE
similarity index 100%
rename from external/cpu_features/WORKSPACE
rename to src/spice2x/external/cpu_features/WORKSPACE
diff --git a/external/cpu_features/cmake/CpuFeaturesConfig.cmake.in b/src/spice2x/external/cpu_features/cmake/CpuFeaturesConfig.cmake.in
similarity index 100%
rename from external/cpu_features/cmake/CpuFeaturesConfig.cmake.in
rename to src/spice2x/external/cpu_features/cmake/CpuFeaturesConfig.cmake.in
diff --git a/external/cpu_features/cmake/CpuFeaturesNdkCompatConfig.cmake.in b/src/spice2x/external/cpu_features/cmake/CpuFeaturesNdkCompatConfig.cmake.in
similarity index 100%
rename from external/cpu_features/cmake/CpuFeaturesNdkCompatConfig.cmake.in
rename to src/spice2x/external/cpu_features/cmake/CpuFeaturesNdkCompatConfig.cmake.in
diff --git a/external/cpu_features/cmake/README.md b/src/spice2x/external/cpu_features/cmake/README.md
similarity index 100%
rename from external/cpu_features/cmake/README.md
rename to src/spice2x/external/cpu_features/cmake/README.md
diff --git a/external/cpu_features/cmake/ci/Makefile b/src/spice2x/external/cpu_features/cmake/ci/Makefile
similarity index 100%
rename from external/cpu_features/cmake/ci/Makefile
rename to src/spice2x/external/cpu_features/cmake/ci/Makefile
diff --git a/external/cpu_features/cmake/ci/README.md b/src/spice2x/external/cpu_features/cmake/ci/README.md
similarity index 100%
rename from external/cpu_features/cmake/ci/README.md
rename to src/spice2x/external/cpu_features/cmake/ci/README.md
diff --git a/external/cpu_features/cmake/ci/doc/docker.dot b/src/spice2x/external/cpu_features/cmake/ci/doc/docker.dot
similarity index 100%
rename from external/cpu_features/cmake/ci/doc/docker.dot
rename to src/spice2x/external/cpu_features/cmake/ci/doc/docker.dot
diff --git a/external/cpu_features/cmake/ci/doc/docker.svg b/src/spice2x/external/cpu_features/cmake/ci/doc/docker.svg
similarity index 100%
rename from external/cpu_features/cmake/ci/doc/docker.svg
rename to src/spice2x/external/cpu_features/cmake/ci/doc/docker.svg
diff --git a/external/cpu_features/cmake/ci/doc/generate_image.sh b/src/spice2x/external/cpu_features/cmake/ci/doc/generate_image.sh
similarity index 100%
rename from external/cpu_features/cmake/ci/doc/generate_image.sh
rename to src/spice2x/external/cpu_features/cmake/ci/doc/generate_image.sh
diff --git a/external/cpu_features/cmake/ci/docker/amd64/Dockerfile b/src/spice2x/external/cpu_features/cmake/ci/docker/amd64/Dockerfile
similarity index 100%
rename from external/cpu_features/cmake/ci/docker/amd64/Dockerfile
rename to src/spice2x/external/cpu_features/cmake/ci/docker/amd64/Dockerfile
diff --git a/external/cpu_features/cmake/ci/docker/toolchain/Dockerfile b/src/spice2x/external/cpu_features/cmake/ci/docker/toolchain/Dockerfile
similarity index 100%
rename from external/cpu_features/cmake/ci/docker/toolchain/Dockerfile
rename to src/spice2x/external/cpu_features/cmake/ci/docker/toolchain/Dockerfile
diff --git a/external/cpu_features/cmake/ci/sample/CMakeLists.txt b/src/spice2x/external/cpu_features/cmake/ci/sample/CMakeLists.txt
similarity index 100%
rename from external/cpu_features/cmake/ci/sample/CMakeLists.txt
rename to src/spice2x/external/cpu_features/cmake/ci/sample/CMakeLists.txt
diff --git a/external/cpu_features/cmake/ci/sample/main.cpp b/src/spice2x/external/cpu_features/cmake/ci/sample/main.cpp
similarity index 100%
rename from external/cpu_features/cmake/ci/sample/main.cpp
rename to src/spice2x/external/cpu_features/cmake/ci/sample/main.cpp
diff --git a/external/cpu_features/cmake/ci/vagrant/freebsd/Vagrantfile b/src/spice2x/external/cpu_features/cmake/ci/vagrant/freebsd/Vagrantfile
similarity index 100%
rename from external/cpu_features/cmake/ci/vagrant/freebsd/Vagrantfile
rename to src/spice2x/external/cpu_features/cmake/ci/vagrant/freebsd/Vagrantfile
diff --git a/external/cpu_features/cmake/googletest.CMakeLists.txt.in b/src/spice2x/external/cpu_features/cmake/googletest.CMakeLists.txt.in
similarity index 100%
rename from external/cpu_features/cmake/googletest.CMakeLists.txt.in
rename to src/spice2x/external/cpu_features/cmake/googletest.CMakeLists.txt.in
diff --git a/external/cpu_features/include/cpu_features_cache_info.h b/src/spice2x/external/cpu_features/include/cpu_features_cache_info.h
similarity index 100%
rename from external/cpu_features/include/cpu_features_cache_info.h
rename to src/spice2x/external/cpu_features/include/cpu_features_cache_info.h
diff --git a/external/cpu_features/include/cpu_features_macros.h b/src/spice2x/external/cpu_features/include/cpu_features_macros.h
similarity index 100%
rename from external/cpu_features/include/cpu_features_macros.h
rename to src/spice2x/external/cpu_features/include/cpu_features_macros.h
diff --git a/external/cpu_features/include/cpuinfo_aarch64.h b/src/spice2x/external/cpu_features/include/cpuinfo_aarch64.h
similarity index 100%
rename from external/cpu_features/include/cpuinfo_aarch64.h
rename to src/spice2x/external/cpu_features/include/cpuinfo_aarch64.h
diff --git a/external/cpu_features/include/cpuinfo_arm.h b/src/spice2x/external/cpu_features/include/cpuinfo_arm.h
similarity index 100%
rename from external/cpu_features/include/cpuinfo_arm.h
rename to src/spice2x/external/cpu_features/include/cpuinfo_arm.h
diff --git a/external/cpu_features/include/cpuinfo_loongarch.h b/src/spice2x/external/cpu_features/include/cpuinfo_loongarch.h
similarity index 100%
rename from external/cpu_features/include/cpuinfo_loongarch.h
rename to src/spice2x/external/cpu_features/include/cpuinfo_loongarch.h
diff --git a/external/cpu_features/include/cpuinfo_mips.h b/src/spice2x/external/cpu_features/include/cpuinfo_mips.h
similarity index 100%
rename from external/cpu_features/include/cpuinfo_mips.h
rename to src/spice2x/external/cpu_features/include/cpuinfo_mips.h
diff --git a/external/cpu_features/include/cpuinfo_ppc.h b/src/spice2x/external/cpu_features/include/cpuinfo_ppc.h
similarity index 100%
rename from external/cpu_features/include/cpuinfo_ppc.h
rename to src/spice2x/external/cpu_features/include/cpuinfo_ppc.h
diff --git a/external/cpu_features/include/cpuinfo_riscv.h b/src/spice2x/external/cpu_features/include/cpuinfo_riscv.h
similarity index 100%
rename from external/cpu_features/include/cpuinfo_riscv.h
rename to src/spice2x/external/cpu_features/include/cpuinfo_riscv.h
diff --git a/external/cpu_features/include/cpuinfo_s390x.h b/src/spice2x/external/cpu_features/include/cpuinfo_s390x.h
similarity index 100%
rename from external/cpu_features/include/cpuinfo_s390x.h
rename to src/spice2x/external/cpu_features/include/cpuinfo_s390x.h
diff --git a/external/cpu_features/include/cpuinfo_x86.h b/src/spice2x/external/cpu_features/include/cpuinfo_x86.h
similarity index 100%
rename from external/cpu_features/include/cpuinfo_x86.h
rename to src/spice2x/external/cpu_features/include/cpuinfo_x86.h
diff --git a/external/cpu_features/include/internal/bit_utils.h b/src/spice2x/external/cpu_features/include/internal/bit_utils.h
similarity index 100%
rename from external/cpu_features/include/internal/bit_utils.h
rename to src/spice2x/external/cpu_features/include/internal/bit_utils.h
diff --git a/external/cpu_features/include/internal/cpuid_x86.h b/src/spice2x/external/cpu_features/include/internal/cpuid_x86.h
similarity index 100%
rename from external/cpu_features/include/internal/cpuid_x86.h
rename to src/spice2x/external/cpu_features/include/internal/cpuid_x86.h
diff --git a/external/cpu_features/include/internal/filesystem.h b/src/spice2x/external/cpu_features/include/internal/filesystem.h
similarity index 100%
rename from external/cpu_features/include/internal/filesystem.h
rename to src/spice2x/external/cpu_features/include/internal/filesystem.h
diff --git a/external/cpu_features/include/internal/hwcaps.h b/src/spice2x/external/cpu_features/include/internal/hwcaps.h
similarity index 100%
rename from external/cpu_features/include/internal/hwcaps.h
rename to src/spice2x/external/cpu_features/include/internal/hwcaps.h
diff --git a/external/cpu_features/include/internal/stack_line_reader.h b/src/spice2x/external/cpu_features/include/internal/stack_line_reader.h
similarity index 100%
rename from external/cpu_features/include/internal/stack_line_reader.h
rename to src/spice2x/external/cpu_features/include/internal/stack_line_reader.h
diff --git a/external/cpu_features/include/internal/string_view.h b/src/spice2x/external/cpu_features/include/internal/string_view.h
similarity index 100%
rename from external/cpu_features/include/internal/string_view.h
rename to src/spice2x/external/cpu_features/include/internal/string_view.h
diff --git a/external/cpu_features/include/internal/windows_utils.h b/src/spice2x/external/cpu_features/include/internal/windows_utils.h
similarity index 100%
rename from external/cpu_features/include/internal/windows_utils.h
rename to src/spice2x/external/cpu_features/include/internal/windows_utils.h
diff --git a/external/cpu_features/src/copy.inl b/src/spice2x/external/cpu_features/src/copy.inl
similarity index 100%
rename from external/cpu_features/src/copy.inl
rename to src/spice2x/external/cpu_features/src/copy.inl
diff --git a/external/cpu_features/src/define_introspection.inl b/src/spice2x/external/cpu_features/src/define_introspection.inl
similarity index 100%
rename from external/cpu_features/src/define_introspection.inl
rename to src/spice2x/external/cpu_features/src/define_introspection.inl
diff --git a/external/cpu_features/src/define_introspection_and_hwcaps.inl b/src/spice2x/external/cpu_features/src/define_introspection_and_hwcaps.inl
similarity index 100%
rename from external/cpu_features/src/define_introspection_and_hwcaps.inl
rename to src/spice2x/external/cpu_features/src/define_introspection_and_hwcaps.inl
diff --git a/external/cpu_features/src/equals.inl b/src/spice2x/external/cpu_features/src/equals.inl
similarity index 100%
rename from external/cpu_features/src/equals.inl
rename to src/spice2x/external/cpu_features/src/equals.inl
diff --git a/external/cpu_features/src/filesystem.c b/src/spice2x/external/cpu_features/src/filesystem.c
similarity index 100%
rename from external/cpu_features/src/filesystem.c
rename to src/spice2x/external/cpu_features/src/filesystem.c
diff --git a/external/cpu_features/src/hwcaps.c b/src/spice2x/external/cpu_features/src/hwcaps.c
similarity index 100%
rename from external/cpu_features/src/hwcaps.c
rename to src/spice2x/external/cpu_features/src/hwcaps.c
diff --git a/external/cpu_features/src/impl_aarch64__base_implementation.inl b/src/spice2x/external/cpu_features/src/impl_aarch64__base_implementation.inl
similarity index 100%
rename from external/cpu_features/src/impl_aarch64__base_implementation.inl
rename to src/spice2x/external/cpu_features/src/impl_aarch64__base_implementation.inl
diff --git a/external/cpu_features/src/impl_aarch64_linux_or_android.c b/src/spice2x/external/cpu_features/src/impl_aarch64_linux_or_android.c
similarity index 100%
rename from external/cpu_features/src/impl_aarch64_linux_or_android.c
rename to src/spice2x/external/cpu_features/src/impl_aarch64_linux_or_android.c
diff --git a/external/cpu_features/src/impl_aarch64_macos_or_iphone.c b/src/spice2x/external/cpu_features/src/impl_aarch64_macos_or_iphone.c
similarity index 100%
rename from external/cpu_features/src/impl_aarch64_macos_or_iphone.c
rename to src/spice2x/external/cpu_features/src/impl_aarch64_macos_or_iphone.c
diff --git a/external/cpu_features/src/impl_aarch64_windows.c b/src/spice2x/external/cpu_features/src/impl_aarch64_windows.c
similarity index 100%
rename from external/cpu_features/src/impl_aarch64_windows.c
rename to src/spice2x/external/cpu_features/src/impl_aarch64_windows.c
diff --git a/external/cpu_features/src/impl_arm_linux_or_android.c b/src/spice2x/external/cpu_features/src/impl_arm_linux_or_android.c
similarity index 100%
rename from external/cpu_features/src/impl_arm_linux_or_android.c
rename to src/spice2x/external/cpu_features/src/impl_arm_linux_or_android.c
diff --git a/external/cpu_features/src/impl_loongarch_linux.c b/src/spice2x/external/cpu_features/src/impl_loongarch_linux.c
similarity index 100%
rename from external/cpu_features/src/impl_loongarch_linux.c
rename to src/spice2x/external/cpu_features/src/impl_loongarch_linux.c
diff --git a/external/cpu_features/src/impl_mips_linux_or_android.c b/src/spice2x/external/cpu_features/src/impl_mips_linux_or_android.c
similarity index 100%
rename from external/cpu_features/src/impl_mips_linux_or_android.c
rename to src/spice2x/external/cpu_features/src/impl_mips_linux_or_android.c
diff --git a/external/cpu_features/src/impl_ppc_linux.c b/src/spice2x/external/cpu_features/src/impl_ppc_linux.c
similarity index 100%
rename from external/cpu_features/src/impl_ppc_linux.c
rename to src/spice2x/external/cpu_features/src/impl_ppc_linux.c
diff --git a/external/cpu_features/src/impl_riscv_linux.c b/src/spice2x/external/cpu_features/src/impl_riscv_linux.c
similarity index 100%
rename from external/cpu_features/src/impl_riscv_linux.c
rename to src/spice2x/external/cpu_features/src/impl_riscv_linux.c
diff --git a/external/cpu_features/src/impl_s390x_linux.c b/src/spice2x/external/cpu_features/src/impl_s390x_linux.c
similarity index 100%
rename from external/cpu_features/src/impl_s390x_linux.c
rename to src/spice2x/external/cpu_features/src/impl_s390x_linux.c
diff --git a/external/cpu_features/src/impl_x86__base_implementation.inl b/src/spice2x/external/cpu_features/src/impl_x86__base_implementation.inl
similarity index 100%
rename from external/cpu_features/src/impl_x86__base_implementation.inl
rename to src/spice2x/external/cpu_features/src/impl_x86__base_implementation.inl
diff --git a/external/cpu_features/src/impl_x86_freebsd.c b/src/spice2x/external/cpu_features/src/impl_x86_freebsd.c
similarity index 100%
rename from external/cpu_features/src/impl_x86_freebsd.c
rename to src/spice2x/external/cpu_features/src/impl_x86_freebsd.c
diff --git a/external/cpu_features/src/impl_x86_linux_or_android.c b/src/spice2x/external/cpu_features/src/impl_x86_linux_or_android.c
similarity index 100%
rename from external/cpu_features/src/impl_x86_linux_or_android.c
rename to src/spice2x/external/cpu_features/src/impl_x86_linux_or_android.c
diff --git a/external/cpu_features/src/impl_x86_macos.c b/src/spice2x/external/cpu_features/src/impl_x86_macos.c
similarity index 100%
rename from external/cpu_features/src/impl_x86_macos.c
rename to src/spice2x/external/cpu_features/src/impl_x86_macos.c
diff --git a/external/cpu_features/src/impl_x86_windows.c b/src/spice2x/external/cpu_features/src/impl_x86_windows.c
similarity index 100%
rename from external/cpu_features/src/impl_x86_windows.c
rename to src/spice2x/external/cpu_features/src/impl_x86_windows.c
diff --git a/external/cpu_features/src/stack_line_reader.c b/src/spice2x/external/cpu_features/src/stack_line_reader.c
similarity index 100%
rename from external/cpu_features/src/stack_line_reader.c
rename to src/spice2x/external/cpu_features/src/stack_line_reader.c
diff --git a/external/cpu_features/src/string_view.c b/src/spice2x/external/cpu_features/src/string_view.c
similarity index 100%
rename from external/cpu_features/src/string_view.c
rename to src/spice2x/external/cpu_features/src/string_view.c
diff --git a/external/cpu_features/src/utils/list_cpu_features.c b/src/spice2x/external/cpu_features/src/utils/list_cpu_features.c
similarity index 100%
rename from external/cpu_features/src/utils/list_cpu_features.c
rename to src/spice2x/external/cpu_features/src/utils/list_cpu_features.c
diff --git a/external/discord-rpc/.clang-format b/src/spice2x/external/discord-rpc/.clang-format
similarity index 100%
rename from external/discord-rpc/.clang-format
rename to src/spice2x/external/discord-rpc/.clang-format
diff --git a/external/discord-rpc/.gitignore b/src/spice2x/external/discord-rpc/.gitignore
similarity index 100%
rename from external/discord-rpc/.gitignore
rename to src/spice2x/external/discord-rpc/.gitignore
diff --git a/external/discord-rpc/.travis.yml b/src/spice2x/external/discord-rpc/.travis.yml
similarity index 100%
rename from external/discord-rpc/.travis.yml
rename to src/spice2x/external/discord-rpc/.travis.yml
diff --git a/external/discord-rpc/CMakeLists.txt b/src/spice2x/external/discord-rpc/CMakeLists.txt
similarity index 100%
rename from external/discord-rpc/CMakeLists.txt
rename to src/spice2x/external/discord-rpc/CMakeLists.txt
diff --git a/external/discord-rpc/LICENSE b/src/spice2x/external/discord-rpc/LICENSE
similarity index 100%
rename from external/discord-rpc/LICENSE
rename to src/spice2x/external/discord-rpc/LICENSE
diff --git a/external/discord-rpc/README.md b/src/spice2x/external/discord-rpc/README.md
similarity index 100%
rename from external/discord-rpc/README.md
rename to src/spice2x/external/discord-rpc/README.md
diff --git a/external/discord-rpc/appveyor.yml b/src/spice2x/external/discord-rpc/appveyor.yml
similarity index 100%
rename from external/discord-rpc/appveyor.yml
rename to src/spice2x/external/discord-rpc/appveyor.yml
diff --git a/external/discord-rpc/build.py b/src/spice2x/external/discord-rpc/build.py
similarity index 100%
rename from external/discord-rpc/build.py
rename to src/spice2x/external/discord-rpc/build.py
diff --git a/external/discord-rpc/include/discord_register.h b/src/spice2x/external/discord-rpc/include/discord_register.h
similarity index 100%
rename from external/discord-rpc/include/discord_register.h
rename to src/spice2x/external/discord-rpc/include/discord_register.h
diff --git a/external/discord-rpc/include/discord_rpc.h b/src/spice2x/external/discord-rpc/include/discord_rpc.h
similarity index 100%
rename from external/discord-rpc/include/discord_rpc.h
rename to src/spice2x/external/discord-rpc/include/discord_rpc.h
diff --git a/external/discord-rpc/src/CMakeLists.txt b/src/spice2x/external/discord-rpc/src/CMakeLists.txt
similarity index 100%
rename from external/discord-rpc/src/CMakeLists.txt
rename to src/spice2x/external/discord-rpc/src/CMakeLists.txt
diff --git a/external/discord-rpc/src/backoff.h b/src/spice2x/external/discord-rpc/src/backoff.h
similarity index 100%
rename from external/discord-rpc/src/backoff.h
rename to src/spice2x/external/discord-rpc/src/backoff.h
diff --git a/external/discord-rpc/src/connection.h b/src/spice2x/external/discord-rpc/src/connection.h
similarity index 100%
rename from external/discord-rpc/src/connection.h
rename to src/spice2x/external/discord-rpc/src/connection.h
diff --git a/external/discord-rpc/src/connection_unix.cpp b/src/spice2x/external/discord-rpc/src/connection_unix.cpp
similarity index 100%
rename from external/discord-rpc/src/connection_unix.cpp
rename to src/spice2x/external/discord-rpc/src/connection_unix.cpp
diff --git a/external/discord-rpc/src/connection_win.cpp b/src/spice2x/external/discord-rpc/src/connection_win.cpp
similarity index 100%
rename from external/discord-rpc/src/connection_win.cpp
rename to src/spice2x/external/discord-rpc/src/connection_win.cpp
diff --git a/external/discord-rpc/src/discord_register_linux.cpp b/src/spice2x/external/discord-rpc/src/discord_register_linux.cpp
similarity index 100%
rename from external/discord-rpc/src/discord_register_linux.cpp
rename to src/spice2x/external/discord-rpc/src/discord_register_linux.cpp
diff --git a/external/discord-rpc/src/discord_register_osx.m b/src/spice2x/external/discord-rpc/src/discord_register_osx.m
similarity index 100%
rename from external/discord-rpc/src/discord_register_osx.m
rename to src/spice2x/external/discord-rpc/src/discord_register_osx.m
diff --git a/external/discord-rpc/src/discord_register_win.cpp b/src/spice2x/external/discord-rpc/src/discord_register_win.cpp
similarity index 100%
rename from external/discord-rpc/src/discord_register_win.cpp
rename to src/spice2x/external/discord-rpc/src/discord_register_win.cpp
diff --git a/external/discord-rpc/src/discord_rpc.cpp b/src/spice2x/external/discord-rpc/src/discord_rpc.cpp
similarity index 100%
rename from external/discord-rpc/src/discord_rpc.cpp
rename to src/spice2x/external/discord-rpc/src/discord_rpc.cpp
diff --git a/external/discord-rpc/src/dllmain.cpp b/src/spice2x/external/discord-rpc/src/dllmain.cpp
similarity index 100%
rename from external/discord-rpc/src/dllmain.cpp
rename to src/spice2x/external/discord-rpc/src/dllmain.cpp
diff --git a/external/discord-rpc/src/msg_queue.h b/src/spice2x/external/discord-rpc/src/msg_queue.h
similarity index 100%
rename from external/discord-rpc/src/msg_queue.h
rename to src/spice2x/external/discord-rpc/src/msg_queue.h
diff --git a/external/discord-rpc/src/rpc_connection.cpp b/src/spice2x/external/discord-rpc/src/rpc_connection.cpp
similarity index 100%
rename from external/discord-rpc/src/rpc_connection.cpp
rename to src/spice2x/external/discord-rpc/src/rpc_connection.cpp
diff --git a/external/discord-rpc/src/rpc_connection.h b/src/spice2x/external/discord-rpc/src/rpc_connection.h
similarity index 100%
rename from external/discord-rpc/src/rpc_connection.h
rename to src/spice2x/external/discord-rpc/src/rpc_connection.h
diff --git a/external/discord-rpc/src/serialization.cpp b/src/spice2x/external/discord-rpc/src/serialization.cpp
similarity index 100%
rename from external/discord-rpc/src/serialization.cpp
rename to src/spice2x/external/discord-rpc/src/serialization.cpp
diff --git a/external/discord-rpc/src/serialization.h b/src/spice2x/external/discord-rpc/src/serialization.h
similarity index 100%
rename from external/discord-rpc/src/serialization.h
rename to src/spice2x/external/discord-rpc/src/serialization.h
diff --git a/external/docker/Dockerfile b/src/spice2x/external/docker/Dockerfile
similarity index 100%
rename from external/docker/Dockerfile
rename to src/spice2x/external/docker/Dockerfile
diff --git a/external/dseg/DSEG-LICENSE.txt b/src/spice2x/external/dseg/DSEG-LICENSE.txt
similarity index 100%
rename from external/dseg/DSEG-LICENSE.txt
rename to src/spice2x/external/dseg/DSEG-LICENSE.txt
diff --git a/external/dseg/DSEG14Classic-Italic.sfd b/src/spice2x/external/dseg/DSEG14Classic-Italic.sfd
similarity index 100%
rename from external/dseg/DSEG14Classic-Italic.sfd
rename to src/spice2x/external/dseg/DSEG14Classic-Italic.sfd
diff --git a/external/dseg/DSEG14Classic-Italic.ttf b/src/spice2x/external/dseg/DSEG14Classic-Italic.ttf
similarity index 100%
rename from external/dseg/DSEG14Classic-Italic.ttf
rename to src/spice2x/external/dseg/DSEG14Classic-Italic.ttf
diff --git a/external/fmt/CMakeLists.txt b/src/spice2x/external/fmt/CMakeLists.txt
similarity index 100%
rename from external/fmt/CMakeLists.txt
rename to src/spice2x/external/fmt/CMakeLists.txt
diff --git a/external/fmt/ChangeLog.md b/src/spice2x/external/fmt/ChangeLog.md
similarity index 100%
rename from external/fmt/ChangeLog.md
rename to src/spice2x/external/fmt/ChangeLog.md
diff --git a/external/fmt/LICENSE b/src/spice2x/external/fmt/LICENSE
similarity index 100%
rename from external/fmt/LICENSE
rename to src/spice2x/external/fmt/LICENSE
diff --git a/external/fmt/README.md b/src/spice2x/external/fmt/README.md
similarity index 100%
rename from external/fmt/README.md
rename to src/spice2x/external/fmt/README.md
diff --git a/external/fmt/include/fmt/args.h b/src/spice2x/external/fmt/include/fmt/args.h
similarity index 100%
rename from external/fmt/include/fmt/args.h
rename to src/spice2x/external/fmt/include/fmt/args.h
diff --git a/external/fmt/include/fmt/base.h b/src/spice2x/external/fmt/include/fmt/base.h
similarity index 100%
rename from external/fmt/include/fmt/base.h
rename to src/spice2x/external/fmt/include/fmt/base.h
diff --git a/external/fmt/include/fmt/chrono.h b/src/spice2x/external/fmt/include/fmt/chrono.h
similarity index 100%
rename from external/fmt/include/fmt/chrono.h
rename to src/spice2x/external/fmt/include/fmt/chrono.h
diff --git a/external/fmt/include/fmt/color.h b/src/spice2x/external/fmt/include/fmt/color.h
similarity index 100%
rename from external/fmt/include/fmt/color.h
rename to src/spice2x/external/fmt/include/fmt/color.h
diff --git a/external/fmt/include/fmt/compile.h b/src/spice2x/external/fmt/include/fmt/compile.h
similarity index 100%
rename from external/fmt/include/fmt/compile.h
rename to src/spice2x/external/fmt/include/fmt/compile.h
diff --git a/external/fmt/include/fmt/core.h b/src/spice2x/external/fmt/include/fmt/core.h
similarity index 100%
rename from external/fmt/include/fmt/core.h
rename to src/spice2x/external/fmt/include/fmt/core.h
diff --git a/external/fmt/include/fmt/format-inl.h b/src/spice2x/external/fmt/include/fmt/format-inl.h
similarity index 100%
rename from external/fmt/include/fmt/format-inl.h
rename to src/spice2x/external/fmt/include/fmt/format-inl.h
diff --git a/external/fmt/include/fmt/format.h b/src/spice2x/external/fmt/include/fmt/format.h
similarity index 100%
rename from external/fmt/include/fmt/format.h
rename to src/spice2x/external/fmt/include/fmt/format.h
diff --git a/external/fmt/include/fmt/os.h b/src/spice2x/external/fmt/include/fmt/os.h
similarity index 100%
rename from external/fmt/include/fmt/os.h
rename to src/spice2x/external/fmt/include/fmt/os.h
diff --git a/external/fmt/include/fmt/ostream.h b/src/spice2x/external/fmt/include/fmt/ostream.h
similarity index 100%
rename from external/fmt/include/fmt/ostream.h
rename to src/spice2x/external/fmt/include/fmt/ostream.h
diff --git a/external/fmt/include/fmt/printf.h b/src/spice2x/external/fmt/include/fmt/printf.h
similarity index 100%
rename from external/fmt/include/fmt/printf.h
rename to src/spice2x/external/fmt/include/fmt/printf.h
diff --git a/external/fmt/include/fmt/ranges.h b/src/spice2x/external/fmt/include/fmt/ranges.h
similarity index 100%
rename from external/fmt/include/fmt/ranges.h
rename to src/spice2x/external/fmt/include/fmt/ranges.h
diff --git a/external/fmt/include/fmt/std.h b/src/spice2x/external/fmt/include/fmt/std.h
similarity index 100%
rename from external/fmt/include/fmt/std.h
rename to src/spice2x/external/fmt/include/fmt/std.h
diff --git a/external/fmt/include/fmt/xchar.h b/src/spice2x/external/fmt/include/fmt/xchar.h
similarity index 100%
rename from external/fmt/include/fmt/xchar.h
rename to src/spice2x/external/fmt/include/fmt/xchar.h
diff --git a/external/fmt/src/fmt.cc b/src/spice2x/external/fmt/src/fmt.cc
similarity index 100%
rename from external/fmt/src/fmt.cc
rename to src/spice2x/external/fmt/src/fmt.cc
diff --git a/external/fmt/src/format.cc b/src/spice2x/external/fmt/src/format.cc
similarity index 100%
rename from external/fmt/src/format.cc
rename to src/spice2x/external/fmt/src/format.cc
diff --git a/external/fmt/src/os.cc b/src/spice2x/external/fmt/src/os.cc
similarity index 100%
rename from external/fmt/src/os.cc
rename to src/spice2x/external/fmt/src/os.cc
diff --git a/external/fmt/support/Android.mk b/src/spice2x/external/fmt/support/Android.mk
similarity index 100%
rename from external/fmt/support/Android.mk
rename to src/spice2x/external/fmt/support/Android.mk
diff --git a/external/fmt/support/AndroidManifest.xml b/src/spice2x/external/fmt/support/AndroidManifest.xml
similarity index 100%
rename from external/fmt/support/AndroidManifest.xml
rename to src/spice2x/external/fmt/support/AndroidManifest.xml
diff --git a/external/fmt/support/C++.sublime-syntax b/src/spice2x/external/fmt/support/C++.sublime-syntax
similarity index 100%
rename from external/fmt/support/C++.sublime-syntax
rename to src/spice2x/external/fmt/support/C++.sublime-syntax
diff --git a/external/fmt/support/README b/src/spice2x/external/fmt/support/README
similarity index 100%
rename from external/fmt/support/README
rename to src/spice2x/external/fmt/support/README
diff --git a/external/fmt/support/Vagrantfile b/src/spice2x/external/fmt/support/Vagrantfile
similarity index 100%
rename from external/fmt/support/Vagrantfile
rename to src/spice2x/external/fmt/support/Vagrantfile
diff --git a/external/fmt/support/build.gradle b/src/spice2x/external/fmt/support/build.gradle
similarity index 100%
rename from external/fmt/support/build.gradle
rename to src/spice2x/external/fmt/support/build.gradle
diff --git a/external/fmt/support/check-commits b/src/spice2x/external/fmt/support/check-commits
similarity index 100%
rename from external/fmt/support/check-commits
rename to src/spice2x/external/fmt/support/check-commits
diff --git a/external/fmt/support/cmake/FindSetEnv.cmake b/src/spice2x/external/fmt/support/cmake/FindSetEnv.cmake
similarity index 100%
rename from external/fmt/support/cmake/FindSetEnv.cmake
rename to src/spice2x/external/fmt/support/cmake/FindSetEnv.cmake
diff --git a/external/fmt/support/cmake/JoinPaths.cmake b/src/spice2x/external/fmt/support/cmake/JoinPaths.cmake
similarity index 100%
rename from external/fmt/support/cmake/JoinPaths.cmake
rename to src/spice2x/external/fmt/support/cmake/JoinPaths.cmake
diff --git a/external/fmt/support/cmake/fmt-config.cmake.in b/src/spice2x/external/fmt/support/cmake/fmt-config.cmake.in
similarity index 100%
rename from external/fmt/support/cmake/fmt-config.cmake.in
rename to src/spice2x/external/fmt/support/cmake/fmt-config.cmake.in
diff --git a/external/fmt/support/cmake/fmt.pc.in b/src/spice2x/external/fmt/support/cmake/fmt.pc.in
similarity index 100%
rename from external/fmt/support/cmake/fmt.pc.in
rename to src/spice2x/external/fmt/support/cmake/fmt.pc.in
diff --git a/external/fmt/support/docopt.py b/src/spice2x/external/fmt/support/docopt.py
similarity index 100%
rename from external/fmt/support/docopt.py
rename to src/spice2x/external/fmt/support/docopt.py
diff --git a/external/fmt/support/mkdocs b/src/spice2x/external/fmt/support/mkdocs
similarity index 100%
rename from external/fmt/support/mkdocs
rename to src/spice2x/external/fmt/support/mkdocs
diff --git a/external/fmt/support/mkdocs.yml b/src/spice2x/external/fmt/support/mkdocs.yml
similarity index 100%
rename from external/fmt/support/mkdocs.yml
rename to src/spice2x/external/fmt/support/mkdocs.yml
diff --git a/external/fmt/support/printable.py b/src/spice2x/external/fmt/support/printable.py
similarity index 100%
rename from external/fmt/support/printable.py
rename to src/spice2x/external/fmt/support/printable.py
diff --git a/external/fmt/support/python/mkdocstrings_handlers/cxx/__init__.py b/src/spice2x/external/fmt/support/python/mkdocstrings_handlers/cxx/__init__.py
similarity index 100%
rename from external/fmt/support/python/mkdocstrings_handlers/cxx/__init__.py
rename to src/spice2x/external/fmt/support/python/mkdocstrings_handlers/cxx/__init__.py
diff --git a/external/fmt/support/python/mkdocstrings_handlers/cxx/templates/README b/src/spice2x/external/fmt/support/python/mkdocstrings_handlers/cxx/templates/README
similarity index 100%
rename from external/fmt/support/python/mkdocstrings_handlers/cxx/templates/README
rename to src/spice2x/external/fmt/support/python/mkdocstrings_handlers/cxx/templates/README
diff --git a/external/fmt/support/release.py b/src/spice2x/external/fmt/support/release.py
similarity index 100%
rename from external/fmt/support/release.py
rename to src/spice2x/external/fmt/support/release.py
diff --git a/external/hash-library/CMakeLists.txt b/src/spice2x/external/hash-library/CMakeLists.txt
similarity index 100%
rename from external/hash-library/CMakeLists.txt
rename to src/spice2x/external/hash-library/CMakeLists.txt
diff --git a/external/hash-library/LICENSE b/src/spice2x/external/hash-library/LICENSE
similarity index 100%
rename from external/hash-library/LICENSE
rename to src/spice2x/external/hash-library/LICENSE
diff --git a/external/hash-library/crc32.cpp b/src/spice2x/external/hash-library/crc32.cpp
similarity index 100%
rename from external/hash-library/crc32.cpp
rename to src/spice2x/external/hash-library/crc32.cpp
diff --git a/external/hash-library/crc32.h b/src/spice2x/external/hash-library/crc32.h
similarity index 100%
rename from external/hash-library/crc32.h
rename to src/spice2x/external/hash-library/crc32.h
diff --git a/external/hash-library/digest.cpp b/src/spice2x/external/hash-library/digest.cpp
similarity index 100%
rename from external/hash-library/digest.cpp
rename to src/spice2x/external/hash-library/digest.cpp
diff --git a/external/hash-library/hash.h b/src/spice2x/external/hash-library/hash.h
similarity index 100%
rename from external/hash-library/hash.h
rename to src/spice2x/external/hash-library/hash.h
diff --git a/external/hash-library/hmac.h b/src/spice2x/external/hash-library/hmac.h
similarity index 100%
rename from external/hash-library/hmac.h
rename to src/spice2x/external/hash-library/hmac.h
diff --git a/external/hash-library/keccak.cpp b/src/spice2x/external/hash-library/keccak.cpp
similarity index 100%
rename from external/hash-library/keccak.cpp
rename to src/spice2x/external/hash-library/keccak.cpp
diff --git a/external/hash-library/keccak.h b/src/spice2x/external/hash-library/keccak.h
similarity index 100%
rename from external/hash-library/keccak.h
rename to src/spice2x/external/hash-library/keccak.h
diff --git a/external/hash-library/md5.cpp b/src/spice2x/external/hash-library/md5.cpp
similarity index 100%
rename from external/hash-library/md5.cpp
rename to src/spice2x/external/hash-library/md5.cpp
diff --git a/external/hash-library/md5.h b/src/spice2x/external/hash-library/md5.h
similarity index 100%
rename from external/hash-library/md5.h
rename to src/spice2x/external/hash-library/md5.h
diff --git a/external/hash-library/readme.md b/src/spice2x/external/hash-library/readme.md
similarity index 100%
rename from external/hash-library/readme.md
rename to src/spice2x/external/hash-library/readme.md
diff --git a/external/hash-library/sha1.cpp b/src/spice2x/external/hash-library/sha1.cpp
similarity index 100%
rename from external/hash-library/sha1.cpp
rename to src/spice2x/external/hash-library/sha1.cpp
diff --git a/external/hash-library/sha1.h b/src/spice2x/external/hash-library/sha1.h
similarity index 100%
rename from external/hash-library/sha1.h
rename to src/spice2x/external/hash-library/sha1.h
diff --git a/external/hash-library/sha256.cpp b/src/spice2x/external/hash-library/sha256.cpp
similarity index 100%
rename from external/hash-library/sha256.cpp
rename to src/spice2x/external/hash-library/sha256.cpp
diff --git a/external/hash-library/sha256.h b/src/spice2x/external/hash-library/sha256.h
similarity index 100%
rename from external/hash-library/sha256.h
rename to src/spice2x/external/hash-library/sha256.h
diff --git a/external/hash-library/sha3.cpp b/src/spice2x/external/hash-library/sha3.cpp
similarity index 100%
rename from external/hash-library/sha3.cpp
rename to src/spice2x/external/hash-library/sha3.cpp
diff --git a/external/hash-library/sha3.h b/src/spice2x/external/hash-library/sha3.h
similarity index 100%
rename from external/hash-library/sha3.h
rename to src/spice2x/external/hash-library/sha3.h
diff --git a/external/hash-library/tests/tests.cpp b/src/spice2x/external/hash-library/tests/tests.cpp
similarity index 100%
rename from external/hash-library/tests/tests.cpp
rename to src/spice2x/external/hash-library/tests/tests.cpp
diff --git a/external/headsocket.h b/src/spice2x/external/headsocket.h
similarity index 100%
rename from external/headsocket.h
rename to src/spice2x/external/headsocket.h
diff --git a/external/http-parser/http_parser.c b/src/spice2x/external/http-parser/http_parser.c
similarity index 100%
rename from external/http-parser/http_parser.c
rename to src/spice2x/external/http-parser/http_parser.c
diff --git a/external/http-parser/http_parser.h b/src/spice2x/external/http-parser/http_parser.h
similarity index 100%
rename from external/http-parser/http_parser.h
rename to src/spice2x/external/http-parser/http_parser.h
diff --git a/external/imgui/CMakeLists.txt b/src/spice2x/external/imgui/CMakeLists.txt
similarity index 100%
rename from external/imgui/CMakeLists.txt
rename to src/spice2x/external/imgui/CMakeLists.txt
diff --git a/external/imgui/LICENSE.txt b/src/spice2x/external/imgui/LICENSE.txt
similarity index 100%
rename from external/imgui/LICENSE.txt
rename to src/spice2x/external/imgui/LICENSE.txt
diff --git a/external/imgui/backends/imgui_impl_dx9.cpp b/src/spice2x/external/imgui/backends/imgui_impl_dx9.cpp
similarity index 100%
rename from external/imgui/backends/imgui_impl_dx9.cpp
rename to src/spice2x/external/imgui/backends/imgui_impl_dx9.cpp
diff --git a/external/imgui/backends/imgui_impl_dx9.h b/src/spice2x/external/imgui/backends/imgui_impl_dx9.h
similarity index 100%
rename from external/imgui/backends/imgui_impl_dx9.h
rename to src/spice2x/external/imgui/backends/imgui_impl_dx9.h
diff --git a/external/imgui/imconfig.h b/src/spice2x/external/imgui/imconfig.h
similarity index 100%
rename from external/imgui/imconfig.h
rename to src/spice2x/external/imgui/imconfig.h
diff --git a/external/imgui/imgui.cpp b/src/spice2x/external/imgui/imgui.cpp
similarity index 100%
rename from external/imgui/imgui.cpp
rename to src/spice2x/external/imgui/imgui.cpp
diff --git a/external/imgui/imgui.h b/src/spice2x/external/imgui/imgui.h
similarity index 100%
rename from external/imgui/imgui.h
rename to src/spice2x/external/imgui/imgui.h
diff --git a/external/imgui/imgui_demo.cpp b/src/spice2x/external/imgui/imgui_demo.cpp
similarity index 100%
rename from external/imgui/imgui_demo.cpp
rename to src/spice2x/external/imgui/imgui_demo.cpp
diff --git a/external/imgui/imgui_draw.cpp b/src/spice2x/external/imgui/imgui_draw.cpp
similarity index 100%
rename from external/imgui/imgui_draw.cpp
rename to src/spice2x/external/imgui/imgui_draw.cpp
diff --git a/external/imgui/imgui_filebrowser.h b/src/spice2x/external/imgui/imgui_filebrowser.h
similarity index 100%
rename from external/imgui/imgui_filebrowser.h
rename to src/spice2x/external/imgui/imgui_filebrowser.h
diff --git a/external/imgui/imgui_internal.h b/src/spice2x/external/imgui/imgui_internal.h
similarity index 100%
rename from external/imgui/imgui_internal.h
rename to src/spice2x/external/imgui/imgui_internal.h
diff --git a/external/imgui/imgui_memory_editor.h b/src/spice2x/external/imgui/imgui_memory_editor.h
similarity index 100%
rename from external/imgui/imgui_memory_editor.h
rename to src/spice2x/external/imgui/imgui_memory_editor.h
diff --git a/external/imgui/imgui_tables.cpp b/src/spice2x/external/imgui/imgui_tables.cpp
similarity index 100%
rename from external/imgui/imgui_tables.cpp
rename to src/spice2x/external/imgui/imgui_tables.cpp
diff --git a/external/imgui/imgui_widgets.cpp b/src/spice2x/external/imgui/imgui_widgets.cpp
similarity index 100%
rename from external/imgui/imgui_widgets.cpp
rename to src/spice2x/external/imgui/imgui_widgets.cpp
diff --git a/external/imgui/imstb_rectpack.h b/src/spice2x/external/imgui/imstb_rectpack.h
similarity index 100%
rename from external/imgui/imstb_rectpack.h
rename to src/spice2x/external/imgui/imstb_rectpack.h
diff --git a/external/imgui/imstb_textedit.h b/src/spice2x/external/imgui/imstb_textedit.h
similarity index 100%
rename from external/imgui/imstb_textedit.h
rename to src/spice2x/external/imgui/imstb_textedit.h
diff --git a/external/imgui/imstb_truetype.h b/src/spice2x/external/imgui/imstb_truetype.h
similarity index 100%
rename from external/imgui/imstb_truetype.h
rename to src/spice2x/external/imgui/imstb_truetype.h
diff --git a/external/imgui/misc/cpp/imgui_stdlib.cpp b/src/spice2x/external/imgui/misc/cpp/imgui_stdlib.cpp
similarity index 100%
rename from external/imgui/misc/cpp/imgui_stdlib.cpp
rename to src/spice2x/external/imgui/misc/cpp/imgui_stdlib.cpp
diff --git a/external/imgui/misc/cpp/imgui_stdlib.h b/src/spice2x/external/imgui/misc/cpp/imgui_stdlib.h
similarity index 100%
rename from external/imgui/misc/cpp/imgui_stdlib.h
rename to src/spice2x/external/imgui/misc/cpp/imgui_stdlib.h
diff --git a/external/minhook/.editorconfig b/src/spice2x/external/minhook/.editorconfig
similarity index 100%
rename from external/minhook/.editorconfig
rename to src/spice2x/external/minhook/.editorconfig
diff --git a/external/minhook/.gitignore b/src/spice2x/external/minhook/.gitignore
similarity index 100%
rename from external/minhook/.gitignore
rename to src/spice2x/external/minhook/.gitignore
diff --git a/external/minhook/AUTHORS.txt b/src/spice2x/external/minhook/AUTHORS.txt
similarity index 100%
rename from external/minhook/AUTHORS.txt
rename to src/spice2x/external/minhook/AUTHORS.txt
diff --git a/external/minhook/CMakeLists.txt b/src/spice2x/external/minhook/CMakeLists.txt
similarity index 100%
rename from external/minhook/CMakeLists.txt
rename to src/spice2x/external/minhook/CMakeLists.txt
diff --git a/external/minhook/LICENSE.txt b/src/spice2x/external/minhook/LICENSE.txt
similarity index 100%
rename from external/minhook/LICENSE.txt
rename to src/spice2x/external/minhook/LICENSE.txt
diff --git a/external/minhook/README.md b/src/spice2x/external/minhook/README.md
similarity index 100%
rename from external/minhook/README.md
rename to src/spice2x/external/minhook/README.md
diff --git a/external/minhook/build/MinGW/Makefile b/src/spice2x/external/minhook/build/MinGW/Makefile
similarity index 100%
rename from external/minhook/build/MinGW/Makefile
rename to src/spice2x/external/minhook/build/MinGW/Makefile
diff --git a/external/minhook/build/MinGW/make.bat b/src/spice2x/external/minhook/build/MinGW/make.bat
similarity index 100%
rename from external/minhook/build/MinGW/make.bat
rename to src/spice2x/external/minhook/build/MinGW/make.bat
diff --git a/external/minhook/build/VC10/MinHook.vcxproj b/src/spice2x/external/minhook/build/VC10/MinHook.vcxproj
similarity index 100%
rename from external/minhook/build/VC10/MinHook.vcxproj
rename to src/spice2x/external/minhook/build/VC10/MinHook.vcxproj
diff --git a/external/minhook/build/VC10/MinHookVC10.sln b/src/spice2x/external/minhook/build/VC10/MinHookVC10.sln
similarity index 100%
rename from external/minhook/build/VC10/MinHookVC10.sln
rename to src/spice2x/external/minhook/build/VC10/MinHookVC10.sln
diff --git a/external/minhook/build/VC10/libMinHook.vcxproj b/src/spice2x/external/minhook/build/VC10/libMinHook.vcxproj
similarity index 100%
rename from external/minhook/build/VC10/libMinHook.vcxproj
rename to src/spice2x/external/minhook/build/VC10/libMinHook.vcxproj
diff --git a/external/minhook/build/VC10/libMinHook.vcxproj.filters b/src/spice2x/external/minhook/build/VC10/libMinHook.vcxproj.filters
similarity index 100%
rename from external/minhook/build/VC10/libMinHook.vcxproj.filters
rename to src/spice2x/external/minhook/build/VC10/libMinHook.vcxproj.filters
diff --git a/external/minhook/build/VC11/MinHook.vcxproj b/src/spice2x/external/minhook/build/VC11/MinHook.vcxproj
similarity index 100%
rename from external/minhook/build/VC11/MinHook.vcxproj
rename to src/spice2x/external/minhook/build/VC11/MinHook.vcxproj
diff --git a/external/minhook/build/VC11/MinHookVC11.sln b/src/spice2x/external/minhook/build/VC11/MinHookVC11.sln
similarity index 100%
rename from external/minhook/build/VC11/MinHookVC11.sln
rename to src/spice2x/external/minhook/build/VC11/MinHookVC11.sln
diff --git a/external/minhook/build/VC11/libMinHook.vcxproj b/src/spice2x/external/minhook/build/VC11/libMinHook.vcxproj
similarity index 100%
rename from external/minhook/build/VC11/libMinHook.vcxproj
rename to src/spice2x/external/minhook/build/VC11/libMinHook.vcxproj
diff --git a/external/minhook/build/VC11/libMinHook.vcxproj.filters b/src/spice2x/external/minhook/build/VC11/libMinHook.vcxproj.filters
similarity index 100%
rename from external/minhook/build/VC11/libMinHook.vcxproj.filters
rename to src/spice2x/external/minhook/build/VC11/libMinHook.vcxproj.filters
diff --git a/external/minhook/build/VC12/MinHook.vcxproj b/src/spice2x/external/minhook/build/VC12/MinHook.vcxproj
similarity index 100%
rename from external/minhook/build/VC12/MinHook.vcxproj
rename to src/spice2x/external/minhook/build/VC12/MinHook.vcxproj
diff --git a/external/minhook/build/VC12/MinHookVC12.sln b/src/spice2x/external/minhook/build/VC12/MinHookVC12.sln
similarity index 100%
rename from external/minhook/build/VC12/MinHookVC12.sln
rename to src/spice2x/external/minhook/build/VC12/MinHookVC12.sln
diff --git a/external/minhook/build/VC12/libMinHook.vcxproj b/src/spice2x/external/minhook/build/VC12/libMinHook.vcxproj
similarity index 100%
rename from external/minhook/build/VC12/libMinHook.vcxproj
rename to src/spice2x/external/minhook/build/VC12/libMinHook.vcxproj
diff --git a/external/minhook/build/VC12/libMinHook.vcxproj.filters b/src/spice2x/external/minhook/build/VC12/libMinHook.vcxproj.filters
similarity index 100%
rename from external/minhook/build/VC12/libMinHook.vcxproj.filters
rename to src/spice2x/external/minhook/build/VC12/libMinHook.vcxproj.filters
diff --git a/external/minhook/build/VC14/MinHook.vcxproj b/src/spice2x/external/minhook/build/VC14/MinHook.vcxproj
similarity index 100%
rename from external/minhook/build/VC14/MinHook.vcxproj
rename to src/spice2x/external/minhook/build/VC14/MinHook.vcxproj
diff --git a/external/minhook/build/VC14/MinHookVC14.sln b/src/spice2x/external/minhook/build/VC14/MinHookVC14.sln
similarity index 100%
rename from external/minhook/build/VC14/MinHookVC14.sln
rename to src/spice2x/external/minhook/build/VC14/MinHookVC14.sln
diff --git a/external/minhook/build/VC14/libMinHook.vcxproj b/src/spice2x/external/minhook/build/VC14/libMinHook.vcxproj
similarity index 100%
rename from external/minhook/build/VC14/libMinHook.vcxproj
rename to src/spice2x/external/minhook/build/VC14/libMinHook.vcxproj
diff --git a/external/minhook/build/VC14/libMinHook.vcxproj.filters b/src/spice2x/external/minhook/build/VC14/libMinHook.vcxproj.filters
similarity index 100%
rename from external/minhook/build/VC14/libMinHook.vcxproj.filters
rename to src/spice2x/external/minhook/build/VC14/libMinHook.vcxproj.filters
diff --git a/external/minhook/build/VC15/MinHook.vcxproj b/src/spice2x/external/minhook/build/VC15/MinHook.vcxproj
similarity index 100%
rename from external/minhook/build/VC15/MinHook.vcxproj
rename to src/spice2x/external/minhook/build/VC15/MinHook.vcxproj
diff --git a/external/minhook/build/VC15/MinHookVC15.sln b/src/spice2x/external/minhook/build/VC15/MinHookVC15.sln
similarity index 100%
rename from external/minhook/build/VC15/MinHookVC15.sln
rename to src/spice2x/external/minhook/build/VC15/MinHookVC15.sln
diff --git a/external/minhook/build/VC15/libMinHook.vcxproj b/src/spice2x/external/minhook/build/VC15/libMinHook.vcxproj
similarity index 100%
rename from external/minhook/build/VC15/libMinHook.vcxproj
rename to src/spice2x/external/minhook/build/VC15/libMinHook.vcxproj
diff --git a/external/minhook/build/VC15/libMinHook.vcxproj.filters b/src/spice2x/external/minhook/build/VC15/libMinHook.vcxproj.filters
similarity index 100%
rename from external/minhook/build/VC15/libMinHook.vcxproj.filters
rename to src/spice2x/external/minhook/build/VC15/libMinHook.vcxproj.filters
diff --git a/external/minhook/build/VC9/MinHook.vcproj b/src/spice2x/external/minhook/build/VC9/MinHook.vcproj
similarity index 100%
rename from external/minhook/build/VC9/MinHook.vcproj
rename to src/spice2x/external/minhook/build/VC9/MinHook.vcproj
diff --git a/external/minhook/build/VC9/MinHookVC9.sln b/src/spice2x/external/minhook/build/VC9/MinHookVC9.sln
similarity index 100%
rename from external/minhook/build/VC9/MinHookVC9.sln
rename to src/spice2x/external/minhook/build/VC9/MinHookVC9.sln
diff --git a/external/minhook/build/VC9/libMinHook.vcproj b/src/spice2x/external/minhook/build/VC9/libMinHook.vcproj
similarity index 100%
rename from external/minhook/build/VC9/libMinHook.vcproj
rename to src/spice2x/external/minhook/build/VC9/libMinHook.vcproj
diff --git a/external/minhook/dll_resources/MinHook.def b/src/spice2x/external/minhook/dll_resources/MinHook.def
similarity index 100%
rename from external/minhook/dll_resources/MinHook.def
rename to src/spice2x/external/minhook/dll_resources/MinHook.def
diff --git a/external/minhook/dll_resources/MinHook.rc b/src/spice2x/external/minhook/dll_resources/MinHook.rc
similarity index 100%
rename from external/minhook/dll_resources/MinHook.rc
rename to src/spice2x/external/minhook/dll_resources/MinHook.rc
diff --git a/external/minhook/include/MinHook.h b/src/spice2x/external/minhook/include/MinHook.h
similarity index 100%
rename from external/minhook/include/MinHook.h
rename to src/spice2x/external/minhook/include/MinHook.h
diff --git a/external/minhook/src/buffer.c b/src/spice2x/external/minhook/src/buffer.c
similarity index 100%
rename from external/minhook/src/buffer.c
rename to src/spice2x/external/minhook/src/buffer.c
diff --git a/external/minhook/src/buffer.h b/src/spice2x/external/minhook/src/buffer.h
similarity index 100%
rename from external/minhook/src/buffer.h
rename to src/spice2x/external/minhook/src/buffer.h
diff --git a/external/minhook/src/hde/hde32.c b/src/spice2x/external/minhook/src/hde/hde32.c
similarity index 100%
rename from external/minhook/src/hde/hde32.c
rename to src/spice2x/external/minhook/src/hde/hde32.c
diff --git a/external/minhook/src/hde/hde32.h b/src/spice2x/external/minhook/src/hde/hde32.h
similarity index 100%
rename from external/minhook/src/hde/hde32.h
rename to src/spice2x/external/minhook/src/hde/hde32.h
diff --git a/external/minhook/src/hde/hde64.c b/src/spice2x/external/minhook/src/hde/hde64.c
similarity index 100%
rename from external/minhook/src/hde/hde64.c
rename to src/spice2x/external/minhook/src/hde/hde64.c
diff --git a/external/minhook/src/hde/hde64.h b/src/spice2x/external/minhook/src/hde/hde64.h
similarity index 100%
rename from external/minhook/src/hde/hde64.h
rename to src/spice2x/external/minhook/src/hde/hde64.h
diff --git a/external/minhook/src/hde/pstdint.h b/src/spice2x/external/minhook/src/hde/pstdint.h
similarity index 100%
rename from external/minhook/src/hde/pstdint.h
rename to src/spice2x/external/minhook/src/hde/pstdint.h
diff --git a/external/minhook/src/hde/table32.h b/src/spice2x/external/minhook/src/hde/table32.h
similarity index 100%
rename from external/minhook/src/hde/table32.h
rename to src/spice2x/external/minhook/src/hde/table32.h
diff --git a/external/minhook/src/hde/table64.h b/src/spice2x/external/minhook/src/hde/table64.h
similarity index 100%
rename from external/minhook/src/hde/table64.h
rename to src/spice2x/external/minhook/src/hde/table64.h
diff --git a/external/minhook/src/hook.c b/src/spice2x/external/minhook/src/hook.c
similarity index 100%
rename from external/minhook/src/hook.c
rename to src/spice2x/external/minhook/src/hook.c
diff --git a/external/minhook/src/trampoline.c b/src/spice2x/external/minhook/src/trampoline.c
similarity index 100%
rename from external/minhook/src/trampoline.c
rename to src/spice2x/external/minhook/src/trampoline.c
diff --git a/external/minhook/src/trampoline.h b/src/spice2x/external/minhook/src/trampoline.h
similarity index 100%
rename from external/minhook/src/trampoline.h
rename to src/spice2x/external/minhook/src/trampoline.h
diff --git a/external/nvapi/License.txt b/src/spice2x/external/nvapi/License.txt
similarity index 100%
rename from external/nvapi/License.txt
rename to src/spice2x/external/nvapi/License.txt
diff --git a/external/nvapi/NvApiDriverSettings.h b/src/spice2x/external/nvapi/NvApiDriverSettings.h
similarity index 100%
rename from external/nvapi/NvApiDriverSettings.h
rename to src/spice2x/external/nvapi/NvApiDriverSettings.h
diff --git a/external/nvapi/nvapi.h b/src/spice2x/external/nvapi/nvapi.h
similarity index 100%
rename from external/nvapi/nvapi.h
rename to src/spice2x/external/nvapi/nvapi.h
diff --git a/external/nvapi/nvapi_lite_common.h b/src/spice2x/external/nvapi/nvapi_lite_common.h
similarity index 100%
rename from external/nvapi/nvapi_lite_common.h
rename to src/spice2x/external/nvapi/nvapi_lite_common.h
diff --git a/external/nvapi/nvapi_lite_d3dext.h b/src/spice2x/external/nvapi/nvapi_lite_d3dext.h
similarity index 100%
rename from external/nvapi/nvapi_lite_d3dext.h
rename to src/spice2x/external/nvapi/nvapi_lite_d3dext.h
diff --git a/external/nvapi/nvapi_lite_salend.h b/src/spice2x/external/nvapi/nvapi_lite_salend.h
similarity index 100%
rename from external/nvapi/nvapi_lite_salend.h
rename to src/spice2x/external/nvapi/nvapi_lite_salend.h
diff --git a/external/nvapi/nvapi_lite_salstart.h b/src/spice2x/external/nvapi/nvapi_lite_salstart.h
similarity index 100%
rename from external/nvapi/nvapi_lite_salstart.h
rename to src/spice2x/external/nvapi/nvapi_lite_salstart.h
diff --git a/external/nvapi/nvapi_lite_sli.h b/src/spice2x/external/nvapi/nvapi_lite_sli.h
similarity index 100%
rename from external/nvapi/nvapi_lite_sli.h
rename to src/spice2x/external/nvapi/nvapi_lite_sli.h
diff --git a/external/nvapi/nvapi_lite_stereo.h b/src/spice2x/external/nvapi/nvapi_lite_stereo.h
similarity index 100%
rename from external/nvapi/nvapi_lite_stereo.h
rename to src/spice2x/external/nvapi/nvapi_lite_stereo.h
diff --git a/external/nvapi/nvapi_lite_surround.h b/src/spice2x/external/nvapi/nvapi_lite_surround.h
similarity index 100%
rename from external/nvapi/nvapi_lite_surround.h
rename to src/spice2x/external/nvapi/nvapi_lite_surround.h
diff --git a/external/nvenc/nvEncodeAPI.h b/src/spice2x/external/nvenc/nvEncodeAPI.h
similarity index 100%
rename from external/nvenc/nvEncodeAPI.h
rename to src/spice2x/external/nvenc/nvEncodeAPI.h
diff --git a/external/rapidjson/allocators.h b/src/spice2x/external/rapidjson/allocators.h
similarity index 100%
rename from external/rapidjson/allocators.h
rename to src/spice2x/external/rapidjson/allocators.h
diff --git a/external/rapidjson/document.h b/src/spice2x/external/rapidjson/document.h
similarity index 100%
rename from external/rapidjson/document.h
rename to src/spice2x/external/rapidjson/document.h
diff --git a/external/rapidjson/encodedstream.h b/src/spice2x/external/rapidjson/encodedstream.h
similarity index 100%
rename from external/rapidjson/encodedstream.h
rename to src/spice2x/external/rapidjson/encodedstream.h
diff --git a/external/rapidjson/encodings.h b/src/spice2x/external/rapidjson/encodings.h
similarity index 100%
rename from external/rapidjson/encodings.h
rename to src/spice2x/external/rapidjson/encodings.h
diff --git a/external/rapidjson/error/en.h b/src/spice2x/external/rapidjson/error/en.h
similarity index 100%
rename from external/rapidjson/error/en.h
rename to src/spice2x/external/rapidjson/error/en.h
diff --git a/external/rapidjson/error/error.h b/src/spice2x/external/rapidjson/error/error.h
similarity index 100%
rename from external/rapidjson/error/error.h
rename to src/spice2x/external/rapidjson/error/error.h
diff --git a/external/rapidjson/filereadstream.h b/src/spice2x/external/rapidjson/filereadstream.h
similarity index 100%
rename from external/rapidjson/filereadstream.h
rename to src/spice2x/external/rapidjson/filereadstream.h
diff --git a/external/rapidjson/filewritestream.h b/src/spice2x/external/rapidjson/filewritestream.h
similarity index 100%
rename from external/rapidjson/filewritestream.h
rename to src/spice2x/external/rapidjson/filewritestream.h
diff --git a/external/rapidjson/fwd.h b/src/spice2x/external/rapidjson/fwd.h
similarity index 100%
rename from external/rapidjson/fwd.h
rename to src/spice2x/external/rapidjson/fwd.h
diff --git a/external/rapidjson/internal/biginteger.h b/src/spice2x/external/rapidjson/internal/biginteger.h
similarity index 100%
rename from external/rapidjson/internal/biginteger.h
rename to src/spice2x/external/rapidjson/internal/biginteger.h
diff --git a/external/rapidjson/internal/diyfp.h b/src/spice2x/external/rapidjson/internal/diyfp.h
similarity index 100%
rename from external/rapidjson/internal/diyfp.h
rename to src/spice2x/external/rapidjson/internal/diyfp.h
diff --git a/external/rapidjson/internal/dtoa.h b/src/spice2x/external/rapidjson/internal/dtoa.h
similarity index 100%
rename from external/rapidjson/internal/dtoa.h
rename to src/spice2x/external/rapidjson/internal/dtoa.h
diff --git a/external/rapidjson/internal/ieee754.h b/src/spice2x/external/rapidjson/internal/ieee754.h
similarity index 100%
rename from external/rapidjson/internal/ieee754.h
rename to src/spice2x/external/rapidjson/internal/ieee754.h
diff --git a/external/rapidjson/internal/itoa.h b/src/spice2x/external/rapidjson/internal/itoa.h
similarity index 100%
rename from external/rapidjson/internal/itoa.h
rename to src/spice2x/external/rapidjson/internal/itoa.h
diff --git a/external/rapidjson/internal/meta.h b/src/spice2x/external/rapidjson/internal/meta.h
similarity index 100%
rename from external/rapidjson/internal/meta.h
rename to src/spice2x/external/rapidjson/internal/meta.h
diff --git a/external/rapidjson/internal/pow10.h b/src/spice2x/external/rapidjson/internal/pow10.h
similarity index 100%
rename from external/rapidjson/internal/pow10.h
rename to src/spice2x/external/rapidjson/internal/pow10.h
diff --git a/external/rapidjson/internal/regex.h b/src/spice2x/external/rapidjson/internal/regex.h
similarity index 100%
rename from external/rapidjson/internal/regex.h
rename to src/spice2x/external/rapidjson/internal/regex.h
diff --git a/external/rapidjson/internal/stack.h b/src/spice2x/external/rapidjson/internal/stack.h
similarity index 100%
rename from external/rapidjson/internal/stack.h
rename to src/spice2x/external/rapidjson/internal/stack.h
diff --git a/external/rapidjson/internal/strfunc.h b/src/spice2x/external/rapidjson/internal/strfunc.h
similarity index 100%
rename from external/rapidjson/internal/strfunc.h
rename to src/spice2x/external/rapidjson/internal/strfunc.h
diff --git a/external/rapidjson/internal/strtod.h b/src/spice2x/external/rapidjson/internal/strtod.h
similarity index 100%
rename from external/rapidjson/internal/strtod.h
rename to src/spice2x/external/rapidjson/internal/strtod.h
diff --git a/external/rapidjson/internal/swap.h b/src/spice2x/external/rapidjson/internal/swap.h
similarity index 100%
rename from external/rapidjson/internal/swap.h
rename to src/spice2x/external/rapidjson/internal/swap.h
diff --git a/external/rapidjson/istreamwrapper.h b/src/spice2x/external/rapidjson/istreamwrapper.h
similarity index 100%
rename from external/rapidjson/istreamwrapper.h
rename to src/spice2x/external/rapidjson/istreamwrapper.h
diff --git a/external/rapidjson/memorybuffer.h b/src/spice2x/external/rapidjson/memorybuffer.h
similarity index 100%
rename from external/rapidjson/memorybuffer.h
rename to src/spice2x/external/rapidjson/memorybuffer.h
diff --git a/external/rapidjson/memorystream.h b/src/spice2x/external/rapidjson/memorystream.h
similarity index 100%
rename from external/rapidjson/memorystream.h
rename to src/spice2x/external/rapidjson/memorystream.h
diff --git a/external/rapidjson/msinttypes/inttypes.h b/src/spice2x/external/rapidjson/msinttypes/inttypes.h
similarity index 100%
rename from external/rapidjson/msinttypes/inttypes.h
rename to src/spice2x/external/rapidjson/msinttypes/inttypes.h
diff --git a/external/rapidjson/msinttypes/stdint.h b/src/spice2x/external/rapidjson/msinttypes/stdint.h
similarity index 100%
rename from external/rapidjson/msinttypes/stdint.h
rename to src/spice2x/external/rapidjson/msinttypes/stdint.h
diff --git a/external/rapidjson/ostreamwrapper.h b/src/spice2x/external/rapidjson/ostreamwrapper.h
similarity index 100%
rename from external/rapidjson/ostreamwrapper.h
rename to src/spice2x/external/rapidjson/ostreamwrapper.h
diff --git a/external/rapidjson/pointer.h b/src/spice2x/external/rapidjson/pointer.h
similarity index 100%
rename from external/rapidjson/pointer.h
rename to src/spice2x/external/rapidjson/pointer.h
diff --git a/external/rapidjson/prettywriter.h b/src/spice2x/external/rapidjson/prettywriter.h
similarity index 100%
rename from external/rapidjson/prettywriter.h
rename to src/spice2x/external/rapidjson/prettywriter.h
diff --git a/external/rapidjson/rapidjson.h b/src/spice2x/external/rapidjson/rapidjson.h
similarity index 100%
rename from external/rapidjson/rapidjson.h
rename to src/spice2x/external/rapidjson/rapidjson.h
diff --git a/external/rapidjson/reader.h b/src/spice2x/external/rapidjson/reader.h
similarity index 100%
rename from external/rapidjson/reader.h
rename to src/spice2x/external/rapidjson/reader.h
diff --git a/external/rapidjson/schema.h b/src/spice2x/external/rapidjson/schema.h
similarity index 100%
rename from external/rapidjson/schema.h
rename to src/spice2x/external/rapidjson/schema.h
diff --git a/external/rapidjson/stream.h b/src/spice2x/external/rapidjson/stream.h
similarity index 100%
rename from external/rapidjson/stream.h
rename to src/spice2x/external/rapidjson/stream.h
diff --git a/external/rapidjson/stringbuffer.h b/src/spice2x/external/rapidjson/stringbuffer.h
similarity index 100%
rename from external/rapidjson/stringbuffer.h
rename to src/spice2x/external/rapidjson/stringbuffer.h
diff --git a/external/rapidjson/writer.h b/src/spice2x/external/rapidjson/writer.h
similarity index 100%
rename from external/rapidjson/writer.h
rename to src/spice2x/external/rapidjson/writer.h
diff --git a/external/readerwriterqueue/.gitignore b/src/spice2x/external/readerwriterqueue/.gitignore
similarity index 100%
rename from external/readerwriterqueue/.gitignore
rename to src/spice2x/external/readerwriterqueue/.gitignore
diff --git a/external/readerwriterqueue/LICENSE.md b/src/spice2x/external/readerwriterqueue/LICENSE.md
similarity index 100%
rename from external/readerwriterqueue/LICENSE.md
rename to src/spice2x/external/readerwriterqueue/LICENSE.md
diff --git a/external/readerwriterqueue/README.md b/src/spice2x/external/readerwriterqueue/README.md
similarity index 100%
rename from external/readerwriterqueue/README.md
rename to src/spice2x/external/readerwriterqueue/README.md
diff --git a/external/readerwriterqueue/atomicops.h b/src/spice2x/external/readerwriterqueue/atomicops.h
similarity index 100%
rename from external/readerwriterqueue/atomicops.h
rename to src/spice2x/external/readerwriterqueue/atomicops.h
diff --git a/external/readerwriterqueue/readerwriterqueue.h b/src/spice2x/external/readerwriterqueue/readerwriterqueue.h
similarity index 100%
rename from external/readerwriterqueue/readerwriterqueue.h
rename to src/spice2x/external/readerwriterqueue/readerwriterqueue.h
diff --git a/external/robin_hood.h b/src/spice2x/external/robin_hood.h
similarity index 100%
rename from external/robin_hood.h
rename to src/spice2x/external/robin_hood.h
diff --git a/external/scard/scard.cpp b/src/spice2x/external/scard/scard.cpp
similarity index 100%
rename from external/scard/scard.cpp
rename to src/spice2x/external/scard/scard.cpp
diff --git a/external/scard/scard.h b/src/spice2x/external/scard/scard.h
similarity index 100%
rename from external/scard/scard.h
rename to src/spice2x/external/scard/scard.h
diff --git a/external/stackwalker/stackwalker.cpp b/src/spice2x/external/stackwalker/stackwalker.cpp
similarity index 100%
rename from external/stackwalker/stackwalker.cpp
rename to src/spice2x/external/stackwalker/stackwalker.cpp
diff --git a/external/stackwalker/stackwalker.h b/src/spice2x/external/stackwalker/stackwalker.h
similarity index 100%
rename from external/stackwalker/stackwalker.h
rename to src/spice2x/external/stackwalker/stackwalker.h
diff --git a/external/stb_image_write.h b/src/spice2x/external/stb_image_write.h
similarity index 100%
rename from external/stb_image_write.h
rename to src/spice2x/external/stb_image_write.h
diff --git a/external/tinyxml2/tinyxml2.cpp b/src/spice2x/external/tinyxml2/tinyxml2.cpp
similarity index 100%
rename from external/tinyxml2/tinyxml2.cpp
rename to src/spice2x/external/tinyxml2/tinyxml2.cpp
diff --git a/external/tinyxml2/tinyxml2.h b/src/spice2x/external/tinyxml2/tinyxml2.h
similarity index 100%
rename from external/tinyxml2/tinyxml2.h
rename to src/spice2x/external/tinyxml2/tinyxml2.h
diff --git a/external/toojpeg/LICENSE b/src/spice2x/external/toojpeg/LICENSE
similarity index 100%
rename from external/toojpeg/LICENSE
rename to src/spice2x/external/toojpeg/LICENSE
diff --git a/external/toojpeg/toojpeg.cpp b/src/spice2x/external/toojpeg/toojpeg.cpp
similarity index 100%
rename from external/toojpeg/toojpeg.cpp
rename to src/spice2x/external/toojpeg/toojpeg.cpp
diff --git a/external/toojpeg/toojpeg.h b/src/spice2x/external/toojpeg/toojpeg.h
similarity index 100%
rename from external/toojpeg/toojpeg.h
rename to src/spice2x/external/toojpeg/toojpeg.h
diff --git a/external/usbhidusage/usb-hid-usage.c b/src/spice2x/external/usbhidusage/usb-hid-usage.c
similarity index 100%
rename from external/usbhidusage/usb-hid-usage.c
rename to src/spice2x/external/usbhidusage/usb-hid-usage.c
diff --git a/external/usbhidusage/usb-hid-usage.h b/src/spice2x/external/usbhidusage/usb-hid-usage.h
similarity index 100%
rename from external/usbhidusage/usb-hid-usage.h
rename to src/spice2x/external/usbhidusage/usb-hid-usage.h
diff --git a/games/bbc/bbc.cpp b/src/spice2x/games/bbc/bbc.cpp
similarity index 100%
rename from games/bbc/bbc.cpp
rename to src/spice2x/games/bbc/bbc.cpp
diff --git a/games/bbc/bbc.h b/src/spice2x/games/bbc/bbc.h
similarity index 100%
rename from games/bbc/bbc.h
rename to src/spice2x/games/bbc/bbc.h
diff --git a/games/bbc/io.cpp b/src/spice2x/games/bbc/io.cpp
similarity index 100%
rename from games/bbc/io.cpp
rename to src/spice2x/games/bbc/io.cpp
diff --git a/games/bbc/io.h b/src/spice2x/games/bbc/io.h
similarity index 100%
rename from games/bbc/io.h
rename to src/spice2x/games/bbc/io.h
diff --git a/games/bc/bc.cpp b/src/spice2x/games/bc/bc.cpp
similarity index 100%
rename from games/bc/bc.cpp
rename to src/spice2x/games/bc/bc.cpp
diff --git a/games/bc/bc.h b/src/spice2x/games/bc/bc.h
similarity index 100%
rename from games/bc/bc.h
rename to src/spice2x/games/bc/bc.h
diff --git a/games/bc/io.cpp b/src/spice2x/games/bc/io.cpp
similarity index 100%
rename from games/bc/io.cpp
rename to src/spice2x/games/bc/io.cpp
diff --git a/games/bc/io.h b/src/spice2x/games/bc/io.h
similarity index 100%
rename from games/bc/io.h
rename to src/spice2x/games/bc/io.h
diff --git a/games/bc/node.h b/src/spice2x/games/bc/node.h
similarity index 100%
rename from games/bc/node.h
rename to src/spice2x/games/bc/node.h
diff --git a/games/bs/bs.cpp b/src/spice2x/games/bs/bs.cpp
similarity index 100%
rename from games/bs/bs.cpp
rename to src/spice2x/games/bs/bs.cpp
diff --git a/games/bs/bs.h b/src/spice2x/games/bs/bs.h
similarity index 100%
rename from games/bs/bs.h
rename to src/spice2x/games/bs/bs.h
diff --git a/games/bs/io.cpp b/src/spice2x/games/bs/io.cpp
similarity index 100%
rename from games/bs/io.cpp
rename to src/spice2x/games/bs/io.cpp
diff --git a/games/bs/io.h b/src/spice2x/games/bs/io.h
similarity index 100%
rename from games/bs/io.h
rename to src/spice2x/games/bs/io.h
diff --git a/games/ccj/bi2x_hook.cpp b/src/spice2x/games/ccj/bi2x_hook.cpp
similarity index 100%
rename from games/ccj/bi2x_hook.cpp
rename to src/spice2x/games/ccj/bi2x_hook.cpp
diff --git a/games/ccj/bi2x_hook.h b/src/spice2x/games/ccj/bi2x_hook.h
similarity index 100%
rename from games/ccj/bi2x_hook.h
rename to src/spice2x/games/ccj/bi2x_hook.h
diff --git a/games/ccj/ccj.cpp b/src/spice2x/games/ccj/ccj.cpp
similarity index 100%
rename from games/ccj/ccj.cpp
rename to src/spice2x/games/ccj/ccj.cpp
diff --git a/games/ccj/ccj.h b/src/spice2x/games/ccj/ccj.h
similarity index 100%
rename from games/ccj/ccj.h
rename to src/spice2x/games/ccj/ccj.h
diff --git a/games/ccj/io.cpp b/src/spice2x/games/ccj/io.cpp
similarity index 100%
rename from games/ccj/io.cpp
rename to src/spice2x/games/ccj/io.cpp
diff --git a/games/ccj/io.h b/src/spice2x/games/ccj/io.h
similarity index 100%
rename from games/ccj/io.h
rename to src/spice2x/games/ccj/io.h
diff --git a/games/ccj/trackball.cpp b/src/spice2x/games/ccj/trackball.cpp
similarity index 100%
rename from games/ccj/trackball.cpp
rename to src/spice2x/games/ccj/trackball.cpp
diff --git a/games/ccj/trackball.h b/src/spice2x/games/ccj/trackball.h
similarity index 100%
rename from games/ccj/trackball.h
rename to src/spice2x/games/ccj/trackball.h
diff --git a/games/ddr/ddr.cpp b/src/spice2x/games/ddr/ddr.cpp
similarity index 100%
rename from games/ddr/ddr.cpp
rename to src/spice2x/games/ddr/ddr.cpp
diff --git a/games/ddr/ddr.h b/src/spice2x/games/ddr/ddr.h
similarity index 100%
rename from games/ddr/ddr.h
rename to src/spice2x/games/ddr/ddr.h
diff --git a/games/ddr/io.cpp b/src/spice2x/games/ddr/io.cpp
similarity index 100%
rename from games/ddr/io.cpp
rename to src/spice2x/games/ddr/io.cpp
diff --git a/games/ddr/io.h b/src/spice2x/games/ddr/io.h
similarity index 100%
rename from games/ddr/io.h
rename to src/spice2x/games/ddr/io.h
diff --git a/games/ddr/p3io/foot.cpp b/src/spice2x/games/ddr/p3io/foot.cpp
similarity index 100%
rename from games/ddr/p3io/foot.cpp
rename to src/spice2x/games/ddr/p3io/foot.cpp
diff --git a/games/ddr/p3io/foot.h b/src/spice2x/games/ddr/p3io/foot.h
similarity index 100%
rename from games/ddr/p3io/foot.h
rename to src/spice2x/games/ddr/p3io/foot.h
diff --git a/games/ddr/p3io/p3io.cpp b/src/spice2x/games/ddr/p3io/p3io.cpp
similarity index 100%
rename from games/ddr/p3io/p3io.cpp
rename to src/spice2x/games/ddr/p3io/p3io.cpp
diff --git a/games/ddr/p3io/p3io.h b/src/spice2x/games/ddr/p3io/p3io.h
similarity index 100%
rename from games/ddr/p3io/p3io.h
rename to src/spice2x/games/ddr/p3io/p3io.h
diff --git a/games/ddr/p3io/sate.cpp b/src/spice2x/games/ddr/p3io/sate.cpp
similarity index 100%
rename from games/ddr/p3io/sate.cpp
rename to src/spice2x/games/ddr/p3io/sate.cpp
diff --git a/games/ddr/p3io/sate.h b/src/spice2x/games/ddr/p3io/sate.h
similarity index 100%
rename from games/ddr/p3io/sate.h
rename to src/spice2x/games/ddr/p3io/sate.h
diff --git a/games/ddr/p3io/usbmem.cpp b/src/spice2x/games/ddr/p3io/usbmem.cpp
similarity index 100%
rename from games/ddr/p3io/usbmem.cpp
rename to src/spice2x/games/ddr/p3io/usbmem.cpp
diff --git a/games/ddr/p3io/usbmem.h b/src/spice2x/games/ddr/p3io/usbmem.h
similarity index 100%
rename from games/ddr/p3io/usbmem.h
rename to src/spice2x/games/ddr/p3io/usbmem.h
diff --git a/games/ddr/p4io/p4io.cpp b/src/spice2x/games/ddr/p4io/p4io.cpp
similarity index 100%
rename from games/ddr/p4io/p4io.cpp
rename to src/spice2x/games/ddr/p4io/p4io.cpp
diff --git a/games/ddr/p4io/p4io.h b/src/spice2x/games/ddr/p4io/p4io.h
similarity index 100%
rename from games/ddr/p4io/p4io.h
rename to src/spice2x/games/ddr/p4io/p4io.h
diff --git a/games/dea/dea.cpp b/src/spice2x/games/dea/dea.cpp
similarity index 100%
rename from games/dea/dea.cpp
rename to src/spice2x/games/dea/dea.cpp
diff --git a/games/dea/dea.h b/src/spice2x/games/dea/dea.h
similarity index 100%
rename from games/dea/dea.h
rename to src/spice2x/games/dea/dea.h
diff --git a/games/dea/io.cpp b/src/spice2x/games/dea/io.cpp
similarity index 100%
rename from games/dea/io.cpp
rename to src/spice2x/games/dea/io.cpp
diff --git a/games/dea/io.h b/src/spice2x/games/dea/io.h
similarity index 100%
rename from games/dea/io.h
rename to src/spice2x/games/dea/io.h
diff --git a/games/drs/drs.cpp b/src/spice2x/games/drs/drs.cpp
similarity index 100%
rename from games/drs/drs.cpp
rename to src/spice2x/games/drs/drs.cpp
diff --git a/games/drs/drs.h b/src/spice2x/games/drs/drs.h
similarity index 100%
rename from games/drs/drs.h
rename to src/spice2x/games/drs/drs.h
diff --git a/games/drs/io.cpp b/src/spice2x/games/drs/io.cpp
similarity index 100%
rename from games/drs/io.cpp
rename to src/spice2x/games/drs/io.cpp
diff --git a/games/drs/io.h b/src/spice2x/games/drs/io.h
similarity index 100%
rename from games/drs/io.h
rename to src/spice2x/games/drs/io.h
diff --git a/games/drs/rgb_cam.cpp b/src/spice2x/games/drs/rgb_cam.cpp
similarity index 100%
rename from games/drs/rgb_cam.cpp
rename to src/spice2x/games/drs/rgb_cam.cpp
diff --git a/games/drs/rgb_cam.h b/src/spice2x/games/drs/rgb_cam.h
similarity index 100%
rename from games/drs/rgb_cam.h
rename to src/spice2x/games/drs/rgb_cam.h
diff --git a/games/ftt/ftt.cpp b/src/spice2x/games/ftt/ftt.cpp
similarity index 100%
rename from games/ftt/ftt.cpp
rename to src/spice2x/games/ftt/ftt.cpp
diff --git a/games/ftt/ftt.h b/src/spice2x/games/ftt/ftt.h
similarity index 100%
rename from games/ftt/ftt.h
rename to src/spice2x/games/ftt/ftt.h
diff --git a/games/ftt/io.cpp b/src/spice2x/games/ftt/io.cpp
similarity index 100%
rename from games/ftt/io.cpp
rename to src/spice2x/games/ftt/io.cpp
diff --git a/games/ftt/io.h b/src/spice2x/games/ftt/io.h
similarity index 100%
rename from games/ftt/io.h
rename to src/spice2x/games/ftt/io.h
diff --git a/games/ftt/nui.h b/src/spice2x/games/ftt/nui.h
similarity index 100%
rename from games/ftt/nui.h
rename to src/spice2x/games/ftt/nui.h
diff --git a/games/game.cpp b/src/spice2x/games/game.cpp
similarity index 100%
rename from games/game.cpp
rename to src/spice2x/games/game.cpp
diff --git a/games/game.h b/src/spice2x/games/game.h
similarity index 100%
rename from games/game.h
rename to src/spice2x/games/game.h
diff --git a/games/gitadora/bi2x_hook.cpp b/src/spice2x/games/gitadora/bi2x_hook.cpp
similarity index 100%
rename from games/gitadora/bi2x_hook.cpp
rename to src/spice2x/games/gitadora/bi2x_hook.cpp
diff --git a/games/gitadora/bi2x_hook.h b/src/spice2x/games/gitadora/bi2x_hook.h
similarity index 100%
rename from games/gitadora/bi2x_hook.h
rename to src/spice2x/games/gitadora/bi2x_hook.h
diff --git a/games/gitadora/device.h b/src/spice2x/games/gitadora/device.h
similarity index 100%
rename from games/gitadora/device.h
rename to src/spice2x/games/gitadora/device.h
diff --git a/games/gitadora/gitadora.cpp b/src/spice2x/games/gitadora/gitadora.cpp
similarity index 100%
rename from games/gitadora/gitadora.cpp
rename to src/spice2x/games/gitadora/gitadora.cpp
diff --git a/games/gitadora/gitadora.h b/src/spice2x/games/gitadora/gitadora.h
similarity index 100%
rename from games/gitadora/gitadora.h
rename to src/spice2x/games/gitadora/gitadora.h
diff --git a/games/gitadora/handle.cpp b/src/spice2x/games/gitadora/handle.cpp
similarity index 100%
rename from games/gitadora/handle.cpp
rename to src/spice2x/games/gitadora/handle.cpp
diff --git a/games/gitadora/handle.h b/src/spice2x/games/gitadora/handle.h
similarity index 100%
rename from games/gitadora/handle.h
rename to src/spice2x/games/gitadora/handle.h
diff --git a/games/gitadora/io.cpp b/src/spice2x/games/gitadora/io.cpp
similarity index 100%
rename from games/gitadora/io.cpp
rename to src/spice2x/games/gitadora/io.cpp
diff --git a/games/gitadora/io.h b/src/spice2x/games/gitadora/io.h
similarity index 100%
rename from games/gitadora/io.h
rename to src/spice2x/games/gitadora/io.h
diff --git a/games/gitadora/j32d.cpp b/src/spice2x/games/gitadora/j32d.cpp
similarity index 100%
rename from games/gitadora/j32d.cpp
rename to src/spice2x/games/gitadora/j32d.cpp
diff --git a/games/gitadora/j32d.h b/src/spice2x/games/gitadora/j32d.h
similarity index 100%
rename from games/gitadora/j32d.h
rename to src/spice2x/games/gitadora/j32d.h
diff --git a/games/gitadora/j33i.cpp b/src/spice2x/games/gitadora/j33i.cpp
similarity index 100%
rename from games/gitadora/j33i.cpp
rename to src/spice2x/games/gitadora/j33i.cpp
diff --git a/games/gitadora/j33i.h b/src/spice2x/games/gitadora/j33i.h
similarity index 100%
rename from games/gitadora/j33i.h
rename to src/spice2x/games/gitadora/j33i.h
diff --git a/games/hpm/hpm.cpp b/src/spice2x/games/hpm/hpm.cpp
similarity index 100%
rename from games/hpm/hpm.cpp
rename to src/spice2x/games/hpm/hpm.cpp
diff --git a/games/hpm/hpm.h b/src/spice2x/games/hpm/hpm.h
similarity index 100%
rename from games/hpm/hpm.h
rename to src/spice2x/games/hpm/hpm.h
diff --git a/games/hpm/io.cpp b/src/spice2x/games/hpm/io.cpp
similarity index 100%
rename from games/hpm/io.cpp
rename to src/spice2x/games/hpm/io.cpp
diff --git a/games/hpm/io.h b/src/spice2x/games/hpm/io.h
similarity index 100%
rename from games/hpm/io.h
rename to src/spice2x/games/hpm/io.h
diff --git a/games/iidx/bi2a.cpp b/src/spice2x/games/iidx/bi2a.cpp
similarity index 100%
rename from games/iidx/bi2a.cpp
rename to src/spice2x/games/iidx/bi2a.cpp
diff --git a/games/iidx/bi2a.h b/src/spice2x/games/iidx/bi2a.h
similarity index 100%
rename from games/iidx/bi2a.h
rename to src/spice2x/games/iidx/bi2a.h
diff --git a/games/iidx/bi2x.cpp b/src/spice2x/games/iidx/bi2x.cpp
similarity index 100%
rename from games/iidx/bi2x.cpp
rename to src/spice2x/games/iidx/bi2x.cpp
diff --git a/games/iidx/bi2x.h b/src/spice2x/games/iidx/bi2x.h
similarity index 100%
rename from games/iidx/bi2x.h
rename to src/spice2x/games/iidx/bi2x.h
diff --git a/games/iidx/bi2x_hook.cpp b/src/spice2x/games/iidx/bi2x_hook.cpp
similarity index 100%
rename from games/iidx/bi2x_hook.cpp
rename to src/spice2x/games/iidx/bi2x_hook.cpp
diff --git a/games/iidx/bi2x_hook.h b/src/spice2x/games/iidx/bi2x_hook.h
similarity index 100%
rename from games/iidx/bi2x_hook.h
rename to src/spice2x/games/iidx/bi2x_hook.h
diff --git a/games/iidx/camera.cpp b/src/spice2x/games/iidx/camera.cpp
similarity index 100%
rename from games/iidx/camera.cpp
rename to src/spice2x/games/iidx/camera.cpp
diff --git a/games/iidx/camera.h b/src/spice2x/games/iidx/camera.h
similarity index 100%
rename from games/iidx/camera.h
rename to src/spice2x/games/iidx/camera.h
diff --git a/games/iidx/ezusb.cpp b/src/spice2x/games/iidx/ezusb.cpp
similarity index 100%
rename from games/iidx/ezusb.cpp
rename to src/spice2x/games/iidx/ezusb.cpp
diff --git a/games/iidx/ezusb.h b/src/spice2x/games/iidx/ezusb.h
similarity index 100%
rename from games/iidx/ezusb.h
rename to src/spice2x/games/iidx/ezusb.h
diff --git a/games/iidx/iidx.cpp b/src/spice2x/games/iidx/iidx.cpp
similarity index 100%
rename from games/iidx/iidx.cpp
rename to src/spice2x/games/iidx/iidx.cpp
diff --git a/games/iidx/iidx.h b/src/spice2x/games/iidx/iidx.h
similarity index 100%
rename from games/iidx/iidx.h
rename to src/spice2x/games/iidx/iidx.h
diff --git a/games/iidx/io.cpp b/src/spice2x/games/iidx/io.cpp
similarity index 100%
rename from games/iidx/io.cpp
rename to src/spice2x/games/iidx/io.cpp
diff --git a/games/iidx/io.h b/src/spice2x/games/iidx/io.h
similarity index 100%
rename from games/iidx/io.h
rename to src/spice2x/games/iidx/io.h
diff --git a/games/iidx/legacy_camera.cpp b/src/spice2x/games/iidx/legacy_camera.cpp
similarity index 100%
rename from games/iidx/legacy_camera.cpp
rename to src/spice2x/games/iidx/legacy_camera.cpp
diff --git a/games/iidx/legacy_camera.h b/src/spice2x/games/iidx/legacy_camera.h
similarity index 100%
rename from games/iidx/legacy_camera.h
rename to src/spice2x/games/iidx/legacy_camera.h
diff --git a/games/iidx/local_camera.cpp b/src/spice2x/games/iidx/local_camera.cpp
similarity index 100%
rename from games/iidx/local_camera.cpp
rename to src/spice2x/games/iidx/local_camera.cpp
diff --git a/games/iidx/local_camera.h b/src/spice2x/games/iidx/local_camera.h
similarity index 100%
rename from games/iidx/local_camera.h
rename to src/spice2x/games/iidx/local_camera.h
diff --git a/games/iidx/mf_wrappers.cpp b/src/spice2x/games/iidx/mf_wrappers.cpp
similarity index 100%
rename from games/iidx/mf_wrappers.cpp
rename to src/spice2x/games/iidx/mf_wrappers.cpp
diff --git a/games/iidx/mf_wrappers.h b/src/spice2x/games/iidx/mf_wrappers.h
similarity index 100%
rename from games/iidx/mf_wrappers.h
rename to src/spice2x/games/iidx/mf_wrappers.h
diff --git a/games/iidx/poke.cpp b/src/spice2x/games/iidx/poke.cpp
similarity index 100%
rename from games/iidx/poke.cpp
rename to src/spice2x/games/iidx/poke.cpp
diff --git a/games/iidx/poke.h b/src/spice2x/games/iidx/poke.h
similarity index 100%
rename from games/iidx/poke.h
rename to src/spice2x/games/iidx/poke.h
diff --git a/games/io.cpp b/src/spice2x/games/io.cpp
similarity index 100%
rename from games/io.cpp
rename to src/spice2x/games/io.cpp
diff --git a/games/io.h b/src/spice2x/games/io.h
similarity index 100%
rename from games/io.h
rename to src/spice2x/games/io.h
diff --git a/games/jb/io.cpp b/src/spice2x/games/jb/io.cpp
similarity index 100%
rename from games/jb/io.cpp
rename to src/spice2x/games/jb/io.cpp
diff --git a/games/jb/io.h b/src/spice2x/games/jb/io.h
similarity index 100%
rename from games/jb/io.h
rename to src/spice2x/games/jb/io.h
diff --git a/games/jb/jb.cpp b/src/spice2x/games/jb/jb.cpp
similarity index 100%
rename from games/jb/jb.cpp
rename to src/spice2x/games/jb/jb.cpp
diff --git a/games/jb/jb.h b/src/spice2x/games/jb/jb.h
similarity index 100%
rename from games/jb/jb.h
rename to src/spice2x/games/jb/jb.h
diff --git a/games/loveplus/io.cpp b/src/spice2x/games/loveplus/io.cpp
similarity index 100%
rename from games/loveplus/io.cpp
rename to src/spice2x/games/loveplus/io.cpp
diff --git a/games/loveplus/io.h b/src/spice2x/games/loveplus/io.h
similarity index 100%
rename from games/loveplus/io.h
rename to src/spice2x/games/loveplus/io.h
diff --git a/games/loveplus/loveplus.cpp b/src/spice2x/games/loveplus/loveplus.cpp
similarity index 100%
rename from games/loveplus/loveplus.cpp
rename to src/spice2x/games/loveplus/loveplus.cpp
diff --git a/games/loveplus/loveplus.h b/src/spice2x/games/loveplus/loveplus.h
similarity index 100%
rename from games/loveplus/loveplus.h
rename to src/spice2x/games/loveplus/loveplus.h
diff --git a/games/mfc/io.cpp b/src/spice2x/games/mfc/io.cpp
similarity index 100%
rename from games/mfc/io.cpp
rename to src/spice2x/games/mfc/io.cpp
diff --git a/games/mfc/io.h b/src/spice2x/games/mfc/io.h
similarity index 100%
rename from games/mfc/io.h
rename to src/spice2x/games/mfc/io.h
diff --git a/games/mfc/mfc.cpp b/src/spice2x/games/mfc/mfc.cpp
similarity index 100%
rename from games/mfc/mfc.cpp
rename to src/spice2x/games/mfc/mfc.cpp
diff --git a/games/mfc/mfc.h b/src/spice2x/games/mfc/mfc.h
similarity index 100%
rename from games/mfc/mfc.h
rename to src/spice2x/games/mfc/mfc.h
diff --git a/games/mfg/bi2a_hook.cpp b/src/spice2x/games/mfg/bi2a_hook.cpp
similarity index 100%
rename from games/mfg/bi2a_hook.cpp
rename to src/spice2x/games/mfg/bi2a_hook.cpp
diff --git a/games/mfg/bi2a_hook.h b/src/spice2x/games/mfg/bi2a_hook.h
similarity index 100%
rename from games/mfg/bi2a_hook.h
rename to src/spice2x/games/mfg/bi2a_hook.h
diff --git a/games/mfg/io.cpp b/src/spice2x/games/mfg/io.cpp
similarity index 100%
rename from games/mfg/io.cpp
rename to src/spice2x/games/mfg/io.cpp
diff --git a/games/mfg/io.h b/src/spice2x/games/mfg/io.h
similarity index 100%
rename from games/mfg/io.h
rename to src/spice2x/games/mfg/io.h
diff --git a/games/mfg/mfg.cpp b/src/spice2x/games/mfg/mfg.cpp
similarity index 100%
rename from games/mfg/mfg.cpp
rename to src/spice2x/games/mfg/mfg.cpp
diff --git a/games/mfg/mfg.h b/src/spice2x/games/mfg/mfg.h
similarity index 100%
rename from games/mfg/mfg.h
rename to src/spice2x/games/mfg/mfg.h
diff --git a/games/mga/gunio.cpp b/src/spice2x/games/mga/gunio.cpp
similarity index 100%
rename from games/mga/gunio.cpp
rename to src/spice2x/games/mga/gunio.cpp
diff --git a/games/mga/gunio.h b/src/spice2x/games/mga/gunio.h
similarity index 100%
rename from games/mga/gunio.h
rename to src/spice2x/games/mga/gunio.h
diff --git a/games/mga/io.cpp b/src/spice2x/games/mga/io.cpp
similarity index 100%
rename from games/mga/io.cpp
rename to src/spice2x/games/mga/io.cpp
diff --git a/games/mga/io.h b/src/spice2x/games/mga/io.h
similarity index 100%
rename from games/mga/io.h
rename to src/spice2x/games/mga/io.h
diff --git a/games/mga/mga.cpp b/src/spice2x/games/mga/mga.cpp
similarity index 100%
rename from games/mga/mga.cpp
rename to src/spice2x/games/mga/mga.cpp
diff --git a/games/mga/mga.h b/src/spice2x/games/mga/mga.h
similarity index 100%
rename from games/mga/mga.h
rename to src/spice2x/games/mga/mga.h
diff --git a/games/museca/io.cpp b/src/spice2x/games/museca/io.cpp
similarity index 100%
rename from games/museca/io.cpp
rename to src/spice2x/games/museca/io.cpp
diff --git a/games/museca/io.h b/src/spice2x/games/museca/io.h
similarity index 100%
rename from games/museca/io.h
rename to src/spice2x/games/museca/io.h
diff --git a/games/museca/museca.cpp b/src/spice2x/games/museca/museca.cpp
similarity index 100%
rename from games/museca/museca.cpp
rename to src/spice2x/games/museca/museca.cpp
diff --git a/games/museca/museca.h b/src/spice2x/games/museca/museca.h
similarity index 100%
rename from games/museca/museca.h
rename to src/spice2x/games/museca/museca.h
diff --git a/games/nost/io.cpp b/src/spice2x/games/nost/io.cpp
similarity index 100%
rename from games/nost/io.cpp
rename to src/spice2x/games/nost/io.cpp
diff --git a/games/nost/io.h b/src/spice2x/games/nost/io.h
similarity index 100%
rename from games/nost/io.h
rename to src/spice2x/games/nost/io.h
diff --git a/games/nost/nost.cpp b/src/spice2x/games/nost/nost.cpp
similarity index 100%
rename from games/nost/nost.cpp
rename to src/spice2x/games/nost/nost.cpp
diff --git a/games/nost/nost.h b/src/spice2x/games/nost/nost.h
similarity index 100%
rename from games/nost/nost.h
rename to src/spice2x/games/nost/nost.h
diff --git a/games/nost/poke.cpp b/src/spice2x/games/nost/poke.cpp
similarity index 100%
rename from games/nost/poke.cpp
rename to src/spice2x/games/nost/poke.cpp
diff --git a/games/nost/poke.h b/src/spice2x/games/nost/poke.h
similarity index 100%
rename from games/nost/poke.h
rename to src/spice2x/games/nost/poke.h
diff --git a/games/onpara/io.cpp b/src/spice2x/games/onpara/io.cpp
similarity index 100%
rename from games/onpara/io.cpp
rename to src/spice2x/games/onpara/io.cpp
diff --git a/games/onpara/io.h b/src/spice2x/games/onpara/io.h
similarity index 100%
rename from games/onpara/io.h
rename to src/spice2x/games/onpara/io.h
diff --git a/games/onpara/onpara.cpp b/src/spice2x/games/onpara/onpara.cpp
similarity index 100%
rename from games/onpara/onpara.cpp
rename to src/spice2x/games/onpara/onpara.cpp
diff --git a/games/onpara/onpara.h b/src/spice2x/games/onpara/onpara.h
similarity index 100%
rename from games/onpara/onpara.h
rename to src/spice2x/games/onpara/onpara.h
diff --git a/games/onpara/touchpanel.cpp b/src/spice2x/games/onpara/touchpanel.cpp
similarity index 100%
rename from games/onpara/touchpanel.cpp
rename to src/spice2x/games/onpara/touchpanel.cpp
diff --git a/games/onpara/touchpanel.h b/src/spice2x/games/onpara/touchpanel.h
similarity index 100%
rename from games/onpara/touchpanel.h
rename to src/spice2x/games/onpara/touchpanel.h
diff --git a/games/onpara/westboard.cpp b/src/spice2x/games/onpara/westboard.cpp
similarity index 100%
rename from games/onpara/westboard.cpp
rename to src/spice2x/games/onpara/westboard.cpp
diff --git a/games/onpara/westboard.h b/src/spice2x/games/onpara/westboard.h
similarity index 100%
rename from games/onpara/westboard.h
rename to src/spice2x/games/onpara/westboard.h
diff --git a/games/otoca/io.cpp b/src/spice2x/games/otoca/io.cpp
similarity index 100%
rename from games/otoca/io.cpp
rename to src/spice2x/games/otoca/io.cpp
diff --git a/games/otoca/io.h b/src/spice2x/games/otoca/io.h
similarity index 100%
rename from games/otoca/io.h
rename to src/spice2x/games/otoca/io.h
diff --git a/games/otoca/otoca.cpp b/src/spice2x/games/otoca/otoca.cpp
similarity index 100%
rename from games/otoca/otoca.cpp
rename to src/spice2x/games/otoca/otoca.cpp
diff --git a/games/otoca/otoca.h b/src/spice2x/games/otoca/otoca.h
similarity index 100%
rename from games/otoca/otoca.h
rename to src/spice2x/games/otoca/otoca.h
diff --git a/games/otoca/p4io.cpp b/src/spice2x/games/otoca/p4io.cpp
similarity index 100%
rename from games/otoca/p4io.cpp
rename to src/spice2x/games/otoca/p4io.cpp
diff --git a/games/otoca/p4io.h b/src/spice2x/games/otoca/p4io.h
similarity index 100%
rename from games/otoca/p4io.h
rename to src/spice2x/games/otoca/p4io.h
diff --git a/games/pc/bi2x_hook.cpp b/src/spice2x/games/pc/bi2x_hook.cpp
similarity index 100%
rename from games/pc/bi2x_hook.cpp
rename to src/spice2x/games/pc/bi2x_hook.cpp
diff --git a/games/pc/bi2x_hook.h b/src/spice2x/games/pc/bi2x_hook.h
similarity index 100%
rename from games/pc/bi2x_hook.h
rename to src/spice2x/games/pc/bi2x_hook.h
diff --git a/games/pc/io.cpp b/src/spice2x/games/pc/io.cpp
similarity index 100%
rename from games/pc/io.cpp
rename to src/spice2x/games/pc/io.cpp
diff --git a/games/pc/io.h b/src/spice2x/games/pc/io.h
similarity index 100%
rename from games/pc/io.h
rename to src/spice2x/games/pc/io.h
diff --git a/games/pc/pc.cpp b/src/spice2x/games/pc/pc.cpp
similarity index 100%
rename from games/pc/pc.cpp
rename to src/spice2x/games/pc/pc.cpp
diff --git a/games/pc/pc.h b/src/spice2x/games/pc/pc.h
similarity index 100%
rename from games/pc/pc.h
rename to src/spice2x/games/pc/pc.h
diff --git a/games/pcm/io.cpp b/src/spice2x/games/pcm/io.cpp
similarity index 100%
rename from games/pcm/io.cpp
rename to src/spice2x/games/pcm/io.cpp
diff --git a/games/pcm/io.h b/src/spice2x/games/pcm/io.h
similarity index 100%
rename from games/pcm/io.h
rename to src/spice2x/games/pcm/io.h
diff --git a/games/pcm/pcm.cpp b/src/spice2x/games/pcm/pcm.cpp
similarity index 100%
rename from games/pcm/pcm.cpp
rename to src/spice2x/games/pcm/pcm.cpp
diff --git a/games/pcm/pcm.h b/src/spice2x/games/pcm/pcm.h
similarity index 100%
rename from games/pcm/pcm.h
rename to src/spice2x/games/pcm/pcm.h
diff --git a/games/popn/io.cpp b/src/spice2x/games/popn/io.cpp
similarity index 100%
rename from games/popn/io.cpp
rename to src/spice2x/games/popn/io.cpp
diff --git a/games/popn/io.h b/src/spice2x/games/popn/io.h
similarity index 100%
rename from games/popn/io.h
rename to src/spice2x/games/popn/io.h
diff --git a/games/popn/popn.cpp b/src/spice2x/games/popn/popn.cpp
similarity index 100%
rename from games/popn/popn.cpp
rename to src/spice2x/games/popn/popn.cpp
diff --git a/games/popn/popn.h b/src/spice2x/games/popn/popn.h
similarity index 100%
rename from games/popn/popn.h
rename to src/spice2x/games/popn/popn.h
diff --git a/games/qks/bi2x_hook.cpp b/src/spice2x/games/qks/bi2x_hook.cpp
similarity index 100%
rename from games/qks/bi2x_hook.cpp
rename to src/spice2x/games/qks/bi2x_hook.cpp
diff --git a/games/qks/bi2x_hook.h b/src/spice2x/games/qks/bi2x_hook.h
similarity index 100%
rename from games/qks/bi2x_hook.h
rename to src/spice2x/games/qks/bi2x_hook.h
diff --git a/games/qks/io.cpp b/src/spice2x/games/qks/io.cpp
similarity index 100%
rename from games/qks/io.cpp
rename to src/spice2x/games/qks/io.cpp
diff --git a/games/qks/io.h b/src/spice2x/games/qks/io.h
similarity index 100%
rename from games/qks/io.h
rename to src/spice2x/games/qks/io.h
diff --git a/games/qks/qks.cpp b/src/spice2x/games/qks/qks.cpp
similarity index 100%
rename from games/qks/qks.cpp
rename to src/spice2x/games/qks/qks.cpp
diff --git a/games/qks/qks.h b/src/spice2x/games/qks/qks.h
similarity index 100%
rename from games/qks/qks.h
rename to src/spice2x/games/qks/qks.h
diff --git a/games/qma/ezusb.cpp b/src/spice2x/games/qma/ezusb.cpp
similarity index 100%
rename from games/qma/ezusb.cpp
rename to src/spice2x/games/qma/ezusb.cpp
diff --git a/games/qma/ezusb.h b/src/spice2x/games/qma/ezusb.h
similarity index 100%
rename from games/qma/ezusb.h
rename to src/spice2x/games/qma/ezusb.h
diff --git a/games/qma/io.cpp b/src/spice2x/games/qma/io.cpp
similarity index 100%
rename from games/qma/io.cpp
rename to src/spice2x/games/qma/io.cpp
diff --git a/games/qma/io.h b/src/spice2x/games/qma/io.h
similarity index 100%
rename from games/qma/io.h
rename to src/spice2x/games/qma/io.h
diff --git a/games/qma/qma.cpp b/src/spice2x/games/qma/qma.cpp
similarity index 100%
rename from games/qma/qma.cpp
rename to src/spice2x/games/qma/qma.cpp
diff --git a/games/qma/qma.h b/src/spice2x/games/qma/qma.h
similarity index 100%
rename from games/qma/qma.h
rename to src/spice2x/games/qma/qma.h
diff --git a/games/rb/io.cpp b/src/spice2x/games/rb/io.cpp
similarity index 100%
rename from games/rb/io.cpp
rename to src/spice2x/games/rb/io.cpp
diff --git a/games/rb/io.h b/src/spice2x/games/rb/io.h
similarity index 100%
rename from games/rb/io.h
rename to src/spice2x/games/rb/io.h
diff --git a/games/rb/rb.cpp b/src/spice2x/games/rb/rb.cpp
similarity index 100%
rename from games/rb/rb.cpp
rename to src/spice2x/games/rb/rb.cpp
diff --git a/games/rb/rb.h b/src/spice2x/games/rb/rb.h
similarity index 100%
rename from games/rb/rb.h
rename to src/spice2x/games/rb/rb.h
diff --git a/games/rb/touch.cpp b/src/spice2x/games/rb/touch.cpp
similarity index 100%
rename from games/rb/touch.cpp
rename to src/spice2x/games/rb/touch.cpp
diff --git a/games/rb/touch.h b/src/spice2x/games/rb/touch.h
similarity index 100%
rename from games/rb/touch.h
rename to src/spice2x/games/rb/touch.h
diff --git a/games/rf3d/io.cpp b/src/spice2x/games/rf3d/io.cpp
similarity index 100%
rename from games/rf3d/io.cpp
rename to src/spice2x/games/rf3d/io.cpp
diff --git a/games/rf3d/io.h b/src/spice2x/games/rf3d/io.h
similarity index 100%
rename from games/rf3d/io.h
rename to src/spice2x/games/rf3d/io.h
diff --git a/games/rf3d/rf3d.cpp b/src/spice2x/games/rf3d/rf3d.cpp
similarity index 100%
rename from games/rf3d/rf3d.cpp
rename to src/spice2x/games/rf3d/rf3d.cpp
diff --git a/games/rf3d/rf3d.h b/src/spice2x/games/rf3d/rf3d.h
similarity index 100%
rename from games/rf3d/rf3d.h
rename to src/spice2x/games/rf3d/rf3d.h
diff --git a/games/sc/io.cpp b/src/spice2x/games/sc/io.cpp
similarity index 100%
rename from games/sc/io.cpp
rename to src/spice2x/games/sc/io.cpp
diff --git a/games/sc/io.h b/src/spice2x/games/sc/io.h
similarity index 100%
rename from games/sc/io.h
rename to src/spice2x/games/sc/io.h
diff --git a/games/sc/sc.cpp b/src/spice2x/games/sc/sc.cpp
similarity index 100%
rename from games/sc/sc.cpp
rename to src/spice2x/games/sc/sc.cpp
diff --git a/games/sc/sc.h b/src/spice2x/games/sc/sc.h
similarity index 100%
rename from games/sc/sc.h
rename to src/spice2x/games/sc/sc.h
diff --git a/games/scotto/io.cpp b/src/spice2x/games/scotto/io.cpp
similarity index 100%
rename from games/scotto/io.cpp
rename to src/spice2x/games/scotto/io.cpp
diff --git a/games/scotto/io.h b/src/spice2x/games/scotto/io.h
similarity index 100%
rename from games/scotto/io.h
rename to src/spice2x/games/scotto/io.h
diff --git a/games/scotto/scotto.cpp b/src/spice2x/games/scotto/scotto.cpp
similarity index 100%
rename from games/scotto/scotto.cpp
rename to src/spice2x/games/scotto/scotto.cpp
diff --git a/games/scotto/scotto.h b/src/spice2x/games/scotto/scotto.h
similarity index 100%
rename from games/scotto/scotto.h
rename to src/spice2x/games/scotto/scotto.h
diff --git a/games/sdvx/bi2x_hook.cpp b/src/spice2x/games/sdvx/bi2x_hook.cpp
similarity index 100%
rename from games/sdvx/bi2x_hook.cpp
rename to src/spice2x/games/sdvx/bi2x_hook.cpp
diff --git a/games/sdvx/bi2x_hook.h b/src/spice2x/games/sdvx/bi2x_hook.h
similarity index 100%
rename from games/sdvx/bi2x_hook.h
rename to src/spice2x/games/sdvx/bi2x_hook.h
diff --git a/games/sdvx/camera.cpp b/src/spice2x/games/sdvx/camera.cpp
similarity index 100%
rename from games/sdvx/camera.cpp
rename to src/spice2x/games/sdvx/camera.cpp
diff --git a/games/sdvx/camera.h b/src/spice2x/games/sdvx/camera.h
similarity index 100%
rename from games/sdvx/camera.h
rename to src/spice2x/games/sdvx/camera.h
diff --git a/games/sdvx/io.cpp b/src/spice2x/games/sdvx/io.cpp
similarity index 100%
rename from games/sdvx/io.cpp
rename to src/spice2x/games/sdvx/io.cpp
diff --git a/games/sdvx/io.h b/src/spice2x/games/sdvx/io.h
similarity index 100%
rename from games/sdvx/io.h
rename to src/spice2x/games/sdvx/io.h
diff --git a/games/sdvx/sdvx.cpp b/src/spice2x/games/sdvx/sdvx.cpp
similarity index 100%
rename from games/sdvx/sdvx.cpp
rename to src/spice2x/games/sdvx/sdvx.cpp
diff --git a/games/sdvx/sdvx.h b/src/spice2x/games/sdvx/sdvx.h
similarity index 100%
rename from games/sdvx/sdvx.h
rename to src/spice2x/games/sdvx/sdvx.h
diff --git a/games/shared/lcdhandle.cpp b/src/spice2x/games/shared/lcdhandle.cpp
similarity index 100%
rename from games/shared/lcdhandle.cpp
rename to src/spice2x/games/shared/lcdhandle.cpp
diff --git a/games/shared/lcdhandle.h b/src/spice2x/games/shared/lcdhandle.h
similarity index 100%
rename from games/shared/lcdhandle.h
rename to src/spice2x/games/shared/lcdhandle.h
diff --git a/games/shared/printer.cpp b/src/spice2x/games/shared/printer.cpp
similarity index 100%
rename from games/shared/printer.cpp
rename to src/spice2x/games/shared/printer.cpp
diff --git a/games/shared/printer.h b/src/spice2x/games/shared/printer.h
similarity index 100%
rename from games/shared/printer.h
rename to src/spice2x/games/shared/printer.h
diff --git a/games/shared/twtouch.cpp b/src/spice2x/games/shared/twtouch.cpp
similarity index 100%
rename from games/shared/twtouch.cpp
rename to src/spice2x/games/shared/twtouch.cpp
diff --git a/games/shared/twtouch.h b/src/spice2x/games/shared/twtouch.h
similarity index 100%
rename from games/shared/twtouch.h
rename to src/spice2x/games/shared/twtouch.h
diff --git a/games/shogikai/io.cpp b/src/spice2x/games/shogikai/io.cpp
similarity index 100%
rename from games/shogikai/io.cpp
rename to src/spice2x/games/shogikai/io.cpp
diff --git a/games/shogikai/io.h b/src/spice2x/games/shogikai/io.h
similarity index 100%
rename from games/shogikai/io.h
rename to src/spice2x/games/shogikai/io.h
diff --git a/games/shogikai/shogikai.cpp b/src/spice2x/games/shogikai/shogikai.cpp
similarity index 100%
rename from games/shogikai/shogikai.cpp
rename to src/spice2x/games/shogikai/shogikai.cpp
diff --git a/games/shogikai/shogikai.h b/src/spice2x/games/shogikai/shogikai.h
similarity index 100%
rename from games/shogikai/shogikai.h
rename to src/spice2x/games/shogikai/shogikai.h
diff --git a/games/silentscope/io.cpp b/src/spice2x/games/silentscope/io.cpp
similarity index 100%
rename from games/silentscope/io.cpp
rename to src/spice2x/games/silentscope/io.cpp
diff --git a/games/silentscope/io.h b/src/spice2x/games/silentscope/io.h
similarity index 100%
rename from games/silentscope/io.h
rename to src/spice2x/games/silentscope/io.h
diff --git a/games/silentscope/silentscope.cpp b/src/spice2x/games/silentscope/silentscope.cpp
similarity index 100%
rename from games/silentscope/silentscope.cpp
rename to src/spice2x/games/silentscope/silentscope.cpp
diff --git a/games/silentscope/silentscope.h b/src/spice2x/games/silentscope/silentscope.h
similarity index 100%
rename from games/silentscope/silentscope.h
rename to src/spice2x/games/silentscope/silentscope.h
diff --git a/games/we/io.cpp b/src/spice2x/games/we/io.cpp
similarity index 100%
rename from games/we/io.cpp
rename to src/spice2x/games/we/io.cpp
diff --git a/games/we/io.h b/src/spice2x/games/we/io.h
similarity index 100%
rename from games/we/io.h
rename to src/spice2x/games/we/io.h
diff --git a/games/we/touchpanel.cpp b/src/spice2x/games/we/touchpanel.cpp
similarity index 100%
rename from games/we/touchpanel.cpp
rename to src/spice2x/games/we/touchpanel.cpp
diff --git a/games/we/touchpanel.h b/src/spice2x/games/we/touchpanel.h
similarity index 100%
rename from games/we/touchpanel.h
rename to src/spice2x/games/we/touchpanel.h
diff --git a/games/we/we.cpp b/src/spice2x/games/we/we.cpp
similarity index 100%
rename from games/we/we.cpp
rename to src/spice2x/games/we/we.cpp
diff --git a/games/we/we.h b/src/spice2x/games/we/we.h
similarity index 100%
rename from games/we/we.h
rename to src/spice2x/games/we/we.h
diff --git a/hooks/audio/acm.cpp b/src/spice2x/hooks/audio/acm.cpp
similarity index 100%
rename from hooks/audio/acm.cpp
rename to src/spice2x/hooks/audio/acm.cpp
diff --git a/hooks/audio/acm.h b/src/spice2x/hooks/audio/acm.h
similarity index 100%
rename from hooks/audio/acm.h
rename to src/spice2x/hooks/audio/acm.h
diff --git a/hooks/audio/audio.cpp b/src/spice2x/hooks/audio/audio.cpp
similarity index 100%
rename from hooks/audio/audio.cpp
rename to src/spice2x/hooks/audio/audio.cpp
diff --git a/hooks/audio/audio.h b/src/spice2x/hooks/audio/audio.h
similarity index 100%
rename from hooks/audio/audio.h
rename to src/spice2x/hooks/audio/audio.h
diff --git a/hooks/audio/audio_private.h b/src/spice2x/hooks/audio/audio_private.h
similarity index 100%
rename from hooks/audio/audio_private.h
rename to src/spice2x/hooks/audio/audio_private.h
diff --git a/hooks/audio/backends/dsound/dsound_backend.cpp b/src/spice2x/hooks/audio/backends/dsound/dsound_backend.cpp
similarity index 100%
rename from hooks/audio/backends/dsound/dsound_backend.cpp
rename to src/spice2x/hooks/audio/backends/dsound/dsound_backend.cpp
diff --git a/hooks/audio/backends/dsound/dsound_backend.h b/src/spice2x/hooks/audio/backends/dsound/dsound_backend.h
similarity index 100%
rename from hooks/audio/backends/dsound/dsound_backend.h
rename to src/spice2x/hooks/audio/backends/dsound/dsound_backend.h
diff --git a/hooks/audio/backends/mmdevice/audio_endpoint_volume.cpp b/src/spice2x/hooks/audio/backends/mmdevice/audio_endpoint_volume.cpp
similarity index 100%
rename from hooks/audio/backends/mmdevice/audio_endpoint_volume.cpp
rename to src/spice2x/hooks/audio/backends/mmdevice/audio_endpoint_volume.cpp
diff --git a/hooks/audio/backends/mmdevice/audio_endpoint_volume.h b/src/spice2x/hooks/audio/backends/mmdevice/audio_endpoint_volume.h
similarity index 100%
rename from hooks/audio/backends/mmdevice/audio_endpoint_volume.h
rename to src/spice2x/hooks/audio/backends/mmdevice/audio_endpoint_volume.h
diff --git a/hooks/audio/backends/mmdevice/device.cpp b/src/spice2x/hooks/audio/backends/mmdevice/device.cpp
similarity index 100%
rename from hooks/audio/backends/mmdevice/device.cpp
rename to src/spice2x/hooks/audio/backends/mmdevice/device.cpp
diff --git a/hooks/audio/backends/mmdevice/device.h b/src/spice2x/hooks/audio/backends/mmdevice/device.h
similarity index 100%
rename from hooks/audio/backends/mmdevice/device.h
rename to src/spice2x/hooks/audio/backends/mmdevice/device.h
diff --git a/hooks/audio/backends/mmdevice/device_collection.cpp b/src/spice2x/hooks/audio/backends/mmdevice/device_collection.cpp
similarity index 100%
rename from hooks/audio/backends/mmdevice/device_collection.cpp
rename to src/spice2x/hooks/audio/backends/mmdevice/device_collection.cpp
diff --git a/hooks/audio/backends/mmdevice/device_collection.h b/src/spice2x/hooks/audio/backends/mmdevice/device_collection.h
similarity index 100%
rename from hooks/audio/backends/mmdevice/device_collection.h
rename to src/spice2x/hooks/audio/backends/mmdevice/device_collection.h
diff --git a/hooks/audio/backends/mmdevice/device_enumerator.cpp b/src/spice2x/hooks/audio/backends/mmdevice/device_enumerator.cpp
similarity index 100%
rename from hooks/audio/backends/mmdevice/device_enumerator.cpp
rename to src/spice2x/hooks/audio/backends/mmdevice/device_enumerator.cpp
diff --git a/hooks/audio/backends/mmdevice/device_enumerator.h b/src/spice2x/hooks/audio/backends/mmdevice/device_enumerator.h
similarity index 100%
rename from hooks/audio/backends/mmdevice/device_enumerator.h
rename to src/spice2x/hooks/audio/backends/mmdevice/device_enumerator.h
diff --git a/hooks/audio/backends/wasapi/audio_client.cpp b/src/spice2x/hooks/audio/backends/wasapi/audio_client.cpp
similarity index 100%
rename from hooks/audio/backends/wasapi/audio_client.cpp
rename to src/spice2x/hooks/audio/backends/wasapi/audio_client.cpp
diff --git a/hooks/audio/backends/wasapi/audio_client.h b/src/spice2x/hooks/audio/backends/wasapi/audio_client.h
similarity index 100%
rename from hooks/audio/backends/wasapi/audio_client.h
rename to src/spice2x/hooks/audio/backends/wasapi/audio_client.h
diff --git a/hooks/audio/backends/wasapi/audio_render_client.cpp b/src/spice2x/hooks/audio/backends/wasapi/audio_render_client.cpp
similarity index 100%
rename from hooks/audio/backends/wasapi/audio_render_client.cpp
rename to src/spice2x/hooks/audio/backends/wasapi/audio_render_client.cpp
diff --git a/hooks/audio/backends/wasapi/audio_render_client.h b/src/spice2x/hooks/audio/backends/wasapi/audio_render_client.h
similarity index 100%
rename from hooks/audio/backends/wasapi/audio_render_client.h
rename to src/spice2x/hooks/audio/backends/wasapi/audio_render_client.h
diff --git a/hooks/audio/backends/wasapi/defs.h b/src/spice2x/hooks/audio/backends/wasapi/defs.h
similarity index 100%
rename from hooks/audio/backends/wasapi/defs.h
rename to src/spice2x/hooks/audio/backends/wasapi/defs.h
diff --git a/hooks/audio/backends/wasapi/dummy_audio_client.cpp b/src/spice2x/hooks/audio/backends/wasapi/dummy_audio_client.cpp
similarity index 100%
rename from hooks/audio/backends/wasapi/dummy_audio_client.cpp
rename to src/spice2x/hooks/audio/backends/wasapi/dummy_audio_client.cpp
diff --git a/hooks/audio/backends/wasapi/dummy_audio_client.h b/src/spice2x/hooks/audio/backends/wasapi/dummy_audio_client.h
similarity index 100%
rename from hooks/audio/backends/wasapi/dummy_audio_client.h
rename to src/spice2x/hooks/audio/backends/wasapi/dummy_audio_client.h
diff --git a/hooks/audio/backends/wasapi/dummy_audio_clock.cpp b/src/spice2x/hooks/audio/backends/wasapi/dummy_audio_clock.cpp
similarity index 100%
rename from hooks/audio/backends/wasapi/dummy_audio_clock.cpp
rename to src/spice2x/hooks/audio/backends/wasapi/dummy_audio_clock.cpp
diff --git a/hooks/audio/backends/wasapi/dummy_audio_clock.h b/src/spice2x/hooks/audio/backends/wasapi/dummy_audio_clock.h
similarity index 100%
rename from hooks/audio/backends/wasapi/dummy_audio_clock.h
rename to src/spice2x/hooks/audio/backends/wasapi/dummy_audio_clock.h
diff --git a/hooks/audio/backends/wasapi/dummy_audio_render_client.cpp b/src/spice2x/hooks/audio/backends/wasapi/dummy_audio_render_client.cpp
similarity index 100%
rename from hooks/audio/backends/wasapi/dummy_audio_render_client.cpp
rename to src/spice2x/hooks/audio/backends/wasapi/dummy_audio_render_client.cpp
diff --git a/hooks/audio/backends/wasapi/dummy_audio_render_client.h b/src/spice2x/hooks/audio/backends/wasapi/dummy_audio_render_client.h
similarity index 100%
rename from hooks/audio/backends/wasapi/dummy_audio_render_client.h
rename to src/spice2x/hooks/audio/backends/wasapi/dummy_audio_render_client.h
diff --git a/hooks/audio/backends/wasapi/dummy_audio_session_control.cpp b/src/spice2x/hooks/audio/backends/wasapi/dummy_audio_session_control.cpp
similarity index 100%
rename from hooks/audio/backends/wasapi/dummy_audio_session_control.cpp
rename to src/spice2x/hooks/audio/backends/wasapi/dummy_audio_session_control.cpp
diff --git a/hooks/audio/backends/wasapi/dummy_audio_session_control.h b/src/spice2x/hooks/audio/backends/wasapi/dummy_audio_session_control.h
similarity index 100%
rename from hooks/audio/backends/wasapi/dummy_audio_session_control.h
rename to src/spice2x/hooks/audio/backends/wasapi/dummy_audio_session_control.h
diff --git a/hooks/audio/backends/wasapi/low_latency_client.cpp b/src/spice2x/hooks/audio/backends/wasapi/low_latency_client.cpp
similarity index 100%
rename from hooks/audio/backends/wasapi/low_latency_client.cpp
rename to src/spice2x/hooks/audio/backends/wasapi/low_latency_client.cpp
diff --git a/hooks/audio/backends/wasapi/low_latency_client.h b/src/spice2x/hooks/audio/backends/wasapi/low_latency_client.h
similarity index 100%
rename from hooks/audio/backends/wasapi/low_latency_client.h
rename to src/spice2x/hooks/audio/backends/wasapi/low_latency_client.h
diff --git a/hooks/audio/backends/wasapi/util.cpp b/src/spice2x/hooks/audio/backends/wasapi/util.cpp
similarity index 100%
rename from hooks/audio/backends/wasapi/util.cpp
rename to src/spice2x/hooks/audio/backends/wasapi/util.cpp
diff --git a/hooks/audio/backends/wasapi/util.h b/src/spice2x/hooks/audio/backends/wasapi/util.h
similarity index 100%
rename from hooks/audio/backends/wasapi/util.h
rename to src/spice2x/hooks/audio/backends/wasapi/util.h
diff --git a/hooks/audio/backends/wasapi/wasapi_private.h b/src/spice2x/hooks/audio/backends/wasapi/wasapi_private.h
similarity index 100%
rename from hooks/audio/backends/wasapi/wasapi_private.h
rename to src/spice2x/hooks/audio/backends/wasapi/wasapi_private.h
diff --git a/hooks/audio/buffer.cpp b/src/spice2x/hooks/audio/buffer.cpp
similarity index 100%
rename from hooks/audio/buffer.cpp
rename to src/spice2x/hooks/audio/buffer.cpp
diff --git a/hooks/audio/buffer.h b/src/spice2x/hooks/audio/buffer.h
similarity index 100%
rename from hooks/audio/buffer.h
rename to src/spice2x/hooks/audio/buffer.h
diff --git a/hooks/audio/implementations/asio.cpp b/src/spice2x/hooks/audio/implementations/asio.cpp
similarity index 100%
rename from hooks/audio/implementations/asio.cpp
rename to src/spice2x/hooks/audio/implementations/asio.cpp
diff --git a/hooks/audio/implementations/asio.h b/src/spice2x/hooks/audio/implementations/asio.h
similarity index 100%
rename from hooks/audio/implementations/asio.h
rename to src/spice2x/hooks/audio/implementations/asio.h
diff --git a/hooks/audio/implementations/backend.h b/src/spice2x/hooks/audio/implementations/backend.h
similarity index 100%
rename from hooks/audio/implementations/backend.h
rename to src/spice2x/hooks/audio/implementations/backend.h
diff --git a/hooks/audio/implementations/none.cpp b/src/spice2x/hooks/audio/implementations/none.cpp
similarity index 100%
rename from hooks/audio/implementations/none.cpp
rename to src/spice2x/hooks/audio/implementations/none.cpp
diff --git a/hooks/audio/implementations/none.h b/src/spice2x/hooks/audio/implementations/none.h
similarity index 100%
rename from hooks/audio/implementations/none.h
rename to src/spice2x/hooks/audio/implementations/none.h
diff --git a/hooks/audio/implementations/pipewire.cpp b/src/spice2x/hooks/audio/implementations/pipewire.cpp
similarity index 100%
rename from hooks/audio/implementations/pipewire.cpp
rename to src/spice2x/hooks/audio/implementations/pipewire.cpp
diff --git a/hooks/audio/implementations/pipewire.h b/src/spice2x/hooks/audio/implementations/pipewire.h
similarity index 100%
rename from hooks/audio/implementations/pipewire.h
rename to src/spice2x/hooks/audio/implementations/pipewire.h
diff --git a/hooks/audio/implementations/wave_out.cpp b/src/spice2x/hooks/audio/implementations/wave_out.cpp
similarity index 100%
rename from hooks/audio/implementations/wave_out.cpp
rename to src/spice2x/hooks/audio/implementations/wave_out.cpp
diff --git a/hooks/audio/implementations/wave_out.h b/src/spice2x/hooks/audio/implementations/wave_out.h
similarity index 100%
rename from hooks/audio/implementations/wave_out.h
rename to src/spice2x/hooks/audio/implementations/wave_out.h
diff --git a/hooks/audio/mme.cpp b/src/spice2x/hooks/audio/mme.cpp
similarity index 100%
rename from hooks/audio/mme.cpp
rename to src/spice2x/hooks/audio/mme.cpp
diff --git a/hooks/audio/mme.h b/src/spice2x/hooks/audio/mme.h
similarity index 100%
rename from hooks/audio/mme.h
rename to src/spice2x/hooks/audio/mme.h
diff --git a/hooks/audio/util.cpp b/src/spice2x/hooks/audio/util.cpp
similarity index 100%
rename from hooks/audio/util.cpp
rename to src/spice2x/hooks/audio/util.cpp
diff --git a/hooks/audio/util.h b/src/spice2x/hooks/audio/util.h
similarity index 100%
rename from hooks/audio/util.h
rename to src/spice2x/hooks/audio/util.h
diff --git a/hooks/avshook.cpp b/src/spice2x/hooks/avshook.cpp
similarity index 100%
rename from hooks/avshook.cpp
rename to src/spice2x/hooks/avshook.cpp
diff --git a/hooks/avshook.h b/src/spice2x/hooks/avshook.h
similarity index 100%
rename from hooks/avshook.h
rename to src/spice2x/hooks/avshook.h
diff --git a/hooks/cfgmgr32hook.cpp b/src/spice2x/hooks/cfgmgr32hook.cpp
similarity index 100%
rename from hooks/cfgmgr32hook.cpp
rename to src/spice2x/hooks/cfgmgr32hook.cpp
diff --git a/hooks/cfgmgr32hook.h b/src/spice2x/hooks/cfgmgr32hook.h
similarity index 100%
rename from hooks/cfgmgr32hook.h
rename to src/spice2x/hooks/cfgmgr32hook.h
diff --git a/hooks/debughook.cpp b/src/spice2x/hooks/debughook.cpp
similarity index 100%
rename from hooks/debughook.cpp
rename to src/spice2x/hooks/debughook.cpp
diff --git a/hooks/debughook.h b/src/spice2x/hooks/debughook.h
similarity index 100%
rename from hooks/debughook.h
rename to src/spice2x/hooks/debughook.h
diff --git a/hooks/develhook.cpp b/src/spice2x/hooks/develhook.cpp
similarity index 100%
rename from hooks/develhook.cpp
rename to src/spice2x/hooks/develhook.cpp
diff --git a/hooks/develhook.h b/src/spice2x/hooks/develhook.h
similarity index 100%
rename from hooks/develhook.h
rename to src/spice2x/hooks/develhook.h
diff --git a/hooks/devicehook.cpp b/src/spice2x/hooks/devicehook.cpp
similarity index 100%
rename from hooks/devicehook.cpp
rename to src/spice2x/hooks/devicehook.cpp
diff --git a/hooks/devicehook.h b/src/spice2x/hooks/devicehook.h
similarity index 100%
rename from hooks/devicehook.h
rename to src/spice2x/hooks/devicehook.h
diff --git a/hooks/graphics/backends/d3d9/d3d9_backend.cpp b/src/spice2x/hooks/graphics/backends/d3d9/d3d9_backend.cpp
similarity index 100%
rename from hooks/graphics/backends/d3d9/d3d9_backend.cpp
rename to src/spice2x/hooks/graphics/backends/d3d9/d3d9_backend.cpp
diff --git a/hooks/graphics/backends/d3d9/d3d9_backend.h b/src/spice2x/hooks/graphics/backends/d3d9/d3d9_backend.h
similarity index 100%
rename from hooks/graphics/backends/d3d9/d3d9_backend.h
rename to src/spice2x/hooks/graphics/backends/d3d9/d3d9_backend.h
diff --git a/hooks/graphics/backends/d3d9/d3d9_device.cpp b/src/spice2x/hooks/graphics/backends/d3d9/d3d9_device.cpp
similarity index 100%
rename from hooks/graphics/backends/d3d9/d3d9_device.cpp
rename to src/spice2x/hooks/graphics/backends/d3d9/d3d9_device.cpp
diff --git a/hooks/graphics/backends/d3d9/d3d9_device.h b/src/spice2x/hooks/graphics/backends/d3d9/d3d9_device.h
similarity index 100%
rename from hooks/graphics/backends/d3d9/d3d9_device.h
rename to src/spice2x/hooks/graphics/backends/d3d9/d3d9_device.h
diff --git a/hooks/graphics/backends/d3d9/d3d9_fake_swapchain.cpp b/src/spice2x/hooks/graphics/backends/d3d9/d3d9_fake_swapchain.cpp
similarity index 100%
rename from hooks/graphics/backends/d3d9/d3d9_fake_swapchain.cpp
rename to src/spice2x/hooks/graphics/backends/d3d9/d3d9_fake_swapchain.cpp
diff --git a/hooks/graphics/backends/d3d9/d3d9_fake_swapchain.h b/src/spice2x/hooks/graphics/backends/d3d9/d3d9_fake_swapchain.h
similarity index 100%
rename from hooks/graphics/backends/d3d9/d3d9_fake_swapchain.h
rename to src/spice2x/hooks/graphics/backends/d3d9/d3d9_fake_swapchain.h
diff --git a/hooks/graphics/backends/d3d9/d3d9_swapchain.cpp b/src/spice2x/hooks/graphics/backends/d3d9/d3d9_swapchain.cpp
similarity index 100%
rename from hooks/graphics/backends/d3d9/d3d9_swapchain.cpp
rename to src/spice2x/hooks/graphics/backends/d3d9/d3d9_swapchain.cpp
diff --git a/hooks/graphics/backends/d3d9/d3d9_swapchain.h b/src/spice2x/hooks/graphics/backends/d3d9/d3d9_swapchain.h
similarity index 100%
rename from hooks/graphics/backends/d3d9/d3d9_swapchain.h
rename to src/spice2x/hooks/graphics/backends/d3d9/d3d9_swapchain.h
diff --git a/hooks/graphics/backends/d3d9/d3d9_texture.cpp b/src/spice2x/hooks/graphics/backends/d3d9/d3d9_texture.cpp
similarity index 100%
rename from hooks/graphics/backends/d3d9/d3d9_texture.cpp
rename to src/spice2x/hooks/graphics/backends/d3d9/d3d9_texture.cpp
diff --git a/hooks/graphics/backends/d3d9/d3d9_texture.h b/src/spice2x/hooks/graphics/backends/d3d9/d3d9_texture.h
similarity index 100%
rename from hooks/graphics/backends/d3d9/d3d9_texture.h
rename to src/spice2x/hooks/graphics/backends/d3d9/d3d9_texture.h
diff --git a/hooks/graphics/backends/d3d9/shaders/vertex_shader.h b/src/spice2x/hooks/graphics/backends/d3d9/shaders/vertex_shader.h
similarity index 100%
rename from hooks/graphics/backends/d3d9/shaders/vertex_shader.h
rename to src/spice2x/hooks/graphics/backends/d3d9/shaders/vertex_shader.h
diff --git a/hooks/graphics/backends/d3d9/shaders/vertex_shader.hlsl b/src/spice2x/hooks/graphics/backends/d3d9/shaders/vertex_shader.hlsl
similarity index 100%
rename from hooks/graphics/backends/d3d9/shaders/vertex_shader.hlsl
rename to src/spice2x/hooks/graphics/backends/d3d9/shaders/vertex_shader.hlsl
diff --git a/hooks/graphics/graphics.cpp b/src/spice2x/hooks/graphics/graphics.cpp
similarity index 100%
rename from hooks/graphics/graphics.cpp
rename to src/spice2x/hooks/graphics/graphics.cpp
diff --git a/hooks/graphics/graphics.h b/src/spice2x/hooks/graphics/graphics.h
similarity index 100%
rename from hooks/graphics/graphics.h
rename to src/spice2x/hooks/graphics/graphics.h
diff --git a/hooks/graphics/graphics_windowed.cpp b/src/spice2x/hooks/graphics/graphics_windowed.cpp
similarity index 100%
rename from hooks/graphics/graphics_windowed.cpp
rename to src/spice2x/hooks/graphics/graphics_windowed.cpp
diff --git a/hooks/graphics/nvapi_hook.cpp b/src/spice2x/hooks/graphics/nvapi_hook.cpp
similarity index 100%
rename from hooks/graphics/nvapi_hook.cpp
rename to src/spice2x/hooks/graphics/nvapi_hook.cpp
diff --git a/hooks/graphics/nvapi_hook.h b/src/spice2x/hooks/graphics/nvapi_hook.h
similarity index 100%
rename from hooks/graphics/nvapi_hook.h
rename to src/spice2x/hooks/graphics/nvapi_hook.h
diff --git a/hooks/graphics/nvenc_hook.cpp b/src/spice2x/hooks/graphics/nvenc_hook.cpp
similarity index 100%
rename from hooks/graphics/nvenc_hook.cpp
rename to src/spice2x/hooks/graphics/nvenc_hook.cpp
diff --git a/hooks/graphics/nvenc_hook.h b/src/spice2x/hooks/graphics/nvenc_hook.h
similarity index 100%
rename from hooks/graphics/nvenc_hook.h
rename to src/spice2x/hooks/graphics/nvenc_hook.h
diff --git a/hooks/input/dinput8/fake_backend.cpp b/src/spice2x/hooks/input/dinput8/fake_backend.cpp
similarity index 100%
rename from hooks/input/dinput8/fake_backend.cpp
rename to src/spice2x/hooks/input/dinput8/fake_backend.cpp
diff --git a/hooks/input/dinput8/fake_backend.h b/src/spice2x/hooks/input/dinput8/fake_backend.h
similarity index 100%
rename from hooks/input/dinput8/fake_backend.h
rename to src/spice2x/hooks/input/dinput8/fake_backend.h
diff --git a/hooks/input/dinput8/fake_device.cpp b/src/spice2x/hooks/input/dinput8/fake_device.cpp
similarity index 100%
rename from hooks/input/dinput8/fake_device.cpp
rename to src/spice2x/hooks/input/dinput8/fake_device.cpp
diff --git a/hooks/input/dinput8/fake_device.h b/src/spice2x/hooks/input/dinput8/fake_device.h
similarity index 100%
rename from hooks/input/dinput8/fake_device.h
rename to src/spice2x/hooks/input/dinput8/fake_device.h
diff --git a/hooks/input/dinput8/hook.cpp b/src/spice2x/hooks/input/dinput8/hook.cpp
similarity index 100%
rename from hooks/input/dinput8/hook.cpp
rename to src/spice2x/hooks/input/dinput8/hook.cpp
diff --git a/hooks/input/dinput8/hook.h b/src/spice2x/hooks/input/dinput8/hook.h
similarity index 100%
rename from hooks/input/dinput8/hook.h
rename to src/spice2x/hooks/input/dinput8/hook.h
diff --git a/hooks/lang.cpp b/src/spice2x/hooks/lang.cpp
similarity index 100%
rename from hooks/lang.cpp
rename to src/spice2x/hooks/lang.cpp
diff --git a/hooks/lang.h b/src/spice2x/hooks/lang.h
similarity index 100%
rename from hooks/lang.h
rename to src/spice2x/hooks/lang.h
diff --git a/hooks/libraryhook.cpp b/src/spice2x/hooks/libraryhook.cpp
similarity index 100%
rename from hooks/libraryhook.cpp
rename to src/spice2x/hooks/libraryhook.cpp
diff --git a/hooks/libraryhook.h b/src/spice2x/hooks/libraryhook.h
similarity index 100%
rename from hooks/libraryhook.h
rename to src/spice2x/hooks/libraryhook.h
diff --git a/hooks/networkhook.cpp b/src/spice2x/hooks/networkhook.cpp
similarity index 100%
rename from hooks/networkhook.cpp
rename to src/spice2x/hooks/networkhook.cpp
diff --git a/hooks/networkhook.h b/src/spice2x/hooks/networkhook.h
similarity index 100%
rename from hooks/networkhook.h
rename to src/spice2x/hooks/networkhook.h
diff --git a/hooks/powrprof.cpp b/src/spice2x/hooks/powrprof.cpp
similarity index 100%
rename from hooks/powrprof.cpp
rename to src/spice2x/hooks/powrprof.cpp
diff --git a/hooks/powrprof.h b/src/spice2x/hooks/powrprof.h
similarity index 100%
rename from hooks/powrprof.h
rename to src/spice2x/hooks/powrprof.h
diff --git a/hooks/rom.cpp b/src/spice2x/hooks/rom.cpp
similarity index 100%
rename from hooks/rom.cpp
rename to src/spice2x/hooks/rom.cpp
diff --git a/hooks/rom.h b/src/spice2x/hooks/rom.h
similarity index 100%
rename from hooks/rom.h
rename to src/spice2x/hooks/rom.h
diff --git a/hooks/setupapihook.cpp b/src/spice2x/hooks/setupapihook.cpp
similarity index 100%
rename from hooks/setupapihook.cpp
rename to src/spice2x/hooks/setupapihook.cpp
diff --git a/hooks/setupapihook.h b/src/spice2x/hooks/setupapihook.h
similarity index 100%
rename from hooks/setupapihook.h
rename to src/spice2x/hooks/setupapihook.h
diff --git a/hooks/sleephook.cpp b/src/spice2x/hooks/sleephook.cpp
similarity index 100%
rename from hooks/sleephook.cpp
rename to src/spice2x/hooks/sleephook.cpp
diff --git a/hooks/sleephook.h b/src/spice2x/hooks/sleephook.h
similarity index 100%
rename from hooks/sleephook.h
rename to src/spice2x/hooks/sleephook.h
diff --git a/hooks/sndbhook.cpp b/src/spice2x/hooks/sndbhook.cpp
similarity index 100%
rename from hooks/sndbhook.cpp
rename to src/spice2x/hooks/sndbhook.cpp
diff --git a/hooks/sndbhook.h b/src/spice2x/hooks/sndbhook.h
similarity index 100%
rename from hooks/sndbhook.h
rename to src/spice2x/hooks/sndbhook.h
diff --git a/hooks/unisintrhook.cpp b/src/spice2x/hooks/unisintrhook.cpp
similarity index 100%
rename from hooks/unisintrhook.cpp
rename to src/spice2x/hooks/unisintrhook.cpp
diff --git a/hooks/unisintrhook.h b/src/spice2x/hooks/unisintrhook.h
similarity index 100%
rename from hooks/unisintrhook.h
rename to src/spice2x/hooks/unisintrhook.h
diff --git a/hooks/winuser.cpp b/src/spice2x/hooks/winuser.cpp
similarity index 100%
rename from hooks/winuser.cpp
rename to src/spice2x/hooks/winuser.cpp
diff --git a/hooks/winuser.h b/src/spice2x/hooks/winuser.h
similarity index 100%
rename from hooks/winuser.h
rename to src/spice2x/hooks/winuser.h
diff --git a/hooks/wmischook.cpp b/src/spice2x/hooks/wmischook.cpp
similarity index 100%
rename from hooks/wmischook.cpp
rename to src/spice2x/hooks/wmischook.cpp
diff --git a/hooks/wmischook.h b/src/spice2x/hooks/wmischook.h
similarity index 100%
rename from hooks/wmischook.h
rename to src/spice2x/hooks/wmischook.h
diff --git a/launcher/launcher.cpp b/src/spice2x/launcher/launcher.cpp
similarity index 100%
rename from launcher/launcher.cpp
rename to src/spice2x/launcher/launcher.cpp
diff --git a/launcher/launcher.h b/src/spice2x/launcher/launcher.h
similarity index 100%
rename from launcher/launcher.h
rename to src/spice2x/launcher/launcher.h
diff --git a/launcher/logger.cpp b/src/spice2x/launcher/logger.cpp
similarity index 100%
rename from launcher/logger.cpp
rename to src/spice2x/launcher/logger.cpp
diff --git a/launcher/logger.h b/src/spice2x/launcher/logger.h
similarity index 100%
rename from launcher/logger.h
rename to src/spice2x/launcher/logger.h
diff --git a/launcher/options.cpp b/src/spice2x/launcher/options.cpp
similarity index 100%
rename from launcher/options.cpp
rename to src/spice2x/launcher/options.cpp
diff --git a/launcher/options.h b/src/spice2x/launcher/options.h
similarity index 100%
rename from launcher/options.h
rename to src/spice2x/launcher/options.h
diff --git a/launcher/richpresence.cpp b/src/spice2x/launcher/richpresence.cpp
similarity index 100%
rename from launcher/richpresence.cpp
rename to src/spice2x/launcher/richpresence.cpp
diff --git a/launcher/richpresence.h b/src/spice2x/launcher/richpresence.h
similarity index 100%
rename from launcher/richpresence.h
rename to src/spice2x/launcher/richpresence.h
diff --git a/launcher/shutdown.cpp b/src/spice2x/launcher/shutdown.cpp
similarity index 100%
rename from launcher/shutdown.cpp
rename to src/spice2x/launcher/shutdown.cpp
diff --git a/launcher/shutdown.h b/src/spice2x/launcher/shutdown.h
similarity index 100%
rename from launcher/shutdown.h
rename to src/spice2x/launcher/shutdown.h
diff --git a/launcher/signal.cpp b/src/spice2x/launcher/signal.cpp
similarity index 100%
rename from launcher/signal.cpp
rename to src/spice2x/launcher/signal.cpp
diff --git a/launcher/signal.h b/src/spice2x/launcher/signal.h
similarity index 100%
rename from launcher/signal.h
rename to src/spice2x/launcher/signal.h
diff --git a/launcher/superexit.cpp b/src/spice2x/launcher/superexit.cpp
similarity index 100%
rename from launcher/superexit.cpp
rename to src/spice2x/launcher/superexit.cpp
diff --git a/launcher/superexit.h b/src/spice2x/launcher/superexit.h
similarity index 100%
rename from launcher/superexit.h
rename to src/spice2x/launcher/superexit.h
diff --git a/licenses.txt b/src/spice2x/licenses.txt
similarity index 100%
rename from licenses.txt
rename to src/spice2x/licenses.txt
diff --git a/misc/ami2000.cpp b/src/spice2x/misc/ami2000.cpp
similarity index 100%
rename from misc/ami2000.cpp
rename to src/spice2x/misc/ami2000.cpp
diff --git a/misc/ami2000.h b/src/spice2x/misc/ami2000.h
similarity index 100%
rename from misc/ami2000.h
rename to src/spice2x/misc/ami2000.h
diff --git a/misc/bt5api.cpp b/src/spice2x/misc/bt5api.cpp
similarity index 100%
rename from misc/bt5api.cpp
rename to src/spice2x/misc/bt5api.cpp
diff --git a/misc/bt5api.h b/src/spice2x/misc/bt5api.h
similarity index 100%
rename from misc/bt5api.h
rename to src/spice2x/misc/bt5api.h
diff --git a/misc/clipboard.cpp b/src/spice2x/misc/clipboard.cpp
similarity index 100%
rename from misc/clipboard.cpp
rename to src/spice2x/misc/clipboard.cpp
diff --git a/misc/clipboard.h b/src/spice2x/misc/clipboard.h
similarity index 100%
rename from misc/clipboard.h
rename to src/spice2x/misc/clipboard.h
diff --git a/misc/device.cpp b/src/spice2x/misc/device.cpp
similarity index 100%
rename from misc/device.cpp
rename to src/spice2x/misc/device.cpp
diff --git a/misc/device.h b/src/spice2x/misc/device.h
similarity index 100%
rename from misc/device.h
rename to src/spice2x/misc/device.h
diff --git a/misc/eamuse.cpp b/src/spice2x/misc/eamuse.cpp
similarity index 100%
rename from misc/eamuse.cpp
rename to src/spice2x/misc/eamuse.cpp
diff --git a/misc/eamuse.h b/src/spice2x/misc/eamuse.h
similarity index 100%
rename from misc/eamuse.h
rename to src/spice2x/misc/eamuse.h
diff --git a/misc/extdev.cpp b/src/spice2x/misc/extdev.cpp
similarity index 100%
rename from misc/extdev.cpp
rename to src/spice2x/misc/extdev.cpp
diff --git a/misc/extdev.h b/src/spice2x/misc/extdev.h
similarity index 100%
rename from misc/extdev.h
rename to src/spice2x/misc/extdev.h
diff --git a/misc/nativetouchhook.cpp b/src/spice2x/misc/nativetouchhook.cpp
similarity index 100%
rename from misc/nativetouchhook.cpp
rename to src/spice2x/misc/nativetouchhook.cpp
diff --git a/misc/nativetouchhook.h b/src/spice2x/misc/nativetouchhook.h
similarity index 100%
rename from misc/nativetouchhook.h
rename to src/spice2x/misc/nativetouchhook.h
diff --git a/misc/sciunit.cpp b/src/spice2x/misc/sciunit.cpp
similarity index 100%
rename from misc/sciunit.cpp
rename to src/spice2x/misc/sciunit.cpp
diff --git a/misc/sciunit.h b/src/spice2x/misc/sciunit.h
similarity index 100%
rename from misc/sciunit.h
rename to src/spice2x/misc/sciunit.h
diff --git a/misc/sde.cpp b/src/spice2x/misc/sde.cpp
similarity index 100%
rename from misc/sde.cpp
rename to src/spice2x/misc/sde.cpp
diff --git a/misc/sde.h b/src/spice2x/misc/sde.h
similarity index 100%
rename from misc/sde.h
rename to src/spice2x/misc/sde.h
diff --git a/misc/wintouchemu.cpp b/src/spice2x/misc/wintouchemu.cpp
similarity index 100%
rename from misc/wintouchemu.cpp
rename to src/spice2x/misc/wintouchemu.cpp
diff --git a/misc/wintouchemu.h b/src/spice2x/misc/wintouchemu.h
similarity index 100%
rename from misc/wintouchemu.h
rename to src/spice2x/misc/wintouchemu.h
diff --git a/nvapi/nvapi.cpp b/src/spice2x/nvapi/nvapi.cpp
similarity index 100%
rename from nvapi/nvapi.cpp
rename to src/spice2x/nvapi/nvapi.cpp
diff --git a/nvapi/nvapi.h b/src/spice2x/nvapi/nvapi.h
similarity index 100%
rename from nvapi/nvapi.h
rename to src/spice2x/nvapi/nvapi.h
diff --git a/overlay/imgui/extensions.cpp b/src/spice2x/overlay/imgui/extensions.cpp
similarity index 100%
rename from overlay/imgui/extensions.cpp
rename to src/spice2x/overlay/imgui/extensions.cpp
diff --git a/overlay/imgui/extensions.h b/src/spice2x/overlay/imgui/extensions.h
similarity index 100%
rename from overlay/imgui/extensions.h
rename to src/spice2x/overlay/imgui/extensions.h
diff --git a/overlay/imgui/impl_spice.cpp b/src/spice2x/overlay/imgui/impl_spice.cpp
similarity index 100%
rename from overlay/imgui/impl_spice.cpp
rename to src/spice2x/overlay/imgui/impl_spice.cpp
diff --git a/overlay/imgui/impl_spice.h b/src/spice2x/overlay/imgui/impl_spice.h
similarity index 100%
rename from overlay/imgui/impl_spice.h
rename to src/spice2x/overlay/imgui/impl_spice.h
diff --git a/overlay/imgui/impl_sw.cpp b/src/spice2x/overlay/imgui/impl_sw.cpp
similarity index 100%
rename from overlay/imgui/impl_sw.cpp
rename to src/spice2x/overlay/imgui/impl_sw.cpp
diff --git a/overlay/imgui/impl_sw.h b/src/spice2x/overlay/imgui/impl_sw.h
similarity index 100%
rename from overlay/imgui/impl_sw.h
rename to src/spice2x/overlay/imgui/impl_sw.h
diff --git a/overlay/overlay.cpp b/src/spice2x/overlay/overlay.cpp
similarity index 100%
rename from overlay/overlay.cpp
rename to src/spice2x/overlay/overlay.cpp
diff --git a/overlay/overlay.h b/src/spice2x/overlay/overlay.h
similarity index 100%
rename from overlay/overlay.h
rename to src/spice2x/overlay/overlay.h
diff --git a/overlay/window.cpp b/src/spice2x/overlay/window.cpp
similarity index 100%
rename from overlay/window.cpp
rename to src/spice2x/overlay/window.cpp
diff --git a/overlay/window.h b/src/spice2x/overlay/window.h
similarity index 100%
rename from overlay/window.h
rename to src/spice2x/overlay/window.h
diff --git a/overlay/windows/acio_status_buffers.cpp b/src/spice2x/overlay/windows/acio_status_buffers.cpp
similarity index 100%
rename from overlay/windows/acio_status_buffers.cpp
rename to src/spice2x/overlay/windows/acio_status_buffers.cpp
diff --git a/overlay/windows/acio_status_buffers.h b/src/spice2x/overlay/windows/acio_status_buffers.h
similarity index 100%
rename from overlay/windows/acio_status_buffers.h
rename to src/spice2x/overlay/windows/acio_status_buffers.h
diff --git a/overlay/windows/camera_control.cpp b/src/spice2x/overlay/windows/camera_control.cpp
similarity index 100%
rename from overlay/windows/camera_control.cpp
rename to src/spice2x/overlay/windows/camera_control.cpp
diff --git a/overlay/windows/camera_control.h b/src/spice2x/overlay/windows/camera_control.h
similarity index 100%
rename from overlay/windows/camera_control.h
rename to src/spice2x/overlay/windows/camera_control.h
diff --git a/overlay/windows/card_manager.cpp b/src/spice2x/overlay/windows/card_manager.cpp
similarity index 100%
rename from overlay/windows/card_manager.cpp
rename to src/spice2x/overlay/windows/card_manager.cpp
diff --git a/overlay/windows/card_manager.h b/src/spice2x/overlay/windows/card_manager.h
similarity index 100%
rename from overlay/windows/card_manager.h
rename to src/spice2x/overlay/windows/card_manager.h
diff --git a/overlay/windows/config.cpp b/src/spice2x/overlay/windows/config.cpp
similarity index 100%
rename from overlay/windows/config.cpp
rename to src/spice2x/overlay/windows/config.cpp
diff --git a/overlay/windows/config.h b/src/spice2x/overlay/windows/config.h
similarity index 100%
rename from overlay/windows/config.h
rename to src/spice2x/overlay/windows/config.h
diff --git a/overlay/windows/control.cpp b/src/spice2x/overlay/windows/control.cpp
similarity index 100%
rename from overlay/windows/control.cpp
rename to src/spice2x/overlay/windows/control.cpp
diff --git a/overlay/windows/control.h b/src/spice2x/overlay/windows/control.h
similarity index 100%
rename from overlay/windows/control.h
rename to src/spice2x/overlay/windows/control.h
diff --git a/overlay/windows/drs_dancefloor.cpp b/src/spice2x/overlay/windows/drs_dancefloor.cpp
similarity index 100%
rename from overlay/windows/drs_dancefloor.cpp
rename to src/spice2x/overlay/windows/drs_dancefloor.cpp
diff --git a/overlay/windows/drs_dancefloor.h b/src/spice2x/overlay/windows/drs_dancefloor.h
similarity index 100%
rename from overlay/windows/drs_dancefloor.h
rename to src/spice2x/overlay/windows/drs_dancefloor.h
diff --git a/overlay/windows/eadev.cpp b/src/spice2x/overlay/windows/eadev.cpp
similarity index 100%
rename from overlay/windows/eadev.cpp
rename to src/spice2x/overlay/windows/eadev.cpp
diff --git a/overlay/windows/eadev.h b/src/spice2x/overlay/windows/eadev.h
similarity index 100%
rename from overlay/windows/eadev.h
rename to src/spice2x/overlay/windows/eadev.h
diff --git a/overlay/windows/exitprompt.cpp b/src/spice2x/overlay/windows/exitprompt.cpp
similarity index 100%
rename from overlay/windows/exitprompt.cpp
rename to src/spice2x/overlay/windows/exitprompt.cpp
diff --git a/overlay/windows/exitprompt.h b/src/spice2x/overlay/windows/exitprompt.h
similarity index 100%
rename from overlay/windows/exitprompt.h
rename to src/spice2x/overlay/windows/exitprompt.h
diff --git a/overlay/windows/fps.cpp b/src/spice2x/overlay/windows/fps.cpp
similarity index 100%
rename from overlay/windows/fps.cpp
rename to src/spice2x/overlay/windows/fps.cpp
diff --git a/overlay/windows/fps.h b/src/spice2x/overlay/windows/fps.h
similarity index 100%
rename from overlay/windows/fps.h
rename to src/spice2x/overlay/windows/fps.h
diff --git a/overlay/windows/generic_sub.cpp b/src/spice2x/overlay/windows/generic_sub.cpp
similarity index 100%
rename from overlay/windows/generic_sub.cpp
rename to src/spice2x/overlay/windows/generic_sub.cpp
diff --git a/overlay/windows/generic_sub.h b/src/spice2x/overlay/windows/generic_sub.h
similarity index 100%
rename from overlay/windows/generic_sub.h
rename to src/spice2x/overlay/windows/generic_sub.h
diff --git a/overlay/windows/gfdm_sub.cpp b/src/spice2x/overlay/windows/gfdm_sub.cpp
similarity index 100%
rename from overlay/windows/gfdm_sub.cpp
rename to src/spice2x/overlay/windows/gfdm_sub.cpp
diff --git a/overlay/windows/gfdm_sub.h b/src/spice2x/overlay/windows/gfdm_sub.h
similarity index 100%
rename from overlay/windows/gfdm_sub.h
rename to src/spice2x/overlay/windows/gfdm_sub.h
diff --git a/overlay/windows/iidx_seg.cpp b/src/spice2x/overlay/windows/iidx_seg.cpp
similarity index 100%
rename from overlay/windows/iidx_seg.cpp
rename to src/spice2x/overlay/windows/iidx_seg.cpp
diff --git a/overlay/windows/iidx_seg.h b/src/spice2x/overlay/windows/iidx_seg.h
similarity index 100%
rename from overlay/windows/iidx_seg.h
rename to src/spice2x/overlay/windows/iidx_seg.h
diff --git a/overlay/windows/iidx_sub.cpp b/src/spice2x/overlay/windows/iidx_sub.cpp
similarity index 100%
rename from overlay/windows/iidx_sub.cpp
rename to src/spice2x/overlay/windows/iidx_sub.cpp
diff --git a/overlay/windows/iidx_sub.h b/src/spice2x/overlay/windows/iidx_sub.h
similarity index 100%
rename from overlay/windows/iidx_sub.h
rename to src/spice2x/overlay/windows/iidx_sub.h
diff --git a/overlay/windows/iopanel.cpp b/src/spice2x/overlay/windows/iopanel.cpp
similarity index 100%
rename from overlay/windows/iopanel.cpp
rename to src/spice2x/overlay/windows/iopanel.cpp
diff --git a/overlay/windows/iopanel.h b/src/spice2x/overlay/windows/iopanel.h
similarity index 100%
rename from overlay/windows/iopanel.h
rename to src/spice2x/overlay/windows/iopanel.h
diff --git a/overlay/windows/iopanel_ddr.cpp b/src/spice2x/overlay/windows/iopanel_ddr.cpp
similarity index 100%
rename from overlay/windows/iopanel_ddr.cpp
rename to src/spice2x/overlay/windows/iopanel_ddr.cpp
diff --git a/overlay/windows/iopanel_ddr.h b/src/spice2x/overlay/windows/iopanel_ddr.h
similarity index 100%
rename from overlay/windows/iopanel_ddr.h
rename to src/spice2x/overlay/windows/iopanel_ddr.h
diff --git a/overlay/windows/iopanel_gfdm.cpp b/src/spice2x/overlay/windows/iopanel_gfdm.cpp
similarity index 100%
rename from overlay/windows/iopanel_gfdm.cpp
rename to src/spice2x/overlay/windows/iopanel_gfdm.cpp
diff --git a/overlay/windows/iopanel_gfdm.h b/src/spice2x/overlay/windows/iopanel_gfdm.h
similarity index 100%
rename from overlay/windows/iopanel_gfdm.h
rename to src/spice2x/overlay/windows/iopanel_gfdm.h
diff --git a/overlay/windows/iopanel_iidx.cpp b/src/spice2x/overlay/windows/iopanel_iidx.cpp
similarity index 100%
rename from overlay/windows/iopanel_iidx.cpp
rename to src/spice2x/overlay/windows/iopanel_iidx.cpp
diff --git a/overlay/windows/iopanel_iidx.h b/src/spice2x/overlay/windows/iopanel_iidx.h
similarity index 100%
rename from overlay/windows/iopanel_iidx.h
rename to src/spice2x/overlay/windows/iopanel_iidx.h
diff --git a/overlay/windows/keypad.cpp b/src/spice2x/overlay/windows/keypad.cpp
similarity index 100%
rename from overlay/windows/keypad.cpp
rename to src/spice2x/overlay/windows/keypad.cpp
diff --git a/overlay/windows/keypad.h b/src/spice2x/overlay/windows/keypad.h
similarity index 100%
rename from overlay/windows/keypad.h
rename to src/spice2x/overlay/windows/keypad.h
diff --git a/overlay/windows/log.cpp b/src/spice2x/overlay/windows/log.cpp
similarity index 100%
rename from overlay/windows/log.cpp
rename to src/spice2x/overlay/windows/log.cpp
diff --git a/overlay/windows/log.h b/src/spice2x/overlay/windows/log.h
similarity index 100%
rename from overlay/windows/log.h
rename to src/spice2x/overlay/windows/log.h
diff --git a/overlay/windows/midi.cpp b/src/spice2x/overlay/windows/midi.cpp
similarity index 100%
rename from overlay/windows/midi.cpp
rename to src/spice2x/overlay/windows/midi.cpp
diff --git a/overlay/windows/midi.h b/src/spice2x/overlay/windows/midi.h
similarity index 100%
rename from overlay/windows/midi.h
rename to src/spice2x/overlay/windows/midi.h
diff --git a/overlay/windows/patch_manager.cpp b/src/spice2x/overlay/windows/patch_manager.cpp
similarity index 100%
rename from overlay/windows/patch_manager.cpp
rename to src/spice2x/overlay/windows/patch_manager.cpp
diff --git a/overlay/windows/patch_manager.h b/src/spice2x/overlay/windows/patch_manager.h
similarity index 100%
rename from overlay/windows/patch_manager.h
rename to src/spice2x/overlay/windows/patch_manager.h
diff --git a/overlay/windows/screen_resize.cpp b/src/spice2x/overlay/windows/screen_resize.cpp
similarity index 100%
rename from overlay/windows/screen_resize.cpp
rename to src/spice2x/overlay/windows/screen_resize.cpp
diff --git a/overlay/windows/screen_resize.h b/src/spice2x/overlay/windows/screen_resize.h
similarity index 100%
rename from overlay/windows/screen_resize.h
rename to src/spice2x/overlay/windows/screen_resize.h
diff --git a/overlay/windows/sdvx_sub.cpp b/src/spice2x/overlay/windows/sdvx_sub.cpp
similarity index 100%
rename from overlay/windows/sdvx_sub.cpp
rename to src/spice2x/overlay/windows/sdvx_sub.cpp
diff --git a/overlay/windows/sdvx_sub.h b/src/spice2x/overlay/windows/sdvx_sub.h
similarity index 100%
rename from overlay/windows/sdvx_sub.h
rename to src/spice2x/overlay/windows/sdvx_sub.h
diff --git a/overlay/windows/wnd_manager.cpp b/src/spice2x/overlay/windows/wnd_manager.cpp
similarity index 100%
rename from overlay/windows/wnd_manager.cpp
rename to src/spice2x/overlay/windows/wnd_manager.cpp
diff --git a/overlay/windows/wnd_manager.h b/src/spice2x/overlay/windows/wnd_manager.h
similarity index 100%
rename from overlay/windows/wnd_manager.h
rename to src/spice2x/overlay/windows/wnd_manager.h
diff --git a/rawinput/device.h b/src/spice2x/rawinput/device.h
similarity index 100%
rename from rawinput/device.h
rename to src/spice2x/rawinput/device.h
diff --git a/rawinput/hotplug.cpp b/src/spice2x/rawinput/hotplug.cpp
similarity index 100%
rename from rawinput/hotplug.cpp
rename to src/spice2x/rawinput/hotplug.cpp
diff --git a/rawinput/hotplug.h b/src/spice2x/rawinput/hotplug.h
similarity index 100%
rename from rawinput/hotplug.h
rename to src/spice2x/rawinput/hotplug.h
diff --git a/rawinput/piuio.cpp b/src/spice2x/rawinput/piuio.cpp
similarity index 100%
rename from rawinput/piuio.cpp
rename to src/spice2x/rawinput/piuio.cpp
diff --git a/rawinput/piuio.h b/src/spice2x/rawinput/piuio.h
similarity index 100%
rename from rawinput/piuio.h
rename to src/spice2x/rawinput/piuio.h
diff --git a/rawinput/rawinput.cpp b/src/spice2x/rawinput/rawinput.cpp
similarity index 100%
rename from rawinput/rawinput.cpp
rename to src/spice2x/rawinput/rawinput.cpp
diff --git a/rawinput/rawinput.h b/src/spice2x/rawinput/rawinput.h
similarity index 100%
rename from rawinput/rawinput.h
rename to src/spice2x/rawinput/rawinput.h
diff --git a/rawinput/sextet.cpp b/src/spice2x/rawinput/sextet.cpp
similarity index 100%
rename from rawinput/sextet.cpp
rename to src/spice2x/rawinput/sextet.cpp
diff --git a/rawinput/sextet.h b/src/spice2x/rawinput/sextet.h
similarity index 100%
rename from rawinput/sextet.h
rename to src/spice2x/rawinput/sextet.h
diff --git a/rawinput/smx.cpp b/src/spice2x/rawinput/smx.cpp
similarity index 100%
rename from rawinput/smx.cpp
rename to src/spice2x/rawinput/smx.cpp
diff --git a/rawinput/smx.h b/src/spice2x/rawinput/smx.h
similarity index 100%
rename from rawinput/smx.h
rename to src/spice2x/rawinput/smx.h
diff --git a/rawinput/smxdedicab.cpp b/src/spice2x/rawinput/smxdedicab.cpp
similarity index 100%
rename from rawinput/smxdedicab.cpp
rename to src/spice2x/rawinput/smxdedicab.cpp
diff --git a/rawinput/smxdedicab.h b/src/spice2x/rawinput/smxdedicab.h
similarity index 100%
rename from rawinput/smxdedicab.h
rename to src/spice2x/rawinput/smxdedicab.h
diff --git a/rawinput/smxstage.cpp b/src/spice2x/rawinput/smxstage.cpp
similarity index 100%
rename from rawinput/smxstage.cpp
rename to src/spice2x/rawinput/smxstage.cpp
diff --git a/rawinput/smxstage.h b/src/spice2x/rawinput/smxstage.h
similarity index 100%
rename from rawinput/smxstage.h
rename to src/spice2x/rawinput/smxstage.h
diff --git a/rawinput/touch.cpp b/src/spice2x/rawinput/touch.cpp
similarity index 100%
rename from rawinput/touch.cpp
rename to src/spice2x/rawinput/touch.cpp
diff --git a/rawinput/touch.h b/src/spice2x/rawinput/touch.h
similarity index 100%
rename from rawinput/touch.h
rename to src/spice2x/rawinput/touch.h
diff --git a/reader/crypt.cpp b/src/spice2x/reader/crypt.cpp
similarity index 100%
rename from reader/crypt.cpp
rename to src/spice2x/reader/crypt.cpp
diff --git a/reader/crypt.h b/src/spice2x/reader/crypt.h
similarity index 100%
rename from reader/crypt.h
rename to src/spice2x/reader/crypt.h
diff --git a/reader/message.cpp b/src/spice2x/reader/message.cpp
similarity index 100%
rename from reader/message.cpp
rename to src/spice2x/reader/message.cpp
diff --git a/reader/message.h b/src/spice2x/reader/message.h
similarity index 100%
rename from reader/message.h
rename to src/spice2x/reader/message.h
diff --git a/reader/reader.cpp b/src/spice2x/reader/reader.cpp
similarity index 100%
rename from reader/reader.cpp
rename to src/spice2x/reader/reader.cpp
diff --git a/reader/reader.h b/src/spice2x/reader/reader.h
similarity index 100%
rename from reader/reader.h
rename to src/spice2x/reader/reader.h
diff --git a/reader/structuredmessage.cpp b/src/spice2x/reader/structuredmessage.cpp
similarity index 100%
rename from reader/structuredmessage.cpp
rename to src/spice2x/reader/structuredmessage.cpp
diff --git a/reader/structuredmessage.h b/src/spice2x/reader/structuredmessage.h
similarity index 100%
rename from reader/structuredmessage.h
rename to src/spice2x/reader/structuredmessage.h
diff --git a/readme.txt b/src/spice2x/readme.txt
similarity index 100%
rename from readme.txt
rename to src/spice2x/readme.txt
diff --git a/stubs/cpusbxpkm.cpp b/src/spice2x/stubs/cpusbxpkm.cpp
similarity index 100%
rename from stubs/cpusbxpkm.cpp
rename to src/spice2x/stubs/cpusbxpkm.cpp
diff --git a/stubs/cpusbxpkm.def b/src/spice2x/stubs/cpusbxpkm.def
similarity index 100%
rename from stubs/cpusbxpkm.def
rename to src/spice2x/stubs/cpusbxpkm.def
diff --git a/stubs/nvEncodeAPI64.cpp b/src/spice2x/stubs/nvEncodeAPI64.cpp
similarity index 100%
rename from stubs/nvEncodeAPI64.cpp
rename to src/spice2x/stubs/nvEncodeAPI64.cpp
diff --git a/stubs/nvEncodeAPI64.def b/src/spice2x/stubs/nvEncodeAPI64.def
similarity index 100%
rename from stubs/nvEncodeAPI64.def
rename to src/spice2x/stubs/nvEncodeAPI64.def
diff --git a/stubs/nvcuda.cpp b/src/spice2x/stubs/nvcuda.cpp
similarity index 100%
rename from stubs/nvcuda.cpp
rename to src/spice2x/stubs/nvcuda.cpp
diff --git a/stubs/nvcuda.def b/src/spice2x/stubs/nvcuda.def
similarity index 100%
rename from stubs/nvcuda.def
rename to src/spice2x/stubs/nvcuda.def
diff --git a/stubs/nvcuvid.cpp b/src/spice2x/stubs/nvcuvid.cpp
similarity index 100%
rename from stubs/nvcuvid.cpp
rename to src/spice2x/stubs/nvcuvid.cpp
diff --git a/stubs/nvcuvid.def b/src/spice2x/stubs/nvcuvid.def
similarity index 100%
rename from stubs/nvcuvid.def
rename to src/spice2x/stubs/nvcuvid.def
diff --git a/stubs/stubs.cpp b/src/spice2x/stubs/stubs.cpp
similarity index 100%
rename from stubs/stubs.cpp
rename to src/spice2x/stubs/stubs.cpp
diff --git a/stubs/stubs.def b/src/spice2x/stubs/stubs.def
similarity index 100%
rename from stubs/stubs.def
rename to src/spice2x/stubs/stubs.def
diff --git a/stubs/stubs.h b/src/spice2x/stubs/stubs.h
similarity index 100%
rename from stubs/stubs.h
rename to src/spice2x/stubs/stubs.h
diff --git a/touch/handler.h b/src/spice2x/touch/handler.h
similarity index 100%
rename from touch/handler.h
rename to src/spice2x/touch/handler.h
diff --git a/touch/touch.cpp b/src/spice2x/touch/touch.cpp
similarity index 100%
rename from touch/touch.cpp
rename to src/spice2x/touch/touch.cpp
diff --git a/touch/touch.h b/src/spice2x/touch/touch.h
similarity index 100%
rename from touch/touch.h
rename to src/spice2x/touch/touch.h
diff --git a/touch/touch_indicators.cpp b/src/spice2x/touch/touch_indicators.cpp
similarity index 100%
rename from touch/touch_indicators.cpp
rename to src/spice2x/touch/touch_indicators.cpp
diff --git a/touch/touch_indicators.h b/src/spice2x/touch/touch_indicators.h
similarity index 100%
rename from touch/touch_indicators.h
rename to src/spice2x/touch/touch_indicators.h
diff --git a/touch/win7.cpp b/src/spice2x/touch/win7.cpp
similarity index 100%
rename from touch/win7.cpp
rename to src/spice2x/touch/win7.cpp
diff --git a/touch/win7.h b/src/spice2x/touch/win7.h
similarity index 100%
rename from touch/win7.h
rename to src/spice2x/touch/win7.h
diff --git a/touch/win8.cpp b/src/spice2x/touch/win8.cpp
similarity index 100%
rename from touch/win8.cpp
rename to src/spice2x/touch/win8.cpp
diff --git a/touch/win8.h b/src/spice2x/touch/win8.h
similarity index 100%
rename from touch/win8.h
rename to src/spice2x/touch/win8.h
diff --git a/util/circular_buffer.h b/src/spice2x/util/circular_buffer.h
similarity index 100%
rename from util/circular_buffer.h
rename to src/spice2x/util/circular_buffer.h
diff --git a/util/co_task_mem_ptr.h b/src/spice2x/util/co_task_mem_ptr.h
similarity index 100%
rename from util/co_task_mem_ptr.h
rename to src/spice2x/util/co_task_mem_ptr.h
diff --git a/util/cpuutils.cpp b/src/spice2x/util/cpuutils.cpp
similarity index 100%
rename from util/cpuutils.cpp
rename to src/spice2x/util/cpuutils.cpp
diff --git a/util/cpuutils.h b/src/spice2x/util/cpuutils.h
similarity index 100%
rename from util/cpuutils.h
rename to src/spice2x/util/cpuutils.h
diff --git a/util/crypt.cpp b/src/spice2x/util/crypt.cpp
similarity index 100%
rename from util/crypt.cpp
rename to src/spice2x/util/crypt.cpp
diff --git a/util/crypt.h b/src/spice2x/util/crypt.h
similarity index 100%
rename from util/crypt.h
rename to src/spice2x/util/crypt.h
diff --git a/util/deferlog.cpp b/src/spice2x/util/deferlog.cpp
similarity index 100%
rename from util/deferlog.cpp
rename to src/spice2x/util/deferlog.cpp
diff --git a/util/deferlog.h b/src/spice2x/util/deferlog.h
similarity index 100%
rename from util/deferlog.h
rename to src/spice2x/util/deferlog.h
diff --git a/util/dependencies.cpp b/src/spice2x/util/dependencies.cpp
similarity index 100%
rename from util/dependencies.cpp
rename to src/spice2x/util/dependencies.cpp
diff --git a/util/dependencies.h b/src/spice2x/util/dependencies.h
similarity index 100%
rename from util/dependencies.h
rename to src/spice2x/util/dependencies.h
diff --git a/util/detour.cpp b/src/spice2x/util/detour.cpp
similarity index 100%
rename from util/detour.cpp
rename to src/spice2x/util/detour.cpp
diff --git a/util/detour.h b/src/spice2x/util/detour.h
similarity index 100%
rename from util/detour.h
rename to src/spice2x/util/detour.h
diff --git a/util/execexe.cpp b/src/spice2x/util/execexe.cpp
similarity index 100%
rename from util/execexe.cpp
rename to src/spice2x/util/execexe.cpp
diff --git a/util/execexe.h b/src/spice2x/util/execexe.h
similarity index 100%
rename from util/execexe.h
rename to src/spice2x/util/execexe.h
diff --git a/util/fileutils.cpp b/src/spice2x/util/fileutils.cpp
similarity index 100%
rename from util/fileutils.cpp
rename to src/spice2x/util/fileutils.cpp
diff --git a/util/fileutils.h b/src/spice2x/util/fileutils.h
similarity index 100%
rename from util/fileutils.h
rename to src/spice2x/util/fileutils.h
diff --git a/util/flags_helper.h b/src/spice2x/util/flags_helper.h
similarity index 100%
rename from util/flags_helper.h
rename to src/spice2x/util/flags_helper.h
diff --git a/util/libutils.cpp b/src/spice2x/util/libutils.cpp
similarity index 100%
rename from util/libutils.cpp
rename to src/spice2x/util/libutils.cpp
diff --git a/util/libutils.h b/src/spice2x/util/libutils.h
similarity index 100%
rename from util/libutils.h
rename to src/spice2x/util/libutils.h
diff --git a/util/logging.cpp b/src/spice2x/util/logging.cpp
similarity index 100%
rename from util/logging.cpp
rename to src/spice2x/util/logging.cpp
diff --git a/util/logging.h b/src/spice2x/util/logging.h
similarity index 100%
rename from util/logging.h
rename to src/spice2x/util/logging.h
diff --git a/util/lz77.cpp b/src/spice2x/util/lz77.cpp
similarity index 100%
rename from util/lz77.cpp
rename to src/spice2x/util/lz77.cpp
diff --git a/util/lz77.h b/src/spice2x/util/lz77.h
similarity index 100%
rename from util/lz77.h
rename to src/spice2x/util/lz77.h
diff --git a/util/memutils.cpp b/src/spice2x/util/memutils.cpp
similarity index 100%
rename from util/memutils.cpp
rename to src/spice2x/util/memutils.cpp
diff --git a/util/memutils.h b/src/spice2x/util/memutils.h
similarity index 100%
rename from util/memutils.h
rename to src/spice2x/util/memutils.h
diff --git a/util/netutils.cpp b/src/spice2x/util/netutils.cpp
similarity index 100%
rename from util/netutils.cpp
rename to src/spice2x/util/netutils.cpp
diff --git a/util/netutils.h b/src/spice2x/util/netutils.h
similarity index 100%
rename from util/netutils.h
rename to src/spice2x/util/netutils.h
diff --git a/util/nt_loader.h b/src/spice2x/util/nt_loader.h
similarity index 100%
rename from util/nt_loader.h
rename to src/spice2x/util/nt_loader.h
diff --git a/util/peb.cpp b/src/spice2x/util/peb.cpp
similarity index 100%
rename from util/peb.cpp
rename to src/spice2x/util/peb.cpp
diff --git a/util/peb.h b/src/spice2x/util/peb.h
similarity index 100%
rename from util/peb.h
rename to src/spice2x/util/peb.h
diff --git a/util/rc4.cpp b/src/spice2x/util/rc4.cpp
similarity index 100%
rename from util/rc4.cpp
rename to src/spice2x/util/rc4.cpp
diff --git a/util/rc4.h b/src/spice2x/util/rc4.h
similarity index 100%
rename from util/rc4.h
rename to src/spice2x/util/rc4.h
diff --git a/util/resutils.cpp b/src/spice2x/util/resutils.cpp
similarity index 100%
rename from util/resutils.cpp
rename to src/spice2x/util/resutils.cpp
diff --git a/util/resutils.h b/src/spice2x/util/resutils.h
similarity index 100%
rename from util/resutils.h
rename to src/spice2x/util/resutils.h
diff --git a/util/scope_guard.h b/src/spice2x/util/scope_guard.h
similarity index 100%
rename from util/scope_guard.h
rename to src/spice2x/util/scope_guard.h
diff --git a/util/secplug.h b/src/spice2x/util/secplug.h
similarity index 100%
rename from util/secplug.h
rename to src/spice2x/util/secplug.h
diff --git a/util/sigscan.cpp b/src/spice2x/util/sigscan.cpp
similarity index 100%
rename from util/sigscan.cpp
rename to src/spice2x/util/sigscan.cpp
diff --git a/util/sigscan.h b/src/spice2x/util/sigscan.h
similarity index 100%
rename from util/sigscan.h
rename to src/spice2x/util/sigscan.h
diff --git a/util/socd_cleaner.cpp b/src/spice2x/util/socd_cleaner.cpp
similarity index 100%
rename from util/socd_cleaner.cpp
rename to src/spice2x/util/socd_cleaner.cpp
diff --git a/util/socd_cleaner.h b/src/spice2x/util/socd_cleaner.h
similarity index 100%
rename from util/socd_cleaner.h
rename to src/spice2x/util/socd_cleaner.h
diff --git a/util/sysutils.cpp b/src/spice2x/util/sysutils.cpp
similarity index 100%
rename from util/sysutils.cpp
rename to src/spice2x/util/sysutils.cpp
diff --git a/util/sysutils.h b/src/spice2x/util/sysutils.h
similarity index 100%
rename from util/sysutils.h
rename to src/spice2x/util/sysutils.h
diff --git a/util/tapeled.cpp b/src/spice2x/util/tapeled.cpp
similarity index 100%
rename from util/tapeled.cpp
rename to src/spice2x/util/tapeled.cpp
diff --git a/util/tapeled.h b/src/spice2x/util/tapeled.h
similarity index 100%
rename from util/tapeled.h
rename to src/spice2x/util/tapeled.h
diff --git a/util/threadpool.h b/src/spice2x/util/threadpool.h
similarity index 100%
rename from util/threadpool.h
rename to src/spice2x/util/threadpool.h
diff --git a/util/time.cpp b/src/spice2x/util/time.cpp
similarity index 100%
rename from util/time.cpp
rename to src/spice2x/util/time.cpp
diff --git a/util/time.h b/src/spice2x/util/time.h
similarity index 100%
rename from util/time.h
rename to src/spice2x/util/time.h
diff --git a/util/unique_plain_ptr.h b/src/spice2x/util/unique_plain_ptr.h
similarity index 100%
rename from util/unique_plain_ptr.h
rename to src/spice2x/util/unique_plain_ptr.h
diff --git a/util/unity_player.cpp b/src/spice2x/util/unity_player.cpp
similarity index 100%
rename from util/unity_player.cpp
rename to src/spice2x/util/unity_player.cpp
diff --git a/util/unity_player.h b/src/spice2x/util/unity_player.h
similarity index 100%
rename from util/unity_player.h
rename to src/spice2x/util/unity_player.h
diff --git a/util/utils.cpp b/src/spice2x/util/utils.cpp
similarity index 100%
rename from util/utils.cpp
rename to src/spice2x/util/utils.cpp
diff --git a/util/utils.h b/src/spice2x/util/utils.h
similarity index 100%
rename from util/utils.h
rename to src/spice2x/util/utils.h