diff --git a/src/citra/src/citra.cpp b/src/citra/citra.cpp
similarity index 100%
rename from src/citra/src/citra.cpp
rename to src/citra/citra.cpp
diff --git a/src/citra/src/citra.h b/src/citra/citra.h
similarity index 100%
rename from src/citra/src/citra.h
rename to src/citra/citra.h
diff --git a/src/citra/src/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp
similarity index 100%
rename from src/citra/src/emu_window/emu_window_glfw.cpp
rename to src/citra/emu_window/emu_window_glfw.cpp
diff --git a/src/citra/src/emu_window/emu_window_glfw.h b/src/citra/emu_window/emu_window_glfw.h
similarity index 100%
rename from src/citra/src/emu_window/emu_window_glfw.h
rename to src/citra/emu_window/emu_window_glfw.h
diff --git a/src/citra/src/version.h b/src/citra/version.h
similarity index 100%
rename from src/citra/src/version.h
rename to src/citra/version.h
diff --git a/src/citra_qt/src/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
similarity index 100%
rename from src/citra_qt/src/bootmanager.cpp
rename to src/citra_qt/bootmanager.cpp
diff --git a/src/citra_qt/src/bootmanager.hxx b/src/citra_qt/bootmanager.hxx
similarity index 100%
rename from src/citra_qt/src/bootmanager.hxx
rename to src/citra_qt/bootmanager.hxx
diff --git a/src/citra_qt/src/callstack.cpp b/src/citra_qt/callstack.cpp
similarity index 100%
rename from src/citra_qt/src/callstack.cpp
rename to src/citra_qt/callstack.cpp
diff --git a/src/citra_qt/src/callstack.hxx b/src/citra_qt/callstack.hxx
similarity index 100%
rename from src/citra_qt/src/callstack.hxx
rename to src/citra_qt/callstack.hxx
diff --git a/src/citra_qt/src/callstack.ui b/src/citra_qt/callstack.ui
similarity index 100%
rename from src/citra_qt/src/callstack.ui
rename to src/citra_qt/callstack.ui
diff --git a/src/citra_qt/src/config/controller_config.cpp b/src/citra_qt/config/controller_config.cpp
similarity index 100%
rename from src/citra_qt/src/config/controller_config.cpp
rename to src/citra_qt/config/controller_config.cpp
diff --git a/src/citra_qt/src/config/controller_config.hxx b/src/citra_qt/config/controller_config.hxx
similarity index 100%
rename from src/citra_qt/src/config/controller_config.hxx
rename to src/citra_qt/config/controller_config.hxx
diff --git a/src/citra_qt/src/config/controller_config.ui b/src/citra_qt/config/controller_config.ui
similarity index 100%
rename from src/citra_qt/src/config/controller_config.ui
rename to src/citra_qt/config/controller_config.ui
diff --git a/src/citra_qt/src/config/controller_config_util.cpp b/src/citra_qt/config/controller_config_util.cpp
similarity index 100%
rename from src/citra_qt/src/config/controller_config_util.cpp
rename to src/citra_qt/config/controller_config_util.cpp
diff --git a/src/citra_qt/src/config/controller_config_util.hxx b/src/citra_qt/config/controller_config_util.hxx
similarity index 100%
rename from src/citra_qt/src/config/controller_config_util.hxx
rename to src/citra_qt/config/controller_config_util.hxx
diff --git a/src/citra_qt/src/config/ui_controller_config.h b/src/citra_qt/config/ui_controller_config.h
similarity index 100%
rename from src/citra_qt/src/config/ui_controller_config.h
rename to src/citra_qt/config/ui_controller_config.h
diff --git a/src/citra_qt/src/cpu_regs.cpp b/src/citra_qt/cpu_regs.cpp
similarity index 100%
rename from src/citra_qt/src/cpu_regs.cpp
rename to src/citra_qt/cpu_regs.cpp
diff --git a/src/citra_qt/src/cpu_regs.hxx b/src/citra_qt/cpu_regs.hxx
similarity index 100%
rename from src/citra_qt/src/cpu_regs.hxx
rename to src/citra_qt/cpu_regs.hxx
diff --git a/src/citra_qt/src/cpu_regs.ui b/src/citra_qt/cpu_regs.ui
similarity index 100%
rename from src/citra_qt/src/cpu_regs.ui
rename to src/citra_qt/cpu_regs.ui
diff --git a/src/citra_qt/src/disasm.cpp b/src/citra_qt/disasm.cpp
similarity index 100%
rename from src/citra_qt/src/disasm.cpp
rename to src/citra_qt/disasm.cpp
diff --git a/src/citra_qt/src/disasm.hxx b/src/citra_qt/disasm.hxx
similarity index 100%
rename from src/citra_qt/src/disasm.hxx
rename to src/citra_qt/disasm.hxx
diff --git a/src/citra_qt/src/disasm.ui b/src/citra_qt/disasm.ui
similarity index 100%
rename from src/citra_qt/src/disasm.ui
rename to src/citra_qt/disasm.ui
diff --git a/src/citra_qt/src/hotkeys.cpp b/src/citra_qt/hotkeys.cpp
similarity index 100%
rename from src/citra_qt/src/hotkeys.cpp
rename to src/citra_qt/hotkeys.cpp
diff --git a/src/citra_qt/src/hotkeys.hxx b/src/citra_qt/hotkeys.hxx
similarity index 100%
rename from src/citra_qt/src/hotkeys.hxx
rename to src/citra_qt/hotkeys.hxx
diff --git a/src/citra_qt/src/hotkeys.ui b/src/citra_qt/hotkeys.ui
similarity index 100%
rename from src/citra_qt/src/hotkeys.ui
rename to src/citra_qt/hotkeys.ui
diff --git a/src/citra_qt/src/main.cpp b/src/citra_qt/main.cpp
similarity index 100%
rename from src/citra_qt/src/main.cpp
rename to src/citra_qt/main.cpp
diff --git a/src/citra_qt/src/main.hxx b/src/citra_qt/main.hxx
similarity index 100%
rename from src/citra_qt/src/main.hxx
rename to src/citra_qt/main.hxx
diff --git a/src/citra_qt/src/main.ui b/src/citra_qt/main.ui
similarity index 100%
rename from src/citra_qt/src/main.ui
rename to src/citra_qt/main.ui
diff --git a/src/citra_qt/src/ramview.cpp b/src/citra_qt/ramview.cpp
similarity index 100%
rename from src/citra_qt/src/ramview.cpp
rename to src/citra_qt/ramview.cpp
diff --git a/src/citra_qt/src/ramview.hxx b/src/citra_qt/ramview.hxx
similarity index 100%
rename from src/citra_qt/src/ramview.hxx
rename to src/citra_qt/ramview.hxx
diff --git a/src/citra_qt/src/ui_callstack.h b/src/citra_qt/ui_callstack.h
similarity index 100%
rename from src/citra_qt/src/ui_callstack.h
rename to src/citra_qt/ui_callstack.h
diff --git a/src/citra_qt/src/ui_cpu_regs.h b/src/citra_qt/ui_cpu_regs.h
similarity index 100%
rename from src/citra_qt/src/ui_cpu_regs.h
rename to src/citra_qt/ui_cpu_regs.h
diff --git a/src/citra_qt/src/ui_disasm.h b/src/citra_qt/ui_disasm.h
similarity index 100%
rename from src/citra_qt/src/ui_disasm.h
rename to src/citra_qt/ui_disasm.h
diff --git a/src/citra_qt/src/ui_gfx_fifo_player.h b/src/citra_qt/ui_gfx_fifo_player.h
similarity index 100%
rename from src/citra_qt/src/ui_gfx_fifo_player.h
rename to src/citra_qt/ui_gfx_fifo_player.h
diff --git a/src/citra_qt/src/ui_hotkeys.h b/src/citra_qt/ui_hotkeys.h
similarity index 100%
rename from src/citra_qt/src/ui_hotkeys.h
rename to src/citra_qt/ui_hotkeys.h
diff --git a/src/citra_qt/src/ui_image_info.h b/src/citra_qt/ui_image_info.h
similarity index 100%
rename from src/citra_qt/src/ui_image_info.h
rename to src/citra_qt/ui_image_info.h
diff --git a/src/citra_qt/src/ui_main.h b/src/citra_qt/ui_main.h
similarity index 100%
rename from src/citra_qt/src/ui_main.h
rename to src/citra_qt/ui_main.h
diff --git a/src/citra_qt/src/ui_welcome_wizard.h b/src/citra_qt/ui_welcome_wizard.h
similarity index 100%
rename from src/citra_qt/src/ui_welcome_wizard.h
rename to src/citra_qt/ui_welcome_wizard.h
diff --git a/src/citra_qt/src/version.h b/src/citra_qt/version.h
similarity index 100%
rename from src/citra_qt/src/version.h
rename to src/citra_qt/version.h
diff --git a/src/common/src/atomic.h b/src/common/atomic.h
similarity index 100%
rename from src/common/src/atomic.h
rename to src/common/atomic.h
diff --git a/src/common/src/atomic_gcc.h b/src/common/atomic_gcc.h
similarity index 100%
rename from src/common/src/atomic_gcc.h
rename to src/common/atomic_gcc.h
diff --git a/src/common/src/atomic_win32.h b/src/common/atomic_win32.h
similarity index 100%
rename from src/common/src/atomic_win32.h
rename to src/common/atomic_win32.h
diff --git a/src/common/src/break_points.cpp b/src/common/break_points.cpp
similarity index 100%
rename from src/common/src/break_points.cpp
rename to src/common/break_points.cpp
diff --git a/src/common/src/break_points.h b/src/common/break_points.h
similarity index 100%
rename from src/common/src/break_points.h
rename to src/common/break_points.h
diff --git a/src/common/src/chunk_file.h b/src/common/chunk_file.h
similarity index 100%
rename from src/common/src/chunk_file.h
rename to src/common/chunk_file.h
diff --git a/src/common/src/common.h b/src/common/common.h
similarity index 100%
rename from src/common/src/common.h
rename to src/common/common.h
diff --git a/src/common/src/common_funcs.h b/src/common/common_funcs.h
similarity index 100%
rename from src/common/src/common_funcs.h
rename to src/common/common_funcs.h
diff --git a/src/common/src/common_paths.h b/src/common/common_paths.h
similarity index 100%
rename from src/common/src/common_paths.h
rename to src/common/common_paths.h
diff --git a/src/common/src/common_types.h b/src/common/common_types.h
similarity index 100%
rename from src/common/src/common_types.h
rename to src/common/common_types.h
diff --git a/src/common/src/console_listener.cpp b/src/common/console_listener.cpp
similarity index 100%
rename from src/common/src/console_listener.cpp
rename to src/common/console_listener.cpp
diff --git a/src/common/src/console_listener.h b/src/common/console_listener.h
similarity index 100%
rename from src/common/src/console_listener.h
rename to src/common/console_listener.h
diff --git a/src/common/src/cpu_detect.h b/src/common/cpu_detect.h
similarity index 100%
rename from src/common/src/cpu_detect.h
rename to src/common/cpu_detect.h
diff --git a/src/common/src/debug_interface.h b/src/common/debug_interface.h
similarity index 100%
rename from src/common/src/debug_interface.h
rename to src/common/debug_interface.h
diff --git a/src/common/src/emu_window.h b/src/common/emu_window.h
similarity index 100%
rename from src/common/src/emu_window.h
rename to src/common/emu_window.h
diff --git a/src/common/src/extended_trace.cpp b/src/common/extended_trace.cpp
similarity index 100%
rename from src/common/src/extended_trace.cpp
rename to src/common/extended_trace.cpp
diff --git a/src/common/src/extended_trace.h b/src/common/extended_trace.h
similarity index 100%
rename from src/common/src/extended_trace.h
rename to src/common/extended_trace.h
diff --git a/src/common/src/fifo_queue.h b/src/common/fifo_queue.h
similarity index 100%
rename from src/common/src/fifo_queue.h
rename to src/common/fifo_queue.h
diff --git a/src/common/src/file_search.cpp b/src/common/file_search.cpp
similarity index 100%
rename from src/common/src/file_search.cpp
rename to src/common/file_search.cpp
diff --git a/src/common/src/file_search.h b/src/common/file_search.h
similarity index 100%
rename from src/common/src/file_search.h
rename to src/common/file_search.h
diff --git a/src/common/src/file_util.cpp b/src/common/file_util.cpp
similarity index 100%
rename from src/common/src/file_util.cpp
rename to src/common/file_util.cpp
diff --git a/src/common/src/file_util.h b/src/common/file_util.h
similarity index 100%
rename from src/common/src/file_util.h
rename to src/common/file_util.h
diff --git a/src/common/src/fixed_size_queue.h b/src/common/fixed_size_queue.h
similarity index 100%
rename from src/common/src/fixed_size_queue.h
rename to src/common/fixed_size_queue.h
diff --git a/src/common/src/hash.cpp b/src/common/hash.cpp
similarity index 100%
rename from src/common/src/hash.cpp
rename to src/common/hash.cpp
diff --git a/src/common/src/hash.h b/src/common/hash.h
similarity index 100%
rename from src/common/src/hash.h
rename to src/common/hash.h
diff --git a/src/common/src/linear_disk_cache.h b/src/common/linear_disk_cache.h
similarity index 100%
rename from src/common/src/linear_disk_cache.h
rename to src/common/linear_disk_cache.h
diff --git a/src/common/src/log.h b/src/common/log.h
similarity index 100%
rename from src/common/src/log.h
rename to src/common/log.h
diff --git a/src/common/src/log_manager.cpp b/src/common/log_manager.cpp
similarity index 100%
rename from src/common/src/log_manager.cpp
rename to src/common/log_manager.cpp
diff --git a/src/common/src/log_manager.h b/src/common/log_manager.h
similarity index 100%
rename from src/common/src/log_manager.h
rename to src/common/log_manager.h
diff --git a/src/common/src/math_util.cpp b/src/common/math_util.cpp
similarity index 100%
rename from src/common/src/math_util.cpp
rename to src/common/math_util.cpp
diff --git a/src/common/src/math_util.h b/src/common/math_util.h
similarity index 100%
rename from src/common/src/math_util.h
rename to src/common/math_util.h
diff --git a/src/common/src/mem_arena.cpp b/src/common/mem_arena.cpp
similarity index 100%
rename from src/common/src/mem_arena.cpp
rename to src/common/mem_arena.cpp
diff --git a/src/common/src/mem_arena.h b/src/common/mem_arena.h
similarity index 100%
rename from src/common/src/mem_arena.h
rename to src/common/mem_arena.h
diff --git a/src/common/src/memory_util.cpp b/src/common/memory_util.cpp
similarity index 100%
rename from src/common/src/memory_util.cpp
rename to src/common/memory_util.cpp
diff --git a/src/common/src/memory_util.h b/src/common/memory_util.h
similarity index 100%
rename from src/common/src/memory_util.h
rename to src/common/memory_util.h
diff --git a/src/common/src/misc.cpp b/src/common/misc.cpp
similarity index 100%
rename from src/common/src/misc.cpp
rename to src/common/misc.cpp
diff --git a/src/common/src/msg_handler.cpp b/src/common/msg_handler.cpp
similarity index 100%
rename from src/common/src/msg_handler.cpp
rename to src/common/msg_handler.cpp
diff --git a/src/common/src/msg_handler.h b/src/common/msg_handler.h
similarity index 100%
rename from src/common/src/msg_handler.h
rename to src/common/msg_handler.h
diff --git a/src/common/src/platform.h b/src/common/platform.h
similarity index 100%
rename from src/common/src/platform.h
rename to src/common/platform.h
diff --git a/src/common/src/scm_rev.h b/src/common/scm_rev.h
similarity index 100%
rename from src/common/src/scm_rev.h
rename to src/common/scm_rev.h
diff --git a/src/common/src/std_condition_variable.h b/src/common/std_condition_variable.h
similarity index 100%
rename from src/common/src/std_condition_variable.h
rename to src/common/std_condition_variable.h
diff --git a/src/common/src/std_mutex.h b/src/common/std_mutex.h
similarity index 100%
rename from src/common/src/std_mutex.h
rename to src/common/std_mutex.h
diff --git a/src/common/src/std_thread.h b/src/common/std_thread.h
similarity index 100%
rename from src/common/src/std_thread.h
rename to src/common/std_thread.h
diff --git a/src/common/src/string_util.cpp b/src/common/string_util.cpp
similarity index 100%
rename from src/common/src/string_util.cpp
rename to src/common/string_util.cpp
diff --git a/src/common/src/string_util.h b/src/common/string_util.h
similarity index 100%
rename from src/common/src/string_util.h
rename to src/common/string_util.h
diff --git a/src/common/src/swap.h b/src/common/swap.h
similarity index 100%
rename from src/common/src/swap.h
rename to src/common/swap.h
diff --git a/src/common/src/thread.cpp b/src/common/thread.cpp
similarity index 100%
rename from src/common/src/thread.cpp
rename to src/common/thread.cpp
diff --git a/src/common/src/thread.h b/src/common/thread.h
similarity index 100%
rename from src/common/src/thread.h
rename to src/common/thread.h
diff --git a/src/common/src/thunk.h b/src/common/thunk.h
similarity index 100%
rename from src/common/src/thunk.h
rename to src/common/thunk.h
diff --git a/src/common/src/timer.cpp b/src/common/timer.cpp
similarity index 100%
rename from src/common/src/timer.cpp
rename to src/common/timer.cpp
diff --git a/src/common/src/timer.h b/src/common/timer.h
similarity index 100%
rename from src/common/src/timer.h
rename to src/common/timer.h
diff --git a/src/common/src/utf8.cpp b/src/common/utf8.cpp
similarity index 100%
rename from src/common/src/utf8.cpp
rename to src/common/utf8.cpp
diff --git a/src/common/src/utf8.h b/src/common/utf8.h
similarity index 100%
rename from src/common/src/utf8.h
rename to src/common/utf8.h
diff --git a/src/common/src/version.cpp b/src/common/version.cpp
similarity index 100%
rename from src/common/src/version.cpp
rename to src/common/version.cpp
diff --git a/src/core/src/arm/arm_interface.h b/src/core/arm/arm_interface.h
similarity index 100%
rename from src/core/src/arm/arm_interface.h
rename to src/core/arm/arm_interface.h
diff --git a/src/core/src/arm/disassembler/arm_disasm.cpp b/src/core/arm/disassembler/arm_disasm.cpp
similarity index 100%
rename from src/core/src/arm/disassembler/arm_disasm.cpp
rename to src/core/arm/disassembler/arm_disasm.cpp
diff --git a/src/core/src/arm/disassembler/arm_disasm.h b/src/core/arm/disassembler/arm_disasm.h
similarity index 100%
rename from src/core/src/arm/disassembler/arm_disasm.h
rename to src/core/arm/disassembler/arm_disasm.h
diff --git a/src/core/src/arm/interpreter/arm_interpreter.cpp b/src/core/arm/interpreter/arm_interpreter.cpp
similarity index 100%
rename from src/core/src/arm/interpreter/arm_interpreter.cpp
rename to src/core/arm/interpreter/arm_interpreter.cpp
diff --git a/src/core/src/arm/interpreter/arm_interpreter.h b/src/core/arm/interpreter/arm_interpreter.h
similarity index 100%
rename from src/core/src/arm/interpreter/arm_interpreter.h
rename to src/core/arm/interpreter/arm_interpreter.h
diff --git a/src/core/src/arm/interpreter/arm_regformat.h b/src/core/arm/interpreter/arm_regformat.h
similarity index 100%
rename from src/core/src/arm/interpreter/arm_regformat.h
rename to src/core/arm/interpreter/arm_regformat.h
diff --git a/src/core/src/arm/interpreter/armcpu.h b/src/core/arm/interpreter/armcpu.h
similarity index 100%
rename from src/core/src/arm/interpreter/armcpu.h
rename to src/core/arm/interpreter/armcpu.h
diff --git a/src/core/src/arm/interpreter/armdefs.h b/src/core/arm/interpreter/armdefs.h
similarity index 100%
rename from src/core/src/arm/interpreter/armdefs.h
rename to src/core/arm/interpreter/armdefs.h
diff --git a/src/core/src/arm/interpreter/armemu.cpp b/src/core/arm/interpreter/armemu.cpp
similarity index 100%
rename from src/core/src/arm/interpreter/armemu.cpp
rename to src/core/arm/interpreter/armemu.cpp
diff --git a/src/core/src/arm/interpreter/armemu.h b/src/core/arm/interpreter/armemu.h
similarity index 100%
rename from src/core/src/arm/interpreter/armemu.h
rename to src/core/arm/interpreter/armemu.h
diff --git a/src/core/src/arm/interpreter/arminit.cpp b/src/core/arm/interpreter/arminit.cpp
similarity index 100%
rename from src/core/src/arm/interpreter/arminit.cpp
rename to src/core/arm/interpreter/arminit.cpp
diff --git a/src/core/src/arm/interpreter/armmmu.cpp b/src/core/arm/interpreter/armmmu.cpp
similarity index 100%
rename from src/core/src/arm/interpreter/armmmu.cpp
rename to src/core/arm/interpreter/armmmu.cpp
diff --git a/src/core/src/arm/interpreter/armmmu.h b/src/core/arm/interpreter/armmmu.h
similarity index 100%
rename from src/core/src/arm/interpreter/armmmu.h
rename to src/core/arm/interpreter/armmmu.h
diff --git a/src/core/src/arm/interpreter/armos.cpp b/src/core/arm/interpreter/armos.cpp
similarity index 100%
rename from src/core/src/arm/interpreter/armos.cpp
rename to src/core/arm/interpreter/armos.cpp
diff --git a/src/core/src/arm/interpreter/armos.h b/src/core/arm/interpreter/armos.h
similarity index 100%
rename from src/core/src/arm/interpreter/armos.h
rename to src/core/arm/interpreter/armos.h
diff --git a/src/core/src/arm/interpreter/armsupp.cpp b/src/core/arm/interpreter/armsupp.cpp
similarity index 100%
rename from src/core/src/arm/interpreter/armsupp.cpp
rename to src/core/arm/interpreter/armsupp.cpp
diff --git a/src/core/src/arm/interpreter/armvirt.cpp b/src/core/arm/interpreter/armvirt.cpp
similarity index 100%
rename from src/core/src/arm/interpreter/armvirt.cpp
rename to src/core/arm/interpreter/armvirt.cpp
diff --git a/src/core/src/arm/interpreter/skyeye_defs.h b/src/core/arm/interpreter/skyeye_defs.h
similarity index 100%
rename from src/core/src/arm/interpreter/skyeye_defs.h
rename to src/core/arm/interpreter/skyeye_defs.h
diff --git a/src/core/src/arm/interpreter/thumbemu.cpp b/src/core/arm/interpreter/thumbemu.cpp
similarity index 100%
rename from src/core/src/arm/interpreter/thumbemu.cpp
rename to src/core/arm/interpreter/thumbemu.cpp
diff --git a/src/core/src/arm/mmu/arm1176jzf_s_mmu.cpp b/src/core/arm/mmu/arm1176jzf_s_mmu.cpp
similarity index 100%
rename from src/core/src/arm/mmu/arm1176jzf_s_mmu.cpp
rename to src/core/arm/mmu/arm1176jzf_s_mmu.cpp
diff --git a/src/core/src/arm/mmu/arm1176jzf_s_mmu.h b/src/core/arm/mmu/arm1176jzf_s_mmu.h
similarity index 100%
rename from src/core/src/arm/mmu/arm1176jzf_s_mmu.h
rename to src/core/arm/mmu/arm1176jzf_s_mmu.h
diff --git a/src/core/src/arm/mmu/cache.h b/src/core/arm/mmu/cache.h
similarity index 100%
rename from src/core/src/arm/mmu/cache.h
rename to src/core/arm/mmu/cache.h
diff --git a/src/core/src/arm/mmu/rb.h b/src/core/arm/mmu/rb.h
similarity index 100%
rename from src/core/src/arm/mmu/rb.h
rename to src/core/arm/mmu/rb.h
diff --git a/src/core/src/arm/mmu/tlb.h b/src/core/arm/mmu/tlb.h
similarity index 100%
rename from src/core/src/arm/mmu/tlb.h
rename to src/core/arm/mmu/tlb.h
diff --git a/src/core/src/arm/mmu/wb.h b/src/core/arm/mmu/wb.h
similarity index 100%
rename from src/core/src/arm/mmu/wb.h
rename to src/core/arm/mmu/wb.h
diff --git a/src/core/src/core.cpp b/src/core/core.cpp
similarity index 100%
rename from src/core/src/core.cpp
rename to src/core/core.cpp
diff --git a/src/core/src/core.h b/src/core/core.h
similarity index 100%
rename from src/core/src/core.h
rename to src/core/core.h
diff --git a/src/core/src/core_timing.cpp b/src/core/core_timing.cpp
similarity index 100%
rename from src/core/src/core_timing.cpp
rename to src/core/core_timing.cpp
diff --git a/src/core/src/core_timing.h b/src/core/core_timing.h
similarity index 100%
rename from src/core/src/core_timing.h
rename to src/core/core_timing.h
diff --git a/src/core/src/elf/elf_reader.cpp b/src/core/elf/elf_reader.cpp
similarity index 100%
rename from src/core/src/elf/elf_reader.cpp
rename to src/core/elf/elf_reader.cpp
diff --git a/src/core/src/elf/elf_reader.h b/src/core/elf/elf_reader.h
similarity index 100%
rename from src/core/src/elf/elf_reader.h
rename to src/core/elf/elf_reader.h
diff --git a/src/core/src/elf/elf_types.h b/src/core/elf/elf_types.h
similarity index 100%
rename from src/core/src/elf/elf_types.h
rename to src/core/elf/elf_types.h
diff --git a/src/core/src/file_sys/directory_file_system.cpp b/src/core/file_sys/directory_file_system.cpp
similarity index 100%
rename from src/core/src/file_sys/directory_file_system.cpp
rename to src/core/file_sys/directory_file_system.cpp
diff --git a/src/core/src/file_sys/directory_file_system.h b/src/core/file_sys/directory_file_system.h
similarity index 100%
rename from src/core/src/file_sys/directory_file_system.h
rename to src/core/file_sys/directory_file_system.h
diff --git a/src/core/src/file_sys/file_sys.h b/src/core/file_sys/file_sys.h
similarity index 100%
rename from src/core/src/file_sys/file_sys.h
rename to src/core/file_sys/file_sys.h
diff --git a/src/core/src/file_sys/meta_file_system.cpp b/src/core/file_sys/meta_file_system.cpp
similarity index 100%
rename from src/core/src/file_sys/meta_file_system.cpp
rename to src/core/file_sys/meta_file_system.cpp
diff --git a/src/core/src/file_sys/meta_file_system.h b/src/core/file_sys/meta_file_system.h
similarity index 100%
rename from src/core/src/file_sys/meta_file_system.h
rename to src/core/file_sys/meta_file_system.h
diff --git a/src/core/src/hw/hw.cpp b/src/core/hw/hw.cpp
similarity index 100%
rename from src/core/src/hw/hw.cpp
rename to src/core/hw/hw.cpp
diff --git a/src/core/src/hw/hw.h b/src/core/hw/hw.h
similarity index 100%
rename from src/core/src/hw/hw.h
rename to src/core/hw/hw.h
diff --git a/src/core/src/hw/hw_lcd.cpp b/src/core/hw/hw_lcd.cpp
similarity index 100%
rename from src/core/src/hw/hw_lcd.cpp
rename to src/core/hw/hw_lcd.cpp
diff --git a/src/core/src/hw/hw_lcd.h b/src/core/hw/hw_lcd.h
similarity index 100%
rename from src/core/src/hw/hw_lcd.h
rename to src/core/hw/hw_lcd.h
diff --git a/src/core/src/loader.cpp b/src/core/loader.cpp
similarity index 100%
rename from src/core/src/loader.cpp
rename to src/core/loader.cpp
diff --git a/src/core/src/loader.h b/src/core/loader.h
similarity index 100%
rename from src/core/src/loader.h
rename to src/core/loader.h
diff --git a/src/core/src/mem_map.cpp b/src/core/mem_map.cpp
similarity index 100%
rename from src/core/src/mem_map.cpp
rename to src/core/mem_map.cpp
diff --git a/src/core/src/mem_map.h b/src/core/mem_map.h
similarity index 100%
rename from src/core/src/mem_map.h
rename to src/core/mem_map.h
diff --git a/src/core/src/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp
similarity index 100%
rename from src/core/src/mem_map_funcs.cpp
rename to src/core/mem_map_funcs.cpp
diff --git a/src/core/src/system.cpp b/src/core/system.cpp
similarity index 100%
rename from src/core/src/system.cpp
rename to src/core/system.cpp
diff --git a/src/core/src/system.h b/src/core/system.h
similarity index 100%
rename from src/core/src/system.h
rename to src/core/system.h
diff --git a/src/video_core/src/renderer_base.h b/src/video_core/renderer_base.h
similarity index 100%
rename from src/video_core/src/renderer_base.h
rename to src/video_core/renderer_base.h
diff --git a/src/video_core/src/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
similarity index 100%
rename from src/video_core/src/renderer_opengl/renderer_opengl.cpp
rename to src/video_core/renderer_opengl/renderer_opengl.cpp
diff --git a/src/video_core/src/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h
similarity index 100%
rename from src/video_core/src/renderer_opengl/renderer_opengl.h
rename to src/video_core/renderer_opengl/renderer_opengl.h
diff --git a/src/video_core/src/utils.cpp b/src/video_core/utils.cpp
similarity index 100%
rename from src/video_core/src/utils.cpp
rename to src/video_core/utils.cpp
diff --git a/src/video_core/src/utils.h b/src/video_core/utils.h
similarity index 100%
rename from src/video_core/src/utils.h
rename to src/video_core/utils.h
diff --git a/src/video_core/src/video_core.cpp b/src/video_core/video_core.cpp
similarity index 100%
rename from src/video_core/src/video_core.cpp
rename to src/video_core/video_core.cpp
diff --git a/src/video_core/src/video_core.h b/src/video_core/video_core.h
similarity index 100%
rename from src/video_core/src/video_core.h
rename to src/video_core/video_core.h