diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 09c16a7a6..72df81e98 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -562,8 +562,8 @@ else() endif() add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h - COMMAND re2c --no-generation-date -s -o ${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h ${CMAKE_CURRENT_SOURCE_DIR}/common/utility/sc_man_scanner.re - DEPENDS re2c ${CMAKE_CURRENT_SOURCE_DIR}/common/utility/sc_man_scanner.re ) + COMMAND re2c --no-generation-date -s -o ${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h ${CMAKE_CURRENT_SOURCE_DIR}/core/utility/sc_man_scanner.re + DEPENDS re2c ${CMAKE_CURRENT_SOURCE_DIR}/core/utility/sc_man_scanner.re ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) @@ -582,26 +582,26 @@ file( GLOB HEADER_FILES libsmackerdec/include/*.h libxmp-lite/include/libxmp-lite/*.h libxmp-lite/src/*.h - common/*.h - common/2d/*.h - common/fonts/*.h - common/utility/*.h - common/utility/rapidjson/*.h - common/console/*.h - common/filesystem/*.h - common/music/*.h - common/sound/*.h - common/sound/backend/*.h - common/menu/*.h - common/input/*.h - common/rendering/*.h - common/rendering/gl_load/*.h - common/rendering/gl/system/*.h - common/rendering/gl/renderer/*.h - common/rendering/gl/shaders/*.h - common/rendering/hwrenderer/data/*.h - common/rendering/hwrenderer/postprocessing/*.h - common/rendering/hwrenderer/utility/*.h + core/*.h + core/2d/*.h + core/fonts/*.h + core/utility/*.h + core/utility/rapidjson/*.h + core/console/*.h + core/filesystem/*.h + core/music/*.h + core/sound/*.h + core/sound/backend/*.h + core/menu/*.h + core/input/*.h + core/rendering/*.h + core/rendering/gl_load/*.h + core/rendering/gl/system/*.h + core/rendering/gl/renderer/*.h + core/rendering/gl/shaders/*.h + core/rendering/hwrenderer/data/*.h + core/rendering/hwrenderer/postprocessing/*.h + core/rendering/hwrenderer/utility/*.h build/src/*.h platform/win32/*.h @@ -609,8 +609,8 @@ file( GLOB HEADER_FILES thirdparty/include/*.h thirdparty/include/*.hpp thirdparty/imgui/*.h - common/textures/*.h - common/textures/formats/*.h + core/textures/*.h + core/textures/formats/*.h ) @@ -619,7 +619,7 @@ file( GLOB HEADER_FILES set( NOT_COMPILED_SOURCE_FILES ${OTHER_SYSTEM_SOURCES} sc_man_scanner.h - common/utility/sc_man_scanner.re + core/utility/sc_man_scanner.re platform/win32/zutil.natvis ) @@ -635,8 +635,8 @@ set( FASTMATH_SOURCES libsmackerdec/src/SmackerDecoder.cpp # The rest is only here because it is C, not C++ - common/utility/strnatcmp.c - common/rendering/gl_load/gl_load.c + core/utility/strnatcmp.c + core/rendering/gl_load/gl_load.c gitinfo.cpp ) @@ -675,133 +675,133 @@ set (PCH_SOURCES build/src/timer.cpp build/src/voxmodel.cpp - common/animlib.cpp - common/rts.cpp - common/gameconfigfile.cpp - common/gamecvars.cpp - common/gamecontrol.cpp - common/inputstate.cpp - common/searchpaths.cpp - common/initfs.cpp - common/statistics.cpp - common/secrets.cpp - common/compositesavegame.cpp - common/savegamehelp.cpp - common/quotes.cpp - common/screenshot.cpp - common/serializer.cpp + core/animlib.cpp + core/rts.cpp + core/gameconfigfile.cpp + core/gamecvars.cpp + core/gamecontrol.cpp + core/inputstate.cpp + core/searchpaths.cpp + core/initfs.cpp + core/statistics.cpp + core/secrets.cpp + core/compositesavegame.cpp + core/savegamehelp.cpp + core/quotes.cpp + core/screenshot.cpp + core/serializer.cpp - common/2d/v_2ddrawer.cpp - common/2d/v_draw.cpp - common/2d/v_drawtext.cpp - common/2d/renderstyle.cpp - common/2d/screentext.cpp + core/2d/v_2ddrawer.cpp + core/2d/v_draw.cpp + core/2d/v_drawtext.cpp + core/2d/renderstyle.cpp + core/2d/screentext.cpp - common/fonts/font.cpp - common/fonts/hexfont.cpp - common/fonts/singlelumpfont.cpp - common/fonts/v_font.cpp - common/fonts/v_text.cpp - common/fonts/fontchars.cpp + core/fonts/font.cpp + core/fonts/hexfont.cpp + core/fonts/singlelumpfont.cpp + core/fonts/v_font.cpp + core/fonts/v_text.cpp + core/fonts/fontchars.cpp - common/console/c_cvars.cpp - common/console/c_console.cpp - common/console/c_consolebuffer.cpp - common/console/c_bind.cpp - common/console/c_buttons.cpp - common/console/c_commandline.cpp - common/console/c_dispatch.cpp - common/console/d_event.cpp - common/console/c_con.cpp + core/console/c_cvars.cpp + core/console/c_console.cpp + core/console/c_consolebuffer.cpp + core/console/c_bind.cpp + core/console/c_buttons.cpp + core/console/c_commandline.cpp + core/console/c_dispatch.cpp + core/console/d_event.cpp + core/console/c_con.cpp - common/utility/i_module.cpp - common/utility/i_time.cpp - common/utility/name.cpp - common/utility/cmdlib.cpp - common/utility/m_argv.cpp - common/utility/files.cpp - common/utility/files_decompress.cpp - common/utility/zstring.cpp - common/utility/zstrformat.cpp - common/utility/utf8.cpp - common/utility/superfasthash.cpp - common/utility/configfile.cpp - common/utility/matrix.cpp - common/utility/m_png.cpp - common/utility/memarena.cpp - common/utility/sc_man.cpp - common/utility/stringtable.cpp - common/utility/stats.cpp + core/utility/i_module.cpp + core/utility/i_time.cpp + core/utility/name.cpp + core/utility/cmdlib.cpp + core/utility/m_argv.cpp + core/utility/files.cpp + core/utility/files_decompress.cpp + core/utility/zstring.cpp + core/utility/zstrformat.cpp + core/utility/utf8.cpp + core/utility/superfasthash.cpp + core/utility/configfile.cpp + core/utility/matrix.cpp + core/utility/m_png.cpp + core/utility/memarena.cpp + core/utility/sc_man.cpp + core/utility/stringtable.cpp + core/utility/stats.cpp - common/filesystem/filesystem.cpp - common/filesystem/ancientzip.cpp - common/filesystem/file_zip.cpp - common/filesystem/file_7z.cpp - common/filesystem/file_grp.cpp - common/filesystem/file_rff.cpp - common/filesystem/file_pak.cpp - common/filesystem/file_lump.cpp - common/filesystem/file_directory.cpp - common/filesystem/resourcefile.cpp + core/filesystem/filesystem.cpp + core/filesystem/ancientzip.cpp + core/filesystem/file_zip.cpp + core/filesystem/file_7z.cpp + core/filesystem/file_grp.cpp + core/filesystem/file_rff.cpp + core/filesystem/file_pak.cpp + core/filesystem/file_lump.cpp + core/filesystem/file_directory.cpp + core/filesystem/resourcefile.cpp - common/textures/bitmap.cpp - common/textures/buildtiles.cpp - common/textures/texture.cpp - common/textures/image.cpp - common/textures/imagetexture.cpp - common/textures/imagehelpers.cpp - common/textures/formats/ddstexture.cpp - common/textures/formats/jpegtexture.cpp - common/textures/formats/pcxtexture.cpp - common/textures/formats/pngtexture.cpp - common/textures/formats/tgatexture.cpp - common/textures/formats/stbtexture.cpp - common/textures/formats/arttexture.cpp + core/textures/bitmap.cpp + core/textures/buildtiles.cpp + core/textures/texture.cpp + core/textures/image.cpp + core/textures/imagetexture.cpp + core/textures/imagehelpers.cpp + core/textures/formats/ddstexture.cpp + core/textures/formats/jpegtexture.cpp + core/textures/formats/pcxtexture.cpp + core/textures/formats/pngtexture.cpp + core/textures/formats/tgatexture.cpp + core/textures/formats/stbtexture.cpp + core/textures/formats/arttexture.cpp - common/music/music.cpp - common/music/i_music.cpp - common/music/i_soundfont.cpp - common/music/music_config.cpp - common/music/music_midi_base.cpp - common/music/s_advsound.cpp + core/music/music.cpp + core/music/i_music.cpp + core/music/i_soundfont.cpp + core/music/music_config.cpp + core/music/music_midi_base.cpp + core/music/s_advsound.cpp - common/sound/backend/oalsound.cpp - common/sound/backend/i_sound.cpp - common/sound/s_sound.cpp - common/sound/s_environment.cpp + core/sound/backend/oalsound.cpp + core/sound/backend/i_sound.cpp + core/sound/s_sound.cpp + core/sound/s_environment.cpp - common/menu/imagescroller.cpp - common/menu/joystickmenu.cpp - common/menu/listmenu.cpp - common/menu/savegamemanager.cpp - common/menu/loadsavemenu.cpp - common/menu/menu.cpp - common/menu/menudef.cpp - common/menu/menuinput.cpp - common/menu/messagebox.cpp - common/menu/optionmenu.cpp - common/menu/resolutionmenu.cpp + core/menu/imagescroller.cpp + core/menu/joystickmenu.cpp + core/menu/listmenu.cpp + core/menu/savegamemanager.cpp + core/menu/loadsavemenu.cpp + core/menu/menu.cpp + core/menu/menudef.cpp + core/menu/menuinput.cpp + core/menu/messagebox.cpp + core/menu/optionmenu.cpp + core/menu/resolutionmenu.cpp - #common/input/i_joystick.cpp - #common/input/i_input.cpp - common/input/m_joy.cpp + #core/input/i_joystick.cpp + #core/input/i_input.cpp + core/input/m_joy.cpp - common/rendering/r_videoscale.cpp - common/rendering/v_framebuffer.cpp - common/rendering/v_video.cpp - common/rendering/gl/renderer/gl_renderer.cpp - common/rendering/gl/renderer/gl_postprocess.cpp - common/rendering/gl/renderer/gl_postprocessstate.cpp - common/rendering/gl/renderer/gl_renderbuffers.cpp - common/rendering/gl/shaders/gl_shaderprogram.cpp - common/rendering/gl/system/gl_buffers.cpp - common/rendering/gl/system/gl_debug.cpp - common/rendering/gl/system/gl_framebuffer.cpp - common/rendering/gl_load/gl_interface.cpp - common/rendering/hwrenderer/data/flatvertices.cpp - common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp - common/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp - common/rendering/hwrenderer/utility/hw_shaderpatcher.cpp + core/rendering/r_videoscale.cpp + core/rendering/v_framebuffer.cpp + core/rendering/v_video.cpp + core/rendering/gl/renderer/gl_renderer.cpp + core/rendering/gl/renderer/gl_postprocess.cpp + core/rendering/gl/renderer/gl_postprocessstate.cpp + core/rendering/gl/renderer/gl_renderbuffers.cpp + core/rendering/gl/shaders/gl_shaderprogram.cpp + core/rendering/gl/system/gl_buffers.cpp + core/rendering/gl/system/gl_debug.cpp + core/rendering/gl/system/gl_framebuffer.cpp + core/rendering/gl_load/gl_interface.cpp + core/rendering/hwrenderer/data/flatvertices.cpp + core/rendering/hwrenderer/postprocessing/hw_postprocess.cpp + core/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp + core/rendering/hwrenderer/utility/hw_shaderpatcher.cpp ) macro( use_precompiled_header ) @@ -857,27 +857,27 @@ include_directories( libsmackerdec/include thirdparty/include thirdparty/imgui - common - common/2d - common/fonts - common/utility - common/console - common/textures - common/filesystem - common/music - common/sound - common/sound/backend - common/dobject - common/menu - common/input - common/rendering/gl_load - common/rendering/gl/system - common/rendering/gl/renderer - common/rendering/gl/shaders - common/rendering/hwrenderer/data - common/rendering/hwrenderer/postprocessing - common/rendering/hwrenderer/utility - common/rendering + core + core/2d + core/fonts + core/utility + core/console + core/textures + core/filesystem + core/music + core/sound + core/sound/backend + core/dobject + core/menu + core/input + core/rendering/gl_load + core/rendering/gl/system + core/rendering/gl/renderer + core/rendering/gl/shaders + core/rendering/hwrenderer/data + core/rendering/hwrenderer/postprocessing + core/rendering/hwrenderer/utility + core/rendering platform ${CMAKE_BINARY_DIR}/libraries/gdtoa @@ -968,23 +968,23 @@ install(TARGETS ${PROJECT_NAME} DESTINATION ${INSTALL_PATH} COMPONENT "Game executable") -source_group("Utility" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/utility/.+") -source_group("Core" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/.+") -source_group("Core\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/.+") -source_group("Core\\Textures\\Formats" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/formats/.+") -source_group("Core\\Utility" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/utility/.+") -source_group("Core\\2D" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/2d/.+") -source_group("Core\\Console" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/console/.+") -source_group("Core\\Fonts" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/fonts/.+") -source_group("Core\\File System" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/filesystem/.+") -source_group("Core\\Music" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/music/.+") -source_group("Core\\Sound" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/sound/.+") -source_group("Core\\Sound\\Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/sound/backend/.+") -source_group("Core\\DObject" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/dobject/.+") -source_group("Core\\Menu" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/menu/.+") -source_group("Core\\Rendering" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/.+") -source_group("Core\\Rendering\\GL_Load" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/gl_load/.+") -source_group("Core\\Rendering\\GL\\System" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/gl/system.+") +source_group("Utility" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/utility/.+") +source_group("Core" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/.+") +source_group("Core\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/textures/.+") +source_group("Core\\Textures\\Formats" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/textures/formats/.+") +source_group("Core\\Utility" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/utility/.+") +source_group("Core\\2D" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/2d/.+") +source_group("Core\\Console" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/console/.+") +source_group("Core\\Fonts" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/fonts/.+") +source_group("Core\\File System" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/filesystem/.+") +source_group("Core\\Music" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/music/.+") +source_group("Core\\Sound" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/sound/.+") +source_group("Core\\Sound\\Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/sound/backend/.+") +source_group("Core\\DObject" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/dobject/.+") +source_group("Core\\Menu" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/menu/.+") +source_group("Core\\Rendering" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/rendering/.+") +source_group("Core\\Rendering\\GL_Load" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/rendering/gl_load/.+") +source_group("Core\\Rendering\\GL\\System" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/rendering/gl/system.+") source_group("Platform" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/platform/.+") source_group("Platform\\Win32" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/platform/win32/.+") source_group("Platform\\POSIX" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/platform/posix/.+") diff --git a/source/common/2d/drawparms.h b/source/core/2d/drawparms.h similarity index 100% rename from source/common/2d/drawparms.h rename to source/core/2d/drawparms.h diff --git a/source/common/2d/renderstyle.cpp b/source/core/2d/renderstyle.cpp similarity index 100% rename from source/common/2d/renderstyle.cpp rename to source/core/2d/renderstyle.cpp diff --git a/source/common/2d/renderstyle.h b/source/core/2d/renderstyle.h similarity index 100% rename from source/common/2d/renderstyle.h rename to source/core/2d/renderstyle.h diff --git a/source/common/2d/screentext.cpp b/source/core/2d/screentext.cpp similarity index 100% rename from source/common/2d/screentext.cpp rename to source/core/2d/screentext.cpp diff --git a/source/common/2d/screentext.h b/source/core/2d/screentext.h similarity index 100% rename from source/common/2d/screentext.h rename to source/core/2d/screentext.h diff --git a/source/common/2d/v_2ddrawer.cpp b/source/core/2d/v_2ddrawer.cpp similarity index 100% rename from source/common/2d/v_2ddrawer.cpp rename to source/core/2d/v_2ddrawer.cpp diff --git a/source/common/2d/v_2ddrawer.h b/source/core/2d/v_2ddrawer.h similarity index 100% rename from source/common/2d/v_2ddrawer.h rename to source/core/2d/v_2ddrawer.h diff --git a/source/common/2d/v_draw.cpp b/source/core/2d/v_draw.cpp similarity index 100% rename from source/common/2d/v_draw.cpp rename to source/core/2d/v_draw.cpp diff --git a/source/common/2d/v_draw.h b/source/core/2d/v_draw.h similarity index 100% rename from source/common/2d/v_draw.h rename to source/core/2d/v_draw.h diff --git a/source/common/2d/v_drawtext.cpp b/source/core/2d/v_drawtext.cpp similarity index 100% rename from source/common/2d/v_drawtext.cpp rename to source/core/2d/v_drawtext.cpp diff --git a/source/common/2d/v_text.h b/source/core/2d/v_text.h similarity index 100% rename from source/common/2d/v_text.h rename to source/core/2d/v_text.h diff --git a/source/common/animlib.cpp b/source/core/animlib.cpp similarity index 100% rename from source/common/animlib.cpp rename to source/core/animlib.cpp diff --git a/source/common/animlib.h b/source/core/animlib.h similarity index 100% rename from source/common/animlib.h rename to source/core/animlib.h diff --git a/source/common/compositesaveame.h b/source/core/compositesaveame.h similarity index 100% rename from source/common/compositesaveame.h rename to source/core/compositesaveame.h diff --git a/source/common/compositesavegame.cpp b/source/core/compositesavegame.cpp similarity index 100% rename from source/common/compositesavegame.cpp rename to source/core/compositesavegame.cpp diff --git a/source/common/console/c_bind.cpp b/source/core/console/c_bind.cpp similarity index 100% rename from source/common/console/c_bind.cpp rename to source/core/console/c_bind.cpp diff --git a/source/common/console/c_bind.h b/source/core/console/c_bind.h similarity index 100% rename from source/common/console/c_bind.h rename to source/core/console/c_bind.h diff --git a/source/common/console/c_buttons.cpp b/source/core/console/c_buttons.cpp similarity index 100% rename from source/common/console/c_buttons.cpp rename to source/core/console/c_buttons.cpp diff --git a/source/common/console/c_buttons.h b/source/core/console/c_buttons.h similarity index 100% rename from source/common/console/c_buttons.h rename to source/core/console/c_buttons.h diff --git a/source/common/console/c_commandline.cpp b/source/core/console/c_commandline.cpp similarity index 100% rename from source/common/console/c_commandline.cpp rename to source/core/console/c_commandline.cpp diff --git a/source/common/console/c_commandline.h b/source/core/console/c_commandline.h similarity index 100% rename from source/common/console/c_commandline.h rename to source/core/console/c_commandline.h diff --git a/source/common/console/c_con.cpp b/source/core/console/c_con.cpp similarity index 100% rename from source/common/console/c_con.cpp rename to source/core/console/c_con.cpp diff --git a/source/common/console/c_console.cpp b/source/core/console/c_console.cpp similarity index 100% rename from source/common/console/c_console.cpp rename to source/core/console/c_console.cpp diff --git a/source/common/console/c_console.h b/source/core/console/c_console.h similarity index 100% rename from source/common/console/c_console.h rename to source/core/console/c_console.h diff --git a/source/common/console/c_consolebuffer.cpp b/source/core/console/c_consolebuffer.cpp similarity index 100% rename from source/common/console/c_consolebuffer.cpp rename to source/core/console/c_consolebuffer.cpp diff --git a/source/common/console/c_consolebuffer.h b/source/core/console/c_consolebuffer.h similarity index 100% rename from source/common/console/c_consolebuffer.h rename to source/core/console/c_consolebuffer.h diff --git a/source/common/console/c_cvars.cpp b/source/core/console/c_cvars.cpp similarity index 100% rename from source/common/console/c_cvars.cpp rename to source/core/console/c_cvars.cpp diff --git a/source/common/console/c_cvars.h b/source/core/console/c_cvars.h similarity index 100% rename from source/common/console/c_cvars.h rename to source/core/console/c_cvars.h diff --git a/source/common/console/c_dispatch.cpp b/source/core/console/c_dispatch.cpp similarity index 100% rename from source/common/console/c_dispatch.cpp rename to source/core/console/c_dispatch.cpp diff --git a/source/common/console/c_dispatch.h b/source/core/console/c_dispatch.h similarity index 100% rename from source/common/console/c_dispatch.h rename to source/core/console/c_dispatch.h diff --git a/source/common/console/d_event.cpp b/source/core/console/d_event.cpp similarity index 100% rename from source/common/console/d_event.cpp rename to source/core/console/d_event.cpp diff --git a/source/common/console/d_event.h b/source/core/console/d_event.h similarity index 100% rename from source/common/console/d_event.h rename to source/core/console/d_event.h diff --git a/source/common/console/d_gui.h b/source/core/console/d_gui.h similarity index 100% rename from source/common/console/d_gui.h rename to source/core/console/d_gui.h diff --git a/source/common/console/keydef.h b/source/core/console/keydef.h similarity index 100% rename from source/common/console/keydef.h rename to source/core/console/keydef.h diff --git a/source/common/filesystem/ancientzip.cpp b/source/core/filesystem/ancientzip.cpp similarity index 100% rename from source/common/filesystem/ancientzip.cpp rename to source/core/filesystem/ancientzip.cpp diff --git a/source/common/filesystem/ancientzip.h b/source/core/filesystem/ancientzip.h similarity index 100% rename from source/common/filesystem/ancientzip.h rename to source/core/filesystem/ancientzip.h diff --git a/source/common/filesystem/cache.cpp b/source/core/filesystem/cache.cpp similarity index 100% rename from source/common/filesystem/cache.cpp rename to source/core/filesystem/cache.cpp diff --git a/source/common/filesystem/file_7z.cpp b/source/core/filesystem/file_7z.cpp similarity index 100% rename from source/common/filesystem/file_7z.cpp rename to source/core/filesystem/file_7z.cpp diff --git a/source/common/filesystem/file_directory.cpp b/source/core/filesystem/file_directory.cpp similarity index 100% rename from source/common/filesystem/file_directory.cpp rename to source/core/filesystem/file_directory.cpp diff --git a/source/common/filesystem/file_grp.cpp b/source/core/filesystem/file_grp.cpp similarity index 100% rename from source/common/filesystem/file_grp.cpp rename to source/core/filesystem/file_grp.cpp diff --git a/source/common/filesystem/file_lump.cpp b/source/core/filesystem/file_lump.cpp similarity index 100% rename from source/common/filesystem/file_lump.cpp rename to source/core/filesystem/file_lump.cpp diff --git a/source/common/filesystem/file_pak.cpp b/source/core/filesystem/file_pak.cpp similarity index 100% rename from source/common/filesystem/file_pak.cpp rename to source/core/filesystem/file_pak.cpp diff --git a/source/common/filesystem/file_rff.cpp b/source/core/filesystem/file_rff.cpp similarity index 100% rename from source/common/filesystem/file_rff.cpp rename to source/core/filesystem/file_rff.cpp diff --git a/source/common/filesystem/file_zip.cpp b/source/core/filesystem/file_zip.cpp similarity index 100% rename from source/common/filesystem/file_zip.cpp rename to source/core/filesystem/file_zip.cpp diff --git a/source/common/filesystem/file_zip.h b/source/core/filesystem/file_zip.h similarity index 100% rename from source/common/filesystem/file_zip.h rename to source/core/filesystem/file_zip.h diff --git a/source/common/filesystem/filesystem.cpp b/source/core/filesystem/filesystem.cpp similarity index 100% rename from source/common/filesystem/filesystem.cpp rename to source/core/filesystem/filesystem.cpp diff --git a/source/common/filesystem/filesystem.h b/source/core/filesystem/filesystem.h similarity index 100% rename from source/common/filesystem/filesystem.h rename to source/core/filesystem/filesystem.h diff --git a/source/common/filesystem/resourcefile.cpp b/source/core/filesystem/resourcefile.cpp similarity index 100% rename from source/common/filesystem/resourcefile.cpp rename to source/core/filesystem/resourcefile.cpp diff --git a/source/common/filesystem/resourcefile.h b/source/core/filesystem/resourcefile.h similarity index 100% rename from source/common/filesystem/resourcefile.h rename to source/core/filesystem/resourcefile.h diff --git a/source/common/fonts/font.cpp b/source/core/fonts/font.cpp similarity index 100% rename from source/common/fonts/font.cpp rename to source/core/fonts/font.cpp diff --git a/source/common/fonts/fontchars.cpp b/source/core/fonts/fontchars.cpp similarity index 100% rename from source/common/fonts/fontchars.cpp rename to source/core/fonts/fontchars.cpp diff --git a/source/common/fonts/fontchars.h b/source/core/fonts/fontchars.h similarity index 100% rename from source/common/fonts/fontchars.h rename to source/core/fonts/fontchars.h diff --git a/source/common/fonts/fontinternals.h b/source/core/fonts/fontinternals.h similarity index 100% rename from source/common/fonts/fontinternals.h rename to source/core/fonts/fontinternals.h diff --git a/source/common/fonts/hexfont.cpp b/source/core/fonts/hexfont.cpp similarity index 100% rename from source/common/fonts/hexfont.cpp rename to source/core/fonts/hexfont.cpp diff --git a/source/common/fonts/myiswalpha.h b/source/core/fonts/myiswalpha.h similarity index 100% rename from source/common/fonts/myiswalpha.h rename to source/core/fonts/myiswalpha.h diff --git a/source/common/fonts/singlelumpfont.cpp b/source/core/fonts/singlelumpfont.cpp similarity index 100% rename from source/common/fonts/singlelumpfont.cpp rename to source/core/fonts/singlelumpfont.cpp diff --git a/source/common/fonts/v_font.cpp b/source/core/fonts/v_font.cpp similarity index 100% rename from source/common/fonts/v_font.cpp rename to source/core/fonts/v_font.cpp diff --git a/source/common/fonts/v_font.h b/source/core/fonts/v_font.h similarity index 100% rename from source/common/fonts/v_font.h rename to source/core/fonts/v_font.h diff --git a/source/common/fonts/v_text.cpp b/source/core/fonts/v_text.cpp similarity index 100% rename from source/common/fonts/v_text.cpp rename to source/core/fonts/v_text.cpp diff --git a/source/common/gameconfigfile.cpp b/source/core/gameconfigfile.cpp similarity index 100% rename from source/common/gameconfigfile.cpp rename to source/core/gameconfigfile.cpp diff --git a/source/common/gameconfigfile.h b/source/core/gameconfigfile.h similarity index 100% rename from source/common/gameconfigfile.h rename to source/core/gameconfigfile.h diff --git a/source/common/gamecontrol.cpp b/source/core/gamecontrol.cpp similarity index 100% rename from source/common/gamecontrol.cpp rename to source/core/gamecontrol.cpp diff --git a/source/common/gamecontrol.h b/source/core/gamecontrol.h similarity index 100% rename from source/common/gamecontrol.h rename to source/core/gamecontrol.h diff --git a/source/common/gamecvars.cpp b/source/core/gamecvars.cpp similarity index 100% rename from source/common/gamecvars.cpp rename to source/core/gamecvars.cpp diff --git a/source/common/gamecvars.h b/source/core/gamecvars.h similarity index 100% rename from source/common/gamecvars.h rename to source/core/gamecvars.h diff --git a/source/common/i_specialpaths.h b/source/core/i_specialpaths.h similarity index 100% rename from source/common/i_specialpaths.h rename to source/core/i_specialpaths.h diff --git a/source/common/initfs.cpp b/source/core/initfs.cpp similarity index 100% rename from source/common/initfs.cpp rename to source/core/initfs.cpp diff --git a/source/common/input/m_joy.cpp b/source/core/input/m_joy.cpp similarity index 100% rename from source/common/input/m_joy.cpp rename to source/core/input/m_joy.cpp diff --git a/source/common/input/m_joy.h b/source/core/input/m_joy.h similarity index 100% rename from source/common/input/m_joy.h rename to source/core/input/m_joy.h diff --git a/source/common/inputstate.cpp b/source/core/inputstate.cpp similarity index 100% rename from source/common/inputstate.cpp rename to source/core/inputstate.cpp diff --git a/source/common/inputstate.h b/source/core/inputstate.h similarity index 100% rename from source/common/inputstate.h rename to source/core/inputstate.h diff --git a/source/common/mapinfo.h b/source/core/mapinfo.h similarity index 100% rename from source/common/mapinfo.h rename to source/core/mapinfo.h diff --git a/source/common/menu/imagescroller.cpp b/source/core/menu/imagescroller.cpp similarity index 100% rename from source/common/menu/imagescroller.cpp rename to source/core/menu/imagescroller.cpp diff --git a/source/common/menu/joystickmenu.cpp b/source/core/menu/joystickmenu.cpp similarity index 100% rename from source/common/menu/joystickmenu.cpp rename to source/core/menu/joystickmenu.cpp diff --git a/source/common/menu/listmenu.cpp b/source/core/menu/listmenu.cpp similarity index 100% rename from source/common/menu/listmenu.cpp rename to source/core/menu/listmenu.cpp diff --git a/source/common/menu/loadsavemenu.cpp b/source/core/menu/loadsavemenu.cpp similarity index 100% rename from source/common/menu/loadsavemenu.cpp rename to source/core/menu/loadsavemenu.cpp diff --git a/source/common/menu/menu.cpp b/source/core/menu/menu.cpp similarity index 100% rename from source/common/menu/menu.cpp rename to source/core/menu/menu.cpp diff --git a/source/common/menu/menu.h b/source/core/menu/menu.h similarity index 100% rename from source/common/menu/menu.h rename to source/core/menu/menu.h diff --git a/source/common/menu/menudef.cpp b/source/core/menu/menudef.cpp similarity index 100% rename from source/common/menu/menudef.cpp rename to source/core/menu/menudef.cpp diff --git a/source/common/menu/menuinput.cpp b/source/core/menu/menuinput.cpp similarity index 100% rename from source/common/menu/menuinput.cpp rename to source/core/menu/menuinput.cpp diff --git a/source/common/menu/messagebox.cpp b/source/core/menu/messagebox.cpp similarity index 100% rename from source/common/menu/messagebox.cpp rename to source/core/menu/messagebox.cpp diff --git a/source/common/menu/optionmenu.cpp b/source/core/menu/optionmenu.cpp similarity index 100% rename from source/common/menu/optionmenu.cpp rename to source/core/menu/optionmenu.cpp diff --git a/source/common/menu/optionmenuitems.h b/source/core/menu/optionmenuitems.h similarity index 100% rename from source/common/menu/optionmenuitems.h rename to source/core/menu/optionmenuitems.h diff --git a/source/common/menu/resolutionmenu.cpp b/source/core/menu/resolutionmenu.cpp similarity index 100% rename from source/common/menu/resolutionmenu.cpp rename to source/core/menu/resolutionmenu.cpp diff --git a/source/common/menu/savegamemanager.cpp b/source/core/menu/savegamemanager.cpp similarity index 100% rename from source/common/menu/savegamemanager.cpp rename to source/core/menu/savegamemanager.cpp diff --git a/source/common/music/i_music.cpp b/source/core/music/i_music.cpp similarity index 100% rename from source/common/music/i_music.cpp rename to source/core/music/i_music.cpp diff --git a/source/common/music/i_music.h b/source/core/music/i_music.h similarity index 100% rename from source/common/music/i_music.h rename to source/core/music/i_music.h diff --git a/source/common/music/i_soundfont.cpp b/source/core/music/i_soundfont.cpp similarity index 100% rename from source/common/music/i_soundfont.cpp rename to source/core/music/i_soundfont.cpp diff --git a/source/common/music/i_soundfont.h b/source/core/music/i_soundfont.h similarity index 100% rename from source/common/music/i_soundfont.h rename to source/core/music/i_soundfont.h diff --git a/source/common/music/music.cpp b/source/core/music/music.cpp similarity index 100% rename from source/common/music/music.cpp rename to source/core/music/music.cpp diff --git a/source/common/music/music_config.cpp b/source/core/music/music_config.cpp similarity index 100% rename from source/common/music/music_config.cpp rename to source/core/music/music_config.cpp diff --git a/source/common/music/music_midi_base.cpp b/source/core/music/music_midi_base.cpp similarity index 100% rename from source/common/music/music_midi_base.cpp rename to source/core/music/music_midi_base.cpp diff --git a/source/common/music/s_advsound.cpp b/source/core/music/s_advsound.cpp similarity index 100% rename from source/common/music/s_advsound.cpp rename to source/core/music/s_advsound.cpp diff --git a/source/common/music/s_music.h b/source/core/music/s_music.h similarity index 100% rename from source/common/music/s_music.h rename to source/core/music/s_music.h diff --git a/source/common/music/z_music.h b/source/core/music/z_music.h similarity index 100% rename from source/common/music/z_music.h rename to source/core/music/z_music.h diff --git a/source/common/ns.h b/source/core/ns.h similarity index 100% rename from source/common/ns.h rename to source/core/ns.h diff --git a/source/common/quotemgr.h b/source/core/quotemgr.h similarity index 100% rename from source/common/quotemgr.h rename to source/core/quotemgr.h diff --git a/source/common/quotes.cpp b/source/core/quotes.cpp similarity index 100% rename from source/common/quotes.cpp rename to source/core/quotes.cpp diff --git a/source/common/rendering/gl/renderer/gl_postprocess.cpp b/source/core/rendering/gl/renderer/gl_postprocess.cpp similarity index 100% rename from source/common/rendering/gl/renderer/gl_postprocess.cpp rename to source/core/rendering/gl/renderer/gl_postprocess.cpp diff --git a/source/common/rendering/gl/renderer/gl_postprocessstate.cpp b/source/core/rendering/gl/renderer/gl_postprocessstate.cpp similarity index 100% rename from source/common/rendering/gl/renderer/gl_postprocessstate.cpp rename to source/core/rendering/gl/renderer/gl_postprocessstate.cpp diff --git a/source/common/rendering/gl/renderer/gl_postprocessstate.h b/source/core/rendering/gl/renderer/gl_postprocessstate.h similarity index 100% rename from source/common/rendering/gl/renderer/gl_postprocessstate.h rename to source/core/rendering/gl/renderer/gl_postprocessstate.h diff --git a/source/common/rendering/gl/renderer/gl_renderbuffers.cpp b/source/core/rendering/gl/renderer/gl_renderbuffers.cpp similarity index 100% rename from source/common/rendering/gl/renderer/gl_renderbuffers.cpp rename to source/core/rendering/gl/renderer/gl_renderbuffers.cpp diff --git a/source/common/rendering/gl/renderer/gl_renderbuffers.h b/source/core/rendering/gl/renderer/gl_renderbuffers.h similarity index 100% rename from source/common/rendering/gl/renderer/gl_renderbuffers.h rename to source/core/rendering/gl/renderer/gl_renderbuffers.h diff --git a/source/common/rendering/gl/renderer/gl_renderer.cpp b/source/core/rendering/gl/renderer/gl_renderer.cpp similarity index 100% rename from source/common/rendering/gl/renderer/gl_renderer.cpp rename to source/core/rendering/gl/renderer/gl_renderer.cpp diff --git a/source/common/rendering/gl/renderer/gl_renderer.h b/source/core/rendering/gl/renderer/gl_renderer.h similarity index 100% rename from source/common/rendering/gl/renderer/gl_renderer.h rename to source/core/rendering/gl/renderer/gl_renderer.h diff --git a/source/common/rendering/gl/shaders/gl_shaderprogram.cpp b/source/core/rendering/gl/shaders/gl_shaderprogram.cpp similarity index 100% rename from source/common/rendering/gl/shaders/gl_shaderprogram.cpp rename to source/core/rendering/gl/shaders/gl_shaderprogram.cpp diff --git a/source/common/rendering/gl/shaders/gl_shaderprogram.h b/source/core/rendering/gl/shaders/gl_shaderprogram.h similarity index 100% rename from source/common/rendering/gl/shaders/gl_shaderprogram.h rename to source/core/rendering/gl/shaders/gl_shaderprogram.h diff --git a/source/common/rendering/gl/system/gl_buffers.cpp b/source/core/rendering/gl/system/gl_buffers.cpp similarity index 100% rename from source/common/rendering/gl/system/gl_buffers.cpp rename to source/core/rendering/gl/system/gl_buffers.cpp diff --git a/source/common/rendering/gl/system/gl_buffers.h b/source/core/rendering/gl/system/gl_buffers.h similarity index 100% rename from source/common/rendering/gl/system/gl_buffers.h rename to source/core/rendering/gl/system/gl_buffers.h diff --git a/source/common/rendering/gl/system/gl_debug.cpp b/source/core/rendering/gl/system/gl_debug.cpp similarity index 100% rename from source/common/rendering/gl/system/gl_debug.cpp rename to source/core/rendering/gl/system/gl_debug.cpp diff --git a/source/common/rendering/gl/system/gl_debug.h b/source/core/rendering/gl/system/gl_debug.h similarity index 100% rename from source/common/rendering/gl/system/gl_debug.h rename to source/core/rendering/gl/system/gl_debug.h diff --git a/source/common/rendering/gl/system/gl_framebuffer.cpp b/source/core/rendering/gl/system/gl_framebuffer.cpp similarity index 100% rename from source/common/rendering/gl/system/gl_framebuffer.cpp rename to source/core/rendering/gl/system/gl_framebuffer.cpp diff --git a/source/common/rendering/gl/system/gl_framebuffer.h b/source/core/rendering/gl/system/gl_framebuffer.h similarity index 100% rename from source/common/rendering/gl/system/gl_framebuffer.h rename to source/core/rendering/gl/system/gl_framebuffer.h diff --git a/source/common/rendering/gl_load/gl_extlist.txt b/source/core/rendering/gl_load/gl_extlist.txt similarity index 100% rename from source/common/rendering/gl_load/gl_extlist.txt rename to source/core/rendering/gl_load/gl_extlist.txt diff --git a/source/common/rendering/gl_load/gl_interface.cpp b/source/core/rendering/gl_load/gl_interface.cpp similarity index 100% rename from source/common/rendering/gl_load/gl_interface.cpp rename to source/core/rendering/gl_load/gl_interface.cpp diff --git a/source/common/rendering/gl_load/gl_interface.h b/source/core/rendering/gl_load/gl_interface.h similarity index 100% rename from source/common/rendering/gl_load/gl_interface.h rename to source/core/rendering/gl_load/gl_interface.h diff --git a/source/common/rendering/gl_load/gl_load.c b/source/core/rendering/gl_load/gl_load.c similarity index 100% rename from source/common/rendering/gl_load/gl_load.c rename to source/core/rendering/gl_load/gl_load.c diff --git a/source/common/rendering/gl_load/gl_load.h b/source/core/rendering/gl_load/gl_load.h similarity index 100% rename from source/common/rendering/gl_load/gl_load.h rename to source/core/rendering/gl_load/gl_load.h diff --git a/source/common/rendering/gl_load/gl_system.h b/source/core/rendering/gl_load/gl_system.h similarity index 100% rename from source/common/rendering/gl_load/gl_system.h rename to source/core/rendering/gl_load/gl_system.h diff --git a/source/common/rendering/hwrenderer/data/buffers.h b/source/core/rendering/hwrenderer/data/buffers.h similarity index 100% rename from source/common/rendering/hwrenderer/data/buffers.h rename to source/core/rendering/hwrenderer/data/buffers.h diff --git a/source/common/rendering/hwrenderer/data/flatvertices.cpp b/source/core/rendering/hwrenderer/data/flatvertices.cpp similarity index 100% rename from source/common/rendering/hwrenderer/data/flatvertices.cpp rename to source/core/rendering/hwrenderer/data/flatvertices.cpp diff --git a/source/common/rendering/hwrenderer/data/flatvertices.h b/source/core/rendering/hwrenderer/data/flatvertices.h similarity index 100% rename from source/common/rendering/hwrenderer/data/flatvertices.h rename to source/core/rendering/hwrenderer/data/flatvertices.h diff --git a/source/common/rendering/hwrenderer/data/renderqueue.h b/source/core/rendering/hwrenderer/data/renderqueue.h similarity index 100% rename from source/common/rendering/hwrenderer/data/renderqueue.h rename to source/core/rendering/hwrenderer/data/renderqueue.h diff --git a/source/common/rendering/hwrenderer/data/shaderuniforms.h b/source/core/rendering/hwrenderer/data/shaderuniforms.h similarity index 100% rename from source/common/rendering/hwrenderer/data/shaderuniforms.h rename to source/core/rendering/hwrenderer/data/shaderuniforms.h diff --git a/source/common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp b/source/core/rendering/hwrenderer/postprocessing/hw_postprocess.cpp similarity index 100% rename from source/common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp rename to source/core/rendering/hwrenderer/postprocessing/hw_postprocess.cpp diff --git a/source/common/rendering/hwrenderer/postprocessing/hw_postprocess.h b/source/core/rendering/hwrenderer/postprocessing/hw_postprocess.h similarity index 100% rename from source/common/rendering/hwrenderer/postprocessing/hw_postprocess.h rename to source/core/rendering/hwrenderer/postprocessing/hw_postprocess.h diff --git a/source/common/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp b/source/core/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp similarity index 100% rename from source/common/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp rename to source/core/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp diff --git a/source/common/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.h b/source/core/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.h similarity index 100% rename from source/common/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.h rename to source/core/rendering/hwrenderer/postprocessing/hw_postprocess_cvars.h diff --git a/source/common/rendering/hwrenderer/utility/hw_cvars.cpp b/source/core/rendering/hwrenderer/utility/hw_cvars.cpp similarity index 100% rename from source/common/rendering/hwrenderer/utility/hw_cvars.cpp rename to source/core/rendering/hwrenderer/utility/hw_cvars.cpp diff --git a/source/common/rendering/hwrenderer/utility/hw_cvars.h b/source/core/rendering/hwrenderer/utility/hw_cvars.h similarity index 100% rename from source/common/rendering/hwrenderer/utility/hw_cvars.h rename to source/core/rendering/hwrenderer/utility/hw_cvars.h diff --git a/source/common/rendering/hwrenderer/utility/hw_shaderpatcher.cpp b/source/core/rendering/hwrenderer/utility/hw_shaderpatcher.cpp similarity index 100% rename from source/common/rendering/hwrenderer/utility/hw_shaderpatcher.cpp rename to source/core/rendering/hwrenderer/utility/hw_shaderpatcher.cpp diff --git a/source/common/rendering/hwrenderer/utility/hw_shaderpatcher.h b/source/core/rendering/hwrenderer/utility/hw_shaderpatcher.h similarity index 100% rename from source/common/rendering/hwrenderer/utility/hw_shaderpatcher.h rename to source/core/rendering/hwrenderer/utility/hw_shaderpatcher.h diff --git a/source/common/rendering/i_video.h b/source/core/rendering/i_video.h similarity index 100% rename from source/common/rendering/i_video.h rename to source/core/rendering/i_video.h diff --git a/source/common/rendering/r_videoscale.cpp b/source/core/rendering/r_videoscale.cpp similarity index 100% rename from source/common/rendering/r_videoscale.cpp rename to source/core/rendering/r_videoscale.cpp diff --git a/source/common/rendering/r_videoscale.h b/source/core/rendering/r_videoscale.h similarity index 100% rename from source/common/rendering/r_videoscale.h rename to source/core/rendering/r_videoscale.h diff --git a/source/common/rendering/v_framebuffer.cpp b/source/core/rendering/v_framebuffer.cpp similarity index 100% rename from source/common/rendering/v_framebuffer.cpp rename to source/core/rendering/v_framebuffer.cpp diff --git a/source/common/rendering/v_video.cpp b/source/core/rendering/v_video.cpp similarity index 100% rename from source/common/rendering/v_video.cpp rename to source/core/rendering/v_video.cpp diff --git a/source/common/rendering/v_video.h b/source/core/rendering/v_video.h similarity index 100% rename from source/common/rendering/v_video.h rename to source/core/rendering/v_video.h diff --git a/source/common/rts.cpp b/source/core/rts.cpp similarity index 100% rename from source/common/rts.cpp rename to source/core/rts.cpp diff --git a/source/common/rts.h b/source/core/rts.h similarity index 100% rename from source/common/rts.h rename to source/core/rts.h diff --git a/source/common/savegamehelp.cpp b/source/core/savegamehelp.cpp similarity index 100% rename from source/common/savegamehelp.cpp rename to source/core/savegamehelp.cpp diff --git a/source/common/savegamehelp.h b/source/core/savegamehelp.h similarity index 100% rename from source/common/savegamehelp.h rename to source/core/savegamehelp.h diff --git a/source/common/screenshot.cpp b/source/core/screenshot.cpp similarity index 100% rename from source/common/screenshot.cpp rename to source/core/screenshot.cpp diff --git a/source/common/searchpaths.cpp b/source/core/searchpaths.cpp similarity index 100% rename from source/common/searchpaths.cpp rename to source/core/searchpaths.cpp diff --git a/source/common/secrets.cpp b/source/core/secrets.cpp similarity index 100% rename from source/common/secrets.cpp rename to source/core/secrets.cpp diff --git a/source/common/secrets.h b/source/core/secrets.h similarity index 100% rename from source/common/secrets.h rename to source/core/secrets.h diff --git a/source/common/serializer.cpp b/source/core/serializer.cpp similarity index 100% rename from source/common/serializer.cpp rename to source/core/serializer.cpp diff --git a/source/common/serializer.h b/source/core/serializer.h similarity index 100% rename from source/common/serializer.h rename to source/core/serializer.h diff --git a/source/common/sound/backend/efx.h b/source/core/sound/backend/efx.h similarity index 100% rename from source/common/sound/backend/efx.h rename to source/core/sound/backend/efx.h diff --git a/source/common/sound/backend/i_sound.cpp b/source/core/sound/backend/i_sound.cpp similarity index 100% rename from source/common/sound/backend/i_sound.cpp rename to source/core/sound/backend/i_sound.cpp diff --git a/source/common/sound/backend/i_sound.h b/source/core/sound/backend/i_sound.h similarity index 100% rename from source/common/sound/backend/i_sound.h rename to source/core/sound/backend/i_sound.h diff --git a/source/common/sound/backend/i_soundinternal.h b/source/core/sound/backend/i_soundinternal.h similarity index 100% rename from source/common/sound/backend/i_soundinternal.h rename to source/core/sound/backend/i_soundinternal.h diff --git a/source/common/sound/backend/oalload.h b/source/core/sound/backend/oalload.h similarity index 100% rename from source/common/sound/backend/oalload.h rename to source/core/sound/backend/oalload.h diff --git a/source/common/sound/backend/oalsound.cpp b/source/core/sound/backend/oalsound.cpp similarity index 100% rename from source/common/sound/backend/oalsound.cpp rename to source/core/sound/backend/oalsound.cpp diff --git a/source/common/sound/backend/oalsound.h b/source/core/sound/backend/oalsound.h similarity index 100% rename from source/common/sound/backend/oalsound.h rename to source/core/sound/backend/oalsound.h diff --git a/source/common/sound/s_environment.cpp b/source/core/sound/s_environment.cpp similarity index 100% rename from source/common/sound/s_environment.cpp rename to source/core/sound/s_environment.cpp diff --git a/source/common/sound/s_sound.cpp b/source/core/sound/s_sound.cpp similarity index 100% rename from source/common/sound/s_sound.cpp rename to source/core/sound/s_sound.cpp diff --git a/source/common/sound/s_soundinternal.h b/source/core/sound/s_soundinternal.h similarity index 100% rename from source/common/sound/s_soundinternal.h rename to source/core/sound/s_soundinternal.h diff --git a/source/common/sound/thirdparty/al.h b/source/core/sound/thirdparty/al.h similarity index 100% rename from source/common/sound/thirdparty/al.h rename to source/core/sound/thirdparty/al.h diff --git a/source/common/sound/thirdparty/alc.h b/source/core/sound/thirdparty/alc.h similarity index 100% rename from source/common/sound/thirdparty/alc.h rename to source/core/sound/thirdparty/alc.h diff --git a/source/common/sound/thirdparty/alext.h b/source/core/sound/thirdparty/alext.h similarity index 100% rename from source/common/sound/thirdparty/alext.h rename to source/core/sound/thirdparty/alext.h diff --git a/source/common/st_start.h b/source/core/st_start.h similarity index 100% rename from source/common/st_start.h rename to source/core/st_start.h diff --git a/source/common/statistics.cpp b/source/core/statistics.cpp similarity index 100% rename from source/common/statistics.cpp rename to source/core/statistics.cpp diff --git a/source/common/statistics.h b/source/core/statistics.h similarity index 100% rename from source/common/statistics.h rename to source/core/statistics.h diff --git a/source/common/textures/bitmap.cpp b/source/core/textures/bitmap.cpp similarity index 100% rename from source/common/textures/bitmap.cpp rename to source/core/textures/bitmap.cpp diff --git a/source/common/textures/bitmap.h b/source/core/textures/bitmap.h similarity index 100% rename from source/common/textures/bitmap.h rename to source/core/textures/bitmap.h diff --git a/source/common/textures/buildtiles.cpp b/source/core/textures/buildtiles.cpp similarity index 100% rename from source/common/textures/buildtiles.cpp rename to source/core/textures/buildtiles.cpp diff --git a/source/common/textures/formats/arttexture.cpp b/source/core/textures/formats/arttexture.cpp similarity index 100% rename from source/common/textures/formats/arttexture.cpp rename to source/core/textures/formats/arttexture.cpp diff --git a/source/common/textures/formats/ddstexture.cpp b/source/core/textures/formats/ddstexture.cpp similarity index 100% rename from source/common/textures/formats/ddstexture.cpp rename to source/core/textures/formats/ddstexture.cpp diff --git a/source/common/textures/formats/jpegtexture.cpp b/source/core/textures/formats/jpegtexture.cpp similarity index 100% rename from source/common/textures/formats/jpegtexture.cpp rename to source/core/textures/formats/jpegtexture.cpp diff --git a/source/common/textures/formats/pcxtexture.cpp b/source/core/textures/formats/pcxtexture.cpp similarity index 100% rename from source/common/textures/formats/pcxtexture.cpp rename to source/core/textures/formats/pcxtexture.cpp diff --git a/source/common/textures/formats/pngtexture.cpp b/source/core/textures/formats/pngtexture.cpp similarity index 100% rename from source/common/textures/formats/pngtexture.cpp rename to source/core/textures/formats/pngtexture.cpp diff --git a/source/common/textures/formats/stb_image.h b/source/core/textures/formats/stb_image.h similarity index 100% rename from source/common/textures/formats/stb_image.h rename to source/core/textures/formats/stb_image.h diff --git a/source/common/textures/formats/stbtexture.cpp b/source/core/textures/formats/stbtexture.cpp similarity index 100% rename from source/common/textures/formats/stbtexture.cpp rename to source/core/textures/formats/stbtexture.cpp diff --git a/source/common/textures/formats/tgatexture.cpp b/source/core/textures/formats/tgatexture.cpp similarity index 100% rename from source/common/textures/formats/tgatexture.cpp rename to source/core/textures/formats/tgatexture.cpp diff --git a/source/common/textures/image.cpp b/source/core/textures/image.cpp similarity index 100% rename from source/common/textures/image.cpp rename to source/core/textures/image.cpp diff --git a/source/common/textures/image.h b/source/core/textures/image.h similarity index 100% rename from source/common/textures/image.h rename to source/core/textures/image.h diff --git a/source/common/textures/imagehelpers.cpp b/source/core/textures/imagehelpers.cpp similarity index 100% rename from source/common/textures/imagehelpers.cpp rename to source/core/textures/imagehelpers.cpp diff --git a/source/common/textures/imagehelpers.h b/source/core/textures/imagehelpers.h similarity index 100% rename from source/common/textures/imagehelpers.h rename to source/core/textures/imagehelpers.h diff --git a/source/common/textures/imagetexture.cpp b/source/core/textures/imagetexture.cpp similarity index 100% rename from source/common/textures/imagetexture.cpp rename to source/core/textures/imagetexture.cpp diff --git a/source/common/textures/skyboxtexture.cpp b/source/core/textures/skyboxtexture.cpp similarity index 100% rename from source/common/textures/skyboxtexture.cpp rename to source/core/textures/skyboxtexture.cpp diff --git a/source/common/textures/skyboxtexture.h b/source/core/textures/skyboxtexture.h similarity index 100% rename from source/common/textures/skyboxtexture.h rename to source/core/textures/skyboxtexture.h diff --git a/source/common/textures/texture.cpp b/source/core/textures/texture.cpp similarity index 100% rename from source/common/textures/texture.cpp rename to source/core/textures/texture.cpp diff --git a/source/common/textures/textureid.h b/source/core/textures/textureid.h similarity index 100% rename from source/common/textures/textureid.h rename to source/core/textures/textureid.h diff --git a/source/common/textures/textures.h b/source/core/textures/textures.h similarity index 100% rename from source/common/textures/textures.h rename to source/core/textures/textures.h diff --git a/source/common/utility/basics.h b/source/core/utility/basics.h similarity index 100% rename from source/common/utility/basics.h rename to source/core/utility/basics.h diff --git a/source/common/utility/cmdlib.cpp b/source/core/utility/cmdlib.cpp similarity index 100% rename from source/common/utility/cmdlib.cpp rename to source/core/utility/cmdlib.cpp diff --git a/source/common/utility/cmdlib.h b/source/core/utility/cmdlib.h similarity index 100% rename from source/common/utility/cmdlib.h rename to source/core/utility/cmdlib.h diff --git a/source/common/utility/configfile.cpp b/source/core/utility/configfile.cpp similarity index 100% rename from source/common/utility/configfile.cpp rename to source/core/utility/configfile.cpp diff --git a/source/common/utility/configfile.h b/source/core/utility/configfile.h similarity index 100% rename from source/common/utility/configfile.h rename to source/core/utility/configfile.h diff --git a/source/common/utility/filereadermusicinterface.h b/source/core/utility/filereadermusicinterface.h similarity index 100% rename from source/common/utility/filereadermusicinterface.h rename to source/core/utility/filereadermusicinterface.h diff --git a/source/common/utility/files.cpp b/source/core/utility/files.cpp similarity index 100% rename from source/common/utility/files.cpp rename to source/core/utility/files.cpp diff --git a/source/common/utility/files.h b/source/core/utility/files.h similarity index 100% rename from source/common/utility/files.h rename to source/core/utility/files.h diff --git a/source/common/utility/files_decompress.cpp b/source/core/utility/files_decompress.cpp similarity index 100% rename from source/common/utility/files_decompress.cpp rename to source/core/utility/files_decompress.cpp diff --git a/source/common/utility/gstrings.h b/source/core/utility/gstrings.h similarity index 100% rename from source/common/utility/gstrings.h rename to source/core/utility/gstrings.h diff --git a/source/common/utility/i_module.cpp b/source/core/utility/i_module.cpp similarity index 100% rename from source/common/utility/i_module.cpp rename to source/core/utility/i_module.cpp diff --git a/source/common/utility/i_module.h b/source/core/utility/i_module.h similarity index 100% rename from source/common/utility/i_module.h rename to source/core/utility/i_module.h diff --git a/source/common/utility/i_time.cpp b/source/core/utility/i_time.cpp similarity index 100% rename from source/common/utility/i_time.cpp rename to source/core/utility/i_time.cpp diff --git a/source/common/utility/i_time.h b/source/core/utility/i_time.h similarity index 100% rename from source/common/utility/i_time.h rename to source/core/utility/i_time.h diff --git a/source/common/utility/m_argv.cpp b/source/core/utility/m_argv.cpp similarity index 100% rename from source/common/utility/m_argv.cpp rename to source/core/utility/m_argv.cpp diff --git a/source/common/utility/m_argv.h b/source/core/utility/m_argv.h similarity index 100% rename from source/common/utility/m_argv.h rename to source/core/utility/m_argv.h diff --git a/source/common/utility/m_crc32.h b/source/core/utility/m_crc32.h similarity index 100% rename from source/common/utility/m_crc32.h rename to source/core/utility/m_crc32.h diff --git a/source/common/utility/m_png.cpp b/source/core/utility/m_png.cpp similarity index 100% rename from source/common/utility/m_png.cpp rename to source/core/utility/m_png.cpp diff --git a/source/common/utility/m_png.h b/source/core/utility/m_png.h similarity index 100% rename from source/common/utility/m_png.h rename to source/core/utility/m_png.h diff --git a/source/common/utility/m_swap.h b/source/core/utility/m_swap.h similarity index 100% rename from source/common/utility/m_swap.h rename to source/core/utility/m_swap.h diff --git a/source/common/utility/matrix.cpp b/source/core/utility/matrix.cpp similarity index 100% rename from source/common/utility/matrix.cpp rename to source/core/utility/matrix.cpp diff --git a/source/common/utility/matrix.h b/source/core/utility/matrix.h similarity index 100% rename from source/common/utility/matrix.h rename to source/core/utility/matrix.h diff --git a/source/common/utility/memarena.cpp b/source/core/utility/memarena.cpp similarity index 100% rename from source/common/utility/memarena.cpp rename to source/core/utility/memarena.cpp diff --git a/source/common/utility/memarena.h b/source/core/utility/memarena.h similarity index 100% rename from source/common/utility/memarena.h rename to source/core/utility/memarena.h diff --git a/source/common/utility/name.cpp b/source/core/utility/name.cpp similarity index 100% rename from source/common/utility/name.cpp rename to source/core/utility/name.cpp diff --git a/source/common/utility/name.h b/source/core/utility/name.h similarity index 100% rename from source/common/utility/name.h rename to source/core/utility/name.h diff --git a/source/common/utility/namedef.h b/source/core/utility/namedef.h similarity index 100% rename from source/common/utility/namedef.h rename to source/core/utility/namedef.h diff --git a/source/common/utility/palentry.h b/source/core/utility/palentry.h similarity index 100% rename from source/common/utility/palentry.h rename to source/core/utility/palentry.h diff --git a/source/common/utility/printf.h b/source/core/utility/printf.h similarity index 100% rename from source/common/utility/printf.h rename to source/core/utility/printf.h diff --git a/source/common/utility/rapidjson/allocators.h b/source/core/utility/rapidjson/allocators.h similarity index 100% rename from source/common/utility/rapidjson/allocators.h rename to source/core/utility/rapidjson/allocators.h diff --git a/source/common/utility/rapidjson/document.h b/source/core/utility/rapidjson/document.h similarity index 100% rename from source/common/utility/rapidjson/document.h rename to source/core/utility/rapidjson/document.h diff --git a/source/common/utility/rapidjson/encodedstream.h b/source/core/utility/rapidjson/encodedstream.h similarity index 100% rename from source/common/utility/rapidjson/encodedstream.h rename to source/core/utility/rapidjson/encodedstream.h diff --git a/source/common/utility/rapidjson/encodings.h b/source/core/utility/rapidjson/encodings.h similarity index 100% rename from source/common/utility/rapidjson/encodings.h rename to source/core/utility/rapidjson/encodings.h diff --git a/source/common/utility/rapidjson/error/en.h b/source/core/utility/rapidjson/error/en.h similarity index 100% rename from source/common/utility/rapidjson/error/en.h rename to source/core/utility/rapidjson/error/en.h diff --git a/source/common/utility/rapidjson/error/error.h b/source/core/utility/rapidjson/error/error.h similarity index 100% rename from source/common/utility/rapidjson/error/error.h rename to source/core/utility/rapidjson/error/error.h diff --git a/source/common/utility/rapidjson/filereadstream.h b/source/core/utility/rapidjson/filereadstream.h similarity index 100% rename from source/common/utility/rapidjson/filereadstream.h rename to source/core/utility/rapidjson/filereadstream.h diff --git a/source/common/utility/rapidjson/filewritestream.h b/source/core/utility/rapidjson/filewritestream.h similarity index 100% rename from source/common/utility/rapidjson/filewritestream.h rename to source/core/utility/rapidjson/filewritestream.h diff --git a/source/common/utility/rapidjson/fwd.h b/source/core/utility/rapidjson/fwd.h similarity index 100% rename from source/common/utility/rapidjson/fwd.h rename to source/core/utility/rapidjson/fwd.h diff --git a/source/common/utility/rapidjson/internal/biginteger.h b/source/core/utility/rapidjson/internal/biginteger.h similarity index 100% rename from source/common/utility/rapidjson/internal/biginteger.h rename to source/core/utility/rapidjson/internal/biginteger.h diff --git a/source/common/utility/rapidjson/internal/diyfp.h b/source/core/utility/rapidjson/internal/diyfp.h similarity index 100% rename from source/common/utility/rapidjson/internal/diyfp.h rename to source/core/utility/rapidjson/internal/diyfp.h diff --git a/source/common/utility/rapidjson/internal/dtoa.h b/source/core/utility/rapidjson/internal/dtoa.h similarity index 100% rename from source/common/utility/rapidjson/internal/dtoa.h rename to source/core/utility/rapidjson/internal/dtoa.h diff --git a/source/common/utility/rapidjson/internal/ieee754.h b/source/core/utility/rapidjson/internal/ieee754.h similarity index 100% rename from source/common/utility/rapidjson/internal/ieee754.h rename to source/core/utility/rapidjson/internal/ieee754.h diff --git a/source/common/utility/rapidjson/internal/itoa.h b/source/core/utility/rapidjson/internal/itoa.h similarity index 100% rename from source/common/utility/rapidjson/internal/itoa.h rename to source/core/utility/rapidjson/internal/itoa.h diff --git a/source/common/utility/rapidjson/internal/meta.h b/source/core/utility/rapidjson/internal/meta.h similarity index 100% rename from source/common/utility/rapidjson/internal/meta.h rename to source/core/utility/rapidjson/internal/meta.h diff --git a/source/common/utility/rapidjson/internal/pow10.h b/source/core/utility/rapidjson/internal/pow10.h similarity index 100% rename from source/common/utility/rapidjson/internal/pow10.h rename to source/core/utility/rapidjson/internal/pow10.h diff --git a/source/common/utility/rapidjson/internal/regex.h b/source/core/utility/rapidjson/internal/regex.h similarity index 100% rename from source/common/utility/rapidjson/internal/regex.h rename to source/core/utility/rapidjson/internal/regex.h diff --git a/source/common/utility/rapidjson/internal/stack.h b/source/core/utility/rapidjson/internal/stack.h similarity index 100% rename from source/common/utility/rapidjson/internal/stack.h rename to source/core/utility/rapidjson/internal/stack.h diff --git a/source/common/utility/rapidjson/internal/strfunc.h b/source/core/utility/rapidjson/internal/strfunc.h similarity index 100% rename from source/common/utility/rapidjson/internal/strfunc.h rename to source/core/utility/rapidjson/internal/strfunc.h diff --git a/source/common/utility/rapidjson/internal/strtod.h b/source/core/utility/rapidjson/internal/strtod.h similarity index 100% rename from source/common/utility/rapidjson/internal/strtod.h rename to source/core/utility/rapidjson/internal/strtod.h diff --git a/source/common/utility/rapidjson/internal/swap.h b/source/core/utility/rapidjson/internal/swap.h similarity index 100% rename from source/common/utility/rapidjson/internal/swap.h rename to source/core/utility/rapidjson/internal/swap.h diff --git a/source/common/utility/rapidjson/istreamwrapper.h b/source/core/utility/rapidjson/istreamwrapper.h similarity index 100% rename from source/common/utility/rapidjson/istreamwrapper.h rename to source/core/utility/rapidjson/istreamwrapper.h diff --git a/source/common/utility/rapidjson/memorybuffer.h b/source/core/utility/rapidjson/memorybuffer.h similarity index 100% rename from source/common/utility/rapidjson/memorybuffer.h rename to source/core/utility/rapidjson/memorybuffer.h diff --git a/source/common/utility/rapidjson/memorystream.h b/source/core/utility/rapidjson/memorystream.h similarity index 100% rename from source/common/utility/rapidjson/memorystream.h rename to source/core/utility/rapidjson/memorystream.h diff --git a/source/common/utility/rapidjson/msinttypes/inttypes.h b/source/core/utility/rapidjson/msinttypes/inttypes.h similarity index 100% rename from source/common/utility/rapidjson/msinttypes/inttypes.h rename to source/core/utility/rapidjson/msinttypes/inttypes.h diff --git a/source/common/utility/rapidjson/msinttypes/stdint.h b/source/core/utility/rapidjson/msinttypes/stdint.h similarity index 100% rename from source/common/utility/rapidjson/msinttypes/stdint.h rename to source/core/utility/rapidjson/msinttypes/stdint.h diff --git a/source/common/utility/rapidjson/ostreamwrapper.h b/source/core/utility/rapidjson/ostreamwrapper.h similarity index 100% rename from source/common/utility/rapidjson/ostreamwrapper.h rename to source/core/utility/rapidjson/ostreamwrapper.h diff --git a/source/common/utility/rapidjson/pointer.h b/source/core/utility/rapidjson/pointer.h similarity index 100% rename from source/common/utility/rapidjson/pointer.h rename to source/core/utility/rapidjson/pointer.h diff --git a/source/common/utility/rapidjson/prettywriter.h b/source/core/utility/rapidjson/prettywriter.h similarity index 100% rename from source/common/utility/rapidjson/prettywriter.h rename to source/core/utility/rapidjson/prettywriter.h diff --git a/source/common/utility/rapidjson/rapidjson.h b/source/core/utility/rapidjson/rapidjson.h similarity index 100% rename from source/common/utility/rapidjson/rapidjson.h rename to source/core/utility/rapidjson/rapidjson.h diff --git a/source/common/utility/rapidjson/reader.h b/source/core/utility/rapidjson/reader.h similarity index 100% rename from source/common/utility/rapidjson/reader.h rename to source/core/utility/rapidjson/reader.h diff --git a/source/common/utility/rapidjson/schema.h b/source/core/utility/rapidjson/schema.h similarity index 100% rename from source/common/utility/rapidjson/schema.h rename to source/core/utility/rapidjson/schema.h diff --git a/source/common/utility/rapidjson/stream.h b/source/core/utility/rapidjson/stream.h similarity index 100% rename from source/common/utility/rapidjson/stream.h rename to source/core/utility/rapidjson/stream.h diff --git a/source/common/utility/rapidjson/stringbuffer.h b/source/core/utility/rapidjson/stringbuffer.h similarity index 100% rename from source/common/utility/rapidjson/stringbuffer.h rename to source/core/utility/rapidjson/stringbuffer.h diff --git a/source/common/utility/rapidjson/writer.h b/source/core/utility/rapidjson/writer.h similarity index 100% rename from source/common/utility/rapidjson/writer.h rename to source/core/utility/rapidjson/writer.h diff --git a/source/common/utility/sc_man.cpp b/source/core/utility/sc_man.cpp similarity index 100% rename from source/common/utility/sc_man.cpp rename to source/core/utility/sc_man.cpp diff --git a/source/common/utility/sc_man.h b/source/core/utility/sc_man.h similarity index 100% rename from source/common/utility/sc_man.h rename to source/core/utility/sc_man.h diff --git a/source/common/utility/sc_man_scanner.re b/source/core/utility/sc_man_scanner.re similarity index 100% rename from source/common/utility/sc_man_scanner.re rename to source/core/utility/sc_man_scanner.re diff --git a/source/common/utility/sc_man_tokens.h b/source/core/utility/sc_man_tokens.h similarity index 100% rename from source/common/utility/sc_man_tokens.h rename to source/core/utility/sc_man_tokens.h diff --git a/source/common/utility/stats.cpp b/source/core/utility/stats.cpp similarity index 100% rename from source/common/utility/stats.cpp rename to source/core/utility/stats.cpp diff --git a/source/common/utility/stats.h b/source/core/utility/stats.h similarity index 100% rename from source/common/utility/stats.h rename to source/core/utility/stats.h diff --git a/source/common/utility/stringtable.cpp b/source/core/utility/stringtable.cpp similarity index 100% rename from source/common/utility/stringtable.cpp rename to source/core/utility/stringtable.cpp diff --git a/source/common/utility/stringtable.h b/source/core/utility/stringtable.h similarity index 100% rename from source/common/utility/stringtable.h rename to source/core/utility/stringtable.h diff --git a/source/common/utility/strnatcmp.c b/source/core/utility/strnatcmp.c similarity index 100% rename from source/common/utility/strnatcmp.c rename to source/core/utility/strnatcmp.c diff --git a/source/common/utility/strnatcmp.h b/source/core/utility/strnatcmp.h similarity index 100% rename from source/common/utility/strnatcmp.h rename to source/core/utility/strnatcmp.h diff --git a/source/common/utility/superfasthash.cpp b/source/core/utility/superfasthash.cpp similarity index 100% rename from source/common/utility/superfasthash.cpp rename to source/core/utility/superfasthash.cpp diff --git a/source/common/utility/superfasthash.h b/source/core/utility/superfasthash.h similarity index 100% rename from source/common/utility/superfasthash.h rename to source/core/utility/superfasthash.h diff --git a/source/common/utility/tarray.h b/source/core/utility/tarray.h similarity index 100% rename from source/common/utility/tarray.h rename to source/core/utility/tarray.h diff --git a/source/common/utility/templates.h b/source/core/utility/templates.h similarity index 100% rename from source/common/utility/templates.h rename to source/core/utility/templates.h diff --git a/source/common/utility/tflags.h b/source/core/utility/tflags.h similarity index 100% rename from source/common/utility/tflags.h rename to source/core/utility/tflags.h diff --git a/source/common/utility/utf8.cpp b/source/core/utility/utf8.cpp similarity index 100% rename from source/common/utility/utf8.cpp rename to source/core/utility/utf8.cpp diff --git a/source/common/utility/utf8.h b/source/core/utility/utf8.h similarity index 100% rename from source/common/utility/utf8.h rename to source/core/utility/utf8.h diff --git a/source/common/utility/vectors.h b/source/core/utility/vectors.h similarity index 100% rename from source/common/utility/vectors.h rename to source/core/utility/vectors.h diff --git a/source/common/utility/w_zip.h b/source/core/utility/w_zip.h similarity index 100% rename from source/common/utility/w_zip.h rename to source/core/utility/w_zip.h diff --git a/source/common/utility/xs_Float.h b/source/core/utility/xs_Float.h similarity index 100% rename from source/common/utility/xs_Float.h rename to source/core/utility/xs_Float.h diff --git a/source/common/utility/zstrformat.cpp b/source/core/utility/zstrformat.cpp similarity index 100% rename from source/common/utility/zstrformat.cpp rename to source/core/utility/zstrformat.cpp diff --git a/source/common/utility/zstring.cpp b/source/core/utility/zstring.cpp similarity index 100% rename from source/common/utility/zstring.cpp rename to source/core/utility/zstring.cpp diff --git a/source/common/utility/zstring.h b/source/core/utility/zstring.h similarity index 100% rename from source/common/utility/zstring.h rename to source/core/utility/zstring.h diff --git a/source/common/version.h b/source/core/version.h similarity index 100% rename from source/common/version.h rename to source/core/version.h diff --git a/source/exhumed/src/exhumed.cpp b/source/exhumed/src/exhumed.cpp index a8a0b5ef2..ddde2d461 100644 --- a/source/exhumed/src/exhumed.cpp +++ b/source/exhumed/src/exhumed.cpp @@ -75,7 +75,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "savegamehelp.h" #include "c_dispatch.h" #include "s_soundinternal.h" -#include "common/menu/menu.h" +#include "core/menu/menu.h" BEGIN_PS_NS diff --git a/source/platform/posix/sdl/hardware.cpp b/source/platform/posix/sdl/hardware.cpp index d9b8ac6a6..819eefd82 100644 --- a/source/platform/posix/sdl/hardware.cpp +++ b/source/platform/posix/sdl/hardware.cpp @@ -41,7 +41,7 @@ #include "v_text.h" #include "m_argv.h" #include "c_console.h" -#include "common/utility/printf.h" +#include "core/utility/printf.h" IVideo *Video; diff --git a/source/platform/posix/sdl/i_input.cpp b/source/platform/posix/sdl/i_input.cpp index ac01ebcb9..118b53b58 100644 --- a/source/platform/posix/sdl/i_input.cpp +++ b/source/platform/posix/sdl/i_input.cpp @@ -40,7 +40,7 @@ #include "c_dispatch.h" #include "dikeys.h" #include "utf8.h" -#include "common/console/keydef.h" +#include "core/console/keydef.h" #include "menu/menu.h" static void I_CheckNativeMouse (); diff --git a/source/platform/posix/sdl/i_main.cpp b/source/platform/posix/sdl/i_main.cpp index b0e2ce978..e37828281 100644 --- a/source/platform/posix/sdl/i_main.cpp +++ b/source/platform/posix/sdl/i_main.cpp @@ -46,7 +46,7 @@ #include "version.h" #include "cmdlib.h" #include "i_system.h" -#include "common/gamecontrol.h" +#include "core/gamecontrol.h" // MACROS ------------------------------------------------------------------ diff --git a/source/platform/win32/gameres.rc b/source/platform/win32/gameres.rc index cf8c924ec..a4e7f1b00 100644 --- a/source/platform/win32/gameres.rc +++ b/source/platform/win32/gameres.rc @@ -1,6 +1,6 @@ #include "afxres.h" #include "resource.h" -#include "../../common/version.h" +#include "../../core/version.h" #include "../../gitinfo.h" IDI_ICON1 ICON "game_icon.ico" diff --git a/source/sw/src/osdcmds.cpp b/source/sw/src/osdcmds.cpp index d91141b86..548e69557 100644 --- a/source/sw/src/osdcmds.cpp +++ b/source/sw/src/osdcmds.cpp @@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "gstrings.h" #include "common.h" -#include "common/2d/v_text.h" +#include "core/2d/v_text.h" #include "cheats.h" #include "demo.h" // g_firstDemoFile[]