diff --git a/codeGenExperimental6502/src/prog8/codegen/experimental6502/IntermediateAstMaker.kt b/codeGenExperimental6502/src/prog8/codegen/experimental6502/IntermediateAstMaker.kt
index 401635838..e5f8290b8 100644
--- a/codeGenExperimental6502/src/prog8/codegen/experimental6502/IntermediateAstMaker.kt
+++ b/codeGenExperimental6502/src/prog8/codegen/experimental6502/IntermediateAstMaker.kt
@@ -3,9 +3,9 @@ package prog8.codegen.experimental6502
 import prog8.ast.Module
 import prog8.ast.Program
 import prog8.ast.base.FatalAstException
-import prog8.ast.base.VarDeclType
 import prog8.ast.expressions.*
 import prog8.ast.statements.*
+import prog8.compilerinterface.VarDeclType
 import prog8.compilerinterface.intermediate.*
 
 
diff --git a/compilerInterfaces/src/prog8/compilerinterface/intermediate/AstBase.kt b/compilerInterfaces/src/prog8/compilerinterface/intermediate/AstBase.kt
index 92db71b16..f19f13cc9 100644
--- a/compilerInterfaces/src/prog8/compilerinterface/intermediate/AstBase.kt
+++ b/compilerInterfaces/src/prog8/compilerinterface/intermediate/AstBase.kt
@@ -1,8 +1,8 @@
 package prog8.compilerinterface.intermediate
 
-import prog8.ast.base.Position
 import prog8.compilerinterface.IMemSizer
 import prog8.compilerinterface.IStringEncoding
+import prog8.compilerinterface.Position
 
 // TODO : once the CodeGen doesn't need the old Ast anymore, get rid of the 'Pt' prefixes.
 
diff --git a/compilerInterfaces/src/prog8/compilerinterface/intermediate/AstExpressions.kt b/compilerInterfaces/src/prog8/compilerinterface/intermediate/AstExpressions.kt
index b5e0f188e..f09085154 100644
--- a/compilerInterfaces/src/prog8/compilerinterface/intermediate/AstExpressions.kt
+++ b/compilerInterfaces/src/prog8/compilerinterface/intermediate/AstExpressions.kt
@@ -1,8 +1,8 @@
 package prog8.compilerinterface.intermediate
 
-import prog8.ast.base.DataType
-import prog8.ast.base.Position
+import prog8.compilerinterface.DataType
 import prog8.compilerinterface.Encoding
+import prog8.compilerinterface.Position
 
 
 class PtAddressOf(position: Position) : PtNode(position) {
diff --git a/compilerInterfaces/src/prog8/compilerinterface/intermediate/AstStatements.kt b/compilerInterfaces/src/prog8/compilerinterface/intermediate/AstStatements.kt
index 706fb9796..3217ec00c 100644
--- a/compilerInterfaces/src/prog8/compilerinterface/intermediate/AstStatements.kt
+++ b/compilerInterfaces/src/prog8/compilerinterface/intermediate/AstStatements.kt
@@ -1,13 +1,9 @@
 package prog8.compilerinterface.intermediate
 
-import prog8.ast.base.BranchCondition
-import prog8.ast.base.CpuRegister
-import prog8.ast.base.DataType
-import prog8.ast.base.Position
 import prog8.ast.statements.AssignmentOrigin
 import prog8.ast.statements.RegisterOrStatusflag
 import prog8.ast.statements.SubroutineParameter
-import prog8.ast.toHex
+import prog8.compilerinterface.*
 
 
 class PtAsmSub(