diff --git a/CONFIG.md b/CONFIG.md index 968487c8..9c1fa54c 100644 --- a/CONFIG.md +++ b/CONFIG.md @@ -3,11 +3,11 @@ It's not possible to provide ROM builds that suit everyone needs - therefore configuration files were introduced, few predefined configurations are provided with sane defaults: -* [`c64/,,config_custom.s`](c64/,,config_custom.s) -* [`c64/,,config_generic.s`](c64/,,config_generic.s) -* [`c64/,,config_mega65.s`](c64/,,config_mega65.s) -* [`c64/,,config_ultimate64.s`](c64/,,config_ultimate64.s) -* [`c64/,,config_testing.s`](c64/,,config_testing.s) +* [`src/,,config_custom.s`](src/,,config_custom.s) +* [`src/,,config_generic.s`](src/,,config_generic.s) +* [`src/,,config_mega65.s`](src/,,config_mega65.s) +* [`src/,,config_ultimate64.s`](src/,,config_ultimate64.s) +* [`src/,,config_testing.s`](src/,,config_testing.s) Just edit them and recompile the project. To enable particular option - uncomment it by removing leading `//` from before `#define` directive (as you probably guessed, commenting out disables it). Some options are followed by constants - you can change them too to further fine-tune the build. diff --git a/Makefile b/Makefile index e3102ca5..92dff008 100644 --- a/Makefile +++ b/Makefile @@ -6,51 +6,51 @@ TESTTAPE = testsuite/testtape-c64-pal-turbo.tap # Source files -SRCDIR_COMMON = c64/aliases +SRCDIR_COMMON = src/aliases SRCDIR_BASIC = $(SRCDIR_COMMON) \ - c64/basic \ - c64/basic/,stubs \ - c64/basic/,stubs_math \ - c64/basic/assets \ - c64/basic/basic_commands \ - c64/basic/basic_commands_CC \ - c64/basic/basic_commands_CD \ - c64/basic/basic_operators \ - c64/basic/basic_functions \ - c64/basic/board_m65 \ - c64/basic/board_x16 \ - c64/basic/engine \ - c64/basic/init \ - c64/basic/math \ - c64/basic/math_consts \ - c64/basic/math_mov \ - c64/basic/memory \ - c64/basic/print \ - c64/basic/rom_revision \ - c64/basic/tokenizer \ - c64/basic/wedge + src/basic \ + src/basic/,stubs \ + src/basic/,stubs_math \ + src/basic/assets \ + src/basic/basic_commands \ + src/basic/basic_commands_CC \ + src/basic/basic_commands_CD \ + src/basic/basic_operators \ + src/basic/basic_functions \ + src/basic/board_m65 \ + src/basic/board_x16 \ + src/basic/engine \ + src/basic/init \ + src/basic/math \ + src/basic/math_consts \ + src/basic/math_mov \ + src/basic/memory \ + src/basic/print \ + src/basic/rom_revision \ + src/basic/tokenizer \ + src/basic/wedge SRCDIR_KERNAL = $(SRCDIR_COMMON) \ - c64/kernal \ - c64/kernal/,stubs \ - c64/kernal/assets \ - c64/kernal/board_m65 \ - c64/kernal/board_x16 \ - c64/kernal/iec \ - c64/kernal/iec_fast \ - c64/kernal/init \ - c64/kernal/interrupts \ - c64/kernal/iostack \ - c64/kernal/jumptable \ - c64/kernal/keyboard \ - c64/kernal/memory \ - c64/kernal/print \ - c64/kernal/rom_revision \ - c64/kernal/rs232 \ - c64/kernal/screen \ - c64/kernal/tape \ - c64/kernal/time + src/kernal \ + src/kernal/,stubs \ + src/kernal/assets \ + src/kernal/board_m65 \ + src/kernal/board_x16 \ + src/kernal/iec \ + src/kernal/iec_fast \ + src/kernal/init \ + src/kernal/interrupts \ + src/kernal/iostack \ + src/kernal/jumptable \ + src/kernal/keyboard \ + src/kernal/memory \ + src/kernal/print \ + src/kernal/rom_revision \ + src/kernal/rs232 \ + src/kernal/screen \ + src/kernal/tape \ + src/kernal/time SRC_BASIC = $(foreach dir,$(SRCDIR_BASIC),$(wildcard $(dir)/*.s)) SRC_KERNAL = $(foreach dir,$(SRCDIR_KERNAL),$(wildcard $(dir)/*.s)) @@ -72,12 +72,12 @@ DIR_X16 = build/target_cx16 # List of config files -CFG_CUS = c64/,,config_custom.s -CFG_GEN = c64/,,config_generic.s -CFG_TST = c64/,,config_testing.s -CFG_M65 = c64/,,config_mega65.s -CFG_U64 = c64/,,config_ultimate64.s -CFG_X16 = c64/,,config_cx16.s +CFG_CUS = src/,,config_custom.s +CFG_GEN = src/,,config_generic.s +CFG_TST = src/,,config_testing.s +CFG_M65 = src/,,config_mega65.s +CFG_U64 = src/,,config_ultimate64.s +CFG_X16 = src/,,config_cx16.s # List of files with generated strings @@ -168,7 +168,7 @@ fast: $(MAKE) -j64 --output-sync=target $(TARGET_LIST) $(EXT_TARGET_LIST) clean: - @rm -rf build c64/basic/combined.s c64/kernal/combined.s + @rm -rf build src/basic/combined.s src/kernal/combined.s updatebin: $(MAKE) -j64 --output-sync=target $(TARGET_LIST) $(TOOL_RELEASE) @@ -306,13 +306,13 @@ GEN_STR_cx16 = $(GEN_STR_X16) build/target_%/OUTB_x.BIN build/target_%/BASIC_combined.vs: @mkdir -p build/target_$* @rm -f $@* build/target_$*/BASIC* - @$(TOOL_BUILD_SEGMENT) -a ../../$(TOOL_ASSEMBLER) -r STD -s BASIC -i BASIC-$* -o OUTB_x.BIN -d build/target_$* -l a000 -h e4d2 c64/,,config_$*.s $(SRCDIR_BASIC) $(GEN_BASIC) $(GEN_STR_$*) + @$(TOOL_BUILD_SEGMENT) -a ../../$(TOOL_ASSEMBLER) -r STD -s BASIC -i BASIC-$* -o OUTB_x.BIN -d build/target_$* -l a000 -h e4d2 src/,,config_$*.s $(SRCDIR_BASIC) $(GEN_BASIC) $(GEN_STR_$*) .PRECIOUS: build/target_%/OUTK_x.BIN build/target_%/KERNAL_combined.vs build/target_%/KERNAL_combined.sym build/target_%/OUTK_x.BIN build/target_%/KERNAL_combined.vs build/target_%/KERNAL_combined.sym: @mkdir -p build/target_$* @rm -f $@* build/target_$*/KERNAL* - @$(TOOL_BUILD_SEGMENT) -a ../../$(TOOL_ASSEMBLER) -r STD -s KERNAL -i KERNAL-$* -o OUTK_x.BIN -d build/target_$* -l e4d3 -h ffff c64/,,config_$*.s $(SRCDIR_KERNAL) $(GEN_KERNAL) $(GEN_STR_$*) + @$(TOOL_BUILD_SEGMENT) -a ../../$(TOOL_ASSEMBLER) -r STD -s KERNAL -i KERNAL-$* -o OUTK_x.BIN -d build/target_$* -l e4d3 -h ffff src/,,config_$*.s $(SRCDIR_KERNAL) $(GEN_KERNAL) $(GEN_STR_$*) # Rules - BASIC and KERNAL intermediate files, for Mega65 diff --git a/STATUS.md b/STATUS.md index 384f08d8..145e4a86 100644 --- a/STATUS.md +++ b/STATUS.md @@ -145,7 +145,7 @@ Status of the various APIs and variables from the original ROMs ## Low memory locations (pages 0 - 3) -For the current status of the low memory location implementation andd usage check [this file](c64/aliases/,aliases_ram_lowmem.s). NOTE: available vector to certain routine does not mean that this routine is fully implemented! +For the current status of the low memory location implementation andd usage check [this file](src/aliases/,aliases_ram_lowmem.s). NOTE: available vector to certain routine does not mean that this routine is fully implemented! ## BASIC diff --git a/bin/basic_generic.rom b/bin/basic_generic.rom index 68bc99f4..90052287 100644 Binary files a/bin/basic_generic.rom and b/bin/basic_generic.rom differ diff --git a/bin/basic_ultimate64.rom b/bin/basic_ultimate64.rom index 4876d158..b84cd139 100644 Binary files a/bin/basic_ultimate64.rom and b/bin/basic_ultimate64.rom differ diff --git a/bin/kernal_generic.rom b/bin/kernal_generic.rom index 18729a72..06a5a7fb 100644 Binary files a/bin/kernal_generic.rom and b/bin/kernal_generic.rom differ diff --git a/bin/kernal_ultimate64.rom b/bin/kernal_ultimate64.rom index 0880452f..9f4108ff 100644 Binary files a/bin/kernal_ultimate64.rom and b/bin/kernal_ultimate64.rom differ diff --git a/bin/mega65.rom b/bin/mega65.rom index f70851d7..6c788321 100644 Binary files a/bin/mega65.rom and b/bin/mega65.rom differ diff --git a/bin/mega65_pxlfont.rom b/bin/mega65_pxlfont.rom index 91d86cbb..2b2c51e8 100644 Binary files a/bin/mega65_pxlfont.rom and b/bin/mega65_pxlfont.rom differ diff --git a/c64/,,config_custom.s b/src/,,config_custom.s similarity index 100% rename from c64/,,config_custom.s rename to src/,,config_custom.s diff --git a/c64/,,config_cx16.s b/src/,,config_cx16.s similarity index 100% rename from c64/,,config_cx16.s rename to src/,,config_cx16.s diff --git a/c64/,,config_generic.s b/src/,,config_generic.s similarity index 100% rename from c64/,,config_generic.s rename to src/,,config_generic.s diff --git a/c64/,,config_mega65.s b/src/,,config_mega65.s similarity index 100% rename from c64/,,config_mega65.s rename to src/,,config_mega65.s diff --git a/c64/,,config_testing.s b/src/,,config_testing.s similarity index 100% rename from c64/,,config_testing.s rename to src/,,config_testing.s diff --git a/c64/,,config_ultimate64.s b/src/,,config_ultimate64.s similarity index 100% rename from c64/,,config_ultimate64.s rename to src/,,config_ultimate64.s diff --git a/c64/aliases/,aliases_config.s b/src/aliases/,aliases_config.s similarity index 100% rename from c64/aliases/,aliases_config.s rename to src/aliases/,aliases_config.s diff --git a/c64/aliases/,aliases_cpu.s b/src/aliases/,aliases_cpu.s similarity index 100% rename from c64/aliases/,aliases_cpu.s rename to src/aliases/,aliases_cpu.s diff --git a/c64/aliases/,aliases_error_codes.s b/src/aliases/,aliases_error_codes.s similarity index 100% rename from c64/aliases/,aliases_error_codes.s rename to src/aliases/,aliases_error_codes.s diff --git a/c64/aliases/,aliases_hardware.s b/src/aliases/,aliases_hardware.s similarity index 100% rename from c64/aliases/,aliases_hardware.s rename to src/aliases/,aliases_hardware.s diff --git a/c64/aliases/,aliases_hardware_cx16.s b/src/aliases/,aliases_hardware_cx16.s similarity index 100% rename from c64/aliases/,aliases_hardware_cx16.s rename to src/aliases/,aliases_hardware_cx16.s diff --git a/c64/aliases/,aliases_petscii_codes.s b/src/aliases/,aliases_petscii_codes.s similarity index 100% rename from c64/aliases/,aliases_petscii_codes.s rename to src/aliases/,aliases_petscii_codes.s diff --git a/c64/aliases/,aliases_ram_lowmem.s b/src/aliases/,aliases_ram_lowmem.s similarity index 100% rename from c64/aliases/,aliases_ram_lowmem.s rename to src/aliases/,aliases_ram_lowmem.s diff --git a/c64/aliases/,aliases_rom_basic.s b/src/aliases/,aliases_rom_basic.s similarity index 100% rename from c64/aliases/,aliases_rom_basic.s rename to src/aliases/,aliases_rom_basic.s diff --git a/c64/aliases/,aliases_rom_cart.s b/src/aliases/,aliases_rom_cart.s similarity index 100% rename from c64/aliases/,aliases_rom_cart.s rename to src/aliases/,aliases_rom_cart.s diff --git a/c64/aliases/,aliases_rom_kernal.s b/src/aliases/,aliases_rom_kernal.s similarity index 100% rename from c64/aliases/,aliases_rom_kernal.s rename to src/aliases/,aliases_rom_kernal.s diff --git a/c64/basic/,aliases.s b/src/basic/,aliases.s similarity index 100% rename from c64/basic/,aliases.s rename to src/basic/,aliases.s diff --git a/c64/basic/,imports.s b/src/basic/,imports.s similarity index 100% rename from c64/basic/,imports.s rename to src/basic/,imports.s diff --git a/c64/basic/,stubs/a408.interop b/src/basic/,stubs/a408.interop similarity index 100% rename from c64/basic/,stubs/a408.interop rename to src/basic/,stubs/a408.interop diff --git a/c64/basic/,stubs/a408.reason.s b/src/basic/,stubs/a408.reason.s similarity index 100% rename from c64/basic/,stubs/a408.reason.s rename to src/basic/,stubs/a408.reason.s diff --git a/c64/basic/,stubs/a453.interop b/src/basic/,stubs/a453.interop similarity index 100% rename from c64/basic/,stubs/a453.interop rename to src/basic/,stubs/a453.interop diff --git a/c64/basic/,stubs/a453.unknown.s b/src/basic/,stubs/a453.unknown.s similarity index 100% rename from c64/basic/,stubs/a453.unknown.s rename to src/basic/,stubs/a453.unknown.s diff --git a/c64/basic/,stubs/a483.main.s b/src/basic/,stubs/a483.main.s similarity index 100% rename from c64/basic/,stubs/a483.main.s rename to src/basic/,stubs/a483.main.s diff --git a/c64/basic/,stubs/a57c.chrnch.s b/src/basic/,stubs/a57c.chrnch.s similarity index 100% rename from c64/basic/,stubs/a57c.chrnch.s rename to src/basic/,stubs/a57c.chrnch.s diff --git a/c64/basic/,stubs/a57c.interop b/src/basic/,stubs/a57c.interop similarity index 100% rename from c64/basic/,stubs/a57c.interop rename to src/basic/,stubs/a57c.interop diff --git a/c64/basic/,stubs/a644.interop b/src/basic/,stubs/a644.interop similarity index 100% rename from c64/basic/,stubs/a644.interop rename to src/basic/,stubs/a644.interop diff --git a/c64/basic/,stubs/a644.new.s b/src/basic/,stubs/a644.new.s similarity index 100% rename from c64/basic/,stubs/a644.new.s rename to src/basic/,stubs/a644.new.s diff --git a/c64/basic/,stubs/a659.interop b/src/basic/,stubs/a659.interop similarity index 100% rename from c64/basic/,stubs/a659.interop rename to src/basic/,stubs/a659.interop diff --git a/c64/basic/,stubs/a659.setcharptr.s b/src/basic/,stubs/a659.setcharptr.s similarity index 100% rename from c64/basic/,stubs/a659.setcharptr.s rename to src/basic/,stubs/a659.setcharptr.s diff --git a/c64/basic/,stubs/a71a.interop b/src/basic/,stubs/a71a.interop similarity index 100% rename from c64/basic/,stubs/a71a.interop rename to src/basic/,stubs/a71a.interop diff --git a/c64/basic/,stubs/a71a.qplop.s b/src/basic/,stubs/a71a.qplop.s similarity index 100% rename from c64/basic/,stubs/a71a.qplop.s rename to src/basic/,stubs/a71a.qplop.s diff --git a/c64/basic/,stubs/a7e4.gone.s b/src/basic/,stubs/a7e4.gone.s similarity index 100% rename from c64/basic/,stubs/a7e4.gone.s rename to src/basic/,stubs/a7e4.gone.s diff --git a/c64/basic/,stubs/a7e4.interop b/src/basic/,stubs/a7e4.interop similarity index 100% rename from c64/basic/,stubs/a7e4.interop rename to src/basic/,stubs/a7e4.interop diff --git a/c64/basic/,stubs/ae86.eval.s b/src/basic/,stubs/ae86.eval.s similarity index 100% rename from c64/basic/,stubs/ae86.eval.s rename to src/basic/,stubs/ae86.eval.s diff --git a/c64/basic/,stubs/ae86.interop b/src/basic/,stubs/ae86.interop similarity index 100% rename from c64/basic/,stubs/ae86.interop rename to src/basic/,stubs/ae86.interop diff --git a/c64/basic/,stubs/basic_adray1.s b/src/basic/,stubs/basic_adray1.s similarity index 100% rename from c64/basic/,stubs/basic_adray1.s rename to src/basic/,stubs/basic_adray1.s diff --git a/c64/basic/,stubs/basic_adray2.s b/src/basic/,stubs/basic_adray2.s similarity index 100% rename from c64/basic/,stubs/basic_adray2.s rename to src/basic/,stubs/basic_adray2.s diff --git a/c64/basic/,stubs/e38b.error.s b/src/basic/,stubs/e38b.error.s similarity index 100% rename from c64/basic/,stubs/e38b.error.s rename to src/basic/,stubs/e38b.error.s diff --git a/c64/basic/,stubs/e38b.interop b/src/basic/,stubs/e38b.interop similarity index 100% rename from c64/basic/,stubs/e38b.interop rename to src/basic/,stubs/e38b.interop diff --git a/c64/basic/,stubs/e3bf.init.s b/src/basic/,stubs/e3bf.init.s similarity index 100% rename from c64/basic/,stubs/e3bf.init.s rename to src/basic/,stubs/e3bf.init.s diff --git a/c64/basic/,stubs/e3bf.interop b/src/basic/,stubs/e3bf.interop similarity index 100% rename from c64/basic/,stubs/e3bf.interop rename to src/basic/,stubs/e3bf.interop diff --git a/c64/basic/,stubs/e453.interop b/src/basic/,stubs/e453.interop similarity index 100% rename from c64/basic/,stubs/e453.interop rename to src/basic/,stubs/e453.interop diff --git a/c64/basic/,stubs/e453.rvect.s b/src/basic/,stubs/e453.rvect.s similarity index 100% rename from c64/basic/,stubs/e453.rvect.s rename to src/basic/,stubs/e453.rvect.s diff --git a/c64/basic/,stubs_math/a9c4.convert_FAC1_to_INT.s b/src/basic/,stubs_math/a9c4.convert_FAC1_to_INT.s similarity index 100% rename from c64/basic/,stubs_math/a9c4.convert_FAC1_to_INT.s rename to src/basic/,stubs_math/a9c4.convert_FAC1_to_INT.s diff --git a/c64/basic/,stubs_math/a9c4.interop b/src/basic/,stubs_math/a9c4.interop similarity index 100% rename from c64/basic/,stubs_math/a9c4.interop rename to src/basic/,stubs_math/a9c4.interop diff --git a/c64/basic/,stubs_math/aabc.interop b/src/basic/,stubs_math/aabc.interop similarity index 100% rename from c64/basic/,stubs_math/aabc.interop rename to src/basic/,stubs_math/aabc.interop diff --git a/c64/basic/,stubs_math/aabc.print_FAC1.s b/src/basic/,stubs_math/aabc.print_FAC1.s similarity index 100% rename from c64/basic/,stubs_math/aabc.print_FAC1.s rename to src/basic/,stubs_math/aabc.print_FAC1.s diff --git a/c64/basic/,stubs_math/af7b.compute_TI.s b/src/basic/,stubs_math/af7b.compute_TI.s similarity index 100% rename from c64/basic/,stubs_math/af7b.compute_TI.s rename to src/basic/,stubs_math/af7b.compute_TI.s diff --git a/c64/basic/,stubs_math/af7b.interop b/src/basic/,stubs_math/af7b.interop similarity index 100% rename from c64/basic/,stubs_math/af7b.interop rename to src/basic/,stubs_math/af7b.interop diff --git a/c64/basic/,stubs_math/af7e.interop b/src/basic/,stubs_math/af7e.interop similarity index 100% rename from c64/basic/,stubs_math/af7e.interop rename to src/basic/,stubs_math/af7e.interop diff --git a/c64/basic/,stubs_math/af7e.math_stub.s b/src/basic/,stubs_math/af7e.math_stub.s similarity index 100% rename from c64/basic/,stubs_math/af7e.math_stub.s rename to src/basic/,stubs_math/af7e.math_stub.s diff --git a/c64/basic/,stubs_math/af87.interop b/src/basic/,stubs_math/af87.interop similarity index 100% rename from c64/basic/,stubs_math/af87.interop rename to src/basic/,stubs_math/af87.interop diff --git a/c64/basic/,stubs_math/af87.math_stub.s b/src/basic/,stubs_math/af87.math_stub.s similarity index 100% rename from c64/basic/,stubs_math/af87.math_stub.s rename to src/basic/,stubs_math/af87.math_stub.s diff --git a/c64/basic/,stubs_math/af9a.compute_ST.s b/src/basic/,stubs_math/af9a.compute_ST.s similarity index 100% rename from c64/basic/,stubs_math/af9a.compute_ST.s rename to src/basic/,stubs_math/af9a.compute_ST.s diff --git a/c64/basic/,stubs_math/af9a.interop b/src/basic/,stubs_math/af9a.interop similarity index 100% rename from c64/basic/,stubs_math/af9a.interop rename to src/basic/,stubs_math/af9a.interop diff --git a/c64/basic/,stubs_math/b1aa.FACINX.s b/src/basic/,stubs_math/b1aa.FACINX.s similarity index 100% rename from c64/basic/,stubs_math/b1aa.FACINX.s rename to src/basic/,stubs_math/b1aa.FACINX.s diff --git a/c64/basic/,stubs_math/b1aa.interop b/src/basic/,stubs_math/b1aa.interop similarity index 100% rename from c64/basic/,stubs_math/b1aa.interop rename to src/basic/,stubs_math/b1aa.interop diff --git a/c64/basic/,stubs_math/b1bf.convert_FAC1_to_s16.s b/src/basic/,stubs_math/b1bf.convert_FAC1_to_s16.s similarity index 100% rename from c64/basic/,stubs_math/b1bf.convert_FAC1_to_s16.s rename to src/basic/,stubs_math/b1bf.convert_FAC1_to_s16.s diff --git a/c64/basic/,stubs_math/b1bf.interop b/src/basic/,stubs_math/b1bf.interop similarity index 100% rename from c64/basic/,stubs_math/b1bf.interop rename to src/basic/,stubs_math/b1bf.interop diff --git a/c64/basic/,stubs_math/b391.GIVAYF.s b/src/basic/,stubs_math/b391.GIVAYF.s similarity index 100% rename from c64/basic/,stubs_math/b391.GIVAYF.s rename to src/basic/,stubs_math/b391.GIVAYF.s diff --git a/c64/basic/,stubs_math/b391.interop b/src/basic/,stubs_math/b391.interop similarity index 100% rename from c64/basic/,stubs_math/b391.interop rename to src/basic/,stubs_math/b391.interop diff --git a/c64/basic/,stubs_math/b3a2.convert_Y_to_FAC1.s b/src/basic/,stubs_math/b3a2.convert_Y_to_FAC1.s similarity index 100% rename from c64/basic/,stubs_math/b3a2.convert_Y_to_FAC1.s rename to src/basic/,stubs_math/b3a2.convert_Y_to_FAC1.s diff --git a/c64/basic/,stubs_math/b3a2.interop b/src/basic/,stubs_math/b3a2.interop similarity index 100% rename from c64/basic/,stubs_math/b3a2.interop rename to src/basic/,stubs_math/b3a2.interop diff --git a/c64/basic/,stubs_math/b794.convert_A_to_FAC1.s b/src/basic/,stubs_math/b794.convert_A_to_FAC1.s similarity index 100% rename from c64/basic/,stubs_math/b794.convert_A_to_FAC1.s rename to src/basic/,stubs_math/b794.convert_A_to_FAC1.s diff --git a/c64/basic/,stubs_math/b794.interop b/src/basic/,stubs_math/b794.interop similarity index 100% rename from c64/basic/,stubs_math/b794.interop rename to src/basic/,stubs_math/b794.interop diff --git a/c64/basic/,stubs_math/b7b5.STRVAL.s b/src/basic/,stubs_math/b7b5.STRVAL.s similarity index 100% rename from c64/basic/,stubs_math/b7b5.STRVAL.s rename to src/basic/,stubs_math/b7b5.STRVAL.s diff --git a/c64/basic/,stubs_math/b7b5.interop b/src/basic/,stubs_math/b7b5.interop similarity index 100% rename from c64/basic/,stubs_math/b7b5.interop rename to src/basic/,stubs_math/b7b5.interop diff --git a/c64/basic/,stubs_math/b7f7.convert_FAC1_to_ADDR.s b/src/basic/,stubs_math/b7f7.convert_FAC1_to_ADDR.s similarity index 100% rename from c64/basic/,stubs_math/b7f7.convert_FAC1_to_ADDR.s rename to src/basic/,stubs_math/b7f7.convert_FAC1_to_ADDR.s diff --git a/c64/basic/,stubs_math/b7f7.interop b/src/basic/,stubs_math/b7f7.interop similarity index 100% rename from c64/basic/,stubs_math/b7f7.interop rename to src/basic/,stubs_math/b7f7.interop diff --git a/c64/basic/,stubs_math/b947.interop b/src/basic/,stubs_math/b947.interop similarity index 100% rename from c64/basic/,stubs_math/b947.interop rename to src/basic/,stubs_math/b947.interop diff --git a/c64/basic/,stubs_math/b947.inv_FAC1_mantissa.s b/src/basic/,stubs_math/b947.inv_FAC1_mantissa.s similarity index 100% rename from c64/basic/,stubs_math/b947.inv_FAC1_mantissa.s rename to src/basic/,stubs_math/b947.inv_FAC1_mantissa.s diff --git a/c64/basic/,stubs_math/b9ea.interop b/src/basic/,stubs_math/b9ea.interop similarity index 100% rename from c64/basic/,stubs_math/b9ea.interop rename to src/basic/,stubs_math/b9ea.interop diff --git a/c64/basic/,stubs_math/b9ea.log_FAC1.s b/src/basic/,stubs_math/b9ea.log_FAC1.s similarity index 100% rename from c64/basic/,stubs_math/b9ea.log_FAC1.s rename to src/basic/,stubs_math/b9ea.log_FAC1.s diff --git a/c64/basic/,stubs_math/ba90.get_FAC2_via_INDEX.s b/src/basic/,stubs_math/ba90.get_FAC2_via_INDEX.s similarity index 100% rename from c64/basic/,stubs_math/ba90.get_FAC2_via_INDEX.s rename to src/basic/,stubs_math/ba90.get_FAC2_via_INDEX.s diff --git a/c64/basic/,stubs_math/ba90.interop b/src/basic/,stubs_math/ba90.interop similarity index 100% rename from c64/basic/,stubs_math/ba90.interop rename to src/basic/,stubs_math/ba90.interop diff --git a/c64/basic/,stubs_math/bba6.get_FAC1_via_INDEX.s b/src/basic/,stubs_math/bba6.get_FAC1_via_INDEX.s similarity index 100% rename from c64/basic/,stubs_math/bba6.get_FAC1_via_INDEX.s rename to src/basic/,stubs_math/bba6.get_FAC1_via_INDEX.s diff --git a/c64/basic/,stubs_math/bba6.interop b/src/basic/,stubs_math/bba6.interop similarity index 100% rename from c64/basic/,stubs_math/bba6.interop rename to src/basic/,stubs_math/bba6.interop diff --git a/c64/basic/,stubs_math/bc39.interop b/src/basic/,stubs_math/bc39.interop similarity index 100% rename from c64/basic/,stubs_math/bc39.interop rename to src/basic/,stubs_math/bc39.interop diff --git a/c64/basic/,stubs_math/bc39.sgn_FAC1.s b/src/basic/,stubs_math/bc39.sgn_FAC1.s similarity index 100% rename from c64/basic/,stubs_math/bc39.sgn_FAC1.s rename to src/basic/,stubs_math/bc39.sgn_FAC1.s diff --git a/c64/basic/,stubs_math/bc3c.convert_A_to_FAC1.s b/src/basic/,stubs_math/bc3c.convert_A_to_FAC1.s similarity index 100% rename from c64/basic/,stubs_math/bc3c.convert_A_to_FAC1.s rename to src/basic/,stubs_math/bc3c.convert_A_to_FAC1.s diff --git a/c64/basic/,stubs_math/bc3c.interop b/src/basic/,stubs_math/bc3c.interop similarity index 100% rename from c64/basic/,stubs_math/bc3c.interop rename to src/basic/,stubs_math/bc3c.interop diff --git a/c64/basic/,stubs_math/bc44.convert_i16_to_FAC1.s b/src/basic/,stubs_math/bc44.convert_i16_to_FAC1.s similarity index 100% rename from c64/basic/,stubs_math/bc44.convert_i16_to_FAC1.s rename to src/basic/,stubs_math/bc44.convert_i16_to_FAC1.s diff --git a/c64/basic/,stubs_math/bc44.interop b/src/basic/,stubs_math/bc44.interop similarity index 100% rename from c64/basic/,stubs_math/bc44.interop rename to src/basic/,stubs_math/bc44.interop diff --git a/c64/basic/,stubs_math/bc58.abs_FAC1.s b/src/basic/,stubs_math/bc58.abs_FAC1.s similarity index 100% rename from c64/basic/,stubs_math/bc58.abs_FAC1.s rename to src/basic/,stubs_math/bc58.abs_FAC1.s diff --git a/c64/basic/,stubs_math/bc58.interop b/src/basic/,stubs_math/bc58.interop similarity index 100% rename from c64/basic/,stubs_math/bc58.interop rename to src/basic/,stubs_math/bc58.interop diff --git a/c64/basic/,stubs_math/bc5b.FCOMP.s b/src/basic/,stubs_math/bc5b.FCOMP.s similarity index 100% rename from c64/basic/,stubs_math/bc5b.FCOMP.s rename to src/basic/,stubs_math/bc5b.FCOMP.s diff --git a/c64/basic/,stubs_math/bc5b.interop b/src/basic/,stubs_math/bc5b.interop similarity index 100% rename from c64/basic/,stubs_math/bc5b.interop rename to src/basic/,stubs_math/bc5b.interop diff --git a/c64/basic/,stubs_math/bc9b.QINT.s b/src/basic/,stubs_math/bc9b.QINT.s similarity index 100% rename from c64/basic/,stubs_math/bc9b.QINT.s rename to src/basic/,stubs_math/bc9b.QINT.s diff --git a/c64/basic/,stubs_math/bc9b.interop b/src/basic/,stubs_math/bc9b.interop similarity index 100% rename from c64/basic/,stubs_math/bc9b.interop rename to src/basic/,stubs_math/bc9b.interop diff --git a/c64/basic/,stubs_math/bccc.int_FAC1.s b/src/basic/,stubs_math/bccc.int_FAC1.s similarity index 100% rename from c64/basic/,stubs_math/bccc.int_FAC1.s rename to src/basic/,stubs_math/bccc.int_FAC1.s diff --git a/c64/basic/,stubs_math/bccc.interop b/src/basic/,stubs_math/bccc.interop similarity index 100% rename from c64/basic/,stubs_math/bccc.interop rename to src/basic/,stubs_math/bccc.interop diff --git a/c64/basic/,stubs_math/bcf3.FIN.s b/src/basic/,stubs_math/bcf3.FIN.s similarity index 100% rename from c64/basic/,stubs_math/bcf3.FIN.s rename to src/basic/,stubs_math/bcf3.FIN.s diff --git a/c64/basic/,stubs_math/bcf3.interop b/src/basic/,stubs_math/bcf3.interop similarity index 100% rename from c64/basic/,stubs_math/bcf3.interop rename to src/basic/,stubs_math/bcf3.interop diff --git a/c64/basic/,stubs_math/bd7e.FINLOG.s b/src/basic/,stubs_math/bd7e.FINLOG.s similarity index 100% rename from c64/basic/,stubs_math/bd7e.FINLOG.s rename to src/basic/,stubs_math/bd7e.FINLOG.s diff --git a/c64/basic/,stubs_math/bd7e.interop b/src/basic/,stubs_math/bd7e.interop similarity index 100% rename from c64/basic/,stubs_math/bd7e.interop rename to src/basic/,stubs_math/bd7e.interop diff --git a/c64/basic/,stubs_math/bddd.FOUT.s b/src/basic/,stubs_math/bddd.FOUT.s similarity index 100% rename from c64/basic/,stubs_math/bddd.FOUT.s rename to src/basic/,stubs_math/bddd.FOUT.s diff --git a/c64/basic/,stubs_math/bddd.interop b/src/basic/,stubs_math/bddd.interop similarity index 100% rename from c64/basic/,stubs_math/bddd.interop rename to src/basic/,stubs_math/bddd.interop diff --git a/c64/basic/,stubs_math/bf74.interop b/src/basic/,stubs_math/bf74.interop similarity index 100% rename from c64/basic/,stubs_math/bf74.interop rename to src/basic/,stubs_math/bf74.interop diff --git a/c64/basic/,stubs_math/bf74.sqr_FAC2.s b/src/basic/,stubs_math/bf74.sqr_FAC2.s similarity index 100% rename from c64/basic/,stubs_math/bf74.sqr_FAC2.s rename to src/basic/,stubs_math/bf74.sqr_FAC2.s diff --git a/c64/basic/,stubs_math/bf7b.interop b/src/basic/,stubs_math/bf7b.interop similarity index 100% rename from c64/basic/,stubs_math/bf7b.interop rename to src/basic/,stubs_math/bf7b.interop diff --git a/c64/basic/,stubs_math/bf7b.pwr_FAC2_FAC1.s b/src/basic/,stubs_math/bf7b.pwr_FAC2_FAC1.s similarity index 100% rename from c64/basic/,stubs_math/bf7b.pwr_FAC2_FAC1.s rename to src/basic/,stubs_math/bf7b.pwr_FAC2_FAC1.s diff --git a/c64/basic/,stubs_math/bfed.exp_FAC1.s b/src/basic/,stubs_math/bfed.exp_FAC1.s similarity index 100% rename from c64/basic/,stubs_math/bfed.exp_FAC1.s rename to src/basic/,stubs_math/bfed.exp_FAC1.s diff --git a/c64/basic/,stubs_math/bfed.interop b/src/basic/,stubs_math/bfed.interop similarity index 100% rename from c64/basic/,stubs_math/bfed.interop rename to src/basic/,stubs_math/bfed.interop diff --git a/c64/basic/,stubs_math/e043.interop b/src/basic/,stubs_math/e043.interop similarity index 100% rename from c64/basic/,stubs_math/e043.interop rename to src/basic/,stubs_math/e043.interop diff --git a/c64/basic/,stubs_math/e043.poly1_FAC1.s b/src/basic/,stubs_math/e043.poly1_FAC1.s similarity index 100% rename from c64/basic/,stubs_math/e043.poly1_FAC1.s rename to src/basic/,stubs_math/e043.poly1_FAC1.s diff --git a/c64/basic/,stubs_math/e059.interop b/src/basic/,stubs_math/e059.interop similarity index 100% rename from c64/basic/,stubs_math/e059.interop rename to src/basic/,stubs_math/e059.interop diff --git a/c64/basic/,stubs_math/e059.poly2_FAC1.s b/src/basic/,stubs_math/e059.poly2_FAC1.s similarity index 100% rename from c64/basic/,stubs_math/e059.poly2_FAC1.s rename to src/basic/,stubs_math/e059.poly2_FAC1.s diff --git a/c64/basic/,stubs_math/e264.cos_FAC1.s b/src/basic/,stubs_math/e264.cos_FAC1.s similarity index 100% rename from c64/basic/,stubs_math/e264.cos_FAC1.s rename to src/basic/,stubs_math/e264.cos_FAC1.s diff --git a/c64/basic/,stubs_math/e264.interop b/src/basic/,stubs_math/e264.interop similarity index 100% rename from c64/basic/,stubs_math/e264.interop rename to src/basic/,stubs_math/e264.interop diff --git a/c64/basic/,stubs_math/e26b.interop b/src/basic/,stubs_math/e26b.interop similarity index 100% rename from c64/basic/,stubs_math/e26b.interop rename to src/basic/,stubs_math/e26b.interop diff --git a/c64/basic/,stubs_math/e26b.sin_FAC1.s b/src/basic/,stubs_math/e26b.sin_FAC1.s similarity index 100% rename from c64/basic/,stubs_math/e26b.sin_FAC1.s rename to src/basic/,stubs_math/e26b.sin_FAC1.s diff --git a/c64/basic/,stubs_math/e2b4.interop b/src/basic/,stubs_math/e2b4.interop similarity index 100% rename from c64/basic/,stubs_math/e2b4.interop rename to src/basic/,stubs_math/e2b4.interop diff --git a/c64/basic/,stubs_math/e2b4.tan_FAC1.s b/src/basic/,stubs_math/e2b4.tan_FAC1.s similarity index 100% rename from c64/basic/,stubs_math/e2b4.tan_FAC1.s rename to src/basic/,stubs_math/e2b4.tan_FAC1.s diff --git a/c64/basic/,stubs_math/e30e.atn_FAC1.s b/src/basic/,stubs_math/e30e.atn_FAC1.s similarity index 100% rename from c64/basic/,stubs_math/e30e.atn_FAC1.s rename to src/basic/,stubs_math/e30e.atn_FAC1.s diff --git a/c64/basic/,stubs_math/e30e.interop b/src/basic/,stubs_math/e30e.interop similarity index 100% rename from c64/basic/,stubs_math/e30e.interop rename to src/basic/,stubs_math/e30e.interop diff --git a/c64/basic/a533.interop b/src/basic/a533.interop similarity index 100% rename from c64/basic/a533.interop rename to src/basic/a533.interop diff --git a/c64/basic/a533.linkprg.s b/src/basic/a533.linkprg.s similarity index 100% rename from c64/basic/a533.linkprg.s rename to src/basic/a533.linkprg.s diff --git a/c64/basic/a68e.interop b/src/basic/a68e.interop similarity index 100% rename from c64/basic/a68e.interop rename to src/basic/a68e.interop diff --git a/c64/basic/a68e.runc.s b/src/basic/a68e.runc.s similarity index 100% rename from c64/basic/a68e.runc.s rename to src/basic/a68e.runc.s diff --git a/c64/basic/a7ae.interop b/src/basic/a7ae.interop similarity index 100% rename from c64/basic/a7ae.interop rename to src/basic/a7ae.interop diff --git a/c64/basic/a7ae.newstt.s b/src/basic/a7ae.newstt.s similarity index 100% rename from c64/basic/a7ae.newstt.s rename to src/basic/a7ae.newstt.s diff --git a/c64/basic/ab1e.strout.s b/src/basic/ab1e.strout.s similarity index 100% rename from c64/basic/ab1e.strout.s rename to src/basic/ab1e.strout.s diff --git a/c64/basic/assets/packed_as_1n.s b/src/basic/assets/packed_as_1n.s similarity index 100% rename from c64/basic/assets/packed_as_1n.s rename to src/basic/assets/packed_as_1n.s diff --git a/c64/basic/assets/packed_as_3n.s b/src/basic/assets/packed_as_3n.s similarity index 100% rename from c64/basic/assets/packed_as_3n.s rename to src/basic/assets/packed_as_3n.s diff --git a/c64/basic/assets/packed_dictionary.s b/src/basic/assets/packed_dictionary.s similarity index 100% rename from c64/basic/assets/packed_dictionary.s rename to src/basic/assets/packed_dictionary.s diff --git a/c64/basic/assets/packed_errors.s b/src/basic/assets/packed_errors.s similarity index 100% rename from c64/basic/assets/packed_errors.s rename to src/basic/assets/packed_errors.s diff --git a/c64/basic/assets/packed_keywords_CC.s b/src/basic/assets/packed_keywords_CC.s similarity index 100% rename from c64/basic/assets/packed_keywords_CC.s rename to src/basic/assets/packed_keywords_CC.s diff --git a/c64/basic/assets/packed_keywords_CD.s b/src/basic/assets/packed_keywords_CD.s similarity index 100% rename from c64/basic/assets/packed_keywords_CD.s rename to src/basic/assets/packed_keywords_CD.s diff --git a/c64/basic/assets/packed_keywords_V2.s b/src/basic/assets/packed_keywords_V2.s similarity index 100% rename from c64/basic/assets/packed_keywords_V2.s rename to src/basic/assets/packed_keywords_V2.s diff --git a/c64/basic/assets/packed_misc.s b/src/basic/assets/packed_misc.s similarity index 100% rename from c64/basic/assets/packed_misc.s rename to src/basic/assets/packed_misc.s diff --git a/c64/basic/basic_commands/cmd__jumptable.s b/src/basic/basic_commands/cmd__jumptable.s similarity index 100% rename from c64/basic/basic_commands/cmd__jumptable.s rename to src/basic/basic_commands/cmd__jumptable.s diff --git a/c64/basic/basic_commands/cmd__unimplemented.s b/src/basic/basic_commands/cmd__unimplemented.s similarity index 100% rename from c64/basic/basic_commands/cmd__unimplemented.s rename to src/basic/basic_commands/cmd__unimplemented.s diff --git a/c64/basic/basic_commands/cmd_clr.s b/src/basic/basic_commands/cmd_clr.s similarity index 100% rename from c64/basic/basic_commands/cmd_clr.s rename to src/basic/basic_commands/cmd_clr.s diff --git a/c64/basic/basic_commands/cmd_list.s b/src/basic/basic_commands/cmd_list.s similarity index 100% rename from c64/basic/basic_commands/cmd_list.s rename to src/basic/basic_commands/cmd_list.s diff --git a/c64/basic/basic_commands/cmd_load_verify.s b/src/basic/basic_commands/cmd_load_verify.s similarity index 100% rename from c64/basic/basic_commands/cmd_load_verify.s rename to src/basic/basic_commands/cmd_load_verify.s diff --git a/c64/basic/basic_commands/cmd_new.s b/src/basic/basic_commands/cmd_new.s similarity index 100% rename from c64/basic/basic_commands/cmd_new.s rename to src/basic/basic_commands/cmd_new.s diff --git a/c64/basic/basic_commands/cmd_print.s b/src/basic/basic_commands/cmd_print.s similarity index 100% rename from c64/basic/basic_commands/cmd_print.s rename to src/basic/basic_commands/cmd_print.s diff --git a/c64/basic/basic_commands/cmd_rem.s b/src/basic/basic_commands/cmd_rem.s similarity index 100% rename from c64/basic/basic_commands/cmd_rem.s rename to src/basic/basic_commands/cmd_rem.s diff --git a/c64/basic/basic_commands/cmd_run_goto.s b/src/basic/basic_commands/cmd_run_goto.s similarity index 100% rename from c64/basic/basic_commands/cmd_run_goto.s rename to src/basic/basic_commands/cmd_run_goto.s diff --git a/c64/basic/basic_commands/cmd_save.s b/src/basic/basic_commands/cmd_save.s similarity index 100% rename from c64/basic/basic_commands/cmd_save.s rename to src/basic/basic_commands/cmd_save.s diff --git a/c64/basic/basic_commands/cmd_stop_end.s b/src/basic/basic_commands/cmd_stop_end.s similarity index 100% rename from c64/basic/basic_commands/cmd_stop_end.s rename to src/basic/basic_commands/cmd_stop_end.s diff --git a/c64/basic/basic_commands/cmd_sys.s b/src/basic/basic_commands/cmd_sys.s similarity index 100% rename from c64/basic/basic_commands/cmd_sys.s rename to src/basic/basic_commands/cmd_sys.s diff --git a/c64/basic/basic_commands/helper_load_fetch_devnum.s b/src/basic/basic_commands/helper_load_fetch_devnum.s similarity index 100% rename from c64/basic/basic_commands/helper_load_fetch_devnum.s rename to src/basic/basic_commands/helper_load_fetch_devnum.s diff --git a/c64/basic/basic_commands/helper_load_fetch_filename.s b/src/basic/basic_commands/helper_load_fetch_filename.s similarity index 100% rename from c64/basic/basic_commands/helper_load_fetch_filename.s rename to src/basic/basic_commands/helper_load_fetch_filename.s diff --git a/c64/basic/basic_commands/helper_load_fetch_secondary.s b/src/basic/basic_commands/helper_load_fetch_secondary.s similarity index 100% rename from c64/basic/basic_commands/helper_load_fetch_secondary.s rename to src/basic/basic_commands/helper_load_fetch_secondary.s diff --git a/c64/basic/basic_commands/helper_load_init_param.s b/src/basic/basic_commands/helper_load_init_param.s similarity index 100% rename from c64/basic/basic_commands/helper_load_init_param.s rename to src/basic/basic_commands/helper_load_init_param.s diff --git a/c64/basic/basic_commands/helper_load_setnam_any.s b/src/basic/basic_commands/helper_load_setnam_any.s similarity index 100% rename from c64/basic/basic_commands/helper_load_setnam_any.s rename to src/basic/basic_commands/helper_load_setnam_any.s diff --git a/c64/basic/basic_commands_CC/cmd__jumptable_CC.s b/src/basic/basic_commands_CC/cmd__jumptable_CC.s similarity index 100% rename from c64/basic/basic_commands_CC/cmd__jumptable_CC.s rename to src/basic/basic_commands_CC/cmd__jumptable_CC.s diff --git a/c64/basic/basic_commands_CC/cmd_bload_bverify.s b/src/basic/basic_commands_CC/cmd_bload_bverify.s similarity index 100% rename from c64/basic/basic_commands_CC/cmd_bload_bverify.s rename to src/basic/basic_commands_CC/cmd_bload_bverify.s diff --git a/c64/basic/basic_commands_CC/cmd_bsave.s b/src/basic/basic_commands_CC/cmd_bsave.s similarity index 100% rename from c64/basic/basic_commands_CC/cmd_bsave.s rename to src/basic/basic_commands_CC/cmd_bsave.s diff --git a/c64/basic/basic_commands_CC/cmd_merge.s b/src/basic/basic_commands_CC/cmd_merge.s similarity index 100% rename from c64/basic/basic_commands_CC/cmd_merge.s rename to src/basic/basic_commands_CC/cmd_merge.s diff --git a/c64/basic/basic_commands_CC/helper_bload_fetch_address.s b/src/basic/basic_commands_CC/helper_bload_fetch_address.s similarity index 100% rename from c64/basic/basic_commands_CC/helper_bload_fetch_address.s rename to src/basic/basic_commands_CC/helper_bload_fetch_address.s diff --git a/c64/basic/basic_commands_CC/helper_bload_fetch_filename.s b/src/basic/basic_commands_CC/helper_bload_fetch_filename.s similarity index 100% rename from c64/basic/basic_commands_CC/helper_bload_fetch_filename.s rename to src/basic/basic_commands_CC/helper_bload_fetch_filename.s diff --git a/c64/basic/basic_commands_CD/cmd__jumptable_CD.s b/src/basic/basic_commands_CD/cmd__jumptable_CD.s similarity index 100% rename from c64/basic/basic_commands_CD/cmd__jumptable_CD.s rename to src/basic/basic_commands_CD/cmd__jumptable_CD.s diff --git a/c64/basic/basic_commands_CD/cmd_fast_slow.s b/src/basic/basic_commands_CD/cmd_fast_slow.s similarity index 100% rename from c64/basic/basic_commands_CD/cmd_fast_slow.s rename to src/basic/basic_commands_CD/cmd_fast_slow.s diff --git a/c64/basic/basic_delete_line.s b/src/basic/basic_delete_line.s similarity index 100% rename from c64/basic/basic_delete_line.s rename to src/basic/basic_delete_line.s diff --git a/c64/basic/basic_do_new.s b/src/basic/basic_do_new.s similarity index 100% rename from c64/basic/basic_do_new.s rename to src/basic/basic_do_new.s diff --git a/c64/basic/basic_find_line.s b/src/basic/basic_find_line.s similarity index 100% rename from c64/basic/basic_find_line.s rename to src/basic/basic_find_line.s diff --git a/c64/basic/basic_find_next_line.s b/src/basic/basic_find_next_line.s similarity index 100% rename from c64/basic/basic_find_next_line.s rename to src/basic/basic_find_next_line.s diff --git a/c64/basic/basic_follow_link_to_next_line.s b/src/basic/basic_follow_link_to_next_line.s similarity index 100% rename from c64/basic/basic_follow_link_to_next_line.s rename to src/basic/basic_follow_link_to_next_line.s diff --git a/c64/basic/basic_functions/fun__jumptable.s b/src/basic/basic_functions/fun__jumptable.s similarity index 100% rename from c64/basic/basic_functions/fun__jumptable.s rename to src/basic/basic_functions/fun__jumptable.s diff --git a/c64/basic/basic_functions/fun__unimplemented.s b/src/basic/basic_functions/fun__unimplemented.s similarity index 100% rename from c64/basic/basic_functions/fun__unimplemented.s rename to src/basic/basic_functions/fun__unimplemented.s diff --git a/c64/basic/basic_insert_line.s b/src/basic/basic_insert_line.s similarity index 100% rename from c64/basic/basic_insert_line.s rename to src/basic/basic_insert_line.s diff --git a/c64/basic/basic_main_loop.s b/src/basic/basic_main_loop.s similarity index 100% rename from c64/basic/basic_main_loop.s rename to src/basic/basic_main_loop.s diff --git a/c64/basic/basic_operators/oper__jumptable.s b/src/basic/basic_operators/oper__jumptable.s similarity index 100% rename from c64/basic/basic_operators/oper__jumptable.s rename to src/basic/basic_operators/oper__jumptable.s diff --git a/c64/basic/basic_operators/oper_add.s b/src/basic/basic_operators/oper_add.s similarity index 100% rename from c64/basic/basic_operators/oper_add.s rename to src/basic/basic_operators/oper_add.s diff --git a/c64/basic/basic_operators/oper_and.s b/src/basic/basic_operators/oper_and.s similarity index 100% rename from c64/basic/basic_operators/oper_and.s rename to src/basic/basic_operators/oper_and.s diff --git a/c64/basic/basic_operators/oper_cmp_eq.s b/src/basic/basic_operators/oper_cmp_eq.s similarity index 100% rename from c64/basic/basic_operators/oper_cmp_eq.s rename to src/basic/basic_operators/oper_cmp_eq.s diff --git a/c64/basic/basic_operators/oper_cmp_gt.s b/src/basic/basic_operators/oper_cmp_gt.s similarity index 100% rename from c64/basic/basic_operators/oper_cmp_gt.s rename to src/basic/basic_operators/oper_cmp_gt.s diff --git a/c64/basic/basic_operators/oper_cmp_gteq.s b/src/basic/basic_operators/oper_cmp_gteq.s similarity index 100% rename from c64/basic/basic_operators/oper_cmp_gteq.s rename to src/basic/basic_operators/oper_cmp_gteq.s diff --git a/c64/basic/basic_operators/oper_cmp_lt.s b/src/basic/basic_operators/oper_cmp_lt.s similarity index 100% rename from c64/basic/basic_operators/oper_cmp_lt.s rename to src/basic/basic_operators/oper_cmp_lt.s diff --git a/c64/basic/basic_operators/oper_cmp_lteq.s b/src/basic/basic_operators/oper_cmp_lteq.s similarity index 100% rename from c64/basic/basic_operators/oper_cmp_lteq.s rename to src/basic/basic_operators/oper_cmp_lteq.s diff --git a/c64/basic/basic_operators/oper_cmp_neq.s b/src/basic/basic_operators/oper_cmp_neq.s similarity index 100% rename from c64/basic/basic_operators/oper_cmp_neq.s rename to src/basic/basic_operators/oper_cmp_neq.s diff --git a/c64/basic/basic_operators/oper_div.s b/src/basic/basic_operators/oper_div.s similarity index 100% rename from c64/basic/basic_operators/oper_div.s rename to src/basic/basic_operators/oper_div.s diff --git a/c64/basic/basic_operators/oper_mul.s b/src/basic/basic_operators/oper_mul.s similarity index 100% rename from c64/basic/basic_operators/oper_mul.s rename to src/basic/basic_operators/oper_mul.s diff --git a/c64/basic/basic_operators/oper_or.s b/src/basic/basic_operators/oper_or.s similarity index 100% rename from c64/basic/basic_operators/oper_or.s rename to src/basic/basic_operators/oper_or.s diff --git a/c64/basic/basic_operators/oper_pow.s b/src/basic/basic_operators/oper_pow.s similarity index 100% rename from c64/basic/basic_operators/oper_pow.s rename to src/basic/basic_operators/oper_pow.s diff --git a/c64/basic/basic_operators/oper_sub.s b/src/basic/basic_operators/oper_sub.s similarity index 100% rename from c64/basic/basic_operators/oper_sub.s rename to src/basic/basic_operators/oper_sub.s diff --git a/c64/basic/basic_operators/oper_unary_minus.s b/src/basic/basic_operators/oper_unary_minus.s similarity index 100% rename from c64/basic/basic_operators/oper_unary_minus.s rename to src/basic/basic_operators/oper_unary_minus.s diff --git a/c64/basic/basic_operators/oper_unary_not.s b/src/basic/basic_operators/oper_unary_not.s similarity index 100% rename from c64/basic/basic_operators/oper_unary_not.s rename to src/basic/basic_operators/oper_unary_not.s diff --git a/c64/basic/basic_parse_line_number.s b/src/basic/basic_parse_line_number.s similarity index 100% rename from c64/basic/basic_parse_line_number.s rename to src/basic/basic_parse_line_number.s diff --git a/c64/basic/basic_shift_mem_down.s b/src/basic/basic_shift_mem_down.s similarity index 100% rename from c64/basic/basic_shift_mem_down.s rename to src/basic/basic_shift_mem_down.s diff --git a/c64/basic/basic_shift_mem_up.s b/src/basic/basic_shift_mem_up.s similarity index 100% rename from c64/basic/basic_shift_mem_up.s rename to src/basic/basic_shift_mem_up.s diff --git a/c64/basic/basic_vector_defaults.s b/src/basic/basic_vector_defaults.s similarity index 100% rename from c64/basic/basic_vector_defaults.s rename to src/basic/basic_vector_defaults.s diff --git a/c64/basic/bdcd.interop b/src/basic/bdcd.interop similarity index 100% rename from c64/basic/bdcd.interop rename to src/basic/bdcd.interop diff --git a/c64/basic/bdcd.linprt.s b/src/basic/bdcd.linprt.s similarity index 100% rename from c64/basic/bdcd.linprt.s rename to src/basic/bdcd.linprt.s diff --git a/c64/basic/board_m65/4000.mega65_vectable_basic_1.s b/src/basic/board_m65/4000.mega65_vectable_basic_1.s similarity index 100% rename from c64/basic/board_m65/4000.mega65_vectable_basic_1.s rename to src/basic/board_m65/4000.mega65_vectable_basic_1.s diff --git a/c64/basic/board_m65/mega65_imports.s b/src/basic/board_m65/mega65_imports.s similarity index 100% rename from c64/basic/board_m65/mega65_imports.s rename to src/basic/board_m65/mega65_imports.s diff --git a/c64/basic/board_m65/mega65_map_helpers.s b/src/basic/board_m65/mega65_map_helpers.s similarity index 100% rename from c64/basic/board_m65/mega65_map_helpers.s rename to src/basic/board_m65/mega65_map_helpers.s diff --git a/c64/basic/board_m65/mega65_proxies.s b/src/basic/board_m65/mega65_proxies.s similarity index 100% rename from c64/basic/board_m65/mega65_proxies.s rename to src/basic/board_m65/mega65_proxies.s diff --git a/c64/basic/board_x16/cx16_dummy.s b/src/basic/board_x16/cx16_dummy.s similarity index 100% rename from c64/basic/board_x16/cx16_dummy.s rename to src/basic/board_x16/cx16_dummy.s diff --git a/c64/basic/board_x16/cx16_stubs.s b/src/basic/board_x16/cx16_stubs.s similarity index 100% rename from c64/basic/board_x16/cx16_stubs.s rename to src/basic/board_x16/cx16_stubs.s diff --git a/c64/basic/c000.skip_gap.s b/src/basic/c000.skip_gap.s similarity index 100% rename from c64/basic/c000.skip_gap.s rename to src/basic/c000.skip_gap.s diff --git a/c64/basic/engine/ad9e.frmevl.s b/src/basic/engine/ad9e.frmevl.s similarity index 100% rename from c64/basic/engine/ad9e.frmevl.s rename to src/basic/engine/ad9e.frmevl.s diff --git a/c64/basic/engine/ad9e.interop b/src/basic/engine/ad9e.interop similarity index 100% rename from c64/basic/engine/ad9e.interop rename to src/basic/engine/ad9e.interop diff --git a/c64/basic/engine/alloc_temp_string.s b/src/basic/engine/alloc_temp_string.s similarity index 100% rename from c64/basic/engine/alloc_temp_string.s rename to src/basic/engine/alloc_temp_string.s diff --git a/c64/basic/engine/do_error.s b/src/basic/engine/do_error.s similarity index 100% rename from c64/basic/engine/do_error.s rename to src/basic/engine/do_error.s diff --git a/c64/basic/engine/end_of_statement_check.s b/src/basic/engine/end_of_statement_check.s similarity index 100% rename from c64/basic/engine/end_of_statement_check.s rename to src/basic/engine/end_of_statement_check.s diff --git a/c64/basic/engine/execute_line_statements.s b/src/basic/engine/execute_line_statements.s similarity index 100% rename from c64/basic/engine/execute_line_statements.s rename to src/basic/engine/execute_line_statements.s diff --git a/c64/basic/engine/fetch_character.s b/src/basic/engine/fetch_character.s similarity index 100% rename from c64/basic/engine/fetch_character.s rename to src/basic/engine/fetch_character.s diff --git a/c64/basic/engine/fetch_operator.s b/src/basic/engine/fetch_operator.s similarity index 100% rename from c64/basic/engine/fetch_operator.s rename to src/basic/engine/fetch_operator.s diff --git a/c64/basic/engine/fetch_uint8.s b/src/basic/engine/fetch_uint8.s similarity index 100% rename from c64/basic/engine/fetch_uint8.s rename to src/basic/engine/fetch_uint8.s diff --git a/c64/basic/engine/init_oldtxt.s b/src/basic/engine/init_oldtxt.s similarity index 100% rename from c64/basic/engine/init_oldtxt.s rename to src/basic/engine/init_oldtxt.s diff --git a/c64/basic/engine/injest_comma.s b/src/basic/engine/injest_comma.s similarity index 100% rename from c64/basic/engine/injest_comma.s rename to src/basic/engine/injest_comma.s diff --git a/c64/basic/engine/injest_spaces.s b/src/basic/engine/injest_spaces.s similarity index 100% rename from c64/basic/engine/injest_spaces.s rename to src/basic/engine/injest_spaces.s diff --git a/c64/basic/engine/unconsume_character.s b/src/basic/engine/unconsume_character.s similarity index 100% rename from c64/basic/engine/unconsume_character.s rename to src/basic/engine/unconsume_character.s diff --git a/c64/basic/fac1_mul.s b/src/basic/fac1_mul.s similarity index 100% rename from c64/basic/fac1_mul.s rename to src/basic/fac1_mul.s diff --git a/c64/basic/init/a000.cold_start_vector.s b/src/basic/init/a000.cold_start_vector.s similarity index 100% rename from c64/basic/init/a000.cold_start_vector.s rename to src/basic/init/a000.cold_start_vector.s diff --git a/c64/basic/init/a002.warm_start_vector.s b/src/basic/init/a002.warm_start_vector.s similarity index 100% rename from c64/basic/init/a002.warm_start_vector.s rename to src/basic/init/a002.warm_start_vector.s diff --git a/c64/basic/init/basic_cold_start_internal.s b/src/basic/init/basic_cold_start_internal.s similarity index 100% rename from c64/basic/init/basic_cold_start_internal.s rename to src/basic/init/basic_cold_start_internal.s diff --git a/c64/basic/init/basic_warm_start_internal.s b/src/basic/init/basic_warm_start_internal.s similarity index 100% rename from c64/basic/init/basic_warm_start_internal.s rename to src/basic/init/basic_warm_start_internal.s diff --git a/c64/basic/init/e394.basic_cold_start.s b/src/basic/init/e394.basic_cold_start.s similarity index 100% rename from c64/basic/init/e394.basic_cold_start.s rename to src/basic/init/e394.basic_cold_start.s diff --git a/c64/basic/init/e394.interop b/src/basic/init/e394.interop similarity index 100% rename from c64/basic/init/e394.interop rename to src/basic/init/e394.interop diff --git a/c64/basic/init/e3b7.basic_warm_start.jmp.s b/src/basic/init/e3b7.basic_warm_start.jmp.s similarity index 100% rename from c64/basic/init/e3b7.basic_warm_start.jmp.s rename to src/basic/init/e3b7.basic_warm_start.jmp.s diff --git a/c64/basic/init/e3b7.interop b/src/basic/init/e3b7.interop similarity index 100% rename from c64/basic/init/e3b7.interop rename to src/basic/init/e3b7.interop diff --git a/c64/basic/init/e422.initmsg.jmp.s b/src/basic/init/e422.initmsg.jmp.s similarity index 100% rename from c64/basic/init/e422.initmsg.jmp.s rename to src/basic/init/e422.initmsg.jmp.s diff --git a/c64/basic/init/e422.interop b/src/basic/init/e422.interop similarity index 100% rename from c64/basic/init/e422.interop rename to src/basic/init/e422.interop diff --git a/c64/basic/init/initmsg_bytes_free.s b/src/basic/init/initmsg_bytes_free.s similarity index 100% rename from c64/basic/init/initmsg_bytes_free.s rename to src/basic/init/initmsg_bytes_free.s diff --git a/c64/basic/init/initmsg_real.s b/src/basic/init/initmsg_real.s similarity index 100% rename from c64/basic/init/initmsg_real.s rename to src/basic/init/initmsg_real.s diff --git a/c64/basic/init/startup_banner.s b/src/basic/init/startup_banner.s similarity index 100% rename from c64/basic/init/startup_banner.s rename to src/basic/init/startup_banner.s diff --git a/c64/basic/injest_number.s b/src/basic/injest_number.s similarity index 100% rename from c64/basic/injest_number.s rename to src/basic/injest_number.s diff --git a/c64/basic/math/add_FAC2_FAC1_sub.s b/src/basic/math/add_FAC2_FAC1_sub.s similarity index 100% rename from c64/basic/math/add_FAC2_FAC1_sub.s rename to src/basic/math/add_FAC2_FAC1_sub.s diff --git a/c64/basic/math/add_align_exponents.s b/src/basic/math/add_align_exponents.s similarity index 100% rename from c64/basic/math/add_align_exponents.s rename to src/basic/math/add_align_exponents.s diff --git a/c64/basic/math/b849.add_HALF_FAC1.s b/src/basic/math/b849.add_HALF_FAC1.s similarity index 100% rename from c64/basic/math/b849.add_HALF_FAC1.s rename to src/basic/math/b849.add_HALF_FAC1.s diff --git a/c64/basic/math/b849.interop b/src/basic/math/b849.interop similarity index 100% rename from c64/basic/math/b849.interop rename to src/basic/math/b849.interop diff --git a/c64/basic/math/b850.interop b/src/basic/math/b850.interop similarity index 100% rename from c64/basic/math/b850.interop rename to src/basic/math/b850.interop diff --git a/c64/basic/math/b850.sub_MEM_FAC1.s b/src/basic/math/b850.sub_MEM_FAC1.s similarity index 100% rename from c64/basic/math/b850.sub_MEM_FAC1.s rename to src/basic/math/b850.sub_MEM_FAC1.s diff --git a/c64/basic/math/b853.interop b/src/basic/math/b853.interop similarity index 100% rename from c64/basic/math/b853.interop rename to src/basic/math/b853.interop diff --git a/c64/basic/math/b853.sub_FAC2_FAC1.s b/src/basic/math/b853.sub_FAC2_FAC1.s similarity index 100% rename from c64/basic/math/b853.sub_FAC2_FAC1.s rename to src/basic/math/b853.sub_FAC2_FAC1.s diff --git a/c64/basic/math/b862.add_align_exponent.jmp.s b/src/basic/math/b862.add_align_exponent.jmp.s similarity index 100% rename from c64/basic/math/b862.add_align_exponent.jmp.s rename to src/basic/math/b862.add_align_exponent.jmp.s diff --git a/c64/basic/math/b862.interop b/src/basic/math/b862.interop similarity index 100% rename from c64/basic/math/b862.interop rename to src/basic/math/b862.interop diff --git a/c64/basic/math/b867.add_MEM_FAC1.s b/src/basic/math/b867.add_MEM_FAC1.s similarity index 100% rename from c64/basic/math/b867.add_MEM_FAC1.s rename to src/basic/math/b867.add_MEM_FAC1.s diff --git a/c64/basic/math/b867.interop b/src/basic/math/b867.interop similarity index 100% rename from c64/basic/math/b867.interop rename to src/basic/math/b867.interop diff --git a/c64/basic/math/b86a.add_FAC2_FAC1.s b/src/basic/math/b86a.add_FAC2_FAC1.s similarity index 100% rename from c64/basic/math/b86a.add_FAC2_FAC1.s rename to src/basic/math/b86a.add_FAC2_FAC1.s diff --git a/c64/basic/math/b86a.interop b/src/basic/math/b86a.interop similarity index 100% rename from c64/basic/math/b86a.interop rename to src/basic/math/b86a.interop diff --git a/c64/basic/math/b8fe.interop b/src/basic/math/b8fe.interop similarity index 100% rename from c64/basic/math/b8fe.interop rename to src/basic/math/b8fe.interop diff --git a/c64/basic/math/b8fe.normal_FAC1.jmp.s b/src/basic/math/b8fe.normal_FAC1.jmp.s similarity index 100% rename from c64/basic/math/b8fe.normal_FAC1.jmp.s rename to src/basic/math/b8fe.normal_FAC1.jmp.s diff --git a/c64/basic/math/ba28.interop b/src/basic/math/ba28.interop similarity index 100% rename from c64/basic/math/ba28.interop rename to src/basic/math/ba28.interop diff --git a/c64/basic/math/ba28.mul_MEM_FAC1.jmp.s b/src/basic/math/ba28.mul_MEM_FAC1.jmp.s similarity index 100% rename from c64/basic/math/ba28.mul_MEM_FAC1.jmp.s rename to src/basic/math/ba28.mul_MEM_FAC1.jmp.s diff --git a/c64/basic/math/ba2b.interop b/src/basic/math/ba2b.interop similarity index 100% rename from c64/basic/math/ba2b.interop rename to src/basic/math/ba2b.interop diff --git a/c64/basic/math/ba2b.mul_FAC2_FAC1.s b/src/basic/math/ba2b.mul_FAC2_FAC1.s similarity index 100% rename from c64/basic/math/ba2b.mul_FAC2_FAC1.s rename to src/basic/math/ba2b.mul_FAC2_FAC1.s diff --git a/c64/basic/math/ba8c.interop b/src/basic/math/ba8c.interop similarity index 100% rename from c64/basic/math/ba8c.interop rename to src/basic/math/ba8c.interop diff --git a/c64/basic/math/ba8c.mov_MEM_FAC2.jmp.s b/src/basic/math/ba8c.mov_MEM_FAC2.jmp.s similarity index 100% rename from c64/basic/math/ba8c.mov_MEM_FAC2.jmp.s rename to src/basic/math/ba8c.mov_MEM_FAC2.jmp.s diff --git a/c64/basic/math/bae2.interop b/src/basic/math/bae2.interop similarity index 100% rename from c64/basic/math/bae2.interop rename to src/basic/math/bae2.interop diff --git a/c64/basic/math/bae2.mul10_FAC1.s b/src/basic/math/bae2.mul10_FAC1.s similarity index 100% rename from c64/basic/math/bae2.mul10_FAC1.s rename to src/basic/math/bae2.mul10_FAC1.s diff --git a/c64/basic/math/bafe.div10_FAC1_p.s b/src/basic/math/bafe.div10_FAC1_p.s similarity index 100% rename from c64/basic/math/bafe.div10_FAC1_p.s rename to src/basic/math/bafe.div10_FAC1_p.s diff --git a/c64/basic/math/bafe.interop b/src/basic/math/bafe.interop similarity index 100% rename from c64/basic/math/bafe.interop rename to src/basic/math/bafe.interop diff --git a/c64/basic/math/bb0f.div_MEM_FAC1.s b/src/basic/math/bb0f.div_MEM_FAC1.s similarity index 100% rename from c64/basic/math/bb0f.div_MEM_FAC1.s rename to src/basic/math/bb0f.div_MEM_FAC1.s diff --git a/c64/basic/math/bb0f.interop b/src/basic/math/bb0f.interop similarity index 100% rename from c64/basic/math/bb0f.interop rename to src/basic/math/bb0f.interop diff --git a/c64/basic/math/bb12.div_FAC2_FAC1.s b/src/basic/math/bb12.div_FAC2_FAC1.s similarity index 100% rename from c64/basic/math/bb12.div_FAC2_FAC1.s rename to src/basic/math/bb12.div_FAC2_FAC1.s diff --git a/c64/basic/math/bb12.interop b/src/basic/math/bb12.interop similarity index 100% rename from c64/basic/math/bb12.interop rename to src/basic/math/bb12.interop diff --git a/c64/basic/math/bc1b.interop b/src/basic/math/bc1b.interop similarity index 100% rename from c64/basic/math/bc1b.interop rename to src/basic/math/bc1b.interop diff --git a/c64/basic/math/bc1b.round_FAC1.jmp.s b/src/basic/math/bc1b.round_FAC1.jmp.s similarity index 100% rename from c64/basic/math/bc1b.round_FAC1.jmp.s rename to src/basic/math/bc1b.round_FAC1.jmp.s diff --git a/c64/basic/math/bc2b.interop b/src/basic/math/bc2b.interop similarity index 100% rename from c64/basic/math/bc2b.interop rename to src/basic/math/bc2b.interop diff --git a/c64/basic/math/bc2b.sgn_FAC1_A.s b/src/basic/math/bc2b.sgn_FAC1_A.s similarity index 100% rename from c64/basic/math/bc2b.sgn_FAC1_A.s rename to src/basic/math/bc2b.sgn_FAC1_A.s diff --git a/c64/basic/math/bf71.interop b/src/basic/math/bf71.interop similarity index 100% rename from c64/basic/math/bf71.interop rename to src/basic/math/bf71.interop diff --git a/c64/basic/math/bf71.sqr_FAC1.s b/src/basic/math/bf71.sqr_FAC1.s similarity index 100% rename from c64/basic/math/bf71.sqr_FAC1.s rename to src/basic/math/bf71.sqr_FAC1.s diff --git a/c64/basic/math/bf78.interop b/src/basic/math/bf78.interop similarity index 100% rename from c64/basic/math/bf78.interop rename to src/basic/math/bf78.interop diff --git a/c64/basic/math/bf78.pwr_FAC2_MEM.s b/src/basic/math/bf78.pwr_FAC2_MEM.s similarity index 100% rename from c64/basic/math/bf78.pwr_FAC2_MEM.s rename to src/basic/math/bf78.pwr_FAC2_MEM.s diff --git a/c64/basic/math/bfb4.interop b/src/basic/math/bfb4.interop similarity index 100% rename from c64/basic/math/bfb4.interop rename to src/basic/math/bfb4.interop diff --git a/c64/basic/math/bfb4.toggle_sign_FAC1.s b/src/basic/math/bfb4.toggle_sign_FAC1.s similarity index 100% rename from c64/basic/math/bfb4.toggle_sign_FAC1.s rename to src/basic/math/bfb4.toggle_sign_FAC1.s diff --git a/c64/basic/math/div_FAC1_denorm.s b/src/basic/math/div_FAC1_denorm.s similarity index 100% rename from c64/basic/math/div_FAC1_denorm.s rename to src/basic/math/div_FAC1_denorm.s diff --git a/c64/basic/math/div_mantissas.s b/src/basic/math/div_mantissas.s similarity index 100% rename from c64/basic/math/div_mantissas.s rename to src/basic/math/div_mantissas.s diff --git a/c64/basic/math/e097.interop b/src/basic/math/e097.interop similarity index 100% rename from c64/basic/math/e097.interop rename to src/basic/math/e097.interop diff --git a/c64/basic/math/e097.rnd_FAC1.s b/src/basic/math/e097.rnd_FAC1.s similarity index 100% rename from c64/basic/math/e097.rnd_FAC1.s rename to src/basic/math/e097.rnd_FAC1.s diff --git a/c64/basic/math/e09a.interop b/src/basic/math/e09a.interop similarity index 100% rename from c64/basic/math/e09a.interop rename to src/basic/math/e09a.interop diff --git a/c64/basic/math/e09a.rnd_A.s b/src/basic/math/e09a.rnd_A.s similarity index 100% rename from c64/basic/math/e09a.rnd_A.s rename to src/basic/math/e09a.rnd_A.s diff --git a/c64/basic/math/e0be.interop b/src/basic/math/e0be.interop similarity index 100% rename from c64/basic/math/e0be.interop rename to src/basic/math/e0be.interop diff --git a/c64/basic/math/e0be.rnd_generate.s b/src/basic/math/e0be.rnd_generate.s similarity index 100% rename from c64/basic/math/e0be.rnd_generate.s rename to src/basic/math/e0be.rnd_generate.s diff --git a/c64/basic/math/mul10_FAC1_mul2.s b/src/basic/math/mul10_FAC1_mul2.s similarity index 100% rename from c64/basic/math/mul10_FAC1_mul2.s rename to src/basic/math/mul10_FAC1_mul2.s diff --git a/c64/basic/math/mul_FAC2_FAC1.s b/src/basic/math/mul_FAC2_FAC1.s similarity index 100% rename from c64/basic/math/mul_FAC2_FAC1.s rename to src/basic/math/mul_FAC2_FAC1.s diff --git a/c64/basic/math/mul_FAC2_FAC1_8x8.s b/src/basic/math/mul_FAC2_FAC1_8x8.s similarity index 100% rename from c64/basic/math/mul_FAC2_FAC1_8x8.s rename to src/basic/math/mul_FAC2_FAC1_8x8.s diff --git a/c64/basic/math/mul_FAC2_FAC1_shift.s b/src/basic/math/mul_FAC2_FAC1_shift.s similarity index 100% rename from c64/basic/math/mul_FAC2_FAC1_shift.s rename to src/basic/math/mul_FAC2_FAC1_shift.s diff --git a/c64/basic/math/muldiv_RESHO_helpers.s b/src/basic/math/muldiv_RESHO_helpers.s similarity index 100% rename from c64/basic/math/muldiv_RESHO_helpers.s rename to src/basic/math/muldiv_RESHO_helpers.s diff --git a/c64/basic/math/normal_FAC1.s b/src/basic/math/normal_FAC1.s similarity index 100% rename from c64/basic/math/normal_FAC1.s rename to src/basic/math/normal_FAC1.s diff --git a/c64/basic/math/rnd_seed_from_FAC1.s b/src/basic/math/rnd_seed_from_FAC1.s similarity index 100% rename from c64/basic/math/rnd_seed_from_FAC1.s rename to src/basic/math/rnd_seed_from_FAC1.s diff --git a/c64/basic/math/rnd_seed_init.s b/src/basic/math/rnd_seed_init.s similarity index 100% rename from c64/basic/math/rnd_seed_init.s rename to src/basic/math/rnd_seed_init.s diff --git a/c64/basic/math/round_FAC1.s b/src/basic/math/round_FAC1.s similarity index 100% rename from c64/basic/math/round_FAC1.s rename to src/basic/math/round_FAC1.s diff --git a/c64/basic/math_consts/aea8.const_PI.s b/src/basic/math_consts/aea8.const_PI.s similarity index 100% rename from c64/basic/math_consts/aea8.const_PI.s rename to src/basic/math_consts/aea8.const_PI.s diff --git a/c64/basic/math_consts/aea8.interop b/src/basic/math_consts/aea8.interop similarity index 100% rename from c64/basic/math_consts/aea8.interop rename to src/basic/math_consts/aea8.interop diff --git a/c64/basic/math_consts/b1a5.const_NEG_32768.s b/src/basic/math_consts/b1a5.const_NEG_32768.s similarity index 100% rename from c64/basic/math_consts/b1a5.const_NEG_32768.s rename to src/basic/math_consts/b1a5.const_NEG_32768.s diff --git a/c64/basic/math_consts/b1a5.interop b/src/basic/math_consts/b1a5.interop similarity index 100% rename from c64/basic/math_consts/b1a5.interop rename to src/basic/math_consts/b1a5.interop diff --git a/c64/basic/math_consts/b9bc.const_ONE.s b/src/basic/math_consts/b9bc.const_ONE.s similarity index 100% rename from c64/basic/math_consts/b9bc.const_ONE.s rename to src/basic/math_consts/b9bc.const_ONE.s diff --git a/c64/basic/math_consts/b9bc.interop b/src/basic/math_consts/b9bc.interop similarity index 100% rename from c64/basic/math_consts/b9bc.interop rename to src/basic/math_consts/b9bc.interop diff --git a/c64/basic/math_consts/b9d6.const_INV_SQR_2.s b/src/basic/math_consts/b9d6.const_INV_SQR_2.s similarity index 100% rename from c64/basic/math_consts/b9d6.const_INV_SQR_2.s rename to src/basic/math_consts/b9d6.const_INV_SQR_2.s diff --git a/c64/basic/math_consts/b9d6.interop b/src/basic/math_consts/b9d6.interop similarity index 100% rename from c64/basic/math_consts/b9d6.interop rename to src/basic/math_consts/b9d6.interop diff --git a/c64/basic/math_consts/b9db.const_SQR_2.s b/src/basic/math_consts/b9db.const_SQR_2.s similarity index 100% rename from c64/basic/math_consts/b9db.const_SQR_2.s rename to src/basic/math_consts/b9db.const_SQR_2.s diff --git a/c64/basic/math_consts/b9db.interop b/src/basic/math_consts/b9db.interop similarity index 100% rename from c64/basic/math_consts/b9db.interop rename to src/basic/math_consts/b9db.interop diff --git a/c64/basic/math_consts/b9e0.const_NEG_HALF.s b/src/basic/math_consts/b9e0.const_NEG_HALF.s similarity index 100% rename from c64/basic/math_consts/b9e0.const_NEG_HALF.s rename to src/basic/math_consts/b9e0.const_NEG_HALF.s diff --git a/c64/basic/math_consts/b9e0.interop b/src/basic/math_consts/b9e0.interop similarity index 100% rename from c64/basic/math_consts/b9e0.interop rename to src/basic/math_consts/b9e0.interop diff --git a/c64/basic/math_consts/b9e5.const_LOG_2.s b/src/basic/math_consts/b9e5.const_LOG_2.s similarity index 100% rename from c64/basic/math_consts/b9e5.const_LOG_2.s rename to src/basic/math_consts/b9e5.const_LOG_2.s diff --git a/c64/basic/math_consts/b9e5.interop b/src/basic/math_consts/b9e5.interop similarity index 100% rename from c64/basic/math_consts/b9e5.interop rename to src/basic/math_consts/b9e5.interop diff --git a/c64/basic/math_consts/baf9.const_TEN.s b/src/basic/math_consts/baf9.const_TEN.s similarity index 100% rename from c64/basic/math_consts/baf9.const_TEN.s rename to src/basic/math_consts/baf9.const_TEN.s diff --git a/c64/basic/math_consts/baf9.interop b/src/basic/math_consts/baf9.interop similarity index 100% rename from c64/basic/math_consts/baf9.interop rename to src/basic/math_consts/baf9.interop diff --git a/c64/basic/math_consts/bf11.const_HALF.s b/src/basic/math_consts/bf11.const_HALF.s similarity index 100% rename from c64/basic/math_consts/bf11.const_HALF.s rename to src/basic/math_consts/bf11.const_HALF.s diff --git a/c64/basic/math_consts/bf11.interop b/src/basic/math_consts/bf11.interop similarity index 100% rename from c64/basic/math_consts/bf11.interop rename to src/basic/math_consts/bf11.interop diff --git a/c64/basic/math_consts/bfbf.const_INV_LOG_2.s b/src/basic/math_consts/bfbf.const_INV_LOG_2.s similarity index 100% rename from c64/basic/math_consts/bfbf.const_INV_LOG_2.s rename to src/basic/math_consts/bfbf.const_INV_LOG_2.s diff --git a/c64/basic/math_consts/bfbf.interop b/src/basic/math_consts/bfbf.interop similarity index 100% rename from c64/basic/math_consts/bfbf.interop rename to src/basic/math_consts/bfbf.interop diff --git a/c64/basic/math_consts/bfe8.const_ONE.s b/src/basic/math_consts/bfe8.const_ONE.s similarity index 100% rename from c64/basic/math_consts/bfe8.const_ONE.s rename to src/basic/math_consts/bfe8.const_ONE.s diff --git a/c64/basic/math_consts/bfe8.interop b/src/basic/math_consts/bfe8.interop similarity index 100% rename from c64/basic/math_consts/bfe8.interop rename to src/basic/math_consts/bfe8.interop diff --git a/c64/basic/math_consts/e2e0.const_HALF_PI.s b/src/basic/math_consts/e2e0.const_HALF_PI.s similarity index 100% rename from c64/basic/math_consts/e2e0.const_HALF_PI.s rename to src/basic/math_consts/e2e0.const_HALF_PI.s diff --git a/c64/basic/math_consts/e2e0.interop b/src/basic/math_consts/e2e0.interop similarity index 100% rename from c64/basic/math_consts/e2e0.interop rename to src/basic/math_consts/e2e0.interop diff --git a/c64/basic/math_consts/e2e5.const_DOUBLE_PI.s b/src/basic/math_consts/e2e5.const_DOUBLE_PI.s similarity index 100% rename from c64/basic/math_consts/e2e5.const_DOUBLE_PI.s rename to src/basic/math_consts/e2e5.const_DOUBLE_PI.s diff --git a/c64/basic/math_consts/e2e5.interop b/src/basic/math_consts/e2e5.interop similarity index 100% rename from c64/basic/math_consts/e2e5.interop rename to src/basic/math_consts/e2e5.interop diff --git a/c64/basic/math_consts/e2ea.const_QUARTER.s b/src/basic/math_consts/e2ea.const_QUARTER.s similarity index 100% rename from c64/basic/math_consts/e2ea.const_QUARTER.s rename to src/basic/math_consts/e2ea.const_QUARTER.s diff --git a/c64/basic/math_consts/e2ea.interop b/src/basic/math_consts/e2ea.interop similarity index 100% rename from c64/basic/math_consts/e2ea.interop rename to src/basic/math_consts/e2ea.interop diff --git a/c64/basic/math_consts/e309.const_DOUBLE_PI.s b/src/basic/math_consts/e309.const_DOUBLE_PI.s similarity index 100% rename from c64/basic/math_consts/e309.const_DOUBLE_PI.s rename to src/basic/math_consts/e309.const_DOUBLE_PI.s diff --git a/c64/basic/math_consts/e309.interop b/src/basic/math_consts/e309.interop similarity index 100% rename from c64/basic/math_consts/e309.interop rename to src/basic/math_consts/e309.interop diff --git a/c64/basic/math_mov/bba2.interop b/src/basic/math_mov/bba2.interop similarity index 100% rename from c64/basic/math_mov/bba2.interop rename to src/basic/math_mov/bba2.interop diff --git a/c64/basic/math_mov/bba2.mov_MEM_FAC1.jmp.s b/src/basic/math_mov/bba2.mov_MEM_FAC1.jmp.s similarity index 100% rename from c64/basic/math_mov/bba2.mov_MEM_FAC1.jmp.s rename to src/basic/math_mov/bba2.mov_MEM_FAC1.jmp.s diff --git a/c64/basic/math_mov/bbc7.interop b/src/basic/math_mov/bbc7.interop similarity index 100% rename from c64/basic/math_mov/bbc7.interop rename to src/basic/math_mov/bbc7.interop diff --git a/c64/basic/math_mov/bbc7.mov_r_FAC1_TMP2.s b/src/basic/math_mov/bbc7.mov_r_FAC1_TMP2.s similarity index 100% rename from c64/basic/math_mov/bbc7.mov_r_FAC1_TMP2.s rename to src/basic/math_mov/bbc7.mov_r_FAC1_TMP2.s diff --git a/c64/basic/math_mov/bbca.interop b/src/basic/math_mov/bbca.interop similarity index 100% rename from c64/basic/math_mov/bbca.interop rename to src/basic/math_mov/bbca.interop diff --git a/c64/basic/math_mov/bbca.mov_r_FAC1_TMP1.s b/src/basic/math_mov/bbca.mov_r_FAC1_TMP1.s similarity index 100% rename from c64/basic/math_mov/bbca.mov_r_FAC1_TMP1.s rename to src/basic/math_mov/bbca.mov_r_FAC1_TMP1.s diff --git a/c64/basic/math_mov/bbd0.interop b/src/basic/math_mov/bbd0.interop similarity index 100% rename from c64/basic/math_mov/bbd0.interop rename to src/basic/math_mov/bbd0.interop diff --git a/c64/basic/math_mov/bbd0.mov_r_FAC1_VAR.s b/src/basic/math_mov/bbd0.mov_r_FAC1_VAR.s similarity index 100% rename from c64/basic/math_mov/bbd0.mov_r_FAC1_VAR.s rename to src/basic/math_mov/bbd0.mov_r_FAC1_VAR.s diff --git a/c64/basic/math_mov/bbd4.interop b/src/basic/math_mov/bbd4.interop similarity index 100% rename from c64/basic/math_mov/bbd4.interop rename to src/basic/math_mov/bbd4.interop diff --git a/c64/basic/math_mov/bbd4.mov_r_FAC1_MEM.s b/src/basic/math_mov/bbd4.mov_r_FAC1_MEM.s similarity index 100% rename from c64/basic/math_mov/bbd4.mov_r_FAC1_MEM.s rename to src/basic/math_mov/bbd4.mov_r_FAC1_MEM.s diff --git a/c64/basic/math_mov/bbfc.interop b/src/basic/math_mov/bbfc.interop similarity index 100% rename from c64/basic/math_mov/bbfc.interop rename to src/basic/math_mov/bbfc.interop diff --git a/c64/basic/math_mov/bbfc.mov_FAC2_FAC1.s b/src/basic/math_mov/bbfc.mov_FAC2_FAC1.s similarity index 100% rename from c64/basic/math_mov/bbfc.mov_FAC2_FAC1.s rename to src/basic/math_mov/bbfc.mov_FAC2_FAC1.s diff --git a/c64/basic/math_mov/bc0c.interop b/src/basic/math_mov/bc0c.interop similarity index 100% rename from c64/basic/math_mov/bc0c.interop rename to src/basic/math_mov/bc0c.interop diff --git a/c64/basic/math_mov/bc0c.mov_r_FAC1_FAC2.s b/src/basic/math_mov/bc0c.mov_r_FAC1_FAC2.s similarity index 100% rename from c64/basic/math_mov/bc0c.mov_r_FAC1_FAC2.s rename to src/basic/math_mov/bc0c.mov_r_FAC1_FAC2.s diff --git a/c64/basic/math_mov/bc0f.interop b/src/basic/math_mov/bc0f.interop similarity index 100% rename from c64/basic/math_mov/bc0f.interop rename to src/basic/math_mov/bc0f.interop diff --git a/c64/basic/math_mov/bc0f.mov_FAC1_FAC2.jmp.s b/src/basic/math_mov/bc0f.mov_FAC1_FAC2.jmp.s similarity index 100% rename from c64/basic/math_mov/bc0f.mov_FAC1_FAC2.jmp.s rename to src/basic/math_mov/bc0f.mov_FAC1_FAC2.jmp.s diff --git a/c64/basic/math_mov/mov_FAC1_FAC2.s b/src/basic/math_mov/mov_FAC1_FAC2.s similarity index 100% rename from c64/basic/math_mov/mov_FAC1_FAC2.s rename to src/basic/math_mov/mov_FAC1_FAC2.s diff --git a/c64/basic/math_mov/mov_FAC1_MEM.s b/src/basic/math_mov/mov_FAC1_MEM.s similarity index 100% rename from c64/basic/math_mov/mov_FAC1_MEM.s rename to src/basic/math_mov/mov_FAC1_MEM.s diff --git a/c64/basic/math_mov/mov_FAC2_FAC1.s b/src/basic/math_mov/mov_FAC2_FAC1.s similarity index 100% rename from c64/basic/math_mov/mov_FAC2_FAC1.s rename to src/basic/math_mov/mov_FAC2_FAC1.s diff --git a/c64/basic/math_mov/mov_MEM_FAC1.s b/src/basic/math_mov/mov_MEM_FAC1.s similarity index 100% rename from c64/basic/math_mov/mov_MEM_FAC1.s rename to src/basic/math_mov/mov_MEM_FAC1.s diff --git a/c64/basic/math_mov/mov_MEM_FAC2.s b/src/basic/math_mov/mov_MEM_FAC2.s similarity index 100% rename from c64/basic/math_mov/mov_MEM_FAC2.s rename to src/basic/math_mov/mov_MEM_FAC2.s diff --git a/c64/basic/math_mov/mov_r_FAC1_TMP1.s b/src/basic/math_mov/mov_r_FAC1_TMP1.s similarity index 100% rename from c64/basic/math_mov/mov_r_FAC1_TMP1.s rename to src/basic/math_mov/mov_r_FAC1_TMP1.s diff --git a/c64/basic/math_mov/mov_r_FAC1_TMP2.s b/src/basic/math_mov/mov_r_FAC1_TMP2.s similarity index 100% rename from c64/basic/math_mov/mov_r_FAC1_TMP2.s rename to src/basic/math_mov/mov_r_FAC1_TMP2.s diff --git a/c64/basic/memory/shift_mem_down_38k.s b/src/basic/memory/shift_mem_down_38k.s similarity index 100% rename from c64/basic/memory/shift_mem_down_38k.s rename to src/basic/memory/shift_mem_down_38k.s diff --git a/c64/basic/memory/shift_mem_up_38k.s b/src/basic/memory/shift_mem_up_38k.s similarity index 100% rename from c64/basic/memory/shift_mem_up_38k.s rename to src/basic/memory/shift_mem_up_38k.s diff --git a/c64/basic/memory/under_rom_routines_46k_50k.s b/src/basic/memory/under_rom_routines_46k_50k.s similarity index 100% rename from c64/basic/memory/under_rom_routines_46k_50k.s rename to src/basic/memory/under_rom_routines_46k_50k.s diff --git a/c64/basic/memory/under_rom_routines_60k.s b/src/basic/memory/under_rom_routines_60k.s similarity index 100% rename from c64/basic/memory/under_rom_routines_60k.s rename to src/basic/memory/under_rom_routines_60k.s diff --git a/c64/basic/peek_line_pointer_null_check.s b/src/basic/peek_line_pointer_null_check.s similarity index 100% rename from c64/basic/peek_line_pointer_null_check.s rename to src/basic/peek_line_pointer_null_check.s diff --git a/c64/basic/print/list_single_line.s b/src/basic/print/list_single_line.s similarity index 100% rename from c64/basic/print/list_single_line.s rename to src/basic/print/list_single_line.s diff --git a/c64/basic/print/print_features.s b/src/basic/print/print_features.s similarity index 100% rename from c64/basic/print/print_features.s rename to src/basic/print/print_features.s diff --git a/c64/basic/print/print_integer.s b/src/basic/print/print_integer.s similarity index 100% rename from c64/basic/print/print_integer.s rename to src/basic/print/print_integer.s diff --git a/c64/basic/print/print_packed_dict_string.s b/src/basic/print/print_packed_dict_string.s similarity index 100% rename from c64/basic/print/print_packed_dict_string.s rename to src/basic/print/print_packed_dict_string.s diff --git a/c64/basic/print/print_packed_freq_string.s b/src/basic/print/print_packed_freq_string.s similarity index 100% rename from c64/basic/print/print_packed_freq_string.s rename to src/basic/print/print_packed_freq_string.s diff --git a/c64/basic/print/print_packed_search.s b/src/basic/print/print_packed_search.s similarity index 100% rename from c64/basic/print/print_packed_search.s rename to src/basic/print/print_packed_search.s diff --git a/c64/basic/rom_revision/a004.identifier.s b/src/basic/rom_revision/a004.identifier.s similarity index 100% rename from c64/basic/rom_revision/a004.identifier.s rename to src/basic/rom_revision/a004.identifier.s diff --git a/c64/basic/rom_revision/a483.interop b/src/basic/rom_revision/a483.interop similarity index 100% rename from c64/basic/rom_revision/a483.interop rename to src/basic/rom_revision/a483.interop diff --git a/c64/basic/rom_revision/bf52.interop b/src/basic/rom_revision/bf52.interop similarity index 100% rename from c64/basic/rom_revision/bf52.interop rename to src/basic/rom_revision/bf52.interop diff --git a/c64/basic/rom_revision/bf52.rom_revision_basic.s b/src/basic/rom_revision/bf52.rom_revision_basic.s similarity index 100% rename from c64/basic/rom_revision/bf52.rom_revision_basic.s rename to src/basic/rom_revision/bf52.rom_revision_basic.s diff --git a/c64/basic/rom_revision/e4b7.interop b/src/basic/rom_revision/e4b7.interop similarity index 100% rename from c64/basic/rom_revision/e4b7.interop rename to src/basic/rom_revision/e4b7.interop diff --git a/c64/basic/rom_revision/e4b7.rom_revision_kernal.s b/src/basic/rom_revision/e4b7.rom_revision_kernal.s similarity index 100% rename from c64/basic/rom_revision/e4b7.rom_revision_kernal.s rename to src/basic/rom_revision/e4b7.rom_revision_kernal.s diff --git a/c64/basic/select_device.s b/src/basic/select_device.s similarity index 100% rename from c64/basic/select_device.s rename to src/basic/select_device.s diff --git a/c64/basic/tokenizer/tk_cut_away.s b/src/basic/tokenizer/tk_cut_away.s similarity index 100% rename from c64/basic/tokenizer/tk_cut_away.s rename to src/basic/tokenizer/tk_cut_away.s diff --git a/c64/basic/tokenizer/tk_pack.s b/src/basic/tokenizer/tk_pack.s similarity index 100% rename from c64/basic/tokenizer/tk_pack.s rename to src/basic/tokenizer/tk_pack.s diff --git a/c64/basic/tokenizer/tk_search.s b/src/basic/tokenizer/tk_search.s similarity index 100% rename from c64/basic/tokenizer/tk_search.s rename to src/basic/tokenizer/tk_search.s diff --git a/c64/basic/tokenizer/tk_shorten.s b/src/basic/tokenizer/tk_shorten.s similarity index 100% rename from c64/basic/tokenizer/tk_shorten.s rename to src/basic/tokenizer/tk_shorten.s diff --git a/c64/basic/tokenizer/tokenise_line.s b/src/basic/tokenizer/tokenise_line.s similarity index 100% rename from c64/basic/tokenizer/tokenise_line.s rename to src/basic/tokenizer/tokenise_line.s diff --git a/c64/basic/wedge/wedge_dos.s b/src/basic/wedge/wedge_dos.s similarity index 100% rename from c64/basic/wedge/wedge_dos.s rename to src/basic/wedge/wedge_dos.s diff --git a/c64/basic/wedge/wedge_tape.s b/src/basic/wedge/wedge_tape.s similarity index 100% rename from c64/basic/wedge/wedge_tape.s rename to src/basic/wedge/wedge_tape.s diff --git a/c64/kernal/,disabled/,aliases_ultimate64.s b/src/kernal/,disabled/,aliases_ultimate64.s similarity index 100% rename from c64/kernal/,disabled/,aliases_ultimate64.s rename to src/kernal/,disabled/,aliases_ultimate64.s diff --git a/c64/kernal/,disabled/u64_load.s b/src/kernal/,disabled/u64_load.s similarity index 100% rename from c64/kernal/,disabled/u64_load.s rename to src/kernal/,disabled/u64_load.s diff --git a/c64/kernal/,stubs/e6b6.advance_cursor.s b/src/kernal/,stubs/e6b6.advance_cursor.s similarity index 100% rename from c64/kernal/,stubs/e6b6.advance_cursor.s rename to src/kernal/,stubs/e6b6.advance_cursor.s diff --git a/c64/kernal/,stubs/e6b6.interop b/src/kernal/,stubs/e6b6.interop similarity index 100% rename from c64/kernal/,stubs/e6b6.interop rename to src/kernal/,stubs/e6b6.interop diff --git a/c64/kernal/,stubs/e701.interop b/src/kernal/,stubs/e701.interop similarity index 100% rename from c64/kernal/,stubs/e701.interop rename to src/kernal/,stubs/e701.interop diff --git a/c64/kernal/,stubs/e701.previous_line.s b/src/kernal/,stubs/e701.previous_line.s similarity index 100% rename from c64/kernal/,stubs/e701.previous_line.s rename to src/kernal/,stubs/e701.previous_line.s diff --git a/c64/kernal/,stubs/e716.chrout_screen.s b/src/kernal/,stubs/e716.chrout_screen.s similarity index 100% rename from c64/kernal/,stubs/e716.chrout_screen.s rename to src/kernal/,stubs/e716.chrout_screen.s diff --git a/c64/kernal/,stubs/e716.interop b/src/kernal/,stubs/e716.interop similarity index 100% rename from c64/kernal/,stubs/e716.interop rename to src/kernal/,stubs/e716.interop diff --git a/c64/kernal/,stubs/e96c.insert_line_at_top.s b/src/kernal/,stubs/e96c.insert_line_at_top.s similarity index 100% rename from c64/kernal/,stubs/e96c.insert_line_at_top.s rename to src/kernal/,stubs/e96c.insert_line_at_top.s diff --git a/c64/kernal/,stubs/e96c.interop b/src/kernal/,stubs/e96c.interop similarity index 100% rename from c64/kernal/,stubs/e96c.interop rename to src/kernal/,stubs/e96c.interop diff --git a/c64/kernal/,stubs/f3f6.interop b/src/kernal/,stubs/f3f6.interop similarity index 100% rename from c64/kernal/,stubs/f3f6.interop rename to src/kernal/,stubs/f3f6.interop diff --git a/c64/kernal/,stubs/f3f6.unknown.s b/src/kernal/,stubs/f3f6.unknown.s similarity index 100% rename from c64/kernal/,stubs/f3f6.unknown.s rename to src/kernal/,stubs/f3f6.unknown.s diff --git a/c64/kernal/,stubs/f646.iec_close.s b/src/kernal/,stubs/f646.iec_close.s similarity index 100% rename from c64/kernal/,stubs/f646.iec_close.s rename to src/kernal/,stubs/f646.iec_close.s diff --git a/c64/kernal/,stubs/f646.interop b/src/kernal/,stubs/f646.interop similarity index 100% rename from c64/kernal/,stubs/f646.interop rename to src/kernal/,stubs/f646.interop diff --git a/c64/kernal/,stubs/fd90.interop b/src/kernal/,stubs/fd90.interop similarity index 100% rename from c64/kernal/,stubs/fd90.interop rename to src/kernal/,stubs/fd90.interop diff --git a/c64/kernal/,stubs/fd90.unknown.s b/src/kernal/,stubs/fd90.unknown.s similarity index 100% rename from c64/kernal/,stubs/fd90.unknown.s rename to src/kernal/,stubs/fd90.unknown.s diff --git a/c64/kernal/assets/cartridge_signature.s b/src/kernal/assets/cartridge_signature.s similarity index 100% rename from c64/kernal/assets/cartridge_signature.s rename to src/kernal/assets/cartridge_signature.s diff --git a/c64/kernal/assets/e8da.colour_codes.s b/src/kernal/assets/e8da.colour_codes.s similarity index 100% rename from c64/kernal/assets/e8da.colour_codes.s rename to src/kernal/assets/e8da.colour_codes.s diff --git a/c64/kernal/assets/e8da.interop b/src/kernal/assets/e8da.interop similarity index 100% rename from c64/kernal/assets/e8da.interop rename to src/kernal/assets/e8da.interop diff --git a/c64/kernal/assets/fd30.interop b/src/kernal/assets/fd30.interop similarity index 100% rename from c64/kernal/assets/fd30.interop rename to src/kernal/assets/fd30.interop diff --git a/c64/kernal/assets/fd30.vector_defaults.s b/src/kernal/assets/fd30.vector_defaults.s similarity index 100% rename from c64/kernal/assets/fd30.vector_defaults.s rename to src/kernal/assets/fd30.vector_defaults.s diff --git a/c64/kernal/assets/filename_any.s b/src/kernal/assets/filename_any.s similarity index 100% rename from c64/kernal/assets/filename_any.s rename to src/kernal/assets/filename_any.s diff --git a/c64/kernal/assets/irq_timing_hi.s b/src/kernal/assets/irq_timing_hi.s similarity index 100% rename from c64/kernal/assets/irq_timing_hi.s rename to src/kernal/assets/irq_timing_hi.s diff --git a/c64/kernal/assets/irq_timing_lo.s b/src/kernal/assets/irq_timing_lo.s similarity index 100% rename from c64/kernal/assets/irq_timing_lo.s rename to src/kernal/assets/irq_timing_lo.s diff --git a/c64/kernal/assets/kernal_messages.s b/src/kernal/assets/kernal_messages.s similarity index 100% rename from c64/kernal/assets/kernal_messages.s rename to src/kernal/assets/kernal_messages.s diff --git a/c64/kernal/assets/programmable_keys.s b/src/kernal/assets/programmable_keys.s similarity index 100% rename from c64/kernal/assets/programmable_keys.s rename to src/kernal/assets/programmable_keys.s diff --git a/c64/kernal/board_m65/4000.interop b/src/kernal/board_m65/4000.interop similarity index 100% rename from c64/kernal/board_m65/4000.interop rename to src/kernal/board_m65/4000.interop diff --git a/c64/kernal/board_m65/4000.mega65_vectable_kernal_1.s b/src/kernal/board_m65/4000.mega65_vectable_kernal_1.s similarity index 100% rename from c64/kernal/board_m65/4000.mega65_vectable_kernal_1.s rename to src/kernal/board_m65/4000.mega65_vectable_kernal_1.s diff --git a/c64/kernal/board_m65/mega65_imports.s b/src/kernal/board_m65/mega65_imports.s similarity index 100% rename from c64/kernal/board_m65/mega65_imports.s rename to src/kernal/board_m65/mega65_imports.s diff --git a/c64/kernal/board_m65/mega65_map_helpers.s b/src/kernal/board_m65/mega65_map_helpers.s similarity index 100% rename from c64/kernal/board_m65/mega65_map_helpers.s rename to src/kernal/board_m65/mega65_map_helpers.s diff --git a/c64/kernal/board_m65/mega65_proxies.s b/src/kernal/board_m65/mega65_proxies.s similarity index 100% rename from c64/kernal/board_m65/mega65_proxies.s rename to src/kernal/board_m65/mega65_proxies.s diff --git a/c64/kernal/board_m65/mega65_redirect_tape.s b/src/kernal/board_m65/mega65_redirect_tape.s similarity index 100% rename from c64/kernal/board_m65/mega65_redirect_tape.s rename to src/kernal/board_m65/mega65_redirect_tape.s diff --git a/c64/kernal/board_m65/mega65_tape_normal_byte_store.s b/src/kernal/board_m65/mega65_tape_normal_byte_store.s similarity index 100% rename from c64/kernal/board_m65/mega65_tape_normal_byte_store.s rename to src/kernal/board_m65/mega65_tape_normal_byte_store.s diff --git a/c64/kernal/board_m65/mega65_unhide.s b/src/kernal/board_m65/mega65_unhide.s similarity index 100% rename from c64/kernal/board_m65/mega65_unhide.s rename to src/kernal/board_m65/mega65_unhide.s diff --git a/c64/kernal/board_x16/cx16_dummy.s b/src/kernal/board_x16/cx16_dummy.s similarity index 100% rename from c64/kernal/board_x16/cx16_dummy.s rename to src/kernal/board_x16/cx16_dummy.s diff --git a/c64/kernal/board_x16/cx16_stubs.s b/src/kernal/board_x16/cx16_stubs.s similarity index 100% rename from c64/kernal/board_x16/cx16_stubs.s rename to src/kernal/board_x16/cx16_stubs.s diff --git a/c64/kernal/errors.s b/src/kernal/errors.s similarity index 100% rename from c64/kernal/errors.s rename to src/kernal/errors.s diff --git a/c64/kernal/iec/acptr.s b/src/kernal/iec/acptr.s similarity index 100% rename from c64/kernal/iec/acptr.s rename to src/kernal/iec/acptr.s diff --git a/c64/kernal/iec/chkin_iec.s b/src/kernal/iec/chkin_iec.s similarity index 100% rename from c64/kernal/iec/chkin_iec.s rename to src/kernal/iec/chkin_iec.s diff --git a/c64/kernal/iec/chrin_iec.s b/src/kernal/iec/chrin_iec.s similarity index 100% rename from c64/kernal/iec/chrin_iec.s rename to src/kernal/iec/chrin_iec.s diff --git a/c64/kernal/iec/chrout_iec.s b/src/kernal/iec/chrout_iec.s similarity index 100% rename from c64/kernal/iec/chrout_iec.s rename to src/kernal/iec/chrout_iec.s diff --git a/c64/kernal/iec/ciout.s b/src/kernal/iec/ciout.s similarity index 100% rename from c64/kernal/iec/ciout.s rename to src/kernal/iec/ciout.s diff --git a/c64/kernal/iec/ckout_iec.s b/src/kernal/iec/ckout_iec.s similarity index 100% rename from c64/kernal/iec/ckout_iec.s rename to src/kernal/iec/ckout_iec.s diff --git a/c64/kernal/iec/close_iec.s b/src/kernal/iec/close_iec.s similarity index 100% rename from c64/kernal/iec/close_iec.s rename to src/kernal/iec/close_iec.s diff --git a/c64/kernal/iec/clrchn_iec.s b/src/kernal/iec/clrchn_iec.s similarity index 100% rename from c64/kernal/iec/clrchn_iec.s rename to src/kernal/iec/clrchn_iec.s diff --git a/c64/kernal/iec/iec_check_devnum.s b/src/kernal/iec/iec_check_devnum.s similarity index 100% rename from c64/kernal/iec/iec_check_devnum.s rename to src/kernal/iec/iec_check_devnum.s diff --git a/c64/kernal/iec/iec_close_load.s b/src/kernal/iec/iec_close_load.s similarity index 100% rename from c64/kernal/iec/iec_close_load.s rename to src/kernal/iec/iec_close_load.s diff --git a/c64/kernal/iec/iec_cmd_close.s b/src/kernal/iec/iec_cmd_close.s similarity index 100% rename from c64/kernal/iec/iec_cmd_close.s rename to src/kernal/iec/iec_cmd_close.s diff --git a/c64/kernal/iec/iec_cmd_open.s b/src/kernal/iec/iec_cmd_open.s similarity index 100% rename from c64/kernal/iec/iec_cmd_open.s rename to src/kernal/iec/iec_cmd_open.s diff --git a/c64/kernal/iec/iec_pull_release.s b/src/kernal/iec/iec_pull_release.s similarity index 100% rename from c64/kernal/iec/iec_pull_release.s rename to src/kernal/iec/iec_pull_release.s diff --git a/c64/kernal/iec/iec_return.s b/src/kernal/iec/iec_return.s similarity index 100% rename from c64/kernal/iec/iec_return.s rename to src/kernal/iec/iec_return.s diff --git a/c64/kernal/iec/iec_rx_byte.s b/src/kernal/iec/iec_rx_byte.s similarity index 100% rename from c64/kernal/iec/iec_rx_byte.s rename to src/kernal/iec/iec_rx_byte.s diff --git a/c64/kernal/iec/iec_rx_check_eoi.s b/src/kernal/iec/iec_rx_check_eoi.s similarity index 100% rename from c64/kernal/iec/iec_rx_check_eoi.s rename to src/kernal/iec/iec_rx_check_eoi.s diff --git a/c64/kernal/iec/iec_send_file_name.s b/src/kernal/iec/iec_send_file_name.s similarity index 100% rename from c64/kernal/iec/iec_send_file_name.s rename to src/kernal/iec/iec_send_file_name.s diff --git a/c64/kernal/iec/iec_set_idle.s b/src/kernal/iec/iec_set_idle.s similarity index 100% rename from c64/kernal/iec/iec_set_idle.s rename to src/kernal/iec/iec_set_idle.s diff --git a/c64/kernal/iec/iec_turnaround_to_listen.s b/src/kernal/iec/iec_turnaround_to_listen.s similarity index 100% rename from c64/kernal/iec/iec_turnaround_to_listen.s rename to src/kernal/iec/iec_turnaround_to_listen.s diff --git a/c64/kernal/iec/iec_turnaround_to_talk.s b/src/kernal/iec/iec_turnaround_to_talk.s similarity index 100% rename from c64/kernal/iec/iec_turnaround_to_talk.s rename to src/kernal/iec/iec_turnaround_to_talk.s diff --git a/c64/kernal/iec/iec_tx_byte.s b/src/kernal/iec/iec_tx_byte.s similarity index 100% rename from c64/kernal/iec/iec_tx_byte.s rename to src/kernal/iec/iec_tx_byte.s diff --git a/c64/kernal/iec/iec_tx_command.s b/src/kernal/iec/iec_tx_command.s similarity index 100% rename from c64/kernal/iec/iec_tx_command.s rename to src/kernal/iec/iec_tx_command.s diff --git a/c64/kernal/iec/iec_tx_command_finalize.s b/src/kernal/iec/iec_tx_command_finalize.s similarity index 100% rename from c64/kernal/iec/iec_tx_command_finalize.s rename to src/kernal/iec/iec_tx_command_finalize.s diff --git a/c64/kernal/iec/iec_tx_flush.s b/src/kernal/iec/iec_tx_flush.s similarity index 100% rename from c64/kernal/iec/iec_tx_flush.s rename to src/kernal/iec/iec_tx_flush.s diff --git a/c64/kernal/iec/iec_update_eal_by_y.s b/src/kernal/iec/iec_update_eal_by_y.s similarity index 100% rename from c64/kernal/iec/iec_update_eal_by_y.s rename to src/kernal/iec/iec_update_eal_by_y.s diff --git a/c64/kernal/iec/iec_wait1ms.s b/src/kernal/iec/iec_wait1ms.s similarity index 100% rename from c64/kernal/iec/iec_wait1ms.s rename to src/kernal/iec/iec_wait1ms.s diff --git a/c64/kernal/iec/iec_wait20us.s b/src/kernal/iec/iec_wait20us.s similarity index 100% rename from c64/kernal/iec/iec_wait20us.s rename to src/kernal/iec/iec_wait20us.s diff --git a/c64/kernal/iec/iec_wait60us.s b/src/kernal/iec/iec_wait60us.s similarity index 100% rename from c64/kernal/iec/iec_wait60us.s rename to src/kernal/iec/iec_wait60us.s diff --git a/c64/kernal/iec/iec_wait_for_clk_release.s b/src/kernal/iec/iec_wait_for_clk_release.s similarity index 100% rename from c64/kernal/iec/iec_wait_for_clk_release.s rename to src/kernal/iec/iec_wait_for_clk_release.s diff --git a/c64/kernal/iec/iec_wait_for_data_pull.s b/src/kernal/iec/iec_wait_for_data_pull.s similarity index 100% rename from c64/kernal/iec/iec_wait_for_data_pull.s rename to src/kernal/iec/iec_wait_for_data_pull.s diff --git a/c64/kernal/iec/iec_wait_for_data_release.s b/src/kernal/iec/iec_wait_for_data_release.s similarity index 100% rename from c64/kernal/iec/iec_wait_for_data_release.s rename to src/kernal/iec/iec_wait_for_data_release.s diff --git a/c64/kernal/iec/listen.s b/src/kernal/iec/listen.s similarity index 100% rename from c64/kernal/iec/listen.s rename to src/kernal/iec/listen.s diff --git a/c64/kernal/iec/load_iec.s b/src/kernal/iec/load_iec.s similarity index 100% rename from c64/kernal/iec/load_iec.s rename to src/kernal/iec/load_iec.s diff --git a/c64/kernal/iec/open_iec.s b/src/kernal/iec/open_iec.s similarity index 100% rename from c64/kernal/iec/open_iec.s rename to src/kernal/iec/open_iec.s diff --git a/c64/kernal/iec/save_iec.s b/src/kernal/iec/save_iec.s similarity index 100% rename from c64/kernal/iec/save_iec.s rename to src/kernal/iec/save_iec.s diff --git a/c64/kernal/iec/second.s b/src/kernal/iec/second.s similarity index 100% rename from c64/kernal/iec/second.s rename to src/kernal/iec/second.s diff --git a/c64/kernal/iec/talk.s b/src/kernal/iec/talk.s similarity index 100% rename from c64/kernal/iec/talk.s rename to src/kernal/iec/talk.s diff --git a/c64/kernal/iec/tksa.s b/src/kernal/iec/tksa.s similarity index 100% rename from c64/kernal/iec/tksa.s rename to src/kernal/iec/tksa.s diff --git a/c64/kernal/iec/unlsn.s b/src/kernal/iec/unlsn.s similarity index 100% rename from c64/kernal/iec/unlsn.s rename to src/kernal/iec/unlsn.s diff --git a/c64/kernal/iec/untlk.s b/src/kernal/iec/untlk.s similarity index 100% rename from c64/kernal/iec/untlk.s rename to src/kernal/iec/untlk.s diff --git a/c64/kernal/iec_fast/burst_cia1_advertise.s b/src/kernal/iec_fast/burst_cia1_advertise.s similarity index 100% rename from c64/kernal/iec_fast/burst_cia1_advertise.s rename to src/kernal/iec_fast/burst_cia1_advertise.s diff --git a/c64/kernal/iec_fast/burst_cia2_advertise.s b/src/kernal/iec_fast/burst_cia2_advertise.s similarity index 100% rename from c64/kernal/iec_fast/burst_cia2_advertise.s rename to src/kernal/iec_fast/burst_cia2_advertise.s diff --git a/c64/kernal/iec_fast/burst_m65_advertise.s b/src/kernal/iec_fast/burst_m65_advertise.s similarity index 100% rename from c64/kernal/iec_fast/burst_m65_advertise.s rename to src/kernal/iec_fast/burst_m65_advertise.s diff --git a/c64/kernal/iec_fast/dolphindos_detect.s b/src/kernal/iec_fast/dolphindos_detect.s similarity index 100% rename from c64/kernal/iec_fast/dolphindos_detect.s rename to src/kernal/iec_fast/dolphindos_detect.s diff --git a/c64/kernal/iec_fast/dolphindos_load.s b/src/kernal/iec_fast/dolphindos_load.s similarity index 100% rename from c64/kernal/iec_fast/dolphindos_load.s rename to src/kernal/iec_fast/dolphindos_load.s diff --git a/c64/kernal/iec_fast/jiffydos_bittable.s b/src/kernal/iec_fast/jiffydos_bittable.s similarity index 100% rename from c64/kernal/iec_fast/jiffydos_bittable.s rename to src/kernal/iec_fast/jiffydos_bittable.s diff --git a/c64/kernal/iec_fast/jiffydos_detect.s b/src/kernal/iec_fast/jiffydos_detect.s similarity index 100% rename from c64/kernal/iec_fast/jiffydos_detect.s rename to src/kernal/iec_fast/jiffydos_detect.s diff --git a/c64/kernal/iec_fast/jiffydos_load.s b/src/kernal/iec_fast/jiffydos_load.s similarity index 100% rename from c64/kernal/iec_fast/jiffydos_load.s rename to src/kernal/iec_fast/jiffydos_load.s diff --git a/c64/kernal/iec_fast/jiffydos_prepare.s b/src/kernal/iec_fast/jiffydos_prepare.s similarity index 100% rename from c64/kernal/iec_fast/jiffydos_prepare.s rename to src/kernal/iec_fast/jiffydos_prepare.s diff --git a/c64/kernal/iec_fast/jiffydos_rx_byte.s b/src/kernal/iec_fast/jiffydos_rx_byte.s similarity index 100% rename from c64/kernal/iec_fast/jiffydos_rx_byte.s rename to src/kernal/iec_fast/jiffydos_rx_byte.s diff --git a/c64/kernal/iec_fast/jiffydos_tx_byte.s b/src/kernal/iec_fast/jiffydos_tx_byte.s similarity index 100% rename from c64/kernal/iec_fast/jiffydos_tx_byte.s rename to src/kernal/iec_fast/jiffydos_tx_byte.s diff --git a/c64/kernal/iec_fast/jiffydos_wait_line.s b/src/kernal/iec_fast/jiffydos_wait_line.s similarity index 100% rename from c64/kernal/iec_fast/jiffydos_wait_line.s rename to src/kernal/iec_fast/jiffydos_wait_line.s diff --git a/c64/kernal/init/cartridge_check.s b/src/kernal/init/cartridge_check.s similarity index 100% rename from c64/kernal/init/cartridge_check.s rename to src/kernal/init/cartridge_check.s diff --git a/c64/kernal/init/cint_screen_keyboard.s b/src/kernal/init/cint_screen_keyboard.s similarity index 100% rename from c64/kernal/init/cint_screen_keyboard.s rename to src/kernal/init/cint_screen_keyboard.s diff --git a/c64/kernal/init/e518.cint_legacy.s b/src/kernal/init/e518.cint_legacy.s similarity index 100% rename from c64/kernal/init/e518.cint_legacy.s rename to src/kernal/init/e518.cint_legacy.s diff --git a/c64/kernal/init/e518.interop b/src/kernal/init/e518.interop similarity index 100% rename from c64/kernal/init/e518.interop rename to src/kernal/init/e518.interop diff --git a/c64/kernal/init/e5a0.setup_vicii.s b/src/kernal/init/e5a0.setup_vicii.s similarity index 100% rename from c64/kernal/init/e5a0.setup_vicii.s rename to src/kernal/init/e5a0.setup_vicii.s diff --git a/c64/kernal/init/fce2.hw_entry_reset.s b/src/kernal/init/fce2.hw_entry_reset.s similarity index 100% rename from c64/kernal/init/fce2.hw_entry_reset.s rename to src/kernal/init/fce2.hw_entry_reset.s diff --git a/c64/kernal/init/fce2.interop b/src/kernal/init/fce2.interop similarity index 100% rename from c64/kernal/init/fce2.interop rename to src/kernal/init/fce2.interop diff --git a/c64/kernal/init/fd50.interop b/src/kernal/init/fd50.interop similarity index 100% rename from c64/kernal/init/fd50.interop rename to src/kernal/init/fd50.interop diff --git a/c64/kernal/init/fd50.ramtas.s b/src/kernal/init/fd50.ramtas.s similarity index 100% rename from c64/kernal/init/fd50.ramtas.s rename to src/kernal/init/fd50.ramtas.s diff --git a/c64/kernal/init/fda3.ioinit.s b/src/kernal/init/fda3.ioinit.s similarity index 100% rename from c64/kernal/init/fda3.ioinit.s rename to src/kernal/init/fda3.ioinit.s diff --git a/c64/kernal/init/ff5b.cint.s b/src/kernal/init/ff5b.cint.s similarity index 100% rename from c64/kernal/init/ff5b.cint.s rename to src/kernal/init/ff5b.cint.s diff --git a/c64/kernal/init/ff5b.interop b/src/kernal/init/ff5b.interop similarity index 100% rename from c64/kernal/init/ff5b.interop rename to src/kernal/init/ff5b.interop diff --git a/c64/kernal/init/fffc.interop b/src/kernal/init/fffc.interop similarity index 100% rename from c64/kernal/init/fffc.interop rename to src/kernal/init/fffc.interop diff --git a/c64/kernal/init/fffc.vector_reset.s b/src/kernal/init/fffc.vector_reset.s similarity index 100% rename from c64/kernal/init/fffc.vector_reset.s rename to src/kernal/init/fffc.vector_reset.s diff --git a/c64/kernal/init/setup_pal_ntsc.s b/src/kernal/init/setup_pal_ntsc.s similarity index 100% rename from c64/kernal/init/setup_pal_ntsc.s rename to src/kernal/init/setup_pal_ntsc.s diff --git a/c64/kernal/interrupts/ea31.default_irq_handler.s b/src/kernal/interrupts/ea31.default_irq_handler.s similarity index 100% rename from c64/kernal/interrupts/ea31.default_irq_handler.s rename to src/kernal/interrupts/ea31.default_irq_handler.s diff --git a/c64/kernal/interrupts/ea31.interop b/src/kernal/interrupts/ea31.interop similarity index 100% rename from c64/kernal/interrupts/ea31.interop rename to src/kernal/interrupts/ea31.interop diff --git a/c64/kernal/interrupts/ea7e.ack_cia1_return_from_interrupt.s b/src/kernal/interrupts/ea7e.ack_cia1_return_from_interrupt.s similarity index 100% rename from c64/kernal/interrupts/ea7e.ack_cia1_return_from_interrupt.s rename to src/kernal/interrupts/ea7e.ack_cia1_return_from_interrupt.s diff --git a/c64/kernal/interrupts/ea81.return_from_interrupt.s b/src/kernal/interrupts/ea81.return_from_interrupt.s similarity index 100% rename from c64/kernal/interrupts/ea81.return_from_interrupt.s rename to src/kernal/interrupts/ea81.return_from_interrupt.s diff --git a/c64/kernal/interrupts/fe47.default_nmi_handler.s b/src/kernal/interrupts/fe47.default_nmi_handler.s similarity index 100% rename from c64/kernal/interrupts/fe47.default_nmi_handler.s rename to src/kernal/interrupts/fe47.default_nmi_handler.s diff --git a/c64/kernal/interrupts/fe47.interop b/src/kernal/interrupts/fe47.interop similarity index 100% rename from c64/kernal/interrupts/fe47.interop rename to src/kernal/interrupts/fe47.interop diff --git a/c64/kernal/interrupts/fe66.default_brk_handler.s b/src/kernal/interrupts/fe66.default_brk_handler.s similarity index 100% rename from c64/kernal/interrupts/fe66.default_brk_handler.s rename to src/kernal/interrupts/fe66.default_brk_handler.s diff --git a/c64/kernal/interrupts/fe66.interop b/src/kernal/interrupts/fe66.interop similarity index 100% rename from c64/kernal/interrupts/fe66.interop rename to src/kernal/interrupts/fe66.interop diff --git a/c64/kernal/interrupts/fffa.interop b/src/kernal/interrupts/fffa.interop similarity index 100% rename from c64/kernal/interrupts/fffa.interop rename to src/kernal/interrupts/fffa.interop diff --git a/c64/kernal/interrupts/fffa.vector_nmi.s b/src/kernal/interrupts/fffa.vector_nmi.s similarity index 100% rename from c64/kernal/interrupts/fffa.vector_nmi.s rename to src/kernal/interrupts/fffa.vector_nmi.s diff --git a/c64/kernal/interrupts/fffe.interop b/src/kernal/interrupts/fffe.interop similarity index 100% rename from c64/kernal/interrupts/fffe.interop rename to src/kernal/interrupts/fffe.interop diff --git a/c64/kernal/interrupts/fffe.vector_irq.s b/src/kernal/interrupts/fffe.vector_irq.s similarity index 100% rename from c64/kernal/interrupts/fffe.vector_irq.s rename to src/kernal/interrupts/fffe.vector_irq.s diff --git a/c64/kernal/interrupts/hw_entry_irq.s b/src/kernal/interrupts/hw_entry_irq.s similarity index 100% rename from c64/kernal/interrupts/hw_entry_irq.s rename to src/kernal/interrupts/hw_entry_irq.s diff --git a/c64/kernal/interrupts/hw_entry_nmi.s b/src/kernal/interrupts/hw_entry_nmi.s similarity index 100% rename from c64/kernal/interrupts/hw_entry_nmi.s rename to src/kernal/interrupts/hw_entry_nmi.s diff --git a/c64/kernal/interrupts/nmi_lock.s b/src/kernal/interrupts/nmi_lock.s similarity index 100% rename from c64/kernal/interrupts/nmi_lock.s rename to src/kernal/interrupts/nmi_lock.s diff --git a/c64/kernal/iostack/chkinout.s b/src/kernal/iostack/chkinout.s similarity index 100% rename from c64/kernal/iostack/chkinout.s rename to src/kernal/iostack/chkinout.s diff --git a/c64/kernal/iostack/clall_real.s b/src/kernal/iostack/clall_real.s similarity index 100% rename from c64/kernal/iostack/clall_real.s rename to src/kernal/iostack/clall_real.s diff --git a/c64/kernal/iostack/e50a.interop b/src/kernal/iostack/e50a.interop similarity index 100% rename from c64/kernal/iostack/e50a.interop rename to src/kernal/iostack/e50a.interop diff --git a/c64/kernal/iostack/e50a.plot.s b/src/kernal/iostack/e50a.plot.s similarity index 100% rename from c64/kernal/iostack/e50a.plot.s rename to src/kernal/iostack/e50a.plot.s diff --git a/c64/kernal/iostack/f13e.getin.s b/src/kernal/iostack/f13e.getin.s similarity index 100% rename from c64/kernal/iostack/f13e.getin.s rename to src/kernal/iostack/f13e.getin.s diff --git a/c64/kernal/iostack/f13e.interop b/src/kernal/iostack/f13e.interop similarity index 100% rename from c64/kernal/iostack/f13e.interop rename to src/kernal/iostack/f13e.interop diff --git a/c64/kernal/iostack/f157.chrin.s b/src/kernal/iostack/f157.chrin.s similarity index 100% rename from c64/kernal/iostack/f157.chrin.s rename to src/kernal/iostack/f157.chrin.s diff --git a/c64/kernal/iostack/f157.interop b/src/kernal/iostack/f157.interop similarity index 100% rename from c64/kernal/iostack/f157.interop rename to src/kernal/iostack/f157.interop diff --git a/c64/kernal/iostack/f1ca.chrout.s b/src/kernal/iostack/f1ca.chrout.s similarity index 100% rename from c64/kernal/iostack/f1ca.chrout.s rename to src/kernal/iostack/f1ca.chrout.s diff --git a/c64/kernal/iostack/f1ca.interop b/src/kernal/iostack/f1ca.interop similarity index 100% rename from c64/kernal/iostack/f1ca.interop rename to src/kernal/iostack/f1ca.interop diff --git a/c64/kernal/iostack/f20e.chkin.s b/src/kernal/iostack/f20e.chkin.s similarity index 100% rename from c64/kernal/iostack/f20e.chkin.s rename to src/kernal/iostack/f20e.chkin.s diff --git a/c64/kernal/iostack/f20e.interop b/src/kernal/iostack/f20e.interop similarity index 100% rename from c64/kernal/iostack/f20e.interop rename to src/kernal/iostack/f20e.interop diff --git a/c64/kernal/iostack/f250.ckout.s b/src/kernal/iostack/f250.ckout.s similarity index 100% rename from c64/kernal/iostack/f250.ckout.s rename to src/kernal/iostack/f250.ckout.s diff --git a/c64/kernal/iostack/f250.interop b/src/kernal/iostack/f250.interop similarity index 100% rename from c64/kernal/iostack/f250.interop rename to src/kernal/iostack/f250.interop diff --git a/c64/kernal/iostack/f291.close.s b/src/kernal/iostack/f291.close.s similarity index 100% rename from c64/kernal/iostack/f291.close.s rename to src/kernal/iostack/f291.close.s diff --git a/c64/kernal/iostack/f291.interop b/src/kernal/iostack/f291.interop similarity index 100% rename from c64/kernal/iostack/f291.interop rename to src/kernal/iostack/f291.interop diff --git a/c64/kernal/iostack/f32f.clall.jmp.s b/src/kernal/iostack/f32f.clall.jmp.s similarity index 100% rename from c64/kernal/iostack/f32f.clall.jmp.s rename to src/kernal/iostack/f32f.clall.jmp.s diff --git a/c64/kernal/iostack/f32f.interop b/src/kernal/iostack/f32f.interop similarity index 100% rename from c64/kernal/iostack/f32f.interop rename to src/kernal/iostack/f32f.interop diff --git a/c64/kernal/iostack/f333.clrchn.s b/src/kernal/iostack/f333.clrchn.s similarity index 100% rename from c64/kernal/iostack/f333.clrchn.s rename to src/kernal/iostack/f333.clrchn.s diff --git a/c64/kernal/iostack/f333.interop b/src/kernal/iostack/f333.interop similarity index 100% rename from c64/kernal/iostack/f333.interop rename to src/kernal/iostack/f333.interop diff --git a/c64/kernal/iostack/f34a.interop b/src/kernal/iostack/f34a.interop similarity index 100% rename from c64/kernal/iostack/f34a.interop rename to src/kernal/iostack/f34a.interop diff --git a/c64/kernal/iostack/f34a.open.s b/src/kernal/iostack/f34a.open.s similarity index 100% rename from c64/kernal/iostack/f34a.open.s rename to src/kernal/iostack/f34a.open.s diff --git a/c64/kernal/iostack/f49e.interop b/src/kernal/iostack/f49e.interop similarity index 100% rename from c64/kernal/iostack/f49e.interop rename to src/kernal/iostack/f49e.interop diff --git a/c64/kernal/iostack/f49e.load_prep.s b/src/kernal/iostack/f49e.load_prep.s similarity index 100% rename from c64/kernal/iostack/f49e.load_prep.s rename to src/kernal/iostack/f49e.load_prep.s diff --git a/c64/kernal/iostack/f4a5.interop b/src/kernal/iostack/f4a5.interop similarity index 100% rename from c64/kernal/iostack/f4a5.interop rename to src/kernal/iostack/f4a5.interop diff --git a/c64/kernal/iostack/f4a5.load.s b/src/kernal/iostack/f4a5.load.s similarity index 100% rename from c64/kernal/iostack/f4a5.load.s rename to src/kernal/iostack/f4a5.load.s diff --git a/c64/kernal/iostack/f5dd.interop b/src/kernal/iostack/f5dd.interop similarity index 100% rename from c64/kernal/iostack/f5dd.interop rename to src/kernal/iostack/f5dd.interop diff --git a/c64/kernal/iostack/f5dd.save_prep.s b/src/kernal/iostack/f5dd.save_prep.s similarity index 100% rename from c64/kernal/iostack/f5dd.save_prep.s rename to src/kernal/iostack/f5dd.save_prep.s diff --git a/c64/kernal/iostack/f5ed.interop b/src/kernal/iostack/f5ed.interop similarity index 100% rename from c64/kernal/iostack/f5ed.interop rename to src/kernal/iostack/f5ed.interop diff --git a/c64/kernal/iostack/f5ed.save.s b/src/kernal/iostack/f5ed.save.s similarity index 100% rename from c64/kernal/iostack/f5ed.save.s rename to src/kernal/iostack/f5ed.save.s diff --git a/c64/kernal/iostack/f6ed.interop b/src/kernal/iostack/f6ed.interop similarity index 100% rename from c64/kernal/iostack/f6ed.interop rename to src/kernal/iostack/f6ed.interop diff --git a/c64/kernal/iostack/findfls.s b/src/kernal/iostack/findfls.s similarity index 100% rename from c64/kernal/iostack/findfls.s rename to src/kernal/iostack/findfls.s diff --git a/c64/kernal/iostack/getin_real.s b/src/kernal/iostack/getin_real.s similarity index 100% rename from c64/kernal/iostack/getin_real.s rename to src/kernal/iostack/getin_real.s diff --git a/c64/kernal/iostack/load_save_common.s b/src/kernal/iostack/load_save_common.s similarity index 100% rename from c64/kernal/iostack/load_save_common.s rename to src/kernal/iostack/load_save_common.s diff --git a/c64/kernal/iostack/pop_keyboard_buffer.s b/src/kernal/iostack/pop_keyboard_buffer.s similarity index 100% rename from c64/kernal/iostack/pop_keyboard_buffer.s rename to src/kernal/iostack/pop_keyboard_buffer.s diff --git a/c64/kernal/iostack/readst.s b/src/kernal/iostack/readst.s similarity index 100% rename from c64/kernal/iostack/readst.s rename to src/kernal/iostack/readst.s diff --git a/c64/kernal/iostack/setfls.s b/src/kernal/iostack/setfls.s similarity index 100% rename from c64/kernal/iostack/setfls.s rename to src/kernal/iostack/setfls.s diff --git a/c64/kernal/iostack/setmsg.s b/src/kernal/iostack/setmsg.s similarity index 100% rename from c64/kernal/iostack/setmsg.s rename to src/kernal/iostack/setmsg.s diff --git a/c64/kernal/iostack/setnam.s b/src/kernal/iostack/setnam.s similarity index 100% rename from c64/kernal/iostack/setnam.s rename to src/kernal/iostack/setnam.s diff --git a/c64/kernal/iostack/settmo.s b/src/kernal/iostack/settmo.s similarity index 100% rename from c64/kernal/iostack/settmo.s rename to src/kernal/iostack/settmo.s diff --git a/c64/kernal/jumptable/ff81.jcint.s b/src/kernal/jumptable/ff81.jcint.s similarity index 100% rename from c64/kernal/jumptable/ff81.jcint.s rename to src/kernal/jumptable/ff81.jcint.s diff --git a/c64/kernal/jumptable/ff84.jioinit.s b/src/kernal/jumptable/ff84.jioinit.s similarity index 100% rename from c64/kernal/jumptable/ff84.jioinit.s rename to src/kernal/jumptable/ff84.jioinit.s diff --git a/c64/kernal/jumptable/ff87.jramtas.s b/src/kernal/jumptable/ff87.jramtas.s similarity index 100% rename from c64/kernal/jumptable/ff87.jramtas.s rename to src/kernal/jumptable/ff87.jramtas.s diff --git a/c64/kernal/jumptable/ff8a.jrestor.s b/src/kernal/jumptable/ff8a.jrestor.s similarity index 100% rename from c64/kernal/jumptable/ff8a.jrestor.s rename to src/kernal/jumptable/ff8a.jrestor.s diff --git a/c64/kernal/jumptable/ff8d.jvector.s b/src/kernal/jumptable/ff8d.jvector.s similarity index 100% rename from c64/kernal/jumptable/ff8d.jvector.s rename to src/kernal/jumptable/ff8d.jvector.s diff --git a/c64/kernal/jumptable/ff90.jsetmsg.s b/src/kernal/jumptable/ff90.jsetmsg.s similarity index 100% rename from c64/kernal/jumptable/ff90.jsetmsg.s rename to src/kernal/jumptable/ff90.jsetmsg.s diff --git a/c64/kernal/jumptable/ff93.jsecond.s b/src/kernal/jumptable/ff93.jsecond.s similarity index 100% rename from c64/kernal/jumptable/ff93.jsecond.s rename to src/kernal/jumptable/ff93.jsecond.s diff --git a/c64/kernal/jumptable/ff96.jtksa.s b/src/kernal/jumptable/ff96.jtksa.s similarity index 100% rename from c64/kernal/jumptable/ff96.jtksa.s rename to src/kernal/jumptable/ff96.jtksa.s diff --git a/c64/kernal/jumptable/ff99.jmemtop.s b/src/kernal/jumptable/ff99.jmemtop.s similarity index 100% rename from c64/kernal/jumptable/ff99.jmemtop.s rename to src/kernal/jumptable/ff99.jmemtop.s diff --git a/c64/kernal/jumptable/ff9c.jmembot.s b/src/kernal/jumptable/ff9c.jmembot.s similarity index 100% rename from c64/kernal/jumptable/ff9c.jmembot.s rename to src/kernal/jumptable/ff9c.jmembot.s diff --git a/c64/kernal/jumptable/ff9f.jscnkey.s b/src/kernal/jumptable/ff9f.jscnkey.s similarity index 100% rename from c64/kernal/jumptable/ff9f.jscnkey.s rename to src/kernal/jumptable/ff9f.jscnkey.s diff --git a/c64/kernal/jumptable/ffa2.jsettmo.s b/src/kernal/jumptable/ffa2.jsettmo.s similarity index 100% rename from c64/kernal/jumptable/ffa2.jsettmo.s rename to src/kernal/jumptable/ffa2.jsettmo.s diff --git a/c64/kernal/jumptable/ffa5.jacptr.s b/src/kernal/jumptable/ffa5.jacptr.s similarity index 100% rename from c64/kernal/jumptable/ffa5.jacptr.s rename to src/kernal/jumptable/ffa5.jacptr.s diff --git a/c64/kernal/jumptable/ffa8.jciout.s b/src/kernal/jumptable/ffa8.jciout.s similarity index 100% rename from c64/kernal/jumptable/ffa8.jciout.s rename to src/kernal/jumptable/ffa8.jciout.s diff --git a/c64/kernal/jumptable/ffab.juntlk.s b/src/kernal/jumptable/ffab.juntlk.s similarity index 100% rename from c64/kernal/jumptable/ffab.juntlk.s rename to src/kernal/jumptable/ffab.juntlk.s diff --git a/c64/kernal/jumptable/ffae.junlsn.s b/src/kernal/jumptable/ffae.junlsn.s similarity index 100% rename from c64/kernal/jumptable/ffae.junlsn.s rename to src/kernal/jumptable/ffae.junlsn.s diff --git a/c64/kernal/jumptable/ffb1.jlisten.s b/src/kernal/jumptable/ffb1.jlisten.s similarity index 100% rename from c64/kernal/jumptable/ffb1.jlisten.s rename to src/kernal/jumptable/ffb1.jlisten.s diff --git a/c64/kernal/jumptable/ffb4.jtalk.s b/src/kernal/jumptable/ffb4.jtalk.s similarity index 100% rename from c64/kernal/jumptable/ffb4.jtalk.s rename to src/kernal/jumptable/ffb4.jtalk.s diff --git a/c64/kernal/jumptable/ffb7.jreadst.s b/src/kernal/jumptable/ffb7.jreadst.s similarity index 100% rename from c64/kernal/jumptable/ffb7.jreadst.s rename to src/kernal/jumptable/ffb7.jreadst.s diff --git a/c64/kernal/jumptable/ffba.jsetfls.s b/src/kernal/jumptable/ffba.jsetfls.s similarity index 100% rename from c64/kernal/jumptable/ffba.jsetfls.s rename to src/kernal/jumptable/ffba.jsetfls.s diff --git a/c64/kernal/jumptable/ffbd.jsetnam.s b/src/kernal/jumptable/ffbd.jsetnam.s similarity index 100% rename from c64/kernal/jumptable/ffbd.jsetnam.s rename to src/kernal/jumptable/ffbd.jsetnam.s diff --git a/c64/kernal/jumptable/ffc0.jopen.s b/src/kernal/jumptable/ffc0.jopen.s similarity index 100% rename from c64/kernal/jumptable/ffc0.jopen.s rename to src/kernal/jumptable/ffc0.jopen.s diff --git a/c64/kernal/jumptable/ffc3.jclose.s b/src/kernal/jumptable/ffc3.jclose.s similarity index 100% rename from c64/kernal/jumptable/ffc3.jclose.s rename to src/kernal/jumptable/ffc3.jclose.s diff --git a/c64/kernal/jumptable/ffc6.jchkin.s b/src/kernal/jumptable/ffc6.jchkin.s similarity index 100% rename from c64/kernal/jumptable/ffc6.jchkin.s rename to src/kernal/jumptable/ffc6.jchkin.s diff --git a/c64/kernal/jumptable/ffc9.jckout.s b/src/kernal/jumptable/ffc9.jckout.s similarity index 100% rename from c64/kernal/jumptable/ffc9.jckout.s rename to src/kernal/jumptable/ffc9.jckout.s diff --git a/c64/kernal/jumptable/ffcc.jclrchn.s b/src/kernal/jumptable/ffcc.jclrchn.s similarity index 100% rename from c64/kernal/jumptable/ffcc.jclrchn.s rename to src/kernal/jumptable/ffcc.jclrchn.s diff --git a/c64/kernal/jumptable/ffcf.jchrin.s b/src/kernal/jumptable/ffcf.jchrin.s similarity index 100% rename from c64/kernal/jumptable/ffcf.jchrin.s rename to src/kernal/jumptable/ffcf.jchrin.s diff --git a/c64/kernal/jumptable/ffd2.jchrout.s b/src/kernal/jumptable/ffd2.jchrout.s similarity index 100% rename from c64/kernal/jumptable/ffd2.jchrout.s rename to src/kernal/jumptable/ffd2.jchrout.s diff --git a/c64/kernal/jumptable/ffd5.jload.s b/src/kernal/jumptable/ffd5.jload.s similarity index 100% rename from c64/kernal/jumptable/ffd5.jload.s rename to src/kernal/jumptable/ffd5.jload.s diff --git a/c64/kernal/jumptable/ffd8.jsave.s b/src/kernal/jumptable/ffd8.jsave.s similarity index 100% rename from c64/kernal/jumptable/ffd8.jsave.s rename to src/kernal/jumptable/ffd8.jsave.s diff --git a/c64/kernal/jumptable/ffdb.jsettim.s b/src/kernal/jumptable/ffdb.jsettim.s similarity index 100% rename from c64/kernal/jumptable/ffdb.jsettim.s rename to src/kernal/jumptable/ffdb.jsettim.s diff --git a/c64/kernal/jumptable/ffde.jrdtim.s b/src/kernal/jumptable/ffde.jrdtim.s similarity index 100% rename from c64/kernal/jumptable/ffde.jrdtim.s rename to src/kernal/jumptable/ffde.jrdtim.s diff --git a/c64/kernal/jumptable/ffe1.jstop.s b/src/kernal/jumptable/ffe1.jstop.s similarity index 100% rename from c64/kernal/jumptable/ffe1.jstop.s rename to src/kernal/jumptable/ffe1.jstop.s diff --git a/c64/kernal/jumptable/ffe4.jgetin.s b/src/kernal/jumptable/ffe4.jgetin.s similarity index 100% rename from c64/kernal/jumptable/ffe4.jgetin.s rename to src/kernal/jumptable/ffe4.jgetin.s diff --git a/c64/kernal/jumptable/ffe7.jclall.s b/src/kernal/jumptable/ffe7.jclall.s similarity index 100% rename from c64/kernal/jumptable/ffe7.jclall.s rename to src/kernal/jumptable/ffe7.jclall.s diff --git a/c64/kernal/jumptable/ffea.judtim.s b/src/kernal/jumptable/ffea.judtim.s similarity index 100% rename from c64/kernal/jumptable/ffea.judtim.s rename to src/kernal/jumptable/ffea.judtim.s diff --git a/c64/kernal/jumptable/ffed.jscreen.s b/src/kernal/jumptable/ffed.jscreen.s similarity index 100% rename from c64/kernal/jumptable/ffed.jscreen.s rename to src/kernal/jumptable/ffed.jscreen.s diff --git a/c64/kernal/jumptable/fff0.jplot.s b/src/kernal/jumptable/fff0.jplot.s similarity index 100% rename from c64/kernal/jumptable/fff0.jplot.s rename to src/kernal/jumptable/fff0.jplot.s diff --git a/c64/kernal/jumptable/fff3.jiobase.s b/src/kernal/jumptable/fff3.jiobase.s similarity index 100% rename from c64/kernal/jumptable/fff3.jiobase.s rename to src/kernal/jumptable/fff3.jiobase.s diff --git a/c64/kernal/keyboard/chrin_keyboard.s b/src/kernal/keyboard/chrin_keyboard.s similarity index 100% rename from c64/kernal/keyboard/chrin_keyboard.s rename to src/kernal/keyboard/chrin_keyboard.s diff --git a/c64/kernal/keyboard/f142.getin_keyboard.s b/src/kernal/keyboard/f142.getin_keyboard.s similarity index 100% rename from c64/kernal/keyboard/f142.getin_keyboard.s rename to src/kernal/keyboard/f142.getin_keyboard.s diff --git a/c64/kernal/keyboard/f142.interop b/src/kernal/keyboard/f142.interop similarity index 100% rename from c64/kernal/keyboard/f142.interop rename to src/kernal/keyboard/f142.interop diff --git a/c64/kernal/keyboard/f6ed.stop.s b/src/kernal/keyboard/f6ed.stop.s similarity index 100% rename from c64/kernal/keyboard/f6ed.stop.s rename to src/kernal/keyboard/f6ed.stop.s diff --git a/c64/kernal/keyboard/kb_matrix.s b/src/kernal/keyboard/kb_matrix.s similarity index 100% rename from c64/kernal/keyboard/kb_matrix.s rename to src/kernal/keyboard/kb_matrix.s diff --git a/c64/kernal/keyboard/kb_matrix_128.s b/src/kernal/keyboard/kb_matrix_128.s similarity index 100% rename from c64/kernal/keyboard/kb_matrix_128.s rename to src/kernal/keyboard/kb_matrix_128.s diff --git a/c64/kernal/keyboard/kb_matrix_65.s b/src/kernal/keyboard/kb_matrix_65.s similarity index 100% rename from c64/kernal/keyboard/kb_matrix_65.s rename to src/kernal/keyboard/kb_matrix_65.s diff --git a/c64/kernal/keyboard/kb_matrix_alwaysrepeat.s b/src/kernal/keyboard/kb_matrix_alwaysrepeat.s similarity index 100% rename from c64/kernal/keyboard/kb_matrix_alwaysrepeat.s rename to src/kernal/keyboard/kb_matrix_alwaysrepeat.s diff --git a/c64/kernal/keyboard/kb_matrix_bucky.s b/src/kernal/keyboard/kb_matrix_bucky.s similarity index 100% rename from c64/kernal/keyboard/kb_matrix_bucky.s rename to src/kernal/keyboard/kb_matrix_bucky.s diff --git a/c64/kernal/keyboard/kb_matrix_bucky_filter.s b/src/kernal/keyboard/kb_matrix_bucky_filter.s similarity index 100% rename from c64/kernal/keyboard/kb_matrix_bucky_filter.s rename to src/kernal/keyboard/kb_matrix_bucky_filter.s diff --git a/c64/kernal/keyboard/kb_matrix_joy.s b/src/kernal/keyboard/kb_matrix_joy.s similarity index 100% rename from c64/kernal/keyboard/kb_matrix_joy.s rename to src/kernal/keyboard/kb_matrix_joy.s diff --git a/c64/kernal/keyboard/kb_matrix_lookup.s b/src/kernal/keyboard/kb_matrix_lookup.s similarity index 100% rename from c64/kernal/keyboard/kb_matrix_lookup.s rename to src/kernal/keyboard/kb_matrix_lookup.s diff --git a/c64/kernal/keyboard/kb_matrix_lookup_legacy.s b/src/kernal/keyboard/kb_matrix_lookup_legacy.s similarity index 100% rename from c64/kernal/keyboard/kb_matrix_lookup_legacy.s rename to src/kernal/keyboard/kb_matrix_lookup_legacy.s diff --git a/c64/kernal/keyboard/kb_matrix_row_keys.s b/src/kernal/keyboard/kb_matrix_row_keys.s similarity index 100% rename from c64/kernal/keyboard/kb_matrix_row_keys.s rename to src/kernal/keyboard/kb_matrix_row_keys.s diff --git a/c64/kernal/keyboard/kb_matrix_row_offsets.s b/src/kernal/keyboard/kb_matrix_row_offsets.s similarity index 100% rename from c64/kernal/keyboard/kb_matrix_row_offsets.s rename to src/kernal/keyboard/kb_matrix_row_offsets.s diff --git a/c64/kernal/keyboard/keyboard_disconnect.s b/src/kernal/keyboard/keyboard_disconnect.s similarity index 100% rename from c64/kernal/keyboard/keyboard_disconnect.s rename to src/kernal/keyboard/keyboard_disconnect.s diff --git a/c64/kernal/keyboard/scnkey.s b/src/kernal/keyboard/scnkey.s similarity index 100% rename from c64/kernal/keyboard/scnkey.s rename to src/kernal/keyboard/scnkey.s diff --git a/c64/kernal/keyboard/scnkey_128.s b/src/kernal/keyboard/scnkey_128.s similarity index 100% rename from c64/kernal/keyboard/scnkey_128.s rename to src/kernal/keyboard/scnkey_128.s diff --git a/c64/kernal/keyboard/scnkey_65.s b/src/kernal/keyboard/scnkey_65.s similarity index 100% rename from c64/kernal/keyboard/scnkey_65.s rename to src/kernal/keyboard/scnkey_65.s diff --git a/c64/kernal/keyboard/scnkey_legacy.s b/src/kernal/keyboard/scnkey_legacy.s similarity index 100% rename from c64/kernal/keyboard/scnkey_legacy.s rename to src/kernal/keyboard/scnkey_legacy.s diff --git a/c64/kernal/keyboard/scnkey_set_keytab.s b/src/kernal/keyboard/scnkey_set_keytab.s similarity index 100% rename from c64/kernal/keyboard/scnkey_set_keytab.s rename to src/kernal/keyboard/scnkey_set_keytab.s diff --git a/c64/kernal/keyboard/udtim_keyboard.s b/src/kernal/keyboard/udtim_keyboard.s similarity index 100% rename from c64/kernal/keyboard/udtim_keyboard.s rename to src/kernal/keyboard/udtim_keyboard.s diff --git a/c64/kernal/memory/fd15.interop b/src/kernal/memory/fd15.interop similarity index 100% rename from c64/kernal/memory/fd15.interop rename to src/kernal/memory/fd15.interop diff --git a/c64/kernal/memory/fd15.restor.s b/src/kernal/memory/fd15.restor.s similarity index 100% rename from c64/kernal/memory/fd15.restor.s rename to src/kernal/memory/fd15.restor.s diff --git a/c64/kernal/memory/fe25.interop b/src/kernal/memory/fe25.interop similarity index 100% rename from c64/kernal/memory/fe25.interop rename to src/kernal/memory/fe25.interop diff --git a/c64/kernal/memory/fe25.memtop.s b/src/kernal/memory/fe25.memtop.s similarity index 100% rename from c64/kernal/memory/fe25.memtop.s rename to src/kernal/memory/fe25.memtop.s diff --git a/c64/kernal/memory/membot.s b/src/kernal/memory/membot.s similarity index 100% rename from c64/kernal/memory/membot.s rename to src/kernal/memory/membot.s diff --git a/c64/kernal/memory/under_rom_routines_46k_50k.s b/src/kernal/memory/under_rom_routines_46k_50k.s similarity index 100% rename from c64/kernal/memory/under_rom_routines_46k_50k.s rename to src/kernal/memory/under_rom_routines_46k_50k.s diff --git a/c64/kernal/memory/under_rom_routines_60k.s b/src/kernal/memory/under_rom_routines_60k.s similarity index 100% rename from c64/kernal/memory/under_rom_routines_60k.s rename to src/kernal/memory/under_rom_routines_60k.s diff --git a/c64/kernal/memory/vector_real.s b/src/kernal/memory/vector_real.s similarity index 100% rename from c64/kernal/memory/vector_real.s rename to src/kernal/memory/vector_real.s diff --git a/c64/kernal/panic.s b/src/kernal/panic.s similarity index 100% rename from c64/kernal/panic.s rename to src/kernal/panic.s diff --git a/c64/kernal/print/print_hex_byte.s b/src/kernal/print/print_hex_byte.s similarity index 100% rename from c64/kernal/print/print_hex_byte.s rename to src/kernal/print/print_hex_byte.s diff --git a/c64/kernal/print/print_kernal_message.s b/src/kernal/print/print_kernal_message.s similarity index 100% rename from c64/kernal/print/print_kernal_message.s rename to src/kernal/print/print_kernal_message.s diff --git a/c64/kernal/print/print_return.s b/src/kernal/print/print_return.s similarity index 100% rename from c64/kernal/print/print_return.s rename to src/kernal/print/print_return.s diff --git a/c64/kernal/print/print_space.s b/src/kernal/print/print_space.s similarity index 100% rename from c64/kernal/print/print_space.s rename to src/kernal/print/print_space.s diff --git a/c64/kernal/print/printf.s b/src/kernal/print/printf.s similarity index 100% rename from c64/kernal/print/printf.s rename to src/kernal/print/printf.s diff --git a/c64/kernal/public_interfaces.md b/src/kernal/public_interfaces.md similarity index 100% rename from c64/kernal/public_interfaces.md rename to src/kernal/public_interfaces.md diff --git a/c64/kernal/rom_revision/ff80.interop b/src/kernal/rom_revision/ff80.interop similarity index 100% rename from c64/kernal/rom_revision/ff80.interop rename to src/kernal/rom_revision/ff80.interop diff --git a/c64/kernal/rom_revision/ff80.kernal_revision.s b/src/kernal/rom_revision/ff80.kernal_revision.s similarity index 100% rename from c64/kernal/rom_revision/ff80.kernal_revision.s rename to src/kernal/rom_revision/ff80.kernal_revision.s diff --git a/c64/kernal/rs232/chkin_rs232_up2400.s b/src/kernal/rs232/chkin_rs232_up2400.s similarity index 100% rename from c64/kernal/rs232/chkin_rs232_up2400.s rename to src/kernal/rs232/chkin_rs232_up2400.s diff --git a/c64/kernal/rs232/chkin_rs232_up9600.s b/src/kernal/rs232/chkin_rs232_up9600.s similarity index 100% rename from c64/kernal/rs232/chkin_rs232_up9600.s rename to src/kernal/rs232/chkin_rs232_up9600.s diff --git a/c64/kernal/rs232/chrin_rs232_up2400.s b/src/kernal/rs232/chrin_rs232_up2400.s similarity index 100% rename from c64/kernal/rs232/chrin_rs232_up2400.s rename to src/kernal/rs232/chrin_rs232_up2400.s diff --git a/c64/kernal/rs232/chrin_rs232_up9600.s b/src/kernal/rs232/chrin_rs232_up9600.s similarity index 100% rename from c64/kernal/rs232/chrin_rs232_up9600.s rename to src/kernal/rs232/chrin_rs232_up9600.s diff --git a/c64/kernal/rs232/chrout_rs232.s b/src/kernal/rs232/chrout_rs232.s similarity index 100% rename from c64/kernal/rs232/chrout_rs232.s rename to src/kernal/rs232/chrout_rs232.s diff --git a/c64/kernal/rs232/ckout_rs232_up2400.s b/src/kernal/rs232/ckout_rs232_up2400.s similarity index 100% rename from c64/kernal/rs232/ckout_rs232_up2400.s rename to src/kernal/rs232/ckout_rs232_up2400.s diff --git a/c64/kernal/rs232/ckout_rs232_up9600.s b/src/kernal/rs232/ckout_rs232_up9600.s similarity index 100% rename from c64/kernal/rs232/ckout_rs232_up9600.s rename to src/kernal/rs232/ckout_rs232_up9600.s diff --git a/c64/kernal/rs232/close_rs232.s b/src/kernal/rs232/close_rs232.s similarity index 100% rename from c64/kernal/rs232/close_rs232.s rename to src/kernal/rs232/close_rs232.s diff --git a/c64/kernal/rs232/getin_rs232.s b/src/kernal/rs232/getin_rs232.s similarity index 100% rename from c64/kernal/rs232/getin_rs232.s rename to src/kernal/rs232/getin_rs232.s diff --git a/c64/kernal/rs232/open_rs232.s b/src/kernal/rs232/open_rs232.s similarity index 100% rename from c64/kernal/rs232/open_rs232.s rename to src/kernal/rs232/open_rs232.s diff --git a/c64/kernal/rs232/rs232_count_channels.s b/src/kernal/rs232/rs232_count_channels.s similarity index 100% rename from c64/kernal/rs232/rs232_count_channels.s rename to src/kernal/rs232/rs232_count_channels.s diff --git a/c64/kernal/rs232/up9600_disable.s b/src/kernal/rs232/up9600_disable.s similarity index 100% rename from c64/kernal/rs232/up9600_disable.s rename to src/kernal/rs232/up9600_disable.s diff --git a/c64/kernal/rs232/up9600_enable.s b/src/kernal/rs232/up9600_enable.s similarity index 100% rename from c64/kernal/rs232/up9600_enable.s rename to src/kernal/rs232/up9600_enable.s diff --git a/c64/kernal/rs232/up9600_ihitab.s b/src/kernal/rs232/up9600_ihitab.s similarity index 100% rename from c64/kernal/rs232/up9600_ihitab.s rename to src/kernal/rs232/up9600_ihitab.s diff --git a/c64/kernal/rs232/up9600_ilotab.s b/src/kernal/rs232/up9600_ilotab.s similarity index 100% rename from c64/kernal/rs232/up9600_ilotab.s rename to src/kernal/rs232/up9600_ilotab.s diff --git a/c64/kernal/rs232/up9600_irq.s b/src/kernal/rs232/up9600_irq.s similarity index 100% rename from c64/kernal/rs232/up9600_irq.s rename to src/kernal/rs232/up9600_irq.s diff --git a/c64/kernal/rs232/up9600_nmi.s b/src/kernal/rs232/up9600_nmi.s similarity index 100% rename from c64/kernal/rs232/up9600_nmi.s rename to src/kernal/rs232/up9600_nmi.s diff --git a/c64/kernal/rs232/up9600_rsin.s b/src/kernal/rs232/up9600_rsin.s similarity index 100% rename from c64/kernal/rs232/up9600_rsin.s rename to src/kernal/rs232/up9600_rsin.s diff --git a/c64/kernal/rs232/up9600_rsout.s b/src/kernal/rs232/up9600_rsout.s similarity index 100% rename from c64/kernal/rs232/up9600_rsout.s rename to src/kernal/rs232/up9600_rsout.s diff --git a/c64/kernal/screen/chrout_screen.s b/src/kernal/screen/chrout_screen.s similarity index 100% rename from c64/kernal/screen/chrout_screen.s rename to src/kernal/screen/chrout_screen.s diff --git a/c64/kernal/screen/chrout_screen_clr.s b/src/kernal/screen/chrout_screen_clr.s similarity index 100% rename from c64/kernal/screen/chrout_screen_clr.s rename to src/kernal/screen/chrout_screen_clr.s diff --git a/c64/kernal/screen/chrout_screen_control.s b/src/kernal/screen/chrout_screen_control.s similarity index 100% rename from c64/kernal/screen/chrout_screen_control.s rename to src/kernal/screen/chrout_screen_control.s diff --git a/c64/kernal/screen/chrout_screen_crsr.s b/src/kernal/screen/chrout_screen_crsr.s similarity index 100% rename from c64/kernal/screen/chrout_screen_crsr.s rename to src/kernal/screen/chrout_screen_crsr.s diff --git a/c64/kernal/screen/chrout_screen_del.s b/src/kernal/screen/chrout_screen_del.s similarity index 100% rename from c64/kernal/screen/chrout_screen_del.s rename to src/kernal/screen/chrout_screen_del.s diff --git a/c64/kernal/screen/chrout_screen_gfxtxt.s b/src/kernal/screen/chrout_screen_gfxtxt.s similarity index 100% rename from c64/kernal/screen/chrout_screen_gfxtxt.s rename to src/kernal/screen/chrout_screen_gfxtxt.s diff --git a/c64/kernal/screen/chrout_screen_home.s b/src/kernal/screen/chrout_screen_home.s similarity index 100% rename from c64/kernal/screen/chrout_screen_home.s rename to src/kernal/screen/chrout_screen_home.s diff --git a/c64/kernal/screen/chrout_screen_ins.s b/src/kernal/screen/chrout_screen_ins.s similarity index 100% rename from c64/kernal/screen/chrout_screen_ins.s rename to src/kernal/screen/chrout_screen_ins.s diff --git a/c64/kernal/screen/chrout_screen_jumptable_codes.s b/src/kernal/screen/chrout_screen_jumptable_codes.s similarity index 100% rename from c64/kernal/screen/chrout_screen_jumptable_codes.s rename to src/kernal/screen/chrout_screen_jumptable_codes.s diff --git a/c64/kernal/screen/chrout_screen_quote.s b/src/kernal/screen/chrout_screen_quote.s similarity index 100% rename from c64/kernal/screen/chrout_screen_quote.s rename to src/kernal/screen/chrout_screen_quote.s diff --git a/c64/kernal/screen/chrout_screen_return.s b/src/kernal/screen/chrout_screen_return.s similarity index 100% rename from c64/kernal/screen/chrout_screen_return.s rename to src/kernal/screen/chrout_screen_return.s diff --git a/c64/kernal/screen/chrout_screen_rvs.s b/src/kernal/screen/chrout_screen_rvs.s similarity index 100% rename from c64/kernal/screen/chrout_screen_rvs.s rename to src/kernal/screen/chrout_screen_rvs.s diff --git a/c64/kernal/screen/chrout_screen_shift_onoff.s b/src/kernal/screen/chrout_screen_shift_onoff.s similarity index 100% rename from c64/kernal/screen/chrout_screen_shift_onoff.s rename to src/kernal/screen/chrout_screen_shift_onoff.s diff --git a/c64/kernal/screen/chrout_screen_stop.s b/src/kernal/screen/chrout_screen_stop.s similarity index 100% rename from c64/kernal/screen/chrout_screen_stop.s rename to src/kernal/screen/chrout_screen_stop.s diff --git a/c64/kernal/screen/chrout_screen_tab.s b/src/kernal/screen/chrout_screen_tab.s similarity index 100% rename from c64/kernal/screen/chrout_screen_tab.s rename to src/kernal/screen/chrout_screen_tab.s diff --git a/c64/kernal/screen/cursor.s b/src/kernal/screen/cursor.s similarity index 100% rename from c64/kernal/screen/cursor.s rename to src/kernal/screen/cursor.s diff --git a/c64/kernal/screen/cursor_enable.s b/src/kernal/screen/cursor_enable.s similarity index 100% rename from c64/kernal/screen/cursor_enable.s rename to src/kernal/screen/cursor_enable.s diff --git a/c64/kernal/screen/cursor_show.s b/src/kernal/screen/cursor_show.s similarity index 100% rename from c64/kernal/screen/cursor_show.s rename to src/kernal/screen/cursor_show.s diff --git a/c64/kernal/screen/e544.clear_screen.s b/src/kernal/screen/e544.clear_screen.s similarity index 100% rename from c64/kernal/screen/e544.clear_screen.s rename to src/kernal/screen/e544.clear_screen.s diff --git a/c64/kernal/screen/e566.cursor_home.s b/src/kernal/screen/e566.cursor_home.s similarity index 100% rename from c64/kernal/screen/e566.cursor_home.s rename to src/kernal/screen/e566.cursor_home.s diff --git a/c64/kernal/screen/e566.interop b/src/kernal/screen/e566.interop similarity index 100% rename from c64/kernal/screen/e566.interop rename to src/kernal/screen/e566.interop diff --git a/c64/kernal/screen/e56c.interop b/src/kernal/screen/e56c.interop similarity index 100% rename from c64/kernal/screen/e56c.interop rename to src/kernal/screen/e56c.interop diff --git a/c64/kernal/screen/e56c.screen_calculate_pointers.s b/src/kernal/screen/e56c.screen_calculate_pointers.s similarity index 100% rename from c64/kernal/screen/e56c.screen_calculate_pointers.s rename to src/kernal/screen/e56c.screen_calculate_pointers.s diff --git a/c64/kernal/screen/e8ea.interop b/src/kernal/screen/e8ea.interop similarity index 100% rename from c64/kernal/screen/e8ea.interop rename to src/kernal/screen/e8ea.interop diff --git a/c64/kernal/screen/e8ea.screen_scroll_up.s b/src/kernal/screen/e8ea.screen_scroll_up.s similarity index 100% rename from c64/kernal/screen/e8ea.screen_scroll_up.s rename to src/kernal/screen/e8ea.screen_scroll_up.s diff --git a/c64/kernal/screen/e9ff.interop b/src/kernal/screen/e9ff.interop similarity index 100% rename from c64/kernal/screen/e9ff.interop rename to src/kernal/screen/e9ff.interop diff --git a/c64/kernal/screen/e9ff.screen_clear_line.s b/src/kernal/screen/e9ff.screen_clear_line.s similarity index 100% rename from c64/kernal/screen/e9ff.screen_clear_line.s rename to src/kernal/screen/e9ff.screen_clear_line.s diff --git a/c64/kernal/screen/screen.s b/src/kernal/screen/screen.s similarity index 100% rename from c64/kernal/screen/screen.s rename to src/kernal/screen/screen.s diff --git a/c64/kernal/screen/screen_advance_to_next_line.s b/src/kernal/screen/screen_advance_to_next_line.s similarity index 100% rename from c64/kernal/screen/screen_advance_to_next_line.s rename to src/kernal/screen/screen_advance_to_next_line.s diff --git a/c64/kernal/screen/screen_calculate_pnt_user.s b/src/kernal/screen/screen_calculate_pnt_user.s similarity index 100% rename from c64/kernal/screen/screen_calculate_pnt_user.s rename to src/kernal/screen/screen_calculate_pnt_user.s diff --git a/c64/kernal/screen/screen_calculate_pntr_lnmx.s b/src/kernal/screen/screen_calculate_pntr_lnmx.s similarity index 100% rename from c64/kernal/screen/screen_calculate_pntr_lnmx.s rename to src/kernal/screen/screen_calculate_pntr_lnmx.s diff --git a/c64/kernal/screen/screen_check_space_ends_line.s b/src/kernal/screen/screen_check_space_ends_line.s similarity index 100% rename from c64/kernal/screen/screen_check_space_ends_line.s rename to src/kernal/screen/screen_check_space_ends_line.s diff --git a/c64/kernal/screen/screen_check_toggle_quote.s b/src/kernal/screen/screen_check_toggle_quote.s similarity index 100% rename from c64/kernal/screen/screen_check_toggle_quote.s rename to src/kernal/screen/screen_check_toggle_quote.s diff --git a/c64/kernal/screen/screen_code_to_petscii.s b/src/kernal/screen/screen_code_to_petscii.s similarity index 100% rename from c64/kernal/screen/screen_code_to_petscii.s rename to src/kernal/screen/screen_code_to_petscii.s diff --git a/c64/kernal/screen/screen_get_cliped_pntr.s b/src/kernal/screen/screen_get_cliped_pntr.s similarity index 100% rename from c64/kernal/screen/screen_get_cliped_pntr.s rename to src/kernal/screen/screen_get_cliped_pntr.s diff --git a/c64/kernal/screen/screen_get_logical_line_end_ptr.s b/src/kernal/screen/screen_get_logical_line_end_ptr.s similarity index 100% rename from c64/kernal/screen/screen_get_logical_line_end_ptr.s rename to src/kernal/screen/screen_get_logical_line_end_ptr.s diff --git a/c64/kernal/screen/screen_grow_logical_line.s b/src/kernal/screen/screen_grow_logical_line.s similarity index 100% rename from c64/kernal/screen/screen_grow_logical_line.s rename to src/kernal/screen/screen_grow_logical_line.s diff --git a/c64/kernal/screen/screen_off.s b/src/kernal/screen/screen_off.s similarity index 100% rename from c64/kernal/screen/screen_off.s rename to src/kernal/screen/screen_off.s diff --git a/c64/kernal/screen/screen_on.s b/src/kernal/screen/screen_on.s similarity index 100% rename from c64/kernal/screen/screen_on.s rename to src/kernal/screen/screen_on.s diff --git a/c64/kernal/screen/screen_preserve_sal_eal.s b/src/kernal/screen/screen_preserve_sal_eal.s similarity index 100% rename from c64/kernal/screen/screen_preserve_sal_eal.s rename to src/kernal/screen/screen_preserve_sal_eal.s diff --git a/c64/kernal/screen/screen_restore_sal_eal.s b/src/kernal/screen/screen_restore_sal_eal.s similarity index 100% rename from c64/kernal/screen/screen_restore_sal_eal.s rename to src/kernal/screen/screen_restore_sal_eal.s diff --git a/c64/kernal/status.s b/src/kernal/status.s similarity index 100% rename from c64/kernal/status.s rename to src/kernal/status.s diff --git a/c64/kernal/tape/load_tape_normal.s b/src/kernal/tape/load_tape_normal.s similarity index 100% rename from c64/kernal/tape/load_tape_normal.s rename to src/kernal/tape/load_tape_normal.s diff --git a/c64/kernal/tape/load_tape_turbo.s b/src/kernal/tape/load_tape_turbo.s similarity index 100% rename from c64/kernal/tape/load_tape_turbo.s rename to src/kernal/tape/load_tape_turbo.s diff --git a/c64/kernal/tape/tape_common.s b/src/kernal/tape/tape_common.s similarity index 100% rename from c64/kernal/tape/tape_common.s rename to src/kernal/tape/tape_common.s diff --git a/c64/kernal/tape/tape_common_autodetect.s b/src/kernal/tape/tape_common_autodetect.s similarity index 100% rename from c64/kernal/tape/tape_common_autodetect.s rename to src/kernal/tape/tape_common_autodetect.s diff --git a/c64/kernal/tape/tape_common_clean_sid.s b/src/kernal/tape/tape_common_clean_sid.s similarity index 100% rename from c64/kernal/tape/tape_common_clean_sid.s rename to src/kernal/tape/tape_common_clean_sid.s diff --git a/c64/kernal/tape/tape_common_ditch_verify.s b/src/kernal/tape/tape_common_ditch_verify.s similarity index 100% rename from c64/kernal/tape/tape_common_ditch_verify.s rename to src/kernal/tape/tape_common_ditch_verify.s diff --git a/c64/kernal/tape/tape_common_get_pulse.s b/src/kernal/tape/tape_common_get_pulse.s similarity index 100% rename from c64/kernal/tape/tape_common_get_pulse.s rename to src/kernal/tape/tape_common_get_pulse.s diff --git a/c64/kernal/tape/tape_common_motor.s b/src/kernal/tape/tape_common_motor.s similarity index 100% rename from c64/kernal/tape/tape_common_motor.s rename to src/kernal/tape/tape_common_motor.s diff --git a/c64/kernal/tape/tape_common_prepare_cia.s b/src/kernal/tape/tape_common_prepare_cia.s similarity index 100% rename from c64/kernal/tape/tape_common_prepare_cia.s rename to src/kernal/tape/tape_common_prepare_cia.s diff --git a/c64/kernal/tape/tape_common_screen.s b/src/kernal/tape/tape_common_screen.s similarity index 100% rename from c64/kernal/tape/tape_common_screen.s rename to src/kernal/tape/tape_common_screen.s diff --git a/c64/kernal/tape/tape_head_align.s b/src/kernal/tape/tape_head_align.s similarity index 100% rename from c64/kernal/tape/tape_head_align.s rename to src/kernal/tape/tape_head_align.s diff --git a/c64/kernal/tape/tape_head_align_gen_code.s b/src/kernal/tape/tape_head_align_gen_code.s similarity index 100% rename from c64/kernal/tape/tape_head_align_gen_code.s rename to src/kernal/tape/tape_head_align_gen_code.s diff --git a/c64/kernal/tape/tape_head_align_get_pulse.s b/src/kernal/tape/tape_head_align_get_pulse.s similarity index 100% rename from c64/kernal/tape/tape_head_align_get_pulse.s rename to src/kernal/tape/tape_head_align_get_pulse.s diff --git a/c64/kernal/tape/tape_head_align_help.s b/src/kernal/tape/tape_head_align_help.s similarity index 100% rename from c64/kernal/tape/tape_head_align_help.s rename to src/kernal/tape/tape_head_align_help.s diff --git a/c64/kernal/tape/tape_head_align_irq.s b/src/kernal/tape/tape_head_align_irq.s similarity index 100% rename from c64/kernal/tape/tape_head_align_irq.s rename to src/kernal/tape/tape_head_align_irq.s diff --git a/c64/kernal/tape/tape_normal_calibrate.s b/src/kernal/tape/tape_normal_calibrate.s similarity index 100% rename from c64/kernal/tape/tape_normal_calibrate.s rename to src/kernal/tape/tape_normal_calibrate.s diff --git a/c64/kernal/tape/tape_normal_get_bit.s b/src/kernal/tape/tape_normal_get_bit.s similarity index 100% rename from c64/kernal/tape/tape_normal_get_bit.s rename to src/kernal/tape/tape_normal_get_bit.s diff --git a/c64/kernal/tape/tape_normal_get_byte.s b/src/kernal/tape/tape_normal_get_byte.s similarity index 100% rename from c64/kernal/tape/tape_normal_get_byte.s rename to src/kernal/tape/tape_normal_get_byte.s diff --git a/c64/kernal/tape/tape_normal_get_data_1.s b/src/kernal/tape/tape_normal_get_data_1.s similarity index 100% rename from c64/kernal/tape/tape_normal_get_data_1.s rename to src/kernal/tape/tape_normal_get_data_1.s diff --git a/c64/kernal/tape/tape_normal_get_data_2.s b/src/kernal/tape/tape_normal_get_data_2.s similarity index 100% rename from c64/kernal/tape/tape_normal_get_data_2.s rename to src/kernal/tape/tape_normal_get_data_2.s diff --git a/c64/kernal/tape/tape_normal_get_marker.s b/src/kernal/tape/tape_normal_get_marker.s similarity index 100% rename from c64/kernal/tape/tape_normal_get_marker.s rename to src/kernal/tape/tape_normal_get_marker.s diff --git a/c64/kernal/tape/tape_normal_get_pilot.s b/src/kernal/tape/tape_normal_get_pilot.s similarity index 100% rename from c64/kernal/tape/tape_normal_get_pilot.s rename to src/kernal/tape/tape_normal_get_pilot.s diff --git a/c64/kernal/tape/tape_normal_sync.s b/src/kernal/tape/tape_normal_sync.s similarity index 100% rename from c64/kernal/tape/tape_normal_sync.s rename to src/kernal/tape/tape_normal_sync.s diff --git a/c64/kernal/tape/tape_normal_update_checksum.s b/src/kernal/tape/tape_normal_update_checksum.s similarity index 100% rename from c64/kernal/tape/tape_normal_update_checksum.s rename to src/kernal/tape/tape_normal_update_checksum.s diff --git a/c64/kernal/tape/tape_turbo_bytestore.s b/src/kernal/tape/tape_turbo_bytestore.s similarity index 100% rename from c64/kernal/tape/tape_turbo_bytestore.s rename to src/kernal/tape/tape_turbo_bytestore.s diff --git a/c64/kernal/tape/tape_turbo_get_bit.s b/src/kernal/tape/tape_turbo_get_bit.s similarity index 100% rename from c64/kernal/tape/tape_turbo_get_bit.s rename to src/kernal/tape/tape_turbo_get_bit.s diff --git a/c64/kernal/tape/tape_turbo_get_byte.s b/src/kernal/tape/tape_turbo_get_byte.s similarity index 100% rename from c64/kernal/tape/tape_turbo_get_byte.s rename to src/kernal/tape/tape_turbo_get_byte.s diff --git a/c64/kernal/tape/tape_turbo_sync.s b/src/kernal/tape/tape_turbo_sync.s similarity index 100% rename from c64/kernal/tape/tape_turbo_sync.s rename to src/kernal/tape/tape_turbo_sync.s diff --git a/c64/kernal/tape/tape_turbo_sync_first.s b/src/kernal/tape/tape_turbo_sync_first.s similarity index 100% rename from c64/kernal/tape/tape_turbo_sync_first.s rename to src/kernal/tape/tape_turbo_sync_first.s diff --git a/c64/kernal/time/rdtim.s b/src/kernal/time/rdtim.s similarity index 100% rename from c64/kernal/time/rdtim.s rename to src/kernal/time/rdtim.s diff --git a/c64/kernal/time/settim.s b/src/kernal/time/settim.s similarity index 100% rename from c64/kernal/time/settim.s rename to src/kernal/time/settim.s diff --git a/c64/kernal/time/udtim.s b/src/kernal/time/udtim.s similarity index 100% rename from c64/kernal/time/udtim.s rename to src/kernal/time/udtim.s diff --git a/c64/program_traces/BASIC2.trace b/src/program_traces/BASIC2.trace similarity index 100% rename from c64/program_traces/BASIC2.trace rename to src/program_traces/BASIC2.trace diff --git a/c64/program_traces/README.md b/src/program_traces/README.md similarity index 100% rename from c64/program_traces/README.md rename to src/program_traces/README.md