From e0eb85bbbc75922bedd1c4c38b3b9a447744ea31 Mon Sep 17 00:00:00 2001
From: Ben Vanik <ben.vanik@gmail.com>
Date: Sat, 18 Jul 2015 16:00:01 -0700
Subject: [PATCH] Switching to premake. Probably with disasterous consequences.

---
 .gitignore                                    |    3 +-
 .gitmodules                                   |    9 +-
 README.md                                     |    4 +-
 build/Xenia.Cpp.x64.Checked.props             |   25 -
 build/Xenia.Cpp.x64.Clang.props               |   14 -
 build/Xenia.Cpp.x64.Common.props              |   32 -
 build/Xenia.Cpp.x64.Debug.props               |   22 -
 build/Xenia.Cpp.x64.Release.props             |   26 -
 build_tools                                   |    1 +
 libxenia-base.vcxproj                         |  161 --
 libxenia-base.vcxproj.filters                 |  132 --
 libxenia.vcxproj                              |  641 --------
 libxenia.vcxproj.filters                      | 1431 -----------------
 premake5.lua                                  |  158 ++
 src/xenia/app/premake5.lua                    |   72 +
 src/xenia/apu/nop/premake5.lua                |   17 +
 src/xenia/apu/premake5.lua                    |   20 +
 src/xenia/apu/xaudio2/premake5.lua            |   16 +
 .../xenia/base/debug_visualizers.natvis       |   14 +-
 src/xenia/base/main_win.cc                    |    4 +-
 src/xenia/base/memory_test.cc                 |   19 +
 src/xenia/base/premake5.lua                   |   24 +
 src/xenia/cpu/backend/x64/premake5.lua        |   28 +
 .../cpu/frontend/test/xe-cpu-ppc-test.vcxproj |  246 ---
 .../test/xe-cpu-ppc-test.vcxproj.filters      |  142 --
 .../cpu/frontend/{test => testing}/README.md  |    0
 .../frontend/{test => testing}/instr_add.s    |    0
 .../frontend/{test => testing}/instr_addc.s   |    0
 .../frontend/{test => testing}/instr_adde.s   |    0
 .../frontend/{test => testing}/instr_addic.s  |    0
 .../frontend/{test => testing}/instr_addis.s  |    0
 .../frontend/{test => testing}/instr_addme.s  |    0
 .../frontend/{test => testing}/instr_addze.s  |    0
 .../frontend/{test => testing}/instr_and.s    |    0
 .../frontend/{test => testing}/instr_andc.s   |    0
 .../frontend/{test => testing}/instr_andi.s   |    0
 .../frontend/{test => testing}/instr_andis.s  |    0
 .../frontend/{test => testing}/instr_cmp.s    |    0
 .../frontend/{test => testing}/instr_cmpi.s   |    0
 .../frontend/{test => testing}/instr_cmpl.s   |    0
 .../frontend/{test => testing}/instr_cmpli.s  |    0
 .../frontend/{test => testing}/instr_cntlzd.s |    0
 .../frontend/{test => testing}/instr_cntlzw.s |    0
 .../frontend/{test => testing}/instr_divd.s   |    0
 .../frontend/{test => testing}/instr_divdu.s  |    0
 .../frontend/{test => testing}/instr_divw.s   |    0
 .../frontend/{test => testing}/instr_divwu.s  |    0
 .../frontend/{test => testing}/instr_eqv.s    |    0
 .../frontend/{test => testing}/instr_extsb.s  |    0
 .../frontend/{test => testing}/instr_extsh.s  |    0
 .../frontend/{test => testing}/instr_extsw.s  |    0
 .../frontend/{test => testing}/instr_fabs.s   |    0
 .../frontend/{test => testing}/instr_fadd.s   |    0
 .../frontend/{test => testing}/instr_fmadd.s  |    0
 .../frontend/{test => testing}/instr_fmadds.s |    0
 .../frontend/{test => testing}/instr_fmul.s   |    0
 .../frontend/{test => testing}/instr_fnabs.s  |    0
 .../{test => testing}/instr_frsqrte.s         |    0
 .../frontend/{test => testing}/instr_fsel.s   |    0
 .../frontend/{test => testing}/instr_fsqrt.s  |    0
 .../frontend/{test => testing}/instr_lvexx.s  |    0
 .../frontend/{test => testing}/instr_lvl.s    |    0
 .../frontend/{test => testing}/instr_lvr.s    |    0
 .../frontend/{test => testing}/instr_lvsl.s   |    0
 .../frontend/{test => testing}/instr_lvsr.s   |    0
 .../frontend/{test => testing}/instr_mulhd.s  |    0
 .../frontend/{test => testing}/instr_mulhdu.s |    0
 .../frontend/{test => testing}/instr_mulhw.s  |    0
 .../frontend/{test => testing}/instr_mulhwu.s |    0
 .../frontend/{test => testing}/instr_mulld.s  |    0
 .../frontend/{test => testing}/instr_mulli.s  |    0
 .../frontend/{test => testing}/instr_mullw.s  |    0
 .../frontend/{test => testing}/instr_neg.s    |    0
 .../frontend/{test => testing}/instr_nor.s    |    0
 .../frontend/{test => testing}/instr_ori.s    |    0
 .../frontend/{test => testing}/instr_rldicl.s |    0
 .../frontend/{test => testing}/instr_rldicr.s |    0
 .../frontend/{test => testing}/instr_rlwimi.s |    0
 .../frontend/{test => testing}/instr_rlwinm.s |    0
 .../frontend/{test => testing}/instr_rlwnm.s  |    0
 .../frontend/{test => testing}/instr_sld.s    |    0
 .../frontend/{test => testing}/instr_slw.s    |    0
 .../frontend/{test => testing}/instr_srad.s   |    0
 .../frontend/{test => testing}/instr_sradi.s  |    0
 .../frontend/{test => testing}/instr_sraw.s   |    0
 .../frontend/{test => testing}/instr_srawi.s  |    0
 .../frontend/{test => testing}/instr_srd.s    |    0
 .../frontend/{test => testing}/instr_srw.s    |    0
 .../frontend/{test => testing}/instr_stvew.s  |    0
 .../frontend/{test => testing}/instr_stvl.s   |    0
 .../frontend/{test => testing}/instr_stvr.s   |    0
 .../frontend/{test => testing}/instr_subf.s   |    0
 .../frontend/{test => testing}/instr_subfc.s  |    0
 .../frontend/{test => testing}/instr_subfe.s  |    0
 .../frontend/{test => testing}/instr_subfic.s |    0
 .../frontend/{test => testing}/instr_subfme.s |    0
 .../frontend/{test => testing}/instr_subfze.s |    0
 .../cpu/frontend/{test => testing}/instr_td.s |    0
 .../frontend/{test => testing}/instr_tdi.s    |    0
 .../cpu/frontend/{test => testing}/instr_tw.s |    0
 .../frontend/{test => testing}/instr_twi.s    |    0
 .../{test => testing}/instr_vaddshs.s         |    0
 .../{test => testing}/instr_vadduhm.s         |    0
 .../frontend/{test => testing}/instr_vcfsx.s  |    0
 .../{test => testing}/instr_vcmpxxfp.s        |    0
 .../frontend/{test => testing}/instr_vctsxs.s |    0
 .../{test => testing}/instr_vmaddfp.s         |    0
 .../frontend/{test => testing}/instr_vmrghb.s |    0
 .../frontend/{test => testing}/instr_vmrghh.s |    0
 .../frontend/{test => testing}/instr_vmrghw.s |    0
 .../frontend/{test => testing}/instr_vmrglb.s |    0
 .../frontend/{test => testing}/instr_vmrglh.s |    0
 .../frontend/{test => testing}/instr_vmrglw.s |    0
 .../{test => testing}/instr_vmsum4fp128.s     |    0
 .../frontend/{test => testing}/instr_vperm.s  |    0
 .../{test => testing}/instr_vpermwi128.s      |    0
 .../{test => testing}/instr_vpkd3d128.s       |    0
 .../{test => testing}/instr_vpkshss.s         |    0
 .../{test => testing}/instr_vpkswss.s         |    0
 .../frontend/{test => testing}/instr_vrfin.s  |    0
 .../{test => testing}/instr_vrlimi128.s       |    0
 .../frontend/{test => testing}/instr_vsel.s   |    0
 .../frontend/{test => testing}/instr_vsl.s    |    0
 .../frontend/{test => testing}/instr_vslb.s   |    0
 .../frontend/{test => testing}/instr_vsldoi.s |    0
 .../frontend/{test => testing}/instr_vslh.s   |    0
 .../frontend/{test => testing}/instr_vslw.s   |    0
 .../frontend/{test => testing}/instr_vspltb.s |    0
 .../frontend/{test => testing}/instr_vsplth.s |    0
 .../{test => testing}/instr_vspltisb.s        |    0
 .../{test => testing}/instr_vspltish.s        |    0
 .../{test => testing}/instr_vspltisw.s        |    0
 .../frontend/{test => testing}/instr_vspltw.s |    0
 .../frontend/{test => testing}/instr_vsr.s    |    0
 .../{test => testing}/instr_vsubshs.s         |    0
 .../{test => testing}/instr_vsubuhm.s         |    0
 .../{test => testing}/instr_vupkd3d128.s      |    0
 .../{test => testing}/instr_vupkhsh.s         |    0
 .../{test => testing}/instr_vupklsh.s         |    0
 .../{test => testing}/jumptable_constants.s   |    0
 .../ppc_testing_main.cc}                      |    6 +-
 src/xenia/cpu/frontend/testing/premake5.lua   |   36 +
 .../{test => testing}/sequence_branch_carry.s |    0
 src/xenia/cpu/premake5.lua                    |   28 +
 src/xenia/cpu/test/xe-cpu-hir-test.cc         |   47 -
 src/xenia/cpu/test/xe-cpu-hir-test.vcxproj    |  149 --
 .../cpu/test/xe-cpu-hir-test.vcxproj.filters  |   45 -
 .../{test/test_add.cc => testing/add_test.cc} |    4 +-
 .../byte_swap_test.cc}                        |    4 +-
 .../extract_test.cc}                          |    4 +-
 .../test_insert.cc => testing/insert_test.cc} |    4 +-
 .../load_vector_shl_shr_test.cc}              |    4 +-
 .../test_pack.cc => testing/pack_test.cc}     |    4 +-
 .../permute_test.cc}                          |    4 +-
 src/xenia/cpu/testing/premake5.lua            |   17 +
 .../sandbox_main.cc}                          |    2 +-
 .../{test/test_sha.cc => testing/sha_test.cc} |    4 +-
 .../{test/test_shl.cc => testing/shl_test.cc} |    4 +-
 .../{test/test_shr.cc => testing/shr_test.cc} |    4 +-
 .../swizzle_test.cc}                          |    4 +-
 .../test_unpack.cc => testing/unpack_test.cc} |    4 +-
 src/xenia/cpu/{test => testing}/util.h        |   10 +-
 .../vector_add_test.cc}                       |    4 +-
 .../vector_max_test.cc}                       |    4 +-
 .../vector_min_test.cc}                       |    4 +-
 .../vector_rotate_left_test.cc}               |    4 +-
 .../vector_sha_test.cc}                       |    4 +-
 .../vector_shl_test.cc}                       |    4 +-
 .../vector_shr_test.cc}                       |    4 +-
 src/xenia/debug/premake5.lua                  |   18 +
 .../ui/{xe-debug-ui.cc => debugger_main.cc}   |    3 +-
 .../{resources.rc => debugger_resources.rc}   |    0
 src/xenia/debug/ui/main_window.cc             |    1 -
 src/xenia/debug/ui/premake5.lua               |   71 +
 src/xenia/gpu/gl4/premake5.lua                |   91 ++
 src/xenia/gpu/{ => gl4}/trace_viewer_main.cc  |    5 +-
 src/xenia/gpu/premake5.lua                    |   20 +
 src/xenia/hid/nop/premake5.lua                |   17 +
 src/xenia/hid/premake5.lua                    |   16 +
 src/xenia/hid/winkey/premake5.lua             |   17 +
 src/xenia/hid/xinput/premake5.lua             |   17 +
 src/xenia/kernel/debug_visualizers.natvis     |   12 +
 src/xenia/kernel/premake5.lua                 |   27 +
 src/xenia/premake5.lua                        |   18 +
 src/xenia/ui/gl/gl.h                          |    1 +
 src/xenia/ui/gl/premake5.lua                  |   22 +
 src/xenia/ui/premake5.lua                     |   18 +
 src/xenia/vfs/premake5.lua                    |   16 +
 third_party/beaengine.lua                     |   20 +
 third_party/capstone.lua                      |   43 +
 third_party/catch                             |    1 -
 third_party/elemental-forms                   |    2 +-
 third_party/flatc.vcxproj                     |  137 --
 third_party/flatc.vcxproj.filters             |   18 -
 third_party/gflags                            |    1 -
 third_party/glew.lua                          |   31 +
 third_party/imgui.lua                         |   21 +
 third_party/libgflags.vcxproj                 |  132 --
 third_party/libgflags.vcxproj.filters         |   21 -
 third_party/libglew.vcxproj                   |  123 --
 third_party/libglew.vcxproj.filters           |   15 -
 third_party/libimgui.vcxproj                  |  121 --
 third_party/libimgui.vcxproj.filters          |   13 -
 third_party/xxhash.lua                        |   17 +
 xb.bat                                        |  122 +-
 xenia.sln                                     |  198 ---
 xenia.vcxproj                                 |  126 --
 xenia.vcxproj.filters                         |   45 -
 208 files changed, 1112 insertions(+), 4162 deletions(-)
 delete mode 100644 build/Xenia.Cpp.x64.Checked.props
 delete mode 100644 build/Xenia.Cpp.x64.Clang.props
 delete mode 100644 build/Xenia.Cpp.x64.Common.props
 delete mode 100644 build/Xenia.Cpp.x64.Debug.props
 delete mode 100644 build/Xenia.Cpp.x64.Release.props
 create mode 160000 build_tools
 delete mode 100644 libxenia-base.vcxproj
 delete mode 100644 libxenia-base.vcxproj.filters
 delete mode 100644 libxenia.vcxproj
 delete mode 100644 libxenia.vcxproj.filters
 create mode 100644 premake5.lua
 create mode 100644 src/xenia/app/premake5.lua
 create mode 100644 src/xenia/apu/nop/premake5.lua
 create mode 100644 src/xenia/apu/premake5.lua
 create mode 100644 src/xenia/apu/xaudio2/premake5.lua
 rename vsdebuggervis.natvis => src/xenia/base/debug_visualizers.natvis (85%)
 create mode 100644 src/xenia/base/memory_test.cc
 create mode 100644 src/xenia/base/premake5.lua
 create mode 100644 src/xenia/cpu/backend/x64/premake5.lua
 delete mode 100644 src/xenia/cpu/frontend/test/xe-cpu-ppc-test.vcxproj
 delete mode 100644 src/xenia/cpu/frontend/test/xe-cpu-ppc-test.vcxproj.filters
 rename src/xenia/cpu/frontend/{test => testing}/README.md (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_add.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_addc.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_adde.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_addic.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_addis.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_addme.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_addze.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_and.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_andc.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_andi.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_andis.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_cmp.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_cmpi.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_cmpl.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_cmpli.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_cntlzd.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_cntlzw.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_divd.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_divdu.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_divw.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_divwu.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_eqv.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_extsb.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_extsh.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_extsw.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_fabs.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_fadd.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_fmadd.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_fmadds.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_fmul.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_fnabs.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_frsqrte.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_fsel.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_fsqrt.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_lvexx.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_lvl.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_lvr.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_lvsl.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_lvsr.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_mulhd.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_mulhdu.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_mulhw.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_mulhwu.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_mulld.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_mulli.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_mullw.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_neg.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_nor.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_ori.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_rldicl.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_rldicr.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_rlwimi.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_rlwinm.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_rlwnm.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_sld.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_slw.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_srad.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_sradi.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_sraw.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_srawi.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_srd.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_srw.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_stvew.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_stvl.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_stvr.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_subf.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_subfc.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_subfe.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_subfic.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_subfme.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_subfze.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_td.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_tdi.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_tw.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_twi.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vaddshs.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vadduhm.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vcfsx.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vcmpxxfp.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vctsxs.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vmaddfp.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vmrghb.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vmrghh.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vmrghw.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vmrglb.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vmrglh.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vmrglw.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vmsum4fp128.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vperm.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vpermwi128.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vpkd3d128.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vpkshss.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vpkswss.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vrfin.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vrlimi128.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vsel.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vsl.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vslb.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vsldoi.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vslh.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vslw.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vspltb.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vsplth.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vspltisb.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vspltish.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vspltisw.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vspltw.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vsr.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vsubshs.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vsubuhm.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vupkd3d128.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vupkhsh.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/instr_vupklsh.s (100%)
 rename src/xenia/cpu/frontend/{test => testing}/jumptable_constants.s (100%)
 rename src/xenia/cpu/frontend/{test/xe-cpu-ppc-test.cc => testing/ppc_testing_main.cc} (98%)
 create mode 100644 src/xenia/cpu/frontend/testing/premake5.lua
 rename src/xenia/cpu/frontend/{test => testing}/sequence_branch_carry.s (100%)
 create mode 100644 src/xenia/cpu/premake5.lua
 delete mode 100644 src/xenia/cpu/test/xe-cpu-hir-test.cc
 delete mode 100644 src/xenia/cpu/test/xe-cpu-hir-test.vcxproj
 delete mode 100644 src/xenia/cpu/test/xe-cpu-hir-test.vcxproj.filters
 rename src/xenia/cpu/{test/test_add.cc => testing/add_test.cc} (99%)
 rename src/xenia/cpu/{test/test_byte_swap.cc => testing/byte_swap_test.cc} (95%)
 rename src/xenia/cpu/{test/test_extract.cc => testing/extract_test.cc} (98%)
 rename src/xenia/cpu/{test/test_insert.cc => testing/insert_test.cc} (97%)
 rename src/xenia/cpu/{test/test_load_vector_shl_shr.cc => testing/load_vector_shl_shr_test.cc} (97%)
 rename src/xenia/cpu/{test/test_pack.cc => testing/pack_test.cc} (98%)
 rename src/xenia/cpu/{test/test_permute.cc => testing/permute_test.cc} (98%)
 create mode 100644 src/xenia/cpu/testing/premake5.lua
 rename src/xenia/cpu/{test/xe-cpu-sandbox.cc => testing/sandbox_main.cc} (97%)
 rename src/xenia/cpu/{test/test_sha.cc => testing/sha_test.cc} (98%)
 rename src/xenia/cpu/{test/test_shl.cc => testing/shl_test.cc} (98%)
 rename src/xenia/cpu/{test/test_shr.cc => testing/shr_test.cc} (99%)
 rename src/xenia/cpu/{test/test_swizzle.cc => testing/swizzle_test.cc} (96%)
 rename src/xenia/cpu/{test/test_unpack.cc => testing/unpack_test.cc} (98%)
 rename src/xenia/cpu/{test => testing}/util.h (96%)
 rename src/xenia/cpu/{test/test_vector_add.cc => testing/vector_add_test.cc} (99%)
 rename src/xenia/cpu/{test/test_vector_max.cc => testing/vector_max_test.cc} (98%)
 rename src/xenia/cpu/{test/test_vector_min.cc => testing/vector_min_test.cc} (98%)
 rename src/xenia/cpu/{test/test_vector_rotate_left.cc => testing/vector_rotate_left_test.cc} (97%)
 rename src/xenia/cpu/{test/test_vector_sha.cc => testing/vector_sha_test.cc} (98%)
 rename src/xenia/cpu/{test/test_vector_shl.cc => testing/vector_shl_test.cc} (98%)
 rename src/xenia/cpu/{test/test_vector_shr.cc => testing/vector_shr_test.cc} (98%)
 create mode 100644 src/xenia/debug/premake5.lua
 rename src/xenia/debug/ui/{xe-debug-ui.cc => debugger_main.cc} (89%)
 rename src/xenia/debug/ui/{resources.rc => debugger_resources.rc} (100%)
 create mode 100644 src/xenia/debug/ui/premake5.lua
 create mode 100644 src/xenia/gpu/gl4/premake5.lua
 rename src/xenia/gpu/{ => gl4}/trace_viewer_main.cc (99%)
 create mode 100644 src/xenia/gpu/premake5.lua
 create mode 100644 src/xenia/hid/nop/premake5.lua
 create mode 100644 src/xenia/hid/premake5.lua
 create mode 100644 src/xenia/hid/winkey/premake5.lua
 create mode 100644 src/xenia/hid/xinput/premake5.lua
 create mode 100644 src/xenia/kernel/debug_visualizers.natvis
 create mode 100644 src/xenia/kernel/premake5.lua
 create mode 100644 src/xenia/premake5.lua
 create mode 100644 src/xenia/ui/gl/premake5.lua
 create mode 100644 src/xenia/ui/premake5.lua
 create mode 100644 src/xenia/vfs/premake5.lua
 create mode 100644 third_party/beaengine.lua
 create mode 100644 third_party/capstone.lua
 delete mode 160000 third_party/catch
 delete mode 100644 third_party/flatc.vcxproj
 delete mode 100644 third_party/flatc.vcxproj.filters
 delete mode 160000 third_party/gflags
 create mode 100644 third_party/glew.lua
 create mode 100644 third_party/imgui.lua
 delete mode 100644 third_party/libgflags.vcxproj
 delete mode 100644 third_party/libgflags.vcxproj.filters
 delete mode 100644 third_party/libglew.vcxproj
 delete mode 100644 third_party/libglew.vcxproj.filters
 delete mode 100644 third_party/libimgui.vcxproj
 delete mode 100644 third_party/libimgui.vcxproj.filters
 create mode 100644 third_party/xxhash.lua
 delete mode 100644 xenia.sln
 delete mode 100644 xenia.vcxproj
 delete mode 100644 xenia.vcxproj.filters

diff --git a/.gitignore b/.gitignore
index 07dcdca2e..de9fdb99a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,8 +77,7 @@ scratch/
 
 .anvil-cache
 .build-cache/
-build/bin/
-build/obj/
+build/
 build-out/
 build-gen/
 build-bin/
diff --git a/.gitmodules b/.gitmodules
index aa8fa6ebd..225878c89 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,9 @@
-[submodule "third_party/gflags"]
-	path = third_party/gflags
-	url = https://github.com/benvanik/gflags.git
 [submodule "third_party/beaengine"]
 	path = third_party/beaengine
 	url = https://github.com/benvanik/beaengine.git
 [submodule "third_party/xbyak"]
 	path = third_party/xbyak
 	url = https://github.com/xenia-project/xbyak.git
-[submodule "third_party/catch"]
-	path = third_party/catch
-	url = https://github.com/philsquared/Catch.git
 [submodule "third_party/imgui"]
 	path = third_party/imgui
 	url = https://github.com/ocornut/imgui.git
@@ -28,3 +22,6 @@
 [submodule "third_party/elemental-forms"]
 	path = third_party/elemental-forms
 	url = https://github.com/xenia-project/elemental-forms.git
+[submodule "build_tools"]
+	path = build_tools
+	url = https://github.com/xenia-project/build-tools.git
diff --git a/README.md b/README.md
index f05cbdbf8..3f0a9f3f3 100644
--- a/README.md
+++ b/README.md
@@ -44,11 +44,11 @@ Windows 8.1+ with Python 2.7 and Visual Studio 2015 installed:
     > xb setup
     # Build on command line:
     > xb build
-    # Open Visual Studio (run the 'xenia' project):
+    # Open Visual Studio (run the 'xenia-app' project):
     > xb edit
 
 When fetching updates use `xb pull` to automatically fetch everything and
-update gyp files/etc.
+run premake for project files/etc.
 
 ## Building
 
diff --git a/build/Xenia.Cpp.x64.Checked.props b/build/Xenia.Cpp.x64.Checked.props
deleted file mode 100644
index 09a3d665a..000000000
--- a/build/Xenia.Cpp.x64.Checked.props
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <PreprocessorDefinitions>CHECKED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-    </ClCompile>
-    <Lib />
-    <Lib>
-      <AdditionalLibraryDirectories>$(SolutionDir)third_party\libav-xma-bin\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-    <Link>
-      <IgnoreSpecificDefaultLibraries />
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/build/Xenia.Cpp.x64.Clang.props b/build/Xenia.Cpp.x64.Clang.props
deleted file mode 100644
index 7c3b4ede3..000000000
--- a/build/Xenia.Cpp.x64.Clang.props
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <MultiProcessorCompilation>false</MultiProcessorCompilation>
-      <MinimalRebuild />
-      <ExceptionHandling>false</ExceptionHandling>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/build/Xenia.Cpp.x64.Common.props b/build/Xenia.Cpp.x64.Common.props
deleted file mode 100644
index 24ed4a356..000000000
--- a/build/Xenia.Cpp.x64.Common.props
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir>$(SolutionDir)build\bin\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\obj\$(Configuration)\$(MSBuildProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>$(SolutionDir)third_party\flatbuffers\include;$(SolutionDir)third_party\turbobadger\src;$(SolutionDir)third_party\gflags\src;$(SolutionDir)third_party\elemental-forms\src;$(SolutionDir)src;$(SolutionDir)third_party;$(SolutionDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>GLEW_STATIC=1;GLEW_MX=1;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;WIN32;_WIN64=1;_AMD64=1;MICROPROFILE_MAX_THREADS=128;CAPSTONE_X86_ATT_DISABLE;CAPSTONE_DIET_NO;CAPSTONE_X86_REDUCE_NO;CAPSTONE_HAS_X86;CAPSTONE_USE_SYS_DYN_MEM;XBYAK_NO_OP_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(SolutionDir)build\bin\$(Configuration)\</AdditionalLibraryDirectories>
-      <AdditionalDependencies>ntdll.lib;wsock32.lib;ws2_32.lib;xinput.lib;xaudio2.lib;glu32.lib;opengl32.lib;comctl32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalOptions>/ignore:4006 /ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-      <IgnoreSpecificDefaultLibraries>MSVCRTD</IgnoreSpecificDefaultLibraries>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>$(SolutionDir)build\bin\$(Configuration)\;$(SolutionDir)third_party\libav-xma-bin\lib\$(Configuration)</AdditionalLibraryDirectories>
-      <AdditionalOptions>/ignore:4006 /ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/build/Xenia.Cpp.x64.Debug.props b/build/Xenia.Cpp.x64.Debug.props
deleted file mode 100644
index 5734acae2..000000000
--- a/build/Xenia.Cpp.x64.Debug.props
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <MinimalRebuild>false</MinimalRebuild>
-      <PreprocessorDefinitions>_NO_DEBUG_HEAP=1;DEBUG;XE_DEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>
-      </BasicRuntimeChecks>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>Debug</GenerateDebugInformation>
-    </Link>
-    <Lib />
-    <Lib>
-      <AdditionalLibraryDirectories>$(SolutionDir)third_party\libav-xma-bin\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/build/Xenia.Cpp.x64.Release.props b/build/Xenia.Cpp.x64.Release.props
deleted file mode 100644
index e784ac2f9..000000000
--- a/build/Xenia.Cpp.x64.Release.props
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <ControlFlowGuard>false</ControlFlowGuard>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-    </ClCompile>
-    <Link>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/build_tools b/build_tools
new file mode 160000
index 000000000..b5ff34023
--- /dev/null
+++ b/build_tools
@@ -0,0 +1 @@
+Subproject commit b5ff34023b95625a9a7c9729bbf8ff1f0e9aab38
diff --git a/libxenia-base.vcxproj b/libxenia-base.vcxproj
deleted file mode 100644
index f0ac061d0..000000000
--- a/libxenia-base.vcxproj
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Checked|x64">
-      <Configuration>Checked</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Clang|x64">
-      <Configuration>Clang</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\xenia\base\arena.cc" />
-    <ClCompile Include="src\xenia\base\clock.cc" />
-    <ClCompile Include="src\xenia\base\clock_win.cc" />
-    <ClCompile Include="src\xenia\base\debugging_win.cc" />
-    <ClCompile Include="src\xenia\base\filesystem.cc" />
-    <ClCompile Include="src\xenia\base\filesystem_win.cc" />
-    <ClCompile Include="src\xenia\base\logging.cc" />
-    <ClCompile Include="src\xenia\base\mapped_memory_win.cc" />
-    <ClCompile Include="src\xenia\base\math.cc" />
-    <ClCompile Include="src\xenia\base\memory.cc" />
-    <ClCompile Include="src\xenia\base\memory_win.cc" />
-    <ClCompile Include="src\xenia\base\platform_win.cc" />
-    <ClCompile Include="src\xenia\base\ring_buffer.cc" />
-    <ClCompile Include="src\xenia\base\string.cc" />
-    <ClCompile Include="src\xenia\base\string_buffer.cc" />
-    <ClCompile Include="src\xenia\base\threading_win.cc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\xenia\base\arena.h" />
-    <ClInclude Include="src\xenia\base\assert.h" />
-    <ClInclude Include="src\xenia\base\atomic.h" />
-    <ClInclude Include="src\xenia\base\byte_order.h" />
-    <ClInclude Include="src\xenia\base\clock.h" />
-    <ClInclude Include="src\xenia\base\debugging.h" />
-    <ClInclude Include="src\xenia\base\delegate.h" />
-    <ClInclude Include="src\xenia\base\filesystem.h" />
-    <ClInclude Include="src\xenia\base\logging.h" />
-    <ClInclude Include="src\xenia\base\mapped_memory.h" />
-    <ClInclude Include="src\xenia\base\math.h" />
-    <ClInclude Include="src\xenia\base\memory.h" />
-    <ClInclude Include="src\xenia\base\mutex.h" />
-    <ClInclude Include="src\xenia\base\platform.h" />
-    <ClInclude Include="src\xenia\base\platform_win.h" />
-    <ClInclude Include="src\xenia\base\reset_scope.h" />
-    <ClInclude Include="src\xenia\base\ring_buffer.h" />
-    <ClInclude Include="src\xenia\base\string.h" />
-    <ClInclude Include="src\xenia\base\string_buffer.h" />
-    <ClInclude Include="src\xenia\base\threading.h" />
-    <ClInclude Include="src\xenia\base\type_pool.h" />
-    <ClInclude Include="src\xenia\base\vec128.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{93533067-6449-4691-88A8-026EBCFDCA97}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libxeniabase</RootNamespace>
-    <TargetPlatformVersion>8.1</TargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Clang|x64'">
-    <PlatformToolset>LLVM-vs2014</PlatformToolset>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="build\Xenia.Cpp.$(Platform).Common.props" />
-    <Import Project="build\Xenia.Cpp.$(Platform).$(Configuration).props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="build\Xenia.Cpp.$(Platform).Common.props" />
-    <Import Project="build\Xenia.Cpp.x64.Debug.props" />
-    <Import Project="build\Xenia.Cpp.$(Platform).$(Configuration).props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="build\Xenia.Cpp.$(Platform).Common.props" />
-    <Import Project="build\Xenia.Cpp.$(Platform).$(Configuration).props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Clang|x64'">
-    <Import Project="build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="build\Xenia.Cpp.x64.Debug.props" />
-    <Import Project="build\Xenia.Cpp.x64.Clang.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/libxenia-base.vcxproj.filters b/libxenia-base.vcxproj.filters
deleted file mode 100644
index 10b804bdd..000000000
--- a/libxenia-base.vcxproj.filters
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="src">
-      <UniqueIdentifier>{f20e4edb-dc80-4fb0-a1bf-76d2699f6358}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia">
-      <UniqueIdentifier>{2417e637-a3df-4149-8365-1e4f5424df45}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\base">
-      <UniqueIdentifier>{3382641c-71e8-422c-afbf-fe45cbeb0ca3}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\xenia\base\arena.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\clock.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\debugging_win.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\filesystem.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\filesystem_win.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\logging.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\mapped_memory_win.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\math.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\platform_win.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\ring_buffer.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\string.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\string_buffer.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\threading_win.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\clock_win.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\memory.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\base\memory_win.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\xenia\base\arena.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\assert.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\atomic.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\byte_order.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\clock.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\debugging.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\delegate.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\filesystem.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\logging.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\mapped_memory.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\math.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\memory.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\mutex.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\platform.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\reset_scope.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\ring_buffer.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\string.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\string_buffer.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\threading.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\type_pool.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\vec128.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\base\platform_win.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libxenia.vcxproj b/libxenia.vcxproj
deleted file mode 100644
index f0ce68fb1..000000000
--- a/libxenia.vcxproj
+++ /dev/null
@@ -1,641 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Checked|x64">
-      <Configuration>Checked</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Clang|x64">
-      <Configuration>Clang</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\xenia\apu\apu_flags.cc" />
-    <ClCompile Include="src\xenia\apu\audio_driver.cc" />
-    <ClCompile Include="src\xenia\apu\audio_system.cc" />
-    <ClCompile Include="src\xenia\apu\nop\nop_apu_flags.cc" />
-    <ClCompile Include="src\xenia\apu\nop\nop_audio_system.cc" />
-    <ClCompile Include="src\xenia\apu\xaudio2\xaudio2_apu_flags.cc" />
-    <ClCompile Include="src\xenia\apu\xaudio2\xaudio2_audio_driver.cc" />
-    <ClCompile Include="src\xenia\apu\xaudio2\xaudio2_audio_system.cc" />
-    <ClCompile Include="src\xenia\apu\xma_context.cc" />
-    <ClCompile Include="src\xenia\apu\xma_decoder.cc" />
-    <ClCompile Include="src\xenia\cpu\backend\assembler.cc" />
-    <ClCompile Include="src\xenia\cpu\backend\backend.cc" />
-    <ClCompile Include="src\xenia\cpu\backend\x64\x64_assembler.cc" />
-    <ClCompile Include="src\xenia\cpu\backend\x64\x64_backend.cc" />
-    <ClCompile Include="src\xenia\cpu\backend\x64\x64_code_cache.cc" />
-    <ClCompile Include="src\xenia\cpu\backend\x64\x64_emitter.cc" />
-    <ClCompile Include="src\xenia\cpu\backend\x64\x64_function.cc" />
-    <ClCompile Include="src\xenia\cpu\backend\x64\x64_sequences.cc" />
-    <ClCompile Include="src\xenia\cpu\backend\x64\x64_tracers.cc" />
-    <ClCompile Include="src\xenia\cpu\compiler\compiler.cc" />
-    <ClCompile Include="src\xenia\cpu\compiler\compiler_pass.cc" />
-    <ClCompile Include="src\xenia\cpu\compiler\passes\constant_propagation_pass.cc" />
-    <ClCompile Include="src\xenia\cpu\compiler\passes\context_promotion_pass.cc" />
-    <ClCompile Include="src\xenia\cpu\compiler\passes\control_flow_analysis_pass.cc" />
-    <ClCompile Include="src\xenia\cpu\compiler\passes\control_flow_simplification_pass.cc" />
-    <ClCompile Include="src\xenia\cpu\compiler\passes\data_flow_analysis_pass.cc" />
-    <ClCompile Include="src\xenia\cpu\compiler\passes\dead_code_elimination_pass.cc" />
-    <ClCompile Include="src\xenia\cpu\compiler\passes\finalization_pass.cc" />
-    <ClCompile Include="src\xenia\cpu\compiler\passes\memory_sequence_combination_pass.cc" />
-    <ClCompile Include="src\xenia\cpu\compiler\passes\register_allocation_pass.cc" />
-    <ClCompile Include="src\xenia\cpu\compiler\passes\simplification_pass.cc" />
-    <ClCompile Include="src\xenia\cpu\compiler\passes\validation_pass.cc" />
-    <ClCompile Include="src\xenia\cpu\compiler\passes\value_reduction_pass.cc" />
-    <ClCompile Include="src\xenia\cpu\cpu_flags.cc" />
-    <ClCompile Include="src\xenia\cpu\debug_info.cc" />
-    <ClCompile Include="src\xenia\cpu\entry_table.cc" />
-    <ClCompile Include="src\xenia\cpu\export_resolver.cc" />
-    <ClCompile Include="src\xenia\cpu\frontend\context_info.cc" />
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_context.cc" />
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_disasm.cc" />
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_emit_altivec.cc" />
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_emit_alu.cc" />
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_emit_control.cc" />
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_emit_fpu.cc" />
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_emit_memory.cc" />
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_frontend.cc" />
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_hir_builder.cc" />
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_instr.cc" />
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_scanner.cc" />
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_translator.cc" />
-    <ClCompile Include="src\xenia\cpu\function.cc" />
-    <ClCompile Include="src\xenia\cpu\hir\block.cc" />
-    <ClCompile Include="src\xenia\cpu\hir\hir_builder.cc" />
-    <ClCompile Include="src\xenia\cpu\hir\instr.cc" />
-    <ClCompile Include="src\xenia\cpu\hir\opcodes.cc" />
-    <ClCompile Include="src\xenia\cpu\hir\value.cc" />
-    <ClCompile Include="src\xenia\cpu\instrument.cc" />
-    <ClCompile Include="src\xenia\cpu\mmio_handler.cc" />
-    <ClCompile Include="src\xenia\cpu\mmio_handler_win.cc" />
-    <ClCompile Include="src\xenia\cpu\module.cc" />
-    <ClCompile Include="src\xenia\cpu\processor.cc" />
-    <ClCompile Include="src\xenia\cpu\raw_module.cc" />
-    <ClCompile Include="src\xenia\cpu\symbol_info.cc" />
-    <ClCompile Include="src\xenia\cpu\test_module.cc" />
-    <ClCompile Include="src\xenia\cpu\thread_state.cc" />
-    <ClCompile Include="src\xenia\cpu\xex_module.cc" />
-    <ClCompile Include="src\xenia\debug\debugger.cc" />
-    <ClCompile Include="src\xenia\emulator.cc" />
-    <ClCompile Include="src\xenia\gpu\gl4\command_processor.cc" />
-    <ClCompile Include="src\xenia\gpu\gl4\draw_batcher.cc" />
-    <ClCompile Include="src\xenia\gpu\gl4\gl4_gpu_flags.cc" />
-    <ClCompile Include="src\xenia\gpu\gl4\gl4_graphics_system.cc" />
-    <ClCompile Include="src\xenia\gpu\gl4\gl4_shader.cc" />
-    <ClCompile Include="src\xenia\gpu\gl4\gl4_shader_translator.cc" />
-    <ClCompile Include="src\xenia\gpu\gl4\texture_cache.cc" />
-    <ClCompile Include="src\xenia\gpu\gpu_flags.cc" />
-    <ClCompile Include="src\xenia\gpu\graphics_system.cc" />
-    <ClCompile Include="src\xenia\gpu\register_file.cc" />
-    <ClCompile Include="src\xenia\gpu\sampler_info.cc" />
-    <ClCompile Include="src\xenia\gpu\shader.cc" />
-    <ClCompile Include="src\xenia\gpu\texture_info.cc" />
-    <ClCompile Include="src\xenia\gpu\tracing.cc" />
-    <ClCompile Include="src\xenia\gpu\ucode_disassembler.cc" />
-    <ClCompile Include="src\xenia\hid\hid_flags.cc" />
-    <ClCompile Include="src\xenia\hid\input_driver.cc" />
-    <ClCompile Include="src\xenia\hid\input_system.cc" />
-    <ClCompile Include="src\xenia\hid\nop\nop_hid.cc" />
-    <ClCompile Include="src\xenia\hid\nop\nop_input_driver.cc" />
-    <ClCompile Include="src\xenia\hid\winkey\winkey_hid.cc" />
-    <ClCompile Include="src\xenia\hid\winkey\winkey_input_driver.cc" />
-    <ClCompile Include="src\xenia\hid\xinput\xinput_hid.cc" />
-    <ClCompile Include="src\xenia\hid\xinput\xinput_input_driver.cc" />
-    <ClCompile Include="src\xenia\kernel\app.cc" />
-    <ClCompile Include="src\xenia\kernel\apps\apps.cc" />
-    <ClCompile Include="src\xenia\kernel\apps\xgi_app.cc" />
-    <ClCompile Include="src\xenia\kernel\apps\xlivebase_app.cc" />
-    <ClCompile Include="src\xenia\kernel\apps\xmp_app.cc" />
-    <ClCompile Include="src\xenia\kernel\async_request.cc" />
-    <ClCompile Include="src\xenia\kernel\content_manager.cc" />
-    <ClCompile Include="src\xenia\kernel\dispatcher.cc" />
-    <ClCompile Include="src\xenia\kernel\kernel_state.cc" />
-    <ClCompile Include="src\xenia\kernel\native_list.cc" />
-    <ClCompile Include="src\xenia\kernel\objects\xenumerator.cc" />
-    <ClCompile Include="src\xenia\kernel\objects\xevent.cc" />
-    <ClCompile Include="src\xenia\kernel\objects\xfile.cc" />
-    <ClCompile Include="src\xenia\kernel\objects\xkernel_module.cc" />
-    <ClCompile Include="src\xenia\kernel\objects\xmodule.cc" />
-    <ClCompile Include="src\xenia\kernel\objects\xmutant.cc" />
-    <ClCompile Include="src\xenia\kernel\objects\xnotify_listener.cc" />
-    <ClCompile Include="src\xenia\kernel\objects\xsemaphore.cc" />
-    <ClCompile Include="src\xenia\kernel\objects\xthread.cc" />
-    <ClCompile Include="src\xenia\kernel\objects\xtimer.cc" />
-    <ClCompile Include="src\xenia\kernel\objects\xuser_module.cc" />
-    <ClCompile Include="src\xenia\kernel\object_table.cc" />
-    <ClCompile Include="src\xenia\kernel\user_profile.cc" />
-    <ClCompile Include="src\xenia\kernel\util\shim_utils.cc" />
-    <ClCompile Include="src\xenia\kernel\util\xex2.cc" />
-    <ClCompile Include="src\xenia\kernel\xam_avatar.cc" />
-    <ClCompile Include="src\xenia\kernel\xam_content.cc" />
-    <ClCompile Include="src\xenia\kernel\xam_info.cc" />
-    <ClCompile Include="src\xenia\kernel\xam_input.cc" />
-    <ClCompile Include="src\xenia\kernel\xam_module.cc" />
-    <ClCompile Include="src\xenia\kernel\xam_msg.cc" />
-    <ClCompile Include="src\xenia\kernel\xam_net.cc" />
-    <ClCompile Include="src\xenia\kernel\xam_notify.cc" />
-    <ClCompile Include="src\xenia\kernel\xam_nui.cc" />
-    <ClCompile Include="src\xenia\kernel\xam_ui.cc" />
-    <ClCompile Include="src\xenia\kernel\xam_user.cc" />
-    <ClCompile Include="src\xenia\kernel\xam_video.cc" />
-    <ClCompile Include="src\xenia\kernel\xam_voice.cc" />
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_audio.cc" />
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_audio_xma.cc" />
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_crypt.cc" />
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_debug.cc" />
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_hal.cc" />
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_io.cc" />
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_memory.cc" />
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_misc.cc" />
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_module.cc" />
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_modules.cc" />
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_ob.cc" />
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_rtl.cc" />
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_error.cc" />
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_strings.cc" />
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_threading.cc" />
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_usbcam.cc" />
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_video.cc" />
-    <ClCompile Include="src\xenia\kernel\xobject.cc" />
-    <ClCompile Include="src\xenia\memory.cc" />
-    <ClCompile Include="src\xenia\profiling.cc" />
-    <ClCompile Include="src\xenia\ui\file_picker_win.cc" />
-    <ClCompile Include="src\xenia\ui\gl\blitter.cc" />
-    <ClCompile Include="src\xenia\ui\gl\circular_buffer.cc" />
-    <ClCompile Include="src\xenia\ui\gl\gl4_elemental_renderer.cc" />
-    <ClCompile Include="src\xenia\ui\gl\gl_context.cc" />
-    <ClCompile Include="src\xenia\ui\gl\gl_profiler_display.cc" />
-    <ClCompile Include="src\xenia\ui\graphics_context.cc" />
-    <ClCompile Include="src\xenia\ui\loop.cc" />
-    <ClCompile Include="src\xenia\ui\loop_win.cc" />
-    <ClCompile Include="src\xenia\ui\window.cc" />
-    <ClCompile Include="src\xenia\ui\menu_item.cc" />
-    <ClCompile Include="src\xenia\ui\window_win.cc" />
-    <ClCompile Include="src\xenia\vfs\device.cc" />
-    <ClCompile Include="src\xenia\vfs\devices\disc_image_device.cc" />
-    <ClCompile Include="src\xenia\vfs\devices\disc_image_entry.cc" />
-    <ClCompile Include="src\xenia\vfs\devices\disc_image_file.cc" />
-    <ClCompile Include="src\xenia\vfs\devices\host_path_device.cc" />
-    <ClCompile Include="src\xenia\vfs\devices\host_path_entry.cc" />
-    <ClCompile Include="src\xenia\vfs\devices\host_path_file.cc" />
-    <ClCompile Include="src\xenia\vfs\devices\stfs_container_device.cc" />
-    <ClCompile Include="src\xenia\vfs\devices\stfs_container_entry.cc" />
-    <ClCompile Include="src\xenia\vfs\devices\stfs_container_file.cc" />
-    <ClCompile Include="src\xenia\vfs\entry.cc" />
-    <ClCompile Include="src\xenia\vfs\virtual_file_system.cc" />
-    <ClCompile Include="third_party\beaengine\beaengineSources\BeaEngine.c" />
-    <ClCompile Include="third_party\capstone\arch\X86\X86Disassembler.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Clang|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">CompileAsCpp</CompileAs>
-    </ClCompile>
-    <ClCompile Include="third_party\capstone\arch\X86\X86DisassemblerDecoder.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Clang|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">CompileAsCpp</CompileAs>
-    </ClCompile>
-    <ClCompile Include="third_party\capstone\arch\X86\X86IntelInstPrinter.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Clang|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">CompileAsCpp</CompileAs>
-    </ClCompile>
-    <ClCompile Include="third_party\capstone\arch\X86\X86Mapping.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Clang|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">CompileAsCpp</CompileAs>
-    </ClCompile>
-    <ClCompile Include="third_party\capstone\arch\X86\X86Module.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Clang|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">CompileAsCpp</CompileAs>
-    </ClCompile>
-    <ClCompile Include="third_party\capstone\cs.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Clang|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">CompileAsCpp</CompileAs>
-    </ClCompile>
-    <ClCompile Include="third_party\capstone\MCInst.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Clang|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">CompileAsCpp</CompileAs>
-    </ClCompile>
-    <ClCompile Include="third_party\capstone\MCInstrDesc.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Clang|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">CompileAsCpp</CompileAs>
-    </ClCompile>
-    <ClCompile Include="third_party\capstone\MCRegisterInfo.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Clang|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">CompileAsCpp</CompileAs>
-    </ClCompile>
-    <ClCompile Include="third_party\capstone\SStream.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Clang|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">CompileAsCpp</CompileAs>
-    </ClCompile>
-    <ClCompile Include="third_party\capstone\utils.c">
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Clang|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
-      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">CompileAsCpp</CompileAs>
-    </ClCompile>
-    <ClCompile Include="third_party\mspack\lzxd.c" />
-    <ClCompile Include="third_party\xxhash\xxhash.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\xenia\apu\apu_flags.h" />
-    <ClInclude Include="src\xenia\apu\audio_driver.h" />
-    <ClInclude Include="src\xenia\apu\audio_system.h" />
-    <ClInclude Include="src\xenia\apu\nop\nop_apu_flags.h" />
-    <ClInclude Include="src\xenia\apu\nop\nop_audio_system.h" />
-    <ClInclude Include="src\xenia\apu\xaudio2\xaudio2_apu_flags.h" />
-    <ClInclude Include="src\xenia\apu\xaudio2\xaudio2_audio_driver.h" />
-    <ClInclude Include="src\xenia\apu\xaudio2\xaudio2_audio_system.h" />
-    <ClInclude Include="src\xenia\apu\xma_context.h" />
-    <ClInclude Include="src\xenia\apu\xma_decoder.h" />
-    <ClInclude Include="src\xenia\cpu\backend\assembler.h" />
-    <ClInclude Include="src\xenia\cpu\backend\backend.h" />
-    <ClInclude Include="src\xenia\cpu\backend\code_cache.h" />
-    <ClInclude Include="src\xenia\cpu\backend\machine_info.h" />
-    <ClInclude Include="src\xenia\cpu\backend\x64\x64_assembler.h" />
-    <ClInclude Include="src\xenia\cpu\backend\x64\x64_backend.h" />
-    <ClInclude Include="src\xenia\cpu\backend\x64\x64_code_cache.h" />
-    <ClInclude Include="src\xenia\cpu\backend\x64\x64_emitter.h" />
-    <ClInclude Include="src\xenia\cpu\backend\x64\x64_function.h" />
-    <ClInclude Include="src\xenia\cpu\backend\x64\x64_sequences.h" />
-    <ClInclude Include="src\xenia\cpu\backend\x64\x64_stack_layout.h" />
-    <ClInclude Include="src\xenia\cpu\backend\x64\x64_tracers.h" />
-    <ClInclude Include="src\xenia\cpu\compiler\compiler.h" />
-    <ClInclude Include="src\xenia\cpu\compiler\compiler_pass.h" />
-    <ClInclude Include="src\xenia\cpu\compiler\compiler_passes.h" />
-    <ClInclude Include="src\xenia\cpu\compiler\passes\constant_propagation_pass.h" />
-    <ClInclude Include="src\xenia\cpu\compiler\passes\context_promotion_pass.h" />
-    <ClInclude Include="src\xenia\cpu\compiler\passes\control_flow_analysis_pass.h" />
-    <ClInclude Include="src\xenia\cpu\compiler\passes\control_flow_simplification_pass.h" />
-    <ClInclude Include="src\xenia\cpu\compiler\passes\data_flow_analysis_pass.h" />
-    <ClInclude Include="src\xenia\cpu\compiler\passes\dead_code_elimination_pass.h" />
-    <ClInclude Include="src\xenia\cpu\compiler\passes\finalization_pass.h" />
-    <ClInclude Include="src\xenia\cpu\compiler\passes\memory_sequence_combination_pass.h" />
-    <ClInclude Include="src\xenia\cpu\compiler\passes\register_allocation_pass.h" />
-    <ClInclude Include="src\xenia\cpu\compiler\passes\simplification_pass.h" />
-    <ClInclude Include="src\xenia\cpu\compiler\passes\validation_pass.h" />
-    <ClInclude Include="src\xenia\cpu\compiler\passes\value_reduction_pass.h" />
-    <ClInclude Include="src\xenia\cpu\cpu_flags.h" />
-    <ClInclude Include="src\xenia\cpu\debug_info.h" />
-    <ClInclude Include="src\xenia\cpu\entry_table.h" />
-    <ClInclude Include="src\xenia\cpu\export_resolver.h" />
-    <ClInclude Include="src\xenia\cpu\frontend\context_info.h" />
-    <ClInclude Include="src\xenia\cpu\frontend\ppc_context.h" />
-    <ClInclude Include="src\xenia\cpu\frontend\ppc_disasm.h" />
-    <ClInclude Include="src\xenia\cpu\frontend\ppc_emit-private.h" />
-    <ClInclude Include="src\xenia\cpu\frontend\ppc_emit.h" />
-    <ClInclude Include="src\xenia\cpu\frontend\ppc_frontend.h" />
-    <ClInclude Include="src\xenia\cpu\frontend\ppc_hir_builder.h" />
-    <ClInclude Include="src\xenia\cpu\frontend\ppc_instr.h" />
-    <ClInclude Include="src\xenia\cpu\frontend\ppc_instr_tables.h" />
-    <ClInclude Include="src\xenia\cpu\frontend\ppc_scanner.h" />
-    <ClInclude Include="src\xenia\cpu\frontend\ppc_translator.h" />
-    <ClInclude Include="src\xenia\cpu\function.h" />
-    <ClInclude Include="src\xenia\cpu\hir\block.h" />
-    <ClInclude Include="src\xenia\cpu\hir\hir_builder.h" />
-    <ClInclude Include="src\xenia\cpu\hir\instr.h" />
-    <ClInclude Include="src\xenia\cpu\hir\label.h" />
-    <ClInclude Include="src\xenia\cpu\hir\opcodes.h" />
-    <ClInclude Include="src\xenia\cpu\hir\value.h" />
-    <ClInclude Include="src\xenia\cpu\instrument.h" />
-    <ClInclude Include="src\xenia\cpu\mmio_handler.h" />
-    <ClInclude Include="src\xenia\cpu\module.h" />
-    <ClInclude Include="src\xenia\cpu\processor.h" />
-    <ClInclude Include="src\xenia\cpu\raw_module.h" />
-    <ClInclude Include="src\xenia\cpu\symbol_info.h" />
-    <ClInclude Include="src\xenia\cpu\test_module.h" />
-    <ClInclude Include="src\xenia\cpu\thread_state.h" />
-    <ClInclude Include="src\xenia\cpu\xex_module.h" />
-    <ClInclude Include="src\xenia\debug\breakpoint.h" />
-    <ClInclude Include="src\xenia\debug\debugger.h" />
-    <ClInclude Include="src\xenia\debug\function_trace_data.h" />
-    <ClInclude Include="src\xenia\debug\proto\breakpoints_generated.h" />
-    <ClInclude Include="src\xenia\debug\proto\common_generated.h" />
-    <ClInclude Include="src\xenia\debug\proto\control_generated.h" />
-    <ClInclude Include="src\xenia\debug\proto\messages_generated.h" />
-    <ClInclude Include="src\xenia\debug\proto\modules_generated.h" />
-    <ClInclude Include="src\xenia\debug\proto\threads_generated.h" />
-    <ClInclude Include="src\xenia\emulator.h" />
-    <ClInclude Include="src\xenia\gpu\gl4\command_processor.h" />
-    <ClInclude Include="src\xenia\gpu\gl4\draw_batcher.h" />
-    <ClInclude Include="src\xenia\gpu\gl4\gl4_gpu_flags.h" />
-    <ClInclude Include="src\xenia\gpu\gl4\gl4_graphics_system.h" />
-    <ClInclude Include="src\xenia\gpu\gl4\gl4_shader.h" />
-    <ClInclude Include="src\xenia\gpu\gl4\gl4_shader_translator.h" />
-    <ClInclude Include="src\xenia\gpu\gl4\texture_cache.h" />
-    <ClInclude Include="src\xenia\gpu\gpu_flags.h" />
-    <ClInclude Include="src\xenia\gpu\graphics_system.h" />
-    <ClInclude Include="src\xenia\gpu\register_file.h" />
-    <ClInclude Include="src\xenia\gpu\sampler_info.h" />
-    <ClInclude Include="src\xenia\gpu\shader.h" />
-    <ClInclude Include="src\xenia\gpu\texture_info.h" />
-    <ClInclude Include="src\xenia\gpu\tracing.h" />
-    <ClInclude Include="src\xenia\gpu\ucode.h" />
-    <ClInclude Include="src\xenia\gpu\ucode_disassembler.h" />
-    <ClInclude Include="src\xenia\gpu\xenos.h" />
-    <ClInclude Include="src\xenia\hid\hid_flags.h" />
-    <ClInclude Include="src\xenia\hid\input.h" />
-    <ClInclude Include="src\xenia\hid\input_driver.h" />
-    <ClInclude Include="src\xenia\hid\input_system.h" />
-    <ClInclude Include="src\xenia\hid\nop\nop_hid.h" />
-    <ClInclude Include="src\xenia\hid\nop\nop_input_driver.h" />
-    <ClInclude Include="src\xenia\hid\winkey\winkey_hid.h" />
-    <ClInclude Include="src\xenia\hid\winkey\winkey_input_driver.h" />
-    <ClInclude Include="src\xenia\hid\xinput\xinput_hid.h" />
-    <ClInclude Include="src\xenia\hid\xinput\xinput_input_driver.h" />
-    <ClInclude Include="src\xenia\kernel\app.h" />
-    <ClInclude Include="src\xenia\kernel\apps\apps.h" />
-    <ClInclude Include="src\xenia\kernel\apps\xgi_app.h" />
-    <ClInclude Include="src\xenia\kernel\apps\xlivebase_app.h" />
-    <ClInclude Include="src\xenia\kernel\apps\xmp_app.h" />
-    <ClInclude Include="src\xenia\kernel\async_request.h" />
-    <ClInclude Include="src\xenia\kernel\content_manager.h" />
-    <ClInclude Include="src\xenia\kernel\dispatcher.h" />
-    <ClInclude Include="src\xenia\kernel\kernel.h" />
-    <ClInclude Include="src\xenia\kernel\kernel_state.h" />
-    <ClInclude Include="src\xenia\kernel\modules.h" />
-    <ClInclude Include="src\xenia\kernel\native_list.h" />
-    <ClInclude Include="src\xenia\kernel\objects\xenumerator.h" />
-    <ClInclude Include="src\xenia\kernel\objects\xevent.h" />
-    <ClInclude Include="src\xenia\kernel\objects\xfile.h" />
-    <ClInclude Include="src\xenia\kernel\objects\xkernel_module.h" />
-    <ClInclude Include="src\xenia\kernel\objects\xmodule.h" />
-    <ClInclude Include="src\xenia\kernel\objects\xmutant.h" />
-    <ClInclude Include="src\xenia\kernel\objects\xnotify_listener.h" />
-    <ClInclude Include="src\xenia\kernel\objects\xsemaphore.h" />
-    <ClInclude Include="src\xenia\kernel\objects\xthread.h" />
-    <ClInclude Include="src\xenia\kernel\objects\xtimer.h" />
-    <ClInclude Include="src\xenia\kernel\objects\xuser_module.h" />
-    <ClInclude Include="src\xenia\kernel\object_table.h" />
-    <ClInclude Include="src\xenia\kernel\user_profile.h" />
-    <ClInclude Include="src\xenia\kernel\util\shim_utils.h" />
-    <ClInclude Include="src\xenia\kernel\util\xex2.h" />
-    <ClInclude Include="src\xenia\kernel\util\xex2_info.h" />
-    <ClInclude Include="src\xenia\kernel\xam_module.h" />
-    <ClInclude Include="src\xenia\kernel\xam_ordinals.h" />
-    <ClInclude Include="src\xenia\kernel\xam_private.h" />
-    <ClInclude Include="src\xenia\kernel\xboxkrnl_module.h" />
-    <ClInclude Include="src\xenia\kernel\xboxkrnl_ordinals.h" />
-    <ClInclude Include="src\xenia\kernel\xboxkrnl_private.h" />
-    <ClInclude Include="src\xenia\kernel\xboxkrnl_rtl.h" />
-    <ClInclude Include="src\xenia\kernel\xobject.h" />
-    <ClInclude Include="src\xenia\memory.h" />
-    <ClInclude Include="src\xenia\profiling.h" />
-    <ClInclude Include="src\xenia\ui\file_picker.h" />
-    <ClInclude Include="src\xenia\ui\gl\blitter.h" />
-    <ClInclude Include="src\xenia\ui\gl\circular_buffer.h" />
-    <ClInclude Include="src\xenia\ui\gl\gl.h" />
-    <ClInclude Include="src\xenia\ui\gl\gl4_elemental_renderer.h" />
-    <ClInclude Include="src\xenia\ui\gl\gl_context.h" />
-    <ClInclude Include="src\xenia\ui\gl\gl_profiler_display.h" />
-    <ClInclude Include="src\xenia\ui\graphics_context.h" />
-    <ClInclude Include="src\xenia\ui\loop.h" />
-    <ClInclude Include="src\xenia\ui\loop_win.h" />
-    <ClInclude Include="src\xenia\ui\menu_item.h" />
-    <ClInclude Include="src\xenia\ui\ui_event.h" />
-    <ClInclude Include="src\xenia\ui\window.h" />
-    <ClInclude Include="src\xenia\ui\window_win.h" />
-    <ClInclude Include="src\xenia\vfs\device.h" />
-    <ClInclude Include="src\xenia\vfs\devices\disc_image_device.h" />
-    <ClInclude Include="src\xenia\vfs\devices\disc_image_entry.h" />
-    <ClInclude Include="src\xenia\vfs\devices\disc_image_file.h" />
-    <ClInclude Include="src\xenia\vfs\devices\host_path_device.h" />
-    <ClInclude Include="src\xenia\vfs\devices\host_path_entry.h" />
-    <ClInclude Include="src\xenia\vfs\devices\host_path_file.h" />
-    <ClInclude Include="src\xenia\vfs\devices\stfs_container_device.h" />
-    <ClInclude Include="src\xenia\vfs\devices\stfs_container_entry.h" />
-    <ClInclude Include="src\xenia\vfs\devices\stfs_container_file.h" />
-    <ClInclude Include="src\xenia\vfs\entry.h" />
-    <ClInclude Include="src\xenia\vfs\virtual_file_system.h" />
-    <ClInclude Include="src\xenia\xbox.h" />
-    <ClInclude Include="third_party\beaengine\include\beaengine\basic_types.h" />
-    <ClInclude Include="third_party\beaengine\include\beaengine\BeaEngine.h" />
-    <ClInclude Include="third_party\beaengine\include\beaengine\export.h" />
-    <ClInclude Include="third_party\beaengine\include\beaengine\macros.h" />
-    <ClInclude Include="third_party\capstone\arch\X86\X86BaseInfo.h" />
-    <ClInclude Include="third_party\capstone\arch\X86\X86Disassembler.h" />
-    <ClInclude Include="third_party\capstone\arch\X86\X86DisassemblerDecoder.h" />
-    <ClInclude Include="third_party\capstone\arch\X86\X86DisassemblerDecoderCommon.h" />
-    <ClInclude Include="third_party\capstone\arch\X86\X86InstPrinter.h" />
-    <ClInclude Include="third_party\capstone\arch\X86\X86Mapping.h" />
-    <ClInclude Include="third_party\capstone\cs_priv.h" />
-    <ClInclude Include="third_party\capstone\include\capstone.h" />
-    <ClInclude Include="third_party\capstone\include\platform.h" />
-    <ClInclude Include="third_party\capstone\include\x86.h" />
-    <ClInclude Include="third_party\capstone\LEB128.h" />
-    <ClInclude Include="third_party\capstone\MathExtras.h" />
-    <ClInclude Include="third_party\capstone\MCDisassembler.h" />
-    <ClInclude Include="third_party\capstone\MCFixedLenDisassembler.h" />
-    <ClInclude Include="third_party\capstone\MCInst.h" />
-    <ClInclude Include="third_party\capstone\MCInstrDesc.h" />
-    <ClInclude Include="third_party\capstone\MCRegisterInfo.h" />
-    <ClInclude Include="third_party\capstone\myinttypes.h" />
-    <ClInclude Include="third_party\capstone\SStream.h" />
-    <ClInclude Include="third_party\capstone\utils.h" />
-    <ClInclude Include="third_party\flatbuffers\include\flatbuffers\flatbuffers.h" />
-    <ClInclude Include="third_party\llvm\include\llvm\ADT\BitVector.h" />
-    <ClInclude Include="third_party\llvm\include\llvm\Support\Compiler.h" />
-    <ClInclude Include="third_party\llvm\include\llvm\Support\MathExtras.h" />
-    <ClInclude Include="third_party\llvm\include\llvm\Support\type_traits.h" />
-    <ClInclude Include="third_party\microprofile\microprofile.h" />
-    <ClInclude Include="third_party\microprofile\microprofileui.h" />
-    <ClInclude Include="third_party\mspack\lzx.h" />
-    <ClInclude Include="third_party\mspack\mspack.h" />
-    <ClInclude Include="third_party\pe\pe_image.h" />
-    <ClInclude Include="third_party\xbyak\xbyak\xbyak.h" />
-    <ClInclude Include="third_party\xbyak\xbyak\xbyak_bin2hex.h" />
-    <ClInclude Include="third_party\xbyak\xbyak\xbyak_mnemonic.h" />
-    <ClInclude Include="third_party\xbyak\xbyak\xbyak_util.h" />
-    <ClInclude Include="third_party\xxhash\xxhash.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="src\xenia\cpu\hir\opcodes.inl" />
-    <None Include="src\xenia\debug\proto\breakpoints.fbs" />
-    <None Include="src\xenia\debug\proto\common.fbs" />
-    <None Include="src\xenia\debug\proto\control.fbs" />
-    <None Include="src\xenia\debug\proto\messages.fbs" />
-    <None Include="src\xenia\debug\proto\modules.fbs" />
-    <None Include="src\xenia\debug\proto\threads.fbs" />
-    <None Include="src\xenia\gpu\register_table.inc" />
-    <None Include="src\xenia\kernel\util\export_table_post.inc" />
-    <None Include="src\xenia\kernel\util\export_table_pre.inc" />
-    <None Include="src\xenia\kernel\util\ordinal_table_post.inc" />
-    <None Include="src\xenia\kernel\util\ordinal_table_pre.inc" />
-    <None Include="src\xenia\kernel\xam_table.inc" />
-    <None Include="src\xenia\kernel\xboxkrnl_table.inc" />
-    <None Include="third_party\capstone\arch\X86\X86GenAsmWriter.inc" />
-    <None Include="third_party\capstone\arch\X86\X86GenAsmWriter1.inc" />
-    <None Include="third_party\capstone\arch\X86\X86GenAsmWriter1_reduce.inc" />
-    <None Include="third_party\capstone\arch\X86\X86GenAsmWriter_reduce.inc" />
-    <None Include="third_party\capstone\arch\X86\X86GenDisassemblerTables.inc" />
-    <None Include="third_party\capstone\arch\X86\X86GenDisassemblerTables_reduce.inc" />
-    <None Include="third_party\capstone\arch\X86\X86GenInstrInfo.inc" />
-    <None Include="third_party\capstone\arch\X86\X86GenInstrInfo_reduce.inc" />
-    <None Include="third_party\capstone\arch\X86\X86GenRegisterInfo.inc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Natvis Include="vsdebuggervis.natvis" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{0CE149F6-41C3-4224-9E57-C02E8C7CD312}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libxenia</RootNamespace>
-    <TargetPlatformVersion>8.1</TargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Clang|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>LLVM-vs2014</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="build\Xenia.Cpp.$(Platform).Common.props" />
-    <Import Project="build\Xenia.Cpp.$(Platform).$(Configuration).props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Clang|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="build\Xenia.Cpp.$(Platform).Common.props" />
-    <Import Project="build\Xenia.Cpp.x64.Debug.props" />
-    <Import Project="build\Xenia.Cpp.$(Platform).$(Configuration).props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="build\Xenia.Cpp.$(Platform).Common.props" />
-    <Import Project="build\Xenia.Cpp.x64.Debug.props" />
-    <Import Project="build\Xenia.Cpp.$(Platform).$(Configuration).props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="build\Xenia.Cpp.$(Platform).Common.props" />
-    <Import Project="build\Xenia.Cpp.$(Platform).$(Configuration).props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Clang|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>BEA_ENGINE_STATIC=1;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\third_party\libav-xma-bin\include;$(SolutionDir)\third_party\beaengine\include;$(SolutionDir)\third_party\llvm\include;$(SolutionDir)\third_party\capstone\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>libelemental.lib;libxenia-base.lib;libavcodec.a;libavutil.a;libgflags.lib;libglew.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)third_party\libav-xma-bin\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Clang|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>BEA_ENGINE_STATIC=1;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\third_party\libav-xma-bin\include;$(SolutionDir)\third_party\beaengine\include;$(SolutionDir)\third_party\llvm\include;$(SolutionDir)\third_party\capstone\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>libelemental.lib;libxenia-base.lib;libavcodec.a;libavutil.a;libgflags.lib;libglew.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)third_party\libav-xma-bin\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>BEA_ENGINE_STATIC=1;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\third_party\libav-xma-bin\include;$(SolutionDir)\third_party\beaengine\include;$(SolutionDir)\third_party\llvm\include;$(SolutionDir)\third_party\capstone\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>libelemental.lib;libxenia-base.lib;libavcodec.a;libavutil.a;libgflags.lib;libglew.lib</AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PreprocessorDefinitions>BEA_ENGINE_STATIC=1;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\third_party\libav-xma-bin\include;$(SolutionDir)\third_party\beaengine\include;$(SolutionDir)\third_party\llvm\include;$(SolutionDir)\third_party\capstone\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>libelemental.lib;libxenia-base.lib;libavcodec.a;libavutil.a;libgflags.lib;libglew.lib</AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/libxenia.vcxproj.filters b/libxenia.vcxproj.filters
deleted file mode 100644
index 314a1eb63..000000000
--- a/libxenia.vcxproj.filters
+++ /dev/null
@@ -1,1431 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="src">
-      <UniqueIdentifier>{ac2ed3f3-54e5-4039-a771-dce7f1afb317}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia">
-      <UniqueIdentifier>{95c5da4e-5624-45cb-acd7-f3ea42f7f35f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\apu">
-      <UniqueIdentifier>{b996d1c8-9a7a-4bf0-8c55-786c15a9a615}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\cpu">
-      <UniqueIdentifier>{ea01c27b-70c2-4527-b8c5-e3cc5cfc92e1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\apu\xaudio2">
-      <UniqueIdentifier>{11c993f1-4ff9-4edb-b589-684bd863c173}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\apu\nop">
-      <UniqueIdentifier>{db2ffaf9-4c33-40bd-a6f6-898d1ff1696e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\cpu\compiler">
-      <UniqueIdentifier>{5b320879-0064-4d8e-bb97-f2c4bb9e53f2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\cpu\frontend">
-      <UniqueIdentifier>{22342627-7b86-4d86-b46a-86ad0babe279}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\cpu\hir">
-      <UniqueIdentifier>{9a9b0a2d-3c03-4377-87ee-d4f3d27fbff3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\cpu\backend">
-      <UniqueIdentifier>{39b164c9-8888-40b3-9cc1-cf58e5fdd2f1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\cpu\backend\x64">
-      <UniqueIdentifier>{d208b57a-e9d9-44cd-84be-365a3992806e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\cpu\compiler\passes">
-      <UniqueIdentifier>{1cdd538c-c1a8-4667-9f7c-dc1dcbdd2934}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\debug">
-      <UniqueIdentifier>{531deabc-1284-48f6-87b6-8a4537960b7a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\debug\proto">
-      <UniqueIdentifier>{b3e55480-f727-470f-a1d6-f602e477f6d5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\gpu">
-      <UniqueIdentifier>{7430583f-5bb5-4901-8ca7-a325978d517f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\gpu\gl4">
-      <UniqueIdentifier>{c205c825-d8a3-4c6d-b2c1-730517c4d62d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\hid">
-      <UniqueIdentifier>{786f142c-5cff-4562-8237-b114650fc3bf}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\hid\winkey">
-      <UniqueIdentifier>{2a8239c3-db27-4eda-82d9-2e837c8c5ba6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\hid\xinput">
-      <UniqueIdentifier>{c2844d0d-a762-4887-bfd1-46ec3c51585b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\hid\nop">
-      <UniqueIdentifier>{7621c4d6-7cf6-495e-b4c9-950deba29a01}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\ui">
-      <UniqueIdentifier>{42d47a43-1af4-4e1a-9ed7-afa7f7d18e9f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\kernel">
-      <UniqueIdentifier>{c1ac0db1-2f4b-4376-b1dc-e6355c99b395}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\kernel\apps">
-      <UniqueIdentifier>{4e0349c4-b0bd-4595-9e83-cb3cbe11a172}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\kernel\objects">
-      <UniqueIdentifier>{bb86c40a-ad91-482e-a7c8-ef0a84280c8d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\kernel\util">
-      <UniqueIdentifier>{447ef539-2dab-4969-a5b0-57c8d6f4c6ec}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party">
-      <UniqueIdentifier>{9194a1f4-9934-465e-adcb-3ac0e337dfe3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\beaengine">
-      <UniqueIdentifier>{119b6173-c3a2-491b-b1eb-dc9248a7ae50}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\beaengine\include">
-      <UniqueIdentifier>{23815560-d0dc-451d-acad-832ac6c2d634}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\beaengine\include\beaengine">
-      <UniqueIdentifier>{fab30014-dd55-4ae2-b2b0-b5f9955fb90d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\beaengine\beaengineSources">
-      <UniqueIdentifier>{23bf3e93-569a-4432-b265-6bbfccf0e7ca}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\flatbuffers">
-      <UniqueIdentifier>{1e52ba44-1bf6-425d-a2c8-a0744f34d348}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\flatbuffers\include">
-      <UniqueIdentifier>{1775ec47-fb64-43eb-be29-3fc356cbfdca}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\flatbuffers\include\flatbuffers">
-      <UniqueIdentifier>{686bc832-94dd-44af-8f4f-f5e9a1f70341}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\llvm">
-      <UniqueIdentifier>{36203590-1da4-4d59-a270-80dd7f8dc9c5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\llvm\include">
-      <UniqueIdentifier>{e339422e-722c-4a25-9865-bfb382c32a14}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\llvm\include\llvm">
-      <UniqueIdentifier>{0c75741e-deec-4675-a7f3-dea54c449ff9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\llvm\include\llvm\ADT">
-      <UniqueIdentifier>{c007145f-e965-4fab-b9be-f957a63e1281}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\llvm\include\llvm\Support">
-      <UniqueIdentifier>{1963ff6f-5514-4c96-a66e-35a6e5cef776}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\microprofile">
-      <UniqueIdentifier>{c976eeb2-a3c2-4692-8397-2b503d928123}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\mspack">
-      <UniqueIdentifier>{b9a45887-83a6-444f-94a9-6002a507da50}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\pe">
-      <UniqueIdentifier>{f8917264-c401-4b7f-8df7-08752ae0acad}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\xxhash">
-      <UniqueIdentifier>{818cdefa-9c17-402a-b427-68640bec3d4c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\xbyak">
-      <UniqueIdentifier>{7eec808d-2cd4-4987-9eaf-abde1c86d579}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\xbyak\xbyak">
-      <UniqueIdentifier>{d1405e1d-d9b0-4d8d-89ce-29d43698c415}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\capstone">
-      <UniqueIdentifier>{49d9a353-9cc1-4ca3-95a1-9db2bd2d0eca}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\capstone\include">
-      <UniqueIdentifier>{56f75ad9-d903-475a-a68c-0f7892e24808}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\capstone\arch">
-      <UniqueIdentifier>{23674cd7-7387-4947-baa5-5216f6a08830}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="third_party\capstone\arch\X86">
-      <UniqueIdentifier>{00596876-a323-4570-a5fb-71343024d429}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\vfs">
-      <UniqueIdentifier>{831bb630-c71e-43c7-abf0-bde923d10e9b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\vfs\devices">
-      <UniqueIdentifier>{82795389-e855-4cd6-a3b6-9580030cebf2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\ui\gl">
-      <UniqueIdentifier>{f598eed5-11dc-4ef8-a7d4-28ec5e43009b}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\xenia\emulator.cc">
-      <Filter>src\xenia</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\memory.cc">
-      <Filter>src\xenia</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\profiling.cc">
-      <Filter>src\xenia</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\apu\audio_driver.cc">
-      <Filter>src\xenia\apu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\apu\audio_system.cc">
-      <Filter>src\xenia\apu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\apu\nop\nop_audio_system.cc">
-      <Filter>src\xenia\apu\nop</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\apu\xaudio2\xaudio2_audio_driver.cc">
-      <Filter>src\xenia\apu\xaudio2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\apu\xaudio2\xaudio2_audio_system.cc">
-      <Filter>src\xenia\apu\xaudio2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\debug_info.cc">
-      <Filter>src\xenia\cpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\entry_table.cc">
-      <Filter>src\xenia\cpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\export_resolver.cc">
-      <Filter>src\xenia\cpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\function.cc">
-      <Filter>src\xenia\cpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\instrument.cc">
-      <Filter>src\xenia\cpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\mmio_handler.cc">
-      <Filter>src\xenia\cpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\mmio_handler_win.cc">
-      <Filter>src\xenia\cpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\module.cc">
-      <Filter>src\xenia\cpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\processor.cc">
-      <Filter>src\xenia\cpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\raw_module.cc">
-      <Filter>src\xenia\cpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\symbol_info.cc">
-      <Filter>src\xenia\cpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\test_module.cc">
-      <Filter>src\xenia\cpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\thread_state.cc">
-      <Filter>src\xenia\cpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\xex_module.cc">
-      <Filter>src\xenia\cpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\backend\assembler.cc">
-      <Filter>src\xenia\cpu\backend</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\backend\backend.cc">
-      <Filter>src\xenia\cpu\backend</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\backend\x64\x64_assembler.cc">
-      <Filter>src\xenia\cpu\backend\x64</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\backend\x64\x64_backend.cc">
-      <Filter>src\xenia\cpu\backend\x64</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\backend\x64\x64_emitter.cc">
-      <Filter>src\xenia\cpu\backend\x64</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\backend\x64\x64_function.cc">
-      <Filter>src\xenia\cpu\backend\x64</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\backend\x64\x64_sequences.cc">
-      <Filter>src\xenia\cpu\backend\x64</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\backend\x64\x64_tracers.cc">
-      <Filter>src\xenia\cpu\backend\x64</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\compiler\compiler.cc">
-      <Filter>src\xenia\cpu\compiler</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\compiler\compiler_pass.cc">
-      <Filter>src\xenia\cpu\compiler</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\compiler\passes\constant_propagation_pass.cc">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\compiler\passes\control_flow_analysis_pass.cc">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\compiler\passes\control_flow_simplification_pass.cc">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\compiler\passes\context_promotion_pass.cc">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\compiler\passes\data_flow_analysis_pass.cc">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\compiler\passes\dead_code_elimination_pass.cc">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\compiler\passes\register_allocation_pass.cc">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\compiler\passes\simplification_pass.cc">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\compiler\passes\value_reduction_pass.cc">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\compiler\passes\validation_pass.cc">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_context.cc">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_disasm.cc">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_emit_altivec.cc">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_emit_alu.cc">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_emit_control.cc">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_emit_fpu.cc">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_emit_memory.cc">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_frontend.cc">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_hir_builder.cc">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_instr.cc">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_scanner.cc">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\frontend\ppc_translator.cc">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\frontend\context_info.cc">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\hir\block.cc">
-      <Filter>src\xenia\cpu\hir</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\hir\hir_builder.cc">
-      <Filter>src\xenia\cpu\hir</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\hir\instr.cc">
-      <Filter>src\xenia\cpu\hir</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\hir\opcodes.cc">
-      <Filter>src\xenia\cpu\hir</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\hir\value.cc">
-      <Filter>src\xenia\cpu\hir</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\debug\debugger.cc">
-      <Filter>src\xenia\debug</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\compiler\passes\finalization_pass.cc">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\gpu\graphics_system.cc">
-      <Filter>src\xenia\gpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\gpu\register_file.cc">
-      <Filter>src\xenia\gpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\gpu\sampler_info.cc">
-      <Filter>src\xenia\gpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\gpu\shader.cc">
-      <Filter>src\xenia\gpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\gpu\texture_info.cc">
-      <Filter>src\xenia\gpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\gpu\ucode_disassembler.cc">
-      <Filter>src\xenia\gpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\gpu\gl4\command_processor.cc">
-      <Filter>src\xenia\gpu\gl4</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\gpu\gl4\draw_batcher.cc">
-      <Filter>src\xenia\gpu\gl4</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\gpu\gl4\texture_cache.cc">
-      <Filter>src\xenia\gpu\gl4</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\gpu\gl4\gl4_graphics_system.cc">
-      <Filter>src\xenia\gpu\gl4</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\gpu\gl4\gl4_shader.cc">
-      <Filter>src\xenia\gpu\gl4</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\gpu\gl4\gl4_shader_translator.cc">
-      <Filter>src\xenia\gpu\gl4</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\hid\input_system.cc">
-      <Filter>src\xenia\hid</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\hid\input_driver.cc">
-      <Filter>src\xenia\hid</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\hid\nop\nop_hid.cc">
-      <Filter>src\xenia\hid\nop</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\hid\nop\nop_input_driver.cc">
-      <Filter>src\xenia\hid\nop</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\hid\winkey\winkey_hid.cc">
-      <Filter>src\xenia\hid\winkey</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\hid\winkey\winkey_input_driver.cc">
-      <Filter>src\xenia\hid\winkey</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\hid\xinput\xinput_hid.cc">
-      <Filter>src\xenia\hid\xinput</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\hid\xinput\xinput_input_driver.cc">
-      <Filter>src\xenia\hid\xinput</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\ui\menu_item.cc">
-      <Filter>src\xenia\ui</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\util\xex2.cc">
-      <Filter>src\xenia\kernel\util</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\objects\xenumerator.cc">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\objects\xevent.cc">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\objects\xfile.cc">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\objects\xkernel_module.cc">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\objects\xmodule.cc">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\objects\xmutant.cc">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\objects\xnotify_listener.cc">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\objects\xsemaphore.cc">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\objects\xthread.cc">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\objects\xtimer.cc">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\objects\xuser_module.cc">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\apps\apps.cc">
-      <Filter>src\xenia\kernel\apps</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\apps\xgi_app.cc">
-      <Filter>src\xenia\kernel\apps</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\apps\xlivebase_app.cc">
-      <Filter>src\xenia\kernel\apps</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\apps\xmp_app.cc">
-      <Filter>src\xenia\kernel\apps</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\app.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\async_request.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\content_manager.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\dispatcher.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\kernel_state.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\native_list.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\object_table.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\user_profile.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xam_content.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xam_info.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xam_input.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xam_module.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xam_msg.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xam_net.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xam_notify.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xam_ui.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xam_user.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xam_video.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xam_voice.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_audio.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_audio_xma.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_debug.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_hal.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_io.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_memory.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_misc.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_module.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_modules.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_ob.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_rtl.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_strings.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_threading.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_usbcam.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_video.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xobject.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="third_party\beaengine\beaengineSources\BeaEngine.c">
-      <Filter>third_party\beaengine\beaengineSources</Filter>
-    </ClCompile>
-    <ClCompile Include="third_party\mspack\lzxd.c">
-      <Filter>third_party\mspack</Filter>
-    </ClCompile>
-    <ClCompile Include="third_party\xxhash\xxhash.c">
-      <Filter>third_party\xxhash</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_error.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\backend\x64\x64_code_cache.cc">
-      <Filter>src\xenia\cpu\backend\x64</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\util\shim_utils.cc">
-      <Filter>src\xenia\kernel\util</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xam_nui.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xboxkrnl_crypt.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\kernel\xam_avatar.cc">
-      <Filter>src\xenia\kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="third_party\capstone\arch\X86\X86Disassembler.c">
-      <Filter>third_party\capstone\arch\X86</Filter>
-    </ClCompile>
-    <ClCompile Include="third_party\capstone\arch\X86\X86DisassemblerDecoder.c">
-      <Filter>third_party\capstone\arch\X86</Filter>
-    </ClCompile>
-    <ClCompile Include="third_party\capstone\arch\X86\X86IntelInstPrinter.c">
-      <Filter>third_party\capstone\arch\X86</Filter>
-    </ClCompile>
-    <ClCompile Include="third_party\capstone\arch\X86\X86Mapping.c">
-      <Filter>third_party\capstone\arch\X86</Filter>
-    </ClCompile>
-    <ClCompile Include="third_party\capstone\arch\X86\X86Module.c">
-      <Filter>third_party\capstone\arch\X86</Filter>
-    </ClCompile>
-    <ClCompile Include="third_party\capstone\cs.c">
-      <Filter>third_party\capstone</Filter>
-    </ClCompile>
-    <ClCompile Include="third_party\capstone\MCInst.c">
-      <Filter>third_party\capstone</Filter>
-    </ClCompile>
-    <ClCompile Include="third_party\capstone\MCInstrDesc.c">
-      <Filter>third_party\capstone</Filter>
-    </ClCompile>
-    <ClCompile Include="third_party\capstone\MCRegisterInfo.c">
-      <Filter>third_party\capstone</Filter>
-    </ClCompile>
-    <ClCompile Include="third_party\capstone\SStream.c">
-      <Filter>third_party\capstone</Filter>
-    </ClCompile>
-    <ClCompile Include="third_party\capstone\utils.c">
-      <Filter>third_party\capstone</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\gpu\tracing.cc">
-      <Filter>src\xenia\gpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\compiler\passes\memory_sequence_combination_pass.cc">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\apu\xma_decoder.cc">
-      <Filter>src\xenia\apu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\apu\xma_context.cc">
-      <Filter>src\xenia\apu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\hid\hid_flags.cc">
-      <Filter>src\xenia\hid</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\gpu\gpu_flags.cc">
-      <Filter>src\xenia\gpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\gpu\gl4\gl4_gpu_flags.cc">
-      <Filter>src\xenia\gpu\gl4</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\cpu\cpu_flags.cc">
-      <Filter>src\xenia\cpu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\apu\apu_flags.cc">
-      <Filter>src\xenia\apu</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\apu\xaudio2\xaudio2_apu_flags.cc">
-      <Filter>src\xenia\apu\xaudio2</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\apu\nop\nop_apu_flags.cc">
-      <Filter>src\xenia\apu\nop</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\vfs\device.cc">
-      <Filter>src\xenia\vfs</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\vfs\entry.cc">
-      <Filter>src\xenia\vfs</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\vfs\devices\disc_image_device.cc">
-      <Filter>src\xenia\vfs\devices</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\vfs\devices\disc_image_entry.cc">
-      <Filter>src\xenia\vfs\devices</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\vfs\devices\disc_image_file.cc">
-      <Filter>src\xenia\vfs\devices</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\vfs\devices\host_path_device.cc">
-      <Filter>src\xenia\vfs\devices</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\vfs\devices\host_path_entry.cc">
-      <Filter>src\xenia\vfs\devices</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\vfs\devices\host_path_file.cc">
-      <Filter>src\xenia\vfs\devices</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\vfs\devices\stfs_container_device.cc">
-      <Filter>src\xenia\vfs\devices</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\vfs\devices\stfs_container_entry.cc">
-      <Filter>src\xenia\vfs\devices</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\vfs\devices\stfs_container_file.cc">
-      <Filter>src\xenia\vfs\devices</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\vfs\virtual_file_system.cc">
-      <Filter>src\xenia\vfs</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\ui\window.cc">
-      <Filter>src\xenia\ui</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\ui\window_win.cc">
-      <Filter>src\xenia\ui</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\ui\loop_win.cc">
-      <Filter>src\xenia\ui</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\ui\loop.cc">
-      <Filter>src\xenia\ui</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\ui\gl\blitter.cc">
-      <Filter>src\xenia\ui\gl</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\ui\gl\circular_buffer.cc">
-      <Filter>src\xenia\ui\gl</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\ui\gl\gl_context.cc">
-      <Filter>src\xenia\ui\gl</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\ui\gl\gl_profiler_display.cc">
-      <Filter>src\xenia\ui\gl</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\ui\gl\gl4_elemental_renderer.cc">
-      <Filter>src\xenia\ui\gl</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\ui\graphics_context.cc">
-      <Filter>src\xenia\ui</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\ui\file_picker_win.cc">
-      <Filter>src\xenia\ui</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\xenia\emulator.h">
-      <Filter>src\xenia</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\profiling.h">
-      <Filter>src\xenia</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\xbox.h">
-      <Filter>src\xenia</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\memory.h">
-      <Filter>src\xenia</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\apu\audio_driver.h">
-      <Filter>src\xenia\apu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\apu\audio_system.h">
-      <Filter>src\xenia\apu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\apu\nop\nop_audio_system.h">
-      <Filter>src\xenia\apu\nop</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\apu\xaudio2\xaudio2_audio_system.h">
-      <Filter>src\xenia\apu\xaudio2</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\apu\xaudio2\xaudio2_audio_driver.h">
-      <Filter>src\xenia\apu\xaudio2</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\debug_info.h">
-      <Filter>src\xenia\cpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\entry_table.h">
-      <Filter>src\xenia\cpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\export_resolver.h">
-      <Filter>src\xenia\cpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\function.h">
-      <Filter>src\xenia\cpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\instrument.h">
-      <Filter>src\xenia\cpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\mmio_handler.h">
-      <Filter>src\xenia\cpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\module.h">
-      <Filter>src\xenia\cpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\processor.h">
-      <Filter>src\xenia\cpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\raw_module.h">
-      <Filter>src\xenia\cpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\symbol_info.h">
-      <Filter>src\xenia\cpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\test_module.h">
-      <Filter>src\xenia\cpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\thread_state.h">
-      <Filter>src\xenia\cpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\xex_module.h">
-      <Filter>src\xenia\cpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\backend\assembler.h">
-      <Filter>src\xenia\cpu\backend</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\backend\backend.h">
-      <Filter>src\xenia\cpu\backend</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\backend\machine_info.h">
-      <Filter>src\xenia\cpu\backend</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\backend\x64\x64_assembler.h">
-      <Filter>src\xenia\cpu\backend\x64</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\backend\x64\x64_backend.h">
-      <Filter>src\xenia\cpu\backend\x64</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\backend\x64\x64_code_cache.h">
-      <Filter>src\xenia\cpu\backend\x64</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\backend\x64\x64_emitter.h">
-      <Filter>src\xenia\cpu\backend\x64</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\backend\x64\x64_function.h">
-      <Filter>src\xenia\cpu\backend\x64</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\backend\x64\x64_sequences.h">
-      <Filter>src\xenia\cpu\backend\x64</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\backend\x64\x64_tracers.h">
-      <Filter>src\xenia\cpu\backend\x64</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\compiler\compiler.h">
-      <Filter>src\xenia\cpu\compiler</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\compiler\compiler_pass.h">
-      <Filter>src\xenia\cpu\compiler</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\compiler\compiler_passes.h">
-      <Filter>src\xenia\cpu\compiler</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\compiler\passes\constant_propagation_pass.h">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\compiler\passes\control_flow_analysis_pass.h">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\compiler\passes\control_flow_simplification_pass.h">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\compiler\passes\context_promotion_pass.h">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\compiler\passes\data_flow_analysis_pass.h">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\compiler\passes\dead_code_elimination_pass.h">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\compiler\passes\register_allocation_pass.h">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\compiler\passes\simplification_pass.h">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\compiler\passes\value_reduction_pass.h">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\compiler\passes\validation_pass.h">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\frontend\ppc_translator.h">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\frontend\ppc_context.h">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\frontend\ppc_disasm.h">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\frontend\ppc_emit.h">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\frontend\ppc_emit-private.h">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\frontend\ppc_frontend.h">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\frontend\ppc_hir_builder.h">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\frontend\ppc_instr.h">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\frontend\ppc_instr_tables.h">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\frontend\ppc_scanner.h">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\frontend\context_info.h">
-      <Filter>src\xenia\cpu\frontend</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\hir\block.h">
-      <Filter>src\xenia\cpu\hir</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\hir\hir_builder.h">
-      <Filter>src\xenia\cpu\hir</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\hir\instr.h">
-      <Filter>src\xenia\cpu\hir</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\hir\label.h">
-      <Filter>src\xenia\cpu\hir</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\hir\opcodes.h">
-      <Filter>src\xenia\cpu\hir</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\hir\value.h">
-      <Filter>src\xenia\cpu\hir</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\debug\breakpoint.h">
-      <Filter>src\xenia\debug</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\debug\debugger.h">
-      <Filter>src\xenia\debug</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\debug\function_trace_data.h">
-      <Filter>src\xenia\debug</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\compiler\passes\finalization_pass.h">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\gpu\graphics_system.h">
-      <Filter>src\xenia\gpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\gpu\register_file.h">
-      <Filter>src\xenia\gpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\gpu\sampler_info.h">
-      <Filter>src\xenia\gpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\gpu\shader.h">
-      <Filter>src\xenia\gpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\gpu\texture_info.h">
-      <Filter>src\xenia\gpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\gpu\tracing.h">
-      <Filter>src\xenia\gpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\gpu\ucode.h">
-      <Filter>src\xenia\gpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\gpu\ucode_disassembler.h">
-      <Filter>src\xenia\gpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\gpu\xenos.h">
-      <Filter>src\xenia\gpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\gpu\gl4\command_processor.h">
-      <Filter>src\xenia\gpu\gl4</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\gpu\gl4\draw_batcher.h">
-      <Filter>src\xenia\gpu\gl4</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\gpu\gl4\texture_cache.h">
-      <Filter>src\xenia\gpu\gl4</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\gpu\gl4\gl4_graphics_system.h">
-      <Filter>src\xenia\gpu\gl4</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\gpu\gl4\gl4_shader.h">
-      <Filter>src\xenia\gpu\gl4</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\gpu\gl4\gl4_shader_translator.h">
-      <Filter>src\xenia\gpu\gl4</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\hid\input_driver.h">
-      <Filter>src\xenia\hid</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\hid\input_system.h">
-      <Filter>src\xenia\hid</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\hid\nop\nop_hid.h">
-      <Filter>src\xenia\hid\nop</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\hid\nop\nop_input_driver.h">
-      <Filter>src\xenia\hid\nop</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\hid\winkey\winkey_input_driver.h">
-      <Filter>src\xenia\hid\winkey</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\hid\winkey\winkey_hid.h">
-      <Filter>src\xenia\hid\winkey</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\hid\xinput\xinput_hid.h">
-      <Filter>src\xenia\hid\xinput</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\hid\xinput\xinput_input_driver.h">
-      <Filter>src\xenia\hid\xinput</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\ui\loop.h">
-      <Filter>src\xenia\ui</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\ui\menu_item.h">
-      <Filter>src\xenia\ui</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\ui\window.h">
-      <Filter>src\xenia\ui</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\ui\ui_event.h">
-      <Filter>src\xenia\ui</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\util\shim_utils.h">
-      <Filter>src\xenia\kernel\util</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\util\xex2.h">
-      <Filter>src\xenia\kernel\util</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\util\xex2_info.h">
-      <Filter>src\xenia\kernel\util</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\objects\xenumerator.h">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\objects\xevent.h">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\objects\xfile.h">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\objects\xkernel_module.h">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\objects\xmodule.h">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\objects\xmutant.h">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\objects\xnotify_listener.h">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\objects\xsemaphore.h">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\objects\xtimer.h">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\objects\xthread.h">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\objects\xuser_module.h">
-      <Filter>src\xenia\kernel\objects</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\apps\apps.h">
-      <Filter>src\xenia\kernel\apps</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\apps\xgi_app.h">
-      <Filter>src\xenia\kernel\apps</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\apps\xlivebase_app.h">
-      <Filter>src\xenia\kernel\apps</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\apps\xmp_app.h">
-      <Filter>src\xenia\kernel\apps</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\app.h">
-      <Filter>src\xenia\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\async_request.h">
-      <Filter>src\xenia\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\content_manager.h">
-      <Filter>src\xenia\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\dispatcher.h">
-      <Filter>src\xenia\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\kernel.h">
-      <Filter>src\xenia\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\kernel_state.h">
-      <Filter>src\xenia\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\modules.h">
-      <Filter>src\xenia\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\native_list.h">
-      <Filter>src\xenia\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\object_table.h">
-      <Filter>src\xenia\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\user_profile.h">
-      <Filter>src\xenia\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\xam_module.h">
-      <Filter>src\xenia\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\xam_ordinals.h">
-      <Filter>src\xenia\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\xam_private.h">
-      <Filter>src\xenia\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\xobject.h">
-      <Filter>src\xenia\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\xboxkrnl_module.h">
-      <Filter>src\xenia\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\xboxkrnl_ordinals.h">
-      <Filter>src\xenia\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\xboxkrnl_private.h">
-      <Filter>src\xenia\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\kernel\xboxkrnl_rtl.h">
-      <Filter>src\xenia\kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\beaengine\include\beaengine\basic_types.h">
-      <Filter>third_party\beaengine\include\beaengine</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\beaengine\include\beaengine\BeaEngine.h">
-      <Filter>third_party\beaengine\include\beaengine</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\beaengine\include\beaengine\export.h">
-      <Filter>third_party\beaengine\include\beaengine</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\beaengine\include\beaengine\macros.h">
-      <Filter>third_party\beaengine\include\beaengine</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\flatbuffers\include\flatbuffers\flatbuffers.h">
-      <Filter>third_party\flatbuffers\include\flatbuffers</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\llvm\include\llvm\ADT\BitVector.h">
-      <Filter>third_party\llvm\include\llvm\ADT</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\llvm\include\llvm\Support\MathExtras.h">
-      <Filter>third_party\llvm\include\llvm\Support</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\llvm\include\llvm\Support\type_traits.h">
-      <Filter>third_party\llvm\include\llvm\Support</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\llvm\include\llvm\Support\Compiler.h">
-      <Filter>third_party\llvm\include\llvm\Support</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\microprofile\microprofileui.h">
-      <Filter>third_party\microprofile</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\microprofile\microprofile.h">
-      <Filter>third_party\microprofile</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\mspack\mspack.h">
-      <Filter>third_party\mspack</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\mspack\lzx.h">
-      <Filter>third_party\mspack</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\pe\pe_image.h">
-      <Filter>third_party\pe</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\xxhash\xxhash.h">
-      <Filter>third_party\xxhash</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\xbyak\xbyak\xbyak_bin2hex.h">
-      <Filter>third_party\xbyak\xbyak</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\xbyak\xbyak\xbyak_mnemonic.h">
-      <Filter>third_party\xbyak\xbyak</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\xbyak\xbyak\xbyak_util.h">
-      <Filter>third_party\xbyak\xbyak</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\xbyak\xbyak\xbyak.h">
-      <Filter>third_party\xbyak\xbyak</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\debug\proto\breakpoints_generated.h">
-      <Filter>src\xenia\debug\proto</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\debug\proto\common_generated.h">
-      <Filter>src\xenia\debug\proto</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\debug\proto\control_generated.h">
-      <Filter>src\xenia\debug\proto</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\debug\proto\messages_generated.h">
-      <Filter>src\xenia\debug\proto</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\debug\proto\modules_generated.h">
-      <Filter>src\xenia\debug\proto</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\debug\proto\threads_generated.h">
-      <Filter>src\xenia\debug\proto</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\capstone\include\capstone.h">
-      <Filter>third_party\capstone\include</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\capstone\include\platform.h">
-      <Filter>third_party\capstone\include</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\capstone\include\x86.h">
-      <Filter>third_party\capstone\include</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\capstone\arch\X86\X86BaseInfo.h">
-      <Filter>third_party\capstone\arch\X86</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\capstone\arch\X86\X86Disassembler.h">
-      <Filter>third_party\capstone\arch\X86</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\capstone\arch\X86\X86DisassemblerDecoder.h">
-      <Filter>third_party\capstone\arch\X86</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\capstone\arch\X86\X86DisassemblerDecoderCommon.h">
-      <Filter>third_party\capstone\arch\X86</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\capstone\arch\X86\X86InstPrinter.h">
-      <Filter>third_party\capstone\arch\X86</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\capstone\arch\X86\X86Mapping.h">
-      <Filter>third_party\capstone\arch\X86</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\capstone\cs_priv.h">
-      <Filter>third_party\capstone</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\capstone\LEB128.h">
-      <Filter>third_party\capstone</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\capstone\MathExtras.h">
-      <Filter>third_party\capstone</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\capstone\MCDisassembler.h">
-      <Filter>third_party\capstone</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\capstone\MCFixedLenDisassembler.h">
-      <Filter>third_party\capstone</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\capstone\MCInst.h">
-      <Filter>third_party\capstone</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\capstone\MCInstrDesc.h">
-      <Filter>third_party\capstone</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\capstone\MCRegisterInfo.h">
-      <Filter>third_party\capstone</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\capstone\myinttypes.h">
-      <Filter>third_party\capstone</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\capstone\SStream.h">
-      <Filter>third_party\capstone</Filter>
-    </ClInclude>
-    <ClInclude Include="third_party\capstone\utils.h">
-      <Filter>third_party\capstone</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\compiler\passes\memory_sequence_combination_pass.h">
-      <Filter>src\xenia\cpu\compiler\passes</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\backend\code_cache.h">
-      <Filter>src\xenia\cpu\backend</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\apu\xma_decoder.h">
-      <Filter>src\xenia\apu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\apu\xma_context.h">
-      <Filter>src\xenia\apu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\ui\file_picker.h">
-      <Filter>src\xenia\ui</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\hid\hid_flags.h">
-      <Filter>src\xenia\hid</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\gpu\gpu_flags.h">
-      <Filter>src\xenia\gpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\gpu\gl4\gl4_gpu_flags.h">
-      <Filter>src\xenia\gpu\gl4</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\cpu_flags.h">
-      <Filter>src\xenia\cpu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\apu\apu_flags.h">
-      <Filter>src\xenia\apu</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\apu\xaudio2\xaudio2_apu_flags.h">
-      <Filter>src\xenia\apu\xaudio2</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\apu\nop\nop_apu_flags.h">
-      <Filter>src\xenia\apu\nop</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\hid\input.h">
-      <Filter>src\xenia\hid</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\vfs\device.h">
-      <Filter>src\xenia\vfs</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\vfs\entry.h">
-      <Filter>src\xenia\vfs</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\vfs\devices\disc_image_device.h">
-      <Filter>src\xenia\vfs\devices</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\vfs\devices\disc_image_entry.h">
-      <Filter>src\xenia\vfs\devices</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\vfs\devices\disc_image_file.h">
-      <Filter>src\xenia\vfs\devices</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\vfs\devices\host_path_device.h">
-      <Filter>src\xenia\vfs\devices</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\vfs\devices\host_path_entry.h">
-      <Filter>src\xenia\vfs\devices</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\vfs\devices\host_path_file.h">
-      <Filter>src\xenia\vfs\devices</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\vfs\devices\stfs_container_device.h">
-      <Filter>src\xenia\vfs\devices</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\vfs\devices\stfs_container_entry.h">
-      <Filter>src\xenia\vfs\devices</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\vfs\devices\stfs_container_file.h">
-      <Filter>src\xenia\vfs\devices</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\vfs\virtual_file_system.h">
-      <Filter>src\xenia\vfs</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\cpu\backend\x64\x64_stack_layout.h">
-      <Filter>src\xenia\cpu\backend\x64</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\ui\loop_win.h">
-      <Filter>src\xenia\ui</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\ui\window_win.h">
-      <Filter>src\xenia\ui</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\ui\gl\blitter.h">
-      <Filter>src\xenia\ui\gl</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\ui\gl\circular_buffer.h">
-      <Filter>src\xenia\ui\gl</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\ui\gl\gl.h">
-      <Filter>src\xenia\ui\gl</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\ui\gl\gl_context.h">
-      <Filter>src\xenia\ui\gl</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\ui\gl\gl_profiler_display.h">
-      <Filter>src\xenia\ui\gl</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\ui\gl\gl4_elemental_renderer.h">
-      <Filter>src\xenia\ui\gl</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\ui\graphics_context.h">
-      <Filter>src\xenia\ui</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="src\xenia\cpu\hir\opcodes.inl">
-      <Filter>src\xenia\cpu\hir</Filter>
-    </None>
-    <None Include="src\xenia\gpu\register_table.inc">
-      <Filter>src\xenia\gpu</Filter>
-    </None>
-    <None Include="src\xenia\kernel\util\export_table_post.inc">
-      <Filter>src\xenia\kernel\util</Filter>
-    </None>
-    <None Include="src\xenia\kernel\util\export_table_pre.inc">
-      <Filter>src\xenia\kernel\util</Filter>
-    </None>
-    <None Include="src\xenia\kernel\util\ordinal_table_pre.inc">
-      <Filter>src\xenia\kernel\util</Filter>
-    </None>
-    <None Include="src\xenia\kernel\util\ordinal_table_post.inc">
-      <Filter>src\xenia\kernel\util</Filter>
-    </None>
-    <None Include="src\xenia\kernel\xam_table.inc">
-      <Filter>src\xenia\kernel</Filter>
-    </None>
-    <None Include="src\xenia\kernel\xboxkrnl_table.inc">
-      <Filter>src\xenia\kernel</Filter>
-    </None>
-    <None Include="src\xenia\debug\proto\breakpoints.fbs">
-      <Filter>src\xenia\debug\proto</Filter>
-    </None>
-    <None Include="src\xenia\debug\proto\common.fbs">
-      <Filter>src\xenia\debug\proto</Filter>
-    </None>
-    <None Include="src\xenia\debug\proto\control.fbs">
-      <Filter>src\xenia\debug\proto</Filter>
-    </None>
-    <None Include="src\xenia\debug\proto\messages.fbs">
-      <Filter>src\xenia\debug\proto</Filter>
-    </None>
-    <None Include="src\xenia\debug\proto\modules.fbs">
-      <Filter>src\xenia\debug\proto</Filter>
-    </None>
-    <None Include="src\xenia\debug\proto\threads.fbs">
-      <Filter>src\xenia\debug\proto</Filter>
-    </None>
-    <None Include="third_party\capstone\arch\X86\X86GenAsmWriter.inc">
-      <Filter>third_party\capstone\arch\X86</Filter>
-    </None>
-    <None Include="third_party\capstone\arch\X86\X86GenAsmWriter_reduce.inc">
-      <Filter>third_party\capstone\arch\X86</Filter>
-    </None>
-    <None Include="third_party\capstone\arch\X86\X86GenAsmWriter1.inc">
-      <Filter>third_party\capstone\arch\X86</Filter>
-    </None>
-    <None Include="third_party\capstone\arch\X86\X86GenAsmWriter1_reduce.inc">
-      <Filter>third_party\capstone\arch\X86</Filter>
-    </None>
-    <None Include="third_party\capstone\arch\X86\X86GenDisassemblerTables.inc">
-      <Filter>third_party\capstone\arch\X86</Filter>
-    </None>
-    <None Include="third_party\capstone\arch\X86\X86GenDisassemblerTables_reduce.inc">
-      <Filter>third_party\capstone\arch\X86</Filter>
-    </None>
-    <None Include="third_party\capstone\arch\X86\X86GenInstrInfo.inc">
-      <Filter>third_party\capstone\arch\X86</Filter>
-    </None>
-    <None Include="third_party\capstone\arch\X86\X86GenInstrInfo_reduce.inc">
-      <Filter>third_party\capstone\arch\X86</Filter>
-    </None>
-    <None Include="third_party\capstone\arch\X86\X86GenRegisterInfo.inc">
-      <Filter>third_party\capstone\arch\X86</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Natvis Include="vsdebuggervis.natvis" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/premake5.lua b/premake5.lua
new file mode 100644
index 000000000..52670306d
--- /dev/null
+++ b/premake5.lua
@@ -0,0 +1,158 @@
+include("build_tools")
+
+location(build_root)
+targetdir(build_bin)
+objdir(build_obj)
+
+includedirs({
+  ".",
+  "src",
+  "third_party",
+  "build_tools/third_party/gflags/src",
+})
+
+defines({
+  "_UNICODE",
+  "UNICODE",
+  "MICROPROFILE_MAX_THREADS=128",
+})
+
+vectorextensions("AVX")
+flags({
+  --"ExtraWarnings",        -- Sets the compiler's maximum warning level.
+  "FatalWarnings",        -- Treat warnings as errors.
+  "Unicode",
+})
+
+filter("kind:StaticLib")
+  defines({
+    "_LIB",
+  })
+
+filter("configurations:Checked")
+  runtime("Debug")
+  defines({
+    "DEBUG",
+  })
+  flags({"Symbols"})
+  runtime("Debug")
+  buildoptions({
+    "/RTCsu",   -- Full Run-Time Checks.
+  })
+
+filter("configurations:Debug")
+  runtime("Debug")
+  defines({
+    "DEBUG",
+    "_NO_DEBUG_HEAP=1",
+  })
+  flags({"Symbols"})
+  runtime("Release")
+  linkoptions({"/NODEFAULTLIB:MSVCRTD"})
+
+filter("configurations:Release")
+  runtime("Release")
+  defines({
+    "NDEBUG",
+    "_NO_DEBUG_HEAP=1",
+  })
+  optimize("On")
+  flags({
+    "LinkTimeOptimization",
+  })
+  runtime("Release")
+  linkoptions({"/NODEFAULTLIB:MSVCRTD"})
+
+filter("platforms:Windows")
+  system("windows")
+  toolset("msc")
+  -- Ignores complaints about empty obj files:
+  linkoptions({"/ignore:4006", "/ignore:4221"})
+  -- Enable multiprocessor compiles (requires Minimal Rebuild to be disabled).
+  buildoptions({"/MP"})
+  flags({
+    "NoMinimalRebuild",
+  })
+  defines({
+    "_CRT_NONSTDC_NO_DEPRECATE",
+    "_CRT_SECURE_NO_WARNINGS",
+    "WIN32",
+    "_WIN64=1",
+    "_AMD64=1",
+  })
+  links({
+    "ntdll",
+    "wsock32",
+    "ws2_32",
+    "xinput",
+    "xaudio2",
+    "glu32",
+    "opengl32",
+    "comctl32",
+    "shlwapi",
+  })
+
+-- Create scratch/ path and dummy flags file if needed.
+if not os.isdir("scratch") then
+  os.mkdir("scratch")
+  local flags_file = io.open("scratch1/flags.txt", "w")
+  flags_file:write("# Put flags, one on each line.\n")
+  flags_file:write("# Launch executables with --flags_file=scratch/flags.txt\n")
+  flags_file:write("\n")
+  flags_file:write("--cpu=x64\n")
+  flags_file:write("#--enable_haswell_instructions=false\n")
+  flags_file:write("\n")
+  flags_file:write("--debug\n")
+  flags_file:write("#--protect_zero=false\n")
+  flags_file:write("\n")
+  flags_file:write("#--mute\n")
+  flags_file:write("\n")
+  flags_file:write("--fast_stdout\n")
+  flags_file:write("#--flush_stdout=false\n")
+  flags_file:write("\n")
+  flags_file:write("#--vsync=false\n")
+  flags_file:write("#--gl_debug\n")
+  flags_file:write("#--gl_debug_output\n")
+  flags_file:write("#--gl_debug_output_synchronous\n")
+  flags_file:write("#--trace_gpu_prefix=scratch/gpu/gpu_trace_\n")
+  flags_file:write("#--trace_gpu_stream\n")
+  flags_file:write("#--disable_framebuffer_readback\n")
+  flags_file:write("\n")
+  flags_file:close()
+end
+
+solution("xenia")
+  uuid("931ef4b0-6170-4f7a-aaf2-0fece7632747")
+  startproject("xenia-app")
+  configurations({"Checked", "Debug", "Release"})
+  platforms({"Windows"})
+  architecture("x86_64")
+
+  include("src/xenia")
+  include("src/xenia/app")
+  include("src/xenia/apu")
+  include("src/xenia/apu/nop")
+  include("src/xenia/apu/xaudio2")
+  include("src/xenia/base")
+  include("src/xenia/cpu")
+  include("src/xenia/cpu/backend/x64")
+  include("src/xenia/debug")
+  include("src/xenia/debug/ui")
+  include("src/xenia/gpu")
+  include("src/xenia/gpu/gl4")
+  include("src/xenia/hid")
+  include("src/xenia/hid/nop")
+  include("src/xenia/hid/winkey")
+  include("src/xenia/hid/xinput")
+  include("src/xenia/kernel")
+  include("src/xenia/ui")
+  include("src/xenia/ui/gl")
+  include("src/xenia/vfs")
+
+  include("third_party/beaengine.lua")
+  include("third_party/capstone.lua")
+  include("third_party/elemental-forms")
+  include("third_party/glew.lua")
+  include("third_party/imgui.lua")
+  include("third_party/xxhash.lua")
+  include("build_tools/third_party/gflags.lua")
diff --git a/src/xenia/app/premake5.lua b/src/xenia/app/premake5.lua
new file mode 100644
index 000000000..867670312
--- /dev/null
+++ b/src/xenia/app/premake5.lua
@@ -0,0 +1,72 @@
+project_root = "../../.."
+include(project_root.."/build_tools")
+
+group("src")
+project("xenia-app")
+  uuid("d7e98620-d007-4ad8-9dbd-b47c8853a17f")
+  kind("WindowedApp")
+  targetname("xenia")
+  language("C++")
+  links({
+    "beaengine",
+    "elemental-forms",
+    "gflags",
+    "xenia-apu",
+    "xenia-apu-nop",
+    "xenia-apu-xaudio2",
+    "xenia-base",
+    "xenia-core",
+    "xenia-cpu",
+    "xenia-cpu-backend-x64",
+    "xenia-debug",
+    "xenia-gpu",
+    "xenia-gpu-gl4",
+    "xenia-hid-nop",
+    "xenia-hid-winkey",
+    "xenia-hid-xinput",
+    "xenia-kernel",
+    "xenia-ui",
+    "xenia-ui-gl",
+    "xenia-vfs",
+  })
+  flags({
+    "WinMain",  -- Use WinMain instead of main.
+  })
+  defines({
+  })
+  includedirs({
+    project_root.."/third_party/elemental-forms/src",
+  })
+  local_platform_files()
+  files({
+    "xenia_main.cc",
+    "../base/main_"..platform_suffix..".cc",
+  })
+  files({
+    "main_resources.rc",
+  })
+  resincludedirs({
+    project_root,
+    project_root.."/third_party/elemental-forms",
+  })
+
+  filter("configurations:Checked")
+    local libav_root = "../third_party/libav-xma-bin/lib/Debug"
+    linkoptions({
+      libav_root.."/libavcodec.a",
+      libav_root.."/libavutil.a",
+    })
+  filter("configurations:Debug or Release")
+    local libav_root = "../third_party/libav-xma-bin/lib/Release"
+    linkoptions({
+      libav_root.."/libavcodec.a",
+      libav_root.."/libavutil.a",
+    })
+
+  filter("platforms:Windows")
+    debugdir(project_root)
+    debugargs({
+      "--flagfile=scratch/flags.txt",
+      "2>&1",
+      "1>scratch/stdout.txt",
+    })
diff --git a/src/xenia/apu/nop/premake5.lua b/src/xenia/apu/nop/premake5.lua
new file mode 100644
index 000000000..068234586
--- /dev/null
+++ b/src/xenia/apu/nop/premake5.lua
@@ -0,0 +1,17 @@
+project_root = "../../../.."
+include(project_root.."/build_tools")
+
+group("src")
+project("xenia-apu-nop")
+  uuid("f37dbf3a-d200-4cc0-83f0-f801b1bdd862")
+  kind("StaticLib")
+  language("C++")
+  links({
+    "xenia-base",
+    "xenia-apu",
+  })
+  defines({
+  })
+  includedirs({
+  })
+  local_platform_files()
diff --git a/src/xenia/apu/premake5.lua b/src/xenia/apu/premake5.lua
new file mode 100644
index 000000000..68ed44140
--- /dev/null
+++ b/src/xenia/apu/premake5.lua
@@ -0,0 +1,20 @@
+project_root = "../../.."
+include(project_root.."/build_tools")
+
+group("src")
+project("xenia-apu")
+  uuid("f4df01f0-50e4-4c67-8f54-61660696cc79")
+  kind("StaticLib")
+  language("C++")
+  links({
+    "libavcodec.a",
+    "libavutil.a",
+    "xenia-base",
+  })
+  defines({
+  })
+  includedirs({
+    project_root.."/third_party/libav-xma-bin/include/",
+  })
+  local_platform_files()
+
diff --git a/src/xenia/apu/xaudio2/premake5.lua b/src/xenia/apu/xaudio2/premake5.lua
new file mode 100644
index 000000000..7054e7419
--- /dev/null
+++ b/src/xenia/apu/xaudio2/premake5.lua
@@ -0,0 +1,16 @@
+project_root = "../../../.."
+include(project_root.."/build_tools")
+
+project("xenia-apu-xaudio2")
+  uuid("7a54a497-24d9-4c0e-a013-8507a04231f9")
+  kind("StaticLib")
+  language("C++")
+  links({
+    "xenia-base",
+    "xenia-apu",
+  })
+  defines({
+  })
+  includedirs({
+  })
+  local_platform_files()
diff --git a/vsdebuggervis.natvis b/src/xenia/base/debug_visualizers.natvis
similarity index 85%
rename from vsdebuggervis.natvis
rename to src/xenia/base/debug_visualizers.natvis
index 7bf54d0d8..17e481c08 100644
--- a/vsdebuggervis.natvis
+++ b/src/xenia/base/debug_visualizers.natvis
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-  
+
   <!-- Automatically convert endianness for xe::be -->
   <Type Name="xe::be&lt;unsigned int&gt;">
     <DisplayString>
@@ -18,7 +18,7 @@
         ((value &amp; 0x000000FF) &lt;&lt; 24))}
     </DisplayString>
   </Type>
-  
+
   <Type Name="xe::be&lt;unsigned short&gt;">
     <DisplayString>
       {(((value &amp; 0xFF00) &gt;&gt;  8) |
@@ -43,12 +43,4 @@
     </DisplayString>
   </Type>
 
-  <!-- Shims -->
-
-  <Type Name="xe::kernel::shim::TypedPointerParam&lt;*&gt;">
-    <DisplayString>{host_ptr_}</DisplayString>
-    <Expand>
-      <ExpandedItem>host_ptr_</ExpandedItem>
-    </Expand>
-  </Type>
-</AutoVisualizer>
\ No newline at end of file
+</AutoVisualizer>
diff --git a/src/xenia/base/main_win.cc b/src/xenia/base/main_win.cc
index 9227f2152..3d3333075 100644
--- a/src/xenia/base/main_win.cc
+++ b/src/xenia/base/main_win.cc
@@ -49,7 +49,7 @@ void AttachConsole() {
 }  // namespace xe
 
 // Used in console mode apps; automatically picked based on subsystem.
-int wmain(int argc, wchar_t* argv[]) {
+int main(int argc, wchar_t* argv[]) {
   auto entry_info = xe::GetEntryInfo();
 
   google::SetUsageMessage(std::string("usage: ") +
@@ -102,7 +102,7 @@ int WINAPI wWinMain(HINSTANCE, HINSTANCE, LPWSTR command_line, int) {
   }
 
   // Run normal entry point.
-  int result = wmain(argc, argv);
+  int result = main(argc, argv);
 
   LocalFree(argv);
   return result;
diff --git a/src/xenia/base/memory_test.cc b/src/xenia/base/memory_test.cc
new file mode 100644
index 000000000..e0d936c9c
--- /dev/null
+++ b/src/xenia/base/memory_test.cc
@@ -0,0 +1,19 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2015 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include "third_party/catch/include/catch.hpp"
+#include "xenia/base/memory.h"
+
+using namespace xe;
+using namespace xe::memory;
+
+TEST_CASE("copy_and_swap_16_aligned", "Copy and Swap") {
+  // TODO(benvanik): tests.
+  REQUIRE(true == true);
+}
diff --git a/src/xenia/base/premake5.lua b/src/xenia/base/premake5.lua
new file mode 100644
index 000000000..155c68613
--- /dev/null
+++ b/src/xenia/base/premake5.lua
@@ -0,0 +1,24 @@
+project_root = "../../.."
+include(project_root.."/build_tools")
+
+project("xenia-base")
+  uuid("aeadaf22-2b20-4941-b05f-a802d5679c11")
+  kind("StaticLib")
+  language("C++")
+  defines({
+  })
+  includedirs({
+  })
+  local_platform_files()
+  removefiles({"main_*.cc"})
+  files({
+    "debug_visualizers.natvis",
+  })
+
+test_suite("xenia-base-tests", project_root, ".", {
+  includedirs = {
+  },
+  links = {
+    "xenia-base",
+  },
+})
diff --git a/src/xenia/cpu/backend/x64/premake5.lua b/src/xenia/cpu/backend/x64/premake5.lua
new file mode 100644
index 000000000..afda7d45a
--- /dev/null
+++ b/src/xenia/cpu/backend/x64/premake5.lua
@@ -0,0 +1,28 @@
+project_root = "../../../../.."
+include(project_root.."/build_tools")
+
+group("src")
+project("xenia-cpu-backend-x64")
+  uuid("7d8d5dce-4696-4197-952a-09506f725afe")
+  kind("StaticLib")
+  language("C++")
+  links({
+    "beaengine",
+    "capstone",
+    "xenia-base",
+    "xenia-cpu",
+  })
+  defines({
+    "BEA_ENGINE_STATIC=1",
+    "CAPSTONE_X86_ATT_DISABLE",
+    "CAPSTONE_DIET_NO",
+    "CAPSTONE_X86_REDUCE_NO",
+    "CAPSTONE_HAS_X86",
+    "CAPSTONE_USE_SYS_DYN_MEM",
+    "XBYAK_NO_OP_NAMES",
+  })
+  includedirs({
+    project_root.."/third_party/beaengine/include",
+    project_root.."/third_party/capstone/include",
+  })
+  local_platform_files()
diff --git a/src/xenia/cpu/frontend/test/xe-cpu-ppc-test.vcxproj b/src/xenia/cpu/frontend/test/xe-cpu-ppc-test.vcxproj
deleted file mode 100644
index 4a51bd167..000000000
--- a/src/xenia/cpu/frontend/test/xe-cpu-ppc-test.vcxproj
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Checked|x64">
-      <Configuration>Checked</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9B8AC22F-9147-490F-BE03-3B8BA31990A8}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>xecpuppctest</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="..\..\..\..\..\build\Xenia.Cpp.x64.Debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="..\..\..\..\..\build\Xenia.Cpp.x64.Debug.props" />
-    <Import Project="..\..\..\..\..\build\Xenia.Cpp.x64.Checked.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="..\..\..\..\..\build\Xenia.Cpp.x64.Release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libxenia.lib;ntdll.lib;wsock32.lib;ws2_32.lib;xinput.lib;xaudio2.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libxenia.lib;ntdll.lib;wsock32.lib;ws2_32.lib;xinput.lib;xaudio2.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>libxenia.lib;ntdll.lib;wsock32.lib;ws2_32.lib;xinput.lib;xaudio2.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\base\main_win.cc" />
-    <ClCompile Include="xe-cpu-ppc-test.cc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="instr_add.s" />
-    <None Include="instr_addc.s" />
-    <None Include="instr_adde.s" />
-    <None Include="instr_addic.s" />
-    <None Include="instr_addis.s" />
-    <None Include="instr_addme.s" />
-    <None Include="instr_addze.s" />
-    <None Include="instr_and.s" />
-    <None Include="instr_andc.s" />
-    <None Include="instr_andi.s" />
-    <None Include="instr_andis.s" />
-    <None Include="instr_cmp.s" />
-    <None Include="instr_cmpi.s" />
-    <None Include="instr_cmpl.s" />
-    <None Include="instr_cmpli.s" />
-    <None Include="instr_cntlzd.s" />
-    <None Include="instr_cntlzw.s" />
-    <None Include="instr_divd.s" />
-    <None Include="instr_divdu.s" />
-    <None Include="instr_divw.s" />
-    <None Include="instr_divwu.s" />
-    <None Include="instr_eqv.s" />
-    <None Include="instr_extsb.s" />
-    <None Include="instr_extsh.s" />
-    <None Include="instr_extsw.s" />
-    <None Include="instr_fabs.s" />
-    <None Include="instr_fadd.s" />
-    <None Include="instr_fmadd.s" />
-    <None Include="instr_fmadds.s" />
-    <None Include="instr_fmul.s" />
-    <None Include="instr_fnabs.s" />
-    <None Include="instr_frsqrte.s" />
-    <None Include="instr_fsel.s" />
-    <None Include="instr_fsqrt.s" />
-    <None Include="instr_lvexx.s" />
-    <None Include="instr_lvl.s" />
-    <None Include="instr_lvr.s" />
-    <None Include="instr_lvsl.s" />
-    <None Include="instr_lvsr.s" />
-    <None Include="instr_mulhd.s" />
-    <None Include="instr_mulhdu.s" />
-    <None Include="instr_mulhw.s" />
-    <None Include="instr_mulhwu.s" />
-    <None Include="instr_mulld.s" />
-    <None Include="instr_mulli.s" />
-    <None Include="instr_mullw.s" />
-    <None Include="instr_neg.s" />
-    <None Include="instr_nor.s" />
-    <None Include="instr_ori.s" />
-    <None Include="instr_rldicl.s" />
-    <None Include="instr_rldicr.s" />
-    <None Include="instr_rlwimi.s" />
-    <None Include="instr_rlwinm.s" />
-    <None Include="instr_rlwnm.s" />
-    <None Include="instr_sld.s" />
-    <None Include="instr_slw.s" />
-    <None Include="instr_srad.s" />
-    <None Include="instr_sradi.s" />
-    <None Include="instr_sraw.s" />
-    <None Include="instr_srawi.s" />
-    <None Include="instr_srd.s" />
-    <None Include="instr_srw.s" />
-    <None Include="instr_stvew.s" />
-    <None Include="instr_stvl.s" />
-    <None Include="instr_stvr.s" />
-    <None Include="instr_subf.s" />
-    <None Include="instr_subfc.s" />
-    <None Include="instr_subfe.s" />
-    <None Include="instr_subfic.s" />
-    <None Include="instr_subfme.s" />
-    <None Include="instr_subfze.s" />
-    <None Include="instr_td.s" />
-    <None Include="instr_tdi.s" />
-    <None Include="instr_tw.s" />
-    <None Include="instr_twi.s" />
-    <None Include="instr_vaddshs.s" />
-    <None Include="instr_vadduhm.s" />
-    <None Include="instr_vcfsx.s" />
-    <None Include="instr_vcmpxxfp.s" />
-    <None Include="instr_vctsxs.s" />
-    <None Include="instr_vmaddfp.s" />
-    <None Include="instr_vmrghb.s" />
-    <None Include="instr_vmrghh.s" />
-    <None Include="instr_vmrghw.s" />
-    <None Include="instr_vmrglb.s" />
-    <None Include="instr_vmrglh.s" />
-    <None Include="instr_vmrglw.s" />
-    <None Include="instr_vmsum4fp128.s" />
-    <None Include="instr_vperm.s" />
-    <None Include="instr_vpermwi128.s" />
-    <None Include="instr_vpkd3d128.s" />
-    <None Include="instr_vpkshss.s" />
-    <None Include="instr_vpkswss.s" />
-    <None Include="instr_vrfin.s" />
-    <None Include="instr_vrlimi128.s" />
-    <None Include="instr_vsel.s" />
-    <None Include="instr_vsl.s" />
-    <None Include="instr_vslb.s" />
-    <None Include="instr_vsldoi.s" />
-    <None Include="instr_vslh.s" />
-    <None Include="instr_vslw.s" />
-    <None Include="instr_vspltb.s" />
-    <None Include="instr_vsplth.s" />
-    <None Include="instr_vspltisb.s" />
-    <None Include="instr_vspltish.s" />
-    <None Include="instr_vspltisw.s" />
-    <None Include="instr_vspltw.s" />
-    <None Include="instr_vsr.s" />
-    <None Include="instr_vsubshs.s" />
-    <None Include="instr_vsubuhm.s" />
-    <None Include="instr_vupkd3d128.s" />
-    <None Include="instr_vupkhsh.s" />
-    <None Include="instr_vupklsh.s" />
-    <None Include="jumptable_constants.s" />
-    <None Include="sequence_branch_carry.s" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\base\main.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/xenia/cpu/frontend/test/xe-cpu-ppc-test.vcxproj.filters b/src/xenia/cpu/frontend/test/xe-cpu-ppc-test.vcxproj.filters
deleted file mode 100644
index 8572a8506..000000000
--- a/src/xenia/cpu/frontend/test/xe-cpu-ppc-test.vcxproj.filters
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="xe-cpu-ppc-test.cc" />
-    <ClCompile Include="..\..\..\base\main_win.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="instr_vupklsh.s" />
-    <None Include="instr_add.s" />
-    <None Include="instr_addc.s" />
-    <None Include="instr_adde.s" />
-    <None Include="instr_addic.s" />
-    <None Include="instr_addme.s" />
-    <None Include="instr_addze.s" />
-    <None Include="instr_cntlzd.s" />
-    <None Include="instr_cntlzw.s" />
-    <None Include="instr_divd.s" />
-    <None Include="instr_divdu.s" />
-    <None Include="instr_divw.s" />
-    <None Include="instr_divwu.s" />
-    <None Include="instr_eqv.s" />
-    <None Include="instr_fabs.s" />
-    <None Include="instr_fsel.s" />
-    <None Include="instr_lvexx.s" />
-    <None Include="instr_lvl.s" />
-    <None Include="instr_lvr.s" />
-    <None Include="instr_lvsl.s" />
-    <None Include="instr_lvsr.s" />
-    <None Include="instr_mulhd.s" />
-    <None Include="instr_mulhdu.s" />
-    <None Include="instr_mulhw.s" />
-    <None Include="instr_mulhwu.s" />
-    <None Include="instr_mulld.s" />
-    <None Include="instr_mulli.s" />
-    <None Include="instr_mullw.s" />
-    <None Include="instr_neg.s" />
-    <None Include="instr_nor.s" />
-    <None Include="instr_ori.s" />
-    <None Include="instr_rldicl.s" />
-    <None Include="instr_rldicr.s" />
-    <None Include="instr_rlwimi.s" />
-    <None Include="instr_rlwinm.s" />
-    <None Include="instr_rlwnm.s" />
-    <None Include="instr_sld.s" />
-    <None Include="instr_slw.s" />
-    <None Include="instr_srad.s" />
-    <None Include="instr_sradi.s" />
-    <None Include="instr_sraw.s" />
-    <None Include="instr_srawi.s" />
-    <None Include="instr_srd.s" />
-    <None Include="instr_srw.s" />
-    <None Include="instr_stvew.s" />
-    <None Include="instr_stvl.s" />
-    <None Include="instr_stvr.s" />
-    <None Include="instr_subf.s" />
-    <None Include="instr_subfc.s" />
-    <None Include="instr_subfe.s" />
-    <None Include="instr_subfic.s" />
-    <None Include="instr_subfme.s" />
-    <None Include="instr_subfze.s" />
-    <None Include="instr_vaddshs.s" />
-    <None Include="instr_vadduhm.s" />
-    <None Include="instr_vcfsx.s" />
-    <None Include="instr_vcmpxxfp.s" />
-    <None Include="instr_vctsxs.s" />
-    <None Include="instr_vmrghb.s" />
-    <None Include="instr_vmrghh.s" />
-    <None Include="instr_vmrghw.s" />
-    <None Include="instr_vmrglb.s" />
-    <None Include="instr_vmrglh.s" />
-    <None Include="instr_vmrglw.s" />
-    <None Include="instr_vperm.s" />
-    <None Include="instr_vpermwi128.s" />
-    <None Include="instr_vpkd3d128.s" />
-    <None Include="instr_vpkshss.s" />
-    <None Include="instr_vpkswss.s" />
-    <None Include="instr_vrfin.s" />
-    <None Include="instr_vrlimi128.s" />
-    <None Include="instr_vsel.s" />
-    <None Include="instr_vslb.s" />
-    <None Include="instr_vsldoi.s" />
-    <None Include="instr_vslh.s" />
-    <None Include="instr_vslw.s" />
-    <None Include="instr_vspltb.s" />
-    <None Include="instr_vsplth.s" />
-    <None Include="instr_vspltisb.s" />
-    <None Include="instr_vspltish.s" />
-    <None Include="instr_vspltisw.s" />
-    <None Include="instr_vspltw.s" />
-    <None Include="instr_vsubshs.s" />
-    <None Include="instr_vsubuhm.s" />
-    <None Include="instr_vupkd3d128.s" />
-    <None Include="instr_vupkhsh.s" />
-    <None Include="instr_fnabs.s" />
-    <None Include="sequence_branch_carry.s" />
-    <None Include="instr_addis.s" />
-    <None Include="instr_and.s" />
-    <None Include="instr_andc.s" />
-    <None Include="instr_andi.s" />
-    <None Include="instr_andis.s" />
-    <None Include="instr_cmp.s" />
-    <None Include="instr_cmpi.s" />
-    <None Include="instr_cmpl.s" />
-    <None Include="instr_cmpli.s" />
-    <None Include="instr_extsb.s" />
-    <None Include="instr_extsh.s" />
-    <None Include="instr_extsw.s" />
-    <None Include="instr_fadd.s" />
-    <None Include="instr_fmadd.s" />
-    <None Include="instr_fmadds.s" />
-    <None Include="instr_fmul.s" />
-    <None Include="instr_frsqrte.s" />
-    <None Include="instr_fsqrt.s" />
-    <None Include="instr_td.s" />
-    <None Include="instr_tdi.s" />
-    <None Include="instr_tw.s" />
-    <None Include="instr_twi.s" />
-    <None Include="instr_vmaddfp.s" />
-    <None Include="instr_vmsum4fp128.s" />
-    <None Include="jumptable_constants.s" />
-    <None Include="instr_vsr.s" />
-    <None Include="instr_vsl.s" />
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="src">
-      <UniqueIdentifier>{3beca96a-ec9a-4570-8873-3de8c124862f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia">
-      <UniqueIdentifier>{eeea8b16-cc79-4e53-80a4-6db3089e6db9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\base">
-      <UniqueIdentifier>{459f7c23-b556-4300-b16d-8f86063c8e1a}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\base\main.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/xenia/cpu/frontend/test/README.md b/src/xenia/cpu/frontend/testing/README.md
similarity index 100%
rename from src/xenia/cpu/frontend/test/README.md
rename to src/xenia/cpu/frontend/testing/README.md
diff --git a/src/xenia/cpu/frontend/test/instr_add.s b/src/xenia/cpu/frontend/testing/instr_add.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_add.s
rename to src/xenia/cpu/frontend/testing/instr_add.s
diff --git a/src/xenia/cpu/frontend/test/instr_addc.s b/src/xenia/cpu/frontend/testing/instr_addc.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_addc.s
rename to src/xenia/cpu/frontend/testing/instr_addc.s
diff --git a/src/xenia/cpu/frontend/test/instr_adde.s b/src/xenia/cpu/frontend/testing/instr_adde.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_adde.s
rename to src/xenia/cpu/frontend/testing/instr_adde.s
diff --git a/src/xenia/cpu/frontend/test/instr_addic.s b/src/xenia/cpu/frontend/testing/instr_addic.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_addic.s
rename to src/xenia/cpu/frontend/testing/instr_addic.s
diff --git a/src/xenia/cpu/frontend/test/instr_addis.s b/src/xenia/cpu/frontend/testing/instr_addis.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_addis.s
rename to src/xenia/cpu/frontend/testing/instr_addis.s
diff --git a/src/xenia/cpu/frontend/test/instr_addme.s b/src/xenia/cpu/frontend/testing/instr_addme.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_addme.s
rename to src/xenia/cpu/frontend/testing/instr_addme.s
diff --git a/src/xenia/cpu/frontend/test/instr_addze.s b/src/xenia/cpu/frontend/testing/instr_addze.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_addze.s
rename to src/xenia/cpu/frontend/testing/instr_addze.s
diff --git a/src/xenia/cpu/frontend/test/instr_and.s b/src/xenia/cpu/frontend/testing/instr_and.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_and.s
rename to src/xenia/cpu/frontend/testing/instr_and.s
diff --git a/src/xenia/cpu/frontend/test/instr_andc.s b/src/xenia/cpu/frontend/testing/instr_andc.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_andc.s
rename to src/xenia/cpu/frontend/testing/instr_andc.s
diff --git a/src/xenia/cpu/frontend/test/instr_andi.s b/src/xenia/cpu/frontend/testing/instr_andi.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_andi.s
rename to src/xenia/cpu/frontend/testing/instr_andi.s
diff --git a/src/xenia/cpu/frontend/test/instr_andis.s b/src/xenia/cpu/frontend/testing/instr_andis.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_andis.s
rename to src/xenia/cpu/frontend/testing/instr_andis.s
diff --git a/src/xenia/cpu/frontend/test/instr_cmp.s b/src/xenia/cpu/frontend/testing/instr_cmp.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_cmp.s
rename to src/xenia/cpu/frontend/testing/instr_cmp.s
diff --git a/src/xenia/cpu/frontend/test/instr_cmpi.s b/src/xenia/cpu/frontend/testing/instr_cmpi.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_cmpi.s
rename to src/xenia/cpu/frontend/testing/instr_cmpi.s
diff --git a/src/xenia/cpu/frontend/test/instr_cmpl.s b/src/xenia/cpu/frontend/testing/instr_cmpl.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_cmpl.s
rename to src/xenia/cpu/frontend/testing/instr_cmpl.s
diff --git a/src/xenia/cpu/frontend/test/instr_cmpli.s b/src/xenia/cpu/frontend/testing/instr_cmpli.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_cmpli.s
rename to src/xenia/cpu/frontend/testing/instr_cmpli.s
diff --git a/src/xenia/cpu/frontend/test/instr_cntlzd.s b/src/xenia/cpu/frontend/testing/instr_cntlzd.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_cntlzd.s
rename to src/xenia/cpu/frontend/testing/instr_cntlzd.s
diff --git a/src/xenia/cpu/frontend/test/instr_cntlzw.s b/src/xenia/cpu/frontend/testing/instr_cntlzw.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_cntlzw.s
rename to src/xenia/cpu/frontend/testing/instr_cntlzw.s
diff --git a/src/xenia/cpu/frontend/test/instr_divd.s b/src/xenia/cpu/frontend/testing/instr_divd.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_divd.s
rename to src/xenia/cpu/frontend/testing/instr_divd.s
diff --git a/src/xenia/cpu/frontend/test/instr_divdu.s b/src/xenia/cpu/frontend/testing/instr_divdu.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_divdu.s
rename to src/xenia/cpu/frontend/testing/instr_divdu.s
diff --git a/src/xenia/cpu/frontend/test/instr_divw.s b/src/xenia/cpu/frontend/testing/instr_divw.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_divw.s
rename to src/xenia/cpu/frontend/testing/instr_divw.s
diff --git a/src/xenia/cpu/frontend/test/instr_divwu.s b/src/xenia/cpu/frontend/testing/instr_divwu.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_divwu.s
rename to src/xenia/cpu/frontend/testing/instr_divwu.s
diff --git a/src/xenia/cpu/frontend/test/instr_eqv.s b/src/xenia/cpu/frontend/testing/instr_eqv.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_eqv.s
rename to src/xenia/cpu/frontend/testing/instr_eqv.s
diff --git a/src/xenia/cpu/frontend/test/instr_extsb.s b/src/xenia/cpu/frontend/testing/instr_extsb.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_extsb.s
rename to src/xenia/cpu/frontend/testing/instr_extsb.s
diff --git a/src/xenia/cpu/frontend/test/instr_extsh.s b/src/xenia/cpu/frontend/testing/instr_extsh.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_extsh.s
rename to src/xenia/cpu/frontend/testing/instr_extsh.s
diff --git a/src/xenia/cpu/frontend/test/instr_extsw.s b/src/xenia/cpu/frontend/testing/instr_extsw.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_extsw.s
rename to src/xenia/cpu/frontend/testing/instr_extsw.s
diff --git a/src/xenia/cpu/frontend/test/instr_fabs.s b/src/xenia/cpu/frontend/testing/instr_fabs.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_fabs.s
rename to src/xenia/cpu/frontend/testing/instr_fabs.s
diff --git a/src/xenia/cpu/frontend/test/instr_fadd.s b/src/xenia/cpu/frontend/testing/instr_fadd.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_fadd.s
rename to src/xenia/cpu/frontend/testing/instr_fadd.s
diff --git a/src/xenia/cpu/frontend/test/instr_fmadd.s b/src/xenia/cpu/frontend/testing/instr_fmadd.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_fmadd.s
rename to src/xenia/cpu/frontend/testing/instr_fmadd.s
diff --git a/src/xenia/cpu/frontend/test/instr_fmadds.s b/src/xenia/cpu/frontend/testing/instr_fmadds.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_fmadds.s
rename to src/xenia/cpu/frontend/testing/instr_fmadds.s
diff --git a/src/xenia/cpu/frontend/test/instr_fmul.s b/src/xenia/cpu/frontend/testing/instr_fmul.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_fmul.s
rename to src/xenia/cpu/frontend/testing/instr_fmul.s
diff --git a/src/xenia/cpu/frontend/test/instr_fnabs.s b/src/xenia/cpu/frontend/testing/instr_fnabs.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_fnabs.s
rename to src/xenia/cpu/frontend/testing/instr_fnabs.s
diff --git a/src/xenia/cpu/frontend/test/instr_frsqrte.s b/src/xenia/cpu/frontend/testing/instr_frsqrte.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_frsqrte.s
rename to src/xenia/cpu/frontend/testing/instr_frsqrte.s
diff --git a/src/xenia/cpu/frontend/test/instr_fsel.s b/src/xenia/cpu/frontend/testing/instr_fsel.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_fsel.s
rename to src/xenia/cpu/frontend/testing/instr_fsel.s
diff --git a/src/xenia/cpu/frontend/test/instr_fsqrt.s b/src/xenia/cpu/frontend/testing/instr_fsqrt.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_fsqrt.s
rename to src/xenia/cpu/frontend/testing/instr_fsqrt.s
diff --git a/src/xenia/cpu/frontend/test/instr_lvexx.s b/src/xenia/cpu/frontend/testing/instr_lvexx.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_lvexx.s
rename to src/xenia/cpu/frontend/testing/instr_lvexx.s
diff --git a/src/xenia/cpu/frontend/test/instr_lvl.s b/src/xenia/cpu/frontend/testing/instr_lvl.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_lvl.s
rename to src/xenia/cpu/frontend/testing/instr_lvl.s
diff --git a/src/xenia/cpu/frontend/test/instr_lvr.s b/src/xenia/cpu/frontend/testing/instr_lvr.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_lvr.s
rename to src/xenia/cpu/frontend/testing/instr_lvr.s
diff --git a/src/xenia/cpu/frontend/test/instr_lvsl.s b/src/xenia/cpu/frontend/testing/instr_lvsl.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_lvsl.s
rename to src/xenia/cpu/frontend/testing/instr_lvsl.s
diff --git a/src/xenia/cpu/frontend/test/instr_lvsr.s b/src/xenia/cpu/frontend/testing/instr_lvsr.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_lvsr.s
rename to src/xenia/cpu/frontend/testing/instr_lvsr.s
diff --git a/src/xenia/cpu/frontend/test/instr_mulhd.s b/src/xenia/cpu/frontend/testing/instr_mulhd.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_mulhd.s
rename to src/xenia/cpu/frontend/testing/instr_mulhd.s
diff --git a/src/xenia/cpu/frontend/test/instr_mulhdu.s b/src/xenia/cpu/frontend/testing/instr_mulhdu.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_mulhdu.s
rename to src/xenia/cpu/frontend/testing/instr_mulhdu.s
diff --git a/src/xenia/cpu/frontend/test/instr_mulhw.s b/src/xenia/cpu/frontend/testing/instr_mulhw.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_mulhw.s
rename to src/xenia/cpu/frontend/testing/instr_mulhw.s
diff --git a/src/xenia/cpu/frontend/test/instr_mulhwu.s b/src/xenia/cpu/frontend/testing/instr_mulhwu.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_mulhwu.s
rename to src/xenia/cpu/frontend/testing/instr_mulhwu.s
diff --git a/src/xenia/cpu/frontend/test/instr_mulld.s b/src/xenia/cpu/frontend/testing/instr_mulld.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_mulld.s
rename to src/xenia/cpu/frontend/testing/instr_mulld.s
diff --git a/src/xenia/cpu/frontend/test/instr_mulli.s b/src/xenia/cpu/frontend/testing/instr_mulli.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_mulli.s
rename to src/xenia/cpu/frontend/testing/instr_mulli.s
diff --git a/src/xenia/cpu/frontend/test/instr_mullw.s b/src/xenia/cpu/frontend/testing/instr_mullw.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_mullw.s
rename to src/xenia/cpu/frontend/testing/instr_mullw.s
diff --git a/src/xenia/cpu/frontend/test/instr_neg.s b/src/xenia/cpu/frontend/testing/instr_neg.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_neg.s
rename to src/xenia/cpu/frontend/testing/instr_neg.s
diff --git a/src/xenia/cpu/frontend/test/instr_nor.s b/src/xenia/cpu/frontend/testing/instr_nor.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_nor.s
rename to src/xenia/cpu/frontend/testing/instr_nor.s
diff --git a/src/xenia/cpu/frontend/test/instr_ori.s b/src/xenia/cpu/frontend/testing/instr_ori.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_ori.s
rename to src/xenia/cpu/frontend/testing/instr_ori.s
diff --git a/src/xenia/cpu/frontend/test/instr_rldicl.s b/src/xenia/cpu/frontend/testing/instr_rldicl.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_rldicl.s
rename to src/xenia/cpu/frontend/testing/instr_rldicl.s
diff --git a/src/xenia/cpu/frontend/test/instr_rldicr.s b/src/xenia/cpu/frontend/testing/instr_rldicr.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_rldicr.s
rename to src/xenia/cpu/frontend/testing/instr_rldicr.s
diff --git a/src/xenia/cpu/frontend/test/instr_rlwimi.s b/src/xenia/cpu/frontend/testing/instr_rlwimi.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_rlwimi.s
rename to src/xenia/cpu/frontend/testing/instr_rlwimi.s
diff --git a/src/xenia/cpu/frontend/test/instr_rlwinm.s b/src/xenia/cpu/frontend/testing/instr_rlwinm.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_rlwinm.s
rename to src/xenia/cpu/frontend/testing/instr_rlwinm.s
diff --git a/src/xenia/cpu/frontend/test/instr_rlwnm.s b/src/xenia/cpu/frontend/testing/instr_rlwnm.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_rlwnm.s
rename to src/xenia/cpu/frontend/testing/instr_rlwnm.s
diff --git a/src/xenia/cpu/frontend/test/instr_sld.s b/src/xenia/cpu/frontend/testing/instr_sld.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_sld.s
rename to src/xenia/cpu/frontend/testing/instr_sld.s
diff --git a/src/xenia/cpu/frontend/test/instr_slw.s b/src/xenia/cpu/frontend/testing/instr_slw.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_slw.s
rename to src/xenia/cpu/frontend/testing/instr_slw.s
diff --git a/src/xenia/cpu/frontend/test/instr_srad.s b/src/xenia/cpu/frontend/testing/instr_srad.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_srad.s
rename to src/xenia/cpu/frontend/testing/instr_srad.s
diff --git a/src/xenia/cpu/frontend/test/instr_sradi.s b/src/xenia/cpu/frontend/testing/instr_sradi.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_sradi.s
rename to src/xenia/cpu/frontend/testing/instr_sradi.s
diff --git a/src/xenia/cpu/frontend/test/instr_sraw.s b/src/xenia/cpu/frontend/testing/instr_sraw.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_sraw.s
rename to src/xenia/cpu/frontend/testing/instr_sraw.s
diff --git a/src/xenia/cpu/frontend/test/instr_srawi.s b/src/xenia/cpu/frontend/testing/instr_srawi.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_srawi.s
rename to src/xenia/cpu/frontend/testing/instr_srawi.s
diff --git a/src/xenia/cpu/frontend/test/instr_srd.s b/src/xenia/cpu/frontend/testing/instr_srd.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_srd.s
rename to src/xenia/cpu/frontend/testing/instr_srd.s
diff --git a/src/xenia/cpu/frontend/test/instr_srw.s b/src/xenia/cpu/frontend/testing/instr_srw.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_srw.s
rename to src/xenia/cpu/frontend/testing/instr_srw.s
diff --git a/src/xenia/cpu/frontend/test/instr_stvew.s b/src/xenia/cpu/frontend/testing/instr_stvew.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_stvew.s
rename to src/xenia/cpu/frontend/testing/instr_stvew.s
diff --git a/src/xenia/cpu/frontend/test/instr_stvl.s b/src/xenia/cpu/frontend/testing/instr_stvl.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_stvl.s
rename to src/xenia/cpu/frontend/testing/instr_stvl.s
diff --git a/src/xenia/cpu/frontend/test/instr_stvr.s b/src/xenia/cpu/frontend/testing/instr_stvr.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_stvr.s
rename to src/xenia/cpu/frontend/testing/instr_stvr.s
diff --git a/src/xenia/cpu/frontend/test/instr_subf.s b/src/xenia/cpu/frontend/testing/instr_subf.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_subf.s
rename to src/xenia/cpu/frontend/testing/instr_subf.s
diff --git a/src/xenia/cpu/frontend/test/instr_subfc.s b/src/xenia/cpu/frontend/testing/instr_subfc.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_subfc.s
rename to src/xenia/cpu/frontend/testing/instr_subfc.s
diff --git a/src/xenia/cpu/frontend/test/instr_subfe.s b/src/xenia/cpu/frontend/testing/instr_subfe.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_subfe.s
rename to src/xenia/cpu/frontend/testing/instr_subfe.s
diff --git a/src/xenia/cpu/frontend/test/instr_subfic.s b/src/xenia/cpu/frontend/testing/instr_subfic.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_subfic.s
rename to src/xenia/cpu/frontend/testing/instr_subfic.s
diff --git a/src/xenia/cpu/frontend/test/instr_subfme.s b/src/xenia/cpu/frontend/testing/instr_subfme.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_subfme.s
rename to src/xenia/cpu/frontend/testing/instr_subfme.s
diff --git a/src/xenia/cpu/frontend/test/instr_subfze.s b/src/xenia/cpu/frontend/testing/instr_subfze.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_subfze.s
rename to src/xenia/cpu/frontend/testing/instr_subfze.s
diff --git a/src/xenia/cpu/frontend/test/instr_td.s b/src/xenia/cpu/frontend/testing/instr_td.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_td.s
rename to src/xenia/cpu/frontend/testing/instr_td.s
diff --git a/src/xenia/cpu/frontend/test/instr_tdi.s b/src/xenia/cpu/frontend/testing/instr_tdi.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_tdi.s
rename to src/xenia/cpu/frontend/testing/instr_tdi.s
diff --git a/src/xenia/cpu/frontend/test/instr_tw.s b/src/xenia/cpu/frontend/testing/instr_tw.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_tw.s
rename to src/xenia/cpu/frontend/testing/instr_tw.s
diff --git a/src/xenia/cpu/frontend/test/instr_twi.s b/src/xenia/cpu/frontend/testing/instr_twi.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_twi.s
rename to src/xenia/cpu/frontend/testing/instr_twi.s
diff --git a/src/xenia/cpu/frontend/test/instr_vaddshs.s b/src/xenia/cpu/frontend/testing/instr_vaddshs.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vaddshs.s
rename to src/xenia/cpu/frontend/testing/instr_vaddshs.s
diff --git a/src/xenia/cpu/frontend/test/instr_vadduhm.s b/src/xenia/cpu/frontend/testing/instr_vadduhm.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vadduhm.s
rename to src/xenia/cpu/frontend/testing/instr_vadduhm.s
diff --git a/src/xenia/cpu/frontend/test/instr_vcfsx.s b/src/xenia/cpu/frontend/testing/instr_vcfsx.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vcfsx.s
rename to src/xenia/cpu/frontend/testing/instr_vcfsx.s
diff --git a/src/xenia/cpu/frontend/test/instr_vcmpxxfp.s b/src/xenia/cpu/frontend/testing/instr_vcmpxxfp.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vcmpxxfp.s
rename to src/xenia/cpu/frontend/testing/instr_vcmpxxfp.s
diff --git a/src/xenia/cpu/frontend/test/instr_vctsxs.s b/src/xenia/cpu/frontend/testing/instr_vctsxs.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vctsxs.s
rename to src/xenia/cpu/frontend/testing/instr_vctsxs.s
diff --git a/src/xenia/cpu/frontend/test/instr_vmaddfp.s b/src/xenia/cpu/frontend/testing/instr_vmaddfp.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vmaddfp.s
rename to src/xenia/cpu/frontend/testing/instr_vmaddfp.s
diff --git a/src/xenia/cpu/frontend/test/instr_vmrghb.s b/src/xenia/cpu/frontend/testing/instr_vmrghb.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vmrghb.s
rename to src/xenia/cpu/frontend/testing/instr_vmrghb.s
diff --git a/src/xenia/cpu/frontend/test/instr_vmrghh.s b/src/xenia/cpu/frontend/testing/instr_vmrghh.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vmrghh.s
rename to src/xenia/cpu/frontend/testing/instr_vmrghh.s
diff --git a/src/xenia/cpu/frontend/test/instr_vmrghw.s b/src/xenia/cpu/frontend/testing/instr_vmrghw.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vmrghw.s
rename to src/xenia/cpu/frontend/testing/instr_vmrghw.s
diff --git a/src/xenia/cpu/frontend/test/instr_vmrglb.s b/src/xenia/cpu/frontend/testing/instr_vmrglb.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vmrglb.s
rename to src/xenia/cpu/frontend/testing/instr_vmrglb.s
diff --git a/src/xenia/cpu/frontend/test/instr_vmrglh.s b/src/xenia/cpu/frontend/testing/instr_vmrglh.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vmrglh.s
rename to src/xenia/cpu/frontend/testing/instr_vmrglh.s
diff --git a/src/xenia/cpu/frontend/test/instr_vmrglw.s b/src/xenia/cpu/frontend/testing/instr_vmrglw.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vmrglw.s
rename to src/xenia/cpu/frontend/testing/instr_vmrglw.s
diff --git a/src/xenia/cpu/frontend/test/instr_vmsum4fp128.s b/src/xenia/cpu/frontend/testing/instr_vmsum4fp128.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vmsum4fp128.s
rename to src/xenia/cpu/frontend/testing/instr_vmsum4fp128.s
diff --git a/src/xenia/cpu/frontend/test/instr_vperm.s b/src/xenia/cpu/frontend/testing/instr_vperm.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vperm.s
rename to src/xenia/cpu/frontend/testing/instr_vperm.s
diff --git a/src/xenia/cpu/frontend/test/instr_vpermwi128.s b/src/xenia/cpu/frontend/testing/instr_vpermwi128.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vpermwi128.s
rename to src/xenia/cpu/frontend/testing/instr_vpermwi128.s
diff --git a/src/xenia/cpu/frontend/test/instr_vpkd3d128.s b/src/xenia/cpu/frontend/testing/instr_vpkd3d128.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vpkd3d128.s
rename to src/xenia/cpu/frontend/testing/instr_vpkd3d128.s
diff --git a/src/xenia/cpu/frontend/test/instr_vpkshss.s b/src/xenia/cpu/frontend/testing/instr_vpkshss.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vpkshss.s
rename to src/xenia/cpu/frontend/testing/instr_vpkshss.s
diff --git a/src/xenia/cpu/frontend/test/instr_vpkswss.s b/src/xenia/cpu/frontend/testing/instr_vpkswss.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vpkswss.s
rename to src/xenia/cpu/frontend/testing/instr_vpkswss.s
diff --git a/src/xenia/cpu/frontend/test/instr_vrfin.s b/src/xenia/cpu/frontend/testing/instr_vrfin.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vrfin.s
rename to src/xenia/cpu/frontend/testing/instr_vrfin.s
diff --git a/src/xenia/cpu/frontend/test/instr_vrlimi128.s b/src/xenia/cpu/frontend/testing/instr_vrlimi128.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vrlimi128.s
rename to src/xenia/cpu/frontend/testing/instr_vrlimi128.s
diff --git a/src/xenia/cpu/frontend/test/instr_vsel.s b/src/xenia/cpu/frontend/testing/instr_vsel.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vsel.s
rename to src/xenia/cpu/frontend/testing/instr_vsel.s
diff --git a/src/xenia/cpu/frontend/test/instr_vsl.s b/src/xenia/cpu/frontend/testing/instr_vsl.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vsl.s
rename to src/xenia/cpu/frontend/testing/instr_vsl.s
diff --git a/src/xenia/cpu/frontend/test/instr_vslb.s b/src/xenia/cpu/frontend/testing/instr_vslb.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vslb.s
rename to src/xenia/cpu/frontend/testing/instr_vslb.s
diff --git a/src/xenia/cpu/frontend/test/instr_vsldoi.s b/src/xenia/cpu/frontend/testing/instr_vsldoi.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vsldoi.s
rename to src/xenia/cpu/frontend/testing/instr_vsldoi.s
diff --git a/src/xenia/cpu/frontend/test/instr_vslh.s b/src/xenia/cpu/frontend/testing/instr_vslh.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vslh.s
rename to src/xenia/cpu/frontend/testing/instr_vslh.s
diff --git a/src/xenia/cpu/frontend/test/instr_vslw.s b/src/xenia/cpu/frontend/testing/instr_vslw.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vslw.s
rename to src/xenia/cpu/frontend/testing/instr_vslw.s
diff --git a/src/xenia/cpu/frontend/test/instr_vspltb.s b/src/xenia/cpu/frontend/testing/instr_vspltb.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vspltb.s
rename to src/xenia/cpu/frontend/testing/instr_vspltb.s
diff --git a/src/xenia/cpu/frontend/test/instr_vsplth.s b/src/xenia/cpu/frontend/testing/instr_vsplth.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vsplth.s
rename to src/xenia/cpu/frontend/testing/instr_vsplth.s
diff --git a/src/xenia/cpu/frontend/test/instr_vspltisb.s b/src/xenia/cpu/frontend/testing/instr_vspltisb.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vspltisb.s
rename to src/xenia/cpu/frontend/testing/instr_vspltisb.s
diff --git a/src/xenia/cpu/frontend/test/instr_vspltish.s b/src/xenia/cpu/frontend/testing/instr_vspltish.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vspltish.s
rename to src/xenia/cpu/frontend/testing/instr_vspltish.s
diff --git a/src/xenia/cpu/frontend/test/instr_vspltisw.s b/src/xenia/cpu/frontend/testing/instr_vspltisw.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vspltisw.s
rename to src/xenia/cpu/frontend/testing/instr_vspltisw.s
diff --git a/src/xenia/cpu/frontend/test/instr_vspltw.s b/src/xenia/cpu/frontend/testing/instr_vspltw.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vspltw.s
rename to src/xenia/cpu/frontend/testing/instr_vspltw.s
diff --git a/src/xenia/cpu/frontend/test/instr_vsr.s b/src/xenia/cpu/frontend/testing/instr_vsr.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vsr.s
rename to src/xenia/cpu/frontend/testing/instr_vsr.s
diff --git a/src/xenia/cpu/frontend/test/instr_vsubshs.s b/src/xenia/cpu/frontend/testing/instr_vsubshs.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vsubshs.s
rename to src/xenia/cpu/frontend/testing/instr_vsubshs.s
diff --git a/src/xenia/cpu/frontend/test/instr_vsubuhm.s b/src/xenia/cpu/frontend/testing/instr_vsubuhm.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vsubuhm.s
rename to src/xenia/cpu/frontend/testing/instr_vsubuhm.s
diff --git a/src/xenia/cpu/frontend/test/instr_vupkd3d128.s b/src/xenia/cpu/frontend/testing/instr_vupkd3d128.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vupkd3d128.s
rename to src/xenia/cpu/frontend/testing/instr_vupkd3d128.s
diff --git a/src/xenia/cpu/frontend/test/instr_vupkhsh.s b/src/xenia/cpu/frontend/testing/instr_vupkhsh.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vupkhsh.s
rename to src/xenia/cpu/frontend/testing/instr_vupkhsh.s
diff --git a/src/xenia/cpu/frontend/test/instr_vupklsh.s b/src/xenia/cpu/frontend/testing/instr_vupklsh.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/instr_vupklsh.s
rename to src/xenia/cpu/frontend/testing/instr_vupklsh.s
diff --git a/src/xenia/cpu/frontend/test/jumptable_constants.s b/src/xenia/cpu/frontend/testing/jumptable_constants.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/jumptable_constants.s
rename to src/xenia/cpu/frontend/testing/jumptable_constants.s
diff --git a/src/xenia/cpu/frontend/test/xe-cpu-ppc-test.cc b/src/xenia/cpu/frontend/testing/ppc_testing_main.cc
similarity index 98%
rename from src/xenia/cpu/frontend/test/xe-cpu-ppc-test.cc
rename to src/xenia/cpu/frontend/testing/ppc_testing_main.cc
index 3f11e3a28..abcfbe1f2 100644
--- a/src/xenia/cpu/frontend/test/xe-cpu-ppc-test.cc
+++ b/src/xenia/cpu/frontend/testing/ppc_testing_main.cc
@@ -24,9 +24,9 @@
 #include "xenia/base/platform_win.h"
 #endif  // XE_COMPILER_MSVC
 
-DEFINE_string(test_path, "src/xenia/cpu/frontend/test/",
+DEFINE_string(test_path, "src/xenia/cpu/frontend/testing/",
               "Directory scanned for test files.");
-DEFINE_string(test_bin_path, "src/xenia/cpu/frontend/test/bin/",
+DEFINE_string(test_bin_path, "src/xenia/cpu/frontend/testing/bin/",
               "Directory with binary outputs of the test files.");
 
 namespace xe {
@@ -449,5 +449,5 @@ int main(std::vector<std::wstring>& args) {
 }  // namespace cpu
 }  // namespace xe
 
-DEFINE_ENTRY_POINT(L"xe-cpu-ppc-test", L"xe-cpu-ppc-test [test name]",
+DEFINE_ENTRY_POINT(L"xenia-cpu-ppc-test", L"xenia-cpu-ppc-test [test name]",
                    xe::cpu::test::main);
diff --git a/src/xenia/cpu/frontend/testing/premake5.lua b/src/xenia/cpu/frontend/testing/premake5.lua
new file mode 100644
index 000000000..fe20118c7
--- /dev/null
+++ b/src/xenia/cpu/frontend/testing/premake5.lua
@@ -0,0 +1,36 @@
+project_root = "../../../../.."
+include(project_root.."/build_tools")
+
+group("tests")
+project("xenia-cpu-frontend-tests")
+  uuid("2a57d5ac-4024-4c49-9cd3-aa3a603c2ef8")
+  kind("ConsoleApp")
+  language("C++")
+  links({
+    "beaengine",
+    "gflags",
+    "xenia-base",
+    "xenia-core",
+    "xenia-cpu",
+    "xenia-cpu-backend-x64",
+
+    -- TODO(benvanik): remove these dependencies.
+    "xenia-debug",
+    "xenia-kernel"
+  })
+  files({
+    "ppc_testing_main.cc",
+    "../../../base/main_"..platform_suffix..".cc",
+  })
+  files({
+    "*.s",
+  })
+  filter("files:*.s")
+    flags({"ExcludeFromBuild"})
+  filter("platforms:Windows")
+    debugdir(project_root)
+    debugargs({
+      "--flagfile=scratch/flags.txt",
+      "2>&1",
+      "1>scratch/stdout-testing.txt",
+    })
diff --git a/src/xenia/cpu/frontend/test/sequence_branch_carry.s b/src/xenia/cpu/frontend/testing/sequence_branch_carry.s
similarity index 100%
rename from src/xenia/cpu/frontend/test/sequence_branch_carry.s
rename to src/xenia/cpu/frontend/testing/sequence_branch_carry.s
diff --git a/src/xenia/cpu/premake5.lua b/src/xenia/cpu/premake5.lua
new file mode 100644
index 000000000..b33d4d68e
--- /dev/null
+++ b/src/xenia/cpu/premake5.lua
@@ -0,0 +1,28 @@
+project_root = "../../.."
+include(project_root.."/build_tools")
+
+group("src")
+project("xenia-cpu")
+  uuid("0109c91e-5a04-41ab-9168-0d5187d11298")
+  kind("StaticLib")
+  language("C++")
+  links({
+    "beaengine",
+    "xenia-base",
+  })
+  defines({
+    "BEA_ENGINE_STATIC=1",
+  })
+  includedirs({
+    project_root.."/third_party/beaengine/include",
+    project_root.."/third_party/llvm/include",
+  })
+  local_platform_files()
+  local_platform_files("backend")
+  local_platform_files("compiler")
+  local_platform_files("compiler/passes")
+  local_platform_files("frontend")
+  local_platform_files("hir")
+
+include("testing")
+include("frontend/testing")
diff --git a/src/xenia/cpu/test/xe-cpu-hir-test.cc b/src/xenia/cpu/test/xe-cpu-hir-test.cc
deleted file mode 100644
index 636405ad2..000000000
--- a/src/xenia/cpu/test/xe-cpu-hir-test.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- ******************************************************************************
- * Xenia : Xbox 360 Emulator Research Project                                 *
- ******************************************************************************
- * Copyright 2014 Ben Vanik. All rights reserved.                             *
- * Released under the BSD license - see LICENSE in the root for more details. *
- ******************************************************************************
- */
-
-#define CATCH_CONFIG_RUNNER
-#include "third_party/catch/single_include/catch.hpp"
-
-#include "xenia/base/debugging.h"
-#include "xenia/base/string.h"
-#include "xenia/cpu/test/util.h"
-
-namespace xe {
-namespace cpu {
-namespace test {
-
-using xe::cpu::frontend::PPCContext;
-
-int main(std::vector<std::wstring>& args) {
-  std::vector<std::string> narrow_args;
-  auto narrow_argv = new char*[args.size()];
-  for (size_t i = 0; i < args.size(); ++i) {
-    auto narrow_arg = xe::to_string(args[i]);
-    narrow_argv[i] = const_cast<char*>(narrow_arg.data());
-    narrow_args.push_back(std::move(narrow_arg));
-  }
-  int ret = Catch::Session().run(int(args.size()), narrow_argv);
-  if (ret) {
-#if XE_PLATFORM_WIN32
-    // Visual Studio kills the console on shutdown, so prevent that.
-    if (xe::debugging::IsDebuggerAttached()) {
-      xe::debugging::Break();
-    }
-#endif  // XE_PLATFORM_WIN32
-  }
-  return ret;
-}
-
-}  // namespace test
-}  // namespace cpu
-}  // namespace xe
-
-DEFINE_ENTRY_POINT(L"xe-cpu-hir-test", L"?", xe::cpu::test::main);
diff --git a/src/xenia/cpu/test/xe-cpu-hir-test.vcxproj b/src/xenia/cpu/test/xe-cpu-hir-test.vcxproj
deleted file mode 100644
index 0c9dd0450..000000000
--- a/src/xenia/cpu/test/xe-cpu-hir-test.vcxproj
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Checked|x64">
-      <Configuration>Checked</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6EC54AD0-4F5B-48D9-B820-43DF2F0DC83C}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>xecpuhirtest</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="..\..\..\..\build\Xenia.Cpp.x64.Debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="..\..\..\..\build\Xenia.Cpp.x64.Debug.props" />
-    <Import Project="..\..\..\..\build\Xenia.Cpp.x64.Checked.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="..\..\..\..\build\Xenia.Cpp.x64.Release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libxenia.lib;ntdll.lib;wsock32.lib;ws2_32.lib;xinput.lib;xaudio2.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libxenia.lib;ntdll.lib;wsock32.lib;ws2_32.lib;xinput.lib;xaudio2.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>libxenia.lib;ntdll.lib;wsock32.lib;ws2_32.lib;xinput.lib;xaudio2.lib;glu32.lib;opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\base\main_win.cc" />
-    <ClCompile Include="test_add.cc" />
-    <ClCompile Include="test_byte_swap.cc" />
-    <ClCompile Include="test_extract.cc" />
-    <ClCompile Include="test_insert.cc" />
-    <ClCompile Include="test_load_vector_shl_shr.cc" />
-    <ClCompile Include="test_pack.cc" />
-    <ClCompile Include="test_permute.cc" />
-    <ClCompile Include="test_sha.cc" />
-    <ClCompile Include="test_shl.cc" />
-    <ClCompile Include="test_shr.cc" />
-    <ClCompile Include="test_swizzle.cc" />
-    <ClCompile Include="test_unpack.cc" />
-    <ClCompile Include="test_vector_add.cc" />
-    <ClCompile Include="test_vector_max.cc" />
-    <ClCompile Include="test_vector_min.cc" />
-    <ClCompile Include="test_vector_rotate_left.cc" />
-    <ClCompile Include="test_vector_sha.cc" />
-    <ClCompile Include="test_vector_shl.cc" />
-    <ClCompile Include="test_vector_shr.cc" />
-    <ClCompile Include="xe-cpu-hir-test.cc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\base\main.h" />
-    <ClInclude Include="util.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/xenia/cpu/test/xe-cpu-hir-test.vcxproj.filters b/src/xenia/cpu/test/xe-cpu-hir-test.vcxproj.filters
deleted file mode 100644
index 24280d22e..000000000
--- a/src/xenia/cpu/test/xe-cpu-hir-test.vcxproj.filters
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="test_add.cc" />
-    <ClCompile Include="test_byte_swap.cc" />
-    <ClCompile Include="test_extract.cc" />
-    <ClCompile Include="test_insert.cc" />
-    <ClCompile Include="test_load_vector_shl_shr.cc" />
-    <ClCompile Include="test_pack.cc" />
-    <ClCompile Include="test_permute.cc" />
-    <ClCompile Include="test_sha.cc" />
-    <ClCompile Include="test_shl.cc" />
-    <ClCompile Include="test_shr.cc" />
-    <ClCompile Include="test_swizzle.cc" />
-    <ClCompile Include="test_unpack.cc" />
-    <ClCompile Include="test_vector_add.cc" />
-    <ClCompile Include="test_vector_max.cc" />
-    <ClCompile Include="test_vector_min.cc" />
-    <ClCompile Include="test_vector_rotate_left.cc" />
-    <ClCompile Include="test_vector_sha.cc" />
-    <ClCompile Include="test_vector_shl.cc" />
-    <ClCompile Include="test_vector_shr.cc" />
-    <ClCompile Include="xe-cpu-hir-test.cc" />
-    <ClCompile Include="..\..\base\main_win.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="util.h" />
-    <ClInclude Include="..\..\base\main.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="src">
-      <UniqueIdentifier>{cd58f445-4d2f-452b-a5a0-1dd29a620341}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia">
-      <UniqueIdentifier>{a43f8164-d83a-4ff6-83a4-1915664abbf9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\base">
-      <UniqueIdentifier>{1bdcf344-57a7-4b58-93d6-3e860f50ad1b}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/xenia/cpu/test/test_add.cc b/src/xenia/cpu/testing/add_test.cc
similarity index 99%
rename from src/xenia/cpu/test/test_add.cc
rename to src/xenia/cpu/testing/add_test.cc
index fdf25adfd..f0a43d4bb 100644
--- a/src/xenia/cpu/test/test_add.cc
+++ b/src/xenia/cpu/testing/add_test.cc
@@ -7,13 +7,13 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/test/util.h"
+#include "xenia/cpu/testing/util.h"
 
 #include <cfloat>
 
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
-using namespace xe::cpu::test;
+using namespace xe::cpu::testing;
 using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("ADD_I8", "[instr]") {
diff --git a/src/xenia/cpu/test/test_byte_swap.cc b/src/xenia/cpu/testing/byte_swap_test.cc
similarity index 95%
rename from src/xenia/cpu/test/test_byte_swap.cc
rename to src/xenia/cpu/testing/byte_swap_test.cc
index d0cc4f18e..4a51961ea 100644
--- a/src/xenia/cpu/test/test_byte_swap.cc
+++ b/src/xenia/cpu/testing/byte_swap_test.cc
@@ -7,12 +7,12 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/test/util.h"
+#include "xenia/cpu/testing/util.h"
 
 using namespace xe;
 using namespace xe::cpu;
 using namespace xe::cpu::hir;
-using namespace xe::cpu::test;
+using namespace xe::cpu::testing;
 using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("BYTE_SWAP_V128", "[instr]") {
diff --git a/src/xenia/cpu/test/test_extract.cc b/src/xenia/cpu/testing/extract_test.cc
similarity index 98%
rename from src/xenia/cpu/test/test_extract.cc
rename to src/xenia/cpu/testing/extract_test.cc
index f90db2ace..94c1017a4 100644
--- a/src/xenia/cpu/test/test_extract.cc
+++ b/src/xenia/cpu/testing/extract_test.cc
@@ -7,14 +7,14 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/test/util.h"
+#include "xenia/cpu/testing/util.h"
 
 #include <cfloat>
 
 using namespace xe;
 using namespace xe::cpu;
 using namespace xe::cpu::hir;
-using namespace xe::cpu::test;
+using namespace xe::cpu::testing;
 using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("EXTRACT_INT8", "[instr]") {
diff --git a/src/xenia/cpu/test/test_insert.cc b/src/xenia/cpu/testing/insert_test.cc
similarity index 97%
rename from src/xenia/cpu/test/test_insert.cc
rename to src/xenia/cpu/testing/insert_test.cc
index 8ad5d6f81..8f0d7f904 100644
--- a/src/xenia/cpu/test/test_insert.cc
+++ b/src/xenia/cpu/testing/insert_test.cc
@@ -7,14 +7,14 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/test/util.h"
+#include "xenia/cpu/testing/util.h"
 
 #include <cfloat>
 
 using namespace xe;
 using namespace xe::cpu;
 using namespace xe::cpu::hir;
-using namespace xe::cpu::test;
+using namespace xe::cpu::testing;
 using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("INSERT_INT8", "[instr]") {
diff --git a/src/xenia/cpu/test/test_load_vector_shl_shr.cc b/src/xenia/cpu/testing/load_vector_shl_shr_test.cc
similarity index 97%
rename from src/xenia/cpu/test/test_load_vector_shl_shr.cc
rename to src/xenia/cpu/testing/load_vector_shl_shr_test.cc
index accc5d6d2..80dd08b75 100644
--- a/src/xenia/cpu/test/test_load_vector_shl_shr.cc
+++ b/src/xenia/cpu/testing/load_vector_shl_shr_test.cc
@@ -7,12 +7,12 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/test/util.h"
+#include "xenia/cpu/testing/util.h"
 
 using namespace xe;
 using namespace xe::cpu;
 using namespace xe::cpu::hir;
-using namespace xe::cpu::test;
+using namespace xe::cpu::testing;
 using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("LOAD_VECTOR_SHL", "[instr]") {
diff --git a/src/xenia/cpu/test/test_pack.cc b/src/xenia/cpu/testing/pack_test.cc
similarity index 98%
rename from src/xenia/cpu/test/test_pack.cc
rename to src/xenia/cpu/testing/pack_test.cc
index 5403a1917..f7f3bfd4a 100644
--- a/src/xenia/cpu/test/test_pack.cc
+++ b/src/xenia/cpu/testing/pack_test.cc
@@ -7,12 +7,12 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/test/util.h"
+#include "xenia/cpu/testing/util.h"
 
 using namespace xe;
 using namespace xe::cpu;
 using namespace xe::cpu::hir;
-using namespace xe::cpu::test;
+using namespace xe::cpu::testing;
 using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("PACK_D3DCOLOR", "[instr]") {
diff --git a/src/xenia/cpu/test/test_permute.cc b/src/xenia/cpu/testing/permute_test.cc
similarity index 98%
rename from src/xenia/cpu/test/test_permute.cc
rename to src/xenia/cpu/testing/permute_test.cc
index 0ca7262be..88fd848ab 100644
--- a/src/xenia/cpu/test/test_permute.cc
+++ b/src/xenia/cpu/testing/permute_test.cc
@@ -7,12 +7,12 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/test/util.h"
+#include "xenia/cpu/testing/util.h"
 
 using namespace xe;
 using namespace xe::cpu;
 using namespace xe::cpu::hir;
-using namespace xe::cpu::test;
+using namespace xe::cpu::testing;
 using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("PERMUTE_V128_BY_INT32_CONSTANT", "[instr]") {
diff --git a/src/xenia/cpu/testing/premake5.lua b/src/xenia/cpu/testing/premake5.lua
new file mode 100644
index 000000000..bbef37b84
--- /dev/null
+++ b/src/xenia/cpu/testing/premake5.lua
@@ -0,0 +1,17 @@
+project_root = "../../../.."
+include(project_root.."/build_tools")
+
+test_suite("xenia-cpu-tests", project_root, ".", {
+  includedirs = {
+  },
+  links = {
+    "xenia-base",
+    "xenia-core",
+    "xenia-cpu",
+    "xenia-cpu-backend-x64",
+
+    -- TODO(benvanik): cut these dependencies?
+    "xenia-debug",
+    "xenia-kernel",
+  },
+})
diff --git a/src/xenia/cpu/test/xe-cpu-sandbox.cc b/src/xenia/cpu/testing/sandbox_main.cc
similarity index 97%
rename from src/xenia/cpu/test/xe-cpu-sandbox.cc
rename to src/xenia/cpu/testing/sandbox_main.cc
index 5bd8f3375..f87f6833e 100644
--- a/src/xenia/cpu/test/xe-cpu-sandbox.cc
+++ b/src/xenia/cpu/testing/sandbox_main.cc
@@ -81,4 +81,4 @@ int main(std::vector<std::wstring>& args) {
 }  // namespace cpu
 }  // namespace xe
 
-DEFINE_ENTRY_POINT(L"xe-cpu-sandbox", L"?", xe::cpu::sandbox::main);
+DEFINE_ENTRY_POINT(L"xenia-cpu-sandbox", L"?", xe::cpu::sandbox::main);
diff --git a/src/xenia/cpu/test/test_sha.cc b/src/xenia/cpu/testing/sha_test.cc
similarity index 98%
rename from src/xenia/cpu/test/test_sha.cc
rename to src/xenia/cpu/testing/sha_test.cc
index 1f0c74ba8..57aae27d4 100644
--- a/src/xenia/cpu/test/test_sha.cc
+++ b/src/xenia/cpu/testing/sha_test.cc
@@ -7,11 +7,11 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/test/util.h"
+#include "xenia/cpu/testing/util.h"
 
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
-using namespace xe::cpu::test;
+using namespace xe::cpu::testing;
 using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("SHA_I8", "[instr]") {
diff --git a/src/xenia/cpu/test/test_shl.cc b/src/xenia/cpu/testing/shl_test.cc
similarity index 98%
rename from src/xenia/cpu/test/test_shl.cc
rename to src/xenia/cpu/testing/shl_test.cc
index 05551c1b8..7fc458b75 100644
--- a/src/xenia/cpu/test/test_shl.cc
+++ b/src/xenia/cpu/testing/shl_test.cc
@@ -7,11 +7,11 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/test/util.h"
+#include "xenia/cpu/testing/util.h"
 
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
-using namespace xe::cpu::test;
+using namespace xe::cpu::testing;
 using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("SHL_I8", "[instr]") {
diff --git a/src/xenia/cpu/test/test_shr.cc b/src/xenia/cpu/testing/shr_test.cc
similarity index 99%
rename from src/xenia/cpu/test/test_shr.cc
rename to src/xenia/cpu/testing/shr_test.cc
index f40652b14..f02e8e6e0 100644
--- a/src/xenia/cpu/test/test_shr.cc
+++ b/src/xenia/cpu/testing/shr_test.cc
@@ -7,12 +7,12 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/test/util.h"
+#include "xenia/cpu/testing/util.h"
 
 using namespace xe;
 using namespace xe::cpu;
 using namespace xe::cpu::hir;
-using namespace xe::cpu::test;
+using namespace xe::cpu::testing;
 using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("SHR_I8", "[instr]") {
diff --git a/src/xenia/cpu/test/test_swizzle.cc b/src/xenia/cpu/testing/swizzle_test.cc
similarity index 96%
rename from src/xenia/cpu/test/test_swizzle.cc
rename to src/xenia/cpu/testing/swizzle_test.cc
index 01941da1d..ae534939f 100644
--- a/src/xenia/cpu/test/test_swizzle.cc
+++ b/src/xenia/cpu/testing/swizzle_test.cc
@@ -7,12 +7,12 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/test/util.h"
+#include "xenia/cpu/testing/util.h"
 
 using namespace xe;
 using namespace xe::cpu;
 using namespace xe::cpu::hir;
-using namespace xe::cpu::test;
+using namespace xe::cpu::testing;
 using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("SWIZZLE_V128", "[instr]") {
diff --git a/src/xenia/cpu/test/test_unpack.cc b/src/xenia/cpu/testing/unpack_test.cc
similarity index 98%
rename from src/xenia/cpu/test/test_unpack.cc
rename to src/xenia/cpu/testing/unpack_test.cc
index 5507c5da9..2e1f04671 100644
--- a/src/xenia/cpu/test/test_unpack.cc
+++ b/src/xenia/cpu/testing/unpack_test.cc
@@ -7,12 +7,12 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/test/util.h"
+#include "xenia/cpu/testing/util.h"
 
 using namespace xe;
 using namespace xe::cpu;
 using namespace xe::cpu::hir;
-using namespace xe::cpu::test;
+using namespace xe::cpu::testing;
 using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("UNPACK_D3DCOLOR", "[instr]") {
diff --git a/src/xenia/cpu/test/util.h b/src/xenia/cpu/testing/util.h
similarity index 96%
rename from src/xenia/cpu/test/util.h
rename to src/xenia/cpu/testing/util.h
index beae944af..44b3eb11f 100644
--- a/src/xenia/cpu/test/util.h
+++ b/src/xenia/cpu/testing/util.h
@@ -7,8 +7,8 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_TEST_UTIL_H_
-#define XENIA_TEST_UTIL_H_
+#ifndef XENIA_TESTING_UTIL_H_
+#define XENIA_TESTING_UTIL_H_
 
 #include "xenia/base/main.h"
 #include "xenia/cpu/backend/x64/x64_backend.h"
@@ -24,7 +24,7 @@
 
 namespace xe {
 namespace cpu {
-namespace test {
+namespace testing {
 
 using xe::cpu::frontend::PPCContext;
 
@@ -111,8 +111,8 @@ inline void StoreVR(hir::HIRBuilder& b, int reg, hir::Value* value) {
   b.StoreContext(offsetof(PPCContext, v) + reg * 16, value);
 }
 
-}  // namespace test
+}  // namespace testing
 }  // namespace cpu
 }  // namespace xe
 
-#endif  // XENIA_TEST_UTIL_H_
+#endif  // XENIA_TESTING_UTIL_H_
diff --git a/src/xenia/cpu/test/test_vector_add.cc b/src/xenia/cpu/testing/vector_add_test.cc
similarity index 99%
rename from src/xenia/cpu/test/test_vector_add.cc
rename to src/xenia/cpu/testing/vector_add_test.cc
index 77d6791ad..6e0cc50e2 100644
--- a/src/xenia/cpu/test/test_vector_add.cc
+++ b/src/xenia/cpu/testing/vector_add_test.cc
@@ -7,14 +7,14 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/test/util.h"
+#include "xenia/cpu/testing/util.h"
 
 #include <cfloat>
 
 using namespace xe;
 using namespace xe::cpu;
 using namespace xe::cpu::hir;
-using namespace xe::cpu::test;
+using namespace xe::cpu::testing;
 using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("VECTOR_ADD_I8", "[instr]") {
diff --git a/src/xenia/cpu/test/test_vector_max.cc b/src/xenia/cpu/testing/vector_max_test.cc
similarity index 98%
rename from src/xenia/cpu/test/test_vector_max.cc
rename to src/xenia/cpu/testing/vector_max_test.cc
index 750036dbe..13c44d894 100644
--- a/src/xenia/cpu/test/test_vector_max.cc
+++ b/src/xenia/cpu/testing/vector_max_test.cc
@@ -7,14 +7,14 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/test/util.h"
+#include "xenia/cpu/testing/util.h"
 
 #include <cfloat>
 
 using namespace xe;
 using namespace xe::cpu;
 using namespace xe::cpu::hir;
-using namespace xe::cpu::test;
+using namespace xe::cpu::testing;
 using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("VECTOR_MAX_I8_SIGNED", "[instr]") {
diff --git a/src/xenia/cpu/test/test_vector_min.cc b/src/xenia/cpu/testing/vector_min_test.cc
similarity index 98%
rename from src/xenia/cpu/test/test_vector_min.cc
rename to src/xenia/cpu/testing/vector_min_test.cc
index 5297d98ea..36e3eef9c 100644
--- a/src/xenia/cpu/test/test_vector_min.cc
+++ b/src/xenia/cpu/testing/vector_min_test.cc
@@ -7,14 +7,14 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/test/util.h"
+#include "xenia/cpu/testing/util.h"
 
 #include <cfloat>
 
 using namespace xe;
 using namespace xe::cpu;
 using namespace xe::cpu::hir;
-using namespace xe::cpu::test;
+using namespace xe::cpu::testing;
 using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("VECTOR_MIN_I8_SIGNED", "[instr]") {
diff --git a/src/xenia/cpu/test/test_vector_rotate_left.cc b/src/xenia/cpu/testing/vector_rotate_left_test.cc
similarity index 97%
rename from src/xenia/cpu/test/test_vector_rotate_left.cc
rename to src/xenia/cpu/testing/vector_rotate_left_test.cc
index 17e0221d7..9d011c8b1 100644
--- a/src/xenia/cpu/test/test_vector_rotate_left.cc
+++ b/src/xenia/cpu/testing/vector_rotate_left_test.cc
@@ -8,12 +8,12 @@
  */
 
 #include "third_party/xbyak/xbyak/xbyak_bin2hex.h"
-#include "xenia/cpu/test/util.h"
+#include "xenia/cpu/testing/util.h"
 
 using namespace xe;
 using namespace xe::cpu;
 using namespace xe::cpu::hir;
-using namespace xe::cpu::test;
+using namespace xe::cpu::testing;
 using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("VECTOR_ROTATE_LEFT_I8", "[instr]") {
diff --git a/src/xenia/cpu/test/test_vector_sha.cc b/src/xenia/cpu/testing/vector_sha_test.cc
similarity index 98%
rename from src/xenia/cpu/test/test_vector_sha.cc
rename to src/xenia/cpu/testing/vector_sha_test.cc
index 19f8dd66e..638ac3d6d 100644
--- a/src/xenia/cpu/test/test_vector_sha.cc
+++ b/src/xenia/cpu/testing/vector_sha_test.cc
@@ -7,12 +7,12 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/test/util.h"
+#include "xenia/cpu/testing/util.h"
 
 using namespace xe;
 using namespace xe::cpu;
 using namespace xe::cpu::hir;
-using namespace xe::cpu::test;
+using namespace xe::cpu::testing;
 using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("VECTOR_SHA_I8", "[instr]") {
diff --git a/src/xenia/cpu/test/test_vector_shl.cc b/src/xenia/cpu/testing/vector_shl_test.cc
similarity index 98%
rename from src/xenia/cpu/test/test_vector_shl.cc
rename to src/xenia/cpu/testing/vector_shl_test.cc
index c14397b76..5861e8343 100644
--- a/src/xenia/cpu/test/test_vector_shl.cc
+++ b/src/xenia/cpu/testing/vector_shl_test.cc
@@ -7,12 +7,12 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/test/util.h"
+#include "xenia/cpu/testing/util.h"
 
 using namespace xe;
 using namespace xe::cpu;
 using namespace xe::cpu::hir;
-using namespace xe::cpu::test;
+using namespace xe::cpu::testing;
 using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("VECTOR_SHL_I8", "[instr]") {
diff --git a/src/xenia/cpu/test/test_vector_shr.cc b/src/xenia/cpu/testing/vector_shr_test.cc
similarity index 98%
rename from src/xenia/cpu/test/test_vector_shr.cc
rename to src/xenia/cpu/testing/vector_shr_test.cc
index c2b8bdbc5..a513eb74f 100644
--- a/src/xenia/cpu/test/test_vector_shr.cc
+++ b/src/xenia/cpu/testing/vector_shr_test.cc
@@ -7,12 +7,12 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/test/util.h"
+#include "xenia/cpu/testing/util.h"
 
 using namespace xe;
 using namespace xe::cpu;
 using namespace xe::cpu::hir;
-using namespace xe::cpu::test;
+using namespace xe::cpu::testing;
 using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("VECTOR_SHR_I8", "[instr]") {
diff --git a/src/xenia/debug/premake5.lua b/src/xenia/debug/premake5.lua
new file mode 100644
index 000000000..1fb0bd135
--- /dev/null
+++ b/src/xenia/debug/premake5.lua
@@ -0,0 +1,18 @@
+project_root = "../../.."
+include(project_root.."/build_tools")
+
+group("src")
+project("xenia-debug")
+  uuid("1c33f25a-4bc0-4959-8092-4223ce749d9b")
+  kind("StaticLib")
+  language("C++")
+  links({
+    "xenia-base",
+    "xenia-cpu",
+  })
+  defines({
+  })
+  includedirs({
+    project_root.."/third_party/flatbuffers/include"
+  })
+  local_platform_files()
diff --git a/src/xenia/debug/ui/xe-debug-ui.cc b/src/xenia/debug/ui/debugger_main.cc
similarity index 89%
rename from src/xenia/debug/ui/xe-debug-ui.cc
rename to src/xenia/debug/ui/debugger_main.cc
index de4e24266..8a657d1b7 100644
--- a/src/xenia/debug/ui/xe-debug-ui.cc
+++ b/src/xenia/debug/ui/debugger_main.cc
@@ -28,4 +28,5 @@ int main(std::vector<std::wstring>& args) {
 }  // namespace debug
 }  // namespace xe
 
-DEFINE_ENTRY_POINT(L"xe-debug-ui", L"xe-debug-ui ??", xe::debug::ui::main);
+DEFINE_ENTRY_POINT(L"xenia-debug-ui", L"xenia-debug-ui ??",
+                   xe::debug::ui::main);
diff --git a/src/xenia/debug/ui/resources.rc b/src/xenia/debug/ui/debugger_resources.rc
similarity index 100%
rename from src/xenia/debug/ui/resources.rc
rename to src/xenia/debug/ui/debugger_resources.rc
diff --git a/src/xenia/debug/ui/main_window.cc b/src/xenia/debug/ui/main_window.cc
index 3177f9f94..b4aa45ab9 100644
--- a/src/xenia/debug/ui/main_window.cc
+++ b/src/xenia/debug/ui/main_window.cc
@@ -26,7 +26,6 @@ using xe::ui::MenuItem;
 const std::wstring kBaseTitle = L"xenia debugger";
 
 MainWindow::MainWindow(Application* app) : app_(app) {}
-// main_menu_(MenuItem::Type::kNormal) {}
 
 MainWindow::~MainWindow() = default;
 
diff --git a/src/xenia/debug/ui/premake5.lua b/src/xenia/debug/ui/premake5.lua
new file mode 100644
index 000000000..0a76d9bc5
--- /dev/null
+++ b/src/xenia/debug/ui/premake5.lua
@@ -0,0 +1,71 @@
+project_root = "../../../.."
+include(project_root.."/build_tools")
+
+group("src")
+project("xenia-debug-ui")
+  uuid("ed128630-8b4e-4dd7-afc9-ef00052fe3a7")
+  kind("WindowedApp")
+  language("C++")
+  links({
+    "beaengine",
+    "elemental-forms",
+    "gflags",
+    "xenia-apu",
+    "xenia-apu-nop",
+    "xenia-apu-xaudio2",
+    "xenia-base",
+    "xenia-core",
+    "xenia-cpu",
+    "xenia-cpu-backend-x64",
+    "xenia-debug",
+    "xenia-gpu",
+    "xenia-gpu-gl4",
+    "xenia-hid-nop",
+    "xenia-hid-winkey",
+    "xenia-hid-xinput",
+    "xenia-kernel",
+    "xenia-ui",
+    "xenia-ui-gl",
+    "xenia-vfs",
+  })
+  flags({
+    "WinMain",  -- Use WinMain instead of main.
+  })
+  defines({
+  })
+  includedirs({
+    project_root.."/third_party/elemental-forms/src",
+  })
+  recursive_platform_files()
+  files({
+    "debugger_main.cc",
+    "../../base/main_"..platform_suffix..".cc",
+  })
+  files({
+    "debugger_resources.rc",
+  })
+  resincludedirs({
+    project_root,
+    project_root.."/third_party/elemental-forms",
+  })
+
+  filter("configurations:Checked")
+    local libav_root = "../third_party/libav-xma-bin/lib/Debug"
+    linkoptions({
+      libav_root.."/libavcodec.a",
+      libav_root.."/libavutil.a",
+    })
+  filter("configurations:Debug or Release")
+    local libav_root = "../third_party/libav-xma-bin/lib/Release"
+    linkoptions({
+      libav_root.."/libavcodec.a",
+      libav_root.."/libavutil.a",
+    })
+
+  filter("platforms:Windows")
+    debugdir(project_root)
+    debugargs({
+      "--flagfile=scratch/flags.txt",
+      "2>&1",
+      "1>scratch/stdout-debugger.txt",
+    })
diff --git a/src/xenia/gpu/gl4/premake5.lua b/src/xenia/gpu/gl4/premake5.lua
new file mode 100644
index 000000000..7f737c1dd
--- /dev/null
+++ b/src/xenia/gpu/gl4/premake5.lua
@@ -0,0 +1,91 @@
+project_root = "../../../.."
+include(project_root.."/build_tools")
+
+group("src")
+project("xenia-gpu-gl4")
+  uuid("da10149d-efb0-44aa-924c-a76a46e1f04d")
+  kind("StaticLib")
+  language("C++")
+  links({
+    "elemental-forms",
+    "glew",
+    "xenia-base",
+    "xenia-gpu",
+    "xenia-ui",
+    "xenia-ui-gl",
+    "xxhash",
+  })
+  defines({
+    "GLEW_STATIC=1",
+    "GLEW_MX=1",
+  })
+  includedirs({
+    project_root.."/third_party/elemental-forms/src",
+  })
+  local_platform_files()
+
+-- TODO(benvanik): kill this and move to the debugger UI.
+group("src")
+project("xenia-gpu-gl4-trace-viewer")
+  uuid("450f965b-a019-4ba5-bc6f-99901e5a4c8d")
+  kind("WindowedApp")
+  language("C++")
+  links({
+    "beaengine",
+    "elemental-forms",
+    "gflags",
+    "glew",
+    "imgui",
+    "xenia-apu",
+    "xenia-apu-nop",
+    "xenia-apu-xaudio2",
+    "xenia-base",
+    "xenia-core",
+    "xenia-cpu",
+    "xenia-cpu-backend-x64",
+    "xenia-debug",
+    "xenia-gpu",
+    "xenia-gpu-gl4",
+    "xenia-hid-nop",
+    "xenia-hid-winkey",
+    "xenia-hid-xinput",
+    "xenia-kernel",
+    "xenia-ui",
+    "xenia-ui-gl",
+    "xenia-vfs",
+  })
+  flags({
+    "WinMain",  -- Use WinMain instead of main.
+  })
+  defines({
+    "GLEW_STATIC=1",
+    "GLEW_MX=1",
+  })
+  includedirs({
+    project_root.."/third_party/elemental-forms/src",
+  })
+  files({
+    "trace_viewer_main.cc",
+    "../../base/main_"..platform_suffix..".cc",
+  })
+
+  filter("configurations:Checked")
+    local libav_root = "../third_party/libav-xma-bin/lib/Debug"
+    linkoptions({
+      libav_root.."/libavcodec.a",
+      libav_root.."/libavutil.a",
+    })
+  filter("configurations:Debug or Release")
+    local libav_root = "../third_party/libav-xma-bin/lib/Release"
+    linkoptions({
+      libav_root.."/libavcodec.a",
+      libav_root.."/libavutil.a",
+    })
+
+  filter("platforms:Windows")
+    debugdir(project_root)
+    debugargs({
+      "--flagfile=scratch/flags.txt",
+      "2>&1",
+      "1>scratch/stdout-trace-viewer.txt",
+    })
diff --git a/src/xenia/gpu/trace_viewer_main.cc b/src/xenia/gpu/gl4/trace_viewer_main.cc
similarity index 99%
rename from src/xenia/gpu/trace_viewer_main.cc
rename to src/xenia/gpu/gl4/trace_viewer_main.cc
index 271814c07..a889ef906 100644
--- a/src/xenia/gpu/trace_viewer_main.cc
+++ b/src/xenia/gpu/gl4/trace_viewer_main.cc
@@ -2193,7 +2193,7 @@ int trace_viewer_main(std::vector<std::wstring>& args) {
 
   // Main emulator display window.
   auto loop = ui::Loop::Create();
-  auto window = xe::ui::Window::Create(loop.get(), L"xe-gpu-trace-viewer");
+  auto window = xe::ui::Window::Create(loop.get(), L"xenia-gpu-trace-viewer");
   loop->PostSynchronous([&window]() {
     xe::threading::set_name("Win32 Loop");
     if (!window->Initialize()) {
@@ -2593,5 +2593,6 @@ void ImImpl_RenderDrawLists(ImDrawList** const cmd_lists, int cmd_lists_count) {
 }  // namespace gpu
 }  // namespace xe
 
-DEFINE_ENTRY_POINT(L"xe-gpu-trace-viewer", L"xe-gpu-trace-viewer some.trace",
+DEFINE_ENTRY_POINT(L"xenia-gpu-gl4-trace-viewer",
+                   L"xenia-gpu-gl4-trace-viewer some.trace",
                    xe::gpu::trace_viewer_main);
diff --git a/src/xenia/gpu/premake5.lua b/src/xenia/gpu/premake5.lua
new file mode 100644
index 000000000..66d919f30
--- /dev/null
+++ b/src/xenia/gpu/premake5.lua
@@ -0,0 +1,20 @@
+project_root = "../../.."
+include(project_root.."/build_tools")
+
+group("src")
+project("xenia-gpu")
+  uuid("0e8d3370-e4b1-4b05-a2e8-39ebbcdf9b17")
+  kind("StaticLib")
+  language("C++")
+  links({
+    "elemental-forms",
+    "xenia-base",
+    "xenia-ui",
+    "xxhash",
+  })
+  defines({
+  })
+  includedirs({
+    project_root.."/third_party/elemental-forms/src",
+  })
+  local_platform_files()
diff --git a/src/xenia/hid/nop/premake5.lua b/src/xenia/hid/nop/premake5.lua
new file mode 100644
index 000000000..7fec94cc3
--- /dev/null
+++ b/src/xenia/hid/nop/premake5.lua
@@ -0,0 +1,17 @@
+project_root = "../../../.."
+include(project_root.."/build_tools")
+
+group("src")
+project("xenia-hid-nop")
+  uuid("887b6f26-b0c1-43c1-a013-a37e7b9634fd")
+  kind("StaticLib")
+  language("C++")
+  links({
+    "xenia-base",
+    "xenia-hid",
+  })
+  defines({
+  })
+  includedirs({
+  })
+  local_platform_files()
diff --git a/src/xenia/hid/premake5.lua b/src/xenia/hid/premake5.lua
new file mode 100644
index 000000000..45f3f7bcd
--- /dev/null
+++ b/src/xenia/hid/premake5.lua
@@ -0,0 +1,16 @@
+project_root = "../../.."
+include(project_root.."/build_tools")
+
+group("src")
+project("xenia-hid")
+  uuid("88a4ef38-c550-430f-8c22-8ded4e4ef601")
+  kind("StaticLib")
+  language("C++")
+  links({
+    "xenia-base",
+  })
+  defines({
+  })
+  includedirs({
+  })
+  local_platform_files()
diff --git a/src/xenia/hid/winkey/premake5.lua b/src/xenia/hid/winkey/premake5.lua
new file mode 100644
index 000000000..4097192a0
--- /dev/null
+++ b/src/xenia/hid/winkey/premake5.lua
@@ -0,0 +1,17 @@
+project_root = "../../../.."
+include(project_root.."/build_tools")
+
+group("src")
+project("xenia-hid-winkey")
+  uuid("fd16e19a-6219-4ab7-b95a-7c78523c50c3")
+  kind("StaticLib")
+  language("C++")
+  links({
+    "xenia-base",
+    "xenia-hid",
+  })
+  defines({
+  })
+  includedirs({
+  })
+  local_platform_files()
diff --git a/src/xenia/hid/xinput/premake5.lua b/src/xenia/hid/xinput/premake5.lua
new file mode 100644
index 000000000..adb3f758c
--- /dev/null
+++ b/src/xenia/hid/xinput/premake5.lua
@@ -0,0 +1,17 @@
+project_root = "../../../.."
+include(project_root.."/build_tools")
+
+group("src")
+project("xenia-hid-xinput")
+  uuid("3d49e251-07a7-40ae-9bc6-aae984c85568")
+  kind("StaticLib")
+  language("C++")
+  links({
+    "xenia-base",
+    "xenia-hid",
+  })
+  defines({
+  })
+  includedirs({
+  })
+  local_platform_files()
diff --git a/src/xenia/kernel/debug_visualizers.natvis b/src/xenia/kernel/debug_visualizers.natvis
new file mode 100644
index 000000000..a828f4e58
--- /dev/null
+++ b/src/xenia/kernel/debug_visualizers.natvis
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
+
+  <!-- Shims -->
+  <Type Name="xe::kernel::shim::TypedPointerParam&lt;*&gt;">
+    <DisplayString>{host_ptr_}</DisplayString>
+    <Expand>
+      <ExpandedItem>host_ptr_</ExpandedItem>
+    </Expand>
+  </Type>
+
+</AutoVisualizer>
diff --git a/src/xenia/kernel/premake5.lua b/src/xenia/kernel/premake5.lua
new file mode 100644
index 000000000..509d39a72
--- /dev/null
+++ b/src/xenia/kernel/premake5.lua
@@ -0,0 +1,27 @@
+project_root = "../../.."
+include(project_root.."/build_tools")
+
+group("src")
+project("xenia-kernel")
+  uuid("ae185c4a-1c4f-4503-9892-328e549e871a")
+  kind("StaticLib")
+  language("C++")
+  links({
+    "elemental-forms",
+    "xenia-apu",
+    "xenia-base",
+    "xenia-cpu",
+    "xenia-gpu",
+    "xenia-hid",
+    "xenia-ui",
+    "xenia-vfs",
+  })
+  defines({
+  })
+  includedirs({
+    project_root.."/third_party/elemental-forms/src",
+  })
+  recursive_platform_files()
+  files({
+    "debug_visualizers.natvis",
+  })
diff --git a/src/xenia/premake5.lua b/src/xenia/premake5.lua
new file mode 100644
index 000000000..9fc178e71
--- /dev/null
+++ b/src/xenia/premake5.lua
@@ -0,0 +1,18 @@
+project_root = "../.."
+include(project_root.."/build_tools")
+
+group("src")
+project("xenia-core")
+  uuid("970f7892-f19a-4bf5-8795-478c51757bec")
+  kind("StaticLib")
+  language("C++")
+  links({
+    "elemental-forms",
+    "xenia-base",
+  })
+  defines({
+  })
+  includedirs({
+    project_root.."/third_party/elemental-forms/src",
+  })
+  files({"*.h", "*.cc"})
diff --git a/src/xenia/ui/gl/gl.h b/src/xenia/ui/gl/gl.h
index 549582153..0c60790e1 100644
--- a/src/xenia/ui/gl/gl.h
+++ b/src/xenia/ui/gl/gl.h
@@ -14,6 +14,7 @@
 
 #include "third_party/GL/glew.h"
 
+typedef struct GLEWContextStruct GLEWContext;
 extern "C" GLEWContext* glewGetContext();
 
 #if XE_PLATFORM_WIN32
diff --git a/src/xenia/ui/gl/premake5.lua b/src/xenia/ui/gl/premake5.lua
new file mode 100644
index 000000000..4d773ce9a
--- /dev/null
+++ b/src/xenia/ui/gl/premake5.lua
@@ -0,0 +1,22 @@
+project_root = "../../../.."
+include(project_root.."/build_tools")
+
+group("src")
+project("xenia-ui-gl")
+  uuid("623300e3-0085-4ccc-af46-d60e88cb43aa")
+  kind("StaticLib")
+  language("C++")
+  links({
+    "elemental-forms",
+    "glew",
+    "xenia-base",
+    "xenia-ui",
+  })
+  defines({
+    "GLEW_STATIC=1",
+    "GLEW_MX=1",
+  })
+  includedirs({
+    project_root.."/third_party/elemental-forms/src",
+  })
+  local_platform_files()
diff --git a/src/xenia/ui/premake5.lua b/src/xenia/ui/premake5.lua
new file mode 100644
index 000000000..9e4fed1ae
--- /dev/null
+++ b/src/xenia/ui/premake5.lua
@@ -0,0 +1,18 @@
+project_root = "../../.."
+include(project_root.."/build_tools")
+
+group("src")
+project("xenia-ui")
+  uuid("d0407c25-b0ea-40dc-846c-82c46fbd9fa2")
+  kind("StaticLib")
+  language("C++")
+  links({
+    "elemental-forms",
+    "xenia-base",
+  })
+  defines({
+  })
+  includedirs({
+    project_root.."/third_party/elemental-forms/src",
+  })
+  local_platform_files()
diff --git a/src/xenia/vfs/premake5.lua b/src/xenia/vfs/premake5.lua
new file mode 100644
index 000000000..b5659dcf8
--- /dev/null
+++ b/src/xenia/vfs/premake5.lua
@@ -0,0 +1,16 @@
+project_root = "../../.."
+include(project_root.."/build_tools")
+
+group("src")
+project("xenia-vfs")
+  uuid("395c8abd-4dc9-46ed-af7a-c2b9b68a3a98")
+  kind("StaticLib")
+  language("C++")
+  links({
+    "xenia-base",
+  })
+  defines({
+  })
+  includedirs({
+  })
+  recursive_platform_files()
diff --git a/third_party/beaengine.lua b/third_party/beaengine.lua
new file mode 100644
index 000000000..ef5b6be32
--- /dev/null
+++ b/third_party/beaengine.lua
@@ -0,0 +1,20 @@
+group("third_party")
+project("beaengine")
+  uuid("56e7d457-9955-4217-aadf-52e5ab45afab")
+  kind("StaticLib")
+  language("C++")
+  links({
+  })
+  defines({
+    "BEA_ENGINE_STATIC=1",
+    "_LIB",
+  })
+  includedirs({
+    "beaengine/include",
+    "beaengine/beaengineSources",
+  })
+  files({
+    "beaengine/beaengineSources/*.h",
+    "beaengine/beaengineSources/*.c",
+    "beaengine/include/beaengine/**.h",
+  })
diff --git a/third_party/capstone.lua b/third_party/capstone.lua
new file mode 100644
index 000000000..f18d2fba9
--- /dev/null
+++ b/third_party/capstone.lua
@@ -0,0 +1,43 @@
+group("third_party")
+project("capstone")
+  uuid("b3a89f7e-bb02-4945-ae75-219caed6afa2")
+  kind("StaticLib")
+  language("C++")
+  links({
+  })
+  defines({
+    "CAPSTONE_X86_ATT_DISABLE",
+    "CAPSTONE_DIET_NO",
+    "CAPSTONE_X86_REDUCE_NO",
+    "CAPSTONE_HAS_X86",
+    "CAPSTONE_USE_SYS_DYN_MEM",
+    "_LIB",
+  })
+  includedirs({
+    "capstone",
+    "capstone/include",
+  })
+  files({
+    "capstone/cs.c",
+    "capstone/cs_priv.h",
+    "capstone/LEB128.h",
+    "capstone/MathExtras.h",
+    "capstone/MCDisassembler.h",
+    "capstone/MCFixedLenDisassembler.h",
+    "capstone/MCInst.c",
+    "capstone/MCInst.h",
+    "capstone/MCInstrDesc.c",
+    "capstone/MCInstrDesc.h",
+    "capstone/MCRegisterInfo.c",
+    "capstone/MCRegisterInfo.h",
+    "capstone/myinttypes.h",
+    "capstone/SStream.c",
+    "capstone/SStream.h",
+    "capstone/utils.c",
+    "capstone/utils.h",
+
+    "capstone/arch/X86/*.c",
+    "capstone/arch/X86/*.h",
+    "capstone/arch/X86/*.inc",
+  })
+  force_compile_as_cc({"capstone/**.c"})
diff --git a/third_party/catch b/third_party/catch
deleted file mode 160000
index 85d33e2cb..000000000
--- a/third_party/catch
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 85d33e2cbd5354c36000424f823fc87707a24c3c
diff --git a/third_party/elemental-forms b/third_party/elemental-forms
index 275ad4155..1f7de4d3c 160000
--- a/third_party/elemental-forms
+++ b/third_party/elemental-forms
@@ -1 +1 @@
-Subproject commit 275ad4155a436883964f16b64c6b32b11fbb027a
+Subproject commit 1f7de4d3c4cbbae1d8cff5a713b4f75dd3088ec4
diff --git a/third_party/flatc.vcxproj b/third_party/flatc.vcxproj
deleted file mode 100644
index 5f928342a..000000000
--- a/third_party/flatc.vcxproj
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Checked|x64">
-      <Configuration>Checked</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D3069A06-62FC-479F-9F5C-23B4377481B0}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>flatc</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="..\build\Xenia.Cpp.x64.Debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="..\build\Xenia.Cpp.x64.Debug.props" />
-    <Import Project="..\build\Xenia.Cpp.x64.Checked.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="..\build\Xenia.Cpp.x64.Release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)third_party\gflags\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)third_party\gflags\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)third_party\gflags\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="flatbuffers\include\flatbuffers\flatbuffers.h" />
-    <ClInclude Include="flatbuffers\include\flatbuffers\hash.h" />
-    <ClInclude Include="flatbuffers\include\flatbuffers\idl.h" />
-    <ClInclude Include="flatbuffers\include\flatbuffers\util.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="flatbuffers\src\flatc.cpp" />
-    <ClCompile Include="flatbuffers\src\idl_gen_cpp.cpp" />
-    <ClCompile Include="flatbuffers\src\idl_gen_fbs.cpp" />
-    <ClCompile Include="flatbuffers\src\idl_gen_general.cpp" />
-    <ClCompile Include="flatbuffers\src\idl_gen_go.cpp" />
-    <ClCompile Include="flatbuffers\src\idl_gen_text.cpp" />
-    <ClCompile Include="flatbuffers\src\idl_parser.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/third_party/flatc.vcxproj.filters b/third_party/flatc.vcxproj.filters
deleted file mode 100644
index db06403aa..000000000
--- a/third_party/flatc.vcxproj.filters
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="flatbuffers\include\flatbuffers\flatbuffers.h" />
-    <ClInclude Include="flatbuffers\include\flatbuffers\hash.h" />
-    <ClInclude Include="flatbuffers\include\flatbuffers\idl.h" />
-    <ClInclude Include="flatbuffers\include\flatbuffers\util.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="flatbuffers\src\flatc.cpp" />
-    <ClCompile Include="flatbuffers\src\idl_parser.cpp" />
-    <ClCompile Include="flatbuffers\src\idl_gen_text.cpp" />
-    <ClCompile Include="flatbuffers\src\idl_gen_general.cpp" />
-    <ClCompile Include="flatbuffers\src\idl_gen_go.cpp" />
-    <ClCompile Include="flatbuffers\src\idl_gen_fbs.cpp" />
-    <ClCompile Include="flatbuffers\src\idl_gen_cpp.cpp" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/third_party/gflags b/third_party/gflags
deleted file mode 160000
index 78b15171a..000000000
--- a/third_party/gflags
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 78b15171a7fce5815df58a919ab593ce80222028
diff --git a/third_party/glew.lua b/third_party/glew.lua
new file mode 100644
index 000000000..960efcf6b
--- /dev/null
+++ b/third_party/glew.lua
@@ -0,0 +1,31 @@
+group("third_party")
+project("glew")
+  uuid("ca31d35a-6cf4-4c86-b97f-60b5244b80cb")
+  kind("StaticLib")
+  language("C++")
+  links({
+  })
+  defines({
+    "GLEW_STATIC=1",
+    "GLEW_MX=1",
+    "_LIB",
+  })
+  includedirs({
+    "GL",
+  })
+  files({
+    "GL/glcorearb.h",
+    "GL/glew.c",
+    "GL/glew.h",
+    "GL/glext.h",
+  })
+  filter("platforms:Linux")
+    files({
+      "GL/glxew.h",
+      "GL/glxext.h",
+    })
+  filter("platforms:Windows")
+    files({
+      "GL/wglew.h",
+      "GL/wglext.h",
+    })
diff --git a/third_party/imgui.lua b/third_party/imgui.lua
new file mode 100644
index 000000000..2026b6fd1
--- /dev/null
+++ b/third_party/imgui.lua
@@ -0,0 +1,21 @@
+group("third_party")
+project("imgui")
+  uuid("ed9271c4-b0a1-42ef-8403-067b11bf49d0")
+  kind("StaticLib")
+  language("C++")
+  links({
+  })
+  defines({
+    "_LIB",
+  })
+  includedirs({
+    "imgui",
+  })
+  files({
+    "imgui/imconfig.h",
+    "imgui/imgui.cpp",
+    "imgui/imgui.h",
+    "imgui/stb_rect_pack.h",
+    "imgui/stb_textedit.h",
+    "imgui/stb_truetype.h",
+  })
diff --git a/third_party/libgflags.vcxproj b/third_party/libgflags.vcxproj
deleted file mode 100644
index d54c38960..000000000
--- a/third_party/libgflags.vcxproj
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Checked|x64">
-      <Configuration>Checked</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="gflags\src\mutex.h" />
-    <ClInclude Include="gflags\src\util.h" />
-    <ClInclude Include="gflags\src\windows\config.h" />
-    <ClInclude Include="gflags\src\windows\gflags\gflags.h" />
-    <ClInclude Include="gflags\src\windows\gflags\gflags_completions.h" />
-    <ClInclude Include="gflags\src\windows\gflags\gflags_declare.h" />
-    <ClInclude Include="gflags\src\windows\port.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="gflags\src\gflags.cc" />
-    <ClCompile Include="gflags\src\gflags_completions.cc" />
-    <ClCompile Include="gflags\src\gflags_reporting.cc" />
-    <ClCompile Include="gflags\src\windows\port.cc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="gflags\src\gflags_completions.sh" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{838020F9-94AA-4314-996D-69B923C45D39}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libgflags</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="..\build\Xenia.Cpp.x64.Debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="..\build\Xenia.Cpp.x64.Debug.props" />
-    <Import Project="..\build\Xenia.Cpp.x64.Checked.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="..\build\Xenia.Cpp.x64.Release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>PATH_SEPARATOR=%27\\%27;GFLAGS_DLL_DECL=;GFLAGS_DLL_DEFINE_FLAG=;GFLAGS_DLL_DECLARE_FLAG=;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)third_party\gflags\src\windows;$(SolutionDir)third_party\gflags\src</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>PATH_SEPARATOR=%27\\%27;GFLAGS_DLL_DECL=;GFLAGS_DLL_DEFINE_FLAG=;GFLAGS_DLL_DECLARE_FLAG=;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\third_party\gflags\src\windows\;$(SolutionDir)\third_party\gflags\src\;$(SolutionDir)\src\;$(SolutionDir)\</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>PATH_SEPARATOR=%27\\%27;GFLAGS_DLL_DECL=;GFLAGS_DLL_DEFINE_FLAG=;GFLAGS_DLL_DECLARE_FLAG=;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\third_party\gflags\src\windows\;$(SolutionDir)\third_party\gflags\src\;$(SolutionDir)\src\;$(SolutionDir)\</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/third_party/libgflags.vcxproj.filters b/third_party/libgflags.vcxproj.filters
deleted file mode 100644
index d4268afc1..000000000
--- a/third_party/libgflags.vcxproj.filters
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="gflags\src\windows\gflags\gflags.h" />
-    <ClInclude Include="gflags\src\windows\gflags\gflags_completions.h" />
-    <ClInclude Include="gflags\src\windows\gflags\gflags_declare.h" />
-    <ClInclude Include="gflags\src\windows\config.h" />
-    <ClInclude Include="gflags\src\windows\port.h" />
-    <ClInclude Include="gflags\src\mutex.h" />
-    <ClInclude Include="gflags\src\util.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="gflags\src\windows\port.cc" />
-    <ClCompile Include="gflags\src\gflags.cc" />
-    <ClCompile Include="gflags\src\gflags_completions.cc" />
-    <ClCompile Include="gflags\src\gflags_reporting.cc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="gflags\src\gflags_completions.sh" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/third_party/libglew.vcxproj b/third_party/libglew.vcxproj
deleted file mode 100644
index 2970f2725..000000000
--- a/third_party/libglew.vcxproj
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Checked|x64">
-      <Configuration>Checked</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="GL\glcorearb.h" />
-    <ClInclude Include="GL\glew.h" />
-    <ClInclude Include="GL\glext.h" />
-    <ClInclude Include="GL\glxew.h" />
-    <ClInclude Include="GL\glxext.h" />
-    <ClInclude Include="GL\wglew.h" />
-    <ClInclude Include="GL\wglext.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="GL\glew.c" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{AE4AF147-715A-4C24-8BFA-136332DED28F}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libglew</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="..\build\Xenia.Cpp.x64.Debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="..\build\Xenia.Cpp.x64.Debug.props" />
-    <Import Project="..\build\Xenia.Cpp.x64.Checked.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="..\build\Xenia.Cpp.x64.Release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/third_party/libglew.vcxproj.filters b/third_party/libglew.vcxproj.filters
deleted file mode 100644
index 72d16732c..000000000
--- a/third_party/libglew.vcxproj.filters
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="GL\glcorearb.h" />
-    <ClInclude Include="GL\glew.h" />
-    <ClInclude Include="GL\glext.h" />
-    <ClInclude Include="GL\glxew.h" />
-    <ClInclude Include="GL\glxext.h" />
-    <ClInclude Include="GL\wglew.h" />
-    <ClInclude Include="GL\wglext.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="GL\glew.c" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/third_party/libimgui.vcxproj b/third_party/libimgui.vcxproj
deleted file mode 100644
index bc454b5eb..000000000
--- a/third_party/libimgui.vcxproj
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Checked|x64">
-      <Configuration>Checked</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="imgui\imconfig.h" />
-    <ClInclude Include="imgui\imgui.h" />
-    <ClInclude Include="imgui\stb_rect_pack.h" />
-    <ClInclude Include="imgui\stb_textedit.h" />
-    <ClInclude Include="imgui\stb_truetype.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="imgui\imgui.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{CE3A80D4-12DB-4164-A050-67E5796A019B}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libimgui</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="..\build\Xenia.Cpp.x64.Debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="..\build\Xenia.Cpp.x64.Debug.props" />
-    <Import Project="..\build\Xenia.Cpp.x64.Checked.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="..\build\Xenia.Cpp.x64.Release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/third_party/libimgui.vcxproj.filters b/third_party/libimgui.vcxproj.filters
deleted file mode 100644
index 7a8251173..000000000
--- a/third_party/libimgui.vcxproj.filters
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClInclude Include="imgui\imconfig.h" />
-    <ClInclude Include="imgui\imgui.h" />
-    <ClInclude Include="imgui\stb_textedit.h" />
-    <ClInclude Include="imgui\stb_rect_pack.h" />
-    <ClInclude Include="imgui\stb_truetype.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="imgui\imgui.cpp" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/third_party/xxhash.lua b/third_party/xxhash.lua
new file mode 100644
index 000000000..edd207d85
--- /dev/null
+++ b/third_party/xxhash.lua
@@ -0,0 +1,17 @@
+group("third_party")
+project("xxhash")
+  uuid("40d4ce21-5448-4399-9f98-589b7e1c23b1")
+  kind("StaticLib")
+  language("C++")
+  links({
+  })
+  defines({
+    "_LIB",
+  })
+  includedirs({
+    "xxhash",
+  })
+  files({
+    "xxhash/xxhash.c",
+    "xxhash/xxhash.h",
+  })
diff --git a/xb.bat b/xb.bat
index 3be37f333..9907a3831 100644
--- a/xb.bat
+++ b/xb.bat
@@ -3,7 +3,7 @@ REM Copyright 2015 Ben Vanik. All Rights Reserved.
 
 SET DIR=%~dp0
 
-SET XENIA_SLN=xenia.sln
+SET XENIA_SLN=build\xenia.sln
 
 SET VS14_VCVARSALL="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
 SET VS15_VCVARSALL="C:\Program Files (x86)\Microsoft Visual Studio 15.0\VC\vcvarsall.bat"
@@ -97,6 +97,9 @@ ECHO.
 ECHO   xb pull [--rebase]
 ECHO     Fetches latest changes from github and rebuilds dependencies.
 ECHO.
+ECHO   xb premake
+ECHO     Regenerates Visual Studio projects and makefiles.
+ECHO.
 ECHO   xb proto
 ECHO     Regenerates protocol files (*.fbs).
 ECHO.
@@ -107,7 +110,7 @@ ECHO   xb build [--checked OR --debug OR --release] [--force]
 ECHO     Initializes dependencies and prepares build environment.
 ECHO.
 ECHO   xb gentests
-ECHO     Generates test binaries (under src/xenia/cpu/frontend/test/bin/).
+ECHO     Generates test binaries (under src/xenia/cpu/frontend/testing/bin/).
 ECHO     Run after modifying test .s files.
 ECHO.
 ECHO   xb test [--checked OR --debug OR --release] [--continue]
@@ -146,6 +149,16 @@ IF %ERRORLEVEL% NEQ 0 (
   GOTO :eof
 )
 
+ECHO.
+ECHO ^> build_tools/premake ...
+CALL :run_premake
+IF %_RESULT% NEQ 0 (
+  ECHO.
+  ECHO ERROR: failed to run premake
+  ENDLOCAL & SET _RESULT=1
+  GOTO :eof
+)
+
 ENDLOCAL & SET _RESULT=0
 GOTO :eof
 
@@ -192,8 +205,8 @@ IF %ERRORLEVEL% NEQ 0 (
 )
 
 ECHO.
-ECHO ^> git submodule update
-git submodule update
+ECHO ^> git submodule update --recursive
+git submodule update --recursive
 IF %ERRORLEVEL% NEQ 0 (
   ECHO.
   ECHO ERROR: failed to update git submodules
@@ -201,6 +214,37 @@ IF %ERRORLEVEL% NEQ 0 (
   GOTO :eof
 )
 
+ECHO.
+ECHO ^> build_tools/premake ...
+CALL :run_premake
+IF %_RESULT% NEQ 0 (
+  ECHO.
+  ECHO ERROR: failed to run premake
+  ENDLOCAL & SET _RESULT=1
+  GOTO :eof
+)
+
+ENDLOCAL & SET _RESULT=0
+GOTO :eof
+
+
+REM ============================================================================
+REM xb premake
+REM ============================================================================
+:perform_premake
+SETLOCAL EnableDelayedExpansion
+ECHO Generating project files...
+
+ECHO.
+ECHO ^> build_tools/premake ...
+CALL :run_premake
+IF %_RESULT% NEQ 0 (
+  ECHO.
+  ECHO ERROR: failed to run premake
+  ENDLOCAL & SET _RESULT=1
+  GOTO :eof
+)
+
 ENDLOCAL & SET _RESULT=0
 GOTO :eof
 
@@ -212,9 +256,9 @@ REM ============================================================================
 SETLOCAL EnableDelayedExpansion
 ECHO Generating proto files...
 
-SET FLATC=build\bin\Debug\flatc.exe
+SET FLATC=build\bin\Windows\Debug\flatc.exe
 IF NOT EXIST %FLATC% (
-  SET FLATC=build\bin\Release\flatc.exe
+  SET FLATC=build\bin\Windows\Release\flatc.exe
   IF NOT EXIST %FLATC% (
     ECHO.
     ECHO ERROR: flatc not built - build before running this
@@ -233,11 +277,11 @@ FOR %%G in (*.fbs) DO (
   ECHO ^> generating %%~nG...
   POPD
   SET SRC_FILE=%FBS_SRCS%\%%G
-  CMD /c build\bin\Debug\flatc.exe -c -o %CC_OUT% !SRC_FILE! 2>&1
+  CMD /c build\bin\Windows\Debug\flatc.exe -c -o %CC_OUT% !SRC_FILE! 2>&1
   IF !ERRORLEVEL! NEQ 0 (
     SET ANY_ERRORS=1
   )
-  CMD /c build\bin\Debug\flatc.exe -n -o %CS_OUT% !SRC_FILE! 2>&1
+  CMD /c build\bin\Windows\Debug\flatc.exe -n -o %CS_OUT% !SRC_FILE! 2>&1
   IF !ERRORLEVEL! NEQ 0 (
     SET ANY_ERRORS=1
   )
@@ -262,6 +306,16 @@ REM ============================================================================
 SETLOCAL
 ECHO Launching Visual Studio...
 
+ECHO.
+ECHO ^> build_tools/premake ...
+CALL :run_premake
+IF %_RESULT% NEQ 0 (
+  ECHO.
+  ECHO ERROR: failed to run premake
+  ENDLOCAL & SET _RESULT=1
+  GOTO :eof
+)
+
 ECHO.
 ECHO ^> devenv %XENIA_SLN%
 START devenv %XENIA_SLN%
@@ -290,6 +344,16 @@ GOTO :perform_build_args
 :perform_build_parsed
 ECHO Building for config %CONFIG%...
 
+ECHO.
+ECHO ^> build_tools/premake ...
+CALL :run_premake
+IF %_RESULT% NEQ 0 (
+  ECHO.
+  ECHO ERROR: failed to run premake
+  ENDLOCAL & SET _RESULT=1
+  GOTO :eof
+)
+
 IF %FORCE% EQU 1 (
   SET DEVENV_COMMAND=/rebuild
 ) ELSE (
@@ -298,11 +362,9 @@ IF %FORCE% EQU 1 (
 ECHO.
 ECHO ^> devenv %XENIA_SLN% %DEVENV_COMMAND% %CONFIG%
 
-CALL %VS14_VCVARSALL% amd64
-
 1>NUL 2>NUL CMD /c where devenv
 IF %ERRORLEVEL% NEQ 0 (
-  REM devenv not found
+  ECHO devenv not found
   ENDLOCAL & SET _RESULT=1
   GOTO :eof
 )
@@ -333,8 +395,8 @@ SET PPC_LD=%BINUTILS%\powerpc-none-elf-ld.exe
 SET PPC_OBJDUMP=%BINUTILS%\powerpc-none-elf-objdump.exe
 SET PPC_NM=%BINUTILS%\powerpc-none-elf-nm.exe
 
-SET TEST_SRC=src/xenia/cpu/frontend/test
-SET TEST_SRC_WIN=src\xenia\cpu\frontend\test
+SET TEST_SRC=src/xenia/cpu/frontend/testing
+SET TEST_SRC_WIN=src\xenia\cpu\frontend\testing
 SET TEST_BIN=%TEST_SRC%/bin
 SET TEST_BIN_WIN=%TEST_SRC_WIN%\bin
 IF NOT EXIST %TEST_BIN_WIN% (mkdir %TEST_BIN_WIN%)
@@ -404,9 +466,9 @@ GOTO :perform_test_args
 :perform_test_parsed
 ECHO Running automated testing for config %CONFIG%...
 
-SET TEST_NAMES=xe-cpu-ppc-test
+SET TEST_NAMES=xenia-cpu-frontend-tests
 FOR %%G IN (%TEST_NAMES%) DO (
-  IF NOT EXIST build\bin\%CONFIG%\%%G.exe (
+  IF NOT EXIST build\bin\Windows\%CONFIG%\%%G.exe (
     ECHO.
     ECHO ERROR: unable to find `%%G.exe` - ensure it is built.
     ENDLOCAL & SET _RESULT=1
@@ -417,8 +479,8 @@ FOR %%G IN (%TEST_NAMES%) DO (
 SET ANY_FAILED=0
 FOR %%G IN (%TEST_NAMES%) DO (
   ECHO.
-  ECHO ^> build\bin\%CONFIG%\%%G.exe %1 %2 %3 %4 %5 %6 %7 %8 %9
-  build\bin\%CONFIG%\%%G.exe %1 %2 %3 %4 %5 %6 %7 %8 %9
+  ECHO ^> build\bin\Windows\%CONFIG%\%%G.exe %1 %2 %3 %4 %5 %6 %7 %8 %9
+  build\bin\Windows\%CONFIG%\%%G.exe %1 %2 %3 %4 %5 %6 %7 %8 %9
   IF !ERRORLEVEL! NEQ 0 (
     SET ANY_FAILED=1
     IF %CONTINUE% EQU 0 (
@@ -451,11 +513,9 @@ SETLOCAL
 ECHO Cleaning normal build outputs...
 ECHO (use nuke to kill all artifacts)
 
-CALL %VS14_VCVARSALL% amd64
-
 1>NUL 2>NUL CMD /c where devenv
 IF %ERRORLEVEL% NEQ 0 (
-  REM devenv not found
+  ECHO devenv not found
   ENDLOCAL & SET _RESULT=1
   GOTO :eof
 )
@@ -479,9 +539,13 @@ SETLOCAL
 ECHO Nuking all local changes...
 ECHO.
 
-REM rmdir build/
-REM git checkout --hard /etc
-ECHO TODO(benvanik): blast away build/ for now
+ECHO.
+ECHO ^> rmdir /s build
+rmdir /s build
+
+ECHO.
+ECHO ^> git checkout --hard master
+git checkout --hard master
 
 ENDLOCAL & SET _RESULT=0
 GOTO :eof
@@ -684,3 +748,15 @@ IF %HAVE_TOOLS% NEQ 1 (
 )
 ENDLOCAL & SET _RESULT=0
 GOTO :eof
+
+:run_premake
+SETLOCAL EnableDelayedExpansion
+CALL build_tools\premake.bat --file=premake5.lua --os=windows --test-suite-mode=combined --verbose vs2015
+IF %ERRORLEVEL% NEQ 0 (
+  ECHO.
+  ECHO ERROR: failed to run premake
+  ENDLOCAL & SET _RESULT=1
+  GOTO :eof
+)
+ENDLOCAL & SET _RESULT=0
+GOTO :eof
diff --git a/xenia.sln b/xenia.sln
deleted file mode 100644
index 76b380207..000000000
--- a/xenia.sln
+++ /dev/null
@@ -1,198 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.22823.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xenia", "xenia.vcxproj", "{88F908AF-79A3-4ED4-87C7-A76368205264}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AE4AF147-715A-4C24-8BFA-136332DED28F} = {AE4AF147-715A-4C24-8BFA-136332DED28F}
-		{0CE149F6-41C3-4224-9E57-C02E8C7CD312} = {0CE149F6-41C3-4224-9E57-C02E8C7CD312}
-		{838020F9-94AA-4314-996D-69B923C45D39} = {838020F9-94AA-4314-996D-69B923C45D39}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxenia", "libxenia.vcxproj", "{0CE149F6-41C3-4224-9E57-C02E8C7CD312}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AE4AF147-715A-4C24-8BFA-136332DED28F} = {AE4AF147-715A-4C24-8BFA-136332DED28F}
-		{93533067-6449-4691-88A8-026EBCFDCA97} = {93533067-6449-4691-88A8-026EBCFDCA97}
-		{156102D7-F2DD-4618-B2EB-2DFE607EE6DD} = {156102D7-F2DD-4618-B2EB-2DFE607EE6DD}
-		{838020F9-94AA-4314-996D-69B923C45D39} = {838020F9-94AA-4314-996D-69B923C45D39}
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "third_party", "third_party", "{FCCBE57F-ECAE-420A-8A82-4B85F722C272}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testing", "testing", "{9C5BDD9E-831B-4AEE-957F-0E88ADED79C6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglew", "third_party\libglew.vcxproj", "{AE4AF147-715A-4C24-8BFA-136332DED28F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgflags", "third_party\libgflags.vcxproj", "{838020F9-94AA-4314-996D-69B923C45D39}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libimgui", "third_party\libimgui.vcxproj", "{CE3A80D4-12DB-4164-A050-67E5796A019B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AE4AF147-715A-4C24-8BFA-136332DED28F} = {AE4AF147-715A-4C24-8BFA-136332DED28F}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flatc", "third_party\flatc.vcxproj", "{D3069A06-62FC-479F-9F5C-23B4377481B0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xe-cpu-hir-test", "src\xenia\cpu\test\xe-cpu-hir-test.vcxproj", "{6EC54AD0-4F5B-48D9-B820-43DF2F0DC83C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{0CE149F6-41C3-4224-9E57-C02E8C7CD312} = {0CE149F6-41C3-4224-9E57-C02E8C7CD312}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xe-cpu-ppc-test", "src\xenia\cpu\frontend\test\xe-cpu-ppc-test.vcxproj", "{9B8AC22F-9147-490F-BE03-3B8BA31990A8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{0CE149F6-41C3-4224-9E57-C02E8C7CD312} = {0CE149F6-41C3-4224-9E57-C02E8C7CD312}
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "debugging", "debugging", "{345BD157-B21D-4989-9CE4-FA3C90FFC095}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xe-gpu-trace-viewer", "src\xenia\gpu\xe-gpu-trace-viewer.vcxproj", "{21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AE4AF147-715A-4C24-8BFA-136332DED28F} = {AE4AF147-715A-4C24-8BFA-136332DED28F}
-		{CE3A80D4-12DB-4164-A050-67E5796A019B} = {CE3A80D4-12DB-4164-A050-67E5796A019B}
-		{0CE149F6-41C3-4224-9E57-C02E8C7CD312} = {0CE149F6-41C3-4224-9E57-C02E8C7CD312}
-		{838020F9-94AA-4314-996D-69B923C45D39} = {838020F9-94AA-4314-996D-69B923C45D39}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xe-debug-ui", "src\xenia\debug\ui\xe-debug-ui.vcxproj", "{C5BA52F0-C86B-4817-921C-CCA257FC04BE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AE4AF147-715A-4C24-8BFA-136332DED28F} = {AE4AF147-715A-4C24-8BFA-136332DED28F}
-		{156102D7-F2DD-4618-B2EB-2DFE607EE6DD} = {156102D7-F2DD-4618-B2EB-2DFE607EE6DD}
-		{0CE149F6-41C3-4224-9E57-C02E8C7CD312} = {0CE149F6-41C3-4224-9E57-C02E8C7CD312}
-		{838020F9-94AA-4314-996D-69B923C45D39} = {838020F9-94AA-4314-996D-69B923C45D39}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxenia-base", "libxenia-base.vcxproj", "{93533067-6449-4691-88A8-026EBCFDCA97}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libelemental", "third_party\elemental-forms\libelemental.vcxproj", "{156102D7-F2DD-4618-B2EB-2DFE607EE6DD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elemental-forms-demo", "third_party\elemental-forms\testbed\elemental-testbed.vcxproj", "{C3FDE1FE-1FCB-4156-BB37-2E38F5C2DFE7}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Checked|x64 = Checked|x64
-		Clang|x64 = Clang|x64
-		Debug|x64 = Debug|x64
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{88F908AF-79A3-4ED4-87C7-A76368205264}.Checked|x64.ActiveCfg = Checked|x64
-		{88F908AF-79A3-4ED4-87C7-A76368205264}.Checked|x64.Build.0 = Checked|x64
-		{88F908AF-79A3-4ED4-87C7-A76368205264}.Clang|x64.ActiveCfg = Debug|x64
-		{88F908AF-79A3-4ED4-87C7-A76368205264}.Clang|x64.Build.0 = Debug|x64
-		{88F908AF-79A3-4ED4-87C7-A76368205264}.Debug|x64.ActiveCfg = Debug|x64
-		{88F908AF-79A3-4ED4-87C7-A76368205264}.Debug|x64.Build.0 = Debug|x64
-		{88F908AF-79A3-4ED4-87C7-A76368205264}.Release|x64.ActiveCfg = Release|x64
-		{88F908AF-79A3-4ED4-87C7-A76368205264}.Release|x64.Build.0 = Release|x64
-		{0CE149F6-41C3-4224-9E57-C02E8C7CD312}.Checked|x64.ActiveCfg = Checked|x64
-		{0CE149F6-41C3-4224-9E57-C02E8C7CD312}.Checked|x64.Build.0 = Checked|x64
-		{0CE149F6-41C3-4224-9E57-C02E8C7CD312}.Clang|x64.ActiveCfg = Clang|x64
-		{0CE149F6-41C3-4224-9E57-C02E8C7CD312}.Clang|x64.Build.0 = Clang|x64
-		{0CE149F6-41C3-4224-9E57-C02E8C7CD312}.Debug|x64.ActiveCfg = Debug|x64
-		{0CE149F6-41C3-4224-9E57-C02E8C7CD312}.Debug|x64.Build.0 = Debug|x64
-		{0CE149F6-41C3-4224-9E57-C02E8C7CD312}.Release|x64.ActiveCfg = Release|x64
-		{0CE149F6-41C3-4224-9E57-C02E8C7CD312}.Release|x64.Build.0 = Release|x64
-		{AE4AF147-715A-4C24-8BFA-136332DED28F}.Checked|x64.ActiveCfg = Checked|x64
-		{AE4AF147-715A-4C24-8BFA-136332DED28F}.Checked|x64.Build.0 = Checked|x64
-		{AE4AF147-715A-4C24-8BFA-136332DED28F}.Clang|x64.ActiveCfg = Debug|x64
-		{AE4AF147-715A-4C24-8BFA-136332DED28F}.Clang|x64.Build.0 = Debug|x64
-		{AE4AF147-715A-4C24-8BFA-136332DED28F}.Debug|x64.ActiveCfg = Debug|x64
-		{AE4AF147-715A-4C24-8BFA-136332DED28F}.Debug|x64.Build.0 = Debug|x64
-		{AE4AF147-715A-4C24-8BFA-136332DED28F}.Release|x64.ActiveCfg = Release|x64
-		{AE4AF147-715A-4C24-8BFA-136332DED28F}.Release|x64.Build.0 = Release|x64
-		{838020F9-94AA-4314-996D-69B923C45D39}.Checked|x64.ActiveCfg = Checked|x64
-		{838020F9-94AA-4314-996D-69B923C45D39}.Checked|x64.Build.0 = Checked|x64
-		{838020F9-94AA-4314-996D-69B923C45D39}.Clang|x64.ActiveCfg = Debug|x64
-		{838020F9-94AA-4314-996D-69B923C45D39}.Clang|x64.Build.0 = Debug|x64
-		{838020F9-94AA-4314-996D-69B923C45D39}.Debug|x64.ActiveCfg = Debug|x64
-		{838020F9-94AA-4314-996D-69B923C45D39}.Debug|x64.Build.0 = Debug|x64
-		{838020F9-94AA-4314-996D-69B923C45D39}.Release|x64.ActiveCfg = Release|x64
-		{838020F9-94AA-4314-996D-69B923C45D39}.Release|x64.Build.0 = Release|x64
-		{CE3A80D4-12DB-4164-A050-67E5796A019B}.Checked|x64.ActiveCfg = Checked|x64
-		{CE3A80D4-12DB-4164-A050-67E5796A019B}.Checked|x64.Build.0 = Checked|x64
-		{CE3A80D4-12DB-4164-A050-67E5796A019B}.Clang|x64.ActiveCfg = Debug|x64
-		{CE3A80D4-12DB-4164-A050-67E5796A019B}.Clang|x64.Build.0 = Debug|x64
-		{CE3A80D4-12DB-4164-A050-67E5796A019B}.Debug|x64.ActiveCfg = Debug|x64
-		{CE3A80D4-12DB-4164-A050-67E5796A019B}.Debug|x64.Build.0 = Debug|x64
-		{CE3A80D4-12DB-4164-A050-67E5796A019B}.Release|x64.ActiveCfg = Release|x64
-		{CE3A80D4-12DB-4164-A050-67E5796A019B}.Release|x64.Build.0 = Release|x64
-		{D3069A06-62FC-479F-9F5C-23B4377481B0}.Checked|x64.ActiveCfg = Checked|x64
-		{D3069A06-62FC-479F-9F5C-23B4377481B0}.Checked|x64.Build.0 = Checked|x64
-		{D3069A06-62FC-479F-9F5C-23B4377481B0}.Clang|x64.ActiveCfg = Debug|x64
-		{D3069A06-62FC-479F-9F5C-23B4377481B0}.Clang|x64.Build.0 = Debug|x64
-		{D3069A06-62FC-479F-9F5C-23B4377481B0}.Debug|x64.ActiveCfg = Debug|x64
-		{D3069A06-62FC-479F-9F5C-23B4377481B0}.Debug|x64.Build.0 = Debug|x64
-		{D3069A06-62FC-479F-9F5C-23B4377481B0}.Release|x64.ActiveCfg = Release|x64
-		{D3069A06-62FC-479F-9F5C-23B4377481B0}.Release|x64.Build.0 = Release|x64
-		{6EC54AD0-4F5B-48D9-B820-43DF2F0DC83C}.Checked|x64.ActiveCfg = Checked|x64
-		{6EC54AD0-4F5B-48D9-B820-43DF2F0DC83C}.Checked|x64.Build.0 = Checked|x64
-		{6EC54AD0-4F5B-48D9-B820-43DF2F0DC83C}.Clang|x64.ActiveCfg = Debug|x64
-		{6EC54AD0-4F5B-48D9-B820-43DF2F0DC83C}.Clang|x64.Build.0 = Debug|x64
-		{6EC54AD0-4F5B-48D9-B820-43DF2F0DC83C}.Debug|x64.ActiveCfg = Debug|x64
-		{6EC54AD0-4F5B-48D9-B820-43DF2F0DC83C}.Debug|x64.Build.0 = Debug|x64
-		{6EC54AD0-4F5B-48D9-B820-43DF2F0DC83C}.Release|x64.ActiveCfg = Release|x64
-		{6EC54AD0-4F5B-48D9-B820-43DF2F0DC83C}.Release|x64.Build.0 = Release|x64
-		{9B8AC22F-9147-490F-BE03-3B8BA31990A8}.Checked|x64.ActiveCfg = Checked|x64
-		{9B8AC22F-9147-490F-BE03-3B8BA31990A8}.Checked|x64.Build.0 = Checked|x64
-		{9B8AC22F-9147-490F-BE03-3B8BA31990A8}.Clang|x64.ActiveCfg = Debug|x64
-		{9B8AC22F-9147-490F-BE03-3B8BA31990A8}.Clang|x64.Build.0 = Debug|x64
-		{9B8AC22F-9147-490F-BE03-3B8BA31990A8}.Debug|x64.ActiveCfg = Debug|x64
-		{9B8AC22F-9147-490F-BE03-3B8BA31990A8}.Debug|x64.Build.0 = Debug|x64
-		{9B8AC22F-9147-490F-BE03-3B8BA31990A8}.Release|x64.ActiveCfg = Release|x64
-		{9B8AC22F-9147-490F-BE03-3B8BA31990A8}.Release|x64.Build.0 = Release|x64
-		{21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}.Checked|x64.ActiveCfg = Debug|x64
-		{21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}.Checked|x64.Build.0 = Debug|x64
-		{21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}.Clang|x64.ActiveCfg = Debug|x64
-		{21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}.Clang|x64.Build.0 = Debug|x64
-		{21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}.Debug|x64.ActiveCfg = Debug|x64
-		{21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}.Debug|x64.Build.0 = Debug|x64
-		{21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}.Release|x64.ActiveCfg = Release|x64
-		{21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}.Release|x64.Build.0 = Release|x64
-		{C5BA52F0-C86B-4817-921C-CCA257FC04BE}.Checked|x64.ActiveCfg = Debug|x64
-		{C5BA52F0-C86B-4817-921C-CCA257FC04BE}.Checked|x64.Build.0 = Debug|x64
-		{C5BA52F0-C86B-4817-921C-CCA257FC04BE}.Clang|x64.ActiveCfg = Debug|x64
-		{C5BA52F0-C86B-4817-921C-CCA257FC04BE}.Clang|x64.Build.0 = Debug|x64
-		{C5BA52F0-C86B-4817-921C-CCA257FC04BE}.Debug|x64.ActiveCfg = Debug|x64
-		{C5BA52F0-C86B-4817-921C-CCA257FC04BE}.Debug|x64.Build.0 = Debug|x64
-		{C5BA52F0-C86B-4817-921C-CCA257FC04BE}.Release|x64.ActiveCfg = Release|x64
-		{C5BA52F0-C86B-4817-921C-CCA257FC04BE}.Release|x64.Build.0 = Release|x64
-		{93533067-6449-4691-88A8-026EBCFDCA97}.Checked|x64.ActiveCfg = Checked|x64
-		{93533067-6449-4691-88A8-026EBCFDCA97}.Checked|x64.Build.0 = Checked|x64
-		{93533067-6449-4691-88A8-026EBCFDCA97}.Clang|x64.ActiveCfg = Clang|x64
-		{93533067-6449-4691-88A8-026EBCFDCA97}.Clang|x64.Build.0 = Clang|x64
-		{93533067-6449-4691-88A8-026EBCFDCA97}.Debug|x64.ActiveCfg = Debug|x64
-		{93533067-6449-4691-88A8-026EBCFDCA97}.Debug|x64.Build.0 = Debug|x64
-		{93533067-6449-4691-88A8-026EBCFDCA97}.Release|x64.ActiveCfg = Release|x64
-		{93533067-6449-4691-88A8-026EBCFDCA97}.Release|x64.Build.0 = Release|x64
-		{156102D7-F2DD-4618-B2EB-2DFE607EE6DD}.Checked|x64.ActiveCfg = Checked|x64
-		{156102D7-F2DD-4618-B2EB-2DFE607EE6DD}.Checked|x64.Build.0 = Checked|x64
-		{156102D7-F2DD-4618-B2EB-2DFE607EE6DD}.Clang|x64.ActiveCfg = Clang|x64
-		{156102D7-F2DD-4618-B2EB-2DFE607EE6DD}.Clang|x64.Build.0 = Clang|x64
-		{156102D7-F2DD-4618-B2EB-2DFE607EE6DD}.Debug|x64.ActiveCfg = Debug|x64
-		{156102D7-F2DD-4618-B2EB-2DFE607EE6DD}.Debug|x64.Build.0 = Debug|x64
-		{156102D7-F2DD-4618-B2EB-2DFE607EE6DD}.Release|x64.ActiveCfg = Release|x64
-		{156102D7-F2DD-4618-B2EB-2DFE607EE6DD}.Release|x64.Build.0 = Release|x64
-		{C3FDE1FE-1FCB-4156-BB37-2E38F5C2DFE7}.Checked|x64.ActiveCfg = Checked|x64
-		{C3FDE1FE-1FCB-4156-BB37-2E38F5C2DFE7}.Checked|x64.Build.0 = Checked|x64
-		{C3FDE1FE-1FCB-4156-BB37-2E38F5C2DFE7}.Clang|x64.ActiveCfg = Clang|x64
-		{C3FDE1FE-1FCB-4156-BB37-2E38F5C2DFE7}.Clang|x64.Build.0 = Clang|x64
-		{C3FDE1FE-1FCB-4156-BB37-2E38F5C2DFE7}.Debug|x64.ActiveCfg = Debug|x64
-		{C3FDE1FE-1FCB-4156-BB37-2E38F5C2DFE7}.Debug|x64.Build.0 = Debug|x64
-		{C3FDE1FE-1FCB-4156-BB37-2E38F5C2DFE7}.Release|x64.ActiveCfg = Release|x64
-		{C3FDE1FE-1FCB-4156-BB37-2E38F5C2DFE7}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{AE4AF147-715A-4C24-8BFA-136332DED28F} = {FCCBE57F-ECAE-420A-8A82-4B85F722C272}
-		{838020F9-94AA-4314-996D-69B923C45D39} = {FCCBE57F-ECAE-420A-8A82-4B85F722C272}
-		{CE3A80D4-12DB-4164-A050-67E5796A019B} = {FCCBE57F-ECAE-420A-8A82-4B85F722C272}
-		{D3069A06-62FC-479F-9F5C-23B4377481B0} = {FCCBE57F-ECAE-420A-8A82-4B85F722C272}
-		{6EC54AD0-4F5B-48D9-B820-43DF2F0DC83C} = {9C5BDD9E-831B-4AEE-957F-0E88ADED79C6}
-		{9B8AC22F-9147-490F-BE03-3B8BA31990A8} = {9C5BDD9E-831B-4AEE-957F-0E88ADED79C6}
-		{21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC} = {345BD157-B21D-4989-9CE4-FA3C90FFC095}
-		{C5BA52F0-C86B-4817-921C-CCA257FC04BE} = {345BD157-B21D-4989-9CE4-FA3C90FFC095}
-		{156102D7-F2DD-4618-B2EB-2DFE607EE6DD} = {FCCBE57F-ECAE-420A-8A82-4B85F722C272}
-		{C3FDE1FE-1FCB-4156-BB37-2E38F5C2DFE7} = {9C5BDD9E-831B-4AEE-957F-0E88ADED79C6}
-	EndGlobalSection
-EndGlobal
diff --git a/xenia.vcxproj b/xenia.vcxproj
deleted file mode 100644
index bcf261624..000000000
--- a/xenia.vcxproj
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Checked|x64">
-      <Configuration>Checked</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{88F908AF-79A3-4ED4-87C7-A76368205264}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>xenia</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="build\Xenia.Cpp.x64.Debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="build\Xenia.Cpp.x64.Debug.props" />
-    <Import Project="build\Xenia.Cpp.x64.Checked.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="build\Xenia.Cpp.x64.Common.props" />
-    <Import Project="build\Xenia.Cpp.x64.Release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PreprocessorDefinitions>_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>libgflags.lib;libglew.lib;libxenia.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PreprocessorDefinitions>_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>libgflags.lib;libglew.lib;libxenia.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>libgflags.lib;libglew.lib;libxenia.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="src\xenia\app\emulator_window.cc" />
-    <ClCompile Include="src\xenia\app\xenia_main.cc" />
-    <ClCompile Include="src\xenia\base\main_win.cc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\xenia\app\emulator_window.h" />
-    <ClInclude Include="src\xenia\base\main.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="src\xenia\app\main_resources.rc">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)third_party/elemental-forms;$(SolutionDir);.</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)third_party/elemental-forms;$(SolutionDir);.</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">$(SolutionDir)third_party/elemental-forms;$(SolutionDir);.</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/xenia.vcxproj.filters b/xenia.vcxproj.filters
deleted file mode 100644
index 695007fc2..000000000
--- a/xenia.vcxproj.filters
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="src">
-      <UniqueIdentifier>{944458a3-c5a7-42f3-9330-1e24284524cc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia">
-      <UniqueIdentifier>{1f48c4ec-0864-4f6f-bc46-51d57f0650a8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\base">
-      <UniqueIdentifier>{a3d918ab-c42b-469d-9950-ec4656b77b32}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\xenia\app">
-      <UniqueIdentifier>{2d31f471-6ba9-434c-88e6-5a4da1b4d67d}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\xenia\base\main_win.cc">
-      <Filter>src\xenia\base</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\app\emulator_window.cc">
-      <Filter>src\xenia\app</Filter>
-    </ClCompile>
-    <ClCompile Include="src\xenia\app\xenia_main.cc">
-      <Filter>src\xenia\app</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\xenia\base\main.h">
-      <Filter>src\xenia\base</Filter>
-    </ClInclude>
-    <ClInclude Include="src\xenia\app\emulator_window.h">
-      <Filter>src\xenia\app</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="src\xenia\app\main_resources.rc">
-      <Filter>src\xenia\app</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file