diff --git a/.travis.sh b/.travis.sh
index 0938451d..12b78454 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 if [ "$ANALYZE" = "true" ]
 then
-	cppcheck --error-exitcode=1 -j2 -DRANGECHECK -D_WIN32 -ISource Source toolsrc 2> stderr.txt
+	cppcheck --error-exitcode=1 -j2 -DRANGECHECK -D_WIN32 -Isrc src toolsrc 2> stderr.txt
 	RET=$?
 	if [ -s stderr.txt ]
 	then
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca45390d..08110307 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,6 +192,6 @@ include(CPack)
 add_subdirectory(data)
 add_subdirectory(opl)
 add_subdirectory(textscreen)
-add_subdirectory(Source)
+add_subdirectory(src)
 add_subdirectory(toolsrc)
 add_subdirectory(setup)
diff --git a/README.md b/README.md
index f148c7bf..88a302db 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ Once installed, compilation should be as simple as:
  make
 ```
 
-After successful compilation the resulting binary can be found in the `Source/` directory.
+After successful compilation the resulting binary can be found in the `src/` directory.
 
 ## Windows with Visual Studio
 
@@ -166,18 +166,18 @@ Copyright:
  © 2020-2022 Roman Fomin.  
 License: [GPL-2.0+](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
 
-Files: `Source/beta.h`  
+Files: `src/beta.h`  
 Copyright: © 2001-2019 Contributors to the Freedoom project.  
 License: [BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
 
-Files: `Source/dogs.h`  
+Files: `src/dogs.h`  
 Copyright:  
  © 2017 Nash Muhandes;  
  © apolloaiello;  
  © TobiasKosmos.  
 License: [CC-BY-3.0](https://creativecommons.org/licenses/by/3.0/) and [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/)
 
-Files: `Source/u_scanner.*`  
+Files: `src/u_scanner.*`  
 Copyright:  
  © 2010 Braden "Blzut3" Obrzut;  
  © 2019 Fernando Carmona Varo.  
@@ -191,7 +191,7 @@ Files: `cmake/FindSDL2.cmake, cmake/FindSDL2_mixer.cmake, cmake/FindSDL2_net.cma
 Copyright: © 2018 Alex Mayfield.  
 License: [BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
 
-Files: `data/woof.ico, data/woof.png, data/woof8.ico, Source/icon.c, data/setup.ico, data/woof-setup.png, data/setup8.ico, setup/setup_icon.c, Source/thermo.h`  
+Files: `data/woof.ico, data/woof.png, data/woof8.ico, src/icon.c, data/setup.ico, data/woof-setup.png, data/setup8.ico, setup/setup_icon.c, src/thermo.h`  
 Copyright: © 2020-2022 Julia Nechaevskaya.  
 License: [CC-BY-3.0](https://creativecommons.org/licenses/by/3.0/)
 
diff --git a/setup/CMakeLists.txt b/setup/CMakeLists.txt
index 66c5aea2..1acb71cf 100644
--- a/setup/CMakeLists.txt
+++ b/setup/CMakeLists.txt
@@ -9,6 +9,6 @@ target_woof_settings(setup)
 
 target_include_directories(setup
                            INTERFACE "."
-                           PRIVATE "../Source/" "${CMAKE_CURRENT_BINARY_DIR}/../")
+                           PRIVATE "../src/" "${CMAKE_CURRENT_BINARY_DIR}/../")
 
 target_link_libraries(setup textscreen SDL2::SDL2)
diff --git a/Source/CMakeLists.txt b/src/CMakeLists.txt
similarity index 100%
rename from Source/CMakeLists.txt
rename to src/CMakeLists.txt
diff --git a/Source/am_map.c b/src/am_map.c
similarity index 100%
rename from Source/am_map.c
rename to src/am_map.c
diff --git a/Source/am_map.h b/src/am_map.h
similarity index 100%
rename from Source/am_map.h
rename to src/am_map.h
diff --git a/Source/beta.h b/src/beta.h
similarity index 100%
rename from Source/beta.h
rename to src/beta.h
diff --git a/Source/cross.h b/src/cross.h
similarity index 100%
rename from Source/cross.h
rename to src/cross.h
diff --git a/Source/d_deh.c b/src/d_deh.c
similarity index 100%
rename from Source/d_deh.c
rename to src/d_deh.c
diff --git a/Source/d_deh.h b/src/d_deh.h
similarity index 100%
rename from Source/d_deh.h
rename to src/d_deh.h
diff --git a/Source/d_englsh.h b/src/d_englsh.h
similarity index 100%
rename from Source/d_englsh.h
rename to src/d_englsh.h
diff --git a/Source/d_event.h b/src/d_event.h
similarity index 100%
rename from Source/d_event.h
rename to src/d_event.h
diff --git a/Source/d_french.h b/src/d_french.h
similarity index 100%
rename from Source/d_french.h
rename to src/d_french.h
diff --git a/Source/d_items.c b/src/d_items.c
similarity index 100%
rename from Source/d_items.c
rename to src/d_items.c
diff --git a/Source/d_items.h b/src/d_items.h
similarity index 100%
rename from Source/d_items.h
rename to src/d_items.h
diff --git a/Source/d_iwad.c b/src/d_iwad.c
similarity index 100%
rename from Source/d_iwad.c
rename to src/d_iwad.c
diff --git a/Source/d_iwad.h b/src/d_iwad.h
similarity index 100%
rename from Source/d_iwad.h
rename to src/d_iwad.h
diff --git a/Source/d_loop.c b/src/d_loop.c
similarity index 100%
rename from Source/d_loop.c
rename to src/d_loop.c
diff --git a/Source/d_loop.h b/src/d_loop.h
similarity index 100%
rename from Source/d_loop.h
rename to src/d_loop.h
diff --git a/Source/d_main.c b/src/d_main.c
similarity index 100%
rename from Source/d_main.c
rename to src/d_main.c
diff --git a/Source/d_main.h b/src/d_main.h
similarity index 100%
rename from Source/d_main.h
rename to src/d_main.h
diff --git a/Source/d_net.c b/src/d_net.c
similarity index 100%
rename from Source/d_net.c
rename to src/d_net.c
diff --git a/Source/d_player.h b/src/d_player.h
similarity index 100%
rename from Source/d_player.h
rename to src/d_player.h
diff --git a/Source/d_quit.c b/src/d_quit.c
similarity index 100%
rename from Source/d_quit.c
rename to src/d_quit.c
diff --git a/Source/d_quit.h b/src/d_quit.h
similarity index 100%
rename from Source/d_quit.h
rename to src/d_quit.h
diff --git a/Source/d_textur.h b/src/d_textur.h
similarity index 100%
rename from Source/d_textur.h
rename to src/d_textur.h
diff --git a/Source/d_think.h b/src/d_think.h
similarity index 100%
rename from Source/d_think.h
rename to src/d_think.h
diff --git a/Source/d_ticcmd.h b/src/d_ticcmd.h
similarity index 100%
rename from Source/d_ticcmd.h
rename to src/d_ticcmd.h
diff --git a/Source/dogs.h b/src/dogs.h
similarity index 100%
rename from Source/dogs.h
rename to src/dogs.h
diff --git a/Source/doomdata.h b/src/doomdata.h
similarity index 100%
rename from Source/doomdata.h
rename to src/doomdata.h
diff --git a/Source/doomdef.c b/src/doomdef.c
similarity index 100%
rename from Source/doomdef.c
rename to src/doomdef.c
diff --git a/Source/doomdef.h b/src/doomdef.h
similarity index 100%
rename from Source/doomdef.h
rename to src/doomdef.h
diff --git a/Source/doomkeys.h b/src/doomkeys.h
similarity index 100%
rename from Source/doomkeys.h
rename to src/doomkeys.h
diff --git a/Source/doomstat.c b/src/doomstat.c
similarity index 100%
rename from Source/doomstat.c
rename to src/doomstat.c
diff --git a/Source/doomstat.h b/src/doomstat.h
similarity index 100%
rename from Source/doomstat.h
rename to src/doomstat.h
diff --git a/Source/doomtype.h b/src/doomtype.h
similarity index 100%
rename from Source/doomtype.h
rename to src/doomtype.h
diff --git a/Source/dsdhacked.c b/src/dsdhacked.c
similarity index 100%
rename from Source/dsdhacked.c
rename to src/dsdhacked.c
diff --git a/Source/dsdhacked.h b/src/dsdhacked.h
similarity index 100%
rename from Source/dsdhacked.h
rename to src/dsdhacked.h
diff --git a/Source/dstrings.c b/src/dstrings.c
similarity index 100%
rename from Source/dstrings.c
rename to src/dstrings.c
diff --git a/Source/dstrings.h b/src/dstrings.h
similarity index 100%
rename from Source/dstrings.h
rename to src/dstrings.h
diff --git a/Source/f_finale.c b/src/f_finale.c
similarity index 100%
rename from Source/f_finale.c
rename to src/f_finale.c
diff --git a/Source/f_finale.h b/src/f_finale.h
similarity index 100%
rename from Source/f_finale.h
rename to src/f_finale.h
diff --git a/Source/f_wipe.c b/src/f_wipe.c
similarity index 100%
rename from Source/f_wipe.c
rename to src/f_wipe.c
diff --git a/Source/f_wipe.h b/src/f_wipe.h
similarity index 100%
rename from Source/f_wipe.h
rename to src/f_wipe.h
diff --git a/Source/g_game.c b/src/g_game.c
similarity index 100%
rename from Source/g_game.c
rename to src/g_game.c
diff --git a/Source/g_game.h b/src/g_game.h
similarity index 100%
rename from Source/g_game.h
rename to src/g_game.h
diff --git a/Source/hu_lib.c b/src/hu_lib.c
similarity index 100%
rename from Source/hu_lib.c
rename to src/hu_lib.c
diff --git a/Source/hu_lib.h b/src/hu_lib.h
similarity index 100%
rename from Source/hu_lib.h
rename to src/hu_lib.h
diff --git a/Source/hu_stuff.c b/src/hu_stuff.c
similarity index 100%
rename from Source/hu_stuff.c
rename to src/hu_stuff.c
diff --git a/Source/hu_stuff.h b/src/hu_stuff.h
similarity index 100%
rename from Source/hu_stuff.h
rename to src/hu_stuff.h
diff --git a/Source/i_endoom.c b/src/i_endoom.c
similarity index 100%
rename from Source/i_endoom.c
rename to src/i_endoom.c
diff --git a/Source/i_endoom.h b/src/i_endoom.h
similarity index 100%
rename from Source/i_endoom.h
rename to src/i_endoom.h
diff --git a/Source/i_flmusic.c b/src/i_flmusic.c
similarity index 100%
rename from Source/i_flmusic.c
rename to src/i_flmusic.c
diff --git a/Source/i_glob.c b/src/i_glob.c
similarity index 100%
rename from Source/i_glob.c
rename to src/i_glob.c
diff --git a/Source/i_glob.h b/src/i_glob.h
similarity index 100%
rename from Source/i_glob.h
rename to src/i_glob.h
diff --git a/Source/i_main.c b/src/i_main.c
similarity index 100%
rename from Source/i_main.c
rename to src/i_main.c
diff --git a/Source/i_oplmusic.c b/src/i_oplmusic.c
similarity index 100%
rename from Source/i_oplmusic.c
rename to src/i_oplmusic.c
diff --git a/Source/i_sdlmusic.c b/src/i_sdlmusic.c
similarity index 100%
rename from Source/i_sdlmusic.c
rename to src/i_sdlmusic.c
diff --git a/Source/i_sound.c b/src/i_sound.c
similarity index 100%
rename from Source/i_sound.c
rename to src/i_sound.c
diff --git a/Source/i_sound.h b/src/i_sound.h
similarity index 100%
rename from Source/i_sound.h
rename to src/i_sound.h
diff --git a/Source/i_system.c b/src/i_system.c
similarity index 100%
rename from Source/i_system.c
rename to src/i_system.c
diff --git a/Source/i_system.h b/src/i_system.h
similarity index 100%
rename from Source/i_system.h
rename to src/i_system.h
diff --git a/Source/i_timer.c b/src/i_timer.c
similarity index 100%
rename from Source/i_timer.c
rename to src/i_timer.c
diff --git a/Source/i_timer.h b/src/i_timer.h
similarity index 100%
rename from Source/i_timer.h
rename to src/i_timer.h
diff --git a/Source/i_video.c b/src/i_video.c
similarity index 100%
rename from Source/i_video.c
rename to src/i_video.c
diff --git a/Source/i_video.h b/src/i_video.h
similarity index 100%
rename from Source/i_video.h
rename to src/i_video.h
diff --git a/Source/i_winmusic.c b/src/i_winmusic.c
similarity index 100%
rename from Source/i_winmusic.c
rename to src/i_winmusic.c
diff --git a/Source/icon.c b/src/icon.c
similarity index 100%
rename from Source/icon.c
rename to src/icon.c
diff --git a/Source/info.c b/src/info.c
similarity index 100%
rename from Source/info.c
rename to src/info.c
diff --git a/Source/info.h b/src/info.h
similarity index 100%
rename from Source/info.h
rename to src/info.h
diff --git a/Source/m_argv.c b/src/m_argv.c
similarity index 100%
rename from Source/m_argv.c
rename to src/m_argv.c
diff --git a/Source/m_argv.h b/src/m_argv.h
similarity index 100%
rename from Source/m_argv.h
rename to src/m_argv.h
diff --git a/Source/m_bbox.c b/src/m_bbox.c
similarity index 100%
rename from Source/m_bbox.c
rename to src/m_bbox.c
diff --git a/Source/m_bbox.h b/src/m_bbox.h
similarity index 100%
rename from Source/m_bbox.h
rename to src/m_bbox.h
diff --git a/Source/m_cheat.c b/src/m_cheat.c
similarity index 100%
rename from Source/m_cheat.c
rename to src/m_cheat.c
diff --git a/Source/m_cheat.h b/src/m_cheat.h
similarity index 100%
rename from Source/m_cheat.h
rename to src/m_cheat.h
diff --git a/Source/m_fixed.h b/src/m_fixed.h
similarity index 100%
rename from Source/m_fixed.h
rename to src/m_fixed.h
diff --git a/Source/m_input.c b/src/m_input.c
similarity index 100%
rename from Source/m_input.c
rename to src/m_input.c
diff --git a/Source/m_input.h b/src/m_input.h
similarity index 100%
rename from Source/m_input.h
rename to src/m_input.h
diff --git a/Source/m_io.c b/src/m_io.c
similarity index 100%
rename from Source/m_io.c
rename to src/m_io.c
diff --git a/Source/m_io.h b/src/m_io.h
similarity index 100%
rename from Source/m_io.h
rename to src/m_io.h
diff --git a/Source/m_menu.c b/src/m_menu.c
similarity index 100%
rename from Source/m_menu.c
rename to src/m_menu.c
diff --git a/Source/m_menu.h b/src/m_menu.h
similarity index 100%
rename from Source/m_menu.h
rename to src/m_menu.h
diff --git a/Source/m_misc.c b/src/m_misc.c
similarity index 100%
rename from Source/m_misc.c
rename to src/m_misc.c
diff --git a/Source/m_misc.h b/src/m_misc.h
similarity index 100%
rename from Source/m_misc.h
rename to src/m_misc.h
diff --git a/Source/m_misc2.c b/src/m_misc2.c
similarity index 100%
rename from Source/m_misc2.c
rename to src/m_misc2.c
diff --git a/Source/m_misc2.h b/src/m_misc2.h
similarity index 100%
rename from Source/m_misc2.h
rename to src/m_misc2.h
diff --git a/Source/m_random.c b/src/m_random.c
similarity index 100%
rename from Source/m_random.c
rename to src/m_random.c
diff --git a/Source/m_random.h b/src/m_random.h
similarity index 100%
rename from Source/m_random.h
rename to src/m_random.h
diff --git a/Source/m_swap.h b/src/m_swap.h
similarity index 100%
rename from Source/m_swap.h
rename to src/m_swap.h
diff --git a/Source/manifest.xml b/src/manifest.xml
similarity index 100%
rename from Source/manifest.xml
rename to src/manifest.xml
diff --git a/Source/memio.c b/src/memio.c
similarity index 100%
rename from Source/memio.c
rename to src/memio.c
diff --git a/Source/memio.h b/src/memio.h
similarity index 100%
rename from Source/memio.h
rename to src/memio.h
diff --git a/Source/midifile.c b/src/midifile.c
similarity index 100%
rename from Source/midifile.c
rename to src/midifile.c
diff --git a/Source/midifile.h b/src/midifile.h
similarity index 100%
rename from Source/midifile.h
rename to src/midifile.h
diff --git a/Source/mus2mid.c b/src/mus2mid.c
similarity index 100%
rename from Source/mus2mid.c
rename to src/mus2mid.c
diff --git a/Source/mus2mid.h b/src/mus2mid.h
similarity index 100%
rename from Source/mus2mid.h
rename to src/mus2mid.h
diff --git a/Source/net_client.c b/src/net_client.c
similarity index 100%
rename from Source/net_client.c
rename to src/net_client.c
diff --git a/Source/net_client.h b/src/net_client.h
similarity index 100%
rename from Source/net_client.h
rename to src/net_client.h
diff --git a/Source/net_common.c b/src/net_common.c
similarity index 100%
rename from Source/net_common.c
rename to src/net_common.c
diff --git a/Source/net_common.h b/src/net_common.h
similarity index 100%
rename from Source/net_common.h
rename to src/net_common.h
diff --git a/Source/net_dedicated.c b/src/net_dedicated.c
similarity index 100%
rename from Source/net_dedicated.c
rename to src/net_dedicated.c
diff --git a/Source/net_dedicated.h b/src/net_dedicated.h
similarity index 100%
rename from Source/net_dedicated.h
rename to src/net_dedicated.h
diff --git a/Source/net_defs.h b/src/net_defs.h
similarity index 100%
rename from Source/net_defs.h
rename to src/net_defs.h
diff --git a/Source/net_gui.c b/src/net_gui.c
similarity index 100%
rename from Source/net_gui.c
rename to src/net_gui.c
diff --git a/Source/net_gui.h b/src/net_gui.h
similarity index 100%
rename from Source/net_gui.h
rename to src/net_gui.h
diff --git a/Source/net_io.c b/src/net_io.c
similarity index 100%
rename from Source/net_io.c
rename to src/net_io.c
diff --git a/Source/net_io.h b/src/net_io.h
similarity index 100%
rename from Source/net_io.h
rename to src/net_io.h
diff --git a/Source/net_loop.c b/src/net_loop.c
similarity index 100%
rename from Source/net_loop.c
rename to src/net_loop.c
diff --git a/Source/net_loop.h b/src/net_loop.h
similarity index 100%
rename from Source/net_loop.h
rename to src/net_loop.h
diff --git a/Source/net_packet.c b/src/net_packet.c
similarity index 100%
rename from Source/net_packet.c
rename to src/net_packet.c
diff --git a/Source/net_packet.h b/src/net_packet.h
similarity index 100%
rename from Source/net_packet.h
rename to src/net_packet.h
diff --git a/Source/net_petname.c b/src/net_petname.c
similarity index 100%
rename from Source/net_petname.c
rename to src/net_petname.c
diff --git a/Source/net_petname.h b/src/net_petname.h
similarity index 100%
rename from Source/net_petname.h
rename to src/net_petname.h
diff --git a/Source/net_query.c b/src/net_query.c
similarity index 100%
rename from Source/net_query.c
rename to src/net_query.c
diff --git a/Source/net_query.h b/src/net_query.h
similarity index 100%
rename from Source/net_query.h
rename to src/net_query.h
diff --git a/Source/net_sdl.c b/src/net_sdl.c
similarity index 100%
rename from Source/net_sdl.c
rename to src/net_sdl.c
diff --git a/Source/net_sdl.h b/src/net_sdl.h
similarity index 100%
rename from Source/net_sdl.h
rename to src/net_sdl.h
diff --git a/Source/net_server.c b/src/net_server.c
similarity index 100%
rename from Source/net_server.c
rename to src/net_server.c
diff --git a/Source/net_server.h b/src/net_server.h
similarity index 100%
rename from Source/net_server.h
rename to src/net_server.h
diff --git a/Source/net_structrw.c b/src/net_structrw.c
similarity index 100%
rename from Source/net_structrw.c
rename to src/net_structrw.c
diff --git a/Source/net_structrw.h b/src/net_structrw.h
similarity index 100%
rename from Source/net_structrw.h
rename to src/net_structrw.h
diff --git a/Source/p_ceilng.c b/src/p_ceilng.c
similarity index 100%
rename from Source/p_ceilng.c
rename to src/p_ceilng.c
diff --git a/Source/p_doors.c b/src/p_doors.c
similarity index 100%
rename from Source/p_doors.c
rename to src/p_doors.c
diff --git a/Source/p_enemy.c b/src/p_enemy.c
similarity index 100%
rename from Source/p_enemy.c
rename to src/p_enemy.c
diff --git a/Source/p_enemy.h b/src/p_enemy.h
similarity index 100%
rename from Source/p_enemy.h
rename to src/p_enemy.h
diff --git a/Source/p_extnodes.c b/src/p_extnodes.c
similarity index 100%
rename from Source/p_extnodes.c
rename to src/p_extnodes.c
diff --git a/Source/p_extnodes.h b/src/p_extnodes.h
similarity index 100%
rename from Source/p_extnodes.h
rename to src/p_extnodes.h
diff --git a/Source/p_floor.c b/src/p_floor.c
similarity index 100%
rename from Source/p_floor.c
rename to src/p_floor.c
diff --git a/Source/p_genlin.c b/src/p_genlin.c
similarity index 100%
rename from Source/p_genlin.c
rename to src/p_genlin.c
diff --git a/Source/p_inter.c b/src/p_inter.c
similarity index 100%
rename from Source/p_inter.c
rename to src/p_inter.c
diff --git a/Source/p_inter.h b/src/p_inter.h
similarity index 100%
rename from Source/p_inter.h
rename to src/p_inter.h
diff --git a/Source/p_lights.c b/src/p_lights.c
similarity index 100%
rename from Source/p_lights.c
rename to src/p_lights.c
diff --git a/Source/p_map.c b/src/p_map.c
similarity index 100%
rename from Source/p_map.c
rename to src/p_map.c
diff --git a/Source/p_map.h b/src/p_map.h
similarity index 100%
rename from Source/p_map.h
rename to src/p_map.h
diff --git a/Source/p_maputl.c b/src/p_maputl.c
similarity index 100%
rename from Source/p_maputl.c
rename to src/p_maputl.c
diff --git a/Source/p_maputl.h b/src/p_maputl.h
similarity index 100%
rename from Source/p_maputl.h
rename to src/p_maputl.h
diff --git a/Source/p_mobj.c b/src/p_mobj.c
similarity index 100%
rename from Source/p_mobj.c
rename to src/p_mobj.c
diff --git a/Source/p_mobj.h b/src/p_mobj.h
similarity index 100%
rename from Source/p_mobj.h
rename to src/p_mobj.h
diff --git a/Source/p_plats.c b/src/p_plats.c
similarity index 100%
rename from Source/p_plats.c
rename to src/p_plats.c
diff --git a/Source/p_pspr.c b/src/p_pspr.c
similarity index 100%
rename from Source/p_pspr.c
rename to src/p_pspr.c
diff --git a/Source/p_pspr.h b/src/p_pspr.h
similarity index 100%
rename from Source/p_pspr.h
rename to src/p_pspr.h
diff --git a/Source/p_saveg.c b/src/p_saveg.c
similarity index 100%
rename from Source/p_saveg.c
rename to src/p_saveg.c
diff --git a/Source/p_saveg.h b/src/p_saveg.h
similarity index 100%
rename from Source/p_saveg.h
rename to src/p_saveg.h
diff --git a/Source/p_setup.c b/src/p_setup.c
similarity index 100%
rename from Source/p_setup.c
rename to src/p_setup.c
diff --git a/Source/p_setup.h b/src/p_setup.h
similarity index 100%
rename from Source/p_setup.h
rename to src/p_setup.h
diff --git a/Source/p_sight.c b/src/p_sight.c
similarity index 100%
rename from Source/p_sight.c
rename to src/p_sight.c
diff --git a/Source/p_spec.c b/src/p_spec.c
similarity index 100%
rename from Source/p_spec.c
rename to src/p_spec.c
diff --git a/Source/p_spec.h b/src/p_spec.h
similarity index 100%
rename from Source/p_spec.h
rename to src/p_spec.h
diff --git a/Source/p_switch.c b/src/p_switch.c
similarity index 100%
rename from Source/p_switch.c
rename to src/p_switch.c
diff --git a/Source/p_telept.c b/src/p_telept.c
similarity index 100%
rename from Source/p_telept.c
rename to src/p_telept.c
diff --git a/Source/p_tick.c b/src/p_tick.c
similarity index 100%
rename from Source/p_tick.c
rename to src/p_tick.c
diff --git a/Source/p_tick.h b/src/p_tick.h
similarity index 100%
rename from Source/p_tick.h
rename to src/p_tick.h
diff --git a/Source/p_user.c b/src/p_user.c
similarity index 100%
rename from Source/p_user.c
rename to src/p_user.c
diff --git a/Source/p_user.h b/src/p_user.h
similarity index 100%
rename from Source/p_user.h
rename to src/p_user.h
diff --git a/Source/r_bmaps.c b/src/r_bmaps.c
similarity index 100%
rename from Source/r_bmaps.c
rename to src/r_bmaps.c
diff --git a/Source/r_bmaps.h b/src/r_bmaps.h
similarity index 100%
rename from Source/r_bmaps.h
rename to src/r_bmaps.h
diff --git a/Source/r_bsp.c b/src/r_bsp.c
similarity index 100%
rename from Source/r_bsp.c
rename to src/r_bsp.c
diff --git a/Source/r_bsp.h b/src/r_bsp.h
similarity index 100%
rename from Source/r_bsp.h
rename to src/r_bsp.h
diff --git a/Source/r_data.c b/src/r_data.c
similarity index 100%
rename from Source/r_data.c
rename to src/r_data.c
diff --git a/Source/r_data.h b/src/r_data.h
similarity index 100%
rename from Source/r_data.h
rename to src/r_data.h
diff --git a/Source/r_defs.h b/src/r_defs.h
similarity index 100%
rename from Source/r_defs.h
rename to src/r_defs.h
diff --git a/Source/r_draw.c b/src/r_draw.c
similarity index 100%
rename from Source/r_draw.c
rename to src/r_draw.c
diff --git a/Source/r_draw.h b/src/r_draw.h
similarity index 100%
rename from Source/r_draw.h
rename to src/r_draw.h
diff --git a/Source/r_main.c b/src/r_main.c
similarity index 100%
rename from Source/r_main.c
rename to src/r_main.c
diff --git a/Source/r_main.h b/src/r_main.h
similarity index 100%
rename from Source/r_main.h
rename to src/r_main.h
diff --git a/Source/r_plane.c b/src/r_plane.c
similarity index 100%
rename from Source/r_plane.c
rename to src/r_plane.c
diff --git a/Source/r_plane.h b/src/r_plane.h
similarity index 100%
rename from Source/r_plane.h
rename to src/r_plane.h
diff --git a/Source/r_segs.c b/src/r_segs.c
similarity index 100%
rename from Source/r_segs.c
rename to src/r_segs.c
diff --git a/Source/r_segs.h b/src/r_segs.h
similarity index 100%
rename from Source/r_segs.h
rename to src/r_segs.h
diff --git a/Source/r_sky.c b/src/r_sky.c
similarity index 100%
rename from Source/r_sky.c
rename to src/r_sky.c
diff --git a/Source/r_sky.h b/src/r_sky.h
similarity index 100%
rename from Source/r_sky.h
rename to src/r_sky.h
diff --git a/Source/r_state.h b/src/r_state.h
similarity index 100%
rename from Source/r_state.h
rename to src/r_state.h
diff --git a/Source/r_swirl.c b/src/r_swirl.c
similarity index 100%
rename from Source/r_swirl.c
rename to src/r_swirl.c
diff --git a/Source/r_swirl.h b/src/r_swirl.h
similarity index 100%
rename from Source/r_swirl.h
rename to src/r_swirl.h
diff --git a/Source/r_things.c b/src/r_things.c
similarity index 100%
rename from Source/r_things.c
rename to src/r_things.c
diff --git a/Source/r_things.h b/src/r_things.h
similarity index 100%
rename from Source/r_things.h
rename to src/r_things.h
diff --git a/Source/resource.rc.in b/src/resource.rc.in
similarity index 100%
rename from Source/resource.rc.in
rename to src/resource.rc.in
diff --git a/Source/s_musinfo.c b/src/s_musinfo.c
similarity index 100%
rename from Source/s_musinfo.c
rename to src/s_musinfo.c
diff --git a/Source/s_musinfo.h b/src/s_musinfo.h
similarity index 100%
rename from Source/s_musinfo.h
rename to src/s_musinfo.h
diff --git a/Source/s_sound.c b/src/s_sound.c
similarity index 100%
rename from Source/s_sound.c
rename to src/s_sound.c
diff --git a/Source/s_sound.h b/src/s_sound.h
similarity index 100%
rename from Source/s_sound.h
rename to src/s_sound.h
diff --git a/Source/setup-res.rc.in b/src/setup-res.rc.in
similarity index 100%
rename from Source/setup-res.rc.in
rename to src/setup-res.rc.in
diff --git a/Source/sounds.c b/src/sounds.c
similarity index 100%
rename from Source/sounds.c
rename to src/sounds.c
diff --git a/Source/sounds.h b/src/sounds.h
similarity index 100%
rename from Source/sounds.h
rename to src/sounds.h
diff --git a/Source/st_lib.c b/src/st_lib.c
similarity index 100%
rename from Source/st_lib.c
rename to src/st_lib.c
diff --git a/Source/st_lib.h b/src/st_lib.h
similarity index 100%
rename from Source/st_lib.h
rename to src/st_lib.h
diff --git a/Source/st_stuff.c b/src/st_stuff.c
similarity index 100%
rename from Source/st_stuff.c
rename to src/st_stuff.c
diff --git a/Source/st_stuff.h b/src/st_stuff.h
similarity index 100%
rename from Source/st_stuff.h
rename to src/st_stuff.h
diff --git a/Source/statdump.c b/src/statdump.c
similarity index 100%
rename from Source/statdump.c
rename to src/statdump.c
diff --git a/Source/statdump.h b/src/statdump.h
similarity index 100%
rename from Source/statdump.h
rename to src/statdump.h
diff --git a/Source/tables.c b/src/tables.c
similarity index 100%
rename from Source/tables.c
rename to src/tables.c
diff --git a/Source/tables.h b/src/tables.h
similarity index 100%
rename from Source/tables.h
rename to src/tables.h
diff --git a/Source/thermo.h b/src/thermo.h
similarity index 100%
rename from Source/thermo.h
rename to src/thermo.h
diff --git a/Source/u_mapinfo.c b/src/u_mapinfo.c
similarity index 100%
rename from Source/u_mapinfo.c
rename to src/u_mapinfo.c
diff --git a/Source/u_mapinfo.h b/src/u_mapinfo.h
similarity index 100%
rename from Source/u_mapinfo.h
rename to src/u_mapinfo.h
diff --git a/Source/u_scanner.c b/src/u_scanner.c
similarity index 100%
rename from Source/u_scanner.c
rename to src/u_scanner.c
diff --git a/Source/u_scanner.h b/src/u_scanner.h
similarity index 100%
rename from Source/u_scanner.h
rename to src/u_scanner.h
diff --git a/Source/v_video.c b/src/v_video.c
similarity index 100%
rename from Source/v_video.c
rename to src/v_video.c
diff --git a/Source/v_video.h b/src/v_video.h
similarity index 100%
rename from Source/v_video.h
rename to src/v_video.h
diff --git a/Source/version.c b/src/version.c
similarity index 100%
rename from Source/version.c
rename to src/version.c
diff --git a/Source/version.h b/src/version.h
similarity index 100%
rename from Source/version.h
rename to src/version.h
diff --git a/Source/w_wad.c b/src/w_wad.c
similarity index 100%
rename from Source/w_wad.c
rename to src/w_wad.c
diff --git a/Source/w_wad.h b/src/w_wad.h
similarity index 100%
rename from Source/w_wad.h
rename to src/w_wad.h
diff --git a/Source/wi_stuff.c b/src/wi_stuff.c
similarity index 100%
rename from Source/wi_stuff.c
rename to src/wi_stuff.c
diff --git a/Source/wi_stuff.h b/src/wi_stuff.h
similarity index 100%
rename from Source/wi_stuff.h
rename to src/wi_stuff.h
diff --git a/Source/z_zone.c b/src/z_zone.c
similarity index 100%
rename from Source/z_zone.c
rename to src/z_zone.c
diff --git a/Source/z_zone.h b/src/z_zone.h
similarity index 100%
rename from Source/z_zone.h
rename to src/z_zone.h
diff --git a/textscreen/CMakeLists.txt b/textscreen/CMakeLists.txt
index 6fc229af..5dd88048 100644
--- a/textscreen/CMakeLists.txt
+++ b/textscreen/CMakeLists.txt
@@ -26,5 +26,5 @@ target_woof_settings(textscreen)
 
 target_include_directories(textscreen
                            INTERFACE "."
-                           PRIVATE "../Source/")
+                           PRIVATE "../src/")
 target_link_libraries(textscreen SDL2::SDL2)
diff --git a/textscreen/textscreen.h b/textscreen/textscreen.h
index bb0a0307..00d20b31 100644
--- a/textscreen/textscreen.h
+++ b/textscreen/textscreen.h
@@ -19,7 +19,7 @@
 extern "C" {
 #endif
 
-#include "../Source/doomkeys.h"
+#include "../src/doomkeys.h"
 
 #include "txt_main.h"
 
diff --git a/toolsrc/CMakeLists.txt b/toolsrc/CMakeLists.txt
index 1be0a630..0704556e 100644
--- a/toolsrc/CMakeLists.txt
+++ b/toolsrc/CMakeLists.txt
@@ -4,6 +4,6 @@ add_executable(bin2c EXCLUDE_FROM_ALL bin2c.c)
 add_executable(bmp2c EXCLUDE_FROM_ALL bmp2c.c)
 add_executable(swantbls EXCLUDE_FROM_ALL swantbls.c)
 
-target_include_directories(bmp2c PRIVATE "../Source/" "${CMAKE_CURRENT_BINARY_DIR}/../")
+target_include_directories(bmp2c PRIVATE "../src/" "${CMAKE_CURRENT_BINARY_DIR}/../")
 
 target_woof_settings(bin2c bmp2c swantbls)