diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml
index c46356b..134c59b 100644
--- a/.github/workflows/emscripten.yml
+++ b/.github/workflows/emscripten.yml
@@ -31,7 +31,7 @@ jobs:
       run: |
         mkdir -p out/wasm
         cd out/wasm
-        emcmake cmake -DCMAKE_BUILD_TYPE=Release ../../src/
+        emcmake cmake -DCMAKE_BUILD_TYPE=Release ../../
         make
         mkdir system3
         mv system3.* system3/
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 66775f8..9bcebdd 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -23,5 +23,5 @@ jobs:
       run: |
         mkdir -p out/${{ matrix.build-type }}
         cd out/${{ matrix.build-type }}
-        cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} ../../src/
+        cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} ../../
         make
diff --git a/.github/workflows/switch.yml b/.github/workflows/switch.yml
index f368911..a608f26 100644
--- a/.github/workflows/switch.yml
+++ b/.github/workflows/switch.yml
@@ -15,7 +15,7 @@ jobs:
       run: |
         mkdir -p out/switch
         cd out/switch
-        /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -DCMAKE_BUILD_TYPE=Release ../../src/
+        /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -DCMAKE_BUILD_TYPE=Release ../../
         make
         mkdir system3
         mv system3.* system3/
diff --git a/.github/workflows/windows-msvc.yml b/.github/workflows/windows-msvc.yml
index 892a454..0d520dc 100644
--- a/.github/workflows/windows-msvc.yml
+++ b/.github/workflows/windows-msvc.yml
@@ -24,7 +24,7 @@ jobs:
       run: |
         mkdir out
         cd out
-        cmake -G "Visual Studio 17 2022" -A ${{ matrix.arch }} ../src/
+        cmake -G "Visual Studio 17 2022" -A ${{ matrix.arch }} ../
         cmake --build . --config Release
         cmake --install . --prefix artifacts
         cp ../COPYING.txt artifacts/
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 3726092..7de9c10 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -33,5 +33,5 @@ jobs:
       run: |
         mkdir -p out/debug
         cd out/debug
-        cmake -G"Ninja" -DCMAKE_BUILD_TYPE=Debug ../../src/
+        cmake -G"Ninja" -DCMAKE_BUILD_TYPE=Debug ../../
         ninja
diff --git a/src/CMakeLists.txt b/CMakeLists.txt
similarity index 80%
rename from src/CMakeLists.txt
rename to CMakeLists.txt
index ebf6c6e..861b4e8 100644
--- a/src/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,19 +18,19 @@ if (MSVC)
 endif ()
 
 add_library(ymfm
-  ../deps/ymfm/src/ymfm_opn.cpp
-  ../deps/ymfm/src/ymfm_adpcm.cpp
-  ../deps/ymfm/src/ymfm_ssg.cpp)
-target_include_directories(ymfm PUBLIC ../deps/ymfm/src)
+  deps/ymfm/src/ymfm_opn.cpp
+  deps/ymfm/src/ymfm_adpcm.cpp
+  deps/ymfm/src/ymfm_ssg.cpp)
+target_include_directories(ymfm PUBLIC deps/ymfm/src)
 
 
 if (ANDROID)
   add_library(system3 SHARED)
 
   target_sources(system3 PRIVATE
-    android/nact_android.cpp
-    android/mako.cpp
-    sys/mako_midi.cpp
+    src/android/nact_android.cpp
+    src/android/mako.cpp
+    src/sys/mako_midi.cpp
     )
   target_link_libraries(system3 PRIVATE SDL2 SDL2_ttf SDL2_mixer ymfm)
 
@@ -38,8 +38,8 @@ elseif (EMSCRIPTEN)
   add_executable(system3)
 
   target_sources(system3 PRIVATE
-    emscripten/nact_emscripten.cpp
-    emscripten/mako.cpp
+    src/emscripten/nact_emscripten.cpp
+    src/emscripten/mako.cpp
     )
   set(LIBS "SHELL:-s USE_SDL=2" "SHELL:-s USE_SDL_TTF=2")
   target_compile_options(system3 PRIVATE ${LIBS})
@@ -125,10 +125,10 @@ else()  # NOT (ANDROID OR EMSCRIPTEN)
 
   if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     target_sources(system3 PRIVATE
-      win/nact_win.cpp
-      win/mako.cpp
-      win/resource.rc
-      sys/mako_midi.cpp
+      src/win/nact_win.cpp
+      src/win/mako.cpp
+      src/win/resource.rc
+      src/sys/mako_midi.cpp
       )
     target_link_libraries(system3 PRIVATE winmm)
     if (MSYS)
@@ -137,47 +137,47 @@ else()  # NOT (ANDROID OR EMSCRIPTEN)
   else()
     pkg_check_modules(SDL2MIXER REQUIRED IMPORTED_TARGET SDL2_mixer)
     target_sources(system3 PRIVATE
-      linux/nact_linux.cpp
-      linux/mako.cpp
-      sys/mako_midi.cpp
+      src/linux/nact_linux.cpp
+      src/linux/mako.cpp
+      src/sys/mako_midi.cpp
       )
     target_link_libraries(system3 PRIVATE PkgConfig::SDL2MIXER)
     set(RESOURCE_PATH ${CMAKE_INSTALL_PREFIX}/share/system3/)
     install(TARGETS system3 RUNTIME DESTINATION bin)
