diff --git a/src/xenia/cpu/frontend/frontend.cc b/src/xenia/cpu/frontend/frontend.cc
deleted file mode 100644
index 3c1c2c563..000000000
--- a/src/xenia/cpu/frontend/frontend.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- ******************************************************************************
- * Xenia : Xbox 360 Emulator Research Project                                 *
- ******************************************************************************
- * Copyright 2013 Ben Vanik. All rights reserved.                             *
- * Released under the BSD license - see LICENSE in the root for more details. *
- ******************************************************************************
- */
-
-#include "xenia/cpu/frontend/frontend.h"
-
-#include "xenia/cpu/runtime.h"
-
-namespace xe {
-namespace cpu {
-namespace frontend {
-
-Frontend::Frontend(Runtime* runtime) : runtime_(runtime) {}
-
-Frontend::~Frontend() = default;
-
-Memory* Frontend::memory() const { return runtime_->memory(); }
-
-int Frontend::Initialize() { return 0; }
-
-}  // namespace frontend
-}  // namespace cpu
-}  // namespace xe
diff --git a/src/xenia/cpu/frontend/frontend.h b/src/xenia/cpu/frontend/frontend.h
deleted file mode 100644
index 1e15653cf..000000000
--- a/src/xenia/cpu/frontend/frontend.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- ******************************************************************************
- * Xenia : Xbox 360 Emulator Research Project                                 *
- ******************************************************************************
- * Copyright 2013 Ben Vanik. All rights reserved.                             *
- * Released under the BSD license - see LICENSE in the root for more details. *
- ******************************************************************************
- */
-
-#ifndef XENIA_FRONTEND_FRONTEND_H_
-#define XENIA_FRONTEND_FRONTEND_H_
-
-#include <memory>
-
-#include "xenia/cpu/frontend/context_info.h"
-#include "xenia/memory.h"
-#include "xenia/cpu/function.h"
-#include "xenia/cpu/symbol_info.h"
-
-namespace xe {
-namespace cpu {
-class Runtime;
-}  // namespace cpu
-}  // namespace xe
-
-namespace xe {
-namespace cpu {
-namespace frontend {
-
-class Frontend {
- public:
-  Frontend(Runtime* runtime);
-  virtual ~Frontend();
-
-  Runtime* runtime() const { return runtime_; }
-  Memory* memory() const;
-  ContextInfo* context_info() const { return context_info_.get(); }
-
-  virtual int Initialize();
-
-  virtual int DeclareFunction(FunctionInfo* symbol_info) = 0;
-  virtual int DefineFunction(FunctionInfo* symbol_info,
-                             uint32_t debug_info_flags, uint32_t trace_flags,
-                             Function** out_function) = 0;
-
- protected:
-  Runtime* runtime_;
-  std::unique_ptr<ContextInfo> context_info_;
-};
-
-}  // namespace frontend
-}  // namespace cpu
-}  // namespace xe
-
-#endif  // XENIA_FRONTEND_FRONTEND_H_
diff --git a/src/xenia/cpu/frontend/ppc/sources.gypi b/src/xenia/cpu/frontend/ppc/sources.gypi
deleted file mode 100644
index 4af4634af..000000000
--- a/src/xenia/cpu/frontend/ppc/sources.gypi
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2013 Ben Vanik. All Rights Reserved.
-{
-  'sources': [
-    'ppc_context.cc',
-    'ppc_context.h',
-    'ppc_disasm.cc',
-    'ppc_disasm.h',
-    'ppc_emit-private.h',
-    'ppc_emit.h',
-    'ppc_emit_altivec.cc',
-    'ppc_emit_alu.cc',
-    'ppc_emit_control.cc',
-    'ppc_emit_fpu.cc',
-    'ppc_emit_memory.cc',
-    'ppc_frontend.cc',
-    'ppc_frontend.h',
-    'ppc_hir_builder.cc',
-    'ppc_hir_builder.h',
-    'ppc_instr.cc',
-    'ppc_instr.h',
-    'ppc_instr_tables.h',
-    'ppc_scanner.cc',
-    'ppc_scanner.h',
-    'ppc_translator.cc',
-    'ppc_translator.h',
-  ],
-
-  'includes': [
-  ],
-}
diff --git a/src/xenia/cpu/frontend/ppc/ppc_context.cc b/src/xenia/cpu/frontend/ppc_context.cc
similarity index 96%
rename from src/xenia/cpu/frontend/ppc/ppc_context.cc
rename to src/xenia/cpu/frontend/ppc_context.cc
index 1b8950a3d..6dbca661f 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_context.cc
+++ b/src/xenia/cpu/frontend/ppc_context.cc
@@ -7,14 +7,13 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/frontend/ppc/ppc_context.h"
+#include "xenia/cpu/frontend/ppc_context.h"
 
 #include <cstdlib>
 
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 uint64_t ParseInt64(const char* value) {
   return std::strtoull(value, nullptr, 0);
@@ -82,7 +81,6 @@ bool PPCContext::CompareRegWithString(const char* name, const char* value,
   }
 }
 
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
diff --git a/src/xenia/cpu/frontend/ppc/ppc_context.h b/src/xenia/cpu/frontend/ppc_context.h
similarity index 97%
rename from src/xenia/cpu/frontend/ppc/ppc_context.h
rename to src/xenia/cpu/frontend/ppc_context.h
index 73a7259e4..c56f451a1 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_context.h
+++ b/src/xenia/cpu/frontend/ppc_context.h
@@ -7,8 +7,8 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_FRONTEND_PPC_PPC_CONTEXT_H_
-#define XENIA_FRONTEND_PPC_PPC_CONTEXT_H_
+#ifndef XENIA_FRONTEND_PPC_CONTEXT_H_
+#define XENIA_FRONTEND_PPC_CONTEXT_H_
 
 #include "poly/poly.h"
 #include "poly/vec128.h"
@@ -23,7 +23,6 @@ class ThreadState;
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 using vec128_t = poly::vec128_t;
 
@@ -217,9 +216,8 @@ typedef struct alignas(64) PPCContext_s {
 } PPCContext;
 #pragma pack(pop)
 
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
 
-#endif  // XENIA_FRONTEND_PPC_PPC_CONTEXT_H_
+#endif  // XENIA_FRONTEND_PPC_CONTEXT_H_
diff --git a/src/xenia/cpu/frontend/ppc/ppc_disasm.cc b/src/xenia/cpu/frontend/ppc_disasm.cc
similarity index 99%
rename from src/xenia/cpu/frontend/ppc/ppc_disasm.cc
rename to src/xenia/cpu/frontend/ppc_disasm.cc
index 5bb74ea8e..b909d26df 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_disasm.cc
+++ b/src/xenia/cpu/frontend/ppc_disasm.cc
@@ -7,7 +7,7 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/frontend/ppc/ppc_disasm.h"
+#include "xenia/cpu/frontend/ppc_disasm.h"
 
 #include "poly/poly.h"
 #include "poly/string_buffer.h"
