diff --git a/app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt b/app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt
index 1fdc1504a..6c6817879 100644
--- a/app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt
+++ b/app/src/main/java/com/itsaky/androidide/activities/editor/EditorHandlerActivity.kt
@@ -32,12 +32,12 @@ import com.itsaky.androidide.actions.ActionData
 import com.itsaky.androidide.actions.ActionItem.Location.EDITOR_TOOLBAR
 import com.itsaky.androidide.actions.ActionsRegistry.Companion.getInstance
 import com.itsaky.androidide.actions.FillMenuParams
-import com.itsaky.androidide.editor.language.java.JavaLanguage
-import com.itsaky.androidide.editor.language.json.JsonLanguage
-import com.itsaky.androidide.editor.language.kotlin.KotlinLanguage
-import com.itsaky.androidide.editor.language.log.LogLanguage
+import com.itsaky.androidide.editor.language.treesitter.JavaLanguage
+import com.itsaky.androidide.editor.language.treesitter.JsonLanguage
+import com.itsaky.androidide.editor.language.treesitter.KotlinLanguage
+import com.itsaky.androidide.editor.language.treesitter.LogLanguage
 import com.itsaky.androidide.editor.language.treesitter.TSLanguageRegistry
-import com.itsaky.androidide.editor.language.xml.XMLLanguage
+import com.itsaky.androidide.editor.language.treesitter.XMLLanguage
 import com.itsaky.androidide.editor.schemes.IDEColorSchemeProvider
 import com.itsaky.androidide.editor.ui.IDEEditor
 import com.itsaky.androidide.eventbus.events.editor.DocumentChangeEvent
diff --git a/app/src/main/java/com/itsaky/androidide/fragments/output/LogViewFragment.kt b/app/src/main/java/com/itsaky/androidide/fragments/output/LogViewFragment.kt
index ee3965125..52f9a06ea 100644
--- a/app/src/main/java/com/itsaky/androidide/fragments/output/LogViewFragment.kt
+++ b/app/src/main/java/com/itsaky/androidide/fragments/output/LogViewFragment.kt
@@ -24,7 +24,7 @@ import android.view.View
 import com.blankj.utilcode.util.ThreadUtils
 import com.itsaky.androidide.R
 import com.itsaky.androidide.databinding.FragmentLogBinding
-import com.itsaky.androidide.editor.language.log.LogLanguage
+import com.itsaky.androidide.editor.language.treesitter.LogLanguage
 import com.itsaky.androidide.editor.schemes.IDEColorSchemeProvider
 import com.itsaky.androidide.fragments.EmptyStateFragment
 import com.itsaky.androidide.models.LogLine
diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/java/JavaLanguage.kt b/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/JavaLanguage.kt
similarity index 94%
rename from editor/src/main/java/com/itsaky/androidide/editor/language/java/JavaLanguage.kt
rename to editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/JavaLanguage.kt
index a8f68cfb6..235d4e569 100644
--- a/editor/src/main/java/com/itsaky/androidide/editor/language/java/JavaLanguage.kt
+++ b/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/JavaLanguage.kt
@@ -15,12 +15,11 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.editor.language.java
+package com.itsaky.androidide.editor.language.treesitter
 
 import android.content.Context
 import com.itsaky.androidide.editor.language.newline.TSBracketsHandler
 import com.itsaky.androidide.editor.language.newline.TSCStyleBracketsHandler
-import com.itsaky.androidide.editor.language.treesitter.TreeSitterLanguage
 import com.itsaky.androidide.editor.language.treesitter.TreeSitterLanguage.Factory
 import com.itsaky.androidide.editor.language.utils.CommonSymbolPairs
 import com.itsaky.androidide.lsp.api.ILanguageServer
diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/json/JsonLanguage.kt b/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/JsonLanguage.kt
similarity index 91%
rename from editor/src/main/java/com/itsaky/androidide/editor/language/json/JsonLanguage.kt
rename to editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/JsonLanguage.kt
index e5dbfdeb8..2b718580c 100644
--- a/editor/src/main/java/com/itsaky/androidide/editor/language/json/JsonLanguage.kt
+++ b/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/JsonLanguage.kt
@@ -15,10 +15,9 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.editor.language.json
+package com.itsaky.androidide.editor.language.treesitter
 
 import android.content.Context
