diff --git a/semantic-typescript/src/Language/TypeScript.hs b/semantic-typescript/src/Language/TypeScript.hs
index 7da01f376..935d3e923 100644
--- a/semantic-typescript/src/Language/TypeScript.hs
+++ b/semantic-typescript/src/Language/TypeScript.hs
@@ -10,7 +10,7 @@ import qualified Language.TypeScript.AST as TypeScript
 import qualified Language.TypeScript.Tags as TsTags
 import qualified Tags.Tagging.Precise as Tags
 import qualified TreeSitter.TypeScript (tree_sitter_typescript)
-import qualified TreeSitter.Unmarshal as TS
+import qualified AST.Unmarshal as TS
 
 newtype Term a = Term { getTerm :: TypeScript.Program a }
 
diff --git a/semantic-typescript/src/Language/TypeScript/AST.hs b/semantic-typescript/src/Language/TypeScript/AST.hs
index 731df756e..667f93937 100644
--- a/semantic-typescript/src/Language/TypeScript/AST.hs
+++ b/semantic-typescript/src/Language/TypeScript/AST.hs
@@ -15,7 +15,7 @@ module Language.TypeScript.AST
 ) where
 
 import           Prelude hiding (False, Float, Integer, String, True)
-import           TreeSitter.GenerateSyntax
+import           AST.GenerateSyntax
 import qualified TreeSitter.TypeScript as Grammar
 
 astDeclarationsForLanguage Grammar.tree_sitter_typescript "../../../vendor/tree-sitter-typescript/typescript/src/node-types.json"
diff --git a/semantic-typescript/src/Language/TypeScript/Tags.hs b/semantic-typescript/src/Language/TypeScript/Tags.hs
index e96e90167..408bdd9ad 100644
--- a/semantic-typescript/src/Language/TypeScript/Tags.hs
+++ b/semantic-typescript/src/Language/TypeScript/Tags.hs
@@ -20,7 +20,7 @@ import           Source.Loc
 import           Source.Source as Source
 import           Tags.Tag
 import qualified Tags.Tagging.Precise as Tags
-import           TreeSitter.Token
+import           AST.Token
 
 class ToTags t where
   tags