diff --git a/src/main.c b/cli/emulator.c similarity index 100% rename from src/main.c rename to cli/emulator.c diff --git a/src/bootstrap.c b/main/bootstrap.c similarity index 100% rename from src/bootstrap.c rename to main/bootstrap.c diff --git a/src/bootstrap.h b/main/bootstrap.h similarity index 100% rename from src/bootstrap.h rename to main/bootstrap.h diff --git a/src/cpu.c b/main/cpu.c similarity index 100% rename from src/cpu.c rename to main/cpu.c diff --git a/src/cpu.h b/main/cpu.h similarity index 100% rename from src/cpu.h rename to main/cpu.h diff --git a/src/dmg.c b/main/dmg.c similarity index 100% rename from src/dmg.c rename to main/dmg.c diff --git a/src/dmg.h b/main/dmg.h similarity index 100% rename from src/dmg.h rename to main/dmg.h diff --git a/src/instructions.c b/main/instructions.c similarity index 100% rename from src/instructions.c rename to main/instructions.c diff --git a/src/instructions.h b/main/instructions.h similarity index 100% rename from src/instructions.h rename to main/instructions.h diff --git a/src/lcd.c b/main/lcd.c similarity index 100% rename from src/lcd.c rename to main/lcd.c diff --git a/src/lcd.h b/main/lcd.h similarity index 100% rename from src/lcd.h rename to main/lcd.h diff --git a/src/rom.c b/main/rom.c similarity index 100% rename from src/rom.c rename to main/rom.c diff --git a/src/rom.h b/main/rom.h similarity index 100% rename from src/rom.h rename to main/rom.h diff --git a/src/types.h b/main/types.h similarity index 100% rename from src/types.h rename to main/types.h diff --git a/src/emulator.c b/system6/emulator.c similarity index 100% rename from src/emulator.c rename to system6/emulator.c diff --git a/src/emulator.h b/system6/emulator.h similarity index 100% rename from src/emulator.h rename to system6/emulator.h