diff --git a/.github/workflows/publish-ghp.yaml b/.github/workflows/publish-ghp.yaml
new file mode 100644
index 0000000..20f8fa6
--- /dev/null
+++ b/.github/workflows/publish-ghp.yaml
@@ -0,0 +1,21 @@
+name: Publish package to GitHub Packages
+on:
+  workflow_dispatch:
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - uses: gradle/gradle-build-action@v3
+      - name: Publish package
+        run: ./gradlew publishMavenPublicationToGitHubPackagesRepository
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index ebc0f1e..ec2a968 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -8,7 +8,7 @@ jobs:
 
     runs-on: ubuntu-latest
     environment: Release
-    if: github.repository == 'itsmattking/k2zpl'
+    if: github.repository == 'sainsburys-tech/k2zpl'
 
     steps:
       - name: Checkout
diff --git a/build.gradle.kts b/build.gradle.kts
index 1a9f0a6..ed458ca 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
     id("com.vanniktech.maven.publish") version "0.29.0"
 }
 
-group = "info.mking.k2zpl"
+group = "com.sainsburys.k2zpl"
 version = "0.1.0"
 
 repositories {
@@ -26,20 +26,31 @@ tasks.test {
     useJUnitPlatform()
 }
 
+
+publishing {
+    repositories {
+        maven("https://maven.pkg.github.com/sainsburys-tech/k2zpl") {
+            name = "GitHubPackages"
+            credentials {
+                username = System.getenv("GITHUB_ACTOR")
+                password = System.getenv("GITHUB_TOKEN")
+            }
+        }
+    }
+}
 mavenPublishing {
     publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
     signAllPublications()
-    coordinates("info.mking.k2zpl", "k2zpl", "0.1.0")
+    coordinates("com.sainsburys.k2zpl", "k2zpl", "0.1.0")
     pom {
         name.set("k2zpl")
         description.set("Kotlin DSL for ZPL (Zebra Programming Language)")
         inceptionYear.set("2024")
-        url.set("https://github.com/itsmattking/k2zpl/")
+        url.set("https://github.com/sainsburys-tech/k2zpl/")
         licenses {
             license {
-                name.set("The Unlicense")
-                url.set("https://unlicense.org")
-                distribution.set("https://unlicense.org")
+                name.set("MIT License")
+                url.set("https://github.com/sainsburys-tech/k2zpl/blob/main/LICENSE")
             }
         }
         developers {
@@ -50,9 +61,9 @@ mavenPublishing {
             }
         }
         scm {
-            url.set("https://github.com/itsmattking/k2zpl/")
-            connection.set("scm:git:git://github.com/itsmattking/k2zpl.git")
-            developerConnection.set("scm:git:ssh://git@github.com/itsmattking/k2zpl.git")
+            url.set("https://github.com/sainsburys-tech/k2zpl/")
+            connection.set("scm:git:git://github.com/sainsburys-tech/k2zpl.git")
+            developerConnection.set("scm:git:ssh://git@github.com/sainsburys-tech/k2zpl.git")
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/info/mking/k2zpl/K2ZPL.kt b/src/main/kotlin/com/sainsburys/k2zpl/K2ZPL.kt
similarity index 57%
rename from src/main/kotlin/info/mking/k2zpl/K2ZPL.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/K2ZPL.kt
index 2311e67..35cd6a8 100644
--- a/src/main/kotlin/info/mking/k2zpl/K2ZPL.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/K2ZPL.kt
@@ -1,7 +1,7 @@
 @file:Suppress("UNUSED")
 
-package info.mking.k2zpl
+package com.sainsburys.k2zpl
 
-import info.mking.k2zpl.builder.ZplBuilder
+import com.sainsburys.k2zpl.builder.ZplBuilder
 
 fun k2zpl(init: ZplBuilder.() -> Unit) = ZplBuilder().apply(init).build()
diff --git a/src/main/kotlin/info/mking/k2zpl/builder/Extensions.kt b/src/main/kotlin/com/sainsburys/k2zpl/builder/Extensions.kt
similarity index 60%
rename from src/main/kotlin/info/mking/k2zpl/builder/Extensions.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/builder/Extensions.kt
index 87c2d36..a9b0b1a 100644
--- a/src/main/kotlin/info/mking/k2zpl/builder/Extensions.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/builder/Extensions.kt
@@ -1,8 +1,8 @@
 @file:Suppress("UNUSED")
 
-package info.mking.k2zpl.builder
+package com.sainsburys.k2zpl.builder
 
-import info.mking.k2zpl.command.options.ZplYesNo
+import com.sainsburys.k2zpl.command.options.ZplYesNo
 
 internal fun Boolean.toZplYesNo(): ZplYesNo = when (this) {
     true -> ZplYesNo.YES
diff --git a/src/main/kotlin/info/mking/k2zpl/builder/ZplBuilder.kt b/src/main/kotlin/com/sainsburys/k2zpl/builder/ZplBuilder.kt
similarity index 84%
rename from src/main/kotlin/info/mking/k2zpl/builder/ZplBuilder.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/builder/ZplBuilder.kt
index 5cc43b1..d15b352 100644
--- a/src/main/kotlin/info/mking/k2zpl/builder/ZplBuilder.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/builder/ZplBuilder.kt
@@ -1,17 +1,17 @@
 @file:Suppress("UNUSED")
 
-package info.mking.k2zpl.builder
+package com.sainsburys.k2zpl.builder
 
-import info.mking.k2zpl.command.CustomCommand
-import info.mking.k2zpl.command.Font
-import info.mking.k2zpl.command.ZplCommand
-import info.mking.k2zpl.command.fieldData
-import info.mking.k2zpl.command.fieldOrigin
-import info.mking.k2zpl.command.fieldSeparator
-import info.mking.k2zpl.command.font
-import info.mking.k2zpl.command.options.ZplDpiSetting
-import info.mking.k2zpl.command.options.ZplFieldOrientation
-import info.mking.k2zpl.command.options.ZplFont
+import com.sainsburys.k2zpl.command.CustomCommand
+import com.sainsburys.k2zpl.command.Font
+import com.sainsburys.k2zpl.command.ZplCommand
+import com.sainsburys.k2zpl.command.fieldData
+import com.sainsburys.k2zpl.command.fieldOrigin
+import com.sainsburys.k2zpl.command.fieldSeparator
+import com.sainsburys.k2zpl.command.font
+import com.sainsburys.k2zpl.command.options.ZplDpiSetting
+import com.sainsburys.k2zpl.command.options.ZplFieldOrientation
+import com.sainsburys.k2zpl.command.options.ZplFont
 import kotlin.math.roundToInt
 
 class ZplBuilder {
diff --git a/src/main/kotlin/info/mking/k2zpl/command/BarCode.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/BarCode.kt
similarity index 85%
rename from src/main/kotlin/info/mking/k2zpl/command/BarCode.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/BarCode.kt
index 5ec3e7c..f72e45c 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/BarCode.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/BarCode.kt
@@ -1,10 +1,10 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.builder.ZplBuilder
-import info.mking.k2zpl.builder.toZplYesNo
-import info.mking.k2zpl.command.options.ZplBarcodeType
-import info.mking.k2zpl.command.options.ZplFieldOrientation
-import info.mking.k2zpl.command.options.ZplYesNo
+import com.sainsburys.k2zpl.builder.ZplBuilder
+import com.sainsburys.k2zpl.builder.toZplYesNo
+import com.sainsburys.k2zpl.command.options.ZplBarcodeType
+import com.sainsburys.k2zpl.command.options.ZplFieldOrientation
+import com.sainsburys.k2zpl.command.options.ZplYesNo
 
 internal data class BarCode(
     val type: ZplBarcodeType,
diff --git a/src/main/kotlin/info/mking/k2zpl/command/CustomCommand.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/CustomCommand.kt
similarity index 69%
rename from src/main/kotlin/info/mking/k2zpl/command/CustomCommand.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/CustomCommand.kt
index ecd0a08..7425782 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/CustomCommand.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/CustomCommand.kt
@@ -1,3 +1,3 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
 internal data class CustomCommand(override val command: CharSequence) : ZplCommand
\ No newline at end of file
diff --git a/src/main/kotlin/info/mking/k2zpl/command/EndFormat.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/EndFormat.kt
similarity index 68%
rename from src/main/kotlin/info/mking/k2zpl/command/EndFormat.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/EndFormat.kt
index 04d9f39..d9b2683 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/EndFormat.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/EndFormat.kt
@@ -1,6 +1,6 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.builder.ZplBuilder
+import com.sainsburys.k2zpl.builder.ZplBuilder
 
 internal data object EndFormat : ZplCommand {
     override val command: CharSequence = "^XZ"
diff --git a/src/main/kotlin/info/mking/k2zpl/command/FieldBlock.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/FieldBlock.kt
similarity index 94%
rename from src/main/kotlin/info/mking/k2zpl/command/FieldBlock.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/FieldBlock.kt
index 493ae73..09f2d79 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/FieldBlock.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/FieldBlock.kt
@@ -1,7 +1,7 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.builder.ZplBuilder
-import info.mking.k2zpl.command.options.ZplTextAlignment
+import com.sainsburys.k2zpl.builder.ZplBuilder
+import com.sainsburys.k2zpl.command.options.ZplTextAlignment
 
 internal data class FieldBlock(
     val width: Int,
diff --git a/src/main/kotlin/info/mking/k2zpl/command/FieldData.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/FieldData.kt
similarity index 80%
rename from src/main/kotlin/info/mking/k2zpl/command/FieldData.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/FieldData.kt
index 5f747db..8ca4dee 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/FieldData.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/FieldData.kt
@@ -1,6 +1,6 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.builder.ZplBuilder
+import com.sainsburys.k2zpl.builder.ZplBuilder
 
 internal data class FieldData(val data: String) : ZplCommand {
     override val command: CharSequence = "^FD"
diff --git a/src/main/kotlin/info/mking/k2zpl/command/FieldOrigin.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/FieldOrigin.kt
similarity index 86%
rename from src/main/kotlin/info/mking/k2zpl/command/FieldOrigin.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/FieldOrigin.kt
index ec94eab..d22af97 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/FieldOrigin.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/FieldOrigin.kt
@@ -1,7 +1,7 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.builder.ZplBuilder
-import info.mking.k2zpl.command.options.ZplJustification
+import com.sainsburys.k2zpl.builder.ZplBuilder
+import com.sainsburys.k2zpl.command.options.ZplJustification
 
 internal data class FieldOrigin(
     val x: Int,
diff --git a/src/main/kotlin/info/mking/k2zpl/command/FieldSeparator.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/FieldSeparator.kt
similarity index 70%
rename from src/main/kotlin/info/mking/k2zpl/command/FieldSeparator.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/FieldSeparator.kt
index 6016434..0f78098 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/FieldSeparator.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/FieldSeparator.kt
@@ -1,6 +1,6 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.builder.ZplBuilder
+import com.sainsburys.k2zpl.builder.ZplBuilder
 
 internal data object FieldSeparator : ZplCommand {
     override val command: CharSequence = "^FS"
diff --git a/src/main/kotlin/info/mking/k2zpl/command/Font.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/Font.kt
similarity index 83%
rename from src/main/kotlin/info/mking/k2zpl/command/Font.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/Font.kt
index d64e5d8..4a878cb 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/Font.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/Font.kt
@@ -1,8 +1,8 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.builder.ZplBuilder
-import info.mking.k2zpl.command.options.ZplFieldOrientation
-import info.mking.k2zpl.command.options.ZplFont
+import com.sainsburys.k2zpl.builder.ZplBuilder
+import com.sainsburys.k2zpl.command.options.ZplFieldOrientation
+import com.sainsburys.k2zpl.command.options.ZplFont
 
 internal data class Font(
     val font: ZplFont,
diff --git a/src/main/kotlin/info/mking/k2zpl/command/GraphicBox.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/GraphicBox.kt
similarity index 94%
rename from src/main/kotlin/info/mking/k2zpl/command/GraphicBox.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/GraphicBox.kt
index 81f0b40..9aefa42 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/GraphicBox.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/GraphicBox.kt
@@ -1,7 +1,7 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.builder.ZplBuilder
-import info.mking.k2zpl.command.options.ZplLineColor
+import com.sainsburys.k2zpl.builder.ZplBuilder
+import com.sainsburys.k2zpl.command.options.ZplLineColor
 
 internal data class GraphicBox(
     val width: Int,
diff --git a/src/main/kotlin/info/mking/k2zpl/command/GraphicField.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/GraphicField.kt
similarity index 90%
rename from src/main/kotlin/info/mking/k2zpl/command/GraphicField.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/GraphicField.kt
index 059e282..4fd33c2 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/GraphicField.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/GraphicField.kt
@@ -1,7 +1,7 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.builder.ZplBuilder
-import info.mking.k2zpl.command.options.ZplCompressionType
+import com.sainsburys.k2zpl.builder.ZplBuilder
+import com.sainsburys.k2zpl.command.options.ZplCompressionType
 
 internal data class GraphicField(
     val format: ZplCompressionType,
diff --git a/src/main/kotlin/info/mking/k2zpl/command/LabelHome.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/LabelHome.kt
similarity index 83%
rename from src/main/kotlin/info/mking/k2zpl/command/LabelHome.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/LabelHome.kt
index e0d5f12..30e02c1 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/LabelHome.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/LabelHome.kt
@@ -1,6 +1,6 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.builder.ZplBuilder
+import com.sainsburys.k2zpl.builder.ZplBuilder
 
 internal data class LabelHome(val x: Int, val y: Int) : ZplCommand {
     override val command: CharSequence = "^LH"
diff --git a/src/main/kotlin/info/mking/k2zpl/command/LabelLength.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/LabelLength.kt
similarity index 84%
rename from src/main/kotlin/info/mking/k2zpl/command/LabelLength.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/LabelLength.kt
index ed54aa6..f6f8c63 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/LabelLength.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/LabelLength.kt
@@ -1,6 +1,6 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.builder.ZplBuilder
+import com.sainsburys.k2zpl.builder.ZplBuilder
 
 internal data class LabelLength(val length: Int) : ZplCommand {
     init {
diff --git a/src/main/kotlin/info/mking/k2zpl/command/MediaMode.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/MediaMode.kt
similarity index 69%
rename from src/main/kotlin/info/mking/k2zpl/command/MediaMode.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/MediaMode.kt
index baabdc0..1e06fd4 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/MediaMode.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/MediaMode.kt
@@ -1,9 +1,9 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.builder.ZplBuilder
-import info.mking.k2zpl.builder.toZplYesNo
-import info.mking.k2zpl.command.options.ZplMediaMode
-import info.mking.k2zpl.command.options.ZplYesNo
+import com.sainsburys.k2zpl.builder.ZplBuilder
+import com.sainsburys.k2zpl.builder.toZplYesNo
+import com.sainsburys.k2zpl.command.options.ZplMediaMode
+import com.sainsburys.k2zpl.command.options.ZplYesNo
 
 internal data class MediaMode(
     val mediaMode: ZplMediaMode,
diff --git a/src/main/kotlin/info/mking/k2zpl/command/PrintWidth.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/PrintWidth.kt
similarity index 85%
rename from src/main/kotlin/info/mking/k2zpl/command/PrintWidth.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/PrintWidth.kt
index 166f6e6..f27ec33 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/PrintWidth.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/PrintWidth.kt
@@ -1,6 +1,6 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.builder.ZplBuilder
+import com.sainsburys.k2zpl.builder.ZplBuilder
 
 internal data class PrintWidth(val width: Int) : ZplCommand {
     init {
diff --git a/src/main/kotlin/info/mking/k2zpl/command/StartFormat.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/StartFormat.kt
similarity index 69%
rename from src/main/kotlin/info/mking/k2zpl/command/StartFormat.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/StartFormat.kt
index 8eab425..bbac449 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/StartFormat.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/StartFormat.kt
@@ -1,6 +1,6 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.builder.ZplBuilder
+import com.sainsburys.k2zpl.builder.ZplBuilder
 
 internal data object StartFormat : ZplCommand {
     override val command: CharSequence = "^XA"
diff --git a/src/main/kotlin/info/mking/k2zpl/command/ZplCommand.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/ZplCommand.kt
similarity index 95%
rename from src/main/kotlin/info/mking/k2zpl/command/ZplCommand.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/ZplCommand.kt
index 6350d86..c406504 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/ZplCommand.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/ZplCommand.kt
@@ -1,4 +1,4 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
 interface ZplCommand {
     val command: CharSequence
diff --git a/src/main/kotlin/info/mking/k2zpl/command/options/ZplBarcodeType.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplBarcodeType.kt
similarity index 60%
rename from src/main/kotlin/info/mking/k2zpl/command/options/ZplBarcodeType.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplBarcodeType.kt
index 365ca7c..1e38afc 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/options/ZplBarcodeType.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplBarcodeType.kt
@@ -1,6 +1,6 @@
 @file:Suppress("UNUSED")
 
-package info.mking.k2zpl.command.options
+package com.sainsburys.k2zpl.command.options
 
 enum class ZplBarcodeType {
     CODE_39
diff --git a/src/main/kotlin/info/mking/k2zpl/command/options/ZplCompressionType.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplCompressionType.kt
similarity index 83%
rename from src/main/kotlin/info/mking/k2zpl/command/options/ZplCompressionType.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplCompressionType.kt
index 30b65b0..7a8bfa0 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/options/ZplCompressionType.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplCompressionType.kt
@@ -1,6 +1,6 @@
 @file:Suppress("UNUSED")
 
-package info.mking.k2zpl.command.options
+package com.sainsburys.k2zpl.command.options
 
 enum class ZplCompressionType(private val value: Char) {
     ASCII('A'),
diff --git a/src/main/kotlin/info/mking/k2zpl/command/options/ZplDpiSetting.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplDpiSetting.kt
similarity index 82%
rename from src/main/kotlin/info/mking/k2zpl/command/options/ZplDpiSetting.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplDpiSetting.kt
index e80dd31..dca135d 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/options/ZplDpiSetting.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplDpiSetting.kt
@@ -1,6 +1,6 @@
 @file:Suppress("UNUSED")
 
-package info.mking.k2zpl.command.options
+package com.sainsburys.k2zpl.command.options
 
 enum class ZplDpiSetting(val dpi: Int, val dotsPerMm: Double) {
     Unset(-1, -1.0),
diff --git a/src/main/kotlin/info/mking/k2zpl/command/options/ZplFieldOrientation.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplFieldOrientation.kt
similarity index 83%
rename from src/main/kotlin/info/mking/k2zpl/command/options/ZplFieldOrientation.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplFieldOrientation.kt
index 4d7f461..58f2d0b 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/options/ZplFieldOrientation.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplFieldOrientation.kt
@@ -1,6 +1,6 @@
 @file:Suppress("UNUSED")
 
-package info.mking.k2zpl.command.options
+package com.sainsburys.k2zpl.command.options
 
 enum class ZplFieldOrientation(val code: Char) {
     NORMAL('N'),
diff --git a/src/main/kotlin/info/mking/k2zpl/command/options/ZplFont.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplFont.kt
similarity index 85%
rename from src/main/kotlin/info/mking/k2zpl/command/options/ZplFont.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplFont.kt
index 08c3740..c06a37e 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/options/ZplFont.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplFont.kt
@@ -1,6 +1,6 @@
 @file:Suppress("UNUSED")
 
-package info.mking.k2zpl.command.options
+package com.sainsburys.k2zpl.command.options
 
 enum class ZplFont(val code: Char) {
     A('A'),
diff --git a/src/main/kotlin/info/mking/k2zpl/command/options/ZplJustification.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplJustification.kt
similarity index 82%
rename from src/main/kotlin/info/mking/k2zpl/command/options/ZplJustification.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplJustification.kt
index 4c4ec99..86beebd 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/options/ZplJustification.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplJustification.kt
@@ -1,6 +1,6 @@
 @file:Suppress("UNUSED")
 
-package info.mking.k2zpl.command.options
+package com.sainsburys.k2zpl.command.options
 
 enum class ZplJustification(private val value: Char) {
     LEFT('0'),
diff --git a/src/main/kotlin/info/mking/k2zpl/command/options/ZplLineColor.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplLineColor.kt
similarity index 69%
rename from src/main/kotlin/info/mking/k2zpl/command/options/ZplLineColor.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplLineColor.kt
index 9a63d54..4e99965 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/options/ZplLineColor.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplLineColor.kt
@@ -1,6 +1,6 @@
 @file:Suppress("UNUSED")
 
-package info.mking.k2zpl.command.options
+package com.sainsburys.k2zpl.command.options
 
 enum class ZplLineColor(val code: Char) {
     BLACK('B'),
diff --git a/src/main/kotlin/info/mking/k2zpl/command/options/ZplMediaMode.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplMediaMode.kt
similarity index 85%
rename from src/main/kotlin/info/mking/k2zpl/command/options/ZplMediaMode.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplMediaMode.kt
index 1743612..21e746d 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/options/ZplMediaMode.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplMediaMode.kt
@@ -1,6 +1,6 @@
 @file:Suppress("UNUSED")
 
-package info.mking.k2zpl.command.options
+package com.sainsburys.k2zpl.command.options
 
 enum class ZplMediaMode(val value: Char) {
     TEAR_OFF('T'),
diff --git a/src/main/kotlin/info/mking/k2zpl/command/options/ZplTextAlignment.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplTextAlignment.kt
similarity index 82%
rename from src/main/kotlin/info/mking/k2zpl/command/options/ZplTextAlignment.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplTextAlignment.kt
index e932f20..6b28c0d 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/options/ZplTextAlignment.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplTextAlignment.kt
@@ -1,6 +1,6 @@
 @file:Suppress("UNUSED")
 
-package info.mking.k2zpl.command.options
+package com.sainsburys.k2zpl.command.options
 
 enum class ZplTextAlignment(val code: Char) {
     LEFT('L'),
diff --git a/src/main/kotlin/info/mking/k2zpl/command/options/ZplYesNo.kt b/src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplYesNo.kt
similarity index 79%
rename from src/main/kotlin/info/mking/k2zpl/command/options/ZplYesNo.kt
rename to src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplYesNo.kt
index 642a0db..352836e 100644
--- a/src/main/kotlin/info/mking/k2zpl/command/options/ZplYesNo.kt
+++ b/src/main/kotlin/com/sainsburys/k2zpl/command/options/ZplYesNo.kt
@@ -1,6 +1,6 @@
 @file:Suppress("UNUSED")
 
-package info.mking.k2zpl.command.options
+package com.sainsburys.k2zpl.command.options
 
 internal enum class ZplYesNo(val value: String) {
     YES("Y"),
diff --git a/src/test/kotlin/com/sainsburys/k2zpl/Extensions.kt b/src/test/kotlin/com/sainsburys/k2zpl/Extensions.kt
new file mode 100644
index 0000000..b41c97b
--- /dev/null
+++ b/src/test/kotlin/com/sainsburys/k2zpl/Extensions.kt
@@ -0,0 +1,5 @@
+package com.sainsburys.k2zpl
+
+import com.sainsburys.k2zpl.command.ZplCommand
+
+fun ZplCommand.testBuildString() = buildString { build(this) }
diff --git a/src/test/kotlin/info/mking/k2zpl/builder/ZplBuilderTest.kt b/src/test/kotlin/com/sainsburys/k2zpl/builder/ZplBuilderTest.kt
similarity index 96%
rename from src/test/kotlin/info/mking/k2zpl/builder/ZplBuilderTest.kt
rename to src/test/kotlin/com/sainsburys/k2zpl/builder/ZplBuilderTest.kt
index 1bfdb68..222e5f6 100644
--- a/src/test/kotlin/info/mking/k2zpl/builder/ZplBuilderTest.kt
+++ b/src/test/kotlin/com/sainsburys/k2zpl/builder/ZplBuilderTest.kt
@@ -1,7 +1,7 @@
-package info.mking.k2zpl.builder
+package com.sainsburys.k2zpl.builder
 
-import info.mking.k2zpl.command.ZplCommand
-import info.mking.k2zpl.command.options.ZplDpiSetting
+import com.sainsburys.k2zpl.command.ZplCommand
+import com.sainsburys.k2zpl.command.options.ZplDpiSetting
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.IsolationMode
 import io.kotest.core.spec.style.DescribeSpec
diff --git a/src/test/kotlin/info/mking/k2zpl/command/BarCodeTest.kt b/src/test/kotlin/com/sainsburys/k2zpl/command/BarCodeTest.kt
similarity index 91%
rename from src/test/kotlin/info/mking/k2zpl/command/BarCodeTest.kt
rename to src/test/kotlin/com/sainsburys/k2zpl/command/BarCodeTest.kt
index c4869e8..6cf0443 100644
--- a/src/test/kotlin/info/mking/k2zpl/command/BarCodeTest.kt
+++ b/src/test/kotlin/com/sainsburys/k2zpl/command/BarCodeTest.kt
@@ -1,10 +1,10 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.command.options.ZplBarcodeType
-import info.mking.k2zpl.command.options.ZplFieldOrientation
-import info.mking.k2zpl.command.options.ZplYesNo
-import info.mking.k2zpl.k2zpl
-import info.mking.k2zpl.testBuildString
+import com.sainsburys.k2zpl.command.options.ZplBarcodeType
+import com.sainsburys.k2zpl.command.options.ZplFieldOrientation
+import com.sainsburys.k2zpl.command.options.ZplYesNo
+import com.sainsburys.k2zpl.k2zpl
+import com.sainsburys.k2zpl.testBuildString
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.IsolationMode
 import io.kotest.core.spec.style.DescribeSpec
diff --git a/src/test/kotlin/info/mking/k2zpl/command/EndFormatTest.kt b/src/test/kotlin/com/sainsburys/k2zpl/command/EndFormatTest.kt
similarity index 83%
rename from src/test/kotlin/info/mking/k2zpl/command/EndFormatTest.kt
rename to src/test/kotlin/com/sainsburys/k2zpl/command/EndFormatTest.kt
index 1a35189..4eab3a6 100644
--- a/src/test/kotlin/info/mking/k2zpl/command/EndFormatTest.kt
+++ b/src/test/kotlin/com/sainsburys/k2zpl/command/EndFormatTest.kt
@@ -1,7 +1,7 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.k2zpl
-import info.mking.k2zpl.testBuildString
+import com.sainsburys.k2zpl.k2zpl
+import com.sainsburys.k2zpl.testBuildString
 import io.kotest.core.spec.IsolationMode
 import io.kotest.core.spec.style.DescribeSpec
 import io.kotest.matchers.shouldBe
diff --git a/src/test/kotlin/info/mking/k2zpl/command/FieldBlockTest.kt b/src/test/kotlin/com/sainsburys/k2zpl/command/FieldBlockTest.kt
similarity index 77%
rename from src/test/kotlin/info/mking/k2zpl/command/FieldBlockTest.kt
rename to src/test/kotlin/com/sainsburys/k2zpl/command/FieldBlockTest.kt
index de49c20..9f1e740 100644
--- a/src/test/kotlin/info/mking/k2zpl/command/FieldBlockTest.kt
+++ b/src/test/kotlin/com/sainsburys/k2zpl/command/FieldBlockTest.kt
@@ -1,8 +1,8 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.command.options.ZplTextAlignment
-import info.mking.k2zpl.k2zpl
-import info.mking.k2zpl.testBuildString
+import com.sainsburys.k2zpl.command.options.ZplTextAlignment
+import com.sainsburys.k2zpl.k2zpl
+import com.sainsburys.k2zpl.testBuildString
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.IsolationMode
 import io.kotest.core.spec.style.DescribeSpec
@@ -58,7 +58,13 @@ class FieldBlockTest : DescribeSpec({
     describe("fieldBlock extension function") {
         it("outputs correct command") {
             val result = k2zpl {
-                fieldBlock(width = 100, maxLines = 10, lineSpacing = 10, alignment = ZplTextAlignment.CENTER, hangingIndent = 10)
+                fieldBlock(
+                    width = 100,
+                    maxLines = 10,
+                    lineSpacing = 10,
+                    alignment = ZplTextAlignment.CENTER,
+                    hangingIndent = 10
+                )
             }
             result shouldBe "^FB100,10,10,C,10\n"
         }
@@ -70,7 +76,15 @@ class FieldBlockTest : DescribeSpec({
         }
         it("outputs correct command with x, y and data") {
             val result = k2zpl {
-                fieldBlock(x = 10, y = 10, width = 640, data = "some-data", maxLines = 1, lineSpacing = 10, alignment = ZplTextAlignment.LEFT)
+                fieldBlock(
+                    x = 10,
+                    y = 10,
+                    width = 640,
+                    data = "some-data",
+                    maxLines = 1,
+                    lineSpacing = 10,
+                    alignment = ZplTextAlignment.LEFT
+                )
             }
             result shouldBe """
                 ^FO10,10,0
diff --git a/src/test/kotlin/info/mking/k2zpl/command/FieldDataTest.kt b/src/test/kotlin/com/sainsburys/k2zpl/command/FieldDataTest.kt
similarity index 85%
rename from src/test/kotlin/info/mking/k2zpl/command/FieldDataTest.kt
rename to src/test/kotlin/com/sainsburys/k2zpl/command/FieldDataTest.kt
index 1d7304b..ab55f0f 100644
--- a/src/test/kotlin/info/mking/k2zpl/command/FieldDataTest.kt
+++ b/src/test/kotlin/com/sainsburys/k2zpl/command/FieldDataTest.kt
@@ -1,7 +1,7 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.k2zpl
-import info.mking.k2zpl.testBuildString
+import com.sainsburys.k2zpl.k2zpl
+import com.sainsburys.k2zpl.testBuildString
 import io.kotest.core.spec.IsolationMode
 import io.kotest.core.spec.style.DescribeSpec
 import io.kotest.matchers.shouldBe
diff --git a/src/test/kotlin/info/mking/k2zpl/command/FieldOriginTest.kt b/src/test/kotlin/com/sainsburys/k2zpl/command/FieldOriginTest.kt
similarity index 90%
rename from src/test/kotlin/info/mking/k2zpl/command/FieldOriginTest.kt
rename to src/test/kotlin/com/sainsburys/k2zpl/command/FieldOriginTest.kt
index 53faaee..e27faf3 100644
--- a/src/test/kotlin/info/mking/k2zpl/command/FieldOriginTest.kt
+++ b/src/test/kotlin/com/sainsburys/k2zpl/command/FieldOriginTest.kt
@@ -1,8 +1,8 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.command.options.ZplJustification
-import info.mking.k2zpl.k2zpl
-import info.mking.k2zpl.testBuildString
+import com.sainsburys.k2zpl.command.options.ZplJustification
+import com.sainsburys.k2zpl.k2zpl
+import com.sainsburys.k2zpl.testBuildString
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.IsolationMode
 import io.kotest.core.spec.style.DescribeSpec
diff --git a/src/test/kotlin/info/mking/k2zpl/command/FieldSeparatorTest.kt b/src/test/kotlin/com/sainsburys/k2zpl/command/FieldSeparatorTest.kt
similarity index 83%
rename from src/test/kotlin/info/mking/k2zpl/command/FieldSeparatorTest.kt
rename to src/test/kotlin/com/sainsburys/k2zpl/command/FieldSeparatorTest.kt
index d28ecb9..135c3c6 100644
--- a/src/test/kotlin/info/mking/k2zpl/command/FieldSeparatorTest.kt
+++ b/src/test/kotlin/com/sainsburys/k2zpl/command/FieldSeparatorTest.kt
@@ -1,7 +1,7 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.k2zpl
-import info.mking.k2zpl.testBuildString
+import com.sainsburys.k2zpl.k2zpl
+import com.sainsburys.k2zpl.testBuildString
 import io.kotest.core.spec.IsolationMode
 import io.kotest.core.spec.style.DescribeSpec
 import io.kotest.matchers.shouldBe
diff --git a/src/test/kotlin/info/mking/k2zpl/command/FontTest.kt b/src/test/kotlin/com/sainsburys/k2zpl/command/FontTest.kt
similarity index 89%
rename from src/test/kotlin/info/mking/k2zpl/command/FontTest.kt
rename to src/test/kotlin/com/sainsburys/k2zpl/command/FontTest.kt
index e593824..1810b31 100644
--- a/src/test/kotlin/info/mking/k2zpl/command/FontTest.kt
+++ b/src/test/kotlin/com/sainsburys/k2zpl/command/FontTest.kt
@@ -1,9 +1,9 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.command.options.ZplFieldOrientation
-import info.mking.k2zpl.command.options.ZplFont
-import info.mking.k2zpl.k2zpl
-import info.mking.k2zpl.testBuildString
+import com.sainsburys.k2zpl.command.options.ZplFieldOrientation
+import com.sainsburys.k2zpl.command.options.ZplFont
+import com.sainsburys.k2zpl.k2zpl
+import com.sainsburys.k2zpl.testBuildString
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.IsolationMode
 import io.kotest.core.spec.style.DescribeSpec
diff --git a/src/test/kotlin/info/mking/k2zpl/command/GraphicBoxTest.kt b/src/test/kotlin/com/sainsburys/k2zpl/command/GraphicBoxTest.kt
similarity index 95%
rename from src/test/kotlin/info/mking/k2zpl/command/GraphicBoxTest.kt
rename to src/test/kotlin/com/sainsburys/k2zpl/command/GraphicBoxTest.kt
index b735287..800352a 100644
--- a/src/test/kotlin/info/mking/k2zpl/command/GraphicBoxTest.kt
+++ b/src/test/kotlin/com/sainsburys/k2zpl/command/GraphicBoxTest.kt
@@ -1,8 +1,8 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.command.options.ZplLineColor
-import info.mking.k2zpl.k2zpl
-import info.mking.k2zpl.testBuildString
+import com.sainsburys.k2zpl.command.options.ZplLineColor
+import com.sainsburys.k2zpl.k2zpl
+import com.sainsburys.k2zpl.testBuildString
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.IsolationMode
 import io.kotest.core.spec.style.DescribeSpec
diff --git a/src/test/kotlin/info/mking/k2zpl/command/GraphicFieldTest.kt b/src/test/kotlin/com/sainsburys/k2zpl/command/GraphicFieldTest.kt
similarity index 84%
rename from src/test/kotlin/info/mking/k2zpl/command/GraphicFieldTest.kt
rename to src/test/kotlin/com/sainsburys/k2zpl/command/GraphicFieldTest.kt
index ad1602e..37cb9f2 100644
--- a/src/test/kotlin/info/mking/k2zpl/command/GraphicFieldTest.kt
+++ b/src/test/kotlin/com/sainsburys/k2zpl/command/GraphicFieldTest.kt
@@ -1,7 +1,7 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.command.options.ZplCompressionType
-import info.mking.k2zpl.k2zpl
+import com.sainsburys.k2zpl.command.options.ZplCompressionType
+import com.sainsburys.k2zpl.k2zpl
 import io.kotest.core.spec.IsolationMode
 import io.kotest.core.spec.style.DescribeSpec
 import io.kotest.matchers.shouldBe
diff --git a/src/test/kotlin/info/mking/k2zpl/command/LabelHomeTest.kt b/src/test/kotlin/com/sainsburys/k2zpl/command/LabelHomeTest.kt
similarity index 85%
rename from src/test/kotlin/info/mking/k2zpl/command/LabelHomeTest.kt
rename to src/test/kotlin/com/sainsburys/k2zpl/command/LabelHomeTest.kt
index 3ce9bc5..f649cbe 100644
--- a/src/test/kotlin/info/mking/k2zpl/command/LabelHomeTest.kt
+++ b/src/test/kotlin/com/sainsburys/k2zpl/command/LabelHomeTest.kt
@@ -1,7 +1,7 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.k2zpl
-import info.mking.k2zpl.testBuildString
+import com.sainsburys.k2zpl.k2zpl
+import com.sainsburys.k2zpl.testBuildString
 import io.kotest.core.spec.IsolationMode
 import io.kotest.core.spec.style.DescribeSpec
 import io.kotest.matchers.shouldBe
diff --git a/src/test/kotlin/info/mking/k2zpl/command/LabelLengthTest.kt b/src/test/kotlin/com/sainsburys/k2zpl/command/LabelLengthTest.kt
similarity index 90%
rename from src/test/kotlin/info/mking/k2zpl/command/LabelLengthTest.kt
rename to src/test/kotlin/com/sainsburys/k2zpl/command/LabelLengthTest.kt
index 8705383..ad2d16c 100644
--- a/src/test/kotlin/info/mking/k2zpl/command/LabelLengthTest.kt
+++ b/src/test/kotlin/com/sainsburys/k2zpl/command/LabelLengthTest.kt
@@ -1,7 +1,7 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.k2zpl
-import info.mking.k2zpl.testBuildString
+import com.sainsburys.k2zpl.k2zpl
+import com.sainsburys.k2zpl.testBuildString
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.IsolationMode
 import io.kotest.core.spec.style.DescribeSpec
diff --git a/src/test/kotlin/info/mking/k2zpl/command/MediaModeTest.kt b/src/test/kotlin/com/sainsburys/k2zpl/command/MediaModeTest.kt
similarity index 85%
rename from src/test/kotlin/info/mking/k2zpl/command/MediaModeTest.kt
rename to src/test/kotlin/com/sainsburys/k2zpl/command/MediaModeTest.kt
index 36255a6..78e1797 100644
--- a/src/test/kotlin/info/mking/k2zpl/command/MediaModeTest.kt
+++ b/src/test/kotlin/com/sainsburys/k2zpl/command/MediaModeTest.kt
@@ -1,9 +1,9 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.command.options.ZplMediaMode
-import info.mking.k2zpl.command.options.ZplYesNo
-import info.mking.k2zpl.k2zpl
-import info.mking.k2zpl.testBuildString
+import com.sainsburys.k2zpl.command.options.ZplMediaMode
+import com.sainsburys.k2zpl.command.options.ZplYesNo
+import com.sainsburys.k2zpl.k2zpl
+import com.sainsburys.k2zpl.testBuildString
 import io.kotest.core.spec.IsolationMode
 import io.kotest.core.spec.style.DescribeSpec
 import io.kotest.matchers.shouldBe
diff --git a/src/test/kotlin/info/mking/k2zpl/command/PrintWidthTest.kt b/src/test/kotlin/com/sainsburys/k2zpl/command/PrintWidthTest.kt
similarity index 90%
rename from src/test/kotlin/info/mking/k2zpl/command/PrintWidthTest.kt
rename to src/test/kotlin/com/sainsburys/k2zpl/command/PrintWidthTest.kt
index 58b84d2..50a3308 100644
--- a/src/test/kotlin/info/mking/k2zpl/command/PrintWidthTest.kt
+++ b/src/test/kotlin/com/sainsburys/k2zpl/command/PrintWidthTest.kt
@@ -1,7 +1,7 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.k2zpl
-import info.mking.k2zpl.testBuildString
+import com.sainsburys.k2zpl.k2zpl
+import com.sainsburys.k2zpl.testBuildString
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.IsolationMode
 import io.kotest.core.spec.style.DescribeSpec
diff --git a/src/test/kotlin/info/mking/k2zpl/command/StartFormatTest.kt b/src/test/kotlin/com/sainsburys/k2zpl/command/StartFormatTest.kt
similarity index 83%
rename from src/test/kotlin/info/mking/k2zpl/command/StartFormatTest.kt
rename to src/test/kotlin/com/sainsburys/k2zpl/command/StartFormatTest.kt
index c1f55d2..9ebe6a1 100644
--- a/src/test/kotlin/info/mking/k2zpl/command/StartFormatTest.kt
+++ b/src/test/kotlin/com/sainsburys/k2zpl/command/StartFormatTest.kt
@@ -1,7 +1,7 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.k2zpl
-import info.mking.k2zpl.testBuildString
+import com.sainsburys.k2zpl.k2zpl
+import com.sainsburys.k2zpl.testBuildString
 import io.kotest.core.spec.IsolationMode
 import io.kotest.core.spec.style.DescribeSpec
 import io.kotest.matchers.shouldBe
diff --git a/src/test/kotlin/info/mking/k2zpl/command/ZplCommandTest.kt b/src/test/kotlin/com/sainsburys/k2zpl/command/ZplCommandTest.kt
similarity index 96%
rename from src/test/kotlin/info/mking/k2zpl/command/ZplCommandTest.kt
rename to src/test/kotlin/com/sainsburys/k2zpl/command/ZplCommandTest.kt
index 4af7506..6a15748 100644
--- a/src/test/kotlin/info/mking/k2zpl/command/ZplCommandTest.kt
+++ b/src/test/kotlin/com/sainsburys/k2zpl/command/ZplCommandTest.kt
@@ -1,6 +1,6 @@
-package info.mking.k2zpl.command
+package com.sainsburys.k2zpl.command
 
-import info.mking.k2zpl.testBuildString
+import com.sainsburys.k2zpl.testBuildString
 import io.kotest.core.spec.IsolationMode
 import io.kotest.core.spec.style.DescribeSpec
 import io.kotest.matchers.shouldBe
diff --git a/src/test/kotlin/info/mking/k2zpl/Extensions.kt b/src/test/kotlin/info/mking/k2zpl/Extensions.kt
deleted file mode 100644
index 41981b2..0000000
--- a/src/test/kotlin/info/mking/k2zpl/Extensions.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package info.mking.k2zpl
-
-import info.mking.k2zpl.command.ZplCommand
-
-fun ZplCommand.testBuildString() = buildString { build(this) }
-
-private fun <T> Iterator<T>.nextNotNull(block: (T) -> Unit) {
-    next()?.let { block(it) }
-}