diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 1d617d777..22231136d 100755
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -31,9 +31,7 @@
       <module name="AndroidIDE.gradle-tooling" target="1.8" />
       <module name="AndroidIDE.gradle-tooling.plugin" target="1.8" />
       <module name="AndroidIDE.javac" target="1.8" />
-      <module name="AndroidIDE.logger" target="11" />
-      <module name="AndroidIDE.logger.main" target="11" />
-      <module name="AndroidIDE.logger.test" target="11" />
+      <module name="AndroidIDE.treesitter.test" target="1.7" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules/treesitter/src/main/jni/com_itsaky_androidide_treesitter_TreeSitter.h b/.idea/modules/treesitter/src/main/jni/com_itsaky_androidide_treesitter_TreeSitter.h
new file mode 100644
index 000000000..2880594b0
--- /dev/null
+++ b/.idea/modules/treesitter/src/main/jni/com_itsaky_androidide_treesitter_TreeSitter.h
@@ -0,0 +1,173 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_itsaky_androidide_treesitter_TreeSitter */
+
+#ifndef _Included_com_itsaky_androidide_treesitter_TreeSitter
+#define _Included_com_itsaky_androidide_treesitter_TreeSitter
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     com_itsaky_androidide_treesitter_TreeSitter
+ * Method:    nodeChild
+ * Signature: (Lcom/itsaky/androidide/treesitter/Node;I)Lcom/itsaky/androidide/treesitter/Node;
+ */
+JNIEXPORT jobject JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_nodeChild
+  (JNIEnv *, jclass, jobject, jint);
+
+/*
+ * Class:     com_itsaky_androidide_treesitter_TreeSitter
+ * Method:    nodeChildCount
+ * Signature: (Lcom/itsaky/androidide/treesitter/Node;)I
+ */
+JNIEXPORT jint JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_nodeChildCount
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     com_itsaky_androidide_treesitter_TreeSitter
+ * Method:    nodeEndByte
+ * Signature: (Lcom/itsaky/androidide/treesitter/Node;)I
+ */
+JNIEXPORT jint JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_nodeEndByte
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     com_itsaky_androidide_treesitter_TreeSitter
+ * Method:    nodeStartByte
+ * Signature: (Lcom/itsaky/androidide/treesitter/Node;)I
+ */
+JNIEXPORT jint JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_nodeStartByte
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     com_itsaky_androidide_treesitter_TreeSitter
+ * Method:    nodeString
+ * Signature: (Lcom/itsaky/androidide/treesitter/Node;)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_nodeString
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     com_itsaky_androidide_treesitter_TreeSitter
+ * Method:    nodeType
+ * Signature: (Lcom/itsaky/androidide/treesitter/Node;)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_nodeType
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     com_itsaky_androidide_treesitter_TreeSitter
+ * Method:    parserNew
+ * Signature: ()J
+ */
+JNIEXPORT jlong JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_parserNew
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     com_itsaky_androidide_treesitter_TreeSitter
+ * Method:    parserDelete
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_parserDelete
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     com_itsaky_androidide_treesitter_TreeSitter
+ * Method:    parserSetLanguage
+ * Signature: (JJ)V
+ */
+JNIEXPORT void JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_parserSetLanguage
+  (JNIEnv *, jclass, jlong, jlong);
+
+/*
+ * Class:     com_itsaky_androidide_treesitter_TreeSitter
+ * Method:    parserParseBytes
+ * Signature: (J[BI)J
+ */
+JNIEXPORT jlong JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_parserParseBytes
+  (JNIEnv *, jclass, jlong, jbyteArray, jint);
+
+/*
+ * Class:     com_itsaky_androidide_treesitter_TreeSitter
+ * Method:    treeCursorNew
+ * Signature: (Lcom/itsaky/androidide/treesitter/Node;)J
+ */
+JNIEXPORT jlong JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_treeCursorNew
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     com_itsaky_androidide_treesitter_TreeSitter
+ * Method:    treeCursorCurrentTreeCursorNode
+ * Signature: (J)Lcom/itsaky/androidide/treesitter/TreeCursorNode;
+ */
+JNIEXPORT jobject JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_treeCursorCurrentTreeCursorNode
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     com_itsaky_androidide_treesitter_TreeSitter
+ * Method:    treeCursorCurrentFieldName
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_treeCursorCurrentFieldName
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     com_itsaky_androidide_treesitter_TreeSitter
+ * Method:    treeCursorCurrentNode
+ * Signature: (J)Lcom/itsaky/androidide/treesitter/Node;
+ */
+JNIEXPORT jobject JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_treeCursorCurrentNode
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     com_itsaky_androidide_treesitter_TreeSitter
+ * Method:    treeCursorDelete
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_treeCursorDelete
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     com_itsaky_androidide_treesitter_TreeSitter
+ * Method:    treeCursorGotoFirstChild
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_treeCursorGotoFirstChild
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     com_itsaky_androidide_treesitter_TreeSitter
+ * Method:    treeCursorGotoNextSibling
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_treeCursorGotoNextSibling
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     com_itsaky_androidide_treesitter_TreeSitter
+ * Method:    treeCursorGotoParent
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_treeCursorGotoParent
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     com_itsaky_androidide_treesitter_TreeSitter
+ * Method:    treeDelete
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_treeDelete
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     com_itsaky_androidide_treesitter_TreeSitter
+ * Method:    treeRootNode
+ * Signature: (J)Lcom/itsaky/androidide/treesitter/Node;
+ */
+JNIEXPORT jobject JNICALL Java_com_itsaky_androidide_treesitter_TreeSitter_treeRootNode
+  (JNIEnv *, jclass, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/logger/build.gradle b/logger/build.gradle
index cddd3aac5..5df558545 100644
--- a/logger/build.gradle
+++ b/logger/build.gradle
@@ -20,8 +20,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility rootProject.ext.javaSourceVersion
+    targetCompatibility rootProject.ext.javaTargetVersion
 }
 
 dependencies {
diff --git a/settings.gradle b/settings.gradle
index 5e215ec90..7fd5ddc7c 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,12 +9,14 @@ include ':eventbus-events'
 include ':lexers'
 include ':logger'
 include ':sdk-info'
+include ':shared'
 include ':treeview'
 include ':xml-inflater'
 
 include ':gradle-plugin'
 
 include ':lsp:api'
+include ':lsp:models'
 include ':lsp:java'
 include ':lsp:xml'
 include ':lsp:testing'
@@ -34,5 +36,3 @@ include ':build-tools:jsonrpc'
 include ':build-tools:projects'
 include ':build-tools:tooling-api-testing'
 include ':build-tools:javac-services'
-include ':lsp:models'
-include ':shared'