diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index c3c213757e..ecfd7be085 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -261,6 +261,13 @@ MENU
 #include "../../360/frontend-xdk/menu.cpp"
 #elif defined(_XBOX1)
 #include "../../xbox1/frontend/menu.cpp"
+#include "../../xbox1/frontend/RetroLaunch/Font.cpp"
+#include "../../xbox1/frontend/RetroLaunch/IoSupport.cpp"
+#include "../../xbox1/frontend/RetroLaunch/MenuMain.cpp"
+#include "../../xbox1/frontend/RetroLaunch/MenuManager.cpp"
+#include "../../xbox1/frontend/RetroLaunch/Rom.cpp"
+#include "../../xbox1/frontend/RetroLaunch/RomList.cpp"
+#include "../../xbox1/frontend/RetroLaunch/Surface.cpp"
 #elif defined(GEKKO)
 #include "../../wii/frontend/rgui.c"
 #include "../../wii/frontend/list.c"
diff --git a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj
index de75501705..8d947bc6c6 100644
--- a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj
+++ b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj
@@ -321,9 +321,6 @@
 						CompileAs="2"/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\xbox1\retrolaunch.cpp">
-			</File>
 			<File
 				RelativePath="..\..\console\rzlib\rzlib.c">
 				<FileConfiguration
diff --git a/xbox1/RetroLaunch/Font.cpp b/xbox1/frontend/RetroLaunch/Font.cpp
similarity index 98%
rename from xbox1/RetroLaunch/Font.cpp
rename to xbox1/frontend/RetroLaunch/Font.cpp
index 6ea617d7a0..7af35f7fb3 100644
--- a/xbox1/RetroLaunch/Font.cpp
+++ b/xbox1/frontend/RetroLaunch/Font.cpp
@@ -14,11 +14,10 @@
  */
 
 
-#ifdef _XBOX
 #include "Font.h"
 
-#include "../../general.h"
-#include "../xdk_d3d8.h"
+#include "../../../general.h"
+#include "../../xdk_d3d8.h"
 
 Font g_font;
 
@@ -213,4 +212,3 @@ word *Font::StringToWChar(const string &str)
 
 	return retVal;
 }
-#endif
diff --git a/xbox1/RetroLaunch/Font.h b/xbox1/frontend/RetroLaunch/Font.h
similarity index 94%
rename from xbox1/RetroLaunch/Font.h
rename to xbox1/frontend/RetroLaunch/Font.h
index 96e3dd2049..5106a5ec8b 100644
--- a/xbox1/RetroLaunch/Font.h
+++ b/xbox1/frontend/RetroLaunch/Font.h
@@ -14,13 +14,9 @@
  */
 
 #pragma once
-#ifdef _XBOX
 #include "Global.h"
 #include "Surface.h"
 
-#define XFONT_TRUETYPE // use true type fonts
-#include <xfont.h>
-
 enum Align
 {
 	Left,
@@ -48,4 +44,3 @@ private:
 };
 
 extern Font g_font;
-#endif
diff --git a/xbox1/RetroLaunch/Global.h b/xbox1/frontend/RetroLaunch/Global.h
similarity index 99%
rename from xbox1/RetroLaunch/Global.h
rename to xbox1/frontend/RetroLaunch/Global.h
index 087fd8c68c..4e16968715 100644
--- a/xbox1/RetroLaunch/Global.h
+++ b/xbox1/frontend/RetroLaunch/Global.h
@@ -29,7 +29,6 @@
 #include <xtl.h>
 #include <xgraphics.h>
 
-
 using namespace std;
 
 #define XBUILD "Launcher CE"
diff --git a/xbox1/RetroLaunch/IoSupport.cpp b/xbox1/frontend/RetroLaunch/IoSupport.cpp
similarity index 100%
rename from xbox1/RetroLaunch/IoSupport.cpp
rename to xbox1/frontend/RetroLaunch/IoSupport.cpp
diff --git a/xbox1/RetroLaunch/IoSupport.h b/xbox1/frontend/RetroLaunch/IoSupport.h
similarity index 100%
rename from xbox1/RetroLaunch/IoSupport.h
rename to xbox1/frontend/RetroLaunch/IoSupport.h
diff --git a/xbox1/RetroLaunch/MenuMain.cpp b/xbox1/frontend/RetroLaunch/MenuMain.cpp
similarity index 100%
rename from xbox1/RetroLaunch/MenuMain.cpp
rename to xbox1/frontend/RetroLaunch/MenuMain.cpp
diff --git a/xbox1/RetroLaunch/MenuMain.h b/xbox1/frontend/RetroLaunch/MenuMain.h
similarity index 100%
rename from xbox1/RetroLaunch/MenuMain.h
rename to xbox1/frontend/RetroLaunch/MenuMain.h
diff --git a/xbox1/RetroLaunch/MenuManager.cpp b/xbox1/frontend/RetroLaunch/MenuManager.cpp
similarity index 100%
rename from xbox1/RetroLaunch/MenuManager.cpp
rename to xbox1/frontend/RetroLaunch/MenuManager.cpp
diff --git a/xbox1/RetroLaunch/MenuManager.h b/xbox1/frontend/RetroLaunch/MenuManager.h
similarity index 100%
rename from xbox1/RetroLaunch/MenuManager.h
rename to xbox1/frontend/RetroLaunch/MenuManager.h
diff --git a/xbox1/RetroLaunch/Rom.cpp b/xbox1/frontend/RetroLaunch/Rom.cpp
similarity index 100%
rename from xbox1/RetroLaunch/Rom.cpp
rename to xbox1/frontend/RetroLaunch/Rom.cpp
diff --git a/xbox1/RetroLaunch/Rom.h b/xbox1/frontend/RetroLaunch/Rom.h
similarity index 100%
rename from xbox1/RetroLaunch/Rom.h
rename to xbox1/frontend/RetroLaunch/Rom.h
diff --git a/xbox1/RetroLaunch/RomList.cpp b/xbox1/frontend/RetroLaunch/RomList.cpp
similarity index 100%
rename from xbox1/RetroLaunch/RomList.cpp
rename to xbox1/frontend/RetroLaunch/RomList.cpp
diff --git a/xbox1/RetroLaunch/RomList.h b/xbox1/frontend/RetroLaunch/RomList.h
similarity index 100%
rename from xbox1/RetroLaunch/RomList.h
rename to xbox1/frontend/RetroLaunch/RomList.h
diff --git a/xbox1/RetroLaunch/Surface.cpp b/xbox1/frontend/RetroLaunch/Surface.cpp
similarity index 99%
rename from xbox1/RetroLaunch/Surface.cpp
rename to xbox1/frontend/RetroLaunch/Surface.cpp
index 87ffb917e9..d4be34b64f 100644
--- a/xbox1/RetroLaunch/Surface.cpp
+++ b/xbox1/frontend/RetroLaunch/Surface.cpp
@@ -17,8 +17,8 @@
 
 #include "Surface.h"
 
