5 files changed, 30 insertions, 36 deletions

diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 746cf083d..37ea97403 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -22,17 +22,17 @@
  * http://code.google.com/p/gekko-gc-emu/
  */
 
-#include "common.h"
-#include "log_manager.h"
-#include "file_util.h"
+#include "common/common.h"
+#include "common/log_manager.h"
+#include "common/file_util.h"
 
-#include "system.h"
-#include "core.h"
-#include "loader.h"
+#include "core/system.h"
+#include "core/core.h"
+#include "core/loader.h"
 
-#include "emu_window/emu_window_glfw.h"
+#include "citra/emu_window/emu_window_glfw.h"
 
-#include "citra.h"
+#include "citra/citra.h"
 
 #define E_ERR -1
 
@@ -52,7 +52,7 @@ int __cdecl main(int argc, char **argv) {
 
         System::Init(emu_window);
 
-    std::string boot_filename = "homebrew.elf";
+    std::string boot_filename = "C:\\Users\\eric\\Desktop\\3ds\\homebrew\\Mandelbrot3DS.elf";
     std::string error_str;
     
     bool res = Loader::LoadFile(boot_filename, &error_str);
diff --git a/src/citra/citra.vcxproj b/src/citra/citra.vcxproj
index 16157ad04..4ea222fcd 100644
--- a/src/citra/citra.vcxproj
+++ b/src/citra/citra.vcxproj
@@ -199,20 +199,17 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\citra.cpp" />
-    <ClCompile Include="src\emu_window\emu_window_glfw.cpp" />
+    <ClCompile Include="citra.cpp" />
+    <ClCompile Include="emu_window\emu_window_glfw.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="citra.h" />
+    <ClInclude Include="emu_window\emu_window_glfw.h" />
     <ClInclude Include="resource.h" />
-    <ClInclude Include="src\citra.h" />
-    <ClInclude Include="src\emu_window\emu_window_glfw.h" />
-    <ClInclude Include="src\version.h" />
+    <ClInclude Include="version.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="citra.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CMakeLists.txt" />
+    <Text Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/src/citra/citra.vcxproj.filters b/src/citra/citra.vcxproj.filters
index f0b6906de..b41cdf146 100644
--- a/src/citra/citra.vcxproj.filters
+++ b/src/citra/citra.vcxproj.filters
@@ -1,28 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="src\citra.cpp" />
-    <ClCompile Include="src\emu_window\emu_window_glfw.cpp">
+    <Filter Include="emu_window">
+      <UniqueIdentifier>{e3161526-9f53-4670-8dae-2be81ff01bc2}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="citra.cpp" />
+    <ClCompile Include="emu_window\emu_window_glfw.cpp">
       <Filter>emu_window</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="citra.h" />
     <ClInclude Include="resource.h" />
-    <ClInclude Include="src\version.h" />
-    <ClInclude Include="src\citra.h" />
-    <ClInclude Include="src\emu_window\emu_window_glfw.h">
+    <ClInclude Include="version.h" />
+    <ClInclude Include="emu_window\emu_window_glfw.h">
       <Filter>emu_window</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="citra.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="emu_window">
-      <UniqueIdentifier>{e3161526-9f53-4670-8dae-2be81ff01bc2}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CMakeLists.txt" />
+    <Text Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp
index 4cdb7fbb0..0192d8598 100644
--- a/src/citra/emu_window/emu_window_glfw.cpp
+++ b/src/citra/emu_window/emu_window_glfw.cpp
@@ -22,9 +22,9 @@
  * http://code.google.com/p/gekko-gc-emu/
  */
 
-#include "common.h"
-#include "video_core.h"
-#include "emu_window_glfw.h"
+#include "common/common.h"
+#include "video_core/video_core.h"
+#include "citra/emu_window/emu_window_glfw.h"
 
 static void OnKeyEvent(GLFWwindow* win, int key, int action) {
  //   EmuWindow_GLFW* emuwin = (EmuWindow_GLFW*)glfwGetWindowUserPointer(win);
diff --git a/src/citra/emu_window/emu_window_glfw.h b/src/citra/emu_window/emu_window_glfw.h
index abca9faa8..c3feb6e51 100644
--- a/src/citra/emu_window/emu_window_glfw.h
+++ b/src/citra/emu_window/emu_window_glfw.h
@@ -27,7 +27,7 @@
 #include <GL/glew.h>
 #include <GLFW/glfw3.h>
 
-#include "emu_window.h"
+#include "common/emu_window.h"
 
 class EmuWindow_GLFW : public EmuWindow {
 public: