diff --git a/src/alloy/frontend/ppc/test/test.gypi b/src/alloy/frontend/ppc/test/test.gypi
index b7a5dd143..f37d59eaf 100644
--- a/src/alloy/frontend/ppc/test/test.gypi
+++ b/src/alloy/frontend/ppc/test/test.gypi
@@ -12,8 +12,8 @@
       },
 
       'dependencies': [
-        'alloy',
-        'xenia',
+        'liballoy',
+        'libxenia',
       ],
 
       'include_dirs': [
diff --git a/src/alloy/test/test.gypi b/src/alloy/test/test.gypi
index 508acb087..0b8a9cb0e 100644
--- a/src/alloy/test/test.gypi
+++ b/src/alloy/test/test.gypi
@@ -12,8 +12,8 @@
       },
 
       'dependencies': [
-        'alloy',
-        'xenia',
+        'liballoy',
+        'libxenia',
       ],
 
       'include_dirs': [
@@ -38,8 +38,8 @@
       },
 
       'dependencies': [
-        'alloy',
-        'xenia',
+        'liballoy',
+        'libxenia',
       ],
 
       'include_dirs': [
diff --git a/src/xenia/sources.gypi b/src/xenia/sources.gypi
index d600a3025..13ef28ad4 100644
--- a/src/xenia/sources.gypi
+++ b/src/xenia/sources.gypi
@@ -15,6 +15,7 @@
     'profiling.cc',
     'profiling.h',
     'xbox.h',
+    # xenia_main.cc is purposefully omitted as it's used in another target.
   ],
 
   'includes': [
diff --git a/tools/xenia-run/xenia-run.cc b/src/xenia/xenia_main.cc
similarity index 93%
rename from tools/xenia-run/xenia-run.cc
rename to src/xenia/xenia_main.cc
index 55dc11e64..83a1a8241 100644
--- a/tools/xenia-run/xenia-run.cc
+++ b/src/xenia/xenia_main.cc
@@ -16,13 +16,13 @@ using namespace xe;
 
 DEFINE_string(target, "", "Specifies the target .xex or .iso to execute.");
 
-int xenia_run(std::vector<std::wstring>& args) {
+int xenia_main(std::vector<std::wstring>& args) {
   Profiler::Initialize();
   Profiler::ThreadEnter("main");
 
   // Grab path from the flag or unnamed argument.
   if (!FLAGS_target.size() && args.size() < 2) {
-    google::ShowUsageWithFlags("xenia-run");
+    google::ShowUsageWithFlags("xenia");
     PFATAL("Pass a file to launch.");
     return 1;
   }
@@ -71,4 +71,4 @@ int xenia_run(std::vector<std::wstring>& args) {
   return 0;
 }
 
-DEFINE_ENTRY_POINT(L"xenia-run", L"xenia-run some.xex", xenia_run);
+DEFINE_ENTRY_POINT(L"xenia", L"xenia some.xex", xenia_main);
diff --git a/tools/tools.gypi b/tools/tools.gypi
index 685b8164b..7632461e1 100644
--- a/tools/tools.gypi
+++ b/tools/tools.gypi
@@ -1,6 +1,5 @@
 # Copyright 2013 Ben Vanik. All Rights Reserved.
 {
   'includes': [
-    'xenia-run/xenia-run.gypi',
   ],
 }
diff --git a/tools/xenia-run/xenia-run.gypi b/tools/xenia-run/xenia-run.gypi
deleted file mode 100644
index 2d2702ac7..000000000
--- a/tools/xenia-run/xenia-run.gypi
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2013 Ben Vanik. All Rights Reserved.
-{
-  'targets': [
-    {
-      'target_name': 'xenia-run',
-      'type': 'executable',
-
-      'msvs_settings': {
-        'VCLinkerTool': {
-          'SubSystem': '2'
-        },
-      },
-
-      'dependencies': [
-        'xenia',
-      ],
-
-      'include_dirs': [
-        '.',
-      ],
-
-      'sources': [
-        'xenia-run.cc',
-      ],
-    },
-  ],
-}
diff --git a/xenia.gyp b/xenia.gyp
index a880cea97..5534d7534 100644
--- a/xenia.gyp
+++ b/xenia.gyp
@@ -198,8 +198,8 @@
 
   'targets': [
     {
-      'target_name': 'poly',
-      'product_name': 'poly',
+      'target_name': 'libpoly',
+      'product_name': 'libpoly',
       'type': 'static_library',
 
       'dependencies': [
@@ -279,15 +279,15 @@
     },
 
     {
-      'target_name': 'alloy',
-      'product_name': 'alloy',
+      'target_name': 'liballoy',
+      'product_name': 'liballoy',
       'type': 'static_library',
 
       'dependencies': [
         'beaengine',
         'gflags',
         'llvm',
-        'poly',
+        'libpoly',
       ],
 
       'conditions': [
@@ -309,7 +309,7 @@
         'beaengine',
         'gflags',
         'llvm',
-        'poly',
+        'libpoly',
       ],
 
       'direct_dependent_settings': {
@@ -365,19 +365,19 @@
     },
 
     {
-      'target_name': 'xenia',
-      'product_name': 'xenia',
+      'target_name': 'libxenia',
+      'product_name': 'libxenia',
       'type': 'static_library',
 
       'dependencies': [
         'gflags',
-        'alloy',
-        'poly',
+        'liballoy',
+        'libpoly',
       ],
       'export_dependent_settings': [
         'gflags',
-        'alloy',
-        'poly',
+        'liballoy',
+        'libpoly',
       ],
 
       'direct_dependent_settings': {
@@ -452,73 +452,25 @@
     },
 
     {
-      'target_name': 'xdb',
-      'product_name': 'xdb',
-      'type': 'static_library',
+      'target_name': 'xenia',
+      'type': 'executable',
 
-      'dependencies': [
-        'gflags',
-        'xenia',
-      ],
-      'export_dependent_settings': [
-        'gflags',
-        'xenia',
-      ],
-
-      'direct_dependent_settings': {
-        'include_dirs': [
-          'src/',
-        ],
-
-        'target_conditions': [
-          ['_type=="shared_library"', {
-            'cflags': [
-            ],
-          }],
-          ['_type=="executable"', {
-            'conditions': [
-              ['OS == "win"', {
-                'libraries': [
-                  'kernel32',
-                  'user32',
-                  'ole32',
-                  'wsock32',
-                  'Ws2_32',
-                  'Shell32',
-                  'Msimg32',
-                  'wxbase31u',
-                  'wxmsw31u_core',
-                  'wxmsw31u_aui',
-                  'wxmsw31u_stc',
-                ],
-              }],
-              ['OS == "mac"', {
-                'xcode_settings': {
-                  'OTHER_LDFLAGS': [
-                  ],
-                },
-              }],
-              ['OS == "linux"', {
-                'libraries': [
-                  '-lpthread',
-                  '-ldl',
-                ],
-              }],
-            ],
-          }],
-        ],
+      'msvs_settings': {
+        'VCLinkerTool': {
+          'SubSystem': '2'
+        },
       },
 
-      'cflags': [
+      'dependencies': [
+        'libxenia',
       ],
 
       'include_dirs': [
         '.',
-        'src/',
       ],
 
-      'includes': [
-        'src/xdb/sources.gypi',
+      'sources': [
+        'src/xenia/xenia_main.cc',
       ],
     },
   ],