diff --git a/enro-core/src/main/java/dev/enro/android/viewmodel/EnroViewModelExtensions.kt b/enro-core/src/main/java/dev/enro/viewmodel/EnroViewModelExtensions.kt
similarity index 88%
rename from enro-core/src/main/java/dev/enro/android/viewmodel/EnroViewModelExtensions.kt
rename to enro-core/src/main/java/dev/enro/viewmodel/EnroViewModelExtensions.kt
index 58b54da1..93196617 100644
--- a/enro-core/src/main/java/dev/enro/android/viewmodel/EnroViewModelExtensions.kt
+++ b/enro-core/src/main/java/dev/enro/viewmodel/EnroViewModelExtensions.kt
@@ -3,9 +3,18 @@ package dev.enro.viewmodel
 import androidx.activity.ComponentActivity
 import androidx.annotation.MainThread
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.*
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelLazy
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelStore
+import androidx.lifecycle.getNavigationHandleTag
 import androidx.lifecycle.viewmodel.CreationExtras
-import dev.enro.core.*
+import dev.enro.core.LazyNavigationHandleConfiguration
+import dev.enro.core.NavigationHandle
+import dev.enro.core.NavigationKey
+import dev.enro.core.TypedNavigationHandle
+import dev.enro.core.asTyped
+import dev.enro.core.getNavigationHandle
 import kotlin.properties.ReadOnlyProperty
 import kotlin.reflect.KClass
 import kotlin.reflect.KProperty
diff --git a/enro-core/src/main/java/dev/enro/android/viewmodel/EnroViewModelFactory.kt b/enro-core/src/main/java/dev/enro/viewmodel/EnroViewModelFactory.kt
similarity index 100%
rename from enro-core/src/main/java/dev/enro/android/viewmodel/EnroViewModelFactory.kt
rename to enro-core/src/main/java/dev/enro/viewmodel/EnroViewModelFactory.kt
diff --git a/enro-core/src/main/java/dev/enro/android/viewmodel/EnroViewModelFactoryExtensions.kt b/enro-core/src/main/java/dev/enro/viewmodel/EnroViewModelFactoryExtensions.kt
similarity index 100%
rename from enro-core/src/main/java/dev/enro/android/viewmodel/EnroViewModelFactoryExtensions.kt
rename to enro-core/src/main/java/dev/enro/viewmodel/EnroViewModelFactoryExtensions.kt
diff --git a/enro-core/src/main/java/dev/enro/android/viewmodel/EnroViewModelNavigationHandleProvider.kt b/enro-core/src/main/java/dev/enro/viewmodel/EnroViewModelNavigationHandleProvider.kt
similarity index 100%
rename from enro-core/src/main/java/dev/enro/android/viewmodel/EnroViewModelNavigationHandleProvider.kt
rename to enro-core/src/main/java/dev/enro/viewmodel/EnroViewModelNavigationHandleProvider.kt