diff --git a/src/main/kotlin/net/razorvine/ksim65/Sim65Main.kt b/src/main/kotlin/razorvine/ksim65/Sim65Main.kt
similarity index 89%
rename from src/main/kotlin/net/razorvine/ksim65/Sim65Main.kt
rename to src/main/kotlin/razorvine/ksim65/Sim65Main.kt
index 2e30c8c..049438a 100644
--- a/src/main/kotlin/net/razorvine/ksim65/Sim65Main.kt
+++ b/src/main/kotlin/razorvine/ksim65/Sim65Main.kt
@@ -1,9 +1,9 @@
-package net.razorvine.ksim65
+package razorvine.ksim65
 
-import net.razorvine.ksim65.components.*
-import net.razorvine.ksim65.components.Cpu6502.Companion.IRQ_vector
-import net.razorvine.ksim65.components.Cpu6502.Companion.NMI_vector
-import net.razorvine.ksim65.components.Cpu6502.Companion.RESET_vector
+import razorvine.ksim65.components.*
+import razorvine.ksim65.components.Cpu6502.Companion.IRQ_vector
+import razorvine.ksim65.components.Cpu6502.Companion.NMI_vector
+import razorvine.ksim65.components.Cpu6502.Companion.RESET_vector
 
 
 fun main(args: Array<String>) {
diff --git a/src/main/kotlin/net/razorvine/ksim65/Petscii.kt b/src/main/kotlin/razorvine/ksim65/c64/Petscii.kt
similarity index 99%
rename from src/main/kotlin/net/razorvine/ksim65/Petscii.kt
rename to src/main/kotlin/razorvine/ksim65/c64/Petscii.kt
index 9173e3d..3b00d2f 100644
--- a/src/main/kotlin/net/razorvine/ksim65/Petscii.kt
+++ b/src/main/kotlin/razorvine/ksim65/c64/Petscii.kt
@@ -1,10 +1,10 @@
-package net.razorvine.ksim65
+package razorvine.ksim65.c64
 
 import java.io.CharConversionException
 
 object Petscii {
 
-    // decoding:  from Petscii/Screencodes (0-255) to unicode
+    // decoding:  from Commodore-64 Petscii/Screencodes (0-255) to unicode
     // character tables used from https://github.com/dj51d/cbmcodecs
 
     private val decodingPetsciiLowercase = arrayOf(
diff --git a/src/main/kotlin/net/razorvine/ksim65/components/Bus.kt b/src/main/kotlin/razorvine/ksim65/components/Bus.kt
similarity index 96%
rename from src/main/kotlin/net/razorvine/ksim65/components/Bus.kt
rename to src/main/kotlin/razorvine/ksim65/components/Bus.kt
index d78afd1..b116983 100644
--- a/src/main/kotlin/net/razorvine/ksim65/components/Bus.kt
+++ b/src/main/kotlin/razorvine/ksim65/components/Bus.kt
@@ -1,4 +1,4 @@
-package net.razorvine.ksim65.components
+package razorvine.ksim65.components
 
 class Bus {
 
diff --git a/src/main/kotlin/net/razorvine/ksim65/components/Component.kt b/src/main/kotlin/razorvine/ksim65/components/Component.kt
similarity index 94%
rename from src/main/kotlin/net/razorvine/ksim65/components/Component.kt
rename to src/main/kotlin/razorvine/ksim65/components/Component.kt
index c0b6f0a..ef801e2 100644
--- a/src/main/kotlin/net/razorvine/ksim65/components/Component.kt
+++ b/src/main/kotlin/razorvine/ksim65/components/Component.kt
@@ -1,6 +1,6 @@
-package net.razorvine.ksim65.components
+package razorvine.ksim65.components
 
-import net.razorvine.ksim65.Petscii
+import razorvine.ksim65.c64.Petscii
 
 typealias UByte = Short
 typealias Address = Int
diff --git a/src/main/kotlin/net/razorvine/ksim65/components/Cpu6502.kt b/src/main/kotlin/razorvine/ksim65/components/Cpu6502.kt
similarity index 99%
rename from src/main/kotlin/net/razorvine/ksim65/components/Cpu6502.kt
rename to src/main/kotlin/razorvine/ksim65/components/Cpu6502.kt
index c57b65f..5991b40 100644
--- a/src/main/kotlin/net/razorvine/ksim65/components/Cpu6502.kt
+++ b/src/main/kotlin/razorvine/ksim65/components/Cpu6502.kt
@@ -1,4 +1,4 @@
-package net.razorvine.ksim65.components
+package razorvine.ksim65.components
 
 // TODO: implement the illegal opcodes, see http://www.ffd2.com/fridge/docs/6502-NMOS.extra.opcodes
 // TODO: add the optional additional cycles to certain instructions and addressing modes
diff --git a/src/main/kotlin/net/razorvine/ksim65/components/Cpu65C02.kt b/src/main/kotlin/razorvine/ksim65/components/Cpu65C02.kt
similarity index 81%
rename from src/main/kotlin/net/razorvine/ksim65/components/Cpu65C02.kt
rename to src/main/kotlin/razorvine/ksim65/components/Cpu65C02.kt
index 2ecae02..935b7bd 100644
--- a/src/main/kotlin/net/razorvine/ksim65/components/Cpu65C02.kt
+++ b/src/main/kotlin/razorvine/ksim65/components/Cpu65C02.kt
@@ -1,4 +1,4 @@
-package net.razorvine.ksim65.components
+package razorvine.ksim65.components
 
 class Cpu65C02(stopOnBrk: Boolean) : Cpu6502(stopOnBrk) {
 
diff --git a/src/main/kotlin/net/razorvine/ksim65/components/ParallelPort.kt b/src/main/kotlin/razorvine/ksim65/components/ParallelPort.kt
similarity index 93%
rename from src/main/kotlin/net/razorvine/ksim65/components/ParallelPort.kt
rename to src/main/kotlin/razorvine/ksim65/components/ParallelPort.kt
index 0807f93..dc5fd4b 100644
--- a/src/main/kotlin/net/razorvine/ksim65/components/ParallelPort.kt
+++ b/src/main/kotlin/razorvine/ksim65/components/ParallelPort.kt
@@ -1,6 +1,6 @@
-package net.razorvine.ksim65.components
+package razorvine.ksim65.components
 
-import net.razorvine.ksim65.Petscii
+import razorvine.ksim65.c64.Petscii
 
 /**
  * A parallel output device (basically, prints bytes as characters to the screen)
diff --git a/src/main/kotlin/net/razorvine/ksim65/components/Ram.kt b/src/main/kotlin/razorvine/ksim65/components/Ram.kt
similarity index 97%
rename from src/main/kotlin/net/razorvine/ksim65/components/Ram.kt
rename to src/main/kotlin/razorvine/ksim65/components/Ram.kt
index 20876e0..2d2fb9e 100644
--- a/src/main/kotlin/net/razorvine/ksim65/components/Ram.kt
+++ b/src/main/kotlin/razorvine/ksim65/components/Ram.kt
@@ -1,4 +1,4 @@
-package net.razorvine.ksim65.components
+package razorvine.ksim65.components
 
 import java.io.File
 
diff --git a/src/main/kotlin/net/razorvine/ksim65/components/RealTimeClock.kt b/src/main/kotlin/razorvine/ksim65/components/RealTimeClock.kt
similarity index 97%
rename from src/main/kotlin/net/razorvine/ksim65/components/RealTimeClock.kt
rename to src/main/kotlin/razorvine/ksim65/components/RealTimeClock.kt
index fed939a..a59acde 100644
--- a/src/main/kotlin/net/razorvine/ksim65/components/RealTimeClock.kt
+++ b/src/main/kotlin/razorvine/ksim65/components/RealTimeClock.kt
@@ -1,4 +1,4 @@
-package net.razorvine.ksim65.components
+package razorvine.ksim65.components
 
 import java.time.LocalDate
 import java.time.LocalTime
diff --git a/src/main/kotlin/net/razorvine/ksim65/components/Rom.kt b/src/main/kotlin/razorvine/ksim65/components/Rom.kt
similarity index 94%
rename from src/main/kotlin/net/razorvine/ksim65/components/Rom.kt
rename to src/main/kotlin/razorvine/ksim65/components/Rom.kt
index d114291..38df04a 100644
--- a/src/main/kotlin/net/razorvine/ksim65/components/Rom.kt
+++ b/src/main/kotlin/razorvine/ksim65/components/Rom.kt
@@ -1,4 +1,4 @@
-package net.razorvine.ksim65.components
+package razorvine.ksim65.components
 
 class Rom(startAddress: Address, endAddress: Address, data: Array<UByte>? = null) : MemoryComponent(startAddress, endAddress) {
     private val memory =
diff --git a/src/main/kotlin/net/razorvine/ksim65/components/Timer.kt b/src/main/kotlin/razorvine/ksim65/components/Timer.kt
similarity index 98%
rename from src/main/kotlin/net/razorvine/ksim65/components/Timer.kt
rename to src/main/kotlin/razorvine/ksim65/components/Timer.kt
index 1c6d409..447d16f 100644
--- a/src/main/kotlin/net/razorvine/ksim65/components/Timer.kt
+++ b/src/main/kotlin/razorvine/ksim65/components/Timer.kt
@@ -1,4 +1,4 @@
-package net.razorvine.ksim65.components
+package razorvine.ksim65.components
 
 /**
  * A programmable timer. Causes an IRQ or NMI at specified 24-bits intervals.
diff --git a/src/test/kotlin/C64KernalStubs.kt b/src/test/kotlin/C64KernalStubs.kt
index 6370d53..622f7d8 100644
--- a/src/test/kotlin/C64KernalStubs.kt
+++ b/src/test/kotlin/C64KernalStubs.kt
@@ -1,7 +1,7 @@
-import net.razorvine.ksim65.Petscii
-import net.razorvine.ksim65.components.Address
-import net.razorvine.ksim65.components.Cpu6502
-import net.razorvine.ksim65.components.Ram
+import razorvine.ksim65.c64.Petscii
+import razorvine.ksim65.components.Address
+import razorvine.ksim65.components.Cpu6502
+import razorvine.ksim65.components.Ram
 
 
 class C64KernalStubs(private val ram: Ram) {
diff --git a/src/test/kotlin/Test6502.kt b/src/test/kotlin/Test6502.kt
index 29ac444..780464d 100644
--- a/src/test/kotlin/Test6502.kt
+++ b/src/test/kotlin/Test6502.kt
@@ -1,4 +1,4 @@
-import net.razorvine.ksim65.components.Cpu6502
+import razorvine.ksim65.components.Cpu6502
 import org.junit.jupiter.api.TestInstance
 import kotlin.test.*
 
@@ -276,7 +276,7 @@ class Test6502 : TestCommon6502() {
         writeMem(memory, 0, listOf(0x6c, 0xff, 0x00))
         mpu.step()
         assertEquals(0x6c00, mpu.PC)
-        assertEquals((5+Cpu6502.resetCycles).toLong(), mpu.totalCycles)
+        assertEquals((5+ Cpu6502.resetCycles).toLong(), mpu.totalCycles)
     }
 
     // ORA Indexed, Indirect (Y)
diff --git a/src/test/kotlin/Test6502CpuBasics.kt b/src/test/kotlin/Test6502CpuBasics.kt
index 91fe9e2..e6c66a8 100644
--- a/src/test/kotlin/Test6502CpuBasics.kt
+++ b/src/test/kotlin/Test6502CpuBasics.kt
@@ -1,6 +1,6 @@
-import net.razorvine.ksim65.components.Bus
-import net.razorvine.ksim65.components.Cpu6502
-import net.razorvine.ksim65.components.Ram
+import razorvine.ksim65.components.Bus
+import razorvine.ksim65.components.Cpu6502
+import razorvine.ksim65.components.Ram
 import kotlin.test.*
 import kotlin.system.measureNanoTime
 import kotlin.test.assertEquals
diff --git a/src/test/kotlin/Test6502Functional.kt b/src/test/kotlin/Test6502Functional.kt
index d2cf106..465c349 100644
--- a/src/test/kotlin/Test6502Functional.kt
+++ b/src/test/kotlin/Test6502Functional.kt
@@ -1,6 +1,6 @@
-import net.razorvine.ksim65.components.Bus
-import net.razorvine.ksim65.components.Ram
-import net.razorvine.ksim65.components.Cpu6502
+import razorvine.ksim65.components.Bus
+import razorvine.ksim65.components.Ram
+import razorvine.ksim65.components.Cpu6502
 import java.lang.Exception
 import kotlin.test.*
 
diff --git a/src/test/kotlin/Test6502TestSuite.kt b/src/test/kotlin/Test6502TestSuite.kt
index 22ad871..d452855 100644
--- a/src/test/kotlin/Test6502TestSuite.kt
+++ b/src/test/kotlin/Test6502TestSuite.kt
@@ -1,6 +1,6 @@
-import net.razorvine.ksim65.components.Bus
-import net.razorvine.ksim65.components.Cpu6502
-import net.razorvine.ksim65.components.Ram
+import razorvine.ksim65.components.Bus
+import razorvine.ksim65.components.Cpu6502
+import razorvine.ksim65.components.Ram
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.TestInstance
 import kotlin.test.*
diff --git a/src/test/kotlin/Test65C02.kt b/src/test/kotlin/Test65C02.kt
index 4ad03ca..353eed4 100644
--- a/src/test/kotlin/Test65C02.kt
+++ b/src/test/kotlin/Test65C02.kt
@@ -1,4 +1,4 @@
-import net.razorvine.ksim65.components.Cpu65C02
+import razorvine.ksim65.components.Cpu65C02
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.TestInstance
 import kotlin.test.*
diff --git a/src/test/kotlin/TestCommon6502.kt b/src/test/kotlin/TestCommon6502.kt
index 5691a91..e0080ae 100644
--- a/src/test/kotlin/TestCommon6502.kt
+++ b/src/test/kotlin/TestCommon6502.kt
@@ -1,5 +1,5 @@
-import net.razorvine.ksim65.components.*
 import org.junit.jupiter.api.TestInstance
+import razorvine.ksim65.components.*
 import kotlin.test.*
 
 /*
diff --git a/src/test/kotlin/TestDisassembler.kt b/src/test/kotlin/TestDisassembler.kt
index 35e62f5..1f2648b 100644
--- a/src/test/kotlin/TestDisassembler.kt
+++ b/src/test/kotlin/TestDisassembler.kt
@@ -1,5 +1,5 @@
-import net.razorvine.ksim65.components.Cpu6502
-import net.razorvine.ksim65.components.Ram
+import razorvine.ksim65.components.Cpu6502
+import razorvine.ksim65.components.Ram
 import java.io.File
 import kotlin.test.*