diff --git a/README.md b/README.md
new file mode 100644
index 0000000..a22ae3c
--- /dev/null
+++ b/README.md
@@ -0,0 +1,6 @@
+## Description
+This is a thin config for the Android build management
+
+## Release Notes
+- v1.1.0: Removed Orbit MVI with is for KMP and not wanted
+- v1.0.0: Initial Version
diff --git a/convention/build.gradle.kts b/convention/build.gradle.kts
index db58e8d..620f004 100644
--- a/convention/build.gradle.kts
+++ b/convention/build.gradle.kts
@@ -66,12 +66,12 @@ afterEvaluate {
 gradlePlugin {
     plugins {
         register("detekt") {
-            id = "com.gruntsoftware.buildlogic.detekt"
-            implementationClass = "com.gruntsoftware.buildlogic.common.plugins.DetektConventionPlugin"
+            id = "com.android.buildlogic.detekt"
+            implementationClass = "com.android.buildlogic.common.plugins.DetektConventionPlugin"
         }
         register("androidTest") {
-            id = "com.gruntsoftware.buildlogic.test"
-            implementationClass = "com.gruntsoftware.buildlogic.android.plugins.TestConventionPlugin"
+            id = "com.android.buildlogic.test"
+            implementationClass = "com.android.buildlogic.android.plugins.TestConventionPlugin"
         }
     }
 }
diff --git a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/android/components/dependency/AndroidDependenciesApplicator.kt b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/android/components/dependency/AndroidDependenciesApplicator.kt
index 7ffe720..1af8b84 100644
--- a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/android/components/dependency/AndroidDependenciesApplicator.kt
+++ b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/android/components/dependency/AndroidDependenciesApplicator.kt
@@ -1,8 +1,8 @@
-package com.gruntsoftware.buildlogic.android.components.dependency
+package com.android.buildlogic.android.components.dependency
 
-import com.gruntsoftware.buildlogic.common.components.BuildLogicLogger
-import com.gruntsoftware.buildlogic.common.components.DependenciesFinder
-import com.gruntsoftware.buildlogic.common.utils.ComponentProvider
+import com.android.buildlogic.common.components.BuildLogicLogger
+import com.android.buildlogic.common.components.DependenciesFinder
+import com.android.buildlogic.common.utils.ComponentProvider
 import org.gradle.api.Project
 import org.gradle.api.artifacts.MinimalExternalModuleDependency
 import org.gradle.api.provider.Provider
diff --git a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/android/components/dependency/DependenciesApplicator.kt b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/android/components/dependency/DependenciesApplicator.kt
index c2e1c9f..655f203 100644
--- a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/android/components/dependency/DependenciesApplicator.kt
+++ b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/android/components/dependency/DependenciesApplicator.kt
@@ -1,4 +1,4 @@
-package com.gruntsoftware.buildlogic.android.components.dependency
+package com.android.buildlogic.android.components.dependency
 
 import org.gradle.api.artifacts.MinimalExternalModuleDependency
 import org.gradle.api.provider.Provider
diff --git a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/android/components/setup/TestSetup.kt b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/android/components/setup/TestSetup.kt
index bd9ba49..b69e906 100644
--- a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/android/components/setup/TestSetup.kt
+++ b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/android/components/setup/TestSetup.kt
@@ -1,14 +1,14 @@
-package com.gruntsoftware.buildlogic.android.components.setup
+package com.android.buildlogic.android.components.setup
 
 import com.android.build.gradle.AppExtension
 import com.android.build.gradle.BaseExtension
 import com.android.build.gradle.LibraryExtension
 import com.android.build.gradle.internal.core.InternalBaseVariant
-import com.gruntsoftware.buildlogic.android.components.dependency.AndroidDependenciesApplicator
-import com.gruntsoftware.buildlogic.android.utils.AndroidProjectTypeChecker
-import com.gruntsoftware.buildlogic.common.components.BuildLogicLogger
-import com.gruntsoftware.buildlogic.common.components.VersionFinder
-import com.gruntsoftware.buildlogic.common.utils.ComponentProvider
+import com.android.buildlogic.android.components.dependency.AndroidDependenciesApplicator
+import com.android.buildlogic.android.utils.AndroidProjectTypeChecker
+import com.android.buildlogic.common.components.BuildLogicLogger
+import com.android.buildlogic.common.components.VersionFinder
+import com.android.buildlogic.common.utils.ComponentProvider
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.tasks.TaskProvider
@@ -55,8 +55,7 @@ class TestSetup(
             "mockk-android",
             "mockk-agent",
             "turbine",
-            "coroutines-test",
-            "orbit-test"
+            "coroutines-test"
         )
         dependenciesApplicator.testImplementations(*testDependencies)
         dependenciesApplicator.androidTestImplementations(*testDependencies)
diff --git a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/android/plugins/TestConventionPlugin.kt b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/android/plugins/TestConventionPlugin.kt
index 435b5ae..c05cb6d 100644
--- a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/android/plugins/TestConventionPlugin.kt
+++ b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/android/plugins/TestConventionPlugin.kt
@@ -1,8 +1,8 @@
-package com.gruntsoftware.buildlogic.android.plugins
+package com.android.buildlogic.android.plugins
 
-import com.gruntsoftware.buildlogic.android.components.setup.TestSetup
-import com.gruntsoftware.buildlogic.common.plugins.BasePlugin
-import com.gruntsoftware.buildlogic.common.utils.ComponentProvider
+import com.android.buildlogic.android.components.setup.TestSetup
+import com.android.buildlogic.common.plugins.BasePlugin
+import com.android.buildlogic.common.utils.ComponentProvider
 import org.gradle.api.Project
 
 class TestConventionPlugin : BasePlugin() {
diff --git a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/android/utils/AndroidProjectTypeChecker.kt b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/android/utils/AndroidProjectTypeChecker.kt
index 7098b77..9e52e86 100644
--- a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/android/utils/AndroidProjectTypeChecker.kt
+++ b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/android/utils/AndroidProjectTypeChecker.kt
@@ -1,4 +1,4 @@
-package com.gruntsoftware.buildlogic.android.utils
+package com.android.buildlogic.android.utils
 
 import org.gradle.api.Project
 import org.koin.core.annotation.Factory
diff --git a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/BuildLogicLogger.kt b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/BuildLogicLogger.kt
index d437898..fb72036 100644
--- a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/BuildLogicLogger.kt
+++ b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/BuildLogicLogger.kt
@@ -1,6 +1,6 @@
-package com.gruntsoftware.buildlogic.common.components
+package com.android.buildlogic.common.components
 
-import com.gruntsoftware.buildlogic.common.utils.C
+import com.android.buildlogic.common.utils.C
 import org.koin.core.annotation.Single
 
 @Single
diff --git a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/DependenciesFinder.kt b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/DependenciesFinder.kt
index 7dcd0be..7a5f15d 100644
--- a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/DependenciesFinder.kt
+++ b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/DependenciesFinder.kt
@@ -1,6 +1,6 @@
-package com.gruntsoftware.buildlogic.common.components
+package com.android.buildlogic.common.components
 
-import com.gruntsoftware.buildlogic.common.utils.ComponentProvider
+import com.android.buildlogic.common.utils.ComponentProvider
 import org.gradle.api.Project
 import org.gradle.api.artifacts.ExternalModuleDependencyBundle
 import org.gradle.api.artifacts.MinimalExternalModuleDependency
diff --git a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/DetektSetup.kt b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/DetektSetup.kt
index 317414e..e016a77 100644
--- a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/DetektSetup.kt
+++ b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/DetektSetup.kt
@@ -1,7 +1,7 @@
-package com.gruntsoftware.buildlogic.common.components
+package com.android.buildlogic.common.components
 
-import com.gruntsoftware.buildlogic.android.components.dependency.AndroidDependenciesApplicator
-import com.gruntsoftware.buildlogic.common.utils.ComponentProvider
+import com.android.buildlogic.android.components.dependency.AndroidDependenciesApplicator
+import com.android.buildlogic.common.utils.ComponentProvider
 import io.gitlab.arturbosch.detekt.Detekt
 import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
 import io.gitlab.arturbosch.detekt.extensions.DetektExtension
diff --git a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/PluginApplicator.kt b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/PluginApplicator.kt
index 5d9dd5f..6b9cfce 100644
--- a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/PluginApplicator.kt
+++ b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/PluginApplicator.kt
@@ -1,6 +1,6 @@
-package com.gruntsoftware.buildlogic.common.components
+package com.android.buildlogic.common.components
 
-import com.gruntsoftware.buildlogic.common.utils.ComponentProvider
+import com.android.buildlogic.common.utils.ComponentProvider
 import org.gradle.api.Project
 import org.koin.core.annotation.Factory
 import org.koin.core.annotation.InjectedParam
diff --git a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/PluginFinder.kt b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/PluginFinder.kt
index a7cfef3..5ac2d6d 100644
--- a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/PluginFinder.kt
+++ b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/PluginFinder.kt
@@ -1,6 +1,6 @@
-package com.gruntsoftware.buildlogic.common.components
+package com.android.buildlogic.common.components
 
-import com.gruntsoftware.buildlogic.common.utils.ComponentProvider
+import com.android.buildlogic.common.utils.ComponentProvider
 import org.gradle.api.Project
 import org.gradle.plugin.use.PluginDependency
 import org.koin.core.annotation.Factory
diff --git a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/VersionCatalogProvider.kt b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/VersionCatalogProvider.kt
index 8e20e2c..dc661ab 100644
--- a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/VersionCatalogProvider.kt
+++ b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/VersionCatalogProvider.kt
@@ -1,4 +1,4 @@
-package com.gruntsoftware.buildlogic.common.components
+package com.android.buildlogic.common.components
 
 import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionCatalog
diff --git a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/VersionFinder.kt b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/VersionFinder.kt
index be00888..5dfe9b8 100644
--- a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/VersionFinder.kt
+++ b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/components/VersionFinder.kt
@@ -1,6 +1,6 @@
-package com.gruntsoftware.buildlogic.common.components
+package com.android.buildlogic.common.components
 
-import com.gruntsoftware.buildlogic.common.utils.ComponentProvider
+import com.android.buildlogic.common.utils.ComponentProvider
 import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionConstraint
 import org.koin.core.annotation.Factory
diff --git a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/plugins/BasePlugin.kt b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/plugins/BasePlugin.kt
index f382207..d8b7b14 100644
--- a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/plugins/BasePlugin.kt
+++ b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/plugins/BasePlugin.kt
@@ -1,6 +1,6 @@
-package com.gruntsoftware.buildlogic.common.plugins
+package com.android.buildlogic.common.plugins
 
-import com.gruntsoftware.buildlogic.di.BuildLogicModule
+import com.android.buildlogic.di.BuildLogicModule
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.koin.core.component.KoinComponent
diff --git a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/plugins/DetektConventionPlugin.kt b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/plugins/DetektConventionPlugin.kt
index aadd5ec..f13d723 100644
--- a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/plugins/DetektConventionPlugin.kt
+++ b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/plugins/DetektConventionPlugin.kt
@@ -1,7 +1,7 @@
-package com.gruntsoftware.buildlogic.common.plugins
+package com.android.buildlogic.common.plugins
 
-import com.gruntsoftware.buildlogic.common.components.DetektSetup
-import com.gruntsoftware.buildlogic.common.utils.ComponentProvider
+import com.android.buildlogic.common.components.DetektSetup
+import com.android.buildlogic.common.utils.ComponentProvider
 import org.gradle.api.Project
 
 class DetektConventionPlugin : BasePlugin() {
diff --git a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/utils/C.kt b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/utils/C.kt
index e2769e9..1961851 100644
--- a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/utils/C.kt
+++ b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/utils/C.kt
@@ -1,4 +1,4 @@
-package com.gruntsoftware.buildlogic.common.utils
+package com.android.buildlogic.common.utils
 
 object C {
     const val GLOBAL_TAG = "[Build Logic]"
diff --git a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/utils/ComponentProvider.kt b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/utils/ComponentProvider.kt
index 8819f63..5f55356 100644
--- a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/utils/ComponentProvider.kt
+++ b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/common/utils/ComponentProvider.kt
@@ -1,4 +1,4 @@
-package com.gruntsoftware.buildlogic.common.utils
+package com.android.buildlogic.common.utils
 
 import org.gradle.api.Project
 import org.koin.core.parameter.ParametersHolder
diff --git a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/di/BuildLogicModule.kt b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/di/BuildLogicModule.kt
index bf75cd0..de6a59a 100644
--- a/convention/src/main/kotlin/com/gruntsoftware/buildlogic/di/BuildLogicModule.kt
+++ b/convention/src/main/kotlin/com/gruntsoftware/buildlogic/di/BuildLogicModule.kt
@@ -1,10 +1,10 @@
-package com.gruntsoftware.buildlogic.di
+package com.android.buildlogic.di
 
 import org.koin.core.annotation.ComponentScan
 import org.koin.core.annotation.Module
 
 @Module
 @ComponentScan(
-    "com.gruntsoftware.buildlogic"
+    "com.android.buildlogic"
 )
 object BuildLogicModule
diff --git a/convention/src/test/kotlin/com/gruntsoftware/buildlogic/android/utils/AndroidProjectTypeCheckerTest.kt b/convention/src/test/kotlin/com/gruntsoftware/buildlogic/android/utils/AndroidProjectTypeCheckerTest.kt
index 8376613..89b73b6 100644
--- a/convention/src/test/kotlin/com/gruntsoftware/buildlogic/android/utils/AndroidProjectTypeCheckerTest.kt
+++ b/convention/src/test/kotlin/com/gruntsoftware/buildlogic/android/utils/AndroidProjectTypeCheckerTest.kt
@@ -1,4 +1,4 @@
-package com.gruntsoftware.buildlogic.android.utils
+package com.android.buildlogic.android.utils
 
 import io.mockk.every
 import io.mockk.mockk
diff --git a/convention/src/test/kotlin/com/gruntsoftware/buildlogic/common/components/DependenciesFinderTest.kt b/convention/src/test/kotlin/com/gruntsoftware/buildlogic/common/components/DependenciesFinderTest.kt
index 12cfe00..5dfad2e 100644
--- a/convention/src/test/kotlin/com/gruntsoftware/buildlogic/common/components/DependenciesFinderTest.kt
+++ b/convention/src/test/kotlin/com/gruntsoftware/buildlogic/common/components/DependenciesFinderTest.kt
@@ -1,4 +1,4 @@
-package com.gruntsoftware.buildlogic.common.components
+package com.android.buildlogic.common.components
 
 import io.mockk.every
 import io.mockk.mockk
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 917fd69..709b8b7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,8 +11,6 @@ mockk = "1.14.5"
 turbine = "1.2.1"
 jacoco = "0.8.13"
 app-startup = "1.2.0"
-orbit = "10.0.0"
-kotlin-immutable = "0.4.0"
 
 # Compose
 material = "1.13.0"
@@ -84,10 +82,6 @@ androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "u
 androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
 androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 androidx-compose-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidx-compose-nav" }
-orbit-core = { module = "org.orbit-mvi:orbit-core", version.ref = "orbit" }
-orbit-compose = { module = "org.orbit-mvi:orbit-compose", version.ref = "orbit" }
-orbit-android = { module = "org.orbit-mvi:orbit-viewmodel", version.ref = "orbit" }
-orbit-test = { module = "org.orbit-mvi:orbit-test", version.ref = "orbit" }
 
 revenue-cat = { module = "com.revenuecat.purchases:purchases", version.ref = "revenue-cat" }
 revenue-cat-ui = { module = "com.revenuecat.purchases:purchases-ui", version.ref = "revenue-cat" }
@@ -104,7 +98,6 @@ koin-nonandroid = [
 ]
 koin = ["koin-android", "koin-android-compat", "koin-compose", "koin-compose-viewmodel"]
 revenue-cat = ["revenue-cat", "revenue-cat-ui"]
-orbit = ["orbit-core", "orbit-android", "orbit-compose"]
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
@@ -115,5 +108,5 @@ detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin-core" }
 jetbrains-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-core" }
 jetbrains-kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin-core" }
-buildlogic-detekt = { id = "com.gruntsoftware.buildlogic.detekt" }
-buildlogic-test = { id = "com.gruntsoftware.buildlogic.test" }
+buildlogic-detekt = { id = "com.android.buildlogic.detekt" }
+buildlogic-test = { id = "com.android.buildlogic.test" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7ba042c..34e8b64 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -18,5 +18,5 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "gruntsoftware-build-logic"
+rootProject.name = "android-build-logic"
 include(":convention")
\ No newline at end of file