diff --git a/source/cart_hw/areplay.c b/core/cart_hw/areplay.c
similarity index 100%
rename from source/cart_hw/areplay.c
rename to core/cart_hw/areplay.c
diff --git a/source/cart_hw/areplay.h b/core/cart_hw/areplay.h
similarity index 100%
rename from source/cart_hw/areplay.h
rename to core/cart_hw/areplay.h
diff --git a/source/cart_hw/eeprom_93c.c b/core/cart_hw/eeprom_93c.c
similarity index 100%
rename from source/cart_hw/eeprom_93c.c
rename to core/cart_hw/eeprom_93c.c
diff --git a/source/cart_hw/eeprom_93c.h b/core/cart_hw/eeprom_93c.h
similarity index 100%
rename from source/cart_hw/eeprom_93c.h
rename to core/cart_hw/eeprom_93c.h
diff --git a/source/cart_hw/eeprom_i2c.c b/core/cart_hw/eeprom_i2c.c
similarity index 100%
rename from source/cart_hw/eeprom_i2c.c
rename to core/cart_hw/eeprom_i2c.c
diff --git a/source/cart_hw/eeprom_i2c.h b/core/cart_hw/eeprom_i2c.h
similarity index 100%
rename from source/cart_hw/eeprom_i2c.h
rename to core/cart_hw/eeprom_i2c.h
diff --git a/source/cart_hw/eeprom_spi.c b/core/cart_hw/eeprom_spi.c
similarity index 100%
rename from source/cart_hw/eeprom_spi.c
rename to core/cart_hw/eeprom_spi.c
diff --git a/source/cart_hw/eeprom_spi.h b/core/cart_hw/eeprom_spi.h
similarity index 100%
rename from source/cart_hw/eeprom_spi.h
rename to core/cart_hw/eeprom_spi.h
diff --git a/source/cart_hw/ggenie.c b/core/cart_hw/ggenie.c
similarity index 100%
rename from source/cart_hw/ggenie.c
rename to core/cart_hw/ggenie.c
diff --git a/source/cart_hw/ggenie.h b/core/cart_hw/ggenie.h
similarity index 100%
rename from source/cart_hw/ggenie.h
rename to core/cart_hw/ggenie.h
diff --git a/source/cart_hw/md_cart.c b/core/cart_hw/md_cart.c
similarity index 100%
rename from source/cart_hw/md_cart.c
rename to core/cart_hw/md_cart.c
diff --git a/source/cart_hw/md_cart.h b/core/cart_hw/md_cart.h
similarity index 100%
rename from source/cart_hw/md_cart.h
rename to core/cart_hw/md_cart.h
diff --git a/source/cart_hw/sms_cart.c b/core/cart_hw/sms_cart.c
similarity index 100%
rename from source/cart_hw/sms_cart.c
rename to core/cart_hw/sms_cart.c
diff --git a/source/cart_hw/sms_cart.h b/core/cart_hw/sms_cart.h
similarity index 100%
rename from source/cart_hw/sms_cart.h
rename to core/cart_hw/sms_cart.h
diff --git a/source/cart_hw/sram.c b/core/cart_hw/sram.c
similarity index 100%
rename from source/cart_hw/sram.c
rename to core/cart_hw/sram.c
diff --git a/source/cart_hw/sram.h b/core/cart_hw/sram.h
similarity index 100%
rename from source/cart_hw/sram.h
rename to core/cart_hw/sram.h
diff --git a/source/cart_hw/svp/imageformat.txt b/core/cart_hw/svp/imageformat.txt
similarity index 100%
rename from source/cart_hw/svp/imageformat.txt
rename to core/cart_hw/svp/imageformat.txt
diff --git a/source/cart_hw/svp/ssp16.c b/core/cart_hw/svp/ssp16.c
similarity index 100%
rename from source/cart_hw/svp/ssp16.c
rename to core/cart_hw/svp/ssp16.c
diff --git a/source/cart_hw/svp/ssp16.h b/core/cart_hw/svp/ssp16.h
similarity index 100%
rename from source/cart_hw/svp/ssp16.h
rename to core/cart_hw/svp/ssp16.h
diff --git a/source/cart_hw/svp/svp.c b/core/cart_hw/svp/svp.c
similarity index 100%
rename from source/cart_hw/svp/svp.c
rename to core/cart_hw/svp/svp.c
diff --git a/source/cart_hw/svp/svp.h b/core/cart_hw/svp/svp.h
similarity index 100%
rename from source/cart_hw/svp/svp.h
rename to core/cart_hw/svp/svp.h
diff --git a/source/cart_hw/svp/svpdoc.txt b/core/cart_hw/svp/svpdoc.txt
similarity index 100%
rename from source/cart_hw/svp/svpdoc.txt
rename to core/cart_hw/svp/svpdoc.txt
diff --git a/source/cd_hw/cd_cart.c b/core/cd_hw/cd_cart.c
similarity index 100%
rename from source/cd_hw/cd_cart.c
rename to core/cd_hw/cd_cart.c
diff --git a/source/cd_hw/cd_cart.h b/core/cd_hw/cd_cart.h
similarity index 100%
rename from source/cd_hw/cd_cart.h
rename to core/cd_hw/cd_cart.h
diff --git a/source/cd_hw/cdc.c b/core/cd_hw/cdc.c
similarity index 100%
rename from source/cd_hw/cdc.c
rename to core/cd_hw/cdc.c
diff --git a/source/cd_hw/cdc.h b/core/cd_hw/cdc.h
similarity index 100%
rename from source/cd_hw/cdc.h
rename to core/cd_hw/cdc.h
diff --git a/source/cd_hw/cdd.c b/core/cd_hw/cdd.c
similarity index 100%
rename from source/cd_hw/cdd.c
rename to core/cd_hw/cdd.c
diff --git a/source/cd_hw/cdd.h b/core/cd_hw/cdd.h
similarity index 100%
rename from source/cd_hw/cdd.h
rename to core/cd_hw/cdd.h
diff --git a/source/cd_hw/gfx.c b/core/cd_hw/gfx.c
similarity index 100%
rename from source/cd_hw/gfx.c
rename to core/cd_hw/gfx.c
diff --git a/source/cd_hw/gfx.h b/core/cd_hw/gfx.h
similarity index 100%
rename from source/cd_hw/gfx.h
rename to core/cd_hw/gfx.h
diff --git a/source/cd_hw/pcm.c b/core/cd_hw/pcm.c
similarity index 100%
rename from source/cd_hw/pcm.c
rename to core/cd_hw/pcm.c
diff --git a/source/cd_hw/pcm.h b/core/cd_hw/pcm.h
similarity index 100%
rename from source/cd_hw/pcm.h
rename to core/cd_hw/pcm.h
diff --git a/source/cd_hw/scd.c b/core/cd_hw/scd.c
similarity index 100%
rename from source/cd_hw/scd.c
rename to core/cd_hw/scd.c
diff --git a/source/cd_hw/scd.h b/core/cd_hw/scd.h
similarity index 100%
rename from source/cd_hw/scd.h
rename to core/cd_hw/scd.h
diff --git a/source/genesis.c b/core/genesis.c
similarity index 100%
rename from source/genesis.c
rename to core/genesis.c
diff --git a/source/genesis.h b/core/genesis.h
similarity index 100%
rename from source/genesis.h
rename to core/genesis.h
diff --git a/source/hvc.h b/core/hvc.h
similarity index 100%
rename from source/hvc.h
rename to core/hvc.h
diff --git a/source/input_hw/activator.c b/core/input_hw/activator.c
similarity index 100%
rename from source/input_hw/activator.c
rename to core/input_hw/activator.c
diff --git a/source/input_hw/activator.h b/core/input_hw/activator.h
similarity index 100%
rename from source/input_hw/activator.h
rename to core/input_hw/activator.h
diff --git a/source/input_hw/gamepad.c b/core/input_hw/gamepad.c
similarity index 100%
rename from source/input_hw/gamepad.c
rename to core/input_hw/gamepad.c
diff --git a/source/input_hw/gamepad.h b/core/input_hw/gamepad.h
similarity index 100%
rename from source/input_hw/gamepad.h
rename to core/input_hw/gamepad.h
diff --git a/source/input_hw/input.c b/core/input_hw/input.c
similarity index 100%
rename from source/input_hw/input.c
rename to core/input_hw/input.c
diff --git a/source/input_hw/input.h b/core/input_hw/input.h
similarity index 100%
rename from source/input_hw/input.h
rename to core/input_hw/input.h
diff --git a/source/input_hw/lightgun.c b/core/input_hw/lightgun.c
similarity index 100%
rename from source/input_hw/lightgun.c
rename to core/input_hw/lightgun.c
diff --git a/source/input_hw/lightgun.h b/core/input_hw/lightgun.h
similarity index 100%
rename from source/input_hw/lightgun.h
rename to core/input_hw/lightgun.h
diff --git a/source/input_hw/mouse.c b/core/input_hw/mouse.c
similarity index 100%
rename from source/input_hw/mouse.c
rename to core/input_hw/mouse.c
diff --git a/source/input_hw/mouse.h b/core/input_hw/mouse.h
similarity index 100%
rename from source/input_hw/mouse.h
rename to core/input_hw/mouse.h
diff --git a/source/input_hw/paddle.c b/core/input_hw/paddle.c
similarity index 100%
rename from source/input_hw/paddle.c
rename to core/input_hw/paddle.c
diff --git a/source/input_hw/paddle.h b/core/input_hw/paddle.h
similarity index 100%
rename from source/input_hw/paddle.h
rename to core/input_hw/paddle.h
diff --git a/source/input_hw/sportspad.c b/core/input_hw/sportspad.c
similarity index 100%
rename from source/input_hw/sportspad.c
rename to core/input_hw/sportspad.c
diff --git a/source/input_hw/sportspad.h b/core/input_hw/sportspad.h
similarity index 100%
rename from source/input_hw/sportspad.h
rename to core/input_hw/sportspad.h
diff --git a/source/input_hw/teamplayer.c b/core/input_hw/teamplayer.c
similarity index 100%
rename from source/input_hw/teamplayer.c
rename to core/input_hw/teamplayer.c
diff --git a/source/input_hw/teamplayer.h b/core/input_hw/teamplayer.h
similarity index 100%
rename from source/input_hw/teamplayer.h
rename to core/input_hw/teamplayer.h
diff --git a/source/input_hw/terebi_oekaki.c b/core/input_hw/terebi_oekaki.c
similarity index 100%
rename from source/input_hw/terebi_oekaki.c
rename to core/input_hw/terebi_oekaki.c
diff --git a/source/input_hw/terebi_oekaki.h b/core/input_hw/terebi_oekaki.h
similarity index 100%
rename from source/input_hw/terebi_oekaki.h
rename to core/input_hw/terebi_oekaki.h
diff --git a/source/input_hw/xe_a1p.c b/core/input_hw/xe_a1p.c
similarity index 100%
rename from source/input_hw/xe_a1p.c
rename to core/input_hw/xe_a1p.c
diff --git a/source/input_hw/xe_a1p.h b/core/input_hw/xe_a1p.h
similarity index 100%
rename from source/input_hw/xe_a1p.h
rename to core/input_hw/xe_a1p.h
diff --git a/source/io_ctrl.c b/core/io_ctrl.c
similarity index 100%
rename from source/io_ctrl.c
rename to core/io_ctrl.c
diff --git a/source/io_ctrl.h b/core/io_ctrl.h
similarity index 100%
rename from source/io_ctrl.h
rename to core/io_ctrl.h
diff --git a/source/loadrom.c b/core/loadrom.c
similarity index 100%
rename from source/loadrom.c
rename to core/loadrom.c
diff --git a/source/loadrom.h b/core/loadrom.h
similarity index 100%
rename from source/loadrom.h
rename to core/loadrom.h
diff --git a/source/m68k/m68k.h b/core/m68k/m68k.h
similarity index 100%
rename from source/m68k/m68k.h
rename to core/m68k/m68k.h
diff --git a/source/m68k/m68kconf.h b/core/m68k/m68kconf.h
similarity index 100%
rename from source/m68k/m68kconf.h
rename to core/m68k/m68kconf.h
diff --git a/source/m68k/m68kcpu.c b/core/m68k/m68kcpu.c
similarity index 100%
rename from source/m68k/m68kcpu.c
rename to core/m68k/m68kcpu.c
diff --git a/source/m68k/m68kcpu.h b/core/m68k/m68kcpu.h
similarity index 100%
rename from source/m68k/m68kcpu.h
rename to core/m68k/m68kcpu.h
diff --git a/source/m68k/m68ki_cycles.h b/core/m68k/m68ki_cycles.h
similarity index 100%
rename from source/m68k/m68ki_cycles.h
rename to core/m68k/m68ki_cycles.h
diff --git a/source/m68k/m68ki_instruction_jump_table.h b/core/m68k/m68ki_instruction_jump_table.h
similarity index 100%
rename from source/m68k/m68ki_instruction_jump_table.h
rename to core/m68k/m68ki_instruction_jump_table.h
diff --git a/source/m68k/m68kops.h b/core/m68k/m68kops.h
similarity index 100%
rename from source/m68k/m68kops.h
rename to core/m68k/m68kops.h
diff --git a/source/m68k/readme.txt b/core/m68k/readme.txt
similarity index 100%
rename from source/m68k/readme.txt
rename to core/m68k/readme.txt
diff --git a/source/m68k/s68kconf.h b/core/m68k/s68kconf.h
similarity index 100%
rename from source/m68k/s68kconf.h
rename to core/m68k/s68kconf.h
diff --git a/source/m68k/s68kcpu.c b/core/m68k/s68kcpu.c
similarity index 100%
rename from source/m68k/s68kcpu.c
rename to core/m68k/s68kcpu.c
diff --git a/source/m68k/s68ki_cycles.h b/core/m68k/s68ki_cycles.h
similarity index 100%
rename from source/m68k/s68ki_cycles.h
rename to core/m68k/s68ki_cycles.h
diff --git a/source/macros.h b/core/macros.h
similarity index 100%
rename from source/macros.h
rename to core/macros.h
diff --git a/source/mem68k.c b/core/mem68k.c
similarity index 100%
rename from source/mem68k.c
rename to core/mem68k.c
diff --git a/source/mem68k.h b/core/mem68k.h
similarity index 100%
rename from source/mem68k.h
rename to core/mem68k.h
diff --git a/source/membnk.c b/core/membnk.c
similarity index 100%
rename from source/membnk.c
rename to core/membnk.c
diff --git a/source/membnk.h b/core/membnk.h
similarity index 100%
rename from source/membnk.h
rename to core/membnk.h
diff --git a/source/memz80.c b/core/memz80.c
similarity index 100%
rename from source/memz80.c
rename to core/memz80.c
diff --git a/source/memz80.h b/core/memz80.h
similarity index 100%
rename from source/memz80.h
rename to core/memz80.h
diff --git a/source/ntsc/changes.txt b/core/ntsc/changes.txt
similarity index 100%
rename from source/ntsc/changes.txt
rename to core/ntsc/changes.txt
diff --git a/source/ntsc/license.txt b/core/ntsc/license.txt
similarity index 100%
rename from source/ntsc/license.txt
rename to core/ntsc/license.txt
diff --git a/source/ntsc/md_ntsc.c b/core/ntsc/md_ntsc.c
similarity index 100%
rename from source/ntsc/md_ntsc.c
rename to core/ntsc/md_ntsc.c
diff --git a/source/ntsc/md_ntsc.h b/core/ntsc/md_ntsc.h
similarity index 100%
rename from source/ntsc/md_ntsc.h
rename to core/ntsc/md_ntsc.h
diff --git a/source/ntsc/md_ntsc_config.h b/core/ntsc/md_ntsc_config.h
similarity index 100%
rename from source/ntsc/md_ntsc_config.h
rename to core/ntsc/md_ntsc_config.h
diff --git a/source/ntsc/md_ntsc_impl.h b/core/ntsc/md_ntsc_impl.h
similarity index 100%
rename from source/ntsc/md_ntsc_impl.h
rename to core/ntsc/md_ntsc_impl.h
diff --git a/source/ntsc/readme.txt b/core/ntsc/readme.txt
similarity index 100%
rename from source/ntsc/readme.txt
rename to core/ntsc/readme.txt
diff --git a/source/ntsc/sms_ntsc.c b/core/ntsc/sms_ntsc.c
similarity index 100%
rename from source/ntsc/sms_ntsc.c
rename to core/ntsc/sms_ntsc.c
diff --git a/source/ntsc/sms_ntsc.h b/core/ntsc/sms_ntsc.h
similarity index 100%
rename from source/ntsc/sms_ntsc.h
rename to core/ntsc/sms_ntsc.h
diff --git a/source/ntsc/sms_ntsc.txt b/core/ntsc/sms_ntsc.txt
similarity index 100%
rename from source/ntsc/sms_ntsc.txt
rename to core/ntsc/sms_ntsc.txt
diff --git a/source/ntsc/sms_ntsc_config.h b/core/ntsc/sms_ntsc_config.h
similarity index 100%
rename from source/ntsc/sms_ntsc_config.h
rename to core/ntsc/sms_ntsc_config.h
diff --git a/source/ntsc/sms_ntsc_impl.h b/core/ntsc/sms_ntsc_impl.h
similarity index 100%
rename from source/ntsc/sms_ntsc_impl.h
rename to core/ntsc/sms_ntsc_impl.h
diff --git a/source/shared.h b/core/shared.h
similarity index 100%
rename from source/shared.h
rename to core/shared.h
diff --git a/source/sound/blip_buf.c b/core/sound/blip_buf.c
similarity index 100%
rename from source/sound/blip_buf.c
rename to core/sound/blip_buf.c
diff --git a/source/sound/blip_buf.h b/core/sound/blip_buf.h
similarity index 100%
rename from source/sound/blip_buf.h
rename to core/sound/blip_buf.h
diff --git a/source/sound/eq.c b/core/sound/eq.c
similarity index 100%
rename from source/sound/eq.c
rename to core/sound/eq.c
diff --git a/source/sound/eq.h b/core/sound/eq.h
similarity index 100%
rename from source/sound/eq.h
rename to core/sound/eq.h
diff --git a/source/sound/sn76489.c b/core/sound/sn76489.c
similarity index 100%
rename from source/sound/sn76489.c
rename to core/sound/sn76489.c
diff --git a/source/sound/sn76489.h b/core/sound/sn76489.h
similarity index 100%
rename from source/sound/sn76489.h
rename to core/sound/sn76489.h
diff --git a/source/sound/sound.c b/core/sound/sound.c
similarity index 100%
rename from source/sound/sound.c
rename to core/sound/sound.c
diff --git a/source/sound/sound.h b/core/sound/sound.h
similarity index 100%
rename from source/sound/sound.h
rename to core/sound/sound.h
diff --git a/source/sound/ym2413.c b/core/sound/ym2413.c
similarity index 100%
rename from source/sound/ym2413.c
rename to core/sound/ym2413.c
diff --git a/source/sound/ym2413.h b/core/sound/ym2413.h
similarity index 100%
rename from source/sound/ym2413.h
rename to core/sound/ym2413.h
diff --git a/source/sound/ym2612.c b/core/sound/ym2612.c
similarity index 100%
rename from source/sound/ym2612.c
rename to core/sound/ym2612.c
diff --git a/source/sound/ym2612.h b/core/sound/ym2612.h
similarity index 100%
rename from source/sound/ym2612.h
rename to core/sound/ym2612.h
diff --git a/source/state.c b/core/state.c
similarity index 100%
rename from source/state.c
rename to core/state.c
diff --git a/source/state.h b/core/state.h
similarity index 100%
rename from source/state.h
rename to core/state.h
diff --git a/source/system.c b/core/system.c
similarity index 100%
rename from source/system.c
rename to core/system.c
diff --git a/source/system.h b/core/system.h
similarity index 100%
rename from source/system.h
rename to core/system.h
diff --git a/source/tremor/CHANGELOG b/core/tremor/CHANGELOG
similarity index 100%
rename from source/tremor/CHANGELOG
rename to core/tremor/CHANGELOG
diff --git a/source/tremor/COPYING b/core/tremor/COPYING
similarity index 100%
rename from source/tremor/COPYING
rename to core/tremor/COPYING
diff --git a/source/tremor/README b/core/tremor/README
similarity index 100%
rename from source/tremor/README
rename to core/tremor/README
diff --git a/source/tremor/Version_script.in b/core/tremor/Version_script.in
similarity index 100%
rename from source/tremor/Version_script.in
rename to core/tremor/Version_script.in
diff --git a/source/tremor/asm_arm.h b/core/tremor/asm_arm.h
similarity index 100%
rename from source/tremor/asm_arm.h
rename to core/tremor/asm_arm.h
diff --git a/source/tremor/backends.h b/core/tremor/backends.h
similarity index 100%
rename from source/tremor/backends.h
rename to core/tremor/backends.h
diff --git a/source/tremor/bitwise.c b/core/tremor/bitwise.c
similarity index 100%
rename from source/tremor/bitwise.c
rename to core/tremor/bitwise.c
diff --git a/source/tremor/block.c b/core/tremor/block.c
similarity index 100%
rename from source/tremor/block.c
rename to core/tremor/block.c
diff --git a/source/tremor/block.h b/core/tremor/block.h
similarity index 100%
rename from source/tremor/block.h
rename to core/tremor/block.h
diff --git a/source/tremor/codebook.c b/core/tremor/codebook.c
similarity index 100%
rename from source/tremor/codebook.c
rename to core/tremor/codebook.c
diff --git a/source/tremor/codebook.h b/core/tremor/codebook.h
similarity index 100%
rename from source/tremor/codebook.h
rename to core/tremor/codebook.h
diff --git a/source/tremor/codec_internal.h b/core/tremor/codec_internal.h
similarity index 100%
rename from source/tremor/codec_internal.h
rename to core/tremor/codec_internal.h
diff --git a/source/tremor/config_types.h b/core/tremor/config_types.h
similarity index 100%
rename from source/tremor/config_types.h
rename to core/tremor/config_types.h
diff --git a/source/tremor/configure.in b/core/tremor/configure.in
similarity index 100%
rename from source/tremor/configure.in
rename to core/tremor/configure.in
diff --git a/source/tremor/floor0.c b/core/tremor/floor0.c
similarity index 100%
rename from source/tremor/floor0.c
rename to core/tremor/floor0.c
diff --git a/source/tremor/floor1.c b/core/tremor/floor1.c
similarity index 100%
rename from source/tremor/floor1.c
rename to core/tremor/floor1.c
diff --git a/source/tremor/framing.c b/core/tremor/framing.c
similarity index 100%
rename from source/tremor/framing.c
rename to core/tremor/framing.c
diff --git a/source/tremor/info.c b/core/tremor/info.c
similarity index 100%
rename from source/tremor/info.c
rename to core/tremor/info.c
diff --git a/source/tremor/ivorbiscodec.h b/core/tremor/ivorbiscodec.h
similarity index 100%
rename from source/tremor/ivorbiscodec.h
rename to core/tremor/ivorbiscodec.h
diff --git a/source/tremor/ivorbisfile.h b/core/tremor/ivorbisfile.h
similarity index 100%
rename from source/tremor/ivorbisfile.h
rename to core/tremor/ivorbisfile.h
diff --git a/source/tremor/lsp_lookup.h b/core/tremor/lsp_lookup.h
similarity index 100%
rename from source/tremor/lsp_lookup.h
rename to core/tremor/lsp_lookup.h
diff --git a/source/tremor/mapping0.c b/core/tremor/mapping0.c
similarity index 100%
rename from source/tremor/mapping0.c
rename to core/tremor/mapping0.c
diff --git a/source/tremor/mdct.c b/core/tremor/mdct.c
similarity index 100%
rename from source/tremor/mdct.c
rename to core/tremor/mdct.c
diff --git a/source/tremor/mdct.h b/core/tremor/mdct.h
similarity index 100%
rename from source/tremor/mdct.h
rename to core/tremor/mdct.h
diff --git a/source/tremor/mdct_lookup.h b/core/tremor/mdct_lookup.h
similarity index 100%
rename from source/tremor/mdct_lookup.h
rename to core/tremor/mdct_lookup.h
diff --git a/source/tremor/misc.h b/core/tremor/misc.h
similarity index 100%
rename from source/tremor/misc.h
rename to core/tremor/misc.h
diff --git a/source/tremor/ogg.h b/core/tremor/ogg.h
similarity index 100%
rename from source/tremor/ogg.h
rename to core/tremor/ogg.h
diff --git a/source/tremor/os.h b/core/tremor/os.h
similarity index 100%
rename from source/tremor/os.h
rename to core/tremor/os.h
diff --git a/source/tremor/os_types.h b/core/tremor/os_types.h
similarity index 100%
rename from source/tremor/os_types.h
rename to core/tremor/os_types.h
diff --git a/source/tremor/registry.c b/core/tremor/registry.c
similarity index 100%
rename from source/tremor/registry.c
rename to core/tremor/registry.c
diff --git a/source/tremor/registry.h b/core/tremor/registry.h
similarity index 100%
rename from source/tremor/registry.h
rename to core/tremor/registry.h
diff --git a/source/tremor/res012.c b/core/tremor/res012.c
similarity index 100%
rename from source/tremor/res012.c
rename to core/tremor/res012.c
diff --git a/source/tremor/sharedbook.c b/core/tremor/sharedbook.c
similarity index 100%
rename from source/tremor/sharedbook.c
rename to core/tremor/sharedbook.c
diff --git a/source/tremor/synthesis.c b/core/tremor/synthesis.c
similarity index 100%
rename from source/tremor/synthesis.c
rename to core/tremor/synthesis.c
diff --git a/source/tremor/vorbisfile.c b/core/tremor/vorbisfile.c
similarity index 100%
rename from source/tremor/vorbisfile.c
rename to core/tremor/vorbisfile.c
diff --git a/source/tremor/window.c b/core/tremor/window.c
similarity index 100%
rename from source/tremor/window.c
rename to core/tremor/window.c
diff --git a/source/tremor/window.h b/core/tremor/window.h
similarity index 100%
rename from source/tremor/window.h
rename to core/tremor/window.h
diff --git a/source/tremor/window_lookup.h b/core/tremor/window_lookup.h
similarity index 100%
rename from source/tremor/window_lookup.h
rename to core/tremor/window_lookup.h
diff --git a/source/types.h b/core/types.h
similarity index 100%
rename from source/types.h
rename to core/types.h
diff --git a/source/vdp_ctrl.c b/core/vdp_ctrl.c
similarity index 100%
rename from source/vdp_ctrl.c
rename to core/vdp_ctrl.c
diff --git a/source/vdp_ctrl.h b/core/vdp_ctrl.h
similarity index 100%
rename from source/vdp_ctrl.h
rename to core/vdp_ctrl.h
diff --git a/source/vdp_render.c b/core/vdp_render.c
similarity index 100%
rename from source/vdp_render.c
rename to core/vdp_render.c
diff --git a/source/vdp_render.h b/core/vdp_render.h
similarity index 100%
rename from source/vdp_render.h
rename to core/vdp_render.h
diff --git a/source/z80/osd_cpu.h b/core/z80/osd_cpu.h
similarity index 100%
rename from source/z80/osd_cpu.h
rename to core/z80/osd_cpu.h
diff --git a/source/z80/z80.c b/core/z80/z80.c
similarity index 100%
rename from source/z80/z80.c
rename to core/z80/z80.c
diff --git a/source/z80/z80.h b/core/z80/z80.h
similarity index 100%
rename from source/z80/z80.h
rename to core/z80/z80.h