diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d2add87c..5af01db47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -427,7 +427,7 @@ if (BUILD_TESTS) endif() add_subdirectory(FEXHeaderUtils/) -add_subdirectory(External/FEXCore) +add_subdirectory(FEXCore/) # Binfmt_misc files must be installed prior to Source/ installs add_subdirectory(Data/binfmts/) diff --git a/External/FEXCore/CMakeLists.txt b/FEXCore/CMakeLists.txt similarity index 100% rename from External/FEXCore/CMakeLists.txt rename to FEXCore/CMakeLists.txt diff --git a/External/FEXCore/LICENSE b/FEXCore/LICENSE similarity index 100% rename from External/FEXCore/LICENSE rename to FEXCore/LICENSE diff --git a/External/FEXCore/Readme.md b/FEXCore/Readme.md similarity index 100% rename from External/FEXCore/Readme.md rename to FEXCore/Readme.md diff --git a/External/FEXCore/Scripts/config_generator.py b/FEXCore/Scripts/config_generator.py similarity index 100% rename from External/FEXCore/Scripts/config_generator.py rename to FEXCore/Scripts/config_generator.py diff --git a/External/FEXCore/Scripts/json_ir_doc_generator.py b/FEXCore/Scripts/json_ir_doc_generator.py similarity index 100% rename from External/FEXCore/Scripts/json_ir_doc_generator.py rename to FEXCore/Scripts/json_ir_doc_generator.py diff --git a/External/FEXCore/Scripts/json_ir_generator.py b/FEXCore/Scripts/json_ir_generator.py similarity index 100% rename from External/FEXCore/Scripts/json_ir_generator.py rename to FEXCore/Scripts/json_ir_generator.py diff --git a/External/FEXCore/Source/CMakeLists.txt b/FEXCore/Source/CMakeLists.txt similarity index 100% rename from External/FEXCore/Source/CMakeLists.txt rename to FEXCore/Source/CMakeLists.txt diff --git a/External/FEXCore/Source/Common/BitSet.h b/FEXCore/Source/Common/BitSet.h similarity index 100% rename from External/FEXCore/Source/Common/BitSet.h rename to FEXCore/Source/Common/BitSet.h diff --git a/External/FEXCore/Source/Common/JitSymbols.cpp b/FEXCore/Source/Common/JitSymbols.cpp similarity index 100% rename from External/FEXCore/Source/Common/JitSymbols.cpp rename to FEXCore/Source/Common/JitSymbols.cpp diff --git a/External/FEXCore/Source/Common/JitSymbols.h b/FEXCore/Source/Common/JitSymbols.h similarity index 100% rename from External/FEXCore/Source/Common/JitSymbols.h rename to FEXCore/Source/Common/JitSymbols.h diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/extF80_add.c b/FEXCore/Source/Common/SoftFloat-3e/extF80_add.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/extF80_add.c rename to FEXCore/Source/Common/SoftFloat-3e/extF80_add.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/extF80_div.c b/FEXCore/Source/Common/SoftFloat-3e/extF80_div.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/extF80_div.c rename to FEXCore/Source/Common/SoftFloat-3e/extF80_div.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/extF80_eq.c b/FEXCore/Source/Common/SoftFloat-3e/extF80_eq.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/extF80_eq.c rename to FEXCore/Source/Common/SoftFloat-3e/extF80_eq.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/extF80_lt.c b/FEXCore/Source/Common/SoftFloat-3e/extF80_lt.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/extF80_lt.c rename to FEXCore/Source/Common/SoftFloat-3e/extF80_lt.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/extF80_mul.c b/FEXCore/Source/Common/SoftFloat-3e/extF80_mul.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/extF80_mul.c rename to FEXCore/Source/Common/SoftFloat-3e/extF80_mul.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/extF80_rem.c b/FEXCore/Source/Common/SoftFloat-3e/extF80_rem.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/extF80_rem.c rename to FEXCore/Source/Common/SoftFloat-3e/extF80_rem.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/extF80_roundToInt.c b/FEXCore/Source/Common/SoftFloat-3e/extF80_roundToInt.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/extF80_roundToInt.c rename to FEXCore/Source/Common/SoftFloat-3e/extF80_roundToInt.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/extF80_sqrt.c b/FEXCore/Source/Common/SoftFloat-3e/extF80_sqrt.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/extF80_sqrt.c rename to FEXCore/Source/Common/SoftFloat-3e/extF80_sqrt.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/extF80_sub.c b/FEXCore/Source/Common/SoftFloat-3e/extF80_sub.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/extF80_sub.c rename to FEXCore/Source/Common/SoftFloat-3e/extF80_sub.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/extF80_to_f128.c b/FEXCore/Source/Common/SoftFloat-3e/extF80_to_f128.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/extF80_to_f128.c rename to FEXCore/Source/Common/SoftFloat-3e/extF80_to_f128.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/extF80_to_f32.c b/FEXCore/Source/Common/SoftFloat-3e/extF80_to_f32.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/extF80_to_f32.c rename to FEXCore/Source/Common/SoftFloat-3e/extF80_to_f32.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/extF80_to_f64.c b/FEXCore/Source/Common/SoftFloat-3e/extF80_to_f64.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/extF80_to_f64.c rename to FEXCore/Source/Common/SoftFloat-3e/extF80_to_f64.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/extF80_to_i32.c b/FEXCore/Source/Common/SoftFloat-3e/extF80_to_i32.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/extF80_to_i32.c rename to FEXCore/Source/Common/SoftFloat-3e/extF80_to_i32.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/extF80_to_i64.c b/FEXCore/Source/Common/SoftFloat-3e/extF80_to_i64.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/extF80_to_i64.c rename to FEXCore/Source/Common/SoftFloat-3e/extF80_to_i64.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/extF80_to_ui64.c b/FEXCore/Source/Common/SoftFloat-3e/extF80_to_ui64.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/extF80_to_ui64.c rename to FEXCore/Source/Common/SoftFloat-3e/extF80_to_ui64.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/f128_to_extF80.c b/FEXCore/Source/Common/SoftFloat-3e/f128_to_extF80.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/f128_to_extF80.c rename to FEXCore/Source/Common/SoftFloat-3e/f128_to_extF80.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/f32_to_extF80.c b/FEXCore/Source/Common/SoftFloat-3e/f32_to_extF80.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/f32_to_extF80.c rename to FEXCore/Source/Common/SoftFloat-3e/f32_to_extF80.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/f64_to_extF80.c b/FEXCore/Source/Common/SoftFloat-3e/f64_to_extF80.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/f64_to_extF80.c rename to FEXCore/Source/Common/SoftFloat-3e/f64_to_extF80.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/i32_to_extF80.c b/FEXCore/Source/Common/SoftFloat-3e/i32_to_extF80.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/i32_to_extF80.c rename to FEXCore/Source/Common/SoftFloat-3e/i32_to_extF80.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/internals.h b/FEXCore/Source/Common/SoftFloat-3e/internals.h similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/internals.h rename to FEXCore/Source/Common/SoftFloat-3e/internals.h diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/opts-GCC.h b/FEXCore/Source/Common/SoftFloat-3e/opts-GCC.h similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/opts-GCC.h rename to FEXCore/Source/Common/SoftFloat-3e/opts-GCC.h diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/platform.h b/FEXCore/Source/Common/SoftFloat-3e/platform.h similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/platform.h rename to FEXCore/Source/Common/SoftFloat-3e/platform.h diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/primitiveTypes.h b/FEXCore/Source/Common/SoftFloat-3e/primitiveTypes.h similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/primitiveTypes.h rename to FEXCore/Source/Common/SoftFloat-3e/primitiveTypes.h diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/primitives.h b/FEXCore/Source/Common/SoftFloat-3e/primitives.h similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/primitives.h rename to FEXCore/Source/Common/SoftFloat-3e/primitives.h diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_add128.c b/FEXCore/Source/Common/SoftFloat-3e/s_add128.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_add128.c rename to FEXCore/Source/Common/SoftFloat-3e/s_add128.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_addMagsExtF80.c b/FEXCore/Source/Common/SoftFloat-3e/s_addMagsExtF80.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_addMagsExtF80.c rename to FEXCore/Source/Common/SoftFloat-3e/s_addMagsExtF80.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_approxRecip32_1.c b/FEXCore/Source/Common/SoftFloat-3e/s_approxRecip32_1.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_approxRecip32_1.c rename to FEXCore/Source/Common/SoftFloat-3e/s_approxRecip32_1.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_approxRecipSqrt32_1.c b/FEXCore/Source/Common/SoftFloat-3e/s_approxRecipSqrt32_1.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_approxRecipSqrt32_1.c rename to FEXCore/Source/Common/SoftFloat-3e/s_approxRecipSqrt32_1.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_approxRecipSqrt_1Ks.c b/FEXCore/Source/Common/SoftFloat-3e/s_approxRecipSqrt_1Ks.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_approxRecipSqrt_1Ks.c rename to FEXCore/Source/Common/SoftFloat-3e/s_approxRecipSqrt_1Ks.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_approxRecip_1Ks.c b/FEXCore/Source/Common/SoftFloat-3e/s_approxRecip_1Ks.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_approxRecip_1Ks.c rename to FEXCore/Source/Common/SoftFloat-3e/s_approxRecip_1Ks.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_commonNaNToExtF80UI.c b/FEXCore/Source/Common/SoftFloat-3e/s_commonNaNToExtF80UI.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_commonNaNToExtF80UI.c rename to FEXCore/Source/Common/SoftFloat-3e/s_commonNaNToExtF80UI.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_commonNaNToF128UI.c b/FEXCore/Source/Common/SoftFloat-3e/s_commonNaNToF128UI.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_commonNaNToF128UI.c rename to FEXCore/Source/Common/SoftFloat-3e/s_commonNaNToF128UI.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_commonNaNToF32UI.c b/FEXCore/Source/Common/SoftFloat-3e/s_commonNaNToF32UI.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_commonNaNToF32UI.c rename to FEXCore/Source/Common/SoftFloat-3e/s_commonNaNToF32UI.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_commonNaNToF64UI.c b/FEXCore/Source/Common/SoftFloat-3e/s_commonNaNToF64UI.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_commonNaNToF64UI.c rename to FEXCore/Source/Common/SoftFloat-3e/s_commonNaNToF64UI.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_countLeadingZeros32.c b/FEXCore/Source/Common/SoftFloat-3e/s_countLeadingZeros32.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_countLeadingZeros32.c rename to FEXCore/Source/Common/SoftFloat-3e/s_countLeadingZeros32.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_countLeadingZeros64.c b/FEXCore/Source/Common/SoftFloat-3e/s_countLeadingZeros64.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_countLeadingZeros64.c rename to FEXCore/Source/Common/SoftFloat-3e/s_countLeadingZeros64.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_countLeadingZeros8.c b/FEXCore/Source/Common/SoftFloat-3e/s_countLeadingZeros8.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_countLeadingZeros8.c rename to FEXCore/Source/Common/SoftFloat-3e/s_countLeadingZeros8.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_extF80UIToCommonNaN.c b/FEXCore/Source/Common/SoftFloat-3e/s_extF80UIToCommonNaN.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_extF80UIToCommonNaN.c rename to FEXCore/Source/Common/SoftFloat-3e/s_extF80UIToCommonNaN.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_f128UIToCommonNaN.c b/FEXCore/Source/Common/SoftFloat-3e/s_f128UIToCommonNaN.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_f128UIToCommonNaN.c rename to FEXCore/Source/Common/SoftFloat-3e/s_f128UIToCommonNaN.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_f32UIToCommonNaN.c b/FEXCore/Source/Common/SoftFloat-3e/s_f32UIToCommonNaN.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_f32UIToCommonNaN.c rename to FEXCore/Source/Common/SoftFloat-3e/s_f32UIToCommonNaN.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_f64UIToCommonNaN.c b/FEXCore/Source/Common/SoftFloat-3e/s_f64UIToCommonNaN.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_f64UIToCommonNaN.c rename to FEXCore/Source/Common/SoftFloat-3e/s_f64UIToCommonNaN.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_le128.c b/FEXCore/Source/Common/SoftFloat-3e/s_le128.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_le128.c rename to FEXCore/Source/Common/SoftFloat-3e/s_le128.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_lt128.c b/FEXCore/Source/Common/SoftFloat-3e/s_lt128.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_lt128.c rename to FEXCore/Source/Common/SoftFloat-3e/s_lt128.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_mul64ByShifted32To128.c b/FEXCore/Source/Common/SoftFloat-3e/s_mul64ByShifted32To128.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_mul64ByShifted32To128.c rename to FEXCore/Source/Common/SoftFloat-3e/s_mul64ByShifted32To128.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_mul64To128.c b/FEXCore/Source/Common/SoftFloat-3e/s_mul64To128.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_mul64To128.c rename to FEXCore/Source/Common/SoftFloat-3e/s_mul64To128.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_normRoundPackToExtF80.c b/FEXCore/Source/Common/SoftFloat-3e/s_normRoundPackToExtF80.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_normRoundPackToExtF80.c rename to FEXCore/Source/Common/SoftFloat-3e/s_normRoundPackToExtF80.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_normSubnormalExtF80Sig.c b/FEXCore/Source/Common/SoftFloat-3e/s_normSubnormalExtF80Sig.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_normSubnormalExtF80Sig.c rename to FEXCore/Source/Common/SoftFloat-3e/s_normSubnormalExtF80Sig.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_normSubnormalF128Sig.c b/FEXCore/Source/Common/SoftFloat-3e/s_normSubnormalF128Sig.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_normSubnormalF128Sig.c rename to FEXCore/Source/Common/SoftFloat-3e/s_normSubnormalF128Sig.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_normSubnormalF128SigM.c b/FEXCore/Source/Common/SoftFloat-3e/s_normSubnormalF128SigM.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_normSubnormalF128SigM.c rename to FEXCore/Source/Common/SoftFloat-3e/s_normSubnormalF128SigM.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_normSubnormalF32Sig.c b/FEXCore/Source/Common/SoftFloat-3e/s_normSubnormalF32Sig.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_normSubnormalF32Sig.c rename to FEXCore/Source/Common/SoftFloat-3e/s_normSubnormalF32Sig.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_normSubnormalF64Sig.c b/FEXCore/Source/Common/SoftFloat-3e/s_normSubnormalF64Sig.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_normSubnormalF64Sig.c rename to FEXCore/Source/Common/SoftFloat-3e/s_normSubnormalF64Sig.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_propagateNaNExtF80UI.c b/FEXCore/Source/Common/SoftFloat-3e/s_propagateNaNExtF80UI.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_propagateNaNExtF80UI.c rename to FEXCore/Source/Common/SoftFloat-3e/s_propagateNaNExtF80UI.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_roundPackToExtF80.c b/FEXCore/Source/Common/SoftFloat-3e/s_roundPackToExtF80.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_roundPackToExtF80.c rename to FEXCore/Source/Common/SoftFloat-3e/s_roundPackToExtF80.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_roundPackToF32.c b/FEXCore/Source/Common/SoftFloat-3e/s_roundPackToF32.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_roundPackToF32.c rename to FEXCore/Source/Common/SoftFloat-3e/s_roundPackToF32.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_roundPackToF64.c b/FEXCore/Source/Common/SoftFloat-3e/s_roundPackToF64.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_roundPackToF64.c rename to FEXCore/Source/Common/SoftFloat-3e/s_roundPackToF64.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_roundToI32.c b/FEXCore/Source/Common/SoftFloat-3e/s_roundToI32.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_roundToI32.c rename to FEXCore/Source/Common/SoftFloat-3e/s_roundToI32.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_roundToI64.c b/FEXCore/Source/Common/SoftFloat-3e/s_roundToI64.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_roundToI64.c rename to FEXCore/Source/Common/SoftFloat-3e/s_roundToI64.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_roundToUI64.c b/FEXCore/Source/Common/SoftFloat-3e/s_roundToUI64.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_roundToUI64.c rename to FEXCore/Source/Common/SoftFloat-3e/s_roundToUI64.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_shiftRightJam128.c b/FEXCore/Source/Common/SoftFloat-3e/s_shiftRightJam128.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_shiftRightJam128.c rename to FEXCore/Source/Common/SoftFloat-3e/s_shiftRightJam128.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_shiftRightJam128Extra.c b/FEXCore/Source/Common/SoftFloat-3e/s_shiftRightJam128Extra.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_shiftRightJam128Extra.c rename to FEXCore/Source/Common/SoftFloat-3e/s_shiftRightJam128Extra.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_shiftRightJam32.c b/FEXCore/Source/Common/SoftFloat-3e/s_shiftRightJam32.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_shiftRightJam32.c rename to FEXCore/Source/Common/SoftFloat-3e/s_shiftRightJam32.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_shiftRightJam64.c b/FEXCore/Source/Common/SoftFloat-3e/s_shiftRightJam64.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_shiftRightJam64.c rename to FEXCore/Source/Common/SoftFloat-3e/s_shiftRightJam64.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_shiftRightJam64Extra.c b/FEXCore/Source/Common/SoftFloat-3e/s_shiftRightJam64Extra.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_shiftRightJam64Extra.c rename to FEXCore/Source/Common/SoftFloat-3e/s_shiftRightJam64Extra.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_shortShiftLeft128.c b/FEXCore/Source/Common/SoftFloat-3e/s_shortShiftLeft128.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_shortShiftLeft128.c rename to FEXCore/Source/Common/SoftFloat-3e/s_shortShiftLeft128.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_shortShiftRight128.c b/FEXCore/Source/Common/SoftFloat-3e/s_shortShiftRight128.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_shortShiftRight128.c rename to FEXCore/Source/Common/SoftFloat-3e/s_shortShiftRight128.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_shortShiftRightJam64.c b/FEXCore/Source/Common/SoftFloat-3e/s_shortShiftRightJam64.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_shortShiftRightJam64.c rename to FEXCore/Source/Common/SoftFloat-3e/s_shortShiftRightJam64.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_shortShiftRightJam64Extra.c b/FEXCore/Source/Common/SoftFloat-3e/s_shortShiftRightJam64Extra.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_shortShiftRightJam64Extra.c rename to FEXCore/Source/Common/SoftFloat-3e/s_shortShiftRightJam64Extra.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_sub128.c b/FEXCore/Source/Common/SoftFloat-3e/s_sub128.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_sub128.c rename to FEXCore/Source/Common/SoftFloat-3e/s_sub128.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/s_subMagsExtF80.c b/FEXCore/Source/Common/SoftFloat-3e/s_subMagsExtF80.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/s_subMagsExtF80.c rename to FEXCore/Source/Common/SoftFloat-3e/s_subMagsExtF80.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/softfloat.h b/FEXCore/Source/Common/SoftFloat-3e/softfloat.h similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/softfloat.h rename to FEXCore/Source/Common/SoftFloat-3e/softfloat.h diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/softfloat_raiseFlags.c b/FEXCore/Source/Common/SoftFloat-3e/softfloat_raiseFlags.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/softfloat_raiseFlags.c rename to FEXCore/Source/Common/SoftFloat-3e/softfloat_raiseFlags.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/softfloat_state.c b/FEXCore/Source/Common/SoftFloat-3e/softfloat_state.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/softfloat_state.c rename to FEXCore/Source/Common/SoftFloat-3e/softfloat_state.c diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/softfloat_types.h b/FEXCore/Source/Common/SoftFloat-3e/softfloat_types.h similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/softfloat_types.h rename to FEXCore/Source/Common/SoftFloat-3e/softfloat_types.h diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/specialize.h b/FEXCore/Source/Common/SoftFloat-3e/specialize.h similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/specialize.h rename to FEXCore/Source/Common/SoftFloat-3e/specialize.h diff --git a/External/FEXCore/Source/Common/SoftFloat-3e/ui64_to_extF80.c b/FEXCore/Source/Common/SoftFloat-3e/ui64_to_extF80.c similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat-3e/ui64_to_extF80.c rename to FEXCore/Source/Common/SoftFloat-3e/ui64_to_extF80.c diff --git a/External/FEXCore/Source/Common/SoftFloat.h b/FEXCore/Source/Common/SoftFloat.h similarity index 100% rename from External/FEXCore/Source/Common/SoftFloat.h rename to FEXCore/Source/Common/SoftFloat.h diff --git a/External/FEXCore/Source/Common/StringConv.h b/FEXCore/Source/Common/StringConv.h similarity index 100% rename from External/FEXCore/Source/Common/StringConv.h rename to FEXCore/Source/Common/StringConv.h diff --git a/External/FEXCore/Source/Common/StringUtils.h b/FEXCore/Source/Common/StringUtils.h similarity index 100% rename from External/FEXCore/Source/Common/StringUtils.h rename to FEXCore/Source/Common/StringUtils.h diff --git a/External/FEXCore/Source/Interface/Config/Config.cpp b/FEXCore/Source/Interface/Config/Config.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Config/Config.cpp rename to FEXCore/Source/Interface/Config/Config.cpp diff --git a/External/FEXCore/Source/Interface/Config/Config.json.in b/FEXCore/Source/Interface/Config/Config.json.in similarity index 100% rename from External/FEXCore/Source/Interface/Config/Config.json.in rename to FEXCore/Source/Interface/Config/Config.json.in diff --git a/External/FEXCore/Source/Interface/Context/Context.cpp b/FEXCore/Source/Interface/Context/Context.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Context/Context.cpp rename to FEXCore/Source/Interface/Context/Context.cpp diff --git a/External/FEXCore/Source/Interface/Context/Context.h b/FEXCore/Source/Interface/Context/Context.h similarity index 100% rename from External/FEXCore/Source/Interface/Context/Context.h rename to FEXCore/Source/Interface/Context/Context.h diff --git a/External/FEXCore/Source/Interface/Core/ArchHelpers/Arm64Emitter.cpp b/FEXCore/Source/Interface/Core/ArchHelpers/Arm64Emitter.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/ArchHelpers/Arm64Emitter.cpp rename to FEXCore/Source/Interface/Core/ArchHelpers/Arm64Emitter.cpp diff --git a/External/FEXCore/Source/Interface/Core/ArchHelpers/Arm64Emitter.h b/FEXCore/Source/Interface/Core/ArchHelpers/Arm64Emitter.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/ArchHelpers/Arm64Emitter.h rename to FEXCore/Source/Interface/Core/ArchHelpers/Arm64Emitter.h diff --git a/External/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/ALUOps.inl b/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/ALUOps.inl similarity index 100% rename from External/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/ALUOps.inl rename to FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/ALUOps.inl diff --git a/External/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/ASIMDOps.inl b/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/ASIMDOps.inl similarity index 100% rename from External/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/ASIMDOps.inl rename to FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/ASIMDOps.inl diff --git a/External/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/BranchOps.inl b/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/BranchOps.inl similarity index 100% rename from External/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/BranchOps.inl rename to FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/BranchOps.inl diff --git a/External/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/Buffer.h b/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/Buffer.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/Buffer.h rename to FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/Buffer.h diff --git a/External/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/Emitter.h b/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/Emitter.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/Emitter.h rename to FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/Emitter.h diff --git a/External/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/LoadstoreOps.inl b/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/LoadstoreOps.inl similarity index 100% rename from External/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/LoadstoreOps.inl rename to FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/LoadstoreOps.inl diff --git a/External/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/Registers.h b/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/Registers.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/Registers.h rename to FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/Registers.h diff --git a/External/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/SVEOps.inl b/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/SVEOps.inl similarity index 100% rename from External/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/SVEOps.inl rename to FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/SVEOps.inl diff --git a/External/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/ScalarOps.inl b/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/ScalarOps.inl similarity index 100% rename from External/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/ScalarOps.inl rename to FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/ScalarOps.inl diff --git a/External/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/SystemOps.inl b/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/SystemOps.inl similarity index 100% rename from External/FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/SystemOps.inl rename to FEXCore/Source/Interface/Core/ArchHelpers/CodeEmitter/SystemOps.inl diff --git a/External/FEXCore/Source/Interface/Core/BlockSamplingData.cpp b/FEXCore/Source/Interface/Core/BlockSamplingData.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/BlockSamplingData.cpp rename to FEXCore/Source/Interface/Core/BlockSamplingData.cpp diff --git a/External/FEXCore/Source/Interface/Core/BlockSamplingData.h b/FEXCore/Source/Interface/Core/BlockSamplingData.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/BlockSamplingData.h rename to FEXCore/Source/Interface/Core/BlockSamplingData.h diff --git a/External/FEXCore/Source/Interface/Core/CPUBackend.cpp b/FEXCore/Source/Interface/Core/CPUBackend.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/CPUBackend.cpp rename to FEXCore/Source/Interface/Core/CPUBackend.cpp diff --git a/External/FEXCore/Source/Interface/Core/CPUID.cpp b/FEXCore/Source/Interface/Core/CPUID.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/CPUID.cpp rename to FEXCore/Source/Interface/Core/CPUID.cpp diff --git a/External/FEXCore/Source/Interface/Core/CPUID.h b/FEXCore/Source/Interface/Core/CPUID.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/CPUID.h rename to FEXCore/Source/Interface/Core/CPUID.h diff --git a/External/FEXCore/Source/Interface/Core/Core.cpp b/FEXCore/Source/Interface/Core/Core.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/Core.cpp rename to FEXCore/Source/Interface/Core/Core.cpp diff --git a/External/FEXCore/Source/Interface/Core/DebugData.h b/FEXCore/Source/Interface/Core/DebugData.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/DebugData.h rename to FEXCore/Source/Interface/Core/DebugData.h diff --git a/External/FEXCore/Source/Interface/Core/Dispatcher/Arm64Dispatcher.cpp b/FEXCore/Source/Interface/Core/Dispatcher/Arm64Dispatcher.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/Dispatcher/Arm64Dispatcher.cpp rename to FEXCore/Source/Interface/Core/Dispatcher/Arm64Dispatcher.cpp diff --git a/External/FEXCore/Source/Interface/Core/Dispatcher/Arm64Dispatcher.h b/FEXCore/Source/Interface/Core/Dispatcher/Arm64Dispatcher.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/Dispatcher/Arm64Dispatcher.h rename to FEXCore/Source/Interface/Core/Dispatcher/Arm64Dispatcher.h diff --git a/External/FEXCore/Source/Interface/Core/Dispatcher/Dispatcher.cpp b/FEXCore/Source/Interface/Core/Dispatcher/Dispatcher.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/Dispatcher/Dispatcher.cpp rename to FEXCore/Source/Interface/Core/Dispatcher/Dispatcher.cpp diff --git a/External/FEXCore/Source/Interface/Core/Dispatcher/Dispatcher.h b/FEXCore/Source/Interface/Core/Dispatcher/Dispatcher.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/Dispatcher/Dispatcher.h rename to FEXCore/Source/Interface/Core/Dispatcher/Dispatcher.h diff --git a/External/FEXCore/Source/Interface/Core/Dispatcher/X86Dispatcher.cpp b/FEXCore/Source/Interface/Core/Dispatcher/X86Dispatcher.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/Dispatcher/X86Dispatcher.cpp rename to FEXCore/Source/Interface/Core/Dispatcher/X86Dispatcher.cpp diff --git a/External/FEXCore/Source/Interface/Core/Dispatcher/X86Dispatcher.h b/FEXCore/Source/Interface/Core/Dispatcher/X86Dispatcher.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/Dispatcher/X86Dispatcher.h rename to FEXCore/Source/Interface/Core/Dispatcher/X86Dispatcher.h diff --git a/External/FEXCore/Source/Interface/Core/Frontend.cpp b/FEXCore/Source/Interface/Core/Frontend.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/Frontend.cpp rename to FEXCore/Source/Interface/Core/Frontend.cpp diff --git a/External/FEXCore/Source/Interface/Core/Frontend.h b/FEXCore/Source/Interface/Core/Frontend.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/Frontend.h rename to FEXCore/Source/Interface/Core/Frontend.h diff --git a/External/FEXCore/Source/Interface/Core/GdbServer.cpp b/FEXCore/Source/Interface/Core/GdbServer.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/GdbServer.cpp rename to FEXCore/Source/Interface/Core/GdbServer.cpp diff --git a/External/FEXCore/Source/Interface/Core/GdbServer.h b/FEXCore/Source/Interface/Core/GdbServer.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/GdbServer.h rename to FEXCore/Source/Interface/Core/GdbServer.h diff --git a/External/FEXCore/Source/Interface/Core/HostFeatures.cpp b/FEXCore/Source/Interface/Core/HostFeatures.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/HostFeatures.cpp rename to FEXCore/Source/Interface/Core/HostFeatures.cpp diff --git a/External/FEXCore/Source/Interface/Core/InternalThreadState.h b/FEXCore/Source/Interface/Core/InternalThreadState.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/InternalThreadState.h rename to FEXCore/Source/Interface/Core/InternalThreadState.h diff --git a/External/FEXCore/Source/Interface/Core/Interpreter/ALUOps.cpp b/FEXCore/Source/Interface/Core/Interpreter/ALUOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/Interpreter/ALUOps.cpp rename to FEXCore/Source/Interface/Core/Interpreter/ALUOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/Interpreter/AtomicOps.cpp b/FEXCore/Source/Interface/Core/Interpreter/AtomicOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/Interpreter/AtomicOps.cpp rename to FEXCore/Source/Interface/Core/Interpreter/AtomicOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/Interpreter/BranchOps.cpp b/FEXCore/Source/Interface/Core/Interpreter/BranchOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/Interpreter/BranchOps.cpp rename to FEXCore/Source/Interface/Core/Interpreter/BranchOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/Interpreter/ConversionOps.cpp b/FEXCore/Source/Interface/Core/Interpreter/ConversionOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/Interpreter/ConversionOps.cpp rename to FEXCore/Source/Interface/Core/Interpreter/ConversionOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/Interpreter/EncryptionOps.cpp b/FEXCore/Source/Interface/Core/Interpreter/EncryptionOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/Interpreter/EncryptionOps.cpp rename to FEXCore/Source/Interface/Core/Interpreter/EncryptionOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/Interpreter/F80Ops.cpp b/FEXCore/Source/Interface/Core/Interpreter/F80Ops.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/Interpreter/F80Ops.cpp rename to FEXCore/Source/Interface/Core/Interpreter/F80Ops.cpp diff --git a/External/FEXCore/Source/Interface/Core/Interpreter/Fallbacks/F80Fallbacks.h b/FEXCore/Source/Interface/Core/Interpreter/Fallbacks/F80Fallbacks.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/Interpreter/Fallbacks/F80Fallbacks.h rename to FEXCore/Source/Interface/Core/Interpreter/Fallbacks/F80Fallbacks.h diff --git a/External/FEXCore/Source/Interface/Core/Interpreter/Fallbacks/FallbackOpHandler.h b/FEXCore/Source/Interface/Core/Interpreter/Fallbacks/FallbackOpHandler.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/Interpreter/Fallbacks/FallbackOpHandler.h rename to FEXCore/Source/Interface/Core/Interpreter/Fallbacks/FallbackOpHandler.h diff --git a/External/FEXCore/Source/Interface/Core/Interpreter/Fallbacks/InterpreterFallbacks.cpp b/FEXCore/Source/Interface/Core/Interpreter/Fallbacks/InterpreterFallbacks.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/Interpreter/Fallbacks/InterpreterFallbacks.cpp rename to FEXCore/Source/Interface/Core/Interpreter/Fallbacks/InterpreterFallbacks.cpp diff --git a/External/FEXCore/Source/Interface/Core/Interpreter/Fallbacks/VectorFallbacks.h b/FEXCore/Source/Interface/Core/Interpreter/Fallbacks/VectorFallbacks.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/Interpreter/Fallbacks/VectorFallbacks.h rename to FEXCore/Source/Interface/Core/Interpreter/Fallbacks/VectorFallbacks.h diff --git a/External/FEXCore/Source/Interface/Core/Interpreter/FlagOps.cpp b/FEXCore/Source/Interface/Core/Interpreter/FlagOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/Interpreter/FlagOps.cpp rename to FEXCore/Source/Interface/Core/Interpreter/FlagOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/Interpreter/InterpreterClass.h b/FEXCore/Source/Interface/Core/Interpreter/InterpreterClass.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/Interpreter/InterpreterClass.h rename to FEXCore/Source/Interface/Core/Interpreter/InterpreterClass.h diff --git a/External/FEXCore/Source/Interface/Core/Interpreter/InterpreterCore.cpp b/FEXCore/Source/Interface/Core/Interpreter/InterpreterCore.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/Interpreter/InterpreterCore.cpp rename to FEXCore/Source/Interface/Core/Interpreter/InterpreterCore.cpp diff --git a/External/FEXCore/Source/Interface/Core/Interpreter/InterpreterCore.h b/FEXCore/Source/Interface/Core/Interpreter/InterpreterCore.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/Interpreter/InterpreterCore.h rename to FEXCore/Source/Interface/Core/Interpreter/InterpreterCore.h diff --git a/External/FEXCore/Source/Interface/Core/Interpreter/InterpreterDefines.h b/FEXCore/Source/Interface/Core/Interpreter/InterpreterDefines.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/Interpreter/InterpreterDefines.h rename to FEXCore/Source/Interface/Core/Interpreter/InterpreterDefines.h diff --git a/External/FEXCore/Source/Interface/Core/Interpreter/InterpreterOps.cpp b/FEXCore/Source/Interface/Core/Interpreter/InterpreterOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/Interpreter/InterpreterOps.cpp rename to FEXCore/Source/Interface/Core/Interpreter/InterpreterOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/Interpreter/InterpreterOps.h b/FEXCore/Source/Interface/Core/Interpreter/InterpreterOps.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/Interpreter/InterpreterOps.h rename to FEXCore/Source/Interface/Core/Interpreter/InterpreterOps.h diff --git a/External/FEXCore/Source/Interface/Core/Interpreter/MemoryOps.cpp b/FEXCore/Source/Interface/Core/Interpreter/MemoryOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/Interpreter/MemoryOps.cpp rename to FEXCore/Source/Interface/Core/Interpreter/MemoryOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/Interpreter/MiscOps.cpp b/FEXCore/Source/Interface/Core/Interpreter/MiscOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/Interpreter/MiscOps.cpp rename to FEXCore/Source/Interface/Core/Interpreter/MiscOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/Interpreter/MoveOps.cpp b/FEXCore/Source/Interface/Core/Interpreter/MoveOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/Interpreter/MoveOps.cpp rename to FEXCore/Source/Interface/Core/Interpreter/MoveOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/Interpreter/VectorOps.cpp b/FEXCore/Source/Interface/Core/Interpreter/VectorOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/Interpreter/VectorOps.cpp rename to FEXCore/Source/Interface/Core/Interpreter/VectorOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/Arm64/ALUOps.cpp b/FEXCore/Source/Interface/Core/JIT/Arm64/ALUOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/Arm64/ALUOps.cpp rename to FEXCore/Source/Interface/Core/JIT/Arm64/ALUOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/Arm64/Arm64Relocations.cpp b/FEXCore/Source/Interface/Core/JIT/Arm64/Arm64Relocations.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/Arm64/Arm64Relocations.cpp rename to FEXCore/Source/Interface/Core/JIT/Arm64/Arm64Relocations.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/Arm64/AtomicOps.cpp b/FEXCore/Source/Interface/Core/JIT/Arm64/AtomicOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/Arm64/AtomicOps.cpp rename to FEXCore/Source/Interface/Core/JIT/Arm64/AtomicOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/Arm64/BranchOps.cpp b/FEXCore/Source/Interface/Core/JIT/Arm64/BranchOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/Arm64/BranchOps.cpp rename to FEXCore/Source/Interface/Core/JIT/Arm64/BranchOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/Arm64/ConversionOps.cpp b/FEXCore/Source/Interface/Core/JIT/Arm64/ConversionOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/Arm64/ConversionOps.cpp rename to FEXCore/Source/Interface/Core/JIT/Arm64/ConversionOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/Arm64/EncryptionOps.cpp b/FEXCore/Source/Interface/Core/JIT/Arm64/EncryptionOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/Arm64/EncryptionOps.cpp rename to FEXCore/Source/Interface/Core/JIT/Arm64/EncryptionOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/Arm64/FlagOps.cpp b/FEXCore/Source/Interface/Core/JIT/Arm64/FlagOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/Arm64/FlagOps.cpp rename to FEXCore/Source/Interface/Core/JIT/Arm64/FlagOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/Arm64/JIT.cpp b/FEXCore/Source/Interface/Core/JIT/Arm64/JIT.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/Arm64/JIT.cpp rename to FEXCore/Source/Interface/Core/JIT/Arm64/JIT.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/Arm64/JITClass.h b/FEXCore/Source/Interface/Core/JIT/Arm64/JITClass.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/Arm64/JITClass.h rename to FEXCore/Source/Interface/Core/JIT/Arm64/JITClass.h diff --git a/External/FEXCore/Source/Interface/Core/JIT/Arm64/MemoryOps.cpp b/FEXCore/Source/Interface/Core/JIT/Arm64/MemoryOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/Arm64/MemoryOps.cpp rename to FEXCore/Source/Interface/Core/JIT/Arm64/MemoryOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/Arm64/MiscOps.cpp b/FEXCore/Source/Interface/Core/JIT/Arm64/MiscOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/Arm64/MiscOps.cpp rename to FEXCore/Source/Interface/Core/JIT/Arm64/MiscOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/Arm64/MoveOps.cpp b/FEXCore/Source/Interface/Core/JIT/Arm64/MoveOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/Arm64/MoveOps.cpp rename to FEXCore/Source/Interface/Core/JIT/Arm64/MoveOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/Arm64/VectorOps.cpp b/FEXCore/Source/Interface/Core/JIT/Arm64/VectorOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/Arm64/VectorOps.cpp rename to FEXCore/Source/Interface/Core/JIT/Arm64/VectorOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/JITCore.h b/FEXCore/Source/Interface/Core/JIT/JITCore.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/JITCore.h rename to FEXCore/Source/Interface/Core/JIT/JITCore.h diff --git a/External/FEXCore/Source/Interface/Core/JIT/x86_64/ALUOps.cpp b/FEXCore/Source/Interface/Core/JIT/x86_64/ALUOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/x86_64/ALUOps.cpp rename to FEXCore/Source/Interface/Core/JIT/x86_64/ALUOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/x86_64/AtomicOps.cpp b/FEXCore/Source/Interface/Core/JIT/x86_64/AtomicOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/x86_64/AtomicOps.cpp rename to FEXCore/Source/Interface/Core/JIT/x86_64/AtomicOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/x86_64/BranchOps.cpp b/FEXCore/Source/Interface/Core/JIT/x86_64/BranchOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/x86_64/BranchOps.cpp rename to FEXCore/Source/Interface/Core/JIT/x86_64/BranchOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/x86_64/ConversionOps.cpp b/FEXCore/Source/Interface/Core/JIT/x86_64/ConversionOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/x86_64/ConversionOps.cpp rename to FEXCore/Source/Interface/Core/JIT/x86_64/ConversionOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/x86_64/EncryptionOps.cpp b/FEXCore/Source/Interface/Core/JIT/x86_64/EncryptionOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/x86_64/EncryptionOps.cpp rename to FEXCore/Source/Interface/Core/JIT/x86_64/EncryptionOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/x86_64/FlagOps.cpp b/FEXCore/Source/Interface/Core/JIT/x86_64/FlagOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/x86_64/FlagOps.cpp rename to FEXCore/Source/Interface/Core/JIT/x86_64/FlagOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/x86_64/JIT.cpp b/FEXCore/Source/Interface/Core/JIT/x86_64/JIT.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/x86_64/JIT.cpp rename to FEXCore/Source/Interface/Core/JIT/x86_64/JIT.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/x86_64/JITClass.h b/FEXCore/Source/Interface/Core/JIT/x86_64/JITClass.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/x86_64/JITClass.h rename to FEXCore/Source/Interface/Core/JIT/x86_64/JITClass.h diff --git a/External/FEXCore/Source/Interface/Core/JIT/x86_64/MemoryOps.cpp b/FEXCore/Source/Interface/Core/JIT/x86_64/MemoryOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/x86_64/MemoryOps.cpp rename to FEXCore/Source/Interface/Core/JIT/x86_64/MemoryOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/x86_64/MiscOps.cpp b/FEXCore/Source/Interface/Core/JIT/x86_64/MiscOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/x86_64/MiscOps.cpp rename to FEXCore/Source/Interface/Core/JIT/x86_64/MiscOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/x86_64/MoveOps.cpp b/FEXCore/Source/Interface/Core/JIT/x86_64/MoveOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/x86_64/MoveOps.cpp rename to FEXCore/Source/Interface/Core/JIT/x86_64/MoveOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/x86_64/VectorOps.cpp b/FEXCore/Source/Interface/Core/JIT/x86_64/VectorOps.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/x86_64/VectorOps.cpp rename to FEXCore/Source/Interface/Core/JIT/x86_64/VectorOps.cpp diff --git a/External/FEXCore/Source/Interface/Core/JIT/x86_64/x64Relocations.cpp b/FEXCore/Source/Interface/Core/JIT/x86_64/x64Relocations.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/JIT/x86_64/x64Relocations.cpp rename to FEXCore/Source/Interface/Core/JIT/x86_64/x64Relocations.cpp diff --git a/External/FEXCore/Source/Interface/Core/LookupCache.cpp b/FEXCore/Source/Interface/Core/LookupCache.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/LookupCache.cpp rename to FEXCore/Source/Interface/Core/LookupCache.cpp diff --git a/External/FEXCore/Source/Interface/Core/LookupCache.h b/FEXCore/Source/Interface/Core/LookupCache.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/LookupCache.h rename to FEXCore/Source/Interface/Core/LookupCache.h diff --git a/External/FEXCore/Source/Interface/Core/ObjectCache/CodeObjectSerializationConfig.h b/FEXCore/Source/Interface/Core/ObjectCache/CodeObjectSerializationConfig.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/ObjectCache/CodeObjectSerializationConfig.h rename to FEXCore/Source/Interface/Core/ObjectCache/CodeObjectSerializationConfig.h diff --git a/External/FEXCore/Source/Interface/Core/ObjectCache/JobHandling.cpp b/FEXCore/Source/Interface/Core/ObjectCache/JobHandling.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/ObjectCache/JobHandling.cpp rename to FEXCore/Source/Interface/Core/ObjectCache/JobHandling.cpp diff --git a/External/FEXCore/Source/Interface/Core/ObjectCache/NamedRegionObjectHandler.cpp b/FEXCore/Source/Interface/Core/ObjectCache/NamedRegionObjectHandler.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/ObjectCache/NamedRegionObjectHandler.cpp rename to FEXCore/Source/Interface/Core/ObjectCache/NamedRegionObjectHandler.cpp diff --git a/External/FEXCore/Source/Interface/Core/ObjectCache/ObjectCacheService.cpp b/FEXCore/Source/Interface/Core/ObjectCache/ObjectCacheService.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/ObjectCache/ObjectCacheService.cpp rename to FEXCore/Source/Interface/Core/ObjectCache/ObjectCacheService.cpp diff --git a/External/FEXCore/Source/Interface/Core/ObjectCache/ObjectCacheService.h b/FEXCore/Source/Interface/Core/ObjectCache/ObjectCacheService.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/ObjectCache/ObjectCacheService.h rename to FEXCore/Source/Interface/Core/ObjectCache/ObjectCacheService.h diff --git a/External/FEXCore/Source/Interface/Core/ObjectCache/Relocations.h b/FEXCore/Source/Interface/Core/ObjectCache/Relocations.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/ObjectCache/Relocations.h rename to FEXCore/Source/Interface/Core/ObjectCache/Relocations.h diff --git a/External/FEXCore/Source/Interface/Core/OpcodeDispatcher.cpp b/FEXCore/Source/Interface/Core/OpcodeDispatcher.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/OpcodeDispatcher.cpp rename to FEXCore/Source/Interface/Core/OpcodeDispatcher.cpp diff --git a/External/FEXCore/Source/Interface/Core/OpcodeDispatcher.h b/FEXCore/Source/Interface/Core/OpcodeDispatcher.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/OpcodeDispatcher.h rename to FEXCore/Source/Interface/Core/OpcodeDispatcher.h diff --git a/External/FEXCore/Source/Interface/Core/OpcodeDispatcher/Crypto.cpp b/FEXCore/Source/Interface/Core/OpcodeDispatcher/Crypto.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/OpcodeDispatcher/Crypto.cpp rename to FEXCore/Source/Interface/Core/OpcodeDispatcher/Crypto.cpp diff --git a/External/FEXCore/Source/Interface/Core/OpcodeDispatcher/Flags.cpp b/FEXCore/Source/Interface/Core/OpcodeDispatcher/Flags.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/OpcodeDispatcher/Flags.cpp rename to FEXCore/Source/Interface/Core/OpcodeDispatcher/Flags.cpp diff --git a/External/FEXCore/Source/Interface/Core/OpcodeDispatcher/Vector.cpp b/FEXCore/Source/Interface/Core/OpcodeDispatcher/Vector.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/OpcodeDispatcher/Vector.cpp rename to FEXCore/Source/Interface/Core/OpcodeDispatcher/Vector.cpp diff --git a/External/FEXCore/Source/Interface/Core/OpcodeDispatcher/X87.cpp b/FEXCore/Source/Interface/Core/OpcodeDispatcher/X87.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/OpcodeDispatcher/X87.cpp rename to FEXCore/Source/Interface/Core/OpcodeDispatcher/X87.cpp diff --git a/External/FEXCore/Source/Interface/Core/OpcodeDispatcher/X87F64.cpp b/FEXCore/Source/Interface/Core/OpcodeDispatcher/X87F64.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/OpcodeDispatcher/X87F64.cpp rename to FEXCore/Source/Interface/Core/OpcodeDispatcher/X87F64.cpp diff --git a/External/FEXCore/Source/Interface/Core/SignalDelegator.cpp b/FEXCore/Source/Interface/Core/SignalDelegator.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/SignalDelegator.cpp rename to FEXCore/Source/Interface/Core/SignalDelegator.cpp diff --git a/External/FEXCore/Source/Interface/Core/VSyscall/VSyscall.inc b/FEXCore/Source/Interface/Core/VSyscall/VSyscall.inc similarity index 100% rename from External/FEXCore/Source/Interface/Core/VSyscall/VSyscall.inc rename to FEXCore/Source/Interface/Core/VSyscall/VSyscall.inc diff --git a/External/FEXCore/Source/Interface/Core/X86DebugInfo.cpp b/FEXCore/Source/Interface/Core/X86DebugInfo.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/X86DebugInfo.cpp rename to FEXCore/Source/Interface/Core/X86DebugInfo.cpp diff --git a/External/FEXCore/Source/Interface/Core/X86HelperGen.cpp b/FEXCore/Source/Interface/Core/X86HelperGen.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/X86HelperGen.cpp rename to FEXCore/Source/Interface/Core/X86HelperGen.cpp diff --git a/External/FEXCore/Source/Interface/Core/X86HelperGen.h b/FEXCore/Source/Interface/Core/X86HelperGen.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/X86HelperGen.h rename to FEXCore/Source/Interface/Core/X86HelperGen.h diff --git a/External/FEXCore/Source/Interface/Core/X86Tables.cpp b/FEXCore/Source/Interface/Core/X86Tables.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/X86Tables.cpp rename to FEXCore/Source/Interface/Core/X86Tables.cpp diff --git a/External/FEXCore/Source/Interface/Core/X86Tables/BaseTables.cpp b/FEXCore/Source/Interface/Core/X86Tables/BaseTables.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/X86Tables/BaseTables.cpp rename to FEXCore/Source/Interface/Core/X86Tables/BaseTables.cpp diff --git a/External/FEXCore/Source/Interface/Core/X86Tables/DDDTables.cpp b/FEXCore/Source/Interface/Core/X86Tables/DDDTables.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/X86Tables/DDDTables.cpp rename to FEXCore/Source/Interface/Core/X86Tables/DDDTables.cpp diff --git a/External/FEXCore/Source/Interface/Core/X86Tables/EVEXTables.cpp b/FEXCore/Source/Interface/Core/X86Tables/EVEXTables.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/X86Tables/EVEXTables.cpp rename to FEXCore/Source/Interface/Core/X86Tables/EVEXTables.cpp diff --git a/External/FEXCore/Source/Interface/Core/X86Tables/H0F38Tables.cpp b/FEXCore/Source/Interface/Core/X86Tables/H0F38Tables.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/X86Tables/H0F38Tables.cpp rename to FEXCore/Source/Interface/Core/X86Tables/H0F38Tables.cpp diff --git a/External/FEXCore/Source/Interface/Core/X86Tables/H0F3ATables.cpp b/FEXCore/Source/Interface/Core/X86Tables/H0F3ATables.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/X86Tables/H0F3ATables.cpp rename to FEXCore/Source/Interface/Core/X86Tables/H0F3ATables.cpp diff --git a/External/FEXCore/Source/Interface/Core/X86Tables/PrimaryGroupTables.cpp b/FEXCore/Source/Interface/Core/X86Tables/PrimaryGroupTables.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/X86Tables/PrimaryGroupTables.cpp rename to FEXCore/Source/Interface/Core/X86Tables/PrimaryGroupTables.cpp diff --git a/External/FEXCore/Source/Interface/Core/X86Tables/SecondaryGroupTables.cpp b/FEXCore/Source/Interface/Core/X86Tables/SecondaryGroupTables.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/X86Tables/SecondaryGroupTables.cpp rename to FEXCore/Source/Interface/Core/X86Tables/SecondaryGroupTables.cpp diff --git a/External/FEXCore/Source/Interface/Core/X86Tables/SecondaryModRMTables.cpp b/FEXCore/Source/Interface/Core/X86Tables/SecondaryModRMTables.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/X86Tables/SecondaryModRMTables.cpp rename to FEXCore/Source/Interface/Core/X86Tables/SecondaryModRMTables.cpp diff --git a/External/FEXCore/Source/Interface/Core/X86Tables/SecondaryTables.cpp b/FEXCore/Source/Interface/Core/X86Tables/SecondaryTables.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/X86Tables/SecondaryTables.cpp rename to FEXCore/Source/Interface/Core/X86Tables/SecondaryTables.cpp diff --git a/External/FEXCore/Source/Interface/Core/X86Tables/VEXTables.cpp b/FEXCore/Source/Interface/Core/X86Tables/VEXTables.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/X86Tables/VEXTables.cpp rename to FEXCore/Source/Interface/Core/X86Tables/VEXTables.cpp diff --git a/External/FEXCore/Source/Interface/Core/X86Tables/X86Tables.h b/FEXCore/Source/Interface/Core/X86Tables/X86Tables.h similarity index 100% rename from External/FEXCore/Source/Interface/Core/X86Tables/X86Tables.h rename to FEXCore/Source/Interface/Core/X86Tables/X86Tables.h diff --git a/External/FEXCore/Source/Interface/Core/X86Tables/X87Tables.cpp b/FEXCore/Source/Interface/Core/X86Tables/X87Tables.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/X86Tables/X87Tables.cpp rename to FEXCore/Source/Interface/Core/X86Tables/X87Tables.cpp diff --git a/External/FEXCore/Source/Interface/Core/X86Tables/XOPTables.cpp b/FEXCore/Source/Interface/Core/X86Tables/XOPTables.cpp similarity index 100% rename from External/FEXCore/Source/Interface/Core/X86Tables/XOPTables.cpp rename to FEXCore/Source/Interface/Core/X86Tables/XOPTables.cpp diff --git a/External/FEXCore/Source/Interface/GDBJIT/GDBJIT.cpp b/FEXCore/Source/Interface/GDBJIT/GDBJIT.cpp similarity index 100% rename from External/FEXCore/Source/Interface/GDBJIT/GDBJIT.cpp rename to FEXCore/Source/Interface/GDBJIT/GDBJIT.cpp diff --git a/External/FEXCore/Source/Interface/GDBJIT/GDBJIT.h b/FEXCore/Source/Interface/GDBJIT/GDBJIT.h similarity index 100% rename from External/FEXCore/Source/Interface/GDBJIT/GDBJIT.h rename to FEXCore/Source/Interface/GDBJIT/GDBJIT.h diff --git a/External/FEXCore/Source/Interface/HLE/Thunks/Thunks.cpp b/FEXCore/Source/Interface/HLE/Thunks/Thunks.cpp similarity index 100% rename from External/FEXCore/Source/Interface/HLE/Thunks/Thunks.cpp rename to FEXCore/Source/Interface/HLE/Thunks/Thunks.cpp diff --git a/External/FEXCore/Source/Interface/HLE/Thunks/Thunks.h b/FEXCore/Source/Interface/HLE/Thunks/Thunks.h similarity index 100% rename from External/FEXCore/Source/Interface/HLE/Thunks/Thunks.h rename to FEXCore/Source/Interface/HLE/Thunks/Thunks.h diff --git a/External/FEXCore/Source/Interface/IR/AOTIR.cpp b/FEXCore/Source/Interface/IR/AOTIR.cpp similarity index 100% rename from External/FEXCore/Source/Interface/IR/AOTIR.cpp rename to FEXCore/Source/Interface/IR/AOTIR.cpp diff --git a/External/FEXCore/Source/Interface/IR/AOTIR.h b/FEXCore/Source/Interface/IR/AOTIR.h similarity index 100% rename from External/FEXCore/Source/Interface/IR/AOTIR.h rename to FEXCore/Source/Interface/IR/AOTIR.h diff --git a/External/FEXCore/Source/Interface/IR/IR.json b/FEXCore/Source/Interface/IR/IR.json similarity index 100% rename from External/FEXCore/Source/Interface/IR/IR.json rename to FEXCore/Source/Interface/IR/IR.json diff --git a/External/FEXCore/Source/Interface/IR/IRDumper.cpp b/FEXCore/Source/Interface/IR/IRDumper.cpp similarity index 100% rename from External/FEXCore/Source/Interface/IR/IRDumper.cpp rename to FEXCore/Source/Interface/IR/IRDumper.cpp diff --git a/External/FEXCore/Source/Interface/IR/IREmitter.cpp b/FEXCore/Source/Interface/IR/IREmitter.cpp similarity index 100% rename from External/FEXCore/Source/Interface/IR/IREmitter.cpp rename to FEXCore/Source/Interface/IR/IREmitter.cpp diff --git a/External/FEXCore/Source/Interface/IR/IRParser.cpp b/FEXCore/Source/Interface/IR/IRParser.cpp similarity index 100% rename from External/FEXCore/Source/Interface/IR/IRParser.cpp rename to FEXCore/Source/Interface/IR/IRParser.cpp diff --git a/External/FEXCore/Source/Interface/IR/PassManager.cpp b/FEXCore/Source/Interface/IR/PassManager.cpp similarity index 100% rename from External/FEXCore/Source/Interface/IR/PassManager.cpp rename to FEXCore/Source/Interface/IR/PassManager.cpp diff --git a/External/FEXCore/Source/Interface/IR/PassManager.h b/FEXCore/Source/Interface/IR/PassManager.h similarity index 100% rename from External/FEXCore/Source/Interface/IR/PassManager.h rename to FEXCore/Source/Interface/IR/PassManager.h diff --git a/External/FEXCore/Source/Interface/IR/Passes.h b/FEXCore/Source/Interface/IR/Passes.h similarity index 100% rename from External/FEXCore/Source/Interface/IR/Passes.h rename to FEXCore/Source/Interface/IR/Passes.h diff --git a/External/FEXCore/Source/Interface/IR/Passes/ConstProp.cpp b/FEXCore/Source/Interface/IR/Passes/ConstProp.cpp similarity index 100% rename from External/FEXCore/Source/Interface/IR/Passes/ConstProp.cpp rename to FEXCore/Source/Interface/IR/Passes/ConstProp.cpp diff --git a/External/FEXCore/Source/Interface/IR/Passes/DeadCodeElimination.cpp b/FEXCore/Source/Interface/IR/Passes/DeadCodeElimination.cpp similarity index 100% rename from External/FEXCore/Source/Interface/IR/Passes/DeadCodeElimination.cpp rename to FEXCore/Source/Interface/IR/Passes/DeadCodeElimination.cpp diff --git a/External/FEXCore/Source/Interface/IR/Passes/DeadContextStoreElimination.cpp b/FEXCore/Source/Interface/IR/Passes/DeadContextStoreElimination.cpp similarity index 100% rename from External/FEXCore/Source/Interface/IR/Passes/DeadContextStoreElimination.cpp rename to FEXCore/Source/Interface/IR/Passes/DeadContextStoreElimination.cpp diff --git a/External/FEXCore/Source/Interface/IR/Passes/DeadStoreElimination.cpp b/FEXCore/Source/Interface/IR/Passes/DeadStoreElimination.cpp similarity index 100% rename from External/FEXCore/Source/Interface/IR/Passes/DeadStoreElimination.cpp rename to FEXCore/Source/Interface/IR/Passes/DeadStoreElimination.cpp diff --git a/External/FEXCore/Source/Interface/IR/Passes/IRCompaction.cpp b/FEXCore/Source/Interface/IR/Passes/IRCompaction.cpp similarity index 100% rename from External/FEXCore/Source/Interface/IR/Passes/IRCompaction.cpp rename to FEXCore/Source/Interface/IR/Passes/IRCompaction.cpp diff --git a/External/FEXCore/Source/Interface/IR/Passes/IRDumperPass.cpp b/FEXCore/Source/Interface/IR/Passes/IRDumperPass.cpp similarity index 100% rename from External/FEXCore/Source/Interface/IR/Passes/IRDumperPass.cpp rename to FEXCore/Source/Interface/IR/Passes/IRDumperPass.cpp diff --git a/External/FEXCore/Source/Interface/IR/Passes/IRValidation.cpp b/FEXCore/Source/Interface/IR/Passes/IRValidation.cpp similarity index 100% rename from External/FEXCore/Source/Interface/IR/Passes/IRValidation.cpp rename to FEXCore/Source/Interface/IR/Passes/IRValidation.cpp diff --git a/External/FEXCore/Source/Interface/IR/Passes/IRValidation.h b/FEXCore/Source/Interface/IR/Passes/IRValidation.h similarity index 100% rename from External/FEXCore/Source/Interface/IR/Passes/IRValidation.h rename to FEXCore/Source/Interface/IR/Passes/IRValidation.h diff --git a/External/FEXCore/Source/Interface/IR/Passes/LongDivideRemovalPass.cpp b/FEXCore/Source/Interface/IR/Passes/LongDivideRemovalPass.cpp similarity index 100% rename from External/FEXCore/Source/Interface/IR/Passes/LongDivideRemovalPass.cpp rename to FEXCore/Source/Interface/IR/Passes/LongDivideRemovalPass.cpp diff --git a/External/FEXCore/Source/Interface/IR/Passes/PhiValidation.cpp b/FEXCore/Source/Interface/IR/Passes/PhiValidation.cpp similarity index 100% rename from External/FEXCore/Source/Interface/IR/Passes/PhiValidation.cpp rename to FEXCore/Source/Interface/IR/Passes/PhiValidation.cpp diff --git a/External/FEXCore/Source/Interface/IR/Passes/RAValidation.cpp b/FEXCore/Source/Interface/IR/Passes/RAValidation.cpp similarity index 100% rename from External/FEXCore/Source/Interface/IR/Passes/RAValidation.cpp rename to FEXCore/Source/Interface/IR/Passes/RAValidation.cpp diff --git a/External/FEXCore/Source/Interface/IR/Passes/RedundantFlagCalculationElimination.cpp b/FEXCore/Source/Interface/IR/Passes/RedundantFlagCalculationElimination.cpp similarity index 100% rename from External/FEXCore/Source/Interface/IR/Passes/RedundantFlagCalculationElimination.cpp rename to FEXCore/Source/Interface/IR/Passes/RedundantFlagCalculationElimination.cpp diff --git a/External/FEXCore/Source/Interface/IR/Passes/RegisterAllocationPass.cpp b/FEXCore/Source/Interface/IR/Passes/RegisterAllocationPass.cpp similarity index 100% rename from External/FEXCore/Source/Interface/IR/Passes/RegisterAllocationPass.cpp rename to FEXCore/Source/Interface/IR/Passes/RegisterAllocationPass.cpp diff --git a/External/FEXCore/Source/Interface/IR/Passes/RegisterAllocationPass.h b/FEXCore/Source/Interface/IR/Passes/RegisterAllocationPass.h similarity index 100% rename from External/FEXCore/Source/Interface/IR/Passes/RegisterAllocationPass.h rename to FEXCore/Source/Interface/IR/Passes/RegisterAllocationPass.h diff --git a/External/FEXCore/Source/Interface/IR/Passes/SyscallOptimization.cpp b/FEXCore/Source/Interface/IR/Passes/SyscallOptimization.cpp similarity index 100% rename from External/FEXCore/Source/Interface/IR/Passes/SyscallOptimization.cpp rename to FEXCore/Source/Interface/IR/Passes/SyscallOptimization.cpp diff --git a/External/FEXCore/Source/Interface/IR/Passes/ValueDominanceValidation.cpp b/FEXCore/Source/Interface/IR/Passes/ValueDominanceValidation.cpp similarity index 100% rename from External/FEXCore/Source/Interface/IR/Passes/ValueDominanceValidation.cpp rename to FEXCore/Source/Interface/IR/Passes/ValueDominanceValidation.cpp diff --git a/External/FEXCore/Source/Utils/Allocator.cpp b/FEXCore/Source/Utils/Allocator.cpp similarity index 100% rename from External/FEXCore/Source/Utils/Allocator.cpp rename to FEXCore/Source/Utils/Allocator.cpp diff --git a/External/FEXCore/Source/Utils/Allocator.h b/FEXCore/Source/Utils/Allocator.h similarity index 100% rename from External/FEXCore/Source/Utils/Allocator.h rename to FEXCore/Source/Utils/Allocator.h diff --git a/External/FEXCore/Source/Utils/Allocator/64BitAllocator.cpp b/FEXCore/Source/Utils/Allocator/64BitAllocator.cpp similarity index 100% rename from External/FEXCore/Source/Utils/Allocator/64BitAllocator.cpp rename to FEXCore/Source/Utils/Allocator/64BitAllocator.cpp diff --git a/External/FEXCore/Source/Utils/Allocator/FlexBitSet.h b/FEXCore/Source/Utils/Allocator/FlexBitSet.h similarity index 100% rename from External/FEXCore/Source/Utils/Allocator/FlexBitSet.h rename to FEXCore/Source/Utils/Allocator/FlexBitSet.h diff --git a/External/FEXCore/Source/Utils/Allocator/HostAllocator.h b/FEXCore/Source/Utils/Allocator/HostAllocator.h similarity index 100% rename from External/FEXCore/Source/Utils/Allocator/HostAllocator.h rename to FEXCore/Source/Utils/Allocator/HostAllocator.h diff --git a/External/FEXCore/Source/Utils/Allocator/IntrusiveArenaAllocator.h b/FEXCore/Source/Utils/Allocator/IntrusiveArenaAllocator.h similarity index 100% rename from External/FEXCore/Source/Utils/Allocator/IntrusiveArenaAllocator.h rename to FEXCore/Source/Utils/Allocator/IntrusiveArenaAllocator.h diff --git a/External/FEXCore/Source/Utils/AllocatorOverride.cpp b/FEXCore/Source/Utils/AllocatorOverride.cpp similarity index 100% rename from External/FEXCore/Source/Utils/AllocatorOverride.cpp rename to FEXCore/Source/Utils/AllocatorOverride.cpp diff --git a/External/FEXCore/Source/Utils/ArchHelpers/Arm64.cpp b/FEXCore/Source/Utils/ArchHelpers/Arm64.cpp similarity index 100% rename from External/FEXCore/Source/Utils/ArchHelpers/Arm64.cpp rename to FEXCore/Source/Utils/ArchHelpers/Arm64.cpp diff --git a/External/FEXCore/Source/Utils/ArchHelpers/Arm64_stubs.cpp b/FEXCore/Source/Utils/ArchHelpers/Arm64_stubs.cpp similarity index 100% rename from External/FEXCore/Source/Utils/ArchHelpers/Arm64_stubs.cpp rename to FEXCore/Source/Utils/ArchHelpers/Arm64_stubs.cpp diff --git a/External/FEXCore/Source/Utils/CPUInfo.cpp b/FEXCore/Source/Utils/CPUInfo.cpp similarity index 100% rename from External/FEXCore/Source/Utils/CPUInfo.cpp rename to FEXCore/Source/Utils/CPUInfo.cpp diff --git a/External/FEXCore/Source/Utils/FileLoading.cpp b/FEXCore/Source/Utils/FileLoading.cpp similarity index 100% rename from External/FEXCore/Source/Utils/FileLoading.cpp rename to FEXCore/Source/Utils/FileLoading.cpp diff --git a/External/FEXCore/Source/Utils/ForcedAssert.cpp b/FEXCore/Source/Utils/ForcedAssert.cpp similarity index 100% rename from External/FEXCore/Source/Utils/ForcedAssert.cpp rename to FEXCore/Source/Utils/ForcedAssert.cpp diff --git a/External/FEXCore/Source/Utils/LogManager.cpp b/FEXCore/Source/Utils/LogManager.cpp similarity index 100% rename from External/FEXCore/Source/Utils/LogManager.cpp rename to FEXCore/Source/Utils/LogManager.cpp diff --git a/External/FEXCore/Source/Utils/MemberFunctionToPointer.h b/FEXCore/Source/Utils/MemberFunctionToPointer.h similarity index 100% rename from External/FEXCore/Source/Utils/MemberFunctionToPointer.h rename to FEXCore/Source/Utils/MemberFunctionToPointer.h diff --git a/External/FEXCore/Source/Utils/NetStream.cpp b/FEXCore/Source/Utils/NetStream.cpp similarity index 100% rename from External/FEXCore/Source/Utils/NetStream.cpp rename to FEXCore/Source/Utils/NetStream.cpp diff --git a/External/FEXCore/Source/Utils/Profiler.cpp b/FEXCore/Source/Utils/Profiler.cpp similarity index 100% rename from External/FEXCore/Source/Utils/Profiler.cpp rename to FEXCore/Source/Utils/Profiler.cpp diff --git a/External/FEXCore/Source/Utils/Telemetry.cpp b/FEXCore/Source/Utils/Telemetry.cpp similarity index 100% rename from External/FEXCore/Source/Utils/Telemetry.cpp rename to FEXCore/Source/Utils/Telemetry.cpp diff --git a/External/FEXCore/Source/Utils/Threads.cpp b/FEXCore/Source/Utils/Threads.cpp similarity index 100% rename from External/FEXCore/Source/Utils/Threads.cpp rename to FEXCore/Source/Utils/Threads.cpp diff --git a/External/FEXCore/docs/CPUBackends.md b/FEXCore/docs/CPUBackends.md similarity index 100% rename from External/FEXCore/docs/CPUBackends.md rename to FEXCore/docs/CPUBackends.md diff --git a/External/FEXCore/docs/CustomCPUBackend.md b/FEXCore/docs/CustomCPUBackend.md similarity index 100% rename from External/FEXCore/docs/CustomCPUBackend.md rename to FEXCore/docs/CustomCPUBackend.md diff --git a/External/FEXCore/docs/Frontend.md b/FEXCore/docs/Frontend.md similarity index 100% rename from External/FEXCore/docs/Frontend.md rename to FEXCore/docs/Frontend.md diff --git a/External/FEXCore/docs/IR.md b/FEXCore/docs/IR.md similarity index 100% rename from External/FEXCore/docs/IR.md rename to FEXCore/docs/IR.md diff --git a/External/FEXCore/docs/OpDispatcher.md b/FEXCore/docs/OpDispatcher.md similarity index 100% rename from External/FEXCore/docs/OpDispatcher.md rename to FEXCore/docs/OpDispatcher.md diff --git a/External/FEXCore/docs/OptimizationPasses.md b/FEXCore/docs/OptimizationPasses.md similarity index 100% rename from External/FEXCore/docs/OptimizationPasses.md rename to FEXCore/docs/OptimizationPasses.md diff --git a/External/FEXCore/include/FEXCore/Config/Config.h b/FEXCore/include/FEXCore/Config/Config.h similarity index 100% rename from External/FEXCore/include/FEXCore/Config/Config.h rename to FEXCore/include/FEXCore/Config/Config.h diff --git a/External/FEXCore/include/FEXCore/Core/CPUBackend.h b/FEXCore/include/FEXCore/Core/CPUBackend.h similarity index 100% rename from External/FEXCore/include/FEXCore/Core/CPUBackend.h rename to FEXCore/include/FEXCore/Core/CPUBackend.h diff --git a/External/FEXCore/include/FEXCore/Core/CPUID.h b/FEXCore/include/FEXCore/Core/CPUID.h similarity index 100% rename from External/FEXCore/include/FEXCore/Core/CPUID.h rename to FEXCore/include/FEXCore/Core/CPUID.h diff --git a/External/FEXCore/include/FEXCore/Core/CodeLoader.h b/FEXCore/include/FEXCore/Core/CodeLoader.h similarity index 100% rename from External/FEXCore/include/FEXCore/Core/CodeLoader.h rename to FEXCore/include/FEXCore/Core/CodeLoader.h diff --git a/External/FEXCore/include/FEXCore/Core/Context.h b/FEXCore/include/FEXCore/Core/Context.h similarity index 100% rename from External/FEXCore/include/FEXCore/Core/Context.h rename to FEXCore/include/FEXCore/Core/Context.h diff --git a/External/FEXCore/include/FEXCore/Core/CoreState.h b/FEXCore/include/FEXCore/Core/CoreState.h similarity index 100% rename from External/FEXCore/include/FEXCore/Core/CoreState.h rename to FEXCore/include/FEXCore/Core/CoreState.h diff --git a/External/FEXCore/include/FEXCore/Core/HostFeatures.h b/FEXCore/include/FEXCore/Core/HostFeatures.h similarity index 100% rename from External/FEXCore/include/FEXCore/Core/HostFeatures.h rename to FEXCore/include/FEXCore/Core/HostFeatures.h diff --git a/External/FEXCore/include/FEXCore/Core/SignalDelegator.h b/FEXCore/include/FEXCore/Core/SignalDelegator.h similarity index 100% rename from External/FEXCore/include/FEXCore/Core/SignalDelegator.h rename to FEXCore/include/FEXCore/Core/SignalDelegator.h diff --git a/External/FEXCore/include/FEXCore/Core/X86Enums.h b/FEXCore/include/FEXCore/Core/X86Enums.h similarity index 100% rename from External/FEXCore/include/FEXCore/Core/X86Enums.h rename to FEXCore/include/FEXCore/Core/X86Enums.h diff --git a/External/FEXCore/include/FEXCore/Debug/GDBReaderInterface.h b/FEXCore/include/FEXCore/Debug/GDBReaderInterface.h similarity index 100% rename from External/FEXCore/include/FEXCore/Debug/GDBReaderInterface.h rename to FEXCore/include/FEXCore/Debug/GDBReaderInterface.h diff --git a/External/FEXCore/include/FEXCore/Debug/InternalThreadState.h b/FEXCore/include/FEXCore/Debug/InternalThreadState.h similarity index 100% rename from External/FEXCore/include/FEXCore/Debug/InternalThreadState.h rename to FEXCore/include/FEXCore/Debug/InternalThreadState.h diff --git a/External/FEXCore/include/FEXCore/HLE/Linux/ThreadManagement.h b/FEXCore/include/FEXCore/HLE/Linux/ThreadManagement.h similarity index 100% rename from External/FEXCore/include/FEXCore/HLE/Linux/ThreadManagement.h rename to FEXCore/include/FEXCore/HLE/Linux/ThreadManagement.h diff --git a/External/FEXCore/include/FEXCore/HLE/SourcecodeResolver.h b/FEXCore/include/FEXCore/HLE/SourcecodeResolver.h similarity index 100% rename from External/FEXCore/include/FEXCore/HLE/SourcecodeResolver.h rename to FEXCore/include/FEXCore/HLE/SourcecodeResolver.h diff --git a/External/FEXCore/include/FEXCore/HLE/SyscallHandler.h b/FEXCore/include/FEXCore/HLE/SyscallHandler.h similarity index 100% rename from External/FEXCore/include/FEXCore/HLE/SyscallHandler.h rename to FEXCore/include/FEXCore/HLE/SyscallHandler.h diff --git a/External/FEXCore/include/FEXCore/HLE/SyscallVisitor.h b/FEXCore/include/FEXCore/HLE/SyscallVisitor.h similarity index 100% rename from External/FEXCore/include/FEXCore/HLE/SyscallVisitor.h rename to FEXCore/include/FEXCore/HLE/SyscallVisitor.h diff --git a/External/FEXCore/include/FEXCore/IR/IR.h b/FEXCore/include/FEXCore/IR/IR.h similarity index 100% rename from External/FEXCore/include/FEXCore/IR/IR.h rename to FEXCore/include/FEXCore/IR/IR.h diff --git a/External/FEXCore/include/FEXCore/IR/IREmitter.h b/FEXCore/include/FEXCore/IR/IREmitter.h similarity index 100% rename from External/FEXCore/include/FEXCore/IR/IREmitter.h rename to FEXCore/include/FEXCore/IR/IREmitter.h diff --git a/External/FEXCore/include/FEXCore/IR/IntrusiveIRList.h b/FEXCore/include/FEXCore/IR/IntrusiveIRList.h similarity index 100% rename from External/FEXCore/include/FEXCore/IR/IntrusiveIRList.h rename to FEXCore/include/FEXCore/IR/IntrusiveIRList.h diff --git a/External/FEXCore/include/FEXCore/IR/RegisterAllocationData.h b/FEXCore/include/FEXCore/IR/RegisterAllocationData.h similarity index 100% rename from External/FEXCore/include/FEXCore/IR/RegisterAllocationData.h rename to FEXCore/include/FEXCore/IR/RegisterAllocationData.h diff --git a/External/FEXCore/include/FEXCore/Utils/Allocator.h b/FEXCore/include/FEXCore/Utils/Allocator.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/Allocator.h rename to FEXCore/include/FEXCore/Utils/Allocator.h diff --git a/External/FEXCore/include/FEXCore/Utils/AllocatorHooks.h b/FEXCore/include/FEXCore/Utils/AllocatorHooks.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/AllocatorHooks.h rename to FEXCore/include/FEXCore/Utils/AllocatorHooks.h diff --git a/External/FEXCore/include/FEXCore/Utils/ArchHelpers/Arm64.h b/FEXCore/include/FEXCore/Utils/ArchHelpers/Arm64.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/ArchHelpers/Arm64.h rename to FEXCore/include/FEXCore/Utils/ArchHelpers/Arm64.h diff --git a/External/FEXCore/include/FEXCore/Utils/BitUtils.h b/FEXCore/include/FEXCore/Utils/BitUtils.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/BitUtils.h rename to FEXCore/include/FEXCore/Utils/BitUtils.h diff --git a/External/FEXCore/include/FEXCore/Utils/BucketList.h b/FEXCore/include/FEXCore/Utils/BucketList.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/BucketList.h rename to FEXCore/include/FEXCore/Utils/BucketList.h diff --git a/External/FEXCore/include/FEXCore/Utils/CPUInfo.h b/FEXCore/include/FEXCore/Utils/CPUInfo.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/CPUInfo.h rename to FEXCore/include/FEXCore/Utils/CPUInfo.h diff --git a/External/FEXCore/include/FEXCore/Utils/CompilerDefs.h b/FEXCore/include/FEXCore/Utils/CompilerDefs.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/CompilerDefs.h rename to FEXCore/include/FEXCore/Utils/CompilerDefs.h diff --git a/External/FEXCore/include/FEXCore/Utils/DeferredSignalMutex.h b/FEXCore/include/FEXCore/Utils/DeferredSignalMutex.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/DeferredSignalMutex.h rename to FEXCore/include/FEXCore/Utils/DeferredSignalMutex.h diff --git a/External/FEXCore/include/FEXCore/Utils/EnumOperators.h b/FEXCore/include/FEXCore/Utils/EnumOperators.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/EnumOperators.h rename to FEXCore/include/FEXCore/Utils/EnumOperators.h diff --git a/External/FEXCore/include/FEXCore/Utils/EnumUtils.h b/FEXCore/include/FEXCore/Utils/EnumUtils.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/EnumUtils.h rename to FEXCore/include/FEXCore/Utils/EnumUtils.h diff --git a/External/FEXCore/include/FEXCore/Utils/Event.h b/FEXCore/include/FEXCore/Utils/Event.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/Event.h rename to FEXCore/include/FEXCore/Utils/Event.h diff --git a/External/FEXCore/include/FEXCore/Utils/File.h b/FEXCore/include/FEXCore/Utils/File.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/File.h rename to FEXCore/include/FEXCore/Utils/File.h diff --git a/External/FEXCore/include/FEXCore/Utils/FileLoading.h b/FEXCore/include/FEXCore/Utils/FileLoading.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/FileLoading.h rename to FEXCore/include/FEXCore/Utils/FileLoading.h diff --git a/External/FEXCore/include/FEXCore/Utils/InterruptableConditionVariable.h b/FEXCore/include/FEXCore/Utils/InterruptableConditionVariable.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/InterruptableConditionVariable.h rename to FEXCore/include/FEXCore/Utils/InterruptableConditionVariable.h diff --git a/External/FEXCore/include/FEXCore/Utils/LogManager.h b/FEXCore/include/FEXCore/Utils/LogManager.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/LogManager.h rename to FEXCore/include/FEXCore/Utils/LogManager.h diff --git a/External/FEXCore/include/FEXCore/Utils/MathUtils.h b/FEXCore/include/FEXCore/Utils/MathUtils.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/MathUtils.h rename to FEXCore/include/FEXCore/Utils/MathUtils.h diff --git a/External/FEXCore/include/FEXCore/Utils/NetStream.h b/FEXCore/include/FEXCore/Utils/NetStream.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/NetStream.h rename to FEXCore/include/FEXCore/Utils/NetStream.h diff --git a/External/FEXCore/include/FEXCore/Utils/Profiler.h b/FEXCore/include/FEXCore/Utils/Profiler.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/Profiler.h rename to FEXCore/include/FEXCore/Utils/Profiler.h diff --git a/External/FEXCore/include/FEXCore/Utils/Telemetry.h b/FEXCore/include/FEXCore/Utils/Telemetry.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/Telemetry.h rename to FEXCore/include/FEXCore/Utils/Telemetry.h diff --git a/External/FEXCore/include/FEXCore/Utils/ThreadPoolAllocator.h b/FEXCore/include/FEXCore/Utils/ThreadPoolAllocator.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/ThreadPoolAllocator.h rename to FEXCore/include/FEXCore/Utils/ThreadPoolAllocator.h diff --git a/External/FEXCore/include/FEXCore/Utils/Threads.h b/FEXCore/include/FEXCore/Utils/Threads.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/Threads.h rename to FEXCore/include/FEXCore/Utils/Threads.h diff --git a/External/FEXCore/include/FEXCore/Utils/refcount_shared_mutex.h b/FEXCore/include/FEXCore/Utils/refcount_shared_mutex.h similarity index 100% rename from External/FEXCore/include/FEXCore/Utils/refcount_shared_mutex.h rename to FEXCore/include/FEXCore/Utils/refcount_shared_mutex.h diff --git a/External/FEXCore/include/FEXCore/fextl/allocator.h b/FEXCore/include/FEXCore/fextl/allocator.h similarity index 100% rename from External/FEXCore/include/FEXCore/fextl/allocator.h rename to FEXCore/include/FEXCore/fextl/allocator.h diff --git a/External/FEXCore/include/FEXCore/fextl/deque.h b/FEXCore/include/FEXCore/fextl/deque.h similarity index 100% rename from External/FEXCore/include/FEXCore/fextl/deque.h rename to FEXCore/include/FEXCore/fextl/deque.h diff --git a/External/FEXCore/include/FEXCore/fextl/fmt.h b/FEXCore/include/FEXCore/fextl/fmt.h similarity index 100% rename from External/FEXCore/include/FEXCore/fextl/fmt.h rename to FEXCore/include/FEXCore/fextl/fmt.h diff --git a/External/FEXCore/include/FEXCore/fextl/forward_list.h b/FEXCore/include/FEXCore/fextl/forward_list.h similarity index 100% rename from External/FEXCore/include/FEXCore/fextl/forward_list.h rename to FEXCore/include/FEXCore/fextl/forward_list.h diff --git a/External/FEXCore/include/FEXCore/fextl/list.h b/FEXCore/include/FEXCore/fextl/list.h similarity index 100% rename from External/FEXCore/include/FEXCore/fextl/list.h rename to FEXCore/include/FEXCore/fextl/list.h diff --git a/External/FEXCore/include/FEXCore/fextl/map.h b/FEXCore/include/FEXCore/fextl/map.h similarity index 100% rename from External/FEXCore/include/FEXCore/fextl/map.h rename to FEXCore/include/FEXCore/fextl/map.h diff --git a/External/FEXCore/include/FEXCore/fextl/memory.h b/FEXCore/include/FEXCore/fextl/memory.h similarity index 100% rename from External/FEXCore/include/FEXCore/fextl/memory.h rename to FEXCore/include/FEXCore/fextl/memory.h diff --git a/External/FEXCore/include/FEXCore/fextl/memory_resource.h b/FEXCore/include/FEXCore/fextl/memory_resource.h similarity index 100% rename from External/FEXCore/include/FEXCore/fextl/memory_resource.h rename to FEXCore/include/FEXCore/fextl/memory_resource.h diff --git a/External/FEXCore/include/FEXCore/fextl/queue.h b/FEXCore/include/FEXCore/fextl/queue.h similarity index 100% rename from External/FEXCore/include/FEXCore/fextl/queue.h rename to FEXCore/include/FEXCore/fextl/queue.h diff --git a/External/FEXCore/include/FEXCore/fextl/robin_map.h b/FEXCore/include/FEXCore/fextl/robin_map.h similarity index 100% rename from External/FEXCore/include/FEXCore/fextl/robin_map.h rename to FEXCore/include/FEXCore/fextl/robin_map.h diff --git a/External/FEXCore/include/FEXCore/fextl/set.h b/FEXCore/include/FEXCore/fextl/set.h similarity index 100% rename from External/FEXCore/include/FEXCore/fextl/set.h rename to FEXCore/include/FEXCore/fextl/set.h diff --git a/External/FEXCore/include/FEXCore/fextl/sstream.h b/FEXCore/include/FEXCore/fextl/sstream.h similarity index 100% rename from External/FEXCore/include/FEXCore/fextl/sstream.h rename to FEXCore/include/FEXCore/fextl/sstream.h diff --git a/External/FEXCore/include/FEXCore/fextl/stack.h b/FEXCore/include/FEXCore/fextl/stack.h similarity index 100% rename from External/FEXCore/include/FEXCore/fextl/stack.h rename to FEXCore/include/FEXCore/fextl/stack.h diff --git a/External/FEXCore/include/FEXCore/fextl/string.h b/FEXCore/include/FEXCore/fextl/string.h similarity index 100% rename from External/FEXCore/include/FEXCore/fextl/string.h rename to FEXCore/include/FEXCore/fextl/string.h diff --git a/External/FEXCore/include/FEXCore/fextl/unordered_map.h b/FEXCore/include/FEXCore/fextl/unordered_map.h similarity index 100% rename from External/FEXCore/include/FEXCore/fextl/unordered_map.h rename to FEXCore/include/FEXCore/fextl/unordered_map.h diff --git a/External/FEXCore/include/FEXCore/fextl/unordered_set.h b/FEXCore/include/FEXCore/fextl/unordered_set.h similarity index 100% rename from External/FEXCore/include/FEXCore/fextl/unordered_set.h rename to FEXCore/include/FEXCore/fextl/unordered_set.h diff --git a/External/FEXCore/include/FEXCore/fextl/vector.h b/FEXCore/include/FEXCore/fextl/vector.h similarity index 100% rename from External/FEXCore/include/FEXCore/fextl/vector.h rename to FEXCore/include/FEXCore/fextl/vector.h diff --git a/External/FEXCore/include/git_version.h.in b/FEXCore/include/git_version.h.in similarity index 100% rename from External/FEXCore/include/git_version.h.in rename to FEXCore/include/git_version.h.in diff --git a/External/FEXCore/unittests/APITests/CMakeLists.txt b/FEXCore/unittests/APITests/CMakeLists.txt similarity index 100% rename from External/FEXCore/unittests/APITests/CMakeLists.txt rename to FEXCore/unittests/APITests/CMakeLists.txt diff --git a/External/FEXCore/unittests/APITests/ILog2.cpp b/FEXCore/unittests/APITests/ILog2.cpp similarity index 100% rename from External/FEXCore/unittests/APITests/ILog2.cpp rename to FEXCore/unittests/APITests/ILog2.cpp diff --git a/External/FEXCore/unittests/CMakeLists.txt b/FEXCore/unittests/CMakeLists.txt similarity index 100% rename from External/FEXCore/unittests/CMakeLists.txt rename to FEXCore/unittests/CMakeLists.txt diff --git a/External/FEXCore/unittests/Emitter/ALU_Tests.cpp b/FEXCore/unittests/Emitter/ALU_Tests.cpp similarity index 100% rename from External/FEXCore/unittests/Emitter/ALU_Tests.cpp rename to FEXCore/unittests/Emitter/ALU_Tests.cpp diff --git a/External/FEXCore/unittests/Emitter/ASIMD_Tests.cpp b/FEXCore/unittests/Emitter/ASIMD_Tests.cpp similarity index 100% rename from External/FEXCore/unittests/Emitter/ASIMD_Tests.cpp rename to FEXCore/unittests/Emitter/ASIMD_Tests.cpp diff --git a/External/FEXCore/unittests/Emitter/Branch_Tests.cpp b/FEXCore/unittests/Emitter/Branch_Tests.cpp similarity index 100% rename from External/FEXCore/unittests/Emitter/Branch_Tests.cpp rename to FEXCore/unittests/Emitter/Branch_Tests.cpp diff --git a/External/FEXCore/unittests/Emitter/CMakeLists.txt b/FEXCore/unittests/Emitter/CMakeLists.txt similarity index 100% rename from External/FEXCore/unittests/Emitter/CMakeLists.txt rename to FEXCore/unittests/Emitter/CMakeLists.txt diff --git a/External/FEXCore/unittests/Emitter/Loadstore_Tests.cpp b/FEXCore/unittests/Emitter/Loadstore_Tests.cpp similarity index 100% rename from External/FEXCore/unittests/Emitter/Loadstore_Tests.cpp rename to FEXCore/unittests/Emitter/Loadstore_Tests.cpp diff --git a/External/FEXCore/unittests/Emitter/SVE_Tests.cpp b/FEXCore/unittests/Emitter/SVE_Tests.cpp similarity index 100% rename from External/FEXCore/unittests/Emitter/SVE_Tests.cpp rename to FEXCore/unittests/Emitter/SVE_Tests.cpp diff --git a/External/FEXCore/unittests/Emitter/Scalar_Tests.cpp b/FEXCore/unittests/Emitter/Scalar_Tests.cpp similarity index 100% rename from External/FEXCore/unittests/Emitter/Scalar_Tests.cpp rename to FEXCore/unittests/Emitter/Scalar_Tests.cpp diff --git a/External/FEXCore/unittests/Emitter/System_Tests.cpp b/FEXCore/unittests/Emitter/System_Tests.cpp similarity index 100% rename from External/FEXCore/unittests/Emitter/System_Tests.cpp rename to FEXCore/unittests/Emitter/System_Tests.cpp diff --git a/External/FEXCore/unittests/Emitter/TestDisassembler.h b/FEXCore/unittests/Emitter/TestDisassembler.h similarity index 100% rename from External/FEXCore/unittests/Emitter/TestDisassembler.h rename to FEXCore/unittests/Emitter/TestDisassembler.h