-import com.itsaky.androidide.editor.language.treesitter.TreeSitterLanguage
 import com.itsaky.androidide.editor.language.treesitter.TreeSitterLanguage.Factory
 import com.itsaky.androidide.treesitter.json.TSLanguageJson
 
diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/kotlin/KotlinLanguage.kt b/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/KotlinLanguage.kt
similarity index 90%
rename from editor/src/main/java/com/itsaky/androidide/editor/language/kotlin/KotlinLanguage.kt
rename to editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/KotlinLanguage.kt
index fade961bd..76d003e1f 100644
--- a/editor/src/main/java/com/itsaky/androidide/editor/language/kotlin/KotlinLanguage.kt
+++ b/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/KotlinLanguage.kt
@@ -15,10 +15,9 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.editor.language.kotlin
+package com.itsaky.androidide.editor.language.treesitter
 
 import android.content.Context
-import com.itsaky.androidide.editor.language.treesitter.TreeSitterLanguage
 import com.itsaky.androidide.treesitter.kotlin.TSLanguageKotlin
 
 /**
diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/log/LogLanguage.kt b/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/LogLanguage.kt
similarity index 90%
rename from editor/src/main/java/com/itsaky/androidide/editor/language/log/LogLanguage.kt
rename to editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/LogLanguage.kt
index 77ab8c5ee..4170f389a 100644
--- a/editor/src/main/java/com/itsaky/androidide/editor/language/log/LogLanguage.kt
+++ b/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/LogLanguage.kt
@@ -15,10 +15,9 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.editor.language.log
+package com.itsaky.androidide.editor.language.treesitter
 
 import android.content.Context
-import com.itsaky.androidide.editor.language.treesitter.TreeSitterLanguage
 import com.itsaky.androidide.editor.language.treesitter.TreeSitterLanguage.Factory
 import com.itsaky.androidide.treesitter.log.TSLanguageLog
 
diff --git a/editor/src/main/java/com/itsaky/androidide/editor/language/xml/XMLLanguage.kt b/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/XMLLanguage.kt
similarity index 93%
rename from editor/src/main/java/com/itsaky/androidide/editor/language/xml/XMLLanguage.kt
rename to editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/XMLLanguage.kt
index f04749c1b..2cde352c0 100644
--- a/editor/src/main/java/com/itsaky/androidide/editor/language/xml/XMLLanguage.kt
+++ b/editor/src/main/java/com/itsaky/androidide/editor/language/treesitter/XMLLanguage.kt
@@ -15,10 +15,9 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.itsaky.androidide.editor.language.xml
+package com.itsaky.androidide.editor.language.treesitter
 
 import android.content.Context
-import com.itsaky.androidide.editor.language.treesitter.TreeSitterLanguage
 import com.itsaky.androidide.editor.language.treesitter.TreeSitterLanguage.Factory
 import com.itsaky.androidide.lsp.api.ILanguageServer
 import com.itsaky.androidide.lsp.api.ILanguageServerRegistry
diff --git a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/ShowXmlActivity.kt b/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/ShowXmlActivity.kt
index 1d5cbee17..5ff5bc1f4 100644
--- a/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/ShowXmlActivity.kt
+++ b/uidesigner/src/main/java/com/itsaky/androidide/uidesigner/ShowXmlActivity.kt
@@ -22,7 +22,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import com.itsaky.androidide.app.BaseIDEActivity
-import com.itsaky.androidide.editor.language.xml.XMLLanguage
+import com.itsaky.androidide.editor.language.treesitter.XMLLanguage
 import com.itsaky.androidide.editor.schemes.IDEColorSchemeProvider
 import com.itsaky.androidide.editor.ui.IDEEditor
 import com.itsaky.androidide.preferences.internal.fontSize