diff --git a/.editorconfig b/.editorconfig
index d9f5985b38a1a7bed21654eb1178b3412c73106f..82d032b903f3eb09f188fb3b6a0d0fa937d6e19d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,28 +3,5 @@ charset = utf-8
 end_of_line = lf
 insert_final_newline = true
 indent_style = space
-indent_size = 4
-
-[{*.mod, *.dtd, *.ent, *.elt}]
-indent_style = space
-indent_size = 2
-
-[{*.jhm, *.rng, *.wsdl, *.fxml, *.xslt, *.jrxml, *.ant, *.xul, *.xsl, *.xsd, *.tld, *.jnlp, *.xml}]
-indent_style = space
-indent_size = 2
-
-[*.json]
-indent_style = space
-indent_size = 2
-
-[*.java]
-indent_style = space
-indent_size = 2
-
-[{*.kts, *.kt}]
-indent_style = space
-indent_size = 2
-
-[{*.yml, *.yaml}]
-indent_style = space
 indent_size = 2
+max_line_length = 120
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9f9cae2f65a52b4c090b88137d67e83c4fb88594..d33a9181294b1ba112c3550a5d26971f02399bb9 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,16 +1,49 @@
 plugins {
   id("com.android.application")
-  id("kotlin-android")
-  id("kotlin-kapt")
-  id("de.kuschku.justcode")
+  kotlin("android")
+  kotlin("kapt")
+  id("de.justjanne.git-version")
+  id("de.justjanne.android-signing")
 }
 
 android {
+  setCompileSdkVersion(30)
+  buildToolsVersion = "30.0.3"
+
   defaultConfig {
     applicationId = "com.iskrembilen.quasseldroid"
 
     setMinSdkVersion(21)
     setTargetSdkVersion(30)
+
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    // Disable test runner analytics
+    testInstrumentationRunnerArguments(mapOf(
+      "disableAnalytics" to "true"
+    ))
+  }
+
+  buildTypes {
+    getByName("release") {
+      isMinifyEnabled = true
+      isShrinkResources = true
+      multiDexEnabled = true
+
+      proguardFiles(
+        getDefaultProguardFile("proguard-android.txt"),
+        "proguard-rules.pro"
+      )
+    }
+
+    getByName("debug") {
+      applicationIdSuffix = ".debug"
+      multiDexEnabled = true
+    }
+  }
+
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
   }
 
   buildFeatures {
diff --git a/app/src/androidTest/java/info/quasseldroid/app/ExampleInstrumentedTest.kt b/app/src/androidTest/java/de/justjanne/quasseldroid/app/ExampleInstrumentedTest.kt
similarity index 92%
rename from app/src/androidTest/java/info/quasseldroid/app/ExampleInstrumentedTest.kt
rename to app/src/androidTest/java/de/justjanne/quasseldroid/app/ExampleInstrumentedTest.kt
index d1c52c3fe62199d14efe0ed6f504bd3b751277d7..f92b1a88dee8afb0c241bb9898ca2e6bb523f814 100644
--- a/app/src/androidTest/java/info/quasseldroid/app/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/de/justjanne/quasseldroid/app/ExampleInstrumentedTest.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.app
+package de.justjanne.quasseldroid.app
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
@@ -36,6 +36,6 @@ class ExampleInstrumentedTest {
   fun useAppContext() {
     // Context of the app under test.
     val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-    assertEquals("info.quasseldroid.app", appContext.packageName)
+    assertEquals("de.justjanne.app", appContext.packageName)
   }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b710a6b4f2c414cfe49568244b5f7f66af98d4cd..dd9ee3b5b9839e5674e498fb77842a7f84fa0ad5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="info.quasseldroid.app">
+  package="de.justjanne.quasseldroid.app">
 
   <uses-feature
     android:name="android.hardware.type.pc"
@@ -13,7 +13,7 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
   <application
-    android:name="info.quasseldroid.app.QuasseldroidApplication"
+    android:name=".QuasseldroidApplication"
     android:allowBackup="true"
     android:fullBackupContent="@xml/backup_descriptor"
     android:icon="@mipmap/ic_launcher"
@@ -22,7 +22,7 @@
     android:supportsRtl="true"
     android:theme="@style/Theme.Quasseldroid">
     <activity
-      android:name="info.quasseldroid.app.MainActivity"
+      android:name=".MainActivity"
       android:label="@string/app_name"
       android:theme="@style/Theme.Quasseldroid.NoActionBar">
       <intent-filter>
diff --git a/app/src/main/java/info/quasseldroid/app/theme/Color.kt b/app/src/main/java/de/justjanne/quasseldroid/app/Color.kt
similarity index 82%
rename from app/src/main/java/info/quasseldroid/app/theme/Color.kt
rename to app/src/main/java/de/justjanne/quasseldroid/app/Color.kt
index 3e09405edbdbd4cadf5890f1a7cbe5a9e00a27b6..8283c6399576a5f51ca5649dee357fcb5209b874 100644
--- a/app/src/main/java/info/quasseldroid/app/theme/Color.kt
+++ b/app/src/main/java/de/justjanne/quasseldroid/app/Color.kt
@@ -1,4 +1,4 @@
-package info.quasseldroid.app.theme
+package de.justjanne.quasseldroid.app
 
 import androidx.compose.ui.graphics.Color
 
diff --git a/app/src/main/java/info/quasseldroid/app/MainActivity.kt b/app/src/main/java/de/justjanne/quasseldroid/app/MainActivity.kt
similarity index 97%
rename from app/src/main/java/info/quasseldroid/app/MainActivity.kt
rename to app/src/main/java/de/justjanne/quasseldroid/app/MainActivity.kt
index 7a5cf935150d90d6d800784887a301d6fccda642..9f00473ac12013a53381951d3ee12d65dffe43fc 100644
--- a/app/src/main/java/info/quasseldroid/app/MainActivity.kt
+++ b/app/src/main/java/de/justjanne/quasseldroid/app/MainActivity.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.app
+package de.justjanne.quasseldroid.app
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
@@ -39,9 +39,6 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.lifecycleScope
-import info.quasseldroid.app.theme.QuasseldroidTheme
-import info.quasseldroid.app.theme.shapes
-import info.quasseldroid.app.theme.typography
 import dev.chrisbanes.accompanist.coil.CoilImage
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/app/src/main/java/info/quasseldroid/app/QuasseldroidApplication.kt b/app/src/main/java/de/justjanne/quasseldroid/app/QuasseldroidApplication.kt
similarity index 95%
rename from app/src/main/java/info/quasseldroid/app/QuasseldroidApplication.kt
rename to app/src/main/java/de/justjanne/quasseldroid/app/QuasseldroidApplication.kt
index 43e54102ca9d7fb8d83e28341c97d3b8c991ac0e..e7b89188f64cf405631aa74d2cdb56a5c848d2a0 100644
--- a/app/src/main/java/info/quasseldroid/app/QuasseldroidApplication.kt
+++ b/app/src/main/java/de/justjanne/quasseldroid/app/QuasseldroidApplication.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.app
+package de.justjanne.quasseldroid.app
 
 import androidx.multidex.MultiDexApplication
 import dagger.hilt.android.HiltAndroidApp
diff --git a/app/src/main/java/info/quasseldroid/app/theme/Shape.kt b/app/src/main/java/de/justjanne/quasseldroid/app/Shape.kt
similarity index 87%
rename from app/src/main/java/info/quasseldroid/app/theme/Shape.kt
rename to app/src/main/java/de/justjanne/quasseldroid/app/Shape.kt
index c42049e2f71179f647f054829a90ddc0059ebd81..e9ac8d7aabd926ac3e141b7202d5e8cfc10d15be 100644
--- a/app/src/main/java/info/quasseldroid/app/theme/Shape.kt
+++ b/app/src/main/java/de/justjanne/quasseldroid/app/Shape.kt
@@ -1,4 +1,4 @@
-package info.quasseldroid.app.theme
+package de.justjanne.quasseldroid.app
 
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Shapes
diff --git a/app/src/main/java/info/quasseldroid/app/theme/Theme.kt b/app/src/main/java/de/justjanne/quasseldroid/app/Theme.kt
similarity index 56%
rename from app/src/main/java/info/quasseldroid/app/theme/Theme.kt
rename to app/src/main/java/de/justjanne/quasseldroid/app/Theme.kt
index c1eba54ccdc65f1de722081cd3d15d05ecd4ec02..b40a6b0ecddd9af945884b306a398ff35ef0c2f5 100644
--- a/app/src/main/java/info/quasseldroid/app/theme/Theme.kt
+++ b/app/src/main/java/de/justjanne/quasseldroid/app/Theme.kt
@@ -1,4 +1,23 @@
-package info.quasseldroid.app.theme
+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2021 Janne Mareike Koschinski
+ * Copyright (c) 2021 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.justjanne.quasseldroid.app
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material.MaterialTheme
diff --git a/app/src/main/java/info/quasseldroid/app/theme/Type.kt b/app/src/main/java/de/justjanne/quasseldroid/app/Type.kt
similarity index 94%
rename from app/src/main/java/info/quasseldroid/app/theme/Type.kt
rename to app/src/main/java/de/justjanne/quasseldroid/app/Type.kt
index 92be9b63b1d1e05f235f6e1c8cecc41966a06e1f..dae71d3aad346a2a6ad96239c76631aacb947f35 100644
--- a/app/src/main/java/info/quasseldroid/app/theme/Type.kt
+++ b/app/src/main/java/de/justjanne/quasseldroid/app/Type.kt
@@ -1,4 +1,4 @@
-package info.quasseldroid.app.theme
+package de.justjanne.quasseldroid.app
 
 import androidx.compose.material.Typography
 import androidx.compose.ui.text.TextStyle
diff --git a/build.gradle.kts b/build.gradle.kts
index 78a62860e6ee9478011a1050c3aa3944d15923ed..9e35158d599d293e9c41a448eb938aafa89f7401 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,6 +19,10 @@
 
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
+plugins {
+  id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
+}
+
 buildscript {
   repositories {
     google()
@@ -37,7 +41,6 @@ allprojects {
     google()
     mavenCentral()
     jcenter()
-    mavenLocal()
   }
 
   tasks.withType<KotlinCompile>().configureEach {
diff --git a/buildSrc/src/main/kotlin/de/justjanne/androidsigning/AndroidSigningPlugin.kt b/buildSrc/src/main/kotlin/de/justjanne/androidsigning/AndroidSigningPlugin.kt
new file mode 100644
index 0000000000000000000000000000000000000000..ff6ee47bc0622264f668a0293f2a5db36c2ce51f
--- /dev/null
+++ b/buildSrc/src/main/kotlin/de/justjanne/androidsigning/AndroidSigningPlugin.kt
@@ -0,0 +1,44 @@
+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2021 Janne Mareike Koschinski
+ * Copyright (c) 2021 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.justjanne.androidsigning
+
+import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.getByType
+
+class AndroidSigningPlugin : Plugin<Project> {
+  override fun apply(project: Project) {
+    project.run {
+      this.extensions.getByType<BaseAppModuleExtension>().run {
+        signingConfigs {
+          signingData(project.rootProject.properties("signing.properties"))?.let {
+            create("default") {
+              storeFile = file(it.storeFile)
+              storePassword = it.storePassword
+              keyAlias = it.keyAlias
+              keyPassword = it.keyPassword
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/buildSrc/src/main/kotlin/de/justjanne/androidsigning/ProjectPropertiesHelper.kt b/buildSrc/src/main/kotlin/de/justjanne/androidsigning/ProjectPropertiesHelper.kt
new file mode 100644
index 0000000000000000000000000000000000000000..a16f5404c629cd92a654369fe1b6b61f4b813e13
--- /dev/null
+++ b/buildSrc/src/main/kotlin/de/justjanne/androidsigning/ProjectPropertiesHelper.kt
@@ -0,0 +1,32 @@
+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2021 Janne Mareike Koschinski
+ * Copyright (c) 2021 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.justjanne.androidsigning
+
+import org.gradle.api.Project
+import java.util.*
+
+fun Project.properties(fileName: String): Properties? {
+  val file = file(fileName)
+  if (!file.exists())
+    return null
+  val props = Properties()
+  props.load(file.inputStream())
+  return props
+}
diff --git a/buildSrc/src/main/kotlin/de/justjanne/androidsigning/SigningData.kt b/buildSrc/src/main/kotlin/de/justjanne/androidsigning/SigningData.kt
new file mode 100644
index 0000000000000000000000000000000000000000..2604d6aab05332fd7a5022243d4362fa64ab9640
--- /dev/null
+++ b/buildSrc/src/main/kotlin/de/justjanne/androidsigning/SigningData.kt
@@ -0,0 +1,40 @@
+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2021 Janne Mareike Koschinski
+ * Copyright (c) 2021 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.justjanne.androidsigning
+
+import java.util.*
+
+data class SigningData(
+  val storeFile: String,
+  val storePassword: String,
+  val keyAlias: String,
+  val keyPassword: String
+)
+
+fun signingData(properties: Properties?): SigningData? {
+  if (properties == null) return null
+
+  val storeFile = properties.getProperty("storeFile") ?: return null
+  val storePassword = properties.getProperty("storePassword") ?: return null
+  val keyAlias = properties.getProperty("keyAlias") ?: return null
+  val keyPassword = properties.getProperty("keyPassword") ?: return null
+
+  return SigningData(storeFile, storePassword, keyAlias, keyPassword)
+}
diff --git a/buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterAction.kt b/buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterAction.kt
new file mode 100644
index 0000000000000000000000000000000000000000..f4522971fdc2d50fa7b17b132bab74bd501f9048
--- /dev/null
+++ b/buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterAction.kt
@@ -0,0 +1,83 @@
+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2021 Janne Mareike Koschinski
+ * Copyright (c) 2021 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.justjanne.coverageconverter
+
+import org.gradle.api.Action
+import org.gradle.api.Task
+import org.gradle.testing.jacoco.tasks.JacocoReport
+import java.io.File
+
+internal class CoverageConverterAction(
+  private val jacocoReportTask: JacocoReport
+) : Action<Task> {
+  private fun findOutputFile(jacocoFile: File): File? {
+    val actualFile = jacocoFile.absoluteFile
+    if (actualFile.exists() && actualFile.parentFile.name == "jacoco") {
+      val folder = File(actualFile.parentFile.parentFile, "cobertura")
+      folder.mkdirs()
+      return File(folder, actualFile.name)
+    }
+
+    return null
+  }
+
+  private fun createPythonScript(name: String, temporaryDir: File): File {
+    val file = File(temporaryDir, name)
+    if (file.exists()) {
+      file.delete()
+    }
+    val source = CoverageConverterPlugin::class.java.getResourceAsStream("/coverageconverter/$name")
+    file.writeBytes(source.readAllBytes())
+    return file
+  }
+
+  override fun execute(task: Task) {
+    val cover2coverScript = createPythonScript("cover2cover.py", task.temporaryDir)
+    val source2filenameScript = createPythonScript("source2filename.py", task.temporaryDir)
+
+    fun cover2cover(reportFile: File, outputFile: File, sourceDirectories: Iterable<File>) {
+      task.project.exec {
+        commandLine("python3")
+        args(cover2coverScript.absolutePath)
+        args(reportFile.absolutePath)
+        args(sourceDirectories.map(File::getAbsolutePath))
+        standardOutput = outputFile.outputStream()
+      }
+    }
+
+    fun source2filename(reportFile: File) {
+      task.project.exec {
+        commandLine("python3")
+        args(source2filenameScript.absolutePath)
+        args(reportFile.absolutePath)
+      }
+    }
+
+    jacocoReportTask.reports.forEach {
+      if (it.isEnabled && it.destination.extension == "xml") {
+        val outputFile = findOutputFile(it.destination)
+        if (outputFile != null) {
+          cover2cover(it.destination, outputFile, jacocoReportTask.sourceDirectories)
+          source2filename(outputFile)
+        }
+      }
+    }
+  }
+}
diff --git a/buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterExtension.kt b/buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterExtension.kt
new file mode 100644
index 0000000000000000000000000000000000000000..59c961f47c93b0265c55a46543bdc857521e9a7d
--- /dev/null
+++ b/buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterExtension.kt
@@ -0,0 +1,14 @@
+/*
+ * Kotlin Bitflags
+ * Copyright (c) 2021 Janne Mareike Koschinski
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package de.justjanne.coverageconverter
+
+open class CoverageConverterExtension {
+  var autoConfigureCoverage: Boolean = false
+}
diff --git a/buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterPlugin.kt b/buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterPlugin.kt
new file mode 100644
index 0000000000000000000000000000000000000000..0e73694d8a357ac03fc25c9514c80b777de7fe3a
--- /dev/null
+++ b/buildSrc/src/main/kotlin/de/justjanne/coverageconverter/CoverageConverterPlugin.kt
@@ -0,0 +1,66 @@
+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2021 Janne Mareike Koschinski
+ * Copyright (c) 2021 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.justjanne.coverageconverter
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.testing.jacoco.plugins.JacocoPluginExtension
+import org.gradle.testing.jacoco.tasks.JacocoReport
+import java.io.File
+
+class CoverageConverterPlugin : Plugin<Project> {
+  override fun apply(project: Project) {
+    val extension = project.extensions.create("coverage", CoverageConverterExtension::class.java)
+
+    if (extension.autoConfigureCoverage) {
+      val jacocoPluginExtension = project.extensions.findByType(JacocoPluginExtension::class.java)
+      if (jacocoPluginExtension != null) {
+        jacocoPluginExtension.toolVersion = "0.8.3"
+      }
+    }
+
+    project.afterEvaluate {
+      val testTask = tasks.getByName("test")
+
+      val jacocoReportTask = tasks.getByName("jacocoTestReport") as? JacocoReport
+      if (jacocoReportTask != null) {
+        jacocoReportTask.dependsOn(testTask)
+        if (extension.autoConfigureCoverage) {
+          jacocoReportTask.sourceDirectories.from(fileTree("src/main/kotlin"))
+          jacocoReportTask.classDirectories.from(fileTree("build/classes"))
+          jacocoReportTask.reports {
+            xml.destination = File("${buildDir}/reports/jacoco/report.xml")
+            html.isEnabled = true
+            xml.isEnabled = true
+            csv.isEnabled = false
+          }
+        }
+
+        tasks.register("coberturaTestReport") {
+          dependsOn(jacocoReportTask)
+          mustRunAfter(jacocoReportTask)
+          group = "verification"
+
+          doLast(CoverageConverterAction(jacocoReportTask))
+        }
+      }
+    }
+  }
+}
diff --git a/buildSrc/src/main/kotlin/de/justjanne/gitversion/GitVersionPlugin.kt b/buildSrc/src/main/kotlin/de/justjanne/gitversion/GitVersionPlugin.kt
new file mode 100644
index 0000000000000000000000000000000000000000..d1323d9dc94d5bee67b745ff3874209e0f9263bb
--- /dev/null
+++ b/buildSrc/src/main/kotlin/de/justjanne/gitversion/GitVersionPlugin.kt
@@ -0,0 +1,56 @@
+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2021 Janne Mareike Koschinski
+ * Copyright (c) 2021 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.justjanne.gitversion
+
+import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.getByType
+
+class GitVersionPlugin : Plugin<Project> {
+  override fun apply(project: Project) {
+    project.run {
+      this.extensions.getByType<BaseAppModuleExtension>().run {
+        defaultConfig {
+          versionCode = gitVersionCode() ?: 1
+          versionName = gitVersionName() ?: "1.0.0"
+
+          setBuildConfigField(
+            ::buildConfigField,
+            "GIT_HEAD",
+            gitHead() ?: ""
+          )
+          setBuildConfigField(
+            ::buildConfigField,
+            "FANCY_VERSION_NAME",
+            fancyVersionName() ?: "1.0.0"
+          )
+          setBuildConfigField(
+            ::buildConfigField,
+            "GIT_COMMIT_DATE",
+            gitCommitDate()
+          )
+
+          setProperty("archivesBaseName", "${rootProject.name}-$versionName")
+        }
+      }
+    }
+  }
+}
diff --git a/buildSrc/src/main/kotlin/de/kuschku/justcode/NullOutputStream.kt b/buildSrc/src/main/kotlin/de/justjanne/gitversion/NullOutputStream.kt
similarity index 97%
rename from buildSrc/src/main/kotlin/de/kuschku/justcode/NullOutputStream.kt
rename to buildSrc/src/main/kotlin/de/justjanne/gitversion/NullOutputStream.kt
index e67610f5f93ab4c3c33eef2c74b0149843e63fd7..8fc8e8b3318e6670c0e0054e8ea00ce886b8afd0 100644
--- a/buildSrc/src/main/kotlin/de/kuschku/justcode/NullOutputStream.kt
+++ b/buildSrc/src/main/kotlin/de/justjanne/gitversion/NullOutputStream.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.kuschku.justcode
+package de.justjanne.gitversion
 
 import java.io.IOException
 import java.io.OutputStream
diff --git a/buildSrc/src/main/kotlin/de/kuschku/justcode/ProjectHelper.kt b/buildSrc/src/main/kotlin/de/justjanne/gitversion/ProjectHelper.kt
similarity index 79%
rename from buildSrc/src/main/kotlin/de/kuschku/justcode/ProjectHelper.kt
rename to buildSrc/src/main/kotlin/de/justjanne/gitversion/ProjectHelper.kt
index bcde26ff39e2dcf0209fc9df46cb6859f155d1ca..66c649e7f4d24603031a8e73292b37f110dbcc49 100644
--- a/buildSrc/src/main/kotlin/de/kuschku/justcode/ProjectHelper.kt
+++ b/buildSrc/src/main/kotlin/de/justjanne/gitversion/ProjectHelper.kt
@@ -1,8 +1,8 @@
 /*
  * Quasseldroid - Quassel client for Android
  *
- * Copyright (c) 2020 Janne Mareike Koschinski
- * Copyright (c) 2020 The Quassel Project
+ * Copyright (c) 2021 Janne Mareike Koschinski
+ * Copyright (c) 2021 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published
@@ -17,11 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.kuschku.justcode
+package de.justjanne.gitversion
 
 import org.gradle.api.Project
 import java.io.ByteArrayOutputStream
-import java.util.*
 
 fun Project.cmd(vararg command: String) = try {
   val stdOut = ByteArrayOutputStream()
@@ -35,15 +34,6 @@ fun Project.cmd(vararg command: String) = try {
   null
 }
 
-fun Project.properties(fileName: String): Properties? {
-  val file = file(fileName)
-  if (!file.exists())
-    return null
-  val props = Properties()
-  props.load(file.inputStream())
-  return props
-}
-
 inline fun <reified T> setBuildConfigField(
   setter: (String, String, String) -> Unit,
   name: String,
diff --git a/buildSrc/src/main/kotlin/de/kuschku/justcode/VersionHelper.kt b/buildSrc/src/main/kotlin/de/justjanne/gitversion/VersionHelper.kt
similarity index 97%
rename from buildSrc/src/main/kotlin/de/kuschku/justcode/VersionHelper.kt
rename to buildSrc/src/main/kotlin/de/justjanne/gitversion/VersionHelper.kt
index 09eba0327b6e083703edafb06931b49bff43d9fd..af2655bc0bed9ea9977ae7c92f078b33a8d6d907 100644
--- a/buildSrc/src/main/kotlin/de/kuschku/justcode/VersionHelper.kt
+++ b/buildSrc/src/main/kotlin/de/justjanne/gitversion/VersionHelper.kt
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package de.kuschku.justcode
+package de.justjanne.gitversion
 
 import org.gradle.api.Project
 
diff --git a/buildSrc/src/main/kotlin/de/kuschku/justcode/JustCodePlugin.kt b/buildSrc/src/main/kotlin/de/kuschku/justcode/JustCodePlugin.kt
deleted file mode 100644
index 697ef1ead17599eab027afd4f1003edbe11b1204..0000000000000000000000000000000000000000
--- a/buildSrc/src/main/kotlin/de/kuschku/justcode/JustCodePlugin.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-package de.kuschku.justcode
-
-import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
-import org.gradle.api.JavaVersion
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.getByType
-
-class JustCodePlugin : Plugin<Project> {
-  override fun apply(project: Project) {
-    project.run {
-      this.extensions.getByType<BaseAppModuleExtension>().run {
-        setCompileSdkVersion(30)
-        buildToolsVersion = "30.0.3"
-
-        signingConfigs {
-          signingData(project.rootProject.properties("signing.properties"))?.let {
-            create("default") {
-              storeFile = file(it.storeFile)
-              storePassword = it.storePassword
-              keyAlias = it.keyAlias
-              keyPassword = it.keyPassword
-            }
-          }
-        }
-
-        defaultConfig {
-          versionCode = gitVersionCode() ?: 1
-          versionName = gitVersionName() ?: "1.0.0"
-
-          setBuildConfigField(
-            ::buildConfigField,
-            "GIT_HEAD",
-            gitHead() ?: ""
-          )
-          setBuildConfigField(
-            ::buildConfigField,
-            "FANCY_VERSION_NAME",
-            fancyVersionName() ?: "1.0.0"
-          )
-          setBuildConfigField(
-            ::buildConfigField,
-            "GIT_COMMIT_DATE",
-            gitCommitDate()
-          )
-
-          setProperty("archivesBaseName", "${rootProject.name}-$versionName")
-
-          signingConfig = signingConfigs.findByName("default")
-
-          testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-          // Disable test runner analytics
-          testInstrumentationRunnerArguments(mapOf(
-            "disableAnalytics" to "true"
-          ))
-        }
-
-        buildTypes {
-          getByName("release") {
-            isMinifyEnabled = true
-            isShrinkResources = true
-            multiDexEnabled = true
-
-            proguardFiles(
-              getDefaultProguardFile("proguard-android.txt"),
-              "proguard-rules.pro"
-            )
-          }
-
-          getByName("debug") {
-            applicationIdSuffix = ".debug"
-            multiDexEnabled = true
-          }
-        }
-
-        compileOptions {
-          sourceCompatibility = JavaVersion.VERSION_1_8
-          targetCompatibility = JavaVersion.VERSION_1_8
-        }
-      }
-    }
-  }
-}
diff --git a/buildSrc/src/main/kotlin/de/kuschku/justcode/SigningData.kt b/buildSrc/src/main/kotlin/de/kuschku/justcode/SigningData.kt
deleted file mode 100644
index 5490d165c21d41086c8c0b5cff11ee68ed3602b5..0000000000000000000000000000000000000000
--- a/buildSrc/src/main/kotlin/de/kuschku/justcode/SigningData.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package de.kuschku.justcode
-
-import java.util.*
-
-data class SigningData(
-  val storeFile: String,
-  val storePassword: String,
-  val keyAlias: String,
-  val keyPassword: String
-)
-
-fun signingData(properties: Properties?): SigningData? {
-  if (properties == null) return null
-
-  val storeFile = properties.getProperty("storeFile") ?: return null
-  val storePassword = properties.getProperty("storePassword") ?: return null
-  val keyAlias = properties.getProperty("keyAlias") ?: return null
-  val keyPassword = properties.getProperty("keyPassword") ?: return null
-
-  return SigningData(storeFile, storePassword, keyAlias, keyPassword)
-}
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/de.justjanne.android-signing.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/de.justjanne.android-signing.properties
new file mode 100644
index 0000000000000000000000000000000000000000..f168d86ee9e7d8cacb65325c95a0cce0afecc9b7
--- /dev/null
+++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/de.justjanne.android-signing.properties
@@ -0,0 +1 @@
+implementation-class=de.justjanne.androidsigning.AndroidSigningPlugin
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/de.justjanne.git-version.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/de.justjanne.git-version.properties
new file mode 100644
index 0000000000000000000000000000000000000000..d76e40206df0112b65cb922800697ce73ee512c3
--- /dev/null
+++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/de.justjanne.git-version.properties
@@ -0,0 +1 @@
+implementation-class=de.justjanne.gitversion.GitVersionPlugin
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/de.justjanne.jacoco-cobertura-converter.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/de.justjanne.jacoco-cobertura-converter.properties
new file mode 100644
index 0000000000000000000000000000000000000000..a6c68c5e16f5ebef15d6bc106c88cfa471b2166c
--- /dev/null
+++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/de.justjanne.jacoco-cobertura-converter.properties
@@ -0,0 +1 @@
+implementation-class=de.justjanne.coverageconverter.CoverageConverterPlugin
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/de.kuschku.justcode.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/de.kuschku.justcode.properties
deleted file mode 100644
index d2e7b0006a988b0600a68f334cd979f88b42f038..0000000000000000000000000000000000000000
--- a/buildSrc/src/main/resources/META-INF/gradle-plugins/de.kuschku.justcode.properties
+++ /dev/null
@@ -1 +0,0 @@
-implementation-class=de.kuschku.justcode.JustCodePlugin
diff --git a/buildSrc/src/main/resources/coverageconverter/LICENSE b/buildSrc/src/main/resources/coverageconverter/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..bfa3f657e2f77b8c6ca50d2788b6e86b0d368745
--- /dev/null
+++ b/buildSrc/src/main/resources/coverageconverter/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Hannes Rosenögger
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/buildSrc/src/main/resources/coverageconverter/cover2cover.py b/buildSrc/src/main/resources/coverageconverter/cover2cover.py
new file mode 100644
index 0000000000000000000000000000000000000000..7561ad560695061ff0b2cdb106cc03abea6a2a21
--- /dev/null
+++ b/buildSrc/src/main/resources/coverageconverter/cover2cover.py
@@ -0,0 +1,163 @@
+#!/usr/bin/env python
+import sys
+import xml.etree.ElementTree as ET
+import re
+import os.path
+import time
+
+# branch-rate="0.0" complexity="0.0" line-rate="1.0"
+# branch="true" hits="1" number="86"
+
+def find_lines(j_package, filename):
+    """Return all <line> elements for a given source file in a package."""
+    lines = list()
+    sourcefiles = j_package.findall("sourcefile")
+    for sourcefile in sourcefiles:
+        if sourcefile.attrib.get("name") == os.path.basename(filename):
+            lines = lines + sourcefile.findall("line")
+    return lines
+
+def line_is_after(jm, start_line):
+    return int(jm.attrib.get('line', 0)) > start_line
+
+def method_lines(jmethod, jmethods, jlines):
+    """Filter the lines from the given set of jlines that apply to the given jmethod."""
+    start_line = int(jmethod.attrib.get('line', 0))
+    larger     = list(int(jm.attrib.get('line', 0)) for jm in jmethods if line_is_after(jm, start_line))
+    end_line   = min(larger) if len(larger) else 99999999
+
+    for jline in jlines:
+        if start_line <= int(jline.attrib['nr']) < end_line:
+            yield jline
+
+def convert_lines(j_lines, into):
+    """Convert the JaCoCo <line> elements into Cobertura <line> elements, add them under the given element."""
+    c_lines = ET.SubElement(into, 'lines')
+    for jline in j_lines:
+        mb = int(jline.attrib['mb'])
+        cb = int(jline.attrib['cb'])
+        ci = int(jline.attrib['ci'])
+
+        cline = ET.SubElement(c_lines, 'line')
+        cline.set('number', jline.attrib['nr'])
+        cline.set('hits', '1' if ci > 0 else '0') # Probably not true but no way to know from JaCoCo XML file
+
+        if mb + cb > 0:
+            percentage = str(int(100 * (float(cb) / (float(cb) + float(mb))))) + '%'
+            cline.set('branch',             'true')
+            cline.set('condition-coverage', percentage + ' (' + str(cb) + '/' + str(cb + mb) + ')')
+
+            cond = ET.SubElement(ET.SubElement(cline, 'conditions'), 'condition')
+            cond.set('number',   '0')
+            cond.set('type',     'jump')
+            cond.set('coverage', percentage)
+        else:
+            cline.set('branch', 'false')
+
+def path_to_filepath(path_to_class, sourcefilename):
+    return path_to_class[0: path_to_class.rfind("/") + 1] + sourcefilename
+
+def add_counters(source, target):
+    target.set('line-rate',   counter(source, 'LINE'))
+    target.set('branch-rate', counter(source, 'BRANCH'))
+    target.set('complexity', counter(source, 'COMPLEXITY', sum))
+
+def fraction(covered, missed):
+    return covered / (covered + missed)
+
+def sum(covered, missed):
+    return covered + missed
+
+def counter(source, type, operation=fraction):
+    cs = source.findall('counter')
+    c = next((ct for ct in cs if ct.attrib.get('type') == type), None)
+
+    if c is not None:
+        covered = float(c.attrib['covered'])
+        missed  = float(c.attrib['missed'])
+
+        return str(operation(covered, missed))
+    else:
+        return '0.0'
+
+def convert_method(j_method, j_lines):
+    c_method = ET.Element('method')
+    c_method.set('name',      j_method.attrib['name'])
+    c_method.set('signature', j_method.attrib['desc'])
+
+    add_counters(j_method, c_method)
+    convert_lines(j_lines, c_method)
+
+    return c_method
+
+def convert_class(j_class, j_package):
+    c_class = ET.Element('class')
+    c_class.set('name',     j_class.attrib['name'].replace('/', '.'))
+    c_class.set('filename', path_to_filepath(j_class.attrib['name'], j_class.attrib['sourcefilename']))
+
+    all_j_lines = list(find_lines(j_package, c_class.attrib['filename']))
+
+    c_methods   = ET.SubElement(c_class, 'methods')
+    all_j_methods = list(j_class.findall('method'))
+    for j_method in all_j_methods:
+        j_method_lines = method_lines(j_method, all_j_methods, all_j_lines)
+        c_methods.append(convert_method(j_method, j_method_lines))
+
+    add_counters(j_class, c_class)
+    convert_lines(all_j_lines, c_class)
+
+    return c_class
+
+def convert_package(j_package):
+    c_package = ET.Element('package')
+    c_package.attrib['name'] = j_package.attrib['name'].replace('/', '.')
+
+    c_classes = ET.SubElement(c_package, 'classes')
+    for j_class in j_package.findall('class'):
+        c_classes.append(convert_class(j_class, j_package))
+
+    add_counters(j_package, c_package)
+
+    return c_package
+
+def convert_root(source, target, source_roots):
+    try:
+      target.set('timestamp', str(int(source.find('sessioninfo').attrib['start']) / 1000))
+    except AttributeError as e:
+        target.set('timestamp', str(int(time.time() / 1000)))
+    sources     = ET.SubElement(target, 'sources')
+    for s in source_roots:
+        ET.SubElement(sources, 'source').text = s
+
+    packages = ET.SubElement(target, 'packages')
+
+    for group in source.findall('group'):
+        for package in group.findall('package'):
+            packages.append(convert_package(package))
+
+    for package in source.findall('package'):
+        packages.append(convert_package(package))
+
+    add_counters(source, target)
+
+def jacoco2cobertura(filename, source_roots):
+    if filename == '-':
+        root = ET.fromstring(sys.stdin.read())
+    else:
+        tree = ET.parse(filename)
+        root = tree.getroot()
+
+    into = ET.Element('coverage')
+    convert_root(root, into, source_roots)
+    print('<?xml version="1.0" ?>')
+    print(ET.tostring(into, encoding='unicode'))
+
+if __name__ == '__main__':
+    if len(sys.argv) < 2:
+        print("Usage: cover2cover.py FILENAME [SOURCE_ROOTS]")
+        sys.exit(1)
+
+    filename    = sys.argv[1]
+    source_roots = sys.argv[2:] if 2 < len(sys.argv) else '.'
+
+    jacoco2cobertura(filename, source_roots)
diff --git a/buildSrc/src/main/resources/coverageconverter/source2filename.py b/buildSrc/src/main/resources/coverageconverter/source2filename.py
new file mode 100644
index 0000000000000000000000000000000000000000..2b60a9b37850051020111393d923d189e8d0c6b7
--- /dev/null
+++ b/buildSrc/src/main/resources/coverageconverter/source2filename.py
@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+import sys
+import xml.etree.ElementTree as ET
+import lxml.etree
+import re
+import os.path
+
+
+
+
+def convert_source(filename):
+    #read input file
+    root = lxml.etree.parse(filename)
+    sources = root.find('sources')
+    packages = root.find('packages')
+    for package in packages:
+        classes = package.find('classes')
+        for clazz in classes:
+            file_not_found = True
+            for source in sources:
+                full_filename = source.text + '/' + clazz.attrib['filename']
+                if os.path.isfile(full_filename):
+                    clazz.attrib['filename'] = full_filename
+                    file_not_found = False
+            if file_not_found:
+                print("Warning: File {} not found in all sources; removing from sources.".format(clazz.attrib['filename']))
+                clazz.getparent().remove(clazz)
+
+    data = lxml.etree.tostring(root, pretty_print=True)
+    #open the input file in write mode
+    fin = open(filename, "wb")
+    #overrite the input file with the resulting data
+    fin.write(data)
+    #close the file
+    fin.close()
+
+if __name__ == '__main__':
+    if len(sys.argv) < 2:
+        print("Usage: source2filename.py FILENAME")
+        sys.exit(1)
+
+    filename    = sys.argv[1]
+
+    convert_source(filename)
diff --git a/coverage-annotations/src/main/kotlin/de/kuschku/codecoverage/Generated.kt b/coverage-annotations/src/main/kotlin/de/justjanne/codecoverage/Generated.kt
similarity index 96%
rename from coverage-annotations/src/main/kotlin/de/kuschku/codecoverage/Generated.kt
rename to coverage-annotations/src/main/kotlin/de/justjanne/codecoverage/Generated.kt
index a0492bb5b35ea6fab62855bbcc1287d163d634b6..2bd88cc25d9fe5dbe4e780a1210277d43b060cdb 100644
--- a/coverage-annotations/src/main/kotlin/de/kuschku/codecoverage/Generated.kt
+++ b/coverage-annotations/src/main/kotlin/de/justjanne/codecoverage/Generated.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.kuschku.codecoverage
+package de.justjanne.codecoverage
 
 /**
  * Used to mark inline functions as generated for jacoco
diff --git a/gradle.properties b/gradle.properties
index 92a927257850c45596b5d51b4889168e2aef3fbd..f64dfa397a200b53f04cbdcf72fa8c3d54382e89 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,7 +32,6 @@ org.gradle.caching=true
 # Enable AndroidX
 android.useAndroidX=true
 android.enableJetifier=true
-
 # Dependency versions
 androidxAppcompatVersion=1.2.0
 androidxCoreVersion=1.2.0
diff --git a/libquassel/build.gradle.kts b/libquassel/build.gradle.kts
index 7216904bb91505fd38b1cd2788f53806d9b8ddbf..f26fafa29d1af5c7bbd09305fc8174ecd3330f5f 100644
--- a/libquassel/build.gradle.kts
+++ b/libquassel/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
   kotlin("jvm")
   id("jacoco")
-  id("de.justjanne.jacoco-cobertura-converter") version "1.0"
+  id("de.justjanne.jacoco-cobertura-converter")
 }
 
 tasks.withType<Test> {
diff --git a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/CoroutineChannel.kt b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/CoroutineChannel.kt
similarity index 94%
rename from libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/CoroutineChannel.kt
rename to libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/CoroutineChannel.kt
index b629ef242c109bb20253eabefb96a6c13675724e..3b221bb8f65daa30ce59a382a4a37061f96b9eb8 100644
--- a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/CoroutineChannel.kt
+++ b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/CoroutineChannel.kt
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.libquassel.io
+package de.justjanne.libquassel.client.io
 
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.libquassel.util.TlsInfo
+import de.justjanne.libquassel.client.util.TlsInfo
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/FixedDeflaterOutputStream.kt b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/FixedDeflaterOutputStream.kt
similarity index 95%
rename from libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/FixedDeflaterOutputStream.kt
rename to libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/FixedDeflaterOutputStream.kt
index d626e96eb2bd69220e0a9b79d78da2b37eedaf16..56eafab68b0b8eca17119c8e3f71d52bf22cd773 100644
--- a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/FixedDeflaterOutputStream.kt
+++ b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/FixedDeflaterOutputStream.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.libquassel.io
+package de.justjanne.libquassel.client.io
 
 import java.io.OutputStream
 import java.util.zip.DeflaterOutputStream
diff --git a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/ReadableWrappedChannel.kt b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/ReadableWrappedChannel.kt
similarity index 98%
rename from libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/ReadableWrappedChannel.kt
rename to libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/ReadableWrappedChannel.kt
index fa2918d4e92511a48e9c284e8240d2ce750c886b..ce82b7b3790a4d0cb7db55f31365d43287e97274 100644
--- a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/ReadableWrappedChannel.kt
+++ b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/ReadableWrappedChannel.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.libquassel.io
+package de.justjanne.libquassel.client.io
 
 import java.io.InputStream
 import java.nio.ByteBuffer
diff --git a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/StreamChannel.kt b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/StreamChannel.kt
similarity index 96%
rename from libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/StreamChannel.kt
rename to libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/StreamChannel.kt
index 80c4079529d0bf324d586b26ac1c9e3fb9f870e0..59c91f96c1a74da265ffeb6962202463751547e0 100644
--- a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/StreamChannel.kt
+++ b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/StreamChannel.kt
@@ -17,9 +17,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.libquassel.io
+package de.justjanne.libquassel.client.io
 
-import info.quasseldroid.libquassel.util.TlsInfo
+import de.justjanne.libquassel.client.util.TlsInfo
 import java.io.Flushable
 import java.io.InputStream
 import java.io.OutputStream
diff --git a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/WritableWrappedChannel.kt b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/WritableWrappedChannel.kt
similarity index 98%
rename from libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/WritableWrappedChannel.kt
rename to libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/WritableWrappedChannel.kt
index b1ea8aae46821aa5b7688c556a4b6965c137b377..a5582508ea2eb782e14d2227207bd6355bea91d5 100644
--- a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/io/WritableWrappedChannel.kt
+++ b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/io/WritableWrappedChannel.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.libquassel.io
+package de.justjanne.libquassel.client.io
 
 import java.io.OutputStream
 import java.nio.ByteBuffer
diff --git a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/util/TlsInfo.kt b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/util/TlsInfo.kt
similarity index 98%
rename from libquassel/src/main/kotlin/info/quasseldroid/libquassel/util/TlsInfo.kt
rename to libquassel/src/main/kotlin/de/justjanne/libquassel/client/util/TlsInfo.kt
index f1e3f085cd8707da0820338464866feecf0f205c..db0f048ea2daa90648ad33ebaebdbde526ed6759 100644
--- a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/util/TlsInfo.kt
+++ b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/util/TlsInfo.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.libquassel.util
+package de.justjanne.libquassel.client.util
 
 import java.security.cert.Certificate
 import java.security.cert.X509Certificate
diff --git a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/util/X509Helper.kt b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/util/X509Helper.kt
similarity index 96%
rename from libquassel/src/main/kotlin/info/quasseldroid/libquassel/util/X509Helper.kt
rename to libquassel/src/main/kotlin/de/justjanne/libquassel/client/util/X509Helper.kt
index cdc72065ea2ee9f343cdf7121be9c673caa05a0c..17f61e638f4786965eed690c9105ccbaa511c431 100644
--- a/libquassel/src/main/kotlin/info/quasseldroid/libquassel/util/X509Helper.kt
+++ b/libquassel/src/main/kotlin/de/justjanne/libquassel/client/util/X509Helper.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.libquassel.util
+package de.justjanne.libquassel.client.util
 
 import java.io.ByteArrayInputStream
 import java.security.cert.Certificate
diff --git a/libquassel/src/test/kotlin/info/quasseldroid/libquassel/EndToEndTest.kt b/libquassel/src/test/kotlin/de/justjanne/libquassel/client/EndToEndTest.kt
similarity index 88%
rename from libquassel/src/test/kotlin/info/quasseldroid/libquassel/EndToEndTest.kt
rename to libquassel/src/test/kotlin/de/justjanne/libquassel/client/EndToEndTest.kt
index e3f8988dcb7704dd6e0206ec8f2e686605e0b660..d4831f1ed3410df583df08a1669a051cde834a1a 100644
--- a/libquassel/src/test/kotlin/info/quasseldroid/libquassel/EndToEndTest.kt
+++ b/libquassel/src/test/kotlin/de/justjanne/libquassel/client/EndToEndTest.kt
@@ -17,25 +17,25 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.libquassel
+package de.justjanne.libquassel.client
 
 import de.justjanne.bitflags.of
+import de.justjanne.libquassel.client.io.CoroutineChannel
+import de.justjanne.libquassel.client.testutil.QuasselCoreContainer
+import de.justjanne.libquassel.client.testutil.TestX509TrustManager
+import de.justjanne.libquassel.protocol.connection.*
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.messages.handshake.*
+import de.justjanne.libquassel.protocol.serializers.HandshakeSerializers
+import de.justjanne.libquassel.protocol.serializers.handshake.ClientInitSerializer
+import de.justjanne.libquassel.protocol.serializers.handshake.ClientLoginSerializer
+import de.justjanne.libquassel.protocol.serializers.handshake.CoreSetupDataSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.HandshakeMapSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.IntSerializer
+import de.justjanne.libquassel.protocol.variant.into
 import de.justjanne.testcontainersci.api.providedContainer
 import de.justjanne.testcontainersci.extension.CiContainers
-import info.quasseldroid.libquassel.io.CoroutineChannel
-import info.quasseldroid.libquassel.testutil.QuasselCoreContainer
-import info.quasseldroid.libquassel.testutil.TestX509TrustManager
-import info.quasseldroid.protocol.connection.*
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.messages.handshake.*
-import info.quasseldroid.protocol.serializers.HandshakeSerializers
-import info.quasseldroid.protocol.serializers.handshake.ClientInitSerializer
-import info.quasseldroid.protocol.serializers.handshake.ClientLoginSerializer
-import info.quasseldroid.protocol.serializers.handshake.CoreSetupDataSerializer
-import info.quasseldroid.protocol.serializers.primitive.HandshakeMapSerializer
-import info.quasseldroid.protocol.serializers.primitive.IntSerializer
-import info.quasseldroid.protocol.variant.into
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/libquassel/src/test/kotlin/info/quasseldroid/libquassel/testutil/QuasselCoreContainer.kt b/libquassel/src/test/kotlin/de/justjanne/libquassel/client/testutil/QuasselCoreContainer.kt
similarity index 97%
rename from libquassel/src/test/kotlin/info/quasseldroid/libquassel/testutil/QuasselCoreContainer.kt
rename to libquassel/src/test/kotlin/de/justjanne/libquassel/client/testutil/QuasselCoreContainer.kt
index 2e879a871ea91069ca32cf3ab6b3411fda8e0298..7bd90de5f9e317b902ca8bf18bb8fe4bfab7f87a 100644
--- a/libquassel/src/test/kotlin/info/quasseldroid/libquassel/testutil/QuasselCoreContainer.kt
+++ b/libquassel/src/test/kotlin/de/justjanne/libquassel/client/testutil/QuasselCoreContainer.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.libquassel.testutil
+package de.justjanne.libquassel.client.testutil
 
 import org.slf4j.LoggerFactory
 import org.testcontainers.containers.BindMode
diff --git a/libquassel/src/test/kotlin/info/quasseldroid/libquassel/testutil/TestX509TrustManager.kt b/libquassel/src/test/kotlin/de/justjanne/libquassel/client/testutil/TestX509TrustManager.kt
similarity index 96%
rename from libquassel/src/test/kotlin/info/quasseldroid/libquassel/testutil/TestX509TrustManager.kt
rename to libquassel/src/test/kotlin/de/justjanne/libquassel/client/testutil/TestX509TrustManager.kt
index ceb9ce2addd99bf02f38c16d895ba13838542505..23e754feff74889d57ae458b4d6bc5e90fffe3d5 100644
--- a/libquassel/src/test/kotlin/info/quasseldroid/libquassel/testutil/TestX509TrustManager.kt
+++ b/libquassel/src/test/kotlin/de/justjanne/libquassel/client/testutil/TestX509TrustManager.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.libquassel.testutil
+package de.justjanne.libquassel.client.testutil
 
 import java.security.cert.X509Certificate
 import javax.net.ssl.X509TrustManager
diff --git a/protocol/build.gradle.kts b/protocol/build.gradle.kts
index 2be90656a4028616be334c6afe3c7d7c3b9feec1..a0d204fdda4dd723507cff01d9dbb0a8a1b3b73d 100644
--- a/protocol/build.gradle.kts
+++ b/protocol/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
   kotlin("jvm")
-  jacoco
-  id("de.justjanne.jacoco-cobertura-converter") version "1.0"
+  id("jacoco")
+  id("de.justjanne.jacoco-cobertura-converter")
 }
 
 tasks.withType<Test> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/connection/ConnectionHeader.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ConnectionHeader.kt
similarity index 94%
rename from protocol/src/main/java/info/quasseldroid/protocol/connection/ConnectionHeader.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ConnectionHeader.kt
index 8673c6637dca078fdccce0895625b0f4e10aa5a3..bf056f5918b820118b328f2ba48b106394080725 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/connection/ConnectionHeader.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ConnectionHeader.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.connection
+package de.justjanne.libquassel.protocol.connection
 
 data class ConnectionHeader(
   val features: ProtocolFeatures,
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/connection/ConnectionHeaderSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ConnectionHeaderSerializer.kt
similarity index 85%
rename from protocol/src/main/java/info/quasseldroid/protocol/connection/ConnectionHeaderSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ConnectionHeaderSerializer.kt
index 4d34ca72dc767d2e74bb5312aabc432849f0ba2a..f3d5055e2a571ed973183f3cf2944206b87ff1f5 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/connection/ConnectionHeaderSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ConnectionHeaderSerializer.kt
@@ -17,15 +17,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.connection
+package de.justjanne.libquassel.protocol.connection
 
 import de.justjanne.bitflags.of
 import de.justjanne.bitflags.toBits
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.serializers.primitive.Serializer
-import info.quasseldroid.protocol.serializers.primitive.UByteSerializer
-import info.quasseldroid.protocol.serializers.primitive.UIntSerializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.serializers.primitive.Serializer
+import de.justjanne.libquassel.protocol.serializers.primitive.UByteSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.UIntSerializer
 import java.nio.ByteBuffer
 
 object ConnectionHeaderSerializer : Serializer<ConnectionHeader> {
@@ -57,7 +57,7 @@ object ConnectionHeaderSerializer : Serializer<ConnectionHeader> {
     buffer: ByteBuffer,
     featureSet: FeatureSet,
     f: () -> T
-  ) : List<T> {
+  ): List<T> {
     val list = mutableListOf<T>()
     while (true) {
       val isLast = UByteSerializer.deserialize(buffer, featureSet) != 0x00u.toUByte()
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolFeature.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolFeature.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolFeature.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolFeature.kt
index 493cd137b24869286af2482c0c0df6ce106376e3..c0ada8fc7315afec1b9e66384ee226b7b8181d47 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolFeature.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolFeature.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.connection
+package de.justjanne.libquassel.protocol.connection
 
 import de.justjanne.bitflags.Flag
 import de.justjanne.bitflags.Flags
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolInfo.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolInfo.kt
similarity index 93%
rename from protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolInfo.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolInfo.kt
index ea7f2e971f68b7a84c4dd9985f8957bd8ca2ec47..920541d13f0700016cda0dd2b557de073a051023 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolInfo.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolInfo.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.connection
+package de.justjanne.libquassel.protocol.connection
 
 data class ProtocolInfo(
   val flags: ProtocolFeatures,
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolInfoSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolInfoSerializer.kt
similarity index 80%
rename from protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolInfoSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolInfoSerializer.kt
index 9285a7046da9a02998499f2ee17dad692bc0420b..dfd701f8d507dbfea390dc4a88e151aa329d2df0 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolInfoSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolInfoSerializer.kt
@@ -17,14 +17,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.connection
+package de.justjanne.libquassel.protocol.connection
 
 import de.justjanne.bitflags.of
 import de.justjanne.bitflags.toBits
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.serializers.primitive.Serializer
-import info.quasseldroid.protocol.serializers.primitive.UByteSerializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.serializers.primitive.Serializer
+import de.justjanne.libquassel.protocol.serializers.primitive.UByteSerializer
 import java.nio.ByteBuffer
 
 object ProtocolInfoSerializer : Serializer<ProtocolInfo> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolMeta.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolMeta.kt
similarity index 93%
rename from protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolMeta.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolMeta.kt
index 2613563055ce13c04ccdd4818a3ac21ac272f052..c9165f3ea0bda833b9919a578d1694fd84580f21 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolMeta.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolMeta.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.connection
+package de.justjanne.libquassel.protocol.connection
 
 data class ProtocolMeta(
   val data: UShort,
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolMetaSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolMetaSerializer.kt
similarity index 76%
rename from protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolMetaSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolMetaSerializer.kt
index 920f9f5cbead05c9cb0f1193000f04db40133f98..736468d950a740cbec8da0ddb5d812355c669787 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolMetaSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolMetaSerializer.kt
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.connection
+package de.justjanne.libquassel.protocol.connection
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.serializers.primitive.Serializer
-import info.quasseldroid.protocol.serializers.primitive.UByteSerializer
-import info.quasseldroid.protocol.serializers.primitive.UShortSerializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.serializers.primitive.Serializer
+import de.justjanne.libquassel.protocol.serializers.primitive.UByteSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.UShortSerializer
 import java.nio.ByteBuffer
 
 object ProtocolMetaSerializer : Serializer<ProtocolMeta> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolVersion.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolVersion.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolVersion.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolVersion.kt
index 3052c14a954d7a1f030166ddb790c34537a470b7..8ffcabfc59584ec3a8379b9df82806b081107235 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/connection/ProtocolVersion.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/connection/ProtocolVersion.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.connection
+package de.justjanne.libquassel.protocol.connection
 
 enum class ProtocolVersion(
   val value: UByte,
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/features/FeatureSet.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/features/FeatureSet.kt
similarity index 97%
rename from protocol/src/main/java/info/quasseldroid/protocol/features/FeatureSet.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/features/FeatureSet.kt
index 24cce95f8dde1e8c482aad86ff3066c95fb88021..9c34c5a207be1fb13ad9dadd0c55563662ff24a9 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/features/FeatureSet.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/features/FeatureSet.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.features
+package de.justjanne.libquassel.protocol.features
 
 import de.justjanne.bitflags.of
 
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/features/LegacyFeature.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/features/LegacyFeature.kt
similarity index 98%
rename from protocol/src/main/java/info/quasseldroid/protocol/features/LegacyFeature.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/features/LegacyFeature.kt
index 25733d33e028fe8e86374ef2c3ace4b70a2d3873..70ab07de1b650d75442500aae97f018a4eaf6181 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/features/LegacyFeature.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/features/LegacyFeature.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.features
+package de.justjanne.libquassel.protocol.features
 
 import de.justjanne.bitflags.Flag
 import de.justjanne.bitflags.Flags
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/features/QuasselFeature.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/features/QuasselFeature.kt
similarity index 96%
rename from protocol/src/main/java/info/quasseldroid/protocol/features/QuasselFeature.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/features/QuasselFeature.kt
index 09dd7f4ae49462538f7e59572e3ee84ac9fde707..8cbf15ef1227dbd643e892df3627e8e02a8003d7 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/features/QuasselFeature.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/features/QuasselFeature.kt
@@ -17,9 +17,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.features
+package de.justjanne.libquassel.protocol.features
 
-import de.kuschku.codecoverage.Generated
+import de.justjanne.codecoverage.Generated
 
 @Generated
 inline class QuasselFeatureName(
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/io/ByteBufferUtil.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/io/ByteBufferUtil.kt
similarity index 97%
rename from protocol/src/main/java/info/quasseldroid/protocol/io/ByteBufferUtil.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/io/ByteBufferUtil.kt
index 72ed1e26bc5b399a334c5436ec95bef7580afc92..0beb4d258df10c946789000efc684aca657c36fc 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/io/ByteBufferUtil.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/io/ByteBufferUtil.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.io
+package de.justjanne.libquassel.protocol.io
 
 import java.nio.ByteBuffer
 
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/io/ChainedByteBuffer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/io/ChainedByteBuffer.kt
similarity index 98%
rename from protocol/src/main/java/info/quasseldroid/protocol/io/ChainedByteBuffer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/io/ChainedByteBuffer.kt
index a67f0e69f889388dfd14cafa05a3aa48f2573b59..e10b6ea90d0e0c1bd8d57edcc6e7fce0f54817d6 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/io/ChainedByteBuffer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/io/ChainedByteBuffer.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.io
+package de.justjanne.libquassel.protocol.io
 
 import java.nio.ByteBuffer
 import java.util.*
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/io/StringEncoder.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/io/StringEncoder.kt
similarity index 98%
rename from protocol/src/main/java/info/quasseldroid/protocol/io/StringEncoder.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/io/StringEncoder.kt
index f1c9e9ffca00deb725a02ba7a7e1e6c355259e96..957e36a3e54614bf6f153556ed02524f4979ca46 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/io/StringEncoder.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/io/StringEncoder.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.io
+package de.justjanne.libquassel.protocol.io
 
 import java.nio.ByteBuffer
 import java.nio.CharBuffer
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInit.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientInit.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInit.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientInit.kt
index 51ff8fce06be2b5ebe33617639c2f9757d2e7203..91f2bd7253a86cffef9112d3703dcdaf1331915d 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInit.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientInit.kt
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.messages.handshake
+package de.justjanne.libquassel.protocol.messages.handshake
 
-import info.quasseldroid.protocol.features.LegacyFeatures
-import info.quasseldroid.protocol.features.QuasselFeatureName
+import de.justjanne.libquassel.protocol.features.LegacyFeatures
+import de.justjanne.libquassel.protocol.features.QuasselFeatureName
 
 data class ClientInit(
   val clientVersion: String?,
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInitAck.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientInitAck.kt
similarity index 78%
rename from protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInitAck.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientInitAck.kt
index 104d43da7fbc6fc7c2a4a31a6d3477af1070c531..17fa28c003081da456f4c06ebd04c11cd95be75e 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInitAck.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientInitAck.kt
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.messages.handshake
+package de.justjanne.libquassel.protocol.messages.handshake
 
-import info.quasseldroid.protocol.features.LegacyFeatures
-import info.quasseldroid.protocol.features.QuasselFeatureName
-import info.quasseldroid.protocol.variant.QVariantList
+import de.justjanne.libquassel.protocol.features.LegacyFeatures
+import de.justjanne.libquassel.protocol.features.QuasselFeatureName
+import de.justjanne.libquassel.protocol.variant.QVariantList
 
 data class ClientInitAck(
   val coreFeatures: LegacyFeatures,
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInitReject.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientInitReject.kt
similarity index 92%
rename from protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInitReject.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientInitReject.kt
index 3414d988ccd79f37e2ea211ed099a772328455fb..ad51700213cc04dbedaad4b10a98d420da2f5906 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientInitReject.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientInitReject.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.messages.handshake
+package de.justjanne.libquassel.protocol.messages.handshake
 
 data class ClientInitReject(
   val errorString: String?
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLogin.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientLogin.kt
similarity index 93%
rename from protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLogin.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientLogin.kt
index 8a4232ab40a839cb4f7f32b636b22977b1d823f5..8576d66d8ec5d8a232d29778540a7387244b5b0c 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLogin.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientLogin.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.messages.handshake
+package de.justjanne.libquassel.protocol.messages.handshake
 
 data class ClientLogin(
   val user: String?,
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLoginAck.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientLoginAck.kt
similarity index 93%
rename from protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLoginAck.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientLoginAck.kt
index 7ed8546064e5ab402660fa3ad636b5a0001e7d6e..2b3ba4f1c3ad389df058f5d8e51a4c79bee009b3 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLoginAck.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientLoginAck.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.messages.handshake
+package de.justjanne.libquassel.protocol.messages.handshake
 
 object ClientLoginAck {
   override fun toString(): String {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLoginReject.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientLoginReject.kt
similarity index 92%
rename from protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLoginReject.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientLoginReject.kt
index baecc0b199a61b38110b58306bf6e81edfc1e614..deeab822be25e02f1c7269583b8982895f0d3629 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/ClientLoginReject.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/ClientLoginReject.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.messages.handshake
+package de.justjanne.libquassel.protocol.messages.handshake
 
 data class ClientLoginReject(
   val errorString: String?
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupAck.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/CoreSetupAck.kt
similarity index 93%
rename from protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupAck.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/CoreSetupAck.kt
index ed4360b358fe92458b97086dec9150cbf4308698..a0fd7bd89ef4a68f9671919a4723e611b394c517 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupAck.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/CoreSetupAck.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.messages.handshake
+package de.justjanne.libquassel.protocol.messages.handshake
 
 object CoreSetupAck {
   override fun toString(): String {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupData.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/CoreSetupData.kt
similarity index 88%
rename from protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupData.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/CoreSetupData.kt
index abf8d27b963c8ad1361e43a43c16c49801c9e23c..31f899a20a1ee3b7c830f29bc5e66520f1854036 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupData.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/CoreSetupData.kt
@@ -17,9 +17,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.messages.handshake
+package de.justjanne.libquassel.protocol.messages.handshake
 
-import info.quasseldroid.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QVariantMap
 
 data class CoreSetupData(
   val adminUser: String?,
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupReject.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/CoreSetupReject.kt
similarity index 92%
rename from protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupReject.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/CoreSetupReject.kt
index 69278c4ed274f5e8d36df4fe1bf07b1f30999d44..6abd57e4165d8cb3d5ca0246f8ea3b9ec7529e72 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/CoreSetupReject.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/CoreSetupReject.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.messages.handshake
+package de.justjanne.libquassel.protocol.messages.handshake
 
 data class CoreSetupReject(
   val errorString: String?
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/SessionInit.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/SessionInit.kt
similarity index 87%
rename from protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/SessionInit.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/SessionInit.kt
index 47b9aad27eaabd96193570eddabb6e8cfe78aed3..8ea95be975271483999c8b978a4b2656331f5b66 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/messages/handshake/SessionInit.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/messages/handshake/SessionInit.kt
@@ -17,9 +17,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.messages.handshake
+package de.justjanne.libquassel.protocol.messages.handshake
 
-import info.quasseldroid.protocol.variant.QVariantList
+import de.justjanne.libquassel.protocol.variant.QVariantList
 
 data class SessionInit(
   val identities: QVariantList?,
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/HandshakeSerializers.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/HandshakeSerializers.kt
similarity index 90%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/HandshakeSerializers.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/HandshakeSerializers.kt
index 1c3188866040dab08310d17e515458a0e646cbae..d1beda27bfaf268618e808f2095a3b0cbddd9203 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/HandshakeSerializers.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/HandshakeSerializers.kt
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers
+package de.justjanne.libquassel.protocol.serializers
 
-import info.quasseldroid.protocol.serializers.handshake.*
-import info.quasseldroid.protocol.serializers.primitive.*
+import de.justjanne.libquassel.protocol.serializers.handshake.*
+import de.justjanne.libquassel.protocol.serializers.primitive.*
 import java.util.*
 
 object HandshakeSerializers {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/NoSerializerForTypeException.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/NoSerializerForTypeException.kt
similarity index 92%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/NoSerializerForTypeException.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/NoSerializerForTypeException.kt
index a776552ed9874e8cd330d306b5b4381de4b2a15d..1b88c7396361466610c6e261fdba4dd6a7129152 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/NoSerializerForTypeException.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/NoSerializerForTypeException.kt
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers
+package de.justjanne.libquassel.protocol.serializers
 
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.QuasselType
 
 sealed class NoSerializerForTypeException : Exception() {
   data class Qt(
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/QtSerializers.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/QtSerializers.kt
similarity index 91%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/QtSerializers.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/QtSerializers.kt
index 22449c4a842bcec53f612c6d74f2457704c41d96..473deea1a0a0258e712f8ce1e8bf9ccc0a3c6f00 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/QtSerializers.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/QtSerializers.kt
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers
+package de.justjanne.libquassel.protocol.serializers
 
-import info.quasseldroid.protocol.serializers.primitive.*
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.primitive.*
+import de.justjanne.libquassel.protocol.variant.QtType
 import java.util.*
 
 object QtSerializers {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/QuasselSerializers.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/QuasselSerializers.kt
similarity index 90%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/QuasselSerializers.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/QuasselSerializers.kt
index d923d7d64a9b70efa76fa17c55645eda3c9a4cfc..2116e3797225d9c22cb3109311bfb967e65e2a0c 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/QuasselSerializers.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/QuasselSerializers.kt
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers
+package de.justjanne.libquassel.protocol.serializers
 
-import info.quasseldroid.protocol.serializers.primitive.*
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.serializers.primitive.*
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import java.util.*
 
 object QuasselSerializers {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitAckSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitAckSerializer.kt
similarity index 85%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitAckSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitAckSerializer.kt
index 63ed22bf95813567d2d535102ed8967addf55ba9..eaf57b7d49dba2e20f19edee04eea13e3db625e4 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitAckSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitAckSerializer.kt
@@ -17,14 +17,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
 
 import de.justjanne.bitflags.of
 import de.justjanne.bitflags.toBits
-import info.quasseldroid.protocol.features.LegacyFeature
-import info.quasseldroid.protocol.features.QuasselFeatureName
-import info.quasseldroid.protocol.messages.handshake.ClientInitAck
-import info.quasseldroid.protocol.variant.*
+import de.justjanne.libquassel.protocol.features.LegacyFeature
+import de.justjanne.libquassel.protocol.features.QuasselFeatureName
+import de.justjanne.libquassel.protocol.messages.handshake.ClientInitAck
+import de.justjanne.libquassel.protocol.variant.*
 
 object ClientInitAckSerializer : HandshakeSerializer<ClientInitAck> {
   override val type: String = "ClientInitAck"
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitRejectSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitRejectSerializer.kt
similarity index 77%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitRejectSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitRejectSerializer.kt
index 6ec646272bb1204bc7a996f44c902e6e616af679..dc33ed98ec2586386835e3ec77a81a6d9fd04278 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitRejectSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitRejectSerializer.kt
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
 
-import info.quasseldroid.protocol.messages.handshake.ClientInitReject
-import info.quasseldroid.protocol.variant.QVariantMap
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.into
-import info.quasseldroid.protocol.variant.qVariant
+import de.justjanne.libquassel.protocol.messages.handshake.ClientInitReject
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.into
+import de.justjanne.libquassel.protocol.variant.qVariant
 
 object ClientInitRejectSerializer : HandshakeSerializer<ClientInitReject> {
   override val type: String = "ClientInitReject"
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitSerializer.kt
similarity index 77%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitSerializer.kt
index 887c0c796d30713a9857b1860252c042a4c5a155..f334afe742b0010d4581fd83b451ebc11ded6b77 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientInitSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitSerializer.kt
@@ -17,17 +17,17 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
 
 import de.justjanne.bitflags.of
 import de.justjanne.bitflags.toBits
-import info.quasseldroid.protocol.features.LegacyFeature
-import info.quasseldroid.protocol.features.QuasselFeatureName
-import info.quasseldroid.protocol.messages.handshake.ClientInit
-import info.quasseldroid.protocol.variant.QVariantMap
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.into
-import info.quasseldroid.protocol.variant.qVariant
+import de.justjanne.libquassel.protocol.features.LegacyFeature
+import de.justjanne.libquassel.protocol.features.QuasselFeatureName
+import de.justjanne.libquassel.protocol.messages.handshake.ClientInit
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.into
+import de.justjanne.libquassel.protocol.variant.qVariant
 
 object ClientInitSerializer : HandshakeSerializer<ClientInit> {
   override val type: String = "ClientInit"
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientLoginAckSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientLoginAckSerializer.kt
similarity index 72%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientLoginAckSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientLoginAckSerializer.kt
index bce204c76235ea528aa6184e7b89d15cdaf2bb8f..3aa2db17a917c38ff193aca0998851775663a8fc 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientLoginAckSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientLoginAckSerializer.kt
@@ -17,15 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
 
-import de.justjanne.bitflags.of
-import de.justjanne.bitflags.toBits
-import info.quasseldroid.protocol.features.LegacyFeature
-import info.quasseldroid.protocol.features.QuasselFeatureName
-import info.quasseldroid.protocol.messages.handshake.ClientInitAck
-import info.quasseldroid.protocol.messages.handshake.ClientLoginAck
-import info.quasseldroid.protocol.variant.*
+import de.justjanne.libquassel.protocol.messages.handshake.ClientLoginAck
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.qVariant
 
 object ClientLoginAckSerializer : HandshakeSerializer<ClientLoginAck> {
   override val type: String = "ClientLoginAck"
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientLoginRejectSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientLoginRejectSerializer.kt
similarity index 77%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientLoginRejectSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientLoginRejectSerializer.kt
index 1be13b9fcdc711f8a7321fdf6a7c9992cff076e6..73488deb05e232488b40d0f5d9bf040c2e803f05 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientLoginRejectSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientLoginRejectSerializer.kt
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
 
-import info.quasseldroid.protocol.messages.handshake.ClientLoginReject
-import info.quasseldroid.protocol.variant.QVariantMap
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.into
-import info.quasseldroid.protocol.variant.qVariant
+import de.justjanne.libquassel.protocol.messages.handshake.ClientLoginReject
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.into
+import de.justjanne.libquassel.protocol.variant.qVariant
 
 object ClientLoginRejectSerializer : HandshakeSerializer<ClientLoginReject> {
   override val type: String = "ClientLoginReject"
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientLoginSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientLoginSerializer.kt
similarity index 77%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientLoginSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientLoginSerializer.kt
index 0756629ac3806edd8fe60a78b5d7ab79e7b85eb4..971d5e507b2feed36dfef44fb4e44062a7c08d65 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/ClientLoginSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientLoginSerializer.kt
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
 
-import info.quasseldroid.protocol.messages.handshake.ClientLogin
-import info.quasseldroid.protocol.variant.QVariantMap
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.into
-import info.quasseldroid.protocol.variant.qVariant
+import de.justjanne.libquassel.protocol.messages.handshake.ClientLogin
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.into
+import de.justjanne.libquassel.protocol.variant.qVariant
 
 object ClientLoginSerializer : HandshakeSerializer<ClientLogin> {
   override val type: String = "ClientLogin"
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/CoreSetupAckSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/CoreSetupAckSerializer.kt
similarity index 78%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/CoreSetupAckSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/CoreSetupAckSerializer.kt
index 0cad1097d91e0c52337bf2ff2b6e4943ebf85007..c5005b05786fa68d5eea647d3748246201efdb2a 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/CoreSetupAckSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/CoreSetupAckSerializer.kt
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
 
-import info.quasseldroid.protocol.messages.handshake.CoreSetupAck
-import info.quasseldroid.protocol.variant.QVariantMap
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.qVariant
+import de.justjanne.libquassel.protocol.messages.handshake.CoreSetupAck
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.qVariant
 
 object CoreSetupAckSerializer : HandshakeSerializer<CoreSetupAck> {
   override val type: String = "CoreSetupAck"
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/CoreSetupDataSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/CoreSetupDataSerializer.kt
similarity index 84%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/CoreSetupDataSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/CoreSetupDataSerializer.kt
index e9dd0a8fd94146645c12c8c756a97903389e826d..0ff90a2f6baae824ca53b7714628ea898112a792 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/CoreSetupDataSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/CoreSetupDataSerializer.kt
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
 
-import info.quasseldroid.protocol.messages.handshake.CoreSetupData
-import info.quasseldroid.protocol.variant.QVariantMap
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.into
-import info.quasseldroid.protocol.variant.qVariant
+import de.justjanne.libquassel.protocol.messages.handshake.CoreSetupData
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.into
+import de.justjanne.libquassel.protocol.variant.qVariant
 
 object CoreSetupDataSerializer : HandshakeSerializer<CoreSetupData> {
   override val type: String = "CoreSetupData"
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/CoreSetupRejectSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/CoreSetupRejectSerializer.kt
similarity index 75%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/CoreSetupRejectSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/CoreSetupRejectSerializer.kt
index a350a6c77ca390270ab18ed648d8428558734047..76ffb5b535c7a99f1b262889a56df883c1118afa 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/CoreSetupRejectSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/CoreSetupRejectSerializer.kt
@@ -17,14 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
 
-import info.quasseldroid.protocol.messages.handshake.ClientInitReject
-import info.quasseldroid.protocol.messages.handshake.CoreSetupReject
-import info.quasseldroid.protocol.variant.QVariantMap
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.into
-import info.quasseldroid.protocol.variant.qVariant
+import de.justjanne.libquassel.protocol.messages.handshake.CoreSetupReject
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.into
+import de.justjanne.libquassel.protocol.variant.qVariant
 
 object CoreSetupRejectSerializer : HandshakeSerializer<CoreSetupReject> {
   override val type: String = "CoreSetupReject"
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/HandshakeSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/HandshakeSerializer.kt
similarity index 87%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/HandshakeSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/HandshakeSerializer.kt
index c9f560937b90bb9e1e5230d33a9e2f7a0ffa7495..480edb97dffc0769508b1617509f3986424afcbe 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/HandshakeSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/HandshakeSerializer.kt
@@ -17,9 +17,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
 
-import info.quasseldroid.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QVariantMap
 
 interface HandshakeSerializer<T> {
   val type: String
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/SessionInitSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/SessionInitSerializer.kt
similarity index 81%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/SessionInitSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/SessionInitSerializer.kt
index dbc49f1e57dfa84fd01c927c02defed7863fd7dd..bbbf90f20aa13e940ea7adb7b2665250588ce95c 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/handshake/SessionInitSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/SessionInitSerializer.kt
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
 
-import info.quasseldroid.protocol.messages.handshake.SessionInit
-import info.quasseldroid.protocol.variant.QVariantMap
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.into
-import info.quasseldroid.protocol.variant.qVariant
+import de.justjanne.libquassel.protocol.messages.handshake.SessionInit
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.into
+import de.justjanne.libquassel.protocol.variant.qVariant
 
 object SessionInitSerializer : HandshakeSerializer<SessionInit> {
   override val type: String = "SessionInit"
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BoolSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/BoolSerializer.kt
similarity index 83%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BoolSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/BoolSerializer.kt
index ae36f4b6a0599d06f0eac79d479daee043739c88..5bc9ce148ffccd72c92cb96d5a7e762936e5461b 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BoolSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/BoolSerializer.kt
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
 import java.nio.ByteBuffer
 
 object BoolSerializer : QtSerializer<Boolean> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BufferIdSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/BufferIdSerializer.kt
similarity index 80%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BufferIdSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/BufferIdSerializer.kt
index 6f527b7d5316ab452dd3f95177c8c9dfdeff011f..16a00ff6e516631da78b594321a214868cf697a7 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BufferIdSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/BufferIdSerializer.kt
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.types.BufferId
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.types.BufferId
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import java.nio.ByteBuffer
 
 object BufferIdSerializer : QuasselSerializer<BufferId> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BufferInfoSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/BufferInfoSerializer.kt
similarity index 85%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BufferInfoSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/BufferInfoSerializer.kt
index b400cd6dc756492ac0922294753be6cb219f2d3d..b894ed94662c37f0aa3340ad09c4aca72c71781f 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/BufferInfoSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/BufferInfoSerializer.kt
@@ -17,15 +17,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
 import de.justjanne.bitflags.of
 import de.justjanne.bitflags.toBits
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.types.BufferInfo
-import info.quasseldroid.protocol.types.BufferType
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.types.BufferInfo
+import de.justjanne.libquassel.protocol.types.BufferType
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import java.nio.ByteBuffer
 
 object BufferInfoSerializer : QuasselSerializer<BufferInfo> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ByteBufferSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ByteBufferSerializer.kt
similarity index 83%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ByteBufferSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ByteBufferSerializer.kt
index 07fc69340e4e0a785c2baae41c9fe226dc7dd7ad..b7462097b458ed3826f0ba219675f6a7e59c101b 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ByteBufferSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ByteBufferSerializer.kt
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.io.copyData
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.io.copyData
+import de.justjanne.libquassel.protocol.variant.QtType
 import java.nio.ByteBuffer
 
 object ByteBufferSerializer : QtSerializer<ByteBuffer?> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ByteSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ByteSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ByteSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ByteSerializer.kt
index b3dd069a97e33b65da2594b3678f273bd67e148b..a91ebc53a353f3add24a7f55c3e55d19a44efb92 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ByteSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ByteSerializer.kt
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
 import java.nio.ByteBuffer
 
 object ByteSerializer : QtSerializer<Byte> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DateSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DateSerializer.kt
similarity index 85%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DateSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DateSerializer.kt
index 0a02256bd589d24e2e7cc42bd6fe8a47134215c2..dbc116e196abf6aaa8f7447bc5251d9d99bf4940 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DateSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DateSerializer.kt
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
 import org.threeten.bp.LocalDate
 import org.threeten.bp.temporal.JulianFields
 import java.nio.ByteBuffer
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DateTimeSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializer.kt
similarity index 90%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DateTimeSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializer.kt
index a532f967265f259e779148b58367c781d8bd1ea5..139ae6f47d9bda32f4cc28cff6f162ec27daa930 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DateTimeSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializer.kt
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.types.TimeSpec
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.types.TimeSpec
+import de.justjanne.libquassel.protocol.variant.QtType
 import org.threeten.bp.*
 import org.threeten.bp.temporal.Temporal
 import java.nio.ByteBuffer
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DccIpDetectionModeSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DccIpDetectionModeSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializer.kt
index fcc9ad1ffeaaca7f8d3149a433e3e3c9dcf0f725..61b1eff79e3073fbc37fcab59b7d83848df01faa 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DccIpDetectionModeSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializer.kt
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.types.DccIpDetectionMode
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.types.DccIpDetectionMode
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import java.nio.ByteBuffer
 
 object DccIpDetectionModeSerializer : QuasselSerializer<DccIpDetectionMode?> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DccPortSelectionModeSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DccPortSelectionModeSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DccPortSelectionModeSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DccPortSelectionModeSerializer.kt
index 27b78d5f597d2fe4aff5533ed86896489d4fb740..36ddb3f198009102d5802d310adf57f83476d6b6 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DccPortSelectionModeSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DccPortSelectionModeSerializer.kt
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.types.DccPortSelectionMode
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.types.DccPortSelectionMode
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import java.nio.ByteBuffer
 
 object DccPortSelectionModeSerializer : QuasselSerializer<DccPortSelectionMode?> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DoubleSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DoubleSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DoubleSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DoubleSerializer.kt
index f708071b53de044b40229d80a6dccfd2b0e117cb..aa3fc5963c96d36c31359574cf56916aa09a8dc7 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/DoubleSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DoubleSerializer.kt
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
 import java.nio.ByteBuffer
 
 object DoubleSerializer : QtSerializer<Double> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/FloatSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/FloatSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/FloatSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/FloatSerializer.kt
index c759d6077aa92ebd7c05e951f6c9d290f7a10a41..3c1f4c935d02ddd25f2612da601a30e840d7cf0d 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/FloatSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/FloatSerializer.kt
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
 import java.nio.ByteBuffer
 
 object FloatSerializer : QtSerializer<Float> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/HandshakeMapSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/HandshakeMapSerializer.kt
similarity index 88%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/HandshakeMapSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/HandshakeMapSerializer.kt
index b281e570db29d99f4eee7c0cc5f5ac4c2d4cf0d0..b427b8368ce743332e863e4332ece97a97f30333 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/HandshakeMapSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/HandshakeMapSerializer.kt
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.*
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.*
 import java.nio.ByteBuffer
 
 object HandshakeMapSerializer : QtSerializer<QVariantMap> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/IdentityIdSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/IdentityIdSerializer.kt
similarity index 80%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/IdentityIdSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/IdentityIdSerializer.kt
index 87252060087d1c009faab5da524bc8dadf039900..8d60c368d9ed0bf2847f3745ee74308c9db4621b 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/IdentityIdSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/IdentityIdSerializer.kt
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.types.IdentityId
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.types.IdentityId
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import java.nio.ByteBuffer
 
 object IdentityIdSerializer : QuasselSerializer<IdentityId> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/IntSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/IntSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/IntSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/IntSerializer.kt
index 4276b63ef3b7f6d5d9b98176559a3c3d5e3eae1f..3528049a8b41c05a60b1df440e9d294923db4a58 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/IntSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/IntSerializer.kt
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
 import java.nio.ByteBuffer
 
 object IntSerializer : QtSerializer<Int> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/LongSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/LongSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/LongSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/LongSerializer.kt
index 4d47fcc47c011e95df99b64388bfa7f53c6ed866..9b11feadd66ba06f35befdb415c307002221959b 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/LongSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/LongSerializer.kt
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
 import java.nio.ByteBuffer
 
 object LongSerializer : QtSerializer<Long> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/MessageSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/MessageSerializer.kt
similarity index 87%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/MessageSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/MessageSerializer.kt
index cd426cf26c15a8615b56766d92214a78669fdf23..b68d578246cab0ead24720b7407417543ff86f85 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/MessageSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/MessageSerializer.kt
@@ -17,17 +17,17 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
 import de.justjanne.bitflags.of
 import de.justjanne.bitflags.toBits
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.features.QuasselFeature
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.types.Message
-import info.quasseldroid.protocol.types.MessageFlag
-import info.quasseldroid.protocol.types.MessageType
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.features.QuasselFeature
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.types.Message
+import de.justjanne.libquassel.protocol.types.MessageFlag
+import de.justjanne.libquassel.protocol.types.MessageType
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import org.threeten.bp.Instant
 import java.nio.ByteBuffer
 
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/MsgIdSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/MsgIdSerializer.kt
similarity index 81%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/MsgIdSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/MsgIdSerializer.kt
index b3885e1bda774fed24e3cd9965f5a0e6b5f67374..cf9141c91ddddb8c2797a0b8f270c9e4e4a93754 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/MsgIdSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/MsgIdSerializer.kt
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.features.QuasselFeature
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.types.MsgId
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.features.QuasselFeature
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.types.MsgId
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import java.nio.ByteBuffer
 
 object MsgIdSerializer : QuasselSerializer<MsgId> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/NetworkIdSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/NetworkIdSerializer.kt
similarity index 80%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/NetworkIdSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/NetworkIdSerializer.kt
index 2afa5409bdefc656592a79c9e6fb6c16445c877f..7ad4c917761538389434ef1101e02037c7ef4c51 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/NetworkIdSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/NetworkIdSerializer.kt
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.types.NetworkId
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.types.NetworkId
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import java.nio.ByteBuffer
 
 object NetworkIdSerializer : QuasselSerializer<NetworkId> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/PeerPtrSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/PeerPtrSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/PeerPtrSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/PeerPtrSerializer.kt
index 713f91b94beb912d40dde7ff5d764a79937f48f4..d9f7aaf3a58b67cc38a7f272a98d2beb8796e35d 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/PeerPtrSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/PeerPtrSerializer.kt
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import java.nio.ByteBuffer
 
 object PeerPtrSerializer : QuasselSerializer<ULong> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QCharSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QCharSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QCharSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QCharSerializer.kt
index 3355e7eaf6f3d80905165cd9d7140e6ee8be51f3..af199efa752018ddd27eb9e7ad8d57f741c7f97d 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QCharSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QCharSerializer.kt
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.io.StringEncoder
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.io.StringEncoder
+import de.justjanne.libquassel.protocol.variant.QtType
 import java.nio.ByteBuffer
 import kotlin.concurrent.getOrSet
 
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QHostAddressSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QHostAddressSerializer.kt
similarity index 87%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QHostAddressSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QHostAddressSerializer.kt
index 9c377f94add2ec0de8e42680ffc71f27cd9e7f09..fb674dc3c7095e4758e020f2e6f873ca45460cf0 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QHostAddressSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QHostAddressSerializer.kt
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.types.NetworkLayerProtocol
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.types.NetworkLayerProtocol
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import java.net.Inet4Address
 import java.net.Inet6Address
 import java.net.InetAddress
@@ -54,7 +54,7 @@ object QHostAddressSerializer : QuasselSerializer<InetAddress> {
         )
         buffer.put(data.address)
       }
-      else            -> {
+      else -> {
         UByteSerializer.serialize(
           buffer,
           NetworkLayerProtocol.UnknownNetworkLayerProtocol.value,
@@ -78,7 +78,7 @@ object QHostAddressSerializer : QuasselSerializer<InetAddress> {
         buffer.get(buf)
         Inet6Address.getByAddress(buf)
       }
-      else                              -> {
+      else -> {
         throw IllegalArgumentException("Invalid network protocol $type")
       }
     }
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QStringListSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QStringListSerializer.kt
similarity index 83%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QStringListSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QStringListSerializer.kt
index 518c6c589334a22aac29085ea1587879bd4a0332..81e8f2cf4311f066c090d63810dd25b2c7e6a5ff 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QStringListSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QStringListSerializer.kt
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QStringList
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QStringList
+import de.justjanne.libquassel.protocol.variant.QtType
 import java.nio.ByteBuffer
 
 object QStringListSerializer : QtSerializer<QStringList> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantListSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QVariantListSerializer.kt
similarity index 81%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantListSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QVariantListSerializer.kt
index 208615e86b99288683f43388f5329b836658661f..2f0ef8a642c179ce33e601d6d80a0828c097cdf3 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantListSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QVariantListSerializer.kt
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QVariantList
-import info.quasseldroid.protocol.variant.QVariant_
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QVariantList
+import de.justjanne.libquassel.protocol.variant.QVariant_
+import de.justjanne.libquassel.protocol.variant.QtType
 import java.nio.ByteBuffer
 
 object QVariantListSerializer : QtSerializer<QVariantList> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantMapSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QVariantMapSerializer.kt
similarity index 83%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantMapSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QVariantMapSerializer.kt
index f64b6f612b08f2ae029569444cc6845ade8ef303..a96fcd6a17403f9607f4d3bc7a21440eb0a32717 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantMapSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QVariantMapSerializer.kt
@@ -17,13 +17,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QVariantMap
-import info.quasseldroid.protocol.variant.QVariant_
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QVariant_
+import de.justjanne.libquassel.protocol.variant.QtType
 import java.nio.ByteBuffer
 
 object QVariantMapSerializer : QtSerializer<QVariantMap> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QVariantSerializer.kt
similarity index 81%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QVariantSerializer.kt
index 2d28fdbefc71c246fb4ba19028568d631648ffa7..3cbf153c5c50535de42410fd47e0ae6fa068484f 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QVariantSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QVariantSerializer.kt
@@ -17,17 +17,17 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.serializers.NoSerializerForTypeException
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.variant.QVariant
-import info.quasseldroid.protocol.variant.QVariant_
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.serializers.NoSerializerForTypeException
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.variant.QVariant
+import de.justjanne.libquassel.protocol.variant.QVariant_
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import java.nio.ByteBuffer
 
 object QVariantSerializer : QtSerializer<QVariant_> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QtSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QtSerializer.kt
similarity index 87%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QtSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QtSerializer.kt
index e981e81083fe6aa403019220c34b78193721f1b4..7a6ff24e0fe20a9531d70a2775f17a803a45bc0f 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QtSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QtSerializer.kt
@@ -17,9 +17,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.QtType
 
 interface QtSerializer<T> : Serializer<T> {
   val qtType: QtType
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QuasselSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QuasselSerializer.kt
similarity index 83%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QuasselSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QuasselSerializer.kt
index cb83b4aa3b870e4ff89bf7cef8adc37e29ec3770..bc5f6f5553d0d1d4bcdcede8351a909e2317e70f 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/QuasselSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/QuasselSerializer.kt
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.QuasselType
 
 interface QuasselSerializer<T> : QtSerializer<T> {
   override val qtType: QtType get() = quasselType.qtType
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/Serializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/Serializer.kt
similarity index 83%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/Serializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/Serializer.kt
index 49eb6c66a3a3cf1b9a7122cc985c53624c8dd238..da634674e8c159520e9a5a5a643accaa46dd017a 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/Serializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/Serializer.kt
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
 import java.nio.ByteBuffer
 
 interface Serializer<T> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ShortSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ShortSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ShortSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ShortSerializer.kt
index 094c649f579c6a4d5969c8402107c530a7df3c04..9f776c89a8a402c165ad6e3ee2bab0db658488c2 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ShortSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ShortSerializer.kt
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
 import java.nio.ByteBuffer
 
 object ShortSerializer : QtSerializer<Short> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializer.kt
similarity index 89%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializer.kt
index 649178a5023b23bb238f3836c2f1f7964746c576..59928cb56c93eb97ef6adecf963d9b2e92d7f00c 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializer.kt
@@ -17,12 +17,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.io.StringEncoder
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.io.StringEncoder
+import de.justjanne.libquassel.protocol.variant.QtType
 import java.nio.ByteBuffer
 import java.nio.charset.Charset
 import kotlin.concurrent.getOrSet
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerAscii.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerAscii.kt
similarity index 92%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerAscii.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerAscii.kt
index 9eec4bb68887d23817cbd92e3ec3146ffef08044..03474fb1c1f77e0f87ffcbcbffcdb2e31b14368d 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerAscii.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerAscii.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
 object StringSerializerAscii : StringSerializer(Charsets.ISO_8859_1, true)
 
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerUtf16.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerUtf16.kt
similarity index 92%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerUtf16.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerUtf16.kt
index 2d40edba1a0a982508c8b20071ef6848fbd2b796..c49d80b34db17ff96cac265ed576ae1c0774da75 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerUtf16.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerUtf16.kt
@@ -17,6 +17,6 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
 object StringSerializerUtf16 : StringSerializer(Charsets.UTF_16BE, false)
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerUtf8.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerUtf8.kt
similarity index 92%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerUtf8.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerUtf8.kt
index 9c9d4ce21447a2a57683812ef30446050e645bb0..e944a65e04da9ec00e0074899206e3736537aa44 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/StringSerializerUtf8.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerUtf8.kt
@@ -17,6 +17,6 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
 object StringSerializerUtf8 : StringSerializer(Charsets.UTF_8, false)
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/TimeSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/TimeSerializer.kt
similarity index 85%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/TimeSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/TimeSerializer.kt
index 323d83a11961e6adba57a15b2b2be981b2ee5e79..42adaa1b786d0dab70eab11d757e0363599dea46 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/TimeSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/TimeSerializer.kt
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
 import org.threeten.bp.LocalTime
 import java.nio.ByteBuffer
 
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UByteSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/UByteSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UByteSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/UByteSerializer.kt
index d9da69a5500f3e78c0e550e04877ae0850ca780a..ac607172f3ff70958bfe5a8529eebca196340e71 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UByteSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/UByteSerializer.kt
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
 import java.nio.ByteBuffer
 
 object UByteSerializer : QtSerializer<UByte> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UIntSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/UIntSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UIntSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/UIntSerializer.kt
index 8f19b4595d2f5b7dacf052a7f9678d532a39baaf..963d6f48a74049b7f84c1195cef1eaae79af892f 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UIntSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/UIntSerializer.kt
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
 import java.nio.ByteBuffer
 
 object UIntSerializer : QtSerializer<UInt> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ULongSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ULongSerializer.kt
similarity index 82%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ULongSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ULongSerializer.kt
index 7173df1733f51bef2d8fffc12c04ee3fc79ce7e9..6771f33e54bbda3cb5fb6a9fd1431a52b51258b9 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/ULongSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/ULongSerializer.kt
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
 import java.nio.ByteBuffer
 
 object ULongSerializer : QtSerializer<ULong> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UShortSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/UShortSerializer.kt
similarity index 83%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UShortSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/UShortSerializer.kt
index 21cf3187917261266f0c5be356ab007efaa0e3ef..f9b056dcfe6b2493d8b6e6a2e0e8fe6676892cb6 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/UShortSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/UShortSerializer.kt
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
 import java.nio.ByteBuffer
 
 object UShortSerializer : QtSerializer<UShort> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/VoidSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/VoidSerializer.kt
similarity index 81%
rename from protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/VoidSerializer.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/VoidSerializer.kt
index f97a587b4ea0b88e779fc3716786ad689132cb8a..c4c90f9b4a53bf5a3c3df6e8f77c838d4c51ea07 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/serializers/primitive/VoidSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/VoidSerializer.kt
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.variant.QtType
 import java.nio.ByteBuffer
 
 object VoidSerializer : QtSerializer<Unit> {
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/BufferActivity.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferActivity.kt
similarity index 96%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/BufferActivity.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferActivity.kt
index e5ba3f4e11c1c3eb04c9c0424a73e252cf2e3992..76228ed8f5e2736a69207fc13a64655b2a8d2109 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/BufferActivity.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferActivity.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
 
 import de.justjanne.bitflags.Flag
 import de.justjanne.bitflags.Flags
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/BufferId.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferId.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/BufferId.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferId.kt
index 38c04f463e37105d80800b7506577d4654c8dd21..2bebd404e9f9b3d534f431f9c285af918ef254f7 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/BufferId.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferId.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
 
 private typealias BufferIdType = SignedIdType
 
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/BufferInfo.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferInfo.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/BufferInfo.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferInfo.kt
index d94211e47daab1d2d121c2aa5b9fc7208205b102..cb49ccf3c2240cfb2fb5e1c25cf64bcb4a540ffb 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/BufferInfo.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferInfo.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
 
 import de.justjanne.bitflags.none
 
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/BufferType.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferType.kt
similarity index 96%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/BufferType.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferType.kt
index 0207df84130e276bbff4cad3f433251f58d24b68..8ee3b1add5a35e46311b1b1dde0c75ef3c573c7a 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/BufferType.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/BufferType.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
 
 import de.justjanne.bitflags.Flag
 import de.justjanne.bitflags.Flags
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/DccIpDetectionMode.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/DccIpDetectionMode.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/DccIpDetectionMode.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/DccIpDetectionMode.kt
index 7f8d17043d0f20a78aba3025d641dae1419204c7..153e5a5b99a2267bba0f94012069e5f9c67abf29 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/DccIpDetectionMode.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/DccIpDetectionMode.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
 
 /**
  * Mode for detecting the outgoing IP
@@ -27,6 +27,7 @@ enum class DccIpDetectionMode(
 ) {
   /** Automatic detection (network socket or USERHOST) */
   Automatic(0x00u),
+
   /** Manually specified IP */
   Manual(0x01u);
 
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/DccPortSelectionMode.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/DccPortSelectionMode.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/DccPortSelectionMode.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/DccPortSelectionMode.kt
index 42ee157be45ef3344036b442020ae96268b11870..b26a5fb71542ba65c86d844e5e93b8460174180f 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/DccPortSelectionMode.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/DccPortSelectionMode.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
 
 /**
  * Mode for selecting the port range for DCC
@@ -27,6 +27,7 @@ enum class DccPortSelectionMode(
 ) {
   /** Automatic port selection */
   Automatic(0x00u),
+
   /** Manually specified port range */
   Manual(0x01u);
 
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/IdentityId.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/IdentityId.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/IdentityId.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/IdentityId.kt
index d24d0367e0da6668667e46e9f84dac42dde2e01c..a6061e8d772086aa43864e4d7b34c5ffceceda94 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/IdentityId.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/IdentityId.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
 
 private typealias IdentityIdType = SignedIdType
 
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/Message.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/Message.kt
similarity index 96%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/Message.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/Message.kt
index 16739cd8161320e256e0352e44b337c587465cf2..b14135695f14ba9519af0599a91bc34f59271b31 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/Message.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/Message.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
 
 import org.threeten.bp.Instant
 
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/MessageFlag.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/MessageFlag.kt
similarity index 96%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/MessageFlag.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/MessageFlag.kt
index 5f43db4354e8b2e8d8832922783f16b07cff59bc..f95313927a61502f9614ea8f240f327099175432 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/MessageFlag.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/MessageFlag.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
 
 import de.justjanne.bitflags.Flag
 import de.justjanne.bitflags.Flags
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/MessageType.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/MessageType.kt
similarity index 96%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/MessageType.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/MessageType.kt
index fe418098fcd2063d280b4464ac8b134bc37516e1..8f8d3458d7a462218150ef1f9d6eed6c874ce3d6 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/MessageType.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/MessageType.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
 
 import de.justjanne.bitflags.Flag
 import de.justjanne.bitflags.Flags
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/MsgId.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/MsgId.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/MsgId.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/MsgId.kt
index b5b3a24ae0f2e4e31d5aaa0162c7a982bbf6df76..06c9df9ff0f0a2e045ea73160d49c321c4ec1cf1 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/MsgId.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/MsgId.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
 
 private typealias MsgIdType = SignedId64Type
 
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/NetworkId.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/NetworkId.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/NetworkId.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/NetworkId.kt
index 5d60b4fb9549ec16e6c71a5156494a7fa76cb872..7ee94256fd2561d30ff356fe2ba83f021b1a6cee 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/NetworkId.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/NetworkId.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
 
 private typealias NetworkIdType = SignedIdType
 
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/NetworkLayerProtocol.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/NetworkLayerProtocol.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/NetworkLayerProtocol.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/NetworkLayerProtocol.kt
index d0b26730c8d5b4ef8b34b24b631f78d060132154..db85d25eaef36862719ebcbae523cd24f3ed0c58 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/NetworkLayerProtocol.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/NetworkLayerProtocol.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
 
 enum class NetworkLayerProtocol(
   val value: UByte,
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/SignedId.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/SignedId.kt
similarity index 93%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/SignedId.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/SignedId.kt
index e30ce878dd8df2dd234b2aba83daf287c96ff6db..44c6a648cdacd4870b8bae8ba31c931ed0ec9e78 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/SignedId.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/SignedId.kt
@@ -17,9 +17,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
 
-import de.kuschku.codecoverage.Generated
+import de.justjanne.codecoverage.Generated
 import java.io.Serializable
 
 typealias SignedIdType = Int
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/types/TimeSpec.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/TimeSpec.kt
similarity index 95%
rename from protocol/src/main/java/info/quasseldroid/protocol/types/TimeSpec.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/types/TimeSpec.kt
index 42d25c0f82b6dd100201b0346ed46d61fda370ec..6d9bcf37e3c997c62b9530ab347a87e6ddc57a21 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/types/TimeSpec.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/types/TimeSpec.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
 
 enum class TimeSpec(val value: Byte) {
   LocalUnknown(-1),
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/variant/QVariant.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/variant/QVariant.kt
similarity index 83%
rename from protocol/src/main/java/info/quasseldroid/protocol/variant/QVariant.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/variant/QVariant.kt
index 50678718a26f797d3a15e626c25831265fd3e715..1485f50ece2d60d410a6e40052904e0861582361 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/variant/QVariant.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/variant/QVariant.kt
@@ -17,15 +17,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.variant
-
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.io.contentToString
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.serializers.primitive.QtSerializer
-import info.quasseldroid.protocol.serializers.primitive.QuasselSerializer
+package de.justjanne.libquassel.protocol.variant
+
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.io.contentToString
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.serializers.primitive.QtSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.QuasselSerializer
 import java.nio.ByteBuffer
 
 typealias QVariant_ = QVariant<*>
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/variant/QtType.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/variant/QtType.kt
similarity index 97%
rename from protocol/src/main/java/info/quasseldroid/protocol/variant/QtType.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/variant/QtType.kt
index 70f9eedba1486b8ecfb33e42174e5ea5555594f4..607a0d2dbbcb3fc2c600949dd645e3afbd06f022 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/variant/QtType.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/variant/QtType.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http:
  */
 
-package info.quasseldroid.protocol.variant
+package de.justjanne.libquassel.protocol.variant
 
 enum class QtType(val id: kotlin.Int) {
   Void(0),
diff --git a/protocol/src/main/java/info/quasseldroid/protocol/variant/QuasselType.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/variant/QuasselType.kt
similarity index 96%
rename from protocol/src/main/java/info/quasseldroid/protocol/variant/QuasselType.kt
rename to protocol/src/main/java/de/justjanne/libquassel/protocol/variant/QuasselType.kt
index d7ba1e364cfc251de54304078d71e85db8f027be..3cd82d015e8f5b0ecc630345b62aed8daee63362 100644
--- a/protocol/src/main/java/info/quasseldroid/protocol/variant/QuasselType.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/variant/QuasselType.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.variant
+package de.justjanne.libquassel.protocol.variant
 
 enum class QuasselType(
   val typeName: String,
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/connection/ConnectionHeaderSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/connection/ConnectionHeaderSerializerTest.kt
similarity index 91%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/connection/ConnectionHeaderSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/connection/ConnectionHeaderSerializerTest.kt
index 2249f9ef9c8302975b119b397c60191c88993b47..7a2db6d1e0e0c5c3d985a84f731d6edb4ddfdc44 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/connection/ConnectionHeaderSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/connection/ConnectionHeaderSerializerTest.kt
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.connection
+package de.justjanne.libquassel.protocol.connection
 
 import de.justjanne.bitflags.of
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.serializerTest
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.serializerTest
 import org.junit.jupiter.api.Test
 
 class ConnectionHeaderSerializerTest {
@@ -76,7 +76,7 @@ class ConnectionHeaderSerializerTest {
   fun testDebugClient() = serializerTest(
     ConnectionHeaderSerializer,
     ConnectionHeader(
-      features = ProtocolFeature.of(      ),
+      features = ProtocolFeature.of(),
       versions = listOf(
         ProtocolMeta(
           data = 0x0000u,
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/features/FeatureSetTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/features/FeatureSetTest.kt
similarity index 97%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/features/FeatureSetTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/features/FeatureSetTest.kt
index df0c8034268b53a4f34630751e03805121c936a2..23bbf531ec3dfcc11b77590b75f6ac234b762414 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/features/FeatureSetTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/features/FeatureSetTest.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.features
+package de.justjanne.libquassel.protocol.features
 
 import de.justjanne.bitflags.none
 import de.justjanne.bitflags.of
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/io/ChainedByteBufferTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/io/ChainedByteBufferTest.kt
similarity index 96%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/io/ChainedByteBufferTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/io/ChainedByteBufferTest.kt
index 5e96454de66cdc7247bbbfd00960719557a98833..aaa2020f963b6715410e1eeba2dff86942f16a4c 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/io/ChainedByteBufferTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/io/ChainedByteBufferTest.kt
@@ -17,9 +17,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.io
+package de.justjanne.libquassel.protocol.io
 
-import info.quasseldroid.protocol.testutil.matchers.ByteBufferMatcher
+import de.justjanne.libquassel.protocol.testutil.matchers.ByteBufferMatcher
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Assertions.assertDoesNotThrow
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/io/StringEncoderTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/io/StringEncoderTest.kt
similarity index 92%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/io/StringEncoderTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/io/StringEncoderTest.kt
index 2e03e0d7e282510ac35da08b4d9b3da22cef01dd..6fde64ea6a67a2eaf811d3c4909674afbbb3e0e3 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/io/StringEncoderTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/io/StringEncoderTest.kt
@@ -17,10 +17,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.io
+package de.justjanne.libquassel.protocol.io
 
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.matchers.ByteBufferMatcher
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.matchers.ByteBufferMatcher
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/handshake/ClientInitSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitSerializerTest.kt
similarity index 85%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/handshake/ClientInitSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitSerializerTest.kt
index 20c2f967fb16c79728fab1a9b88bc2b3afcf980d..aff2a703ad255fc521d74176eceec7e8d896d244 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/handshake/ClientInitSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitSerializerTest.kt
@@ -16,17 +16,17 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.handshake
+package de.justjanne.libquassel.protocol.serializers.handshake
 
 import de.justjanne.bitflags.none
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.features.LegacyFeature
-import info.quasseldroid.protocol.messages.handshake.ClientInit
-import info.quasseldroid.protocol.serializers.HandshakeSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.handshakeSerializerTest
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.features.LegacyFeature
+import de.justjanne.libquassel.protocol.messages.handshake.ClientInit
+import de.justjanne.libquassel.protocol.serializers.HandshakeSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.handshakeSerializerTest
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.Assertions.assertEquals as assertEquals
 
 class ClientInitSerializerTest {
   @Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BoolSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/BoolSerializerTest.kt
similarity index 79%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BoolSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/BoolSerializerTest.kt
index aae04c194ca27cbc3464b9c71ba500742856f203..8708dfd363fa8ef5728f289372fd2eb61321c23b 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BoolSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/BoolSerializerTest.kt
@@ -16,12 +16,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BufferIdSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/BufferIdSerializerTest.kt
similarity index 80%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BufferIdSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/BufferIdSerializerTest.kt
index a6f291e7f065cf27f5f51ea05f09ada58a9f9e2e..0223237cd232093e3fb56138be4379ad4d38496f 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BufferIdSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/BufferIdSerializerTest.kt
@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.quasselSerializerTest
-import info.quasseldroid.protocol.types.BufferId
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
+import de.justjanne.libquassel.protocol.types.BufferId
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BufferInfoSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/BufferInfoSerializerTest.kt
similarity index 76%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BufferInfoSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/BufferInfoSerializerTest.kt
index 7a9c6a3d7015b72e8e271f6fe13489e66617a455..5b80f95e5c5337bb45dd06c0ff6c33cc003b17d2 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/BufferInfoSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/BufferInfoSerializerTest.kt
@@ -16,18 +16,18 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
 import de.justjanne.bitflags.none
 import de.justjanne.bitflags.validValues
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.quasselSerializerTest
-import info.quasseldroid.protocol.types.BufferId
-import info.quasseldroid.protocol.types.BufferInfo
-import info.quasseldroid.protocol.types.BufferType
-import info.quasseldroid.protocol.types.NetworkId
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
+import de.justjanne.libquassel.protocol.types.BufferId
+import de.justjanne.libquassel.protocol.types.BufferInfo
+import de.justjanne.libquassel.protocol.types.BufferType
+import de.justjanne.libquassel.protocol.types.NetworkId
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ByteBufferSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ByteBufferSerializerTest.kt
similarity index 82%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ByteBufferSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ByteBufferSerializerTest.kt
index 67bd99c52401b9f12829588b0cc774c3593a55df..888646cee17ed3682ef0ac6590789f2ea3ea5a05 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ByteBufferSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ByteBufferSerializerTest.kt
@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.matchers.ByteBufferMatcher
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.matchers.ByteBufferMatcher
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import java.nio.ByteBuffer
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ByteSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ByteSerializerTest.kt
similarity index 82%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ByteSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ByteSerializerTest.kt
index 6ef6bc714db21987453e13ed8d98ebeaa2b98b5f..140978a3004d66ba3c65765d601070307e53a6ec 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ByteSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ByteSerializerTest.kt
@@ -16,12 +16,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import kotlin.experimental.inv
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DateTimeSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializerTest.kt
similarity index 89%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DateTimeSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializerTest.kt
index 3821eb635ba71490db3afdd1056807309dbad17d..f69dbb50260fbb495f133c962713bc2ad039bd87 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DateTimeSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializerTest.kt
@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.matchers.TemporalMatcher
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.matchers.TemporalMatcher
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt
similarity index 77%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt
index 8b069b08af7908f750ea1bc1ed2b536e9180bf23..639511ce7f73c074c30d9bd46380ede69dcc1b8f 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt
@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.quasselSerializerTest
-import info.quasseldroid.protocol.types.DccIpDetectionMode
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
+import de.justjanne.libquassel.protocol.types.DccIpDetectionMode
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DccPortSelectionModeSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DccPortSelectionModeSerializerTest.kt
similarity index 77%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DccPortSelectionModeSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DccPortSelectionModeSerializerTest.kt
index f6ffb7dd589cfbbb19096b315b918a7949c9f431..ec9b2c6ca41967348bc31130a5d865981bee9e51 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DccPortSelectionModeSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DccPortSelectionModeSerializerTest.kt
@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.quasselSerializerTest
-import info.quasseldroid.protocol.types.DccPortSelectionMode
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
+import de.justjanne.libquassel.protocol.types.DccPortSelectionMode
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DoubleSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DoubleSerializerTest.kt
similarity index 86%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DoubleSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DoubleSerializerTest.kt
index c67d69c9d142e1fc6c8b19f66dde0e84abb20a0f..6c1f6726f0622a36abb55fd3c33f530101d21383 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/DoubleSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DoubleSerializerTest.kt
@@ -16,12 +16,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/FloatSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/FloatSerializerTest.kt
similarity index 85%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/FloatSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/FloatSerializerTest.kt
index b4978f533a346bf446a614790bed979c7eaf1c70..0161d0811b0474c00a0ddee25d9bfdd6aec6e422 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/FloatSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/FloatSerializerTest.kt
@@ -16,12 +16,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/IdentityIdSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/IdentityIdSerializerTest.kt
similarity index 80%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/IdentityIdSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/IdentityIdSerializerTest.kt
index 225cb273e07af5e74f3eb8bc42f7fff6161b5d38..c77f7e59846a4868c81ce9ece6c564eb176f4dc7 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/IdentityIdSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/IdentityIdSerializerTest.kt
@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.quasselSerializerTest
-import info.quasseldroid.protocol.types.IdentityId
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
+import de.justjanne.libquassel.protocol.types.IdentityId
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/IntSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/IntSerializerTest.kt
similarity index 82%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/IntSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/IntSerializerTest.kt
index 53aa3c9a9af031ef4814c86a1c41fda0173f8ca2..cb15a66da3c5b091d0cedb1463073aa0a4710d8e 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/IntSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/IntSerializerTest.kt
@@ -16,12 +16,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/LongSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/LongSerializerTest.kt
similarity index 82%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/LongSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/LongSerializerTest.kt
index a1f20b4132bd8d7e3005913d612b568261eb6544..b4d3065ae44033c6a280cbc0030487da8003aab1 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/LongSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/LongSerializerTest.kt
@@ -16,12 +16,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not,see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/MessageSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/MessageSerializerTest.kt
similarity index 92%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/MessageSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/MessageSerializerTest.kt
index 75f0342a4d1a78a1c8ba4f9034de6b93b17bb710..ab3aa1cb09a58082528db61f581efa4eefe421c4 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/MessageSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/MessageSerializerTest.kt
@@ -17,16 +17,16 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
 import de.justjanne.bitflags.none
 import de.justjanne.bitflags.validValues
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.quasselSerializerTest
-import info.quasseldroid.protocol.types.*
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
+import de.justjanne.libquassel.protocol.types.*
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.threeten.bp.Instant
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/MsgIdSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/MsgIdSerializerTest.kt
similarity index 79%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/MsgIdSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/MsgIdSerializerTest.kt
index 957f9c5ad084cb7855982297886319efecc015af..0ca4268ecd95ac532a8ae9bbc032114f6e5add4b 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/MsgIdSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/MsgIdSerializerTest.kt
@@ -16,14 +16,14 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.quasselSerializerTest
-import info.quasseldroid.protocol.types.MsgId
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
+import de.justjanne.libquassel.protocol.types.MsgId
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/NetworkIdSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/NetworkIdSerializerTest.kt
similarity index 80%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/NetworkIdSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/NetworkIdSerializerTest.kt
index 58ba01e13b28249dc520a56579be6f58fa7bcda3..60755175df548e9380bb245b6d9a22484bf29e1d 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/NetworkIdSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/NetworkIdSerializerTest.kt
@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.quasselSerializerTest
-import info.quasseldroid.protocol.types.NetworkId
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
+import de.justjanne.libquassel.protocol.types.NetworkId
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/PeerPtrSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/PeerPtrSerializerTest.kt
similarity index 81%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/PeerPtrSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/PeerPtrSerializerTest.kt
index bd6f61e0a7815dd11832942bfd9d1a9772554482..ef2dc8753d13d3593e65d5ae35262d936113193f 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/PeerPtrSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/PeerPtrSerializerTest.kt
@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.quasselSerializerTest
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QCharSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QCharSerializerTest.kt
similarity index 84%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QCharSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QCharSerializerTest.kt
index eaa1685e67439b94a28465e90832f85d9fad5136..ec7bbf141f3264d5664686abcb9690d7f6785914 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QCharSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QCharSerializerTest.kt
@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.matchers.BomMatcherChar
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.matchers.BomMatcherChar
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QHostAddressSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QHostAddressSerializerTest.kt
similarity index 84%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QHostAddressSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QHostAddressSerializerTest.kt
index 9e7ce464289e67ed22629f8aa3acd9c3ee738dae..96e7de270970f20939f8825091b6f22a3f620c9d 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QHostAddressSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QHostAddressSerializerTest.kt
@@ -16,12 +16,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QuasselSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.quasselSerializerTest
-import info.quasseldroid.protocol.variant.QuasselType
+import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
+import de.justjanne.libquassel.protocol.variant.QuasselType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import java.net.Inet4Address
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantListSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QVariantListSerializerTest.kt
similarity index 60%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantListSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QVariantListSerializerTest.kt
index fddad7d8497e6b35d472cf12de4f0eb2cf67501c..ad6dfe65ff1be7791d4d0fe1da7941adcf3ff2cf 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantListSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QVariantListSerializerTest.kt
@@ -16,14 +16,14 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QVariantList
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.qVariant
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QVariantList
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.qVariant
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
@@ -50,7 +50,7 @@ class QVariantListSerializerTest {
       qVariant("AzureDiamond", QtType.QString),
       qVariant("hunter2", QtType.QString)
     ),
-    byteBufferOf( 0x00u, 0x00u, 0x00u, 0x02u, 0x00u, 0x00u, 0x00u, 0x0Au, 0x00u, 0x00u, 0x00u, 0x00u, 0x18u, 0x00u, 0x41u, 0x00u, 0x7Au, 0x00u, 0x75u, 0x00u, 0x72u, 0x00u, 0x65u, 0x00u, 0x44u, 0x00u, 0x69u, 0x00u, 0x61u, 0x00u, 0x6Du, 0x00u, 0x6Fu, 0x00u, 0x6Eu, 0x00u, 0x64u, 0x00u, 0x00u, 0x00u, 0x0Au, 0x00u, 0x00u, 0x00u, 0x00u, 0x0Eu, 0x00u, 0x68u, 0x00u, 0x75u, 0x00u, 0x6Eu, 0x00u, 0x74u, 0x00u, 0x65u, 0x00u, 0x72u, 0x00u, 0x32u)
+    byteBufferOf(0x00u, 0x00u, 0x00u, 0x02u, 0x00u, 0x00u, 0x00u, 0x0Au, 0x00u, 0x00u, 0x00u, 0x00u, 0x18u, 0x00u, 0x41u, 0x00u, 0x7Au, 0x00u, 0x75u, 0x00u, 0x72u, 0x00u, 0x65u, 0x00u, 0x44u, 0x00u, 0x69u, 0x00u, 0x61u, 0x00u, 0x6Du, 0x00u, 0x6Fu, 0x00u, 0x6Eu, 0x00u, 0x64u, 0x00u, 0x00u, 0x00u, 0x0Au, 0x00u, 0x00u, 0x00u, 0x00u, 0x0Eu, 0x00u, 0x68u, 0x00u, 0x75u, 0x00u, 0x6Eu, 0x00u, 0x74u, 0x00u, 0x65u, 0x00u, 0x72u, 0x00u, 0x32u)
   )
 }
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantMapSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QVariantMapSerializerTest.kt
similarity index 83%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantMapSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QVariantMapSerializerTest.kt
index 8c5699260d6bfa6930e181aa8c713354ccfb31f2..a7b16dd63a78686cf0e560226dbe0048053057d4 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantMapSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QVariantMapSerializerTest.kt
@@ -16,15 +16,15 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.matchers.MapMatcher
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QVariantMap
-import info.quasseldroid.protocol.variant.QtType
-import info.quasseldroid.protocol.variant.qVariant
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.matchers.MapMatcher
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.qVariant
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QVariantSerializerTest.kt
similarity index 83%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QVariantSerializerTest.kt
index 52403ebc19c38cf75df6b337c9cf2f76805b893e..fbcb635c09172c3a8e9b3cd61a32572f09ec1803 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/QVariantSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/QVariantSerializerTest.kt
@@ -16,14 +16,14 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.NoSerializerForTypeException
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.deserialize
-import info.quasseldroid.protocol.variant.QVariant_
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.NoSerializerForTypeException
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.deserialize
+import de.justjanne.libquassel.protocol.variant.QVariant_
+import de.justjanne.libquassel.protocol.variant.QtType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ShortSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ShortSerializerTest.kt
similarity index 82%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ShortSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ShortSerializerTest.kt
index 025d207c706ce395f31adb2e355888c54d061a47..1af119185c66d44ab73ea66678f511be6883bf9e 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ShortSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ShortSerializerTest.kt
@@ -16,12 +16,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import kotlin.experimental.inv
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/StringSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerTest.kt
similarity index 94%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/StringSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerTest.kt
index 282e8245b6331f0c28c6f699378f15ce884bcc58..e903391a9f43e249555833dd313bfc4d7ff83a89 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/StringSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/StringSerializerTest.kt
@@ -16,16 +16,16 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
-
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.deserialize
-import info.quasseldroid.protocol.testutil.matchers.BomMatcherString
-import info.quasseldroid.protocol.testutil.matchers.ByteBufferMatcher
-import info.quasseldroid.protocol.testutil.testQtSerializerDirect
-import info.quasseldroid.protocol.testutil.testQtSerializerVariant
-import info.quasseldroid.protocol.variant.QtType
+package de.justjanne.libquassel.protocol.serializers.primitive
+
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.deserialize
+import de.justjanne.libquassel.protocol.testutil.matchers.BomMatcherString
+import de.justjanne.libquassel.protocol.testutil.matchers.ByteBufferMatcher
+import de.justjanne.libquassel.protocol.testutil.testQtSerializerDirect
+import de.justjanne.libquassel.protocol.testutil.testQtSerializerVariant
+import de.justjanne.libquassel.protocol.variant.QtType
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UByteSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/UByteSerializerTest.kt
similarity index 82%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UByteSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/UByteSerializerTest.kt
index 0d1b29f4e6a9c1f547d745c94c5a0376e3aaa656..e119bd738e1d2ce70dd3d25eaca68a666bb5ba50 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UByteSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/UByteSerializerTest.kt
@@ -16,12 +16,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UIntSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/UIntSerializerTest.kt
similarity index 82%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UIntSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/UIntSerializerTest.kt
index a1ff805996784174de2cdf52f3a3be99db1bad7f..4115fd0d5fcff190d20cf720a3a91d6b9d27afad 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UIntSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/UIntSerializerTest.kt
@@ -16,12 +16,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ULongSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ULongSerializerTest.kt
similarity index 83%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ULongSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ULongSerializerTest.kt
index 3eead2bfd220297d19e84fc10995b5d40795e9c4..10e5265e45ac6b3913aeab67307074018e9e0227 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/ULongSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/ULongSerializerTest.kt
@@ -16,12 +16,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UShortSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/UShortSerializerTest.kt
similarity index 82%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UShortSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/UShortSerializerTest.kt
index 44848330980e318ac2216b60ab4de2e1ac5977cd..d7d62aef29780eb29646b7956ad4287381b14ec2 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/UShortSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/UShortSerializerTest.kt
@@ -16,12 +16,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/VoidSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/VoidSerializerTest.kt
similarity index 77%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/VoidSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/VoidSerializerTest.kt
index b5763b2fe68ceb5784da0ef4724d4f7f6a514f05..311086fd2414084c43520a096df139c6f3b594e5 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/serializers/primitive/VoidSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/VoidSerializerTest.kt
@@ -16,12 +16,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.serializers.primitive
+package de.justjanne.libquassel.protocol.serializers.primitive
 
-import info.quasseldroid.protocol.serializers.QtSerializers
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.testutil.qtSerializerTest
-import info.quasseldroid.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.serializers.QtSerializers
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
+import de.justjanne.libquassel.protocol.variant.QtType
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/byteBufferOf.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/byteBufferOf.kt
similarity index 95%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/byteBufferOf.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/byteBufferOf.kt
index 62f5d70288e9c2d975e7d9973cf4987463549e02..0cc6a8cf413b5db829151d2c8be2598fb802f125 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/byteBufferOf.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/byteBufferOf.kt
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
 
 import java.nio.ByteBuffer
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/deserialize.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/deserialize.kt
similarity index 86%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/deserialize.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/deserialize.kt
index 0191234d3da0c163936b103c66cbe2ab0a2b3790..117aae1facabffc66ea71e39a8aaba966b89228d 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/deserialize.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/deserialize.kt
@@ -16,12 +16,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.serializers.handshake.HandshakeSerializer
-import info.quasseldroid.protocol.serializers.primitive.HandshakeMapSerializer
-import info.quasseldroid.protocol.serializers.primitive.Serializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.serializers.handshake.HandshakeSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.HandshakeMapSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.Serializer
 import org.hamcrest.Matcher
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/handshakeSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/handshakeSerializerTest.kt
similarity index 89%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/handshakeSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/handshakeSerializerTest.kt
index 5cbf4d92ef3c45bc1febff067cb8f10f375d69c2..6ccc94440268f59b9ab138738cfebdcb79aa3e24 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/handshakeSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/handshakeSerializerTest.kt
@@ -16,10 +16,10 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.serializers.handshake.HandshakeSerializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.serializers.handshake.HandshakeSerializer
 import org.hamcrest.Matcher
 import java.nio.ByteBuffer
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/BomMatcherChar.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/BomMatcherChar.kt
similarity index 95%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/BomMatcherChar.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/BomMatcherChar.kt
index 172700bc235c92ef715cacc2eb83061500ffd7d2..4c83d1ed37716611e025d5b106536bc835734f5c 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/BomMatcherChar.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/BomMatcherChar.kt
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.testutil.matchers
+package de.justjanne.libquassel.protocol.testutil.matchers
 
 import org.hamcrest.BaseMatcher
 import org.hamcrest.Description
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/BomMatcherString.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/BomMatcherString.kt
similarity index 95%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/BomMatcherString.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/BomMatcherString.kt
index 898c3c049f97cd59528f28bcdfbdd7bc2c4b5b24..4173866984c836da611bf13b198d32b608a7c3a9 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/BomMatcherString.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/BomMatcherString.kt
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.testutil.matchers
+package de.justjanne.libquassel.protocol.testutil.matchers
 
 import org.hamcrest.BaseMatcher
 import org.hamcrest.Description
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/ByteBufferMatcher.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/ByteBufferMatcher.kt
similarity index 90%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/ByteBufferMatcher.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/ByteBufferMatcher.kt
index 1ac3a6ad73a617b49dfa0a7054195df5efc30a81..e8a6e9cf42635a794f7ea94d7dff3a08fe436b93 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/ByteBufferMatcher.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/ByteBufferMatcher.kt
@@ -16,10 +16,10 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.testutil.matchers
+package de.justjanne.libquassel.protocol.testutil.matchers
 
-import info.quasseldroid.protocol.io.contentToString
-import info.quasseldroid.protocol.io.isEmpty
+import de.justjanne.libquassel.protocol.io.contentToString
+import de.justjanne.libquassel.protocol.io.isEmpty
 import org.hamcrest.BaseMatcher
 import org.hamcrest.Description
 import java.nio.ByteBuffer
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/MapMatcher.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/MapMatcher.kt
similarity index 96%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/MapMatcher.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/MapMatcher.kt
index 749e268b3365cfa194fee204f14d32c9b0251375..cded0d1d530abb68c460d241a36ee7b071556e3b 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/MapMatcher.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/MapMatcher.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.testutil.matchers
+package de.justjanne.libquassel.protocol.testutil.matchers
 
 import org.hamcrest.BaseMatcher
 import org.hamcrest.Description
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/TemporalMatcher.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/TemporalMatcher.kt
similarity index 96%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/TemporalMatcher.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/TemporalMatcher.kt
index e2f1cc879ea248b6d66463f70a9ca4f632b80bdf..884daba32be07024a2d528c7662da57acd9f2c0c 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/matchers/TemporalMatcher.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/TemporalMatcher.kt
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.testutil.matchers
+package de.justjanne.libquassel.protocol.testutil.matchers
 
 import org.hamcrest.BaseMatcher
 import org.hamcrest.Description
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/qtSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/qtSerializerTest.kt
similarity index 90%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/qtSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/qtSerializerTest.kt
index 7a5244d8106be424e8b1bf69601b8c1c3a4bbdb4..20865fc7fa539468cc03d9adee2d1791d84c1de9 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/qtSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/qtSerializerTest.kt
@@ -16,10 +16,10 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.serializers.primitive.QtSerializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.serializers.primitive.QtSerializer
 import org.hamcrest.Matcher
 import java.nio.ByteBuffer
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/quasselSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/quasselSerializerTest.kt
similarity index 90%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/quasselSerializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/quasselSerializerTest.kt
index dc203a9aad61bb0774b22c6662969260bcd5699d..88d3633d7e242dc3595b8e3df45cf57747cb3b89 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/quasselSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/quasselSerializerTest.kt
@@ -16,10 +16,10 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.serializers.primitive.QuasselSerializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.serializers.primitive.QuasselSerializer
 import org.hamcrest.Matcher
 import java.nio.ByteBuffer
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/serialize.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/serialize.kt
similarity index 76%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/serialize.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/serialize.kt
index 4b44e36f027d09c23edcb5bf53bf0e73ea9486d2..519bb467a7b8550a2c84b0e87bab742e27ba3413 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/serialize.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/serialize.kt
@@ -16,14 +16,14 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.serializers.handshake.HandshakeSerializer
-import info.quasseldroid.protocol.serializers.primitive.HandshakeMapSerializer
-import info.quasseldroid.protocol.serializers.primitive.Serializer
-import info.quasseldroid.protocol.testutil.matchers.ByteBufferMatcher
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.serializers.handshake.HandshakeSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.HandshakeMapSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.Serializer
+import de.justjanne.libquassel.protocol.testutil.matchers.ByteBufferMatcher
 import org.hamcrest.MatcherAssert.assertThat
 import java.nio.ByteBuffer
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/serializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/serializerTest.kt
similarity index 88%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/serializerTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/serializerTest.kt
index 15e2c4e6862f3bb0fdf475ae846f48a9acaaa19c..5394a08d484e1cdac7c18bcdbe4e9f42dfb8ccfd 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/serializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/serializerTest.kt
@@ -16,10 +16,10 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.serializers.primitive.Serializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.serializers.primitive.Serializer
 import org.hamcrest.Matcher
 import java.nio.ByteBuffer
 
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testHandshakeSerializerDirect.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testHandshakeSerializerDirect.kt
similarity index 89%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testHandshakeSerializerDirect.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testHandshakeSerializerDirect.kt
index 82beecf2c38d6eb5b25b46219b8cad45b10c6bef..3f81bab0ef9ddeeccebf2e5d966717d0ea2253c0 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testHandshakeSerializerDirect.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testHandshakeSerializerDirect.kt
@@ -16,9 +16,9 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
 
-import info.quasseldroid.protocol.serializers.handshake.HandshakeSerializer
+import de.justjanne.libquassel.protocol.serializers.handshake.HandshakeSerializer
 import org.hamcrest.Matcher
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testHandshakeSerializerEncoded.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testHandshakeSerializerEncoded.kt
similarity index 80%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testHandshakeSerializerEncoded.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testHandshakeSerializerEncoded.kt
index d16dc072c79f89e577774f369f9f726dc788f731..feb0e99ba2289da2485bf0052498021af27f2dec 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testHandshakeSerializerEncoded.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testHandshakeSerializerEncoded.kt
@@ -16,12 +16,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.serializers.handshake.HandshakeSerializer
-import info.quasseldroid.protocol.serializers.primitive.HandshakeMapSerializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.serializers.handshake.HandshakeSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.HandshakeMapSerializer
 import org.hamcrest.Matcher
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQtSerializerDirect.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQtSerializerDirect.kt
similarity index 81%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQtSerializerDirect.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQtSerializerDirect.kt
index 6280db52c9d7d6a6f7bef33141a9c9e8e0b3597f..fbbddf671738875dfd16ca6bc3adf7049e474c67 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQtSerializerDirect.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQtSerializerDirect.kt
@@ -16,12 +16,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.io.contentToString
-import info.quasseldroid.protocol.serializers.primitive.QtSerializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.io.contentToString
+import de.justjanne.libquassel.protocol.serializers.primitive.QtSerializer
 import org.hamcrest.Matcher
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQtSerializerVariant.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQtSerializerVariant.kt
similarity index 79%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQtSerializerVariant.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQtSerializerVariant.kt
index 70726cb56a4f6ca3aec579e3a53278744ea63f62..bf8fd14e0c9c348116d5bbe8ec06ccd527e2d627 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQtSerializerVariant.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQtSerializerVariant.kt
@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.serializers.primitive.QVariantSerializer
-import info.quasseldroid.protocol.serializers.primitive.QtSerializer
-import info.quasseldroid.protocol.variant.QVariant
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.serializers.primitive.QVariantSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.QtSerializer
+import de.justjanne.libquassel.protocol.variant.QVariant
 import org.hamcrest.Matcher
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQuasselSerializerDirect.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQuasselSerializerDirect.kt
similarity index 84%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQuasselSerializerDirect.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQuasselSerializerDirect.kt
index 239081a94bfbdf6f5ea35f47a49b56ee36bbee8b..0b7da5527adb150e53c81494e3817f9b5d36f079 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQuasselSerializerDirect.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQuasselSerializerDirect.kt
@@ -16,11 +16,11 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.serializers.primitive.QuasselSerializer
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.serializers.primitive.QuasselSerializer
 import org.hamcrest.Matcher
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQuasselSerializerVariant.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQuasselSerializerVariant.kt
similarity index 78%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQuasselSerializerVariant.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQuasselSerializerVariant.kt
index adcfcf01764cb55318c0f973b3c9bd62af6ce2ee..818802ac5bb6e308af3ddaaecbb91df90a434dd4 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/testutil/testQuasselSerializerVariant.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQuasselSerializerVariant.kt
@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package info.quasseldroid.protocol.testutil
+package de.justjanne.libquassel.protocol.testutil
 
-import info.quasseldroid.protocol.features.FeatureSet
-import info.quasseldroid.protocol.io.ChainedByteBuffer
-import info.quasseldroid.protocol.serializers.primitive.QVariantSerializer
-import info.quasseldroid.protocol.serializers.primitive.QuasselSerializer
-import info.quasseldroid.protocol.variant.QVariant
+import de.justjanne.libquassel.protocol.features.FeatureSet
+import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
+import de.justjanne.libquassel.protocol.serializers.primitive.QVariantSerializer
+import de.justjanne.libquassel.protocol.serializers.primitive.QuasselSerializer
+import de.justjanne.libquassel.protocol.variant.QVariant
 import org.hamcrest.Matcher
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/types/SignedIdTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/types/SignedIdTest.kt
similarity index 98%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/types/SignedIdTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/types/SignedIdTest.kt
index 94779e693fe1af452406f6cfe78cdb8b1033b864..7c7cea2b4391cf3f1682958ccdec153df3fbe2fa 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/types/SignedIdTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/types/SignedIdTest.kt
@@ -17,7 +17,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.types
+package de.justjanne.libquassel.protocol.types
 
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/info/quasseldroid/protocol/variant/QVariantTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/variant/QVariantTest.kt
similarity index 85%
rename from protocol/src/test/kotlin/info/quasseldroid/protocol/variant/QVariantTest.kt
rename to protocol/src/test/kotlin/de/justjanne/libquassel/protocol/variant/QVariantTest.kt
index 7a94751ed11c334b68b87fb241a52cd5f6c09515..772dd2aadd016d51e2bc4a2ff844a033b465f8f0 100644
--- a/protocol/src/test/kotlin/info/quasseldroid/protocol/variant/QVariantTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/variant/QVariantTest.kt
@@ -17,11 +17,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package info.quasseldroid.protocol.variant
+package de.justjanne.libquassel.protocol.variant
 
-import info.quasseldroid.protocol.testutil.byteBufferOf
-import info.quasseldroid.protocol.types.BufferId
-import org.junit.jupiter.api.Assertions.*
+import de.justjanne.libquassel.protocol.testutil.byteBufferOf
+import de.justjanne.libquassel.protocol.types.BufferId
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
 class QVariantTest {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a881985c1d9d4f406de5013f962743b2aebe76e2..9af61d669b2de01b82dea923ae0e5f4808e7676c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -30,7 +30,6 @@ include(
 
 pluginManagement {
   repositories {
-    mavenLocal()
     gradlePluginPortal()
   }
 }