diff --git a/ioC0Page.go b/apple2/ioC0Page.go
similarity index 100%
rename from ioC0Page.go
rename to apple2/ioC0Page.go
diff --git a/textPages.go b/apple2/textPages.go
similarity index 100%
rename from textPages.go
rename to apple2/textPages.go
diff --git a/textPages_test.go b/apple2/textPages_test.go
similarity index 100%
rename from textPages_test.go
rename to apple2/textPages_test.go
diff --git a/6502functional_test.go b/core6502/6502functional_test.go
similarity index 100%
rename from 6502functional_test.go
rename to core6502/6502functional_test.go
diff --git a/execute.go b/core6502/execute.go
similarity index 100%
rename from execute.go
rename to core6502/execute.go
diff --git a/execute_test.go b/core6502/execute_test.go
similarity index 100%
rename from execute_test.go
rename to core6502/execute_test.go
diff --git a/memory.go b/core6502/memory.go
similarity index 100%
rename from memory.go
rename to core6502/memory.go
diff --git a/registers.go b/core6502/registers.go
similarity index 100%
rename from registers.go
rename to core6502/registers.go
diff --git a/registers_test.go b/core6502/registers_test.go
similarity index 100%
rename from registers_test.go
rename to core6502/registers_test.go
diff --git a/tests/6502_functional_test.bin b/core6502/testdata/6502_functional_test.bin
similarity index 100%
rename from tests/6502_functional_test.bin
rename to core6502/testdata/6502_functional_test.bin
diff --git a/tests/6502_functional_test.lst b/core6502/testdata/6502_functional_test.lst
similarity index 100%
rename from tests/6502_functional_test.lst
rename to core6502/testdata/6502_functional_test.lst