-#include "../../general.h"
-#include "../xdk_d3d8.h"
+#include "../../../general.h"
+#include "../../xdk_d3d8.h"
 
 CSurface::CSurface()
 {
diff --git a/xbox1/RetroLaunch/Surface.h b/xbox1/frontend/RetroLaunch/Surface.h
similarity index 100%
rename from xbox1/RetroLaunch/Surface.h
rename to xbox1/frontend/RetroLaunch/Surface.h
diff --git a/xbox1/RetroLaunch/Undocumented.h b/xbox1/frontend/RetroLaunch/Undocumented.h
similarity index 100%
rename from xbox1/RetroLaunch/Undocumented.h
rename to xbox1/frontend/RetroLaunch/Undocumented.h
diff --git a/xbox1/RetroLaunch/titleimage.bmp b/xbox1/frontend/RetroLaunch/titleimage.bmp
similarity index 100%
rename from xbox1/RetroLaunch/titleimage.bmp
rename to xbox1/frontend/RetroLaunch/titleimage.bmp
diff --git a/xbox1/frontend/menu.cpp b/xbox1/frontend/menu.cpp
index 41c9f49a1d..20ec4efba5 100644
--- a/xbox1/frontend/menu.cpp
+++ b/xbox1/frontend/menu.cpp
@@ -14,11 +14,11 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../xbox1/RetroLaunch/Global.h"
-#include "../../xbox1/RetroLaunch/IoSupport.h"
-#include "../../xbox1/RetroLaunch/Font.h"
-#include "../../xbox1/RetroLaunch/MenuManager.h"
-#include "../../xbox1/RetroLaunch/RomList.h"
+#include "RetroLaunch/Global.h"
+#include "RetroLaunch/IoSupport.h"
+#include "RetroLaunch/Font.h"
+#include "RetroLaunch/MenuManager.h"
+#include "RetroLaunch/RomList.h"
 
 int menu_init(void)
 {
diff --git a/xbox1/retrolaunch.cpp b/xbox1/retrolaunch.cpp
deleted file mode 100644
index dd1bf8283f..0000000000
--- a/xbox1/retrolaunch.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/* RetroArch - A frontend for libretro.
-* Copyright (C) 2010-2012 - Hans-Kristian Arntzen
-* Copyright (C) 2011-2012 - Daniel De Matteis
-*
-* RetroArch is free software: you can redistribute it and/or modify it under the terms
-* of the GNU General Public License as published by the Free Software Found-
-* ation, either version 3 of the License, or (at your option) any later version.
-*
-* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-* PURPOSE. See the GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License along with RetroArch.
-* If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * RetroLaunch 2012
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version. This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details. You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. To contact the
- * authors: Surreal64 CE Team (http://www.emuxtras.net)
- */
-
-#include "RetroLaunch/Font.cpp"
-#include "RetroLaunch/IoSupport.cpp"
-#include "RetroLaunch/MenuMain.cpp"
-#include "RetroLaunch/MenuManager.cpp"
-#include "RetroLaunch/Rom.cpp"
-#include "RetroLaunch/RomList.cpp"
-#include "RetroLaunch/Surface.cpp"
\ No newline at end of file
diff --git a/xbox1/xdk_d3d8.h b/xbox1/xdk_d3d8.h
index 7ce1a84c84..a6e867d9e1 100644
--- a/xbox1/xdk_d3d8.h
+++ b/xbox1/xdk_d3d8.h
@@ -18,6 +18,11 @@
 #define _XDK_VIDEO_H
 
 #include <stdint.h>
+
+#ifdef _XBOX1
+#define XFONT_TRUETYPE // use true type fonts
+#endif
+
 #include <xfont.h>
 
 #include "../xdk/xdk_defines.h"