@@ -15,7 +15,6 @@
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 void Disasm_0(InstrData& i, poly::StringBuffer* str) {
   str->Append("%-8s ???", i.type->name);
@@ -499,7 +498,6 @@ int DisasmPPC(InstrData& i, poly::StringBuffer* str) {
   return 0;
 }
 
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
diff --git a/src/xenia/cpu/frontend/ppc/ppc_disasm.h b/src/xenia/cpu/frontend/ppc_disasm.h
similarity index 76%
rename from src/xenia/cpu/frontend/ppc/ppc_disasm.h
rename to src/xenia/cpu/frontend/ppc_disasm.h
index 2fef833f1..dfa610d6e 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_disasm.h
+++ b/src/xenia/cpu/frontend/ppc_disasm.h
@@ -7,22 +7,20 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_FRONTEND_PPC_PPC_DISASM_H_
-#define XENIA_FRONTEND_PPC_PPC_DISASM_H_
+#ifndef XENIA_FRONTEND_PPC_DISASM_H_
+#define XENIA_FRONTEND_PPC_DISASM_H_
 
-#include "xenia/cpu/frontend/ppc/ppc_instr.h"
+#include "xenia/cpu/frontend/ppc_instr.h"
 #include "poly/string_buffer.h"
 
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 int DisasmPPC(InstrData& i, poly::StringBuffer* str);
 
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
 
-#endif  // XENIA_FRONTEND_PPC_PPC_DISASM_H_
+#endif  // XENIA_FRONTEND_PPC_DISASM_H_
diff --git a/src/xenia/cpu/frontend/ppc/ppc_emit-private.h b/src/xenia/cpu/frontend/ppc_emit-private.h
similarity index 77%
rename from src/xenia/cpu/frontend/ppc/ppc_emit-private.h
rename to src/xenia/cpu/frontend/ppc_emit-private.h
index 58dbb0505..6d7d9734a 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_emit-private.h
+++ b/src/xenia/cpu/frontend/ppc_emit-private.h
@@ -7,16 +7,15 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_FRONTEND_PPC_PPC_EMIT_PRIVATE_H_
-#define XENIA_FRONTEND_PPC_PPC_EMIT_PRIVATE_H_
+#ifndef XENIA_FRONTEND_PPC_EMIT_PRIVATE_H_
+#define XENIA_FRONTEND_PPC_EMIT_PRIVATE_H_
 
-#include "xenia/cpu/frontend/ppc/ppc_emit.h"
-#include "xenia/cpu/frontend/ppc/ppc_instr.h"
+#include "xenia/cpu/frontend/ppc_emit.h"
+#include "xenia/cpu/frontend/ppc_instr.h"
 
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 #define XEEMITTER(name, opcode, format) int InstrEmit_##name
 
@@ -27,9 +26,8 @@ namespace ppc {
 #define XEINSTRNOTIMPLEMENTED() assert_always("Instruction not implemented");
 //#define XEINSTRNOTIMPLEMENTED() __debugbreak()
 
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
 
-#endif  // XENIA_FRONTEND_PPC_PPC_EMIT_PRIVATE_H_
+#endif  // XENIA_FRONTEND_PPC_EMIT_PRIVATE_H_
diff --git a/src/xenia/cpu/frontend/ppc/ppc_emit.h b/src/xenia/cpu/frontend/ppc_emit.h
similarity index 79%
rename from src/xenia/cpu/frontend/ppc/ppc_emit.h
rename to src/xenia/cpu/frontend/ppc_emit.h
index 5ae2e40ca..cbf5ceff1 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_emit.h
+++ b/src/xenia/cpu/frontend/ppc_emit.h
@@ -7,15 +7,14 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_FRONTEND_PPC_PPC_EMIT_H_
-#define XENIA_FRONTEND_PPC_PPC_EMIT_H_
+#ifndef XENIA_FRONTEND_PPC_EMIT_H_
+#define XENIA_FRONTEND_PPC_EMIT_H_
 
-#include "xenia/cpu/frontend/ppc/ppc_instr.h"
+#include "xenia/cpu/frontend/ppc_instr.h"
 
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 void RegisterEmitCategoryAltivec();
 void RegisterEmitCategoryALU();
@@ -23,9 +22,8 @@ void RegisterEmitCategoryControl();
 void RegisterEmitCategoryFPU();
 void RegisterEmitCategoryMemory();
 
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
 
-#endif  // XENIA_FRONTEND_PPC_PPC_EMIT_H_
+#endif  // XENIA_FRONTEND_PPC_EMIT_H_
diff --git a/src/xenia/cpu/frontend/ppc/ppc_emit_altivec.cc b/src/xenia/cpu/frontend/ppc_emit_altivec.cc
similarity index 99%
rename from src/xenia/cpu/frontend/ppc/ppc_emit_altivec.cc
rename to src/xenia/cpu/frontend/ppc_emit_altivec.cc
index 10e0b694c..838f0569c 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_emit_altivec.cc
+++ b/src/xenia/cpu/frontend/ppc_emit_altivec.cc
@@ -7,15 +7,14 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/frontend/ppc/ppc_emit-private.h"
+#include "xenia/cpu/frontend/ppc_emit-private.h"
 
-#include "xenia/cpu/frontend/ppc/ppc_context.h"
-#include "xenia/cpu/frontend/ppc/ppc_hir_builder.h"
+#include "xenia/cpu/frontend/ppc_context.h"
+#include "xenia/cpu/frontend/ppc_hir_builder.h"
 
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 // TODO(benvanik): remove when enums redefined.
 using namespace xe::cpu::hir;
@@ -2408,7 +2407,6 @@ void RegisterEmitCategoryAltivec() {
   XEREGISTERINSTR(vxor128, VX128(5, 784));
 }
 
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
diff --git a/src/xenia/cpu/frontend/ppc/ppc_emit_alu.cc b/src/xenia/cpu/frontend/ppc_emit_alu.cc
similarity index 99%
rename from src/xenia/cpu/frontend/ppc/ppc_emit_alu.cc
rename to src/xenia/cpu/frontend/ppc_emit_alu.cc
index fbf519650..708d96f2c 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_emit_alu.cc
+++ b/src/xenia/cpu/frontend/ppc_emit_alu.cc
@@ -7,15 +7,14 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/frontend/ppc/ppc_emit-private.h"
+#include "xenia/cpu/frontend/ppc_emit-private.h"
 
-#include "xenia/cpu/frontend/ppc/ppc_context.h"
-#include "xenia/cpu/frontend/ppc/ppc_hir_builder.h"
+#include "xenia/cpu/frontend/ppc_context.h"
+#include "xenia/cpu/frontend/ppc_hir_builder.h"
 
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 // TODO(benvanik): remove when enums redefined.
 using namespace xe::cpu::hir;
@@ -1270,7 +1269,6 @@ void RegisterEmitCategoryALU() {
   XEREGISTERINSTR(srawix, 0x7C000670);
 }
 
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
diff --git a/src/xenia/cpu/frontend/ppc/ppc_emit_control.cc b/src/xenia/cpu/frontend/ppc_emit_control.cc
similarity index 99%
rename from src/xenia/cpu/frontend/ppc/ppc_emit_control.cc
rename to src/xenia/cpu/frontend/ppc_emit_control.cc
index 18c1cfcbf..96bf21948 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_emit_control.cc
+++ b/src/xenia/cpu/frontend/ppc_emit_control.cc
@@ -7,15 +7,14 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/frontend/ppc/ppc_emit-private.h"
+#include "xenia/cpu/frontend/ppc_emit-private.h"
 
-#include "xenia/cpu/frontend/ppc/ppc_context.h"
-#include "xenia/cpu/frontend/ppc/ppc_hir_builder.h"
+#include "xenia/cpu/frontend/ppc_context.h"
+#include "xenia/cpu/frontend/ppc_hir_builder.h"
 
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 // TODO(benvanik): remove when enums redefined.
 using namespace xe::cpu::hir;
@@ -748,7 +747,6 @@ void RegisterEmitCategoryControl() {
   XEREGISTERINSTR(mtmsrd, 0x7C000164);
 }
 
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
diff --git a/src/xenia/cpu/frontend/ppc/ppc_emit_fpu.cc b/src/xenia/cpu/frontend/ppc_emit_fpu.cc
similarity index 98%
rename from src/xenia/cpu/frontend/ppc/ppc_emit_fpu.cc
rename to src/xenia/cpu/frontend/ppc_emit_fpu.cc
index e29499e82..bc72c0a13 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_emit_fpu.cc
+++ b/src/xenia/cpu/frontend/ppc_emit_fpu.cc
@@ -7,15 +7,14 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/frontend/ppc/ppc_emit-private.h"
+#include "xenia/cpu/frontend/ppc_emit-private.h"
 
-#include "xenia/cpu/frontend/ppc/ppc_context.h"
-#include "xenia/cpu/frontend/ppc/ppc_hir_builder.h"
+#include "xenia/cpu/frontend/ppc_context.h"
+#include "xenia/cpu/frontend/ppc_hir_builder.h"
 
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 // TODO(benvanik): remove when enums redefined.
 using namespace xe::cpu::hir;
@@ -553,7 +552,6 @@ void RegisterEmitCategoryFPU() {
   XEREGISTERINSTR(fnegx, 0xFC000050);
 }
 
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
diff --git a/src/xenia/cpu/frontend/ppc/ppc_emit_memory.cc b/src/xenia/cpu/frontend/ppc_emit_memory.cc
similarity index 99%
rename from src/xenia/cpu/frontend/ppc/ppc_emit_memory.cc
rename to src/xenia/cpu/frontend/ppc_emit_memory.cc
index 6cd688a3f..33038c239 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_emit_memory.cc
+++ b/src/xenia/cpu/frontend/ppc_emit_memory.cc
@@ -7,15 +7,14 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/frontend/ppc/ppc_emit-private.h"
+#include "xenia/cpu/frontend/ppc_emit-private.h"
 
-#include "xenia/cpu/frontend/ppc/ppc_context.h"
-#include "xenia/cpu/frontend/ppc/ppc_hir_builder.h"
+#include "xenia/cpu/frontend/ppc_context.h"
+#include "xenia/cpu/frontend/ppc_hir_builder.h"
 
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 // TODO(benvanik): remove when enums redefined.
 using namespace xe::cpu::hir;
@@ -1082,7 +1081,6 @@ void RegisterEmitCategoryMemory() {
   XEREGISTERINSTR(icbi, 0x7C0007AC);
 }
 
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
diff --git a/src/xenia/cpu/frontend/ppc/ppc_frontend.cc b/src/xenia/cpu/frontend/ppc_frontend.cc
similarity index 88%
rename from src/xenia/cpu/frontend/ppc/ppc_frontend.cc
rename to src/xenia/cpu/frontend/ppc_frontend.cc
index 17bc144a0..5714d6c92 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_frontend.cc
+++ b/src/xenia/cpu/frontend/ppc_frontend.cc
@@ -7,18 +7,17 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/frontend/ppc/ppc_frontend.h"
+#include "xenia/cpu/frontend/ppc_frontend.h"
 
-#include "xenia/cpu/frontend/ppc/ppc_context.h"
-#include "xenia/cpu/frontend/ppc/ppc_disasm.h"
-#include "xenia/cpu/frontend/ppc/ppc_emit.h"
-#include "xenia/cpu/frontend/ppc/ppc_translator.h"
+#include "xenia/cpu/frontend/ppc_context.h"
+#include "xenia/cpu/frontend/ppc_disasm.h"
+#include "xenia/cpu/frontend/ppc_emit.h"
+#include "xenia/cpu/frontend/ppc_translator.h"
 #include "xenia/cpu/runtime.h"
 
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 using xe::cpu::Runtime;
 
@@ -43,7 +42,7 @@ void InitializeIfNeeded() {
 
 void CleanupOnShutdown() {}
 
-PPCFrontend::PPCFrontend(Runtime* runtime) : Frontend(runtime) {
+PPCFrontend::PPCFrontend(Runtime* runtime) : runtime_(runtime) {
   InitializeIfNeeded();
 
   std::unique_ptr<ContextInfo> context_info(
@@ -58,6 +57,8 @@ PPCFrontend::~PPCFrontend() {
   translator_pool_.Reset();
 }
 
+Memory* PPCFrontend::memory() const { return runtime_->memory(); }
+
 void CheckGlobalLock(PPCContext* ppc_state, void* arg0, void* arg1) {
   ppc_state->scratch = 0x8000;
 }
@@ -75,11 +76,6 @@ void HandleGlobalLock(PPCContext* ppc_state, void* arg0, void* arg1) {
 }
 
 int PPCFrontend::Initialize() {
-  int result = Frontend::Initialize();
-  if (result) {
-    return result;
-  }
-
   void* arg0 = reinterpret_cast<void*>(&builtins_.global_lock);
   void* arg1 = reinterpret_cast<void*>(&builtins_.global_lock_taken);
   builtins_.check_global_lock = runtime_->DefineBuiltin(
@@ -89,7 +85,7 @@ int PPCFrontend::Initialize() {
       "HandleGlobalLock", (FunctionInfo::ExternHandler)HandleGlobalLock, arg0,
       arg1);
 
-  return result;
+  return 0;
 }
 
 int PPCFrontend::DeclareFunction(FunctionInfo* symbol_info) {
@@ -111,7 +107,6 @@ int PPCFrontend::DefineFunction(FunctionInfo* symbol_info,
   return result;
 }
 
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
diff --git a/src/xenia/cpu/frontend/ppc/ppc_frontend.h b/src/xenia/cpu/frontend/ppc_frontend.h
similarity index 60%
rename from src/xenia/cpu/frontend/ppc/ppc_frontend.h
rename to src/xenia/cpu/frontend/ppc_frontend.h
index 55546e392..c0af243fd 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_frontend.h
+++ b/src/xenia/cpu/frontend/ppc_frontend.h
@@ -7,18 +7,27 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_FRONTEND_PPC_PPC_FRONTEND_H_
-#define XENIA_FRONTEND_PPC_PPC_FRONTEND_H_
+#ifndef XENIA_FRONTEND_PPC_FRONTEND_H_
+#define XENIA_FRONTEND_PPC_FRONTEND_H_
 
+#include <memory>
 #include <mutex>
 
-#include "xenia/cpu/frontend/frontend.h"
 #include "poly/type_pool.h"
+#include "xenia/cpu/frontend/context_info.h"
+#include "xenia/memory.h"
+#include "xenia/cpu/function.h"
+#include "xenia/cpu/symbol_info.h"
+
+namespace xe {
+namespace cpu {
+class Runtime;
+}  // namespace cpu
+}  // namespace xe
 
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 class PPCTranslator;
 
@@ -29,27 +38,31 @@ struct PPCBuiltins {
   FunctionInfo* handle_global_lock;
 };
 
-class PPCFrontend : public Frontend {
+class PPCFrontend {
  public:
-  PPCFrontend(Runtime* runtime);
-  ~PPCFrontend() override;
+  explicit PPCFrontend(Runtime* runtime);
+  ~PPCFrontend();
 
-  int Initialize() override;
+  int Initialize();
 
+  Runtime* runtime() const { return runtime_; }
+  Memory* memory() const;
+  ContextInfo* context_info() const { return context_info_.get(); }
   PPCBuiltins* builtins() { return &builtins_; }
 
-  int DeclareFunction(FunctionInfo* symbol_info) override;
+  int DeclareFunction(FunctionInfo* symbol_info);
   int DefineFunction(FunctionInfo* symbol_info, uint32_t debug_info_flags,
-                     uint32_t trace_flags, Function** out_function) override;
+                     uint32_t trace_flags, Function** out_function);
 
  private:
-  poly::TypePool<PPCTranslator, PPCFrontend*> translator_pool_;
+  Runtime* runtime_;
+  std::unique_ptr<ContextInfo> context_info_;
   PPCBuiltins builtins_;
+  poly::TypePool<PPCTranslator, PPCFrontend*> translator_pool_;
 };
 
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
 
-#endif  // XENIA_FRONTEND_PPC_PPC_FRONTEND_H_
+#endif  // XENIA_FRONTEND_PPC_FRONTEND_H_
diff --git a/src/xenia/cpu/frontend/ppc/ppc_hir_builder.cc b/src/xenia/cpu/frontend/ppc_hir_builder.cc
similarity index 98%
rename from src/xenia/cpu/frontend/ppc/ppc_hir_builder.cc
rename to src/xenia/cpu/frontend/ppc_hir_builder.cc
index eaa074e21..5708ef932 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_hir_builder.cc
+++ b/src/xenia/cpu/frontend/ppc_hir_builder.cc
@@ -7,13 +7,13 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/frontend/ppc/ppc_hir_builder.h"
+#include "xenia/cpu/frontend/ppc_hir_builder.h"
 
 #include "xenia/cpu/cpu-private.h"
-#include "xenia/cpu/frontend/ppc/ppc_context.h"
-#include "xenia/cpu/frontend/ppc/ppc_disasm.h"
-#include "xenia/cpu/frontend/ppc/ppc_frontend.h"
-#include "xenia/cpu/frontend/ppc/ppc_instr.h"
+#include "xenia/cpu/frontend/ppc_context.h"
+#include "xenia/cpu/frontend/ppc_disasm.h"
+#include "xenia/cpu/frontend/ppc_frontend.h"
+#include "xenia/cpu/frontend/ppc_instr.h"
 #include "xenia/cpu/hir/label.h"
 #include "xenia/cpu/runtime.h"
 #include "xenia/profiling.h"
@@ -21,7 +21,6 @@
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 // TODO(benvanik): remove when enums redefined.
 using namespace xe::cpu::hir;
@@ -490,7 +489,6 @@ Value* PPCHIRBuilder::StoreRelease(Value* address, Value* value,
   return eq;
 }
 
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
diff --git a/src/xenia/cpu/frontend/ppc/ppc_hir_builder.h b/src/xenia/cpu/frontend/ppc_hir_builder.h
similarity index 94%
rename from src/xenia/cpu/frontend/ppc/ppc_hir_builder.h
rename to src/xenia/cpu/frontend/ppc_hir_builder.h
index a877f3848..3649255bc 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_hir_builder.h
+++ b/src/xenia/cpu/frontend/ppc_hir_builder.h
@@ -7,8 +7,8 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_FRONTEND_PPC_PPC_HIR_BUILDER_H_
-#define XENIA_FRONTEND_PPC_PPC_HIR_BUILDER_H_
+#ifndef XENIA_FRONTEND_PPC_HIR_BUILDER_H_
+#define XENIA_FRONTEND_PPC_HIR_BUILDER_H_
 
 #include "xenia/cpu/hir/hir_builder.h"
 #include "xenia/cpu/function.h"
@@ -18,7 +18,6 @@
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 class PPCFrontend;
 
@@ -112,9 +111,8 @@ class PPCHIRBuilder : public hir::HIRBuilder {
   } trace_info_;
 };
 
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
 
-#endif  // XENIA_FRONTEND_PPC_PPC_HIR_BUILDER_H_
+#endif  // XENIA_FRONTEND_PPC_HIR_BUILDER_H_
diff --git a/src/xenia/cpu/frontend/ppc/ppc_instr.cc b/src/xenia/cpu/frontend/ppc_instr.cc
similarity index 98%
rename from src/xenia/cpu/frontend/ppc/ppc_instr.cc
rename to src/xenia/cpu/frontend/ppc_instr.cc
index 8eba143fb..cc57172fa 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_instr.cc
+++ b/src/xenia/cpu/frontend/ppc_instr.cc
@@ -7,19 +7,18 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/frontend/ppc/ppc_instr.h"
+#include "xenia/cpu/frontend/ppc_instr.h"
 
 #include <sstream>
 #include <vector>
 
-#include "xenia/cpu/frontend/ppc/ppc_instr_tables.h"
+#include "xenia/cpu/frontend/ppc_instr_tables.h"
 #include "poly/poly.h"
 #include "poly/string_buffer.h"
 
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 std::vector<InstrType*> all_instrs_;
 
@@ -402,7 +401,6 @@ int RegisterInstrEmit(uint32_t code, InstrEmitFn emit) {
   return 0;
 }
 
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
diff --git a/src/xenia/cpu/frontend/ppc/ppc_instr.h b/src/xenia/cpu/frontend/ppc_instr.h
similarity index 98%
rename from src/xenia/cpu/frontend/ppc/ppc_instr.h
rename to src/xenia/cpu/frontend/ppc_instr.h
index d4d0ee846..865738c5c 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_instr.h
+++ b/src/xenia/cpu/frontend/ppc_instr.h
@@ -7,8 +7,8 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_FRONTEND_PPC_PPC_INSTR_H_
-#define XENIA_FRONTEND_PPC_PPC_INSTR_H_
+#ifndef XENIA_FRONTEND_PPC_INSTR_H_
+#define XENIA_FRONTEND_PPC_INSTR_H_
 
 #include <cstdint>
 #include <string>
@@ -19,7 +19,6 @@
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 inline uint32_t make_bitmask(uint32_t a, uint32_t b) {
   return (static_cast<uint32_t>(-1) >> (31 - b)) & ~((1u << a) - 1);
@@ -569,9 +568,8 @@ void DumpAllInstrCounts();
 InstrType* GetInstrType(uint32_t code);
 int RegisterInstrEmit(uint32_t code, InstrEmitFn emit);
 
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
 
-#endif  // XENIA_FRONTEND_PPC_PPC_INSTR_H_
+#endif  // XENIA_FRONTEND_PPC_INSTR_H_
diff --git a/src/xenia/cpu/frontend/ppc/ppc_instr_tables.h b/src/xenia/cpu/frontend/ppc_instr_tables.h
similarity index 99%
rename from src/xenia/cpu/frontend/ppc/ppc_instr_tables.h
rename to src/xenia/cpu/frontend/ppc_instr_tables.h
index e891e3670..b6264b024 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_instr_tables.h
+++ b/src/xenia/cpu/frontend/ppc_instr_tables.h
@@ -7,19 +7,18 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_FRONTEND_PPC_PPC_INSTR_TABLES_H_
-#define XENIA_FRONTEND_PPC_PPC_INSTR_TABLES_H_
+#ifndef XENIA_FRONTEND_PPC_INSTR_TABLES_H_
+#define XENIA_FRONTEND_PPC_INSTR_TABLES_H_
 
 #include <cmath>
 
-#include "xenia/cpu/frontend/ppc/ppc_instr.h"
+#include "xenia/cpu/frontend/ppc_instr.h"
 #include "poly/poly.h"
 #include "poly/string_buffer.h"
 
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 void Disasm_0(InstrData& i, poly::StringBuffer* str);
 void Disasm__(InstrData& i, poly::StringBuffer* str);
@@ -1094,9 +1093,8 @@ static InstrType instr_table_scan[] = {
 #undef EMPTY
 
 }  // namespace tables
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
 
-#endif  // XENIA_FRONTEND_PPC_PPC_INSTR_TABLES_H_
+#endif  // XENIA_FRONTEND_PPC_INSTR_TABLES_H_
diff --git a/src/xenia/cpu/frontend/ppc/ppc_scanner.cc b/src/xenia/cpu/frontend/ppc_scanner.cc
similarity index 98%
rename from src/xenia/cpu/frontend/ppc/ppc_scanner.cc
rename to src/xenia/cpu/frontend/ppc_scanner.cc
index ff60711f9..6249d546f 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_scanner.cc
+++ b/src/xenia/cpu/frontend/ppc_scanner.cc
@@ -7,13 +7,13 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/frontend/ppc/ppc_scanner.h"
+#include "xenia/cpu/frontend/ppc_scanner.h"
 
 #include <algorithm>
 #include <map>
 
-#include "xenia/cpu/frontend/ppc/ppc_frontend.h"
-#include "xenia/cpu/frontend/ppc/ppc_instr.h"
+#include "xenia/cpu/frontend/ppc_frontend.h"
+#include "xenia/cpu/frontend/ppc_instr.h"
 #include "xenia/cpu/runtime.h"
 #include "poly/logging.h"
 #include "poly/memory.h"
@@ -28,7 +28,6 @@
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 PPCScanner::PPCScanner(PPCFrontend* frontend) : frontend_(frontend) {}
 
@@ -357,7 +356,6 @@ std::vector<BlockInfo> PPCScanner::FindBlocks(FunctionInfo* symbol_info) {
   return blocks;
 }
 
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
diff --git a/src/xenia/cpu/frontend/ppc/ppc_scanner.h b/src/xenia/cpu/frontend/ppc_scanner.h
similarity index 86%
rename from src/xenia/cpu/frontend/ppc/ppc_scanner.h
rename to src/xenia/cpu/frontend/ppc_scanner.h
index 5ee8170cf..885bd0dd7 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_scanner.h
+++ b/src/xenia/cpu/frontend/ppc_scanner.h
@@ -7,8 +7,8 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_FRONTEND_PPC_PPC_SCANNER_H_
-#define XENIA_FRONTEND_PPC_PPC_SCANNER_H_
+#ifndef XENIA_FRONTEND_PPC_SCANNER_H_
+#define XENIA_FRONTEND_PPC_SCANNER_H_
 
 #include <vector>
 
@@ -17,7 +17,6 @@
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 class PPCFrontend;
 
@@ -42,9 +41,8 @@ class PPCScanner {
   PPCFrontend* frontend_;
 };
 
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
 
-#endif  // XENIA_FRONTEND_PPC_PPC_SCANNER_H_
+#endif  // XENIA_FRONTEND_PPC_SCANNER_H_
diff --git a/src/xenia/cpu/frontend/ppc/ppc_translator.cc b/src/xenia/cpu/frontend/ppc_translator.cc
similarity index 95%
rename from src/xenia/cpu/frontend/ppc/ppc_translator.cc
rename to src/xenia/cpu/frontend/ppc_translator.cc
index 2c055c7fc..94cebb28a 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_translator.cc
+++ b/src/xenia/cpu/frontend/ppc_translator.cc
@@ -7,15 +7,15 @@
  ******************************************************************************
  */
 
-#include "xenia/cpu/frontend/ppc/ppc_translator.h"
+#include "xenia/cpu/frontend/ppc_translator.h"
 
 #include "xenia/cpu/compiler/compiler_passes.h"
 #include "xenia/cpu/cpu-private.h"
-#include "xenia/cpu/frontend/ppc/ppc_disasm.h"
-#include "xenia/cpu/frontend/ppc/ppc_frontend.h"
-#include "xenia/cpu/frontend/ppc/ppc_hir_builder.h"
-#include "xenia/cpu/frontend/ppc/ppc_instr.h"
-#include "xenia/cpu/frontend/ppc/ppc_scanner.h"
+#include "xenia/cpu/frontend/ppc_disasm.h"
+#include "xenia/cpu/frontend/ppc_frontend.h"
+#include "xenia/cpu/frontend/ppc_hir_builder.h"
+#include "xenia/cpu/frontend/ppc_instr.h"
+#include "xenia/cpu/frontend/ppc_scanner.h"
 #include "xenia/cpu/runtime.h"
 #include "poly/reset_scope.h"
 #include "xenia/profiling.h"
@@ -23,7 +23,6 @@
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 // TODO(benvanik): remove when enums redefined.
 using namespace xe::cpu;
@@ -124,7 +123,7 @@ int PPCTranslator::Translate(FunctionInfo* symbol_info,
   }
 
   if (false) {
-    xe::cpu::frontend::ppc::DumpAllInstrCounts();
+    xe::cpu::frontend::DumpAllInstrCounts();
   }
 
   // Emit function.
@@ -208,7 +207,6 @@ void PPCTranslator::DumpSource(FunctionInfo* symbol_info,
   }
 }
 
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
diff --git a/src/xenia/cpu/frontend/ppc/ppc_translator.h b/src/xenia/cpu/frontend/ppc_translator.h
similarity index 89%
rename from src/xenia/cpu/frontend/ppc/ppc_translator.h
rename to src/xenia/cpu/frontend/ppc_translator.h
index 852d80655..db6ae5f75 100644
--- a/src/xenia/cpu/frontend/ppc/ppc_translator.h
+++ b/src/xenia/cpu/frontend/ppc_translator.h
@@ -7,8 +7,8 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_FRONTEND_PPC_PPC_TRANSLATOR_H_
-#define XENIA_FRONTEND_PPC_PPC_TRANSLATOR_H_
+#ifndef XENIA_FRONTEND_PPC_TRANSLATOR_H_
+#define XENIA_FRONTEND_PPC_TRANSLATOR_H_
 
 #include <memory>
 
@@ -20,7 +20,6 @@
 namespace xe {
 namespace cpu {
 namespace frontend {
-namespace ppc {
 
 class PPCFrontend;
 class PPCHIRBuilder;
@@ -47,9 +46,8 @@ class PPCTranslator {
   poly::StringBuffer string_buffer_;
 };
 
-}  // namespace ppc
 }  // namespace frontend
 }  // namespace cpu
 }  // namespace xe
 
-#endif  // XENIA_FRONTEND_PPC_PPC_TRANSLATOR_H_
+#endif  // XENIA_FRONTEND_PPC_TRANSLATOR_H_
diff --git a/src/xenia/cpu/frontend/sources.gypi b/src/xenia/cpu/frontend/sources.gypi
index 7635a2678..67ea0774d 100644
--- a/src/xenia/cpu/frontend/sources.gypi
+++ b/src/xenia/cpu/frontend/sources.gypi
@@ -3,11 +3,30 @@
   'sources': [
     'context_info.cc',
     'context_info.h',
-    'frontend.cc',
-    'frontend.h',
+    'ppc_context.cc',
+    'ppc_context.h',
+    'ppc_disasm.cc',
+    'ppc_disasm.h',
+    'ppc_emit-private.h',
+    'ppc_emit.h',
+    'ppc_emit_altivec.cc',
+    'ppc_emit_alu.cc',
+    'ppc_emit_control.cc',
+    'ppc_emit_fpu.cc',
+    'ppc_emit_memory.cc',
+    'ppc_frontend.cc',
+    'ppc_frontend.h',
+    'ppc_hir_builder.cc',
+    'ppc_hir_builder.h',
+    'ppc_instr.cc',
+    'ppc_instr.h',
+    'ppc_instr_tables.h',
+    'ppc_scanner.cc',
+    'ppc_scanner.h',
+    'ppc_translator.cc',
+    'ppc_translator.h',
   ],
 
   'includes': [
-    'ppc/sources.gypi',
   ],
 }
diff --git a/src/xenia/cpu/frontend/ppc/test/README.md b/src/xenia/cpu/frontend/test/README.md
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/README.md
rename to src/xenia/cpu/frontend/test/README.md
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_add.bin b/src/xenia/cpu/frontend/test/bin/instr_add.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_add.bin
rename to src/xenia/cpu/frontend/test/bin/instr_add.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_add.dis b/src/xenia/cpu/frontend/test/bin/instr_add.dis
similarity index 72%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_add.dis
rename to src/xenia/cpu/frontend/test/bin/instr_add.dis
index edb6347bc..7a54960b2 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_add.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_add.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_add.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_add.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_add.map b/src/xenia/cpu/frontend/test/bin/instr_add.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_add.map
rename to src/xenia/cpu/frontend/test/bin/instr_add.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_addc.bin b/src/xenia/cpu/frontend/test/bin/instr_addc.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_addc.bin
rename to src/xenia/cpu/frontend/test/bin/instr_addc.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_addc.dis b/src/xenia/cpu/frontend/test/bin/instr_addc.dis
similarity index 89%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_addc.dis
rename to src/xenia/cpu/frontend/test/bin/instr_addc.dis
index 87d699b0f..a2b5d1802 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_addc.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_addc.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_addc.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_addc.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_addc.map b/src/xenia/cpu/frontend/test/bin/instr_addc.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_addc.map
rename to src/xenia/cpu/frontend/test/bin/instr_addc.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_adde.bin b/src/xenia/cpu/frontend/test/bin/instr_adde.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_adde.bin
rename to src/xenia/cpu/frontend/test/bin/instr_adde.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_adde.dis b/src/xenia/cpu/frontend/test/bin/instr_adde.dis
similarity index 95%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_adde.dis
rename to src/xenia/cpu/frontend/test/bin/instr_adde.dis
index b8b472c03..4f040f1d7 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_adde.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_adde.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_adde.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_adde.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_adde.map b/src/xenia/cpu/frontend/test/bin/instr_adde.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_adde.map
rename to src/xenia/cpu/frontend/test/bin/instr_adde.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_addic.bin b/src/xenia/cpu/frontend/test/bin/instr_addic.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_addic.bin
rename to src/xenia/cpu/frontend/test/bin/instr_addic.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_addic.dis b/src/xenia/cpu/frontend/test/bin/instr_addic.dis
similarity index 77%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_addic.dis
rename to src/xenia/cpu/frontend/test/bin/instr_addic.dis
index 89398bf12..f095c3be4 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_addic.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_addic.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_addic.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_addic.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_addic.map b/src/xenia/cpu/frontend/test/bin/instr_addic.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_addic.map
rename to src/xenia/cpu/frontend/test/bin/instr_addic.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_addme.bin b/src/xenia/cpu/frontend/test/bin/instr_addme.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_addme.bin
rename to src/xenia/cpu/frontend/test/bin/instr_addme.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_addme.dis b/src/xenia/cpu/frontend/test/bin/instr_addme.dis
similarity index 94%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_addme.dis
rename to src/xenia/cpu/frontend/test/bin/instr_addme.dis
index 2c428c6a5..9e4c0f592 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_addme.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_addme.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_addme.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_addme.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_addme.map b/src/xenia/cpu/frontend/test/bin/instr_addme.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_addme.map
rename to src/xenia/cpu/frontend/test/bin/instr_addme.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_addze.bin b/src/xenia/cpu/frontend/test/bin/instr_addze.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_addze.bin
rename to src/xenia/cpu/frontend/test/bin/instr_addze.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_addze.dis b/src/xenia/cpu/frontend/test/bin/instr_addze.dis
similarity index 94%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_addze.dis
rename to src/xenia/cpu/frontend/test/bin/instr_addze.dis
index 9abe262b3..4de52588b 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_addze.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_addze.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_addze.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_addze.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_addze.map b/src/xenia/cpu/frontend/test/bin/instr_addze.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_addze.map
rename to src/xenia/cpu/frontend/test/bin/instr_addze.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_cntlzd.bin b/src/xenia/cpu/frontend/test/bin/instr_cntlzd.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_cntlzd.bin
rename to src/xenia/cpu/frontend/test/bin/instr_cntlzd.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_cntlzd.dis b/src/xenia/cpu/frontend/test/bin/instr_cntlzd.dis
similarity index 82%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_cntlzd.dis
rename to src/xenia/cpu/frontend/test/bin/instr_cntlzd.dis
index a88c70f14..3901eb8ab 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_cntlzd.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_cntlzd.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_cntlzd.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_cntlzd.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_cntlzd.map b/src/xenia/cpu/frontend/test/bin/instr_cntlzd.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_cntlzd.map
rename to src/xenia/cpu/frontend/test/bin/instr_cntlzd.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_cntlzw.bin b/src/xenia/cpu/frontend/test/bin/instr_cntlzw.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_cntlzw.bin
rename to src/xenia/cpu/frontend/test/bin/instr_cntlzw.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_cntlzw.dis b/src/xenia/cpu/frontend/test/bin/instr_cntlzw.dis
similarity index 82%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_cntlzw.dis
rename to src/xenia/cpu/frontend/test/bin/instr_cntlzw.dis
index 53f45a573..aed40e2e4 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_cntlzw.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_cntlzw.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_cntlzw.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_cntlzw.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_cntlzw.map b/src/xenia/cpu/frontend/test/bin/instr_cntlzw.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_cntlzw.map
rename to src/xenia/cpu/frontend/test/bin/instr_cntlzw.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_divd.bin b/src/xenia/cpu/frontend/test/bin/instr_divd.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_divd.bin
rename to src/xenia/cpu/frontend/test/bin/instr_divd.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_divd.dis b/src/xenia/cpu/frontend/test/bin/instr_divd.dis
similarity index 89%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_divd.dis
rename to src/xenia/cpu/frontend/test/bin/instr_divd.dis
index c2dc23d56..27c6d57fd 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_divd.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_divd.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_divd.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_divd.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_divd.map b/src/xenia/cpu/frontend/test/bin/instr_divd.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_divd.map
rename to src/xenia/cpu/frontend/test/bin/instr_divd.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_divdu.bin b/src/xenia/cpu/frontend/test/bin/instr_divdu.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_divdu.bin
rename to src/xenia/cpu/frontend/test/bin/instr_divdu.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_divdu.dis b/src/xenia/cpu/frontend/test/bin/instr_divdu.dis
similarity index 90%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_divdu.dis
rename to src/xenia/cpu/frontend/test/bin/instr_divdu.dis
index fb8ff3e88..ce29e7149 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_divdu.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_divdu.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_divdu.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_divdu.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_divdu.map b/src/xenia/cpu/frontend/test/bin/instr_divdu.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_divdu.map
rename to src/xenia/cpu/frontend/test/bin/instr_divdu.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_divw.bin b/src/xenia/cpu/frontend/test/bin/instr_divw.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_divw.bin
rename to src/xenia/cpu/frontend/test/bin/instr_divw.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_divw.dis b/src/xenia/cpu/frontend/test/bin/instr_divw.dis
similarity index 92%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_divw.dis
rename to src/xenia/cpu/frontend/test/bin/instr_divw.dis
index 93d6f8a0b..f83bee62b 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_divw.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_divw.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_divw.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_divw.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_divw.map b/src/xenia/cpu/frontend/test/bin/instr_divw.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_divw.map
rename to src/xenia/cpu/frontend/test/bin/instr_divw.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_divwu.bin b/src/xenia/cpu/frontend/test/bin/instr_divwu.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_divwu.bin
rename to src/xenia/cpu/frontend/test/bin/instr_divwu.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_divwu.dis b/src/xenia/cpu/frontend/test/bin/instr_divwu.dis
similarity index 92%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_divwu.dis
rename to src/xenia/cpu/frontend/test/bin/instr_divwu.dis
index 6a9c22a0e..f69eb2d5b 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_divwu.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_divwu.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_divwu.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_divwu.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_divwu.map b/src/xenia/cpu/frontend/test/bin/instr_divwu.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_divwu.map
rename to src/xenia/cpu/frontend/test/bin/instr_divwu.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_eqv.bin b/src/xenia/cpu/frontend/test/bin/instr_eqv.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_eqv.bin
rename to src/xenia/cpu/frontend/test/bin/instr_eqv.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_eqv.dis b/src/xenia/cpu/frontend/test/bin/instr_eqv.dis
similarity index 87%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_eqv.dis
rename to src/xenia/cpu/frontend/test/bin/instr_eqv.dis
index c85336360..5bb457bd4 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_eqv.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_eqv.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_eqv.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_eqv.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_eqv.map b/src/xenia/cpu/frontend/test/bin/instr_eqv.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_eqv.map
rename to src/xenia/cpu/frontend/test/bin/instr_eqv.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_fabs.bin b/src/xenia/cpu/frontend/test/bin/instr_fabs.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_fabs.bin
rename to src/xenia/cpu/frontend/test/bin/instr_fabs.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_fabs.dis b/src/xenia/cpu/frontend/test/bin/instr_fabs.dis
similarity index 78%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_fabs.dis
rename to src/xenia/cpu/frontend/test/bin/instr_fabs.dis
index f440b2968..7d637d57e 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_fabs.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_fabs.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_fabs.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_fabs.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_fabs.map b/src/xenia/cpu/frontend/test/bin/instr_fabs.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_fabs.map
rename to src/xenia/cpu/frontend/test/bin/instr_fabs.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_fsel.bin b/src/xenia/cpu/frontend/test/bin/instr_fsel.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_fsel.bin
rename to src/xenia/cpu/frontend/test/bin/instr_fsel.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_fsel.dis b/src/xenia/cpu/frontend/test/bin/instr_fsel.dis
similarity index 79%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_fsel.dis
rename to src/xenia/cpu/frontend/test/bin/instr_fsel.dis
index ff6d87cfb..f14a44e88 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_fsel.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_fsel.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_fsel.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_fsel.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_fsel.map b/src/xenia/cpu/frontend/test/bin/instr_fsel.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_fsel.map
rename to src/xenia/cpu/frontend/test/bin/instr_fsel.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_lvexx.bin b/src/xenia/cpu/frontend/test/bin/instr_lvexx.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_lvexx.bin
rename to src/xenia/cpu/frontend/test/bin/instr_lvexx.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_lvexx.dis b/src/xenia/cpu/frontend/test/bin/instr_lvexx.dis
similarity index 87%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_lvexx.dis
rename to src/xenia/cpu/frontend/test/bin/instr_lvexx.dis
index e7f263a6d..c7c29c95e 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_lvexx.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_lvexx.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_lvexx.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_lvexx.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_lvexx.map b/src/xenia/cpu/frontend/test/bin/instr_lvexx.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_lvexx.map
rename to src/xenia/cpu/frontend/test/bin/instr_lvexx.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_lvl.bin b/src/xenia/cpu/frontend/test/bin/instr_lvl.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_lvl.bin
rename to src/xenia/cpu/frontend/test/bin/instr_lvl.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_lvl.dis b/src/xenia/cpu/frontend/test/bin/instr_lvl.dis
similarity index 59%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_lvl.dis
rename to src/xenia/cpu/frontend/test/bin/instr_lvl.dis
index 358b5f8ce..02d16b796 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_lvl.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_lvl.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_lvl.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_lvl.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_lvl.map b/src/xenia/cpu/frontend/test/bin/instr_lvl.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_lvl.map
rename to src/xenia/cpu/frontend/test/bin/instr_lvl.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_lvr.bin b/src/xenia/cpu/frontend/test/bin/instr_lvr.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_lvr.bin
rename to src/xenia/cpu/frontend/test/bin/instr_lvr.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_lvr.dis b/src/xenia/cpu/frontend/test/bin/instr_lvr.dis
similarity index 59%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_lvr.dis
rename to src/xenia/cpu/frontend/test/bin/instr_lvr.dis
index fcdaec821..36f22d14f 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_lvr.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_lvr.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_lvr.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_lvr.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_lvr.map b/src/xenia/cpu/frontend/test/bin/instr_lvr.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_lvr.map
rename to src/xenia/cpu/frontend/test/bin/instr_lvr.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_lvsl.bin b/src/xenia/cpu/frontend/test/bin/instr_lvsl.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_lvsl.bin
rename to src/xenia/cpu/frontend/test/bin/instr_lvsl.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_lvsl.dis b/src/xenia/cpu/frontend/test/bin/instr_lvsl.dis
similarity index 78%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_lvsl.dis
rename to src/xenia/cpu/frontend/test/bin/instr_lvsl.dis
index 298d4443a..9edfaac9b 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_lvsl.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_lvsl.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_lvsl.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_lvsl.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_lvsl.map b/src/xenia/cpu/frontend/test/bin/instr_lvsl.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_lvsl.map
rename to src/xenia/cpu/frontend/test/bin/instr_lvsl.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_lvsr.bin b/src/xenia/cpu/frontend/test/bin/instr_lvsr.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_lvsr.bin
rename to src/xenia/cpu/frontend/test/bin/instr_lvsr.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_lvsr.dis b/src/xenia/cpu/frontend/test/bin/instr_lvsr.dis
similarity index 78%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_lvsr.dis
rename to src/xenia/cpu/frontend/test/bin/instr_lvsr.dis
index 298c614fd..85721c7e9 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_lvsr.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_lvsr.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_lvsr.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_lvsr.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_lvsr.map b/src/xenia/cpu/frontend/test/bin/instr_lvsr.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_lvsr.map
rename to src/xenia/cpu/frontend/test/bin/instr_lvsr.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulhd.bin b/src/xenia/cpu/frontend/test/bin/instr_mulhd.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_mulhd.bin
rename to src/xenia/cpu/frontend/test/bin/instr_mulhd.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulhd.dis b/src/xenia/cpu/frontend/test/bin/instr_mulhd.dis
similarity index 85%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_mulhd.dis
rename to src/xenia/cpu/frontend/test/bin/instr_mulhd.dis
index 436b1a8d2..eb450bc7c 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulhd.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_mulhd.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_mulhd.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_mulhd.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulhd.map b/src/xenia/cpu/frontend/test/bin/instr_mulhd.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_mulhd.map
rename to src/xenia/cpu/frontend/test/bin/instr_mulhd.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulhdu.bin b/src/xenia/cpu/frontend/test/bin/instr_mulhdu.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_mulhdu.bin
rename to src/xenia/cpu/frontend/test/bin/instr_mulhdu.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulhdu.dis b/src/xenia/cpu/frontend/test/bin/instr_mulhdu.dis
similarity index 85%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_mulhdu.dis
rename to src/xenia/cpu/frontend/test/bin/instr_mulhdu.dis
index 2f9180b92..1e7f4c331 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulhdu.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_mulhdu.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_mulhdu.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_mulhdu.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulhdu.map b/src/xenia/cpu/frontend/test/bin/instr_mulhdu.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_mulhdu.map
rename to src/xenia/cpu/frontend/test/bin/instr_mulhdu.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulhw.bin b/src/xenia/cpu/frontend/test/bin/instr_mulhw.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_mulhw.bin
rename to src/xenia/cpu/frontend/test/bin/instr_mulhw.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulhw.dis b/src/xenia/cpu/frontend/test/bin/instr_mulhw.dis
similarity index 87%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_mulhw.dis
rename to src/xenia/cpu/frontend/test/bin/instr_mulhw.dis
index cd8508dff..c2f22970e 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulhw.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_mulhw.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_mulhw.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_mulhw.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulhw.map b/src/xenia/cpu/frontend/test/bin/instr_mulhw.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_mulhw.map
rename to src/xenia/cpu/frontend/test/bin/instr_mulhw.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulhwu.bin b/src/xenia/cpu/frontend/test/bin/instr_mulhwu.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_mulhwu.bin
rename to src/xenia/cpu/frontend/test/bin/instr_mulhwu.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulhwu.dis b/src/xenia/cpu/frontend/test/bin/instr_mulhwu.dis
similarity index 87%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_mulhwu.dis
rename to src/xenia/cpu/frontend/test/bin/instr_mulhwu.dis
index e8d0c3e0e..5d2f29f4d 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulhwu.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_mulhwu.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_mulhwu.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_mulhwu.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulhwu.map b/src/xenia/cpu/frontend/test/bin/instr_mulhwu.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_mulhwu.map
rename to src/xenia/cpu/frontend/test/bin/instr_mulhwu.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulld.bin b/src/xenia/cpu/frontend/test/bin/instr_mulld.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_mulld.bin
rename to src/xenia/cpu/frontend/test/bin/instr_mulld.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulld.dis b/src/xenia/cpu/frontend/test/bin/instr_mulld.dis
similarity index 90%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_mulld.dis
rename to src/xenia/cpu/frontend/test/bin/instr_mulld.dis
index 54dffd70d..1122b276e 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulld.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_mulld.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_mulld.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_mulld.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulld.map b/src/xenia/cpu/frontend/test/bin/instr_mulld.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_mulld.map
rename to src/xenia/cpu/frontend/test/bin/instr_mulld.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulli.bin b/src/xenia/cpu/frontend/test/bin/instr_mulli.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_mulli.bin
rename to src/xenia/cpu/frontend/test/bin/instr_mulli.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulli.dis b/src/xenia/cpu/frontend/test/bin/instr_mulli.dis
similarity index 90%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_mulli.dis
rename to src/xenia/cpu/frontend/test/bin/instr_mulli.dis
index 5a2b0500d..8f84db690 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulli.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_mulli.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_mulli.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_mulli.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_mulli.map b/src/xenia/cpu/frontend/test/bin/instr_mulli.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_mulli.map
rename to src/xenia/cpu/frontend/test/bin/instr_mulli.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_mullw.bin b/src/xenia/cpu/frontend/test/bin/instr_mullw.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_mullw.bin
rename to src/xenia/cpu/frontend/test/bin/instr_mullw.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_mullw.dis b/src/xenia/cpu/frontend/test/bin/instr_mullw.dis
similarity index 92%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_mullw.dis
rename to src/xenia/cpu/frontend/test/bin/instr_mullw.dis
index 44bf4c4c6..15539c010 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_mullw.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_mullw.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_mullw.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_mullw.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_mullw.map b/src/xenia/cpu/frontend/test/bin/instr_mullw.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_mullw.map
rename to src/xenia/cpu/frontend/test/bin/instr_mullw.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_neg.bin b/src/xenia/cpu/frontend/test/bin/instr_neg.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_neg.bin
rename to src/xenia/cpu/frontend/test/bin/instr_neg.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_neg.dis b/src/xenia/cpu/frontend/test/bin/instr_neg.dis
similarity index 78%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_neg.dis
rename to src/xenia/cpu/frontend/test/bin/instr_neg.dis
index d0466abcd..8a722a691 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_neg.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_neg.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_neg.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_neg.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_neg.map b/src/xenia/cpu/frontend/test/bin/instr_neg.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_neg.map
rename to src/xenia/cpu/frontend/test/bin/instr_neg.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_nor.bin b/src/xenia/cpu/frontend/test/bin/instr_nor.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_nor.bin
rename to src/xenia/cpu/frontend/test/bin/instr_nor.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_nor.dis b/src/xenia/cpu/frontend/test/bin/instr_nor.dis
similarity index 76%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_nor.dis
rename to src/xenia/cpu/frontend/test/bin/instr_nor.dis
index d132762c6..0ce13d6a8 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_nor.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_nor.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_nor.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_nor.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_nor.map b/src/xenia/cpu/frontend/test/bin/instr_nor.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_nor.map
rename to src/xenia/cpu/frontend/test/bin/instr_nor.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_ori.bin b/src/xenia/cpu/frontend/test/bin/instr_ori.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_ori.bin
rename to src/xenia/cpu/frontend/test/bin/instr_ori.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_ori.dis b/src/xenia/cpu/frontend/test/bin/instr_ori.dis
similarity index 72%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_ori.dis
rename to src/xenia/cpu/frontend/test/bin/instr_ori.dis
index 724c48110..d01944591 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_ori.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_ori.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_ori.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_ori.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_ori.map b/src/xenia/cpu/frontend/test/bin/instr_ori.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_ori.map
rename to src/xenia/cpu/frontend/test/bin/instr_ori.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_rldicl.bin b/src/xenia/cpu/frontend/test/bin/instr_rldicl.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_rldicl.bin
rename to src/xenia/cpu/frontend/test/bin/instr_rldicl.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_rldicl.dis b/src/xenia/cpu/frontend/test/bin/instr_rldicl.dis
similarity index 94%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_rldicl.dis
rename to src/xenia/cpu/frontend/test/bin/instr_rldicl.dis
index 78e51f198..5fdd860a6 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_rldicl.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_rldicl.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_rldicl.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_rldicl.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_rldicl.map b/src/xenia/cpu/frontend/test/bin/instr_rldicl.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_rldicl.map
rename to src/xenia/cpu/frontend/test/bin/instr_rldicl.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_rldicr.bin b/src/xenia/cpu/frontend/test/bin/instr_rldicr.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_rldicr.bin
rename to src/xenia/cpu/frontend/test/bin/instr_rldicr.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_rldicr.dis b/src/xenia/cpu/frontend/test/bin/instr_rldicr.dis
similarity index 94%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_rldicr.dis
rename to src/xenia/cpu/frontend/test/bin/instr_rldicr.dis
index c4e024f2d..a0132e2a1 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_rldicr.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_rldicr.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_rldicr.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_rldicr.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_rldicr.map b/src/xenia/cpu/frontend/test/bin/instr_rldicr.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_rldicr.map
rename to src/xenia/cpu/frontend/test/bin/instr_rldicr.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_rlwimi.bin b/src/xenia/cpu/frontend/test/bin/instr_rlwimi.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_rlwimi.bin
rename to src/xenia/cpu/frontend/test/bin/instr_rlwimi.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_rlwimi.dis b/src/xenia/cpu/frontend/test/bin/instr_rlwimi.dis
similarity index 59%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_rlwimi.dis
rename to src/xenia/cpu/frontend/test/bin/instr_rlwimi.dis
index 4d06c9b15..56e92ae67 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_rlwimi.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_rlwimi.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_rlwimi.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_rlwimi.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_rlwimi.map b/src/xenia/cpu/frontend/test/bin/instr_rlwimi.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_rlwimi.map
rename to src/xenia/cpu/frontend/test/bin/instr_rlwimi.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_rlwinm.bin b/src/xenia/cpu/frontend/test/bin/instr_rlwinm.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_rlwinm.bin
rename to src/xenia/cpu/frontend/test/bin/instr_rlwinm.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_rlwinm.dis b/src/xenia/cpu/frontend/test/bin/instr_rlwinm.dis
similarity index 92%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_rlwinm.dis
rename to src/xenia/cpu/frontend/test/bin/instr_rlwinm.dis
index 117e3cbbb..035b6851c 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_rlwinm.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_rlwinm.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_rlwinm.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_rlwinm.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_rlwinm.map b/src/xenia/cpu/frontend/test/bin/instr_rlwinm.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_rlwinm.map
rename to src/xenia/cpu/frontend/test/bin/instr_rlwinm.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_rlwnm.bin b/src/xenia/cpu/frontend/test/bin/instr_rlwnm.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_rlwnm.bin
rename to src/xenia/cpu/frontend/test/bin/instr_rlwnm.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_rlwnm.dis b/src/xenia/cpu/frontend/test/bin/instr_rlwnm.dis
similarity index 92%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_rlwnm.dis
rename to src/xenia/cpu/frontend/test/bin/instr_rlwnm.dis
index ff39d3374..da3df72eb 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_rlwnm.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_rlwnm.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_rlwnm.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_rlwnm.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_rlwnm.map b/src/xenia/cpu/frontend/test/bin/instr_rlwnm.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_rlwnm.map
rename to src/xenia/cpu/frontend/test/bin/instr_rlwnm.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_sld.bin b/src/xenia/cpu/frontend/test/bin/instr_sld.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_sld.bin
rename to src/xenia/cpu/frontend/test/bin/instr_sld.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_sld.dis b/src/xenia/cpu/frontend/test/bin/instr_sld.dis
similarity index 89%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_sld.dis
rename to src/xenia/cpu/frontend/test/bin/instr_sld.dis
index 9c45d277d..2cd85a9d5 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_sld.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_sld.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_sld.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_sld.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_sld.map b/src/xenia/cpu/frontend/test/bin/instr_sld.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_sld.map
rename to src/xenia/cpu/frontend/test/bin/instr_sld.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_slw.bin b/src/xenia/cpu/frontend/test/bin/instr_slw.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_slw.bin
rename to src/xenia/cpu/frontend/test/bin/instr_slw.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_slw.dis b/src/xenia/cpu/frontend/test/bin/instr_slw.dis
similarity index 91%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_slw.dis
rename to src/xenia/cpu/frontend/test/bin/instr_slw.dis
index 89c526003..ca10328b2 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_slw.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_slw.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_slw.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_slw.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_slw.map b/src/xenia/cpu/frontend/test/bin/instr_slw.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_slw.map
rename to src/xenia/cpu/frontend/test/bin/instr_slw.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_srad.bin b/src/xenia/cpu/frontend/test/bin/instr_srad.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_srad.bin
rename to src/xenia/cpu/frontend/test/bin/instr_srad.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_srad.dis b/src/xenia/cpu/frontend/test/bin/instr_srad.dis
similarity index 91%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_srad.dis
rename to src/xenia/cpu/frontend/test/bin/instr_srad.dis
index 47e6c61f6..fceeb47ab 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_srad.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_srad.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_srad.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_srad.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_srad.map b/src/xenia/cpu/frontend/test/bin/instr_srad.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_srad.map
rename to src/xenia/cpu/frontend/test/bin/instr_srad.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_sradi.bin b/src/xenia/cpu/frontend/test/bin/instr_sradi.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_sradi.bin
rename to src/xenia/cpu/frontend/test/bin/instr_sradi.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_sradi.dis b/src/xenia/cpu/frontend/test/bin/instr_sradi.dis
similarity index 88%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_sradi.dis
rename to src/xenia/cpu/frontend/test/bin/instr_sradi.dis
index 386bc9188..77e557049 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_sradi.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_sradi.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_sradi.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_sradi.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_sradi.map b/src/xenia/cpu/frontend/test/bin/instr_sradi.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_sradi.map
rename to src/xenia/cpu/frontend/test/bin/instr_sradi.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_sraw.bin b/src/xenia/cpu/frontend/test/bin/instr_sraw.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_sraw.bin
rename to src/xenia/cpu/frontend/test/bin/instr_sraw.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_sraw.dis b/src/xenia/cpu/frontend/test/bin/instr_sraw.dis
similarity index 93%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_sraw.dis
rename to src/xenia/cpu/frontend/test/bin/instr_sraw.dis
index 74d6ae0d8..400eedefa 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_sraw.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_sraw.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_sraw.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_sraw.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_sraw.map b/src/xenia/cpu/frontend/test/bin/instr_sraw.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_sraw.map
rename to src/xenia/cpu/frontend/test/bin/instr_sraw.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_srawi.bin b/src/xenia/cpu/frontend/test/bin/instr_srawi.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_srawi.bin
rename to src/xenia/cpu/frontend/test/bin/instr_srawi.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_srawi.dis b/src/xenia/cpu/frontend/test/bin/instr_srawi.dis
similarity index 88%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_srawi.dis
rename to src/xenia/cpu/frontend/test/bin/instr_srawi.dis
index 69c8e3907..a3829b17e 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_srawi.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_srawi.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_srawi.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_srawi.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_srawi.map b/src/xenia/cpu/frontend/test/bin/instr_srawi.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_srawi.map
rename to src/xenia/cpu/frontend/test/bin/instr_srawi.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_srd.bin b/src/xenia/cpu/frontend/test/bin/instr_srd.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_srd.bin
rename to src/xenia/cpu/frontend/test/bin/instr_srd.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_srd.dis b/src/xenia/cpu/frontend/test/bin/instr_srd.dis
similarity index 89%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_srd.dis
rename to src/xenia/cpu/frontend/test/bin/instr_srd.dis
index 0a45b4cf5..5a1baefac 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_srd.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_srd.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_srd.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_srd.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_srd.map b/src/xenia/cpu/frontend/test/bin/instr_srd.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_srd.map
rename to src/xenia/cpu/frontend/test/bin/instr_srd.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_srw.bin b/src/xenia/cpu/frontend/test/bin/instr_srw.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_srw.bin
rename to src/xenia/cpu/frontend/test/bin/instr_srw.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_srw.dis b/src/xenia/cpu/frontend/test/bin/instr_srw.dis
similarity index 91%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_srw.dis
rename to src/xenia/cpu/frontend/test/bin/instr_srw.dis
index 70b5dc722..d005a0f58 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_srw.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_srw.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_srw.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_srw.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_srw.map b/src/xenia/cpu/frontend/test/bin/instr_srw.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_srw.map
rename to src/xenia/cpu/frontend/test/bin/instr_srw.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_stvew.bin b/src/xenia/cpu/frontend/test/bin/instr_stvew.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_stvew.bin
rename to src/xenia/cpu/frontend/test/bin/instr_stvew.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_stvew.dis b/src/xenia/cpu/frontend/test/bin/instr_stvew.dis
similarity index 82%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_stvew.dis
rename to src/xenia/cpu/frontend/test/bin/instr_stvew.dis
index 18dba2a35..688c055e5 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_stvew.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_stvew.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_stvew.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_stvew.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_stvew.map b/src/xenia/cpu/frontend/test/bin/instr_stvew.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_stvew.map
rename to src/xenia/cpu/frontend/test/bin/instr_stvew.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_stvl.bin b/src/xenia/cpu/frontend/test/bin/instr_stvl.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_stvl.bin
rename to src/xenia/cpu/frontend/test/bin/instr_stvl.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_stvl.dis b/src/xenia/cpu/frontend/test/bin/instr_stvl.dis
similarity index 72%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_stvl.dis
rename to src/xenia/cpu/frontend/test/bin/instr_stvl.dis
index 878d30754..65b99df36 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_stvl.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_stvl.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_stvl.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_stvl.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_stvl.map b/src/xenia/cpu/frontend/test/bin/instr_stvl.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_stvl.map
rename to src/xenia/cpu/frontend/test/bin/instr_stvl.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_stvr.bin b/src/xenia/cpu/frontend/test/bin/instr_stvr.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_stvr.bin
rename to src/xenia/cpu/frontend/test/bin/instr_stvr.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_stvr.dis b/src/xenia/cpu/frontend/test/bin/instr_stvr.dis
similarity index 72%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_stvr.dis
rename to src/xenia/cpu/frontend/test/bin/instr_stvr.dis
index daf9a7d7f..8663d1863 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_stvr.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_stvr.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_stvr.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_stvr.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_stvr.map b/src/xenia/cpu/frontend/test/bin/instr_stvr.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_stvr.map
rename to src/xenia/cpu/frontend/test/bin/instr_stvr.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_subf.bin b/src/xenia/cpu/frontend/test/bin/instr_subf.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_subf.bin
rename to src/xenia/cpu/frontend/test/bin/instr_subf.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_subf.dis b/src/xenia/cpu/frontend/test/bin/instr_subf.dis
similarity index 85%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_subf.dis
rename to src/xenia/cpu/frontend/test/bin/instr_subf.dis
index e80e84e63..1e0481cfd 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_subf.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_subf.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_subf.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_subf.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_subf.map b/src/xenia/cpu/frontend/test/bin/instr_subf.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_subf.map
rename to src/xenia/cpu/frontend/test/bin/instr_subf.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_subfc.bin b/src/xenia/cpu/frontend/test/bin/instr_subfc.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_subfc.bin
rename to src/xenia/cpu/frontend/test/bin/instr_subfc.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_subfc.dis b/src/xenia/cpu/frontend/test/bin/instr_subfc.dis
similarity index 89%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_subfc.dis
rename to src/xenia/cpu/frontend/test/bin/instr_subfc.dis
index dd4a4d975..6028430ea 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_subfc.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_subfc.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_subfc.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_subfc.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_subfc.map b/src/xenia/cpu/frontend/test/bin/instr_subfc.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_subfc.map
rename to src/xenia/cpu/frontend/test/bin/instr_subfc.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_subfe.bin b/src/xenia/cpu/frontend/test/bin/instr_subfe.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_subfe.bin
rename to src/xenia/cpu/frontend/test/bin/instr_subfe.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_subfe.dis b/src/xenia/cpu/frontend/test/bin/instr_subfe.dis
similarity index 89%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_subfe.dis
rename to src/xenia/cpu/frontend/test/bin/instr_subfe.dis
index b65aa5de6..72799ec7d 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_subfe.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_subfe.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_subfe.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_subfe.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_subfe.map b/src/xenia/cpu/frontend/test/bin/instr_subfe.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_subfe.map
rename to src/xenia/cpu/frontend/test/bin/instr_subfe.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_subfic.bin b/src/xenia/cpu/frontend/test/bin/instr_subfic.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_subfic.bin
rename to src/xenia/cpu/frontend/test/bin/instr_subfic.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_subfic.dis b/src/xenia/cpu/frontend/test/bin/instr_subfic.dis
similarity index 90%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_subfic.dis
rename to src/xenia/cpu/frontend/test/bin/instr_subfic.dis
index 4ea667e38..794c3b7b5 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_subfic.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_subfic.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_subfic.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_subfic.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_subfic.map b/src/xenia/cpu/frontend/test/bin/instr_subfic.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_subfic.map
rename to src/xenia/cpu/frontend/test/bin/instr_subfic.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_subfme.bin b/src/xenia/cpu/frontend/test/bin/instr_subfme.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_subfme.bin
rename to src/xenia/cpu/frontend/test/bin/instr_subfme.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_subfme.dis b/src/xenia/cpu/frontend/test/bin/instr_subfme.dis
similarity index 95%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_subfme.dis
rename to src/xenia/cpu/frontend/test/bin/instr_subfme.dis
index 7e5fc4daf..8269df7c4 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_subfme.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_subfme.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_subfme.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_subfme.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_subfme.map b/src/xenia/cpu/frontend/test/bin/instr_subfme.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_subfme.map
rename to src/xenia/cpu/frontend/test/bin/instr_subfme.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_subfze.bin b/src/xenia/cpu/frontend/test/bin/instr_subfze.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_subfze.bin
rename to src/xenia/cpu/frontend/test/bin/instr_subfze.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_subfze.dis b/src/xenia/cpu/frontend/test/bin/instr_subfze.dis
similarity index 95%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_subfze.dis
rename to src/xenia/cpu/frontend/test/bin/instr_subfze.dis
index fda14ee42..34c913b8f 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_subfze.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_subfze.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_subfze.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_subfze.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_subfze.map b/src/xenia/cpu/frontend/test/bin/instr_subfze.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_subfze.map
rename to src/xenia/cpu/frontend/test/bin/instr_subfze.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vaddshs.bin b/src/xenia/cpu/frontend/test/bin/instr_vaddshs.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vaddshs.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vaddshs.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vaddshs.dis b/src/xenia/cpu/frontend/test/bin/instr_vaddshs.dis
similarity index 59%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vaddshs.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vaddshs.dis
index 4663a0442..afa47a361 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vaddshs.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vaddshs.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vaddshs.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vaddshs.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vaddshs.map b/src/xenia/cpu/frontend/test/bin/instr_vaddshs.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vaddshs.map
rename to src/xenia/cpu/frontend/test/bin/instr_vaddshs.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vadduhm.bin b/src/xenia/cpu/frontend/test/bin/instr_vadduhm.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vadduhm.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vadduhm.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vadduhm.dis b/src/xenia/cpu/frontend/test/bin/instr_vadduhm.dis
similarity index 59%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vadduhm.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vadduhm.dis
index f60ca05e9..312128c4a 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vadduhm.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vadduhm.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vadduhm.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vadduhm.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vadduhm.map b/src/xenia/cpu/frontend/test/bin/instr_vadduhm.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vadduhm.map
rename to src/xenia/cpu/frontend/test/bin/instr_vadduhm.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vcfsx.bin b/src/xenia/cpu/frontend/test/bin/instr_vcfsx.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vcfsx.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vcfsx.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vcfsx.dis b/src/xenia/cpu/frontend/test/bin/instr_vcfsx.dis
similarity index 78%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vcfsx.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vcfsx.dis
index 441d0b8a4..a1bf98f74 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vcfsx.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vcfsx.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vcfsx.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vcfsx.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vcfsx.map b/src/xenia/cpu/frontend/test/bin/instr_vcfsx.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vcfsx.map
rename to src/xenia/cpu/frontend/test/bin/instr_vcfsx.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vcmpxxfp.bin b/src/xenia/cpu/frontend/test/bin/instr_vcmpxxfp.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vcmpxxfp.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vcmpxxfp.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vcmpxxfp.dis b/src/xenia/cpu/frontend/test/bin/instr_vcmpxxfp.dis
similarity index 82%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vcmpxxfp.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vcmpxxfp.dis
index d6233f6d7..2b785f147 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vcmpxxfp.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vcmpxxfp.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vcmpxxfp.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vcmpxxfp.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vcmpxxfp.map b/src/xenia/cpu/frontend/test/bin/instr_vcmpxxfp.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vcmpxxfp.map
rename to src/xenia/cpu/frontend/test/bin/instr_vcmpxxfp.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vctsxs.bin b/src/xenia/cpu/frontend/test/bin/instr_vctsxs.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vctsxs.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vctsxs.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vctsxs.dis b/src/xenia/cpu/frontend/test/bin/instr_vctsxs.dis
similarity index 85%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vctsxs.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vctsxs.dis
index 9d2c9873a..57801e028 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vctsxs.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vctsxs.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vctsxs.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vctsxs.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vctsxs.map b/src/xenia/cpu/frontend/test/bin/instr_vctsxs.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vctsxs.map
rename to src/xenia/cpu/frontend/test/bin/instr_vctsxs.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrghb.bin b/src/xenia/cpu/frontend/test/bin/instr_vmrghb.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vmrghb.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vmrghb.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrghb.dis b/src/xenia/cpu/frontend/test/bin/instr_vmrghb.dis
similarity index 59%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vmrghb.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vmrghb.dis
index 826ceb2ce..1ebcf4839 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrghb.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vmrghb.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vmrghb.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vmrghb.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrghb.map b/src/xenia/cpu/frontend/test/bin/instr_vmrghb.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vmrghb.map
rename to src/xenia/cpu/frontend/test/bin/instr_vmrghb.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrghh.bin b/src/xenia/cpu/frontend/test/bin/instr_vmrghh.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vmrghh.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vmrghh.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrghh.dis b/src/xenia/cpu/frontend/test/bin/instr_vmrghh.dis
similarity index 59%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vmrghh.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vmrghh.dis
index 49afcbe4b..f40db2035 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrghh.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vmrghh.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vmrghh.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vmrghh.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrghh.map b/src/xenia/cpu/frontend/test/bin/instr_vmrghh.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vmrghh.map
rename to src/xenia/cpu/frontend/test/bin/instr_vmrghh.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrghw.bin b/src/xenia/cpu/frontend/test/bin/instr_vmrghw.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vmrghw.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vmrghw.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrghw.dis b/src/xenia/cpu/frontend/test/bin/instr_vmrghw.dis
similarity index 59%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vmrghw.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vmrghw.dis
index f683f053d..0505260d6 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrghw.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vmrghw.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vmrghw.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vmrghw.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrghw.map b/src/xenia/cpu/frontend/test/bin/instr_vmrghw.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vmrghw.map
rename to src/xenia/cpu/frontend/test/bin/instr_vmrghw.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrglb.bin b/src/xenia/cpu/frontend/test/bin/instr_vmrglb.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vmrglb.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vmrglb.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrglb.dis b/src/xenia/cpu/frontend/test/bin/instr_vmrglb.dis
similarity index 59%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vmrglb.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vmrglb.dis
index f98764104..263da93f2 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrglb.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vmrglb.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vmrglb.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vmrglb.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrglb.map b/src/xenia/cpu/frontend/test/bin/instr_vmrglb.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vmrglb.map
rename to src/xenia/cpu/frontend/test/bin/instr_vmrglb.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrglh.bin b/src/xenia/cpu/frontend/test/bin/instr_vmrglh.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vmrglh.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vmrglh.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrglh.dis b/src/xenia/cpu/frontend/test/bin/instr_vmrglh.dis
similarity index 59%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vmrglh.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vmrglh.dis
index 320a2992d..d2b43576c 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrglh.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vmrglh.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vmrglh.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vmrglh.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrglh.map b/src/xenia/cpu/frontend/test/bin/instr_vmrglh.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vmrglh.map
rename to src/xenia/cpu/frontend/test/bin/instr_vmrglh.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrglw.bin b/src/xenia/cpu/frontend/test/bin/instr_vmrglw.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vmrglw.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vmrglw.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrglw.dis b/src/xenia/cpu/frontend/test/bin/instr_vmrglw.dis
similarity index 59%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vmrglw.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vmrglw.dis
index a5ffbbe60..6e7ae25ae 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrglw.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vmrglw.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vmrglw.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vmrglw.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vmrglw.map b/src/xenia/cpu/frontend/test/bin/instr_vmrglw.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vmrglw.map
rename to src/xenia/cpu/frontend/test/bin/instr_vmrglw.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vperm.bin b/src/xenia/cpu/frontend/test/bin/instr_vperm.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vperm.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vperm.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vperm.dis b/src/xenia/cpu/frontend/test/bin/instr_vperm.dis
similarity index 83%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vperm.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vperm.dis
index 498de6fd1..d1ab08450 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vperm.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vperm.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vperm.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vperm.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vperm.map b/src/xenia/cpu/frontend/test/bin/instr_vperm.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vperm.map
rename to src/xenia/cpu/frontend/test/bin/instr_vperm.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vpermwi128.bin b/src/xenia/cpu/frontend/test/bin/instr_vpermwi128.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vpermwi128.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vpermwi128.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vpermwi128.dis b/src/xenia/cpu/frontend/test/bin/instr_vpermwi128.dis
similarity index 83%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vpermwi128.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vpermwi128.dis
index aad887857..efc51aee3 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vpermwi128.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vpermwi128.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vpermwi128.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vpermwi128.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vpermwi128.map b/src/xenia/cpu/frontend/test/bin/instr_vpermwi128.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vpermwi128.map
rename to src/xenia/cpu/frontend/test/bin/instr_vpermwi128.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vpkd3d128.bin b/src/xenia/cpu/frontend/test/bin/instr_vpkd3d128.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vpkd3d128.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vpkd3d128.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vpkd3d128.dis b/src/xenia/cpu/frontend/test/bin/instr_vpkd3d128.dis
similarity index 96%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vpkd3d128.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vpkd3d128.dis
index fa39a1d69..3b22e6c4c 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vpkd3d128.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vpkd3d128.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vpkd3d128.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vpkd3d128.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vpkd3d128.map b/src/xenia/cpu/frontend/test/bin/instr_vpkd3d128.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vpkd3d128.map
rename to src/xenia/cpu/frontend/test/bin/instr_vpkd3d128.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vpkshss.bin b/src/xenia/cpu/frontend/test/bin/instr_vpkshss.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vpkshss.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vpkshss.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vpkshss.dis b/src/xenia/cpu/frontend/test/bin/instr_vpkshss.dis
similarity index 71%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vpkshss.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vpkshss.dis
index 405c7e9fb..3ad77a513 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vpkshss.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vpkshss.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vpkshss.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vpkshss.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vpkshss.map b/src/xenia/cpu/frontend/test/bin/instr_vpkshss.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vpkshss.map
rename to src/xenia/cpu/frontend/test/bin/instr_vpkshss.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vpkswss.bin b/src/xenia/cpu/frontend/test/bin/instr_vpkswss.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vpkswss.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vpkswss.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vpkswss.dis b/src/xenia/cpu/frontend/test/bin/instr_vpkswss.dis
similarity index 71%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vpkswss.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vpkswss.dis
index b3c4adff1..f4d69fd9c 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vpkswss.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vpkswss.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vpkswss.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vpkswss.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vpkswss.map b/src/xenia/cpu/frontend/test/bin/instr_vpkswss.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vpkswss.map
rename to src/xenia/cpu/frontend/test/bin/instr_vpkswss.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vrfin.bin b/src/xenia/cpu/frontend/test/bin/instr_vrfin.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vrfin.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vrfin.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vrfin.dis b/src/xenia/cpu/frontend/test/bin/instr_vrfin.dis
similarity index 71%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vrfin.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vrfin.dis
index effd2b8cd..5b63bc202 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vrfin.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vrfin.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vrfin.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vrfin.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vrfin.map b/src/xenia/cpu/frontend/test/bin/instr_vrfin.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vrfin.map
rename to src/xenia/cpu/frontend/test/bin/instr_vrfin.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vrlimi128.bin b/src/xenia/cpu/frontend/test/bin/instr_vrlimi128.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vrlimi128.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vrlimi128.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vrlimi128.dis b/src/xenia/cpu/frontend/test/bin/instr_vrlimi128.dis
similarity index 91%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vrlimi128.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vrlimi128.dis
index d906f0676..0aa431996 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vrlimi128.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vrlimi128.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vrlimi128.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vrlimi128.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vrlimi128.map b/src/xenia/cpu/frontend/test/bin/instr_vrlimi128.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vrlimi128.map
rename to src/xenia/cpu/frontend/test/bin/instr_vrlimi128.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vsel.bin b/src/xenia/cpu/frontend/test/bin/instr_vsel.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vsel.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vsel.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vsel.dis b/src/xenia/cpu/frontend/test/bin/instr_vsel.dis
similarity index 79%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vsel.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vsel.dis
index 2b192debe..fd2f89cf2 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vsel.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vsel.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vsel.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vsel.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vsel.map b/src/xenia/cpu/frontend/test/bin/instr_vsel.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vsel.map
rename to src/xenia/cpu/frontend/test/bin/instr_vsel.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vslb.bin b/src/xenia/cpu/frontend/test/bin/instr_vslb.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vslb.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vslb.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vslb.dis b/src/xenia/cpu/frontend/test/bin/instr_vslb.dis
similarity index 85%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vslb.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vslb.dis
index 0ccd162a0..3085a8909 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vslb.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vslb.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vslb.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vslb.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vslb.map b/src/xenia/cpu/frontend/test/bin/instr_vslb.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vslb.map
rename to src/xenia/cpu/frontend/test/bin/instr_vslb.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vsldoi.bin b/src/xenia/cpu/frontend/test/bin/instr_vsldoi.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vsldoi.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vsldoi.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vsldoi.dis b/src/xenia/cpu/frontend/test/bin/instr_vsldoi.dis
similarity index 78%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vsldoi.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vsldoi.dis
index 770e7a0af..5e9acff7a 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vsldoi.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vsldoi.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vsldoi.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vsldoi.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vsldoi.map b/src/xenia/cpu/frontend/test/bin/instr_vsldoi.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vsldoi.map
rename to src/xenia/cpu/frontend/test/bin/instr_vsldoi.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vslh.bin b/src/xenia/cpu/frontend/test/bin/instr_vslh.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vslh.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vslh.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vslh.dis b/src/xenia/cpu/frontend/test/bin/instr_vslh.dis
similarity index 87%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vslh.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vslh.dis
index ac0904b6c..dfc73b08f 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vslh.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vslh.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vslh.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vslh.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vslh.map b/src/xenia/cpu/frontend/test/bin/instr_vslh.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vslh.map
rename to src/xenia/cpu/frontend/test/bin/instr_vslh.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vslw.bin b/src/xenia/cpu/frontend/test/bin/instr_vslw.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vslw.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vslw.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vslw.dis b/src/xenia/cpu/frontend/test/bin/instr_vslw.dis
similarity index 87%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vslw.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vslw.dis
index 3fa611b71..24af80752 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vslw.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vslw.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vslw.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vslw.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vslw.map b/src/xenia/cpu/frontend/test/bin/instr_vslw.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vslw.map
rename to src/xenia/cpu/frontend/test/bin/instr_vslw.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vspltb.bin b/src/xenia/cpu/frontend/test/bin/instr_vspltb.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vspltb.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vspltb.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vspltb.dis b/src/xenia/cpu/frontend/test/bin/instr_vspltb.dis
similarity index 78%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vspltb.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vspltb.dis
index 0d971e500..35693182e 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vspltb.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vspltb.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vspltb.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vspltb.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vspltb.map b/src/xenia/cpu/frontend/test/bin/instr_vspltb.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vspltb.map
rename to src/xenia/cpu/frontend/test/bin/instr_vspltb.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vsplth.bin b/src/xenia/cpu/frontend/test/bin/instr_vsplth.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vsplth.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vsplth.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vsplth.dis b/src/xenia/cpu/frontend/test/bin/instr_vsplth.dis
similarity index 78%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vsplth.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vsplth.dis
index 6981aa708..22acec872 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vsplth.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vsplth.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vsplth.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vsplth.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vsplth.map b/src/xenia/cpu/frontend/test/bin/instr_vsplth.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vsplth.map
rename to src/xenia/cpu/frontend/test/bin/instr_vsplth.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vspltisb.bin b/src/xenia/cpu/frontend/test/bin/instr_vspltisb.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vspltisb.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vspltisb.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vspltisb.dis b/src/xenia/cpu/frontend/test/bin/instr_vspltisb.dis
similarity index 82%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vspltisb.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vspltisb.dis
index c227f5416..a68c77afb 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vspltisb.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vspltisb.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vspltisb.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vspltisb.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vspltisb.map b/src/xenia/cpu/frontend/test/bin/instr_vspltisb.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vspltisb.map
rename to src/xenia/cpu/frontend/test/bin/instr_vspltisb.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vspltish.bin b/src/xenia/cpu/frontend/test/bin/instr_vspltish.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vspltish.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vspltish.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vspltish.dis b/src/xenia/cpu/frontend/test/bin/instr_vspltish.dis
similarity index 82%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vspltish.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vspltish.dis
index 19b7dd6fd..4bf6ab074 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vspltish.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vspltish.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vspltish.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vspltish.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vspltish.map b/src/xenia/cpu/frontend/test/bin/instr_vspltish.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vspltish.map
rename to src/xenia/cpu/frontend/test/bin/instr_vspltish.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vspltisw.bin b/src/xenia/cpu/frontend/test/bin/instr_vspltisw.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vspltisw.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vspltisw.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vspltisw.dis b/src/xenia/cpu/frontend/test/bin/instr_vspltisw.dis
similarity index 82%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vspltisw.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vspltisw.dis
index 513ab4200..c50e0c80c 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vspltisw.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vspltisw.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vspltisw.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vspltisw.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vspltisw.map b/src/xenia/cpu/frontend/test/bin/instr_vspltisw.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vspltisw.map
rename to src/xenia/cpu/frontend/test/bin/instr_vspltisw.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vspltw.bin b/src/xenia/cpu/frontend/test/bin/instr_vspltw.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vspltw.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vspltw.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vspltw.dis b/src/xenia/cpu/frontend/test/bin/instr_vspltw.dis
similarity index 78%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vspltw.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vspltw.dis
index a6f7f1faa..83079a629 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vspltw.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vspltw.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vspltw.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vspltw.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vspltw.map b/src/xenia/cpu/frontend/test/bin/instr_vspltw.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vspltw.map
rename to src/xenia/cpu/frontend/test/bin/instr_vspltw.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vsubshs.bin b/src/xenia/cpu/frontend/test/bin/instr_vsubshs.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vsubshs.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vsubshs.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vsubshs.dis b/src/xenia/cpu/frontend/test/bin/instr_vsubshs.dis
similarity index 59%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vsubshs.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vsubshs.dis
index a8035a881..a598fb1be 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vsubshs.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vsubshs.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vsubshs.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vsubshs.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vsubshs.map b/src/xenia/cpu/frontend/test/bin/instr_vsubshs.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vsubshs.map
rename to src/xenia/cpu/frontend/test/bin/instr_vsubshs.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vsubuhm.bin b/src/xenia/cpu/frontend/test/bin/instr_vsubuhm.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vsubuhm.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vsubuhm.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vsubuhm.dis b/src/xenia/cpu/frontend/test/bin/instr_vsubuhm.dis
similarity index 59%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vsubuhm.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vsubuhm.dis
index 0decabb50..d248080aa 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vsubuhm.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vsubuhm.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vsubuhm.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vsubuhm.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vsubuhm.map b/src/xenia/cpu/frontend/test/bin/instr_vsubuhm.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vsubuhm.map
rename to src/xenia/cpu/frontend/test/bin/instr_vsubuhm.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vupkd3d128.bin b/src/xenia/cpu/frontend/test/bin/instr_vupkd3d128.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vupkd3d128.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vupkd3d128.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vupkd3d128.dis b/src/xenia/cpu/frontend/test/bin/instr_vupkd3d128.dis
similarity index 88%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vupkd3d128.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vupkd3d128.dis
index a5dd0c4a4..5d9eb8f73 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vupkd3d128.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vupkd3d128.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vupkd3d128.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vupkd3d128.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vupkd3d128.map b/src/xenia/cpu/frontend/test/bin/instr_vupkd3d128.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vupkd3d128.map
rename to src/xenia/cpu/frontend/test/bin/instr_vupkd3d128.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vupkhsh.bin b/src/xenia/cpu/frontend/test/bin/instr_vupkhsh.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vupkhsh.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vupkhsh.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vupkhsh.dis b/src/xenia/cpu/frontend/test/bin/instr_vupkhsh.dis
similarity index 71%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vupkhsh.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vupkhsh.dis
index efb206cb5..adb260e2d 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vupkhsh.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vupkhsh.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vupkhsh.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vupkhsh.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vupkhsh.map b/src/xenia/cpu/frontend/test/bin/instr_vupkhsh.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vupkhsh.map
rename to src/xenia/cpu/frontend/test/bin/instr_vupkhsh.map
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vupklsh.bin b/src/xenia/cpu/frontend/test/bin/instr_vupklsh.bin
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vupklsh.bin
rename to src/xenia/cpu/frontend/test/bin/instr_vupklsh.bin
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vupklsh.dis b/src/xenia/cpu/frontend/test/bin/instr_vupklsh.dis
similarity index 71%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vupklsh.dis
rename to src/xenia/cpu/frontend/test/bin/instr_vupklsh.dis
index c247dc0f3..d86569179 100644
--- a/src/xenia/cpu/frontend/ppc/test/bin/instr_vupklsh.dis
+++ b/src/xenia/cpu/frontend/test/bin/instr_vupklsh.dis
@@ -1,5 +1,5 @@
 
-/vagrant/src/xenia/cpu/frontend/ppc/test/bin//instr_vupklsh.o:     file format elf64-powerpc
+/vagrant/src/xenia/cpu/frontend/test/bin//instr_vupklsh.o:     file format elf64-powerpc
 
 
 Disassembly of section .text:
diff --git a/src/xenia/cpu/frontend/ppc/test/bin/instr_vupklsh.map b/src/xenia/cpu/frontend/test/bin/instr_vupklsh.map
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/bin/instr_vupklsh.map
rename to src/xenia/cpu/frontend/test/bin/instr_vupklsh.map
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_add.s b/src/xenia/cpu/frontend/test/instr_add.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_add.s
rename to src/xenia/cpu/frontend/test/instr_add.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_addc.s b/src/xenia/cpu/frontend/test/instr_addc.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_addc.s
rename to src/xenia/cpu/frontend/test/instr_addc.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_adde.s b/src/xenia/cpu/frontend/test/instr_adde.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_adde.s
rename to src/xenia/cpu/frontend/test/instr_adde.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_addic.s b/src/xenia/cpu/frontend/test/instr_addic.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_addic.s
rename to src/xenia/cpu/frontend/test/instr_addic.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_addme.s b/src/xenia/cpu/frontend/test/instr_addme.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_addme.s
rename to src/xenia/cpu/frontend/test/instr_addme.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_addze.s b/src/xenia/cpu/frontend/test/instr_addze.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_addze.s
rename to src/xenia/cpu/frontend/test/instr_addze.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_cntlzd.s b/src/xenia/cpu/frontend/test/instr_cntlzd.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_cntlzd.s
rename to src/xenia/cpu/frontend/test/instr_cntlzd.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_cntlzw.s b/src/xenia/cpu/frontend/test/instr_cntlzw.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_cntlzw.s
rename to src/xenia/cpu/frontend/test/instr_cntlzw.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_divd.s b/src/xenia/cpu/frontend/test/instr_divd.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_divd.s
rename to src/xenia/cpu/frontend/test/instr_divd.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_divdu.s b/src/xenia/cpu/frontend/test/instr_divdu.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_divdu.s
rename to src/xenia/cpu/frontend/test/instr_divdu.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_divw.s b/src/xenia/cpu/frontend/test/instr_divw.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_divw.s
rename to src/xenia/cpu/frontend/test/instr_divw.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_divwu.s b/src/xenia/cpu/frontend/test/instr_divwu.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_divwu.s
rename to src/xenia/cpu/frontend/test/instr_divwu.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_eqv.s b/src/xenia/cpu/frontend/test/instr_eqv.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_eqv.s
rename to src/xenia/cpu/frontend/test/instr_eqv.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_fabs.s b/src/xenia/cpu/frontend/test/instr_fabs.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_fabs.s
rename to src/xenia/cpu/frontend/test/instr_fabs.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_fsel.s b/src/xenia/cpu/frontend/test/instr_fsel.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_fsel.s
rename to src/xenia/cpu/frontend/test/instr_fsel.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_lvexx.s b/src/xenia/cpu/frontend/test/instr_lvexx.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_lvexx.s
rename to src/xenia/cpu/frontend/test/instr_lvexx.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_lvl.s b/src/xenia/cpu/frontend/test/instr_lvl.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_lvl.s
rename to src/xenia/cpu/frontend/test/instr_lvl.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_lvr.s b/src/xenia/cpu/frontend/test/instr_lvr.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_lvr.s
rename to src/xenia/cpu/frontend/test/instr_lvr.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_lvsl.s b/src/xenia/cpu/frontend/test/instr_lvsl.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_lvsl.s
rename to src/xenia/cpu/frontend/test/instr_lvsl.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_lvsr.s b/src/xenia/cpu/frontend/test/instr_lvsr.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_lvsr.s
rename to src/xenia/cpu/frontend/test/instr_lvsr.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_mulhd.s b/src/xenia/cpu/frontend/test/instr_mulhd.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_mulhd.s
rename to src/xenia/cpu/frontend/test/instr_mulhd.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_mulhdu.s b/src/xenia/cpu/frontend/test/instr_mulhdu.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_mulhdu.s
rename to src/xenia/cpu/frontend/test/instr_mulhdu.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_mulhw.s b/src/xenia/cpu/frontend/test/instr_mulhw.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_mulhw.s
rename to src/xenia/cpu/frontend/test/instr_mulhw.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_mulhwu.s b/src/xenia/cpu/frontend/test/instr_mulhwu.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_mulhwu.s
rename to src/xenia/cpu/frontend/test/instr_mulhwu.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_mulld.s b/src/xenia/cpu/frontend/test/instr_mulld.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_mulld.s
rename to src/xenia/cpu/frontend/test/instr_mulld.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_mulli.s b/src/xenia/cpu/frontend/test/instr_mulli.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_mulli.s
rename to src/xenia/cpu/frontend/test/instr_mulli.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_mullw.s b/src/xenia/cpu/frontend/test/instr_mullw.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_mullw.s
rename to src/xenia/cpu/frontend/test/instr_mullw.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_neg.s b/src/xenia/cpu/frontend/test/instr_neg.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_neg.s
rename to src/xenia/cpu/frontend/test/instr_neg.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_nor.s b/src/xenia/cpu/frontend/test/instr_nor.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_nor.s
rename to src/xenia/cpu/frontend/test/instr_nor.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_ori.s b/src/xenia/cpu/frontend/test/instr_ori.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_ori.s
rename to src/xenia/cpu/frontend/test/instr_ori.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_rldicl.s b/src/xenia/cpu/frontend/test/instr_rldicl.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_rldicl.s
rename to src/xenia/cpu/frontend/test/instr_rldicl.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_rldicr.s b/src/xenia/cpu/frontend/test/instr_rldicr.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_rldicr.s
rename to src/xenia/cpu/frontend/test/instr_rldicr.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_rlwimi.s b/src/xenia/cpu/frontend/test/instr_rlwimi.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_rlwimi.s
rename to src/xenia/cpu/frontend/test/instr_rlwimi.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_rlwinm.s b/src/xenia/cpu/frontend/test/instr_rlwinm.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_rlwinm.s
rename to src/xenia/cpu/frontend/test/instr_rlwinm.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_rlwnm.s b/src/xenia/cpu/frontend/test/instr_rlwnm.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_rlwnm.s
rename to src/xenia/cpu/frontend/test/instr_rlwnm.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_sld.s b/src/xenia/cpu/frontend/test/instr_sld.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_sld.s
rename to src/xenia/cpu/frontend/test/instr_sld.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_slw.s b/src/xenia/cpu/frontend/test/instr_slw.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_slw.s
rename to src/xenia/cpu/frontend/test/instr_slw.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_srad.s b/src/xenia/cpu/frontend/test/instr_srad.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_srad.s
rename to src/xenia/cpu/frontend/test/instr_srad.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_sradi.s b/src/xenia/cpu/frontend/test/instr_sradi.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_sradi.s
rename to src/xenia/cpu/frontend/test/instr_sradi.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_sraw.s b/src/xenia/cpu/frontend/test/instr_sraw.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_sraw.s
rename to src/xenia/cpu/frontend/test/instr_sraw.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_srawi.s b/src/xenia/cpu/frontend/test/instr_srawi.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_srawi.s
rename to src/xenia/cpu/frontend/test/instr_srawi.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_srd.s b/src/xenia/cpu/frontend/test/instr_srd.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_srd.s
rename to src/xenia/cpu/frontend/test/instr_srd.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_srw.s b/src/xenia/cpu/frontend/test/instr_srw.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_srw.s
rename to src/xenia/cpu/frontend/test/instr_srw.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_stvew.s b/src/xenia/cpu/frontend/test/instr_stvew.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_stvew.s
rename to src/xenia/cpu/frontend/test/instr_stvew.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_stvl.s b/src/xenia/cpu/frontend/test/instr_stvl.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_stvl.s
rename to src/xenia/cpu/frontend/test/instr_stvl.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_stvr.s b/src/xenia/cpu/frontend/test/instr_stvr.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_stvr.s
rename to src/xenia/cpu/frontend/test/instr_stvr.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_subf.s b/src/xenia/cpu/frontend/test/instr_subf.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_subf.s
rename to src/xenia/cpu/frontend/test/instr_subf.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_subfc.s b/src/xenia/cpu/frontend/test/instr_subfc.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_subfc.s
rename to src/xenia/cpu/frontend/test/instr_subfc.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_subfe.s b/src/xenia/cpu/frontend/test/instr_subfe.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_subfe.s
rename to src/xenia/cpu/frontend/test/instr_subfe.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_subfic.s b/src/xenia/cpu/frontend/test/instr_subfic.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_subfic.s
rename to src/xenia/cpu/frontend/test/instr_subfic.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_subfme.s b/src/xenia/cpu/frontend/test/instr_subfme.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_subfme.s
rename to src/xenia/cpu/frontend/test/instr_subfme.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_subfze.s b/src/xenia/cpu/frontend/test/instr_subfze.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_subfze.s
rename to src/xenia/cpu/frontend/test/instr_subfze.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vaddshs.s b/src/xenia/cpu/frontend/test/instr_vaddshs.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vaddshs.s
rename to src/xenia/cpu/frontend/test/instr_vaddshs.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vadduhm.s b/src/xenia/cpu/frontend/test/instr_vadduhm.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vadduhm.s
rename to src/xenia/cpu/frontend/test/instr_vadduhm.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vcfsx.s b/src/xenia/cpu/frontend/test/instr_vcfsx.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vcfsx.s
rename to src/xenia/cpu/frontend/test/instr_vcfsx.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vcmpxxfp.s b/src/xenia/cpu/frontend/test/instr_vcmpxxfp.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vcmpxxfp.s
rename to src/xenia/cpu/frontend/test/instr_vcmpxxfp.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vctsxs.s b/src/xenia/cpu/frontend/test/instr_vctsxs.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vctsxs.s
rename to src/xenia/cpu/frontend/test/instr_vctsxs.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vmrghb.s b/src/xenia/cpu/frontend/test/instr_vmrghb.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vmrghb.s
rename to src/xenia/cpu/frontend/test/instr_vmrghb.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vmrghh.s b/src/xenia/cpu/frontend/test/instr_vmrghh.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vmrghh.s
rename to src/xenia/cpu/frontend/test/instr_vmrghh.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vmrghw.s b/src/xenia/cpu/frontend/test/instr_vmrghw.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vmrghw.s
rename to src/xenia/cpu/frontend/test/instr_vmrghw.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vmrglb.s b/src/xenia/cpu/frontend/test/instr_vmrglb.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vmrglb.s
rename to src/xenia/cpu/frontend/test/instr_vmrglb.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vmrglh.s b/src/xenia/cpu/frontend/test/instr_vmrglh.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vmrglh.s
rename to src/xenia/cpu/frontend/test/instr_vmrglh.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vmrglw.s b/src/xenia/cpu/frontend/test/instr_vmrglw.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vmrglw.s
rename to src/xenia/cpu/frontend/test/instr_vmrglw.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vperm.s b/src/xenia/cpu/frontend/test/instr_vperm.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vperm.s
rename to src/xenia/cpu/frontend/test/instr_vperm.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vpermwi128.s b/src/xenia/cpu/frontend/test/instr_vpermwi128.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vpermwi128.s
rename to src/xenia/cpu/frontend/test/instr_vpermwi128.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vpkd3d128.s b/src/xenia/cpu/frontend/test/instr_vpkd3d128.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vpkd3d128.s
rename to src/xenia/cpu/frontend/test/instr_vpkd3d128.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vpkshss.s b/src/xenia/cpu/frontend/test/instr_vpkshss.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vpkshss.s
rename to src/xenia/cpu/frontend/test/instr_vpkshss.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vpkswss.s b/src/xenia/cpu/frontend/test/instr_vpkswss.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vpkswss.s
rename to src/xenia/cpu/frontend/test/instr_vpkswss.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vrfin.s b/src/xenia/cpu/frontend/test/instr_vrfin.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vrfin.s
rename to src/xenia/cpu/frontend/test/instr_vrfin.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vrlimi128.s b/src/xenia/cpu/frontend/test/instr_vrlimi128.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vrlimi128.s
rename to src/xenia/cpu/frontend/test/instr_vrlimi128.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vsel.s b/src/xenia/cpu/frontend/test/instr_vsel.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vsel.s
rename to src/xenia/cpu/frontend/test/instr_vsel.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vslb.s b/src/xenia/cpu/frontend/test/instr_vslb.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vslb.s
rename to src/xenia/cpu/frontend/test/instr_vslb.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vsldoi.s b/src/xenia/cpu/frontend/test/instr_vsldoi.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vsldoi.s
rename to src/xenia/cpu/frontend/test/instr_vsldoi.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vslh.s b/src/xenia/cpu/frontend/test/instr_vslh.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vslh.s
rename to src/xenia/cpu/frontend/test/instr_vslh.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vslw.s b/src/xenia/cpu/frontend/test/instr_vslw.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vslw.s
rename to src/xenia/cpu/frontend/test/instr_vslw.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vspltb.s b/src/xenia/cpu/frontend/test/instr_vspltb.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vspltb.s
rename to src/xenia/cpu/frontend/test/instr_vspltb.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vsplth.s b/src/xenia/cpu/frontend/test/instr_vsplth.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vsplth.s
rename to src/xenia/cpu/frontend/test/instr_vsplth.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vspltisb.s b/src/xenia/cpu/frontend/test/instr_vspltisb.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vspltisb.s
rename to src/xenia/cpu/frontend/test/instr_vspltisb.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vspltish.s b/src/xenia/cpu/frontend/test/instr_vspltish.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vspltish.s
rename to src/xenia/cpu/frontend/test/instr_vspltish.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vspltisw.s b/src/xenia/cpu/frontend/test/instr_vspltisw.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vspltisw.s
rename to src/xenia/cpu/frontend/test/instr_vspltisw.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vspltw.s b/src/xenia/cpu/frontend/test/instr_vspltw.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vspltw.s
rename to src/xenia/cpu/frontend/test/instr_vspltw.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vsubshs.s b/src/xenia/cpu/frontend/test/instr_vsubshs.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vsubshs.s
rename to src/xenia/cpu/frontend/test/instr_vsubshs.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vsubuhm.s b/src/xenia/cpu/frontend/test/instr_vsubuhm.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vsubuhm.s
rename to src/xenia/cpu/frontend/test/instr_vsubuhm.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vupkd3d128.s b/src/xenia/cpu/frontend/test/instr_vupkd3d128.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vupkd3d128.s
rename to src/xenia/cpu/frontend/test/instr_vupkd3d128.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vupkhsh.s b/src/xenia/cpu/frontend/test/instr_vupkhsh.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vupkhsh.s
rename to src/xenia/cpu/frontend/test/instr_vupkhsh.s
diff --git a/src/xenia/cpu/frontend/ppc/test/instr_vupklsh.s b/src/xenia/cpu/frontend/test/instr_vupklsh.s
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/instr_vupklsh.s
rename to src/xenia/cpu/frontend/test/instr_vupklsh.s
diff --git a/src/xenia/cpu/frontend/ppc/test/test.gypi b/src/xenia/cpu/frontend/test/test.gypi
similarity index 100%
rename from src/xenia/cpu/frontend/ppc/test/test.gypi
rename to src/xenia/cpu/frontend/test/test.gypi
diff --git a/src/xenia/cpu/frontend/ppc/test/update.sh b/src/xenia/cpu/frontend/test/update.sh
similarity index 93%
rename from src/xenia/cpu/frontend/ppc/test/update.sh
rename to src/xenia/cpu/frontend/test/update.sh
index 8f3bd7b40..95d2ff9de 100644
--- a/src/xenia/cpu/frontend/ppc/test/update.sh
+++ b/src/xenia/cpu/frontend/test/update.sh
@@ -3,7 +3,7 @@ set -e
 
 THIS_SCRIPT_DIR=$( cd "$( dirname "$0" )" && pwd )
 
-BINUTILS=$THIS_SCRIPT_DIR/../../../../../../third_party/binutils/bin/
+BINUTILS=$THIS_SCRIPT_DIR/../../../../../third_party/binutils/bin/
 PPC_AS=$BINUTILS/powerpc-none-elf-as
 PPC_LD=$BINUTILS/powerpc-none-elf-ld
 PPC_OBJDUMP=$BINUTILS/powerpc-none-elf-objdump
diff --git a/src/xenia/cpu/frontend/ppc/test/xe-cpu-ppc-test.cc b/src/xenia/cpu/frontend/test/xe-cpu-ppc-test.cc
similarity index 98%
rename from src/xenia/cpu/frontend/ppc/test/xe-cpu-ppc-test.cc
rename to src/xenia/cpu/frontend/test/xe-cpu-ppc-test.cc
index 12cde143a..f49fa14e4 100644
--- a/src/xenia/cpu/frontend/ppc/test/xe-cpu-ppc-test.cc
+++ b/src/xenia/cpu/frontend/test/xe-cpu-ppc-test.cc
@@ -9,8 +9,8 @@
 
 #include "xenia/cpu/cpu.h"
 #include "xenia/cpu/backend/x64/x64_backend.h"
-#include "xenia/cpu/frontend/ppc/ppc_context.h"
-#include "xenia/cpu/frontend/ppc/ppc_frontend.h"
+#include "xenia/cpu/frontend/ppc_context.h"
+#include "xenia/cpu/frontend/ppc_frontend.h"
 #include "xenia/cpu/raw_module.h"
 #include "poly/main.h"
 #include "poly/poly.h"
@@ -20,16 +20,16 @@
 #endif  // !WIN32
 #include <gflags/gflags.h>
 
-DEFINE_string(test_path, "src/xenia/cpu/frontend/ppc/test/",
+DEFINE_string(test_path, "src/xenia/cpu/frontend/test/",
               "Directory scanned for test files.");
-DEFINE_string(test_bin_path, "src/xenia/cpu/frontend/ppc/test/bin/",
+DEFINE_string(test_bin_path, "src/xenia/cpu/frontend/test/bin/",
               "Directory with binary outputs of the test files.");
 
 namespace xe {
 namespace cpu {
 namespace test {
 
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 using xe::cpu::Runtime;
 
 typedef std::vector<std::pair<std::string, std::string>> AnnotationList;
diff --git a/src/xenia/cpu/processor.cc b/src/xenia/cpu/processor.cc
index 32e81a067..6e88ee08a 100644
--- a/src/xenia/cpu/processor.cc
+++ b/src/xenia/cpu/processor.cc
@@ -21,7 +21,7 @@ namespace cpu {
 using namespace xe::cpu;
 using namespace xe::cpu::backend;
 
-using PPCContext = xe::cpu::frontend::ppc::PPCContext;
+using PPCContext = xe::cpu::frontend::PPCContext;
 
 void InitializeIfNeeded();
 void CleanupOnShutdown();
diff --git a/src/xenia/cpu/runtime.cc b/src/xenia/cpu/runtime.cc
index 4cb787e05..9fcc91ed2 100644
--- a/src/xenia/cpu/runtime.cc
+++ b/src/xenia/cpu/runtime.cc
@@ -13,7 +13,7 @@
 
 #include "poly/poly.h"
 #include "xdb/protocol.h"
-#include "xenia/cpu/frontend/ppc/ppc_frontend.h"
+#include "xenia/cpu/frontend/ppc_frontend.h"
 #include "xenia/cpu/module.h"
 #include "xenia/cpu/thread_state.h"
 
@@ -25,9 +25,6 @@ DEFINE_string(runtime_backend, "any", "Runtime backend [any, x64].");
 namespace xe {
 namespace cpu {
 
-using xe::cpu::backend::Backend;
-using xe::cpu::frontend::Frontend;
-
 class BuiltinModule : public Module {
  public:
   BuiltinModule(Runtime* runtime) : Module(runtime), name_("builtin") {}
@@ -61,7 +58,7 @@ Runtime::~Runtime() {
 }
 
 int Runtime::Initialize(std::unique_ptr<xe::cpu::backend::Backend> backend) {
-  auto frontend = std::make_unique<xe::cpu::frontend::ppc::PPCFrontend>(this);
+  auto frontend = std::make_unique<xe::cpu::frontend::PPCFrontend>(this);
   // TODO(benvanik): set options/etc.
 
   // Must be initialized by subclass before calling into this.
diff --git a/src/xenia/cpu/runtime.h b/src/xenia/cpu/runtime.h
index 50e984843..e4dc0b149 100644
--- a/src/xenia/cpu/runtime.h
+++ b/src/xenia/cpu/runtime.h
@@ -14,7 +14,7 @@
 #include "xenia/cpu/backend/backend.h"
 #include "xenia/cpu/debugger.h"
 #include "xenia/cpu/entry_table.h"
-#include "xenia/cpu/frontend/frontend.h"
+#include "xenia/cpu/frontend/ppc_frontend.h"
 #include "xenia/cpu/function.h"
 #include "xenia/cpu/module.h"
 #include "xenia/cpu/thread_state.h"
@@ -32,7 +32,7 @@ class Runtime {
 
   Memory* memory() const { return memory_; }
   Debugger* debugger() const { return debugger_.get(); }
-  frontend::Frontend* frontend() const { return frontend_.get(); }
+  frontend::PPCFrontend* frontend() const { return frontend_.get(); }
   backend::Backend* backend() const { return backend_.get(); }
   ExportResolver* export_resolver() const { return export_resolver_; }
 
@@ -67,7 +67,7 @@ class Runtime {
 
   std::unique_ptr<Debugger> debugger_;
 
-  std::unique_ptr<frontend::Frontend> frontend_;
+  std::unique_ptr<frontend::PPCFrontend> frontend_;
   std::unique_ptr<backend::Backend> backend_;
   ExportResolver* export_resolver_;
 
diff --git a/src/xenia/cpu/test/test_add.cc b/src/xenia/cpu/test/test_add.cc
index e3a95157c..acff3fb10 100644
--- a/src/xenia/cpu/test/test_add.cc
+++ b/src/xenia/cpu/test/test_add.cc
@@ -14,7 +14,7 @@
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
 using namespace xe::cpu::test;
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("ADD_I8", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
diff --git a/src/xenia/cpu/test/test_byte_swap.cc b/src/xenia/cpu/test/test_byte_swap.cc
index 927d8f772..9e6d39757 100644
--- a/src/xenia/cpu/test/test_byte_swap.cc
+++ b/src/xenia/cpu/test/test_byte_swap.cc
@@ -12,7 +12,7 @@
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
 using namespace xe::cpu::test;
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 using namespace poly;
 
 TEST_CASE("BYTE_SWAP_V128", "[instr]") {
diff --git a/src/xenia/cpu/test/test_extract.cc b/src/xenia/cpu/test/test_extract.cc
index 03c97e568..c577d1aa7 100644
--- a/src/xenia/cpu/test/test_extract.cc
+++ b/src/xenia/cpu/test/test_extract.cc
@@ -14,7 +14,7 @@
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
 using namespace xe::cpu::test;
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 using namespace poly;
 
 TEST_CASE("EXTRACT_INT8", "[instr]") {
diff --git a/src/xenia/cpu/test/test_insert.cc b/src/xenia/cpu/test/test_insert.cc
index d18692236..da42e4f8e 100644
--- a/src/xenia/cpu/test/test_insert.cc
+++ b/src/xenia/cpu/test/test_insert.cc
@@ -14,7 +14,7 @@
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
 using namespace xe::cpu::test;
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 using namespace poly;
 
 TEST_CASE("INSERT_INT8", "[instr]") {
diff --git a/src/xenia/cpu/test/test_load_vector_shl_shr.cc b/src/xenia/cpu/test/test_load_vector_shl_shr.cc
index 5082030bd..120c929e9 100644
--- a/src/xenia/cpu/test/test_load_vector_shl_shr.cc
+++ b/src/xenia/cpu/test/test_load_vector_shl_shr.cc
@@ -12,7 +12,7 @@
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
 using namespace xe::cpu::test;
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 using namespace poly;
 
 TEST_CASE("LOAD_VECTOR_SHL", "[instr]") {
diff --git a/src/xenia/cpu/test/test_pack.cc b/src/xenia/cpu/test/test_pack.cc
index bf9746d2e..e7dea10d0 100644
--- a/src/xenia/cpu/test/test_pack.cc
+++ b/src/xenia/cpu/test/test_pack.cc
@@ -12,7 +12,7 @@
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
 using namespace xe::cpu::test;
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 using namespace poly;
 
 TEST_CASE("PACK_D3DCOLOR", "[instr]") {
diff --git a/src/xenia/cpu/test/test_permute.cc b/src/xenia/cpu/test/test_permute.cc
index e2c674773..0bd884925 100644
--- a/src/xenia/cpu/test/test_permute.cc
+++ b/src/xenia/cpu/test/test_permute.cc
@@ -12,7 +12,7 @@
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
 using namespace xe::cpu::test;
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 using namespace poly;
 
 TEST_CASE("PERMUTE_V128_BY_INT32_CONSTANT", "[instr]") {
diff --git a/src/xenia/cpu/test/test_sha.cc b/src/xenia/cpu/test/test_sha.cc
index ecbd415b5..0cc4e9763 100644
--- a/src/xenia/cpu/test/test_sha.cc
+++ b/src/xenia/cpu/test/test_sha.cc
@@ -12,7 +12,7 @@
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
 using namespace xe::cpu::test;
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("SHA_I8", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
diff --git a/src/xenia/cpu/test/test_shl.cc b/src/xenia/cpu/test/test_shl.cc
index f491c66fc..93dc412cd 100644
--- a/src/xenia/cpu/test/test_shl.cc
+++ b/src/xenia/cpu/test/test_shl.cc
@@ -12,7 +12,7 @@
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
 using namespace xe::cpu::test;
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 
 TEST_CASE("SHL_I8", "[instr]") {
   TestFunction test([](HIRBuilder& b) {
diff --git a/src/xenia/cpu/test/test_shr.cc b/src/xenia/cpu/test/test_shr.cc
index 243df51a4..171f4ba9e 100644
--- a/src/xenia/cpu/test/test_shr.cc
+++ b/src/xenia/cpu/test/test_shr.cc
@@ -12,7 +12,7 @@
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
 using namespace xe::cpu::test;
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 using namespace poly;
 
 TEST_CASE("SHR_I8", "[instr]") {
diff --git a/src/xenia/cpu/test/test_swizzle.cc b/src/xenia/cpu/test/test_swizzle.cc
index 14a688dfd..b0cb30a2c 100644
--- a/src/xenia/cpu/test/test_swizzle.cc
+++ b/src/xenia/cpu/test/test_swizzle.cc
@@ -12,7 +12,7 @@
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
 using namespace xe::cpu::test;
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 using namespace poly;
 
 TEST_CASE("SWIZZLE_V128", "[instr]") {
diff --git a/src/xenia/cpu/test/test_unpack.cc b/src/xenia/cpu/test/test_unpack.cc
index bdc36dddc..0b95e23b3 100644
--- a/src/xenia/cpu/test/test_unpack.cc
+++ b/src/xenia/cpu/test/test_unpack.cc
@@ -12,7 +12,7 @@
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
 using namespace xe::cpu::test;
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 using namespace poly;
 
 TEST_CASE("UNPACK_D3DCOLOR", "[instr]") {
diff --git a/src/xenia/cpu/test/test_vector_add.cc b/src/xenia/cpu/test/test_vector_add.cc
index ac595e1c4..98b1f0642 100644
--- a/src/xenia/cpu/test/test_vector_add.cc
+++ b/src/xenia/cpu/test/test_vector_add.cc
@@ -14,7 +14,7 @@
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
 using namespace xe::cpu::test;
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 using namespace poly;
 
 TEST_CASE("VECTOR_ADD_I8", "[instr]") {
diff --git a/src/xenia/cpu/test/test_vector_max.cc b/src/xenia/cpu/test/test_vector_max.cc
index 998b7c931..2cf17ef1a 100644
--- a/src/xenia/cpu/test/test_vector_max.cc
+++ b/src/xenia/cpu/test/test_vector_max.cc
@@ -14,7 +14,7 @@
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
 using namespace xe::cpu::test;
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 using namespace poly;
 
 TEST_CASE("VECTOR_MAX_I8_SIGNED", "[instr]") {
diff --git a/src/xenia/cpu/test/test_vector_min.cc b/src/xenia/cpu/test/test_vector_min.cc
index c53f21b7a..a94263c37 100644
--- a/src/xenia/cpu/test/test_vector_min.cc
+++ b/src/xenia/cpu/test/test_vector_min.cc
@@ -14,7 +14,7 @@
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
 using namespace xe::cpu::test;
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 using namespace poly;
 
 TEST_CASE("VECTOR_MIN_I8_SIGNED", "[instr]") {
diff --git a/src/xenia/cpu/test/test_vector_rotate_left.cc b/src/xenia/cpu/test/test_vector_rotate_left.cc
index 9782b1fb6..d9820f549 100644
--- a/src/xenia/cpu/test/test_vector_rotate_left.cc
+++ b/src/xenia/cpu/test/test_vector_rotate_left.cc
@@ -13,7 +13,7 @@
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
 using namespace xe::cpu::test;
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 using namespace poly;
 
 TEST_CASE("VECTOR_ROTATE_LEFT_I8", "[instr]") {
diff --git a/src/xenia/cpu/test/test_vector_sha.cc b/src/xenia/cpu/test/test_vector_sha.cc
index ecb4fbbdb..b79bf9db2 100644
--- a/src/xenia/cpu/test/test_vector_sha.cc
+++ b/src/xenia/cpu/test/test_vector_sha.cc
@@ -12,7 +12,7 @@
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
 using namespace xe::cpu::test;
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 using namespace poly;
 
 TEST_CASE("VECTOR_SHA_I8", "[instr]") {
diff --git a/src/xenia/cpu/test/test_vector_shl.cc b/src/xenia/cpu/test/test_vector_shl.cc
index 53e48a801..65c1ab572 100644
--- a/src/xenia/cpu/test/test_vector_shl.cc
+++ b/src/xenia/cpu/test/test_vector_shl.cc
@@ -12,7 +12,7 @@
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
 using namespace xe::cpu::test;
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 using namespace poly;
 
 TEST_CASE("VECTOR_SHL_I8", "[instr]") {
diff --git a/src/xenia/cpu/test/test_vector_shr.cc b/src/xenia/cpu/test/test_vector_shr.cc
index be2b90ff7..64c1330ae 100644
--- a/src/xenia/cpu/test/test_vector_shr.cc
+++ b/src/xenia/cpu/test/test_vector_shr.cc
@@ -12,7 +12,7 @@
 using namespace xe::cpu::hir;
 using namespace xe::cpu;
 using namespace xe::cpu::test;
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 using namespace poly;
 
 TEST_CASE("VECTOR_SHR_I8", "[instr]") {
diff --git a/src/xenia/cpu/test/util.h b/src/xenia/cpu/test/util.h
index b0309a4ee..8266039d2 100644
--- a/src/xenia/cpu/test/util.h
+++ b/src/xenia/cpu/test/util.h
@@ -12,8 +12,8 @@
 
 #include "xenia/cpu/backend/x64/x64_backend.h"
 #include "xenia/cpu/cpu.h"
-#include "xenia/cpu/frontend/ppc/ppc_context.h"
-#include "xenia/cpu/frontend/ppc/ppc_frontend.h"
+#include "xenia/cpu/frontend/ppc_context.h"
+#include "xenia/cpu/frontend/ppc_frontend.h"
 #include "xenia/cpu/hir/hir_builder.h"
 #include "xenia/cpu/test_module.h"
 #include "poly/main.h"
@@ -27,7 +27,7 @@ namespace xe {
 namespace cpu {
 namespace test {
 
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 using xe::cpu::Runtime;
 
 class TestFunction {
diff --git a/src/xenia/cpu/test/xe-cpu-hir-test.cc b/src/xenia/cpu/test/xe-cpu-hir-test.cc
index 451a7c2da..f204929d4 100644
--- a/src/xenia/cpu/test/xe-cpu-hir-test.cc
+++ b/src/xenia/cpu/test/xe-cpu-hir-test.cc
@@ -16,7 +16,7 @@ namespace xe {
 namespace cpu {
 namespace test {
 
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 using xe::cpu::Runtime;
 
 int main(std::vector<std::wstring>& args) {
diff --git a/src/xenia/cpu/test/xe-cpu-sandbox.cc b/src/xenia/cpu/test/xe-cpu-sandbox.cc
index 27adc34d3..1d9d4b267 100644
--- a/src/xenia/cpu/test/xe-cpu-sandbox.cc
+++ b/src/xenia/cpu/test/xe-cpu-sandbox.cc
@@ -9,8 +9,8 @@
 
 #include "xenia/cpu/cpu.h"
 #include "xenia/cpu/backend/x64/x64_backend.h"
-#include "xenia/cpu/frontend/ppc/ppc_context.h"
-#include "xenia/cpu/frontend/ppc/ppc_frontend.h"
+#include "xenia/cpu/frontend/ppc_context.h"
+#include "xenia/cpu/frontend/ppc_frontend.h"
 #include "xenia/cpu/raw_module.h"
 #include "poly/main.h"
 #include "poly/poly.h"
@@ -21,7 +21,7 @@ namespace xe {
 namespace cpu {
 namespace sandbox {
 
-using xe::cpu::frontend::ppc::PPCContext;
+using xe::cpu::frontend::PPCContext;
 using xe::cpu::Runtime;
 
 // TODO(benvanik): simple memory? move more into core?
diff --git a/src/xenia/cpu/thread_state.cc b/src/xenia/cpu/thread_state.cc
index fc2de8fca..1072b6e98 100644
--- a/src/xenia/cpu/thread_state.cc
+++ b/src/xenia/cpu/thread_state.cc
@@ -15,10 +15,9 @@
 namespace xe {
 namespace cpu {
 
-using namespace xe::cpu::frontend;
 using namespace xe::cpu;
 
-using PPCContext = xe::cpu::frontend::ppc::PPCContext;
+using PPCContext = xe::cpu::frontend::PPCContext;
 
 thread_local ThreadState* thread_state_ = nullptr;
 
diff --git a/src/xenia/cpu/thread_state.h b/src/xenia/cpu/thread_state.h
index d80c31b8e..ab388c44f 100644
--- a/src/xenia/cpu/thread_state.h
+++ b/src/xenia/cpu/thread_state.h
@@ -10,7 +10,7 @@
 #ifndef XENIA_CPU_thread_state_H_
 #define XENIA_CPU_thread_state_H_
 
-#include "xenia/cpu/frontend/ppc/ppc_context.h"
+#include "xenia/cpu/frontend/ppc_context.h"
 #include "xenia/cpu/thread_state.h"
 #include "xenia/common.h"
 #include "xenia/memory.h"
@@ -42,7 +42,7 @@ class ThreadState {
   uint64_t stack_address() const { return stack_address_; }
   size_t stack_size() const { return stack_size_; }
   uint64_t thread_state_address() const { return thread_state_address_; }
-  xe::cpu::frontend::ppc::PPCContext* context() const { return context_; }
+  xe::cpu::frontend::PPCContext* context() const { return context_; }
 
   int Suspend() { return Suspend(~0); }
   int Suspend(uint32_t timeout_ms) { return 1; }
@@ -67,7 +67,7 @@ class ThreadState {
   uint64_t thread_state_address_;
 
   // NOTE: must be 64b aligned for SSE ops.
-  xe::cpu::frontend::ppc::PPCContext* context_;
+  xe::cpu::frontend::PPCContext* context_;
 };
 
 }  // namespace cpu
diff --git a/src/xenia/cpu/xex_module.cc b/src/xenia/cpu/xex_module.cc
index 61c47581c..2e8efc3c0 100644
--- a/src/xenia/cpu/xex_module.cc
+++ b/src/xenia/cpu/xex_module.cc
@@ -21,7 +21,7 @@ namespace cpu {
 
 using namespace xe::cpu;
 
-using PPCContext = xe::cpu::frontend::ppc::PPCContext;
+using PPCContext = xe::cpu::frontend::PPCContext;
 
 void UndefinedImport(PPCContext* ppc_state, void* arg0, void* arg1) {
   XELOGE("call to undefined kernel import");
diff --git a/src/xenia/kernel/util/shim_utils.h b/src/xenia/kernel/util/shim_utils.h
index 6b8805994..50fc6edc6 100644
--- a/src/xenia/kernel/util/shim_utils.h
+++ b/src/xenia/kernel/util/shim_utils.h
@@ -10,14 +10,14 @@
 #ifndef XENIA_KERNEL_UTIL_SHIM_UTILS_H_
 #define XENIA_KERNEL_UTIL_SHIM_UTILS_H_
 
-#include "xenia/cpu/frontend/ppc/ppc_context.h"
+#include "xenia/cpu/frontend/ppc_context.h"
 #include "xenia/common.h"
 #include "xenia/export_resolver.h"
 
 namespace xe {
 namespace kernel {
 
-using PPCContext = xe::cpu::frontend::ppc::PPCContext;
+using PPCContext = xe::cpu::frontend::PPCContext;
 
 #define SHIM_CALL             void _cdecl
 #define SHIM_SET_MAPPING(library_name, export_name, shim_data) \
diff --git a/xenia.gyp b/xenia.gyp
index 77fcbc488..6d74b5c85 100644
--- a/xenia.gyp
+++ b/xenia.gyp
@@ -1,7 +1,7 @@
 # Copyright 2013 Ben Vanik. All Rights Reserved.
 {
   'includes': [
-    'src/xenia/cpu/frontend/ppc/test/test.gypi',
+    'src/xenia/cpu/frontend/test/test.gypi',
     'src/xenia/cpu/test/test.gypi',
     'tools/tools.gypi',
     'third_party/beaengine.gypi',