-    install(DIRECTORY ../resources/
+    install(DIRECTORY resources/
       DESTINATION share/system3
       FILES_MATCHING PATTERN *.MDA PATTERN *.ttf)
   endif()
 endif()
 
 target_sources(system3 PRIVATE
-  sdlmain.cpp
-  config.cpp
-  fileio.cpp
-  resource.cpp
-  encoding.cpp
-  texthook.cpp
-  fm/makofm.cpp
-  fm/mako_ymfm.cpp
-  sys/ags.cpp
-  sys/ags_bmp.cpp
-  sys/ags_cursor.cpp
-  sys/ags_draw.cpp
-  sys/ags_gl3.cpp
-  sys/ags_gm3.cpp
-  sys/ags_pms.cpp
-  sys/ags_text.cpp
-  sys/ags_vsp.cpp
-  sys/ags_vsp2l.cpp
-  sys/ags_window.cpp
-  sys/dri.cpp
-  sys/msgskip.cpp
-  sys/nact.cpp
-  sys/nact_crc32.cpp
-  sys/nact_input.cpp
-  sys/nact_sys1.cpp
-  sys/nact_sys2.cpp
-  sys/nact_sys3.cpp
+  src/sdlmain.cpp
+  src/config.cpp
+  src/fileio.cpp
+  src/resource.cpp
+  src/encoding.cpp
+  src/texthook.cpp
+  src/fm/makofm.cpp
+  src/fm/mako_ymfm.cpp
+  src/sys/ags.cpp
+  src/sys/ags_bmp.cpp
+  src/sys/ags_cursor.cpp
+  src/sys/ags_draw.cpp
+  src/sys/ags_gl3.cpp
+  src/sys/ags_gm3.cpp
+  src/sys/ags_pms.cpp
+  src/sys/ags_text.cpp
+  src/sys/ags_vsp.cpp
+  src/sys/ags_vsp2l.cpp
+  src/sys/ags_window.cpp
+  src/sys/dri.cpp
+  src/sys/msgskip.cpp
+  src/sys/nact.cpp
+  src/sys/nact_crc32.cpp
+  src/sys/nact_input.cpp
+  src/sys/nact_sys1.cpp
+  src/sys/nact_sys2.cpp
+  src/sys/nact_sys3.cpp
   )
 
 if(NINTENDO_SWITCH)
@@ -191,12 +191,12 @@ if(NINTENDO_SWITCH)
 
   nx_create_nro(system3
     NACP system3.nacp
-    ICON "../switch/icon.jpg"
-    ROMFS "../resources"
+    ICON "switch/icon.jpg"
+    ROMFS "resources"
   )
 endif()
 
 target_compile_definitions(system3 PRIVATE
   $<$<CONFIG:Debug>:_DEBUG_CONSOLE>
   RESOURCE_PATH="${RESOURCE_PATH}")
-target_include_directories(system3 PRIVATE . sys)
+target_include_directories(system3 PRIVATE src src/sys)
diff --git a/README.md b/README.md
index 168a21b..aa5c1a5 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ $ git submodule update --init
 $ sudo apt install g++ cmake libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev
 $ mkdir -p out/debug
 $ cd out/debug
-$ cmake -DCMAKE_BUILD_TYPE=Debug ../../src/
+$ cmake -DCMAKE_BUILD_TYPE=Debug ../../
 $ make
 $ sudo make install
 ```
@@ -25,7 +25,7 @@ $ git submodule update --init
 $ brew install cmake pkg-config sdl2 sdl2_ttf sdl2_mixer
 $ mkdir -p out/debug
 $ cd out/debug
-$ cmake -DCMAKE_BUILD_TYPE=Debug ../../src/
+$ cmake -DCMAKE_BUILD_TYPE=Debug ../../
 $ make
 $ sudo make install
 ```
@@ -37,7 +37,7 @@ $ git submodule update --init
 $ pacman -S make mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-SDL2 mingw-w64-ucrt-x86_64-SDL2_ttf
 $ mkdir -p out/debug
 $ cd out/debug
-$ cmake -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug ../../src/
+$ cmake -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug ../../
 $ make
 ```
 
@@ -49,7 +49,7 @@ $ make
     this repository using the `--recurse-submodules` option.
 - Install [CMake](https://cmake.org/download/). (The CMake integration in
   Visual Studio does not work.)
-- In the CMake GUI, press the "Browse Source..." button and select the `src`
+- In the CMake GUI, press the "Browse Source..." button and select the root
   folder of this repository.
 - Press the "Browse Build..." button. Create a new folder (e.g., `out`) under
   the top-level directory of the repository and select it.
@@ -65,7 +65,7 @@ $ make
 $ git submodule update --init
 $ mkdir -p out/wasm
 $ cd out/wasm
-$ emcmake cmake -DCMAKE_BUILD_TYPE=Release ../../src/
+$ emcmake cmake -DCMAKE_BUILD_TYPE=Release ../../
 $ make
 ```
 
diff --git a/android/app/jni/CMakeLists.txt b/android/app/jni/CMakeLists.txt
index 3ae0415..36a4dc8 100644
--- a/android/app/jni/CMakeLists.txt
+++ b/android/app/jni/CMakeLists.txt
@@ -47,7 +47,7 @@ if(NOT sdl_mixer_POPULATED)
 endif()
 
 # The main CMakeLists.txt of system3
-add_subdirectory(${PROJECT_ROOT_DIR}/src src)
+add_subdirectory(${PROJECT_ROOT_DIR} src)
 
 # Copy asset files
 set(ASSETS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/main/assets)
diff --git a/switch/README.md b/switch/README.md
index 39440e3..f0196a4 100644
--- a/switch/README.md
+++ b/switch/README.md
@@ -12,7 +12,7 @@ git submodule update --init
 sudo (dkp-)pacman -S switch-dev switch-sdl2 switch-sdl2_ttf switch-sdl2_mixer
 mkdir -p out/debug
 cd out/debug
-/opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -DCMAKE_BUILD_TYPE=Debug ../../src/
+/opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -DCMAKE_BUILD_TYPE=Debug ../../
 make
 ```