diff --git a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layout/QualifiedTagCompleter.kt b/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layout/QualifiedTagCompleter.kt
index 837b875d7..d4bdb240b 100644
--- a/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layout/QualifiedTagCompleter.kt
+++ b/lsp/xml/src/main/java/com/itsaky/androidide/lsp/xml/providers/completion/layout/QualifiedTagCompleter.kt
@@ -29,7 +29,7 @@ import com.itsaky.androidide.lsp.xml.utils.XmlUtils.NodeType
 import com.itsaky.androidide.projects.api.ModuleProject
 import com.itsaky.androidide.utils.ClassTrie
 import com.itsaky.androidide.xml.widgets.WidgetTable
-import com.itsaky.androidide.xml.widgets.internal.DefaultWidgetTable
+import com.itsaky.androidide.xml.internal.widgets.DefaultWidgetTable
 import org.eclipse.lemminx.dom.DOMDocument
 
 /**
diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/resources/internal/DefaultResourceTableRegistry.kt b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/resources/DefaultResourceTableRegistry.kt
similarity index 96%
rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/resources/internal/DefaultResourceTableRegistry.kt
rename to subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/resources/DefaultResourceTableRegistry.kt
index 98be89012..e9636c7a6 100644
--- a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/resources/internal/DefaultResourceTableRegistry.kt
+++ b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/resources/DefaultResourceTableRegistry.kt
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.xml.resources.internal
+package com.itsaky.androidide.xml.internal.resources
 
 import com.android.SdkConstants
 import com.android.SdkConstants.FN_INTENT_ACTIONS_ACTIVITY
@@ -38,11 +38,11 @@ import com.itsaky.androidide.layoutlib.resources.ResourceVisibility.PUBLIC
 import com.itsaky.androidide.utils.ILogger
 import com.itsaky.androidide.xml.resources.ResourceTableRegistry
 import com.itsaky.androidide.xml.resources.ResourceTableRegistry.Companion.PCK_ANDROID
-import com.itsaky.androidide.xml.resources.internal.DefaultResourceTableRegistry.SingleLineValueEntryType.ACTIVITY_ACTIONS
-import com.itsaky.androidide.xml.resources.internal.DefaultResourceTableRegistry.SingleLineValueEntryType.BROADCAST_ACTIONS
-import com.itsaky.androidide.xml.resources.internal.DefaultResourceTableRegistry.SingleLineValueEntryType.CATEGORIES
-import com.itsaky.androidide.xml.resources.internal.DefaultResourceTableRegistry.SingleLineValueEntryType.FEATURES
-import com.itsaky.androidide.xml.resources.internal.DefaultResourceTableRegistry.SingleLineValueEntryType.SERVICE_ACTIONS
+import com.itsaky.androidide.xml.internal.resources.DefaultResourceTableRegistry.SingleLineValueEntryType.ACTIVITY_ACTIONS
+import com.itsaky.androidide.xml.internal.resources.DefaultResourceTableRegistry.SingleLineValueEntryType.BROADCAST_ACTIONS
+import com.itsaky.androidide.xml.internal.resources.DefaultResourceTableRegistry.SingleLineValueEntryType.CATEGORIES
+import com.itsaky.androidide.xml.internal.resources.DefaultResourceTableRegistry.SingleLineValueEntryType.FEATURES
+import com.itsaky.androidide.xml.internal.resources.DefaultResourceTableRegistry.SingleLineValueEntryType.SERVICE_ACTIONS
 import java.io.File
 import java.util.concurrent.ConcurrentHashMap
 
diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/internal/DefaultApiVersions.kt b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultApiVersions.kt
similarity index 95%
rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/internal/DefaultApiVersions.kt
rename to subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultApiVersions.kt
index 9b53dcc1f..b3047c694 100644
--- a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/internal/DefaultApiVersions.kt
+++ b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultApiVersions.kt
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.xml.versions.internal
+package com.itsaky.androidide.xml.internal.versions
 
 import com.itsaky.androidide.xml.versions.ApiVersions
 import com.itsaky.androidide.xml.versions.ClassInfo
diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/internal/DefaultApiVersionsRegistry.kt b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultApiVersionsRegistry.kt
similarity index 99%
rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/internal/DefaultApiVersionsRegistry.kt
rename to subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultApiVersionsRegistry.kt
index 6eea44de3..83b9c61ae 100644
--- a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/internal/DefaultApiVersionsRegistry.kt
+++ b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultApiVersionsRegistry.kt
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.xml.versions.internal
+package com.itsaky.androidide.xml.internal.versions
 
 import com.google.auto.service.AutoService
 import com.itsaky.androidide.utils.ILogger
diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/internal/DefaultClassInfo.kt b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultClassInfo.kt
similarity index 97%
rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/internal/DefaultClassInfo.kt
rename to subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultClassInfo.kt
index 992fce65e..73de67118 100644
--- a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/internal/DefaultClassInfo.kt
+++ b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultClassInfo.kt
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.xml.versions.internal
+package com.itsaky.androidide.xml.internal.versions
 
 import com.itsaky.androidide.xml.versions.ClassInfo
 import com.itsaky.androidide.xml.versions.FieldInfo
diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/internal/DefaultFieldInfo.kt b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultFieldInfo.kt
similarity index 94%
rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/internal/DefaultFieldInfo.kt
rename to subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultFieldInfo.kt
index 283a05055..f6531aed7 100644
--- a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/internal/DefaultFieldInfo.kt
+++ b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultFieldInfo.kt
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.xml.versions.internal
+package com.itsaky.androidide.xml.internal.versions
 
 import com.itsaky.androidide.xml.versions.FieldInfo
 
diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/internal/DefaultInfo.kt b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultInfo.kt
similarity index 96%
rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/internal/DefaultInfo.kt
rename to subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultInfo.kt
index 86e649765..d38553d28 100644
--- a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/internal/DefaultInfo.kt
+++ b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultInfo.kt
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.xml.versions.internal
+package com.itsaky.androidide.xml.internal.versions
 
 import com.itsaky.androidide.xml.versions.Info
 
diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/internal/DefaultMethodInfo.kt b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultMethodInfo.kt
similarity index 96%
rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/internal/DefaultMethodInfo.kt
rename to subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultMethodInfo.kt
index ae418b868..8127e35ae 100644
--- a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/internal/DefaultMethodInfo.kt
+++ b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/versions/DefaultMethodInfo.kt
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.xml.versions.internal
+package com.itsaky.androidide.xml.internal.versions
 
 import com.itsaky.androidide.xml.versions.MethodInfo
 
diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/widgets/internal/DefaultWidgetTable.kt b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/DefaultWidgetTable.kt
similarity index 96%
rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/widgets/internal/DefaultWidgetTable.kt
rename to subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/DefaultWidgetTable.kt
index 29cc2617a..6e42bf7a6 100644
--- a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/widgets/internal/DefaultWidgetTable.kt
+++ b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/DefaultWidgetTable.kt
@@ -15,13 +15,13 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.xml.widgets.internal
+package com.itsaky.androidide.xml.internal.widgets
 
 import com.itsaky.androidide.utils.ILogger
 import com.itsaky.androidide.xml.widgets.Widget
 import com.itsaky.androidide.xml.widgets.WidgetTable
-import com.itsaky.androidide.xml.widgets.internal.util.DefaultWidget
-import com.itsaky.androidide.xml.widgets.internal.util.WidgetParser
+import com.itsaky.androidide.xml.internal.widgets.util.DefaultWidget
+import com.itsaky.androidide.xml.internal.widgets.util.WidgetParser
 
 /**
  * Default implementation of [WidgetTable].
diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/widgets/internal/DefaultWidgetTableRegistry.kt b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/DefaultWidgetTableRegistry.kt
similarity index 97%
rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/widgets/internal/DefaultWidgetTableRegistry.kt
rename to subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/DefaultWidgetTableRegistry.kt
index b83799ccc..f6e8fcb17 100644
--- a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/widgets/internal/DefaultWidgetTableRegistry.kt
+++ b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/DefaultWidgetTableRegistry.kt
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.xml.widgets.internal
+package com.itsaky.androidide.xml.internal.widgets
 
 import com.google.auto.service.AutoService
 import com.itsaky.androidide.utils.ILogger
diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/widgets/internal/util/DefaultWidget.kt b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/util/DefaultWidget.kt
similarity index 94%
rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/widgets/internal/util/DefaultWidget.kt
rename to subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/util/DefaultWidget.kt
index a85a3774b..c675ea8ff 100644
--- a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/widgets/internal/util/DefaultWidget.kt
+++ b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/util/DefaultWidget.kt
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.xml.widgets.internal.util
+package com.itsaky.androidide.xml.internal.widgets.util
 
 import com.itsaky.androidide.xml.widgets.Widget
 import com.itsaky.androidide.xml.widgets.WidgetType
diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/widgets/internal/util/WidgetParser.kt b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/util/WidgetParser.kt
similarity index 96%
rename from subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/widgets/internal/util/WidgetParser.kt
rename to subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/util/WidgetParser.kt
index 36d40e650..29365b366 100644
--- a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/widgets/internal/util/WidgetParser.kt
+++ b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/internal/widgets/util/WidgetParser.kt
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.xml.widgets.internal.util
+package com.itsaky.androidide.xml.internal.widgets.util
 
 import com.itsaky.androidide.xml.widgets.WidgetType
 
diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/resources/ResourceTableRegistry.kt b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/resources/ResourceTableRegistry.kt
index b0c73ac70..f36a767e9 100644
--- a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/resources/ResourceTableRegistry.kt
+++ b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/resources/ResourceTableRegistry.kt
@@ -22,7 +22,6 @@ import com.android.aaptcompiler.ResourceTable
 import com.itsaky.androidide.lookup.Lookup
 import com.itsaky.androidide.utils.ServiceLoader
 import com.itsaky.androidide.xml.registry.XmlRegistry
-import com.itsaky.androidide.xml.resources.internal.DefaultResourceTableRegistry
 import java.io.File
 
 /**
diff --git a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/ApiVersionsRegistry.kt b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/ApiVersionsRegistry.kt
index e9166160c..4ecacfa00 100644
--- a/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/ApiVersionsRegistry.kt
+++ b/subprojects/xml-utils/src/main/java/com/itsaky/androidide/xml/versions/ApiVersionsRegistry.kt
@@ -19,7 +19,6 @@ package com.itsaky.androidide.xml.versions
 
 import com.itsaky.androidide.utils.ServiceLoader
 import com.itsaky.androidide.xml.registry.XmlRegistry
-import com.itsaky.androidide.xml.versions.internal.DefaultApiVersionsRegistry
 
 /**
  * Registry that reads information about the API versions of classes, their fields and methods.
diff --git a/subprojects/xml-utils/src/test/java/com/itsaky/androidide/xml/resources/ResourceTableRegistryTest.kt b/subprojects/xml-utils/src/test/java/com/itsaky/androidide/xml/resources/ResourceTableRegistryTest.kt
index 89ab660a0..9a302e40c 100644
--- a/subprojects/xml-utils/src/test/java/com/itsaky/androidide/xml/resources/ResourceTableRegistryTest.kt
+++ b/subprojects/xml-utils/src/test/java/com/itsaky/androidide/xml/resources/ResourceTableRegistryTest.kt
@@ -28,7 +28,7 @@ import com.android.aaptcompiler.android.ResValue.DataType
 import com.google.common.truth.Truth.assertThat
 import com.itsaky.androidide.xml.findAndroidJar
 import com.itsaky.androidide.xml.resources.ResourceTableRegistry.Companion.PCK_ANDROID
-import com.itsaky.androidide.xml.resources.internal.DefaultResourceTableRegistry
+import com.itsaky.androidide.xml.internal.resources.DefaultResourceTableRegistry
 import java.io.File
 import org.junit.Test
 import org.junit.runner.RunWith