diff --git a/codeOptimizers/src/prog8/optimizer/ConstExprEvaluator.kt b/codeOptimizers/src/prog8/optimizer/ConstExprEvaluator.kt
index d3abc9e5e..ea611fed4 100644
--- a/codeOptimizers/src/prog8/optimizer/ConstExprEvaluator.kt
+++ b/codeOptimizers/src/prog8/optimizer/ConstExprEvaluator.kt
@@ -1,8 +1,8 @@
 package prog8.optimizer
 
+import prog8.ast.ExpressionError
+import prog8.ast.FatalAstException
 import prog8.ast.Program
-import prog8.ast.base.ExpressionError
-import prog8.ast.base.FatalAstException
 import prog8.ast.expressions.FunctionCallExpression
 import prog8.ast.expressions.NumericLiteral
 import prog8.code.core.BaseDataType
diff --git a/codeOptimizers/src/prog8/optimizer/ConstantFoldingOptimizer.kt b/codeOptimizers/src/prog8/optimizer/ConstantFoldingOptimizer.kt
index a9e89621a..fe25e6d1c 100644
--- a/codeOptimizers/src/prog8/optimizer/ConstantFoldingOptimizer.kt
+++ b/codeOptimizers/src/prog8/optimizer/ConstantFoldingOptimizer.kt
@@ -1,8 +1,8 @@
 package prog8.optimizer
 
+import prog8.ast.FatalAstException
 import prog8.ast.Node
 import prog8.ast.Program
-import prog8.ast.base.FatalAstException
 import prog8.ast.expressions.*
 import prog8.ast.maySwapOperandOrder
 import prog8.ast.statements.*
diff --git a/codeOptimizers/src/prog8/optimizer/ConstantIdentifierReplacer.kt b/codeOptimizers/src/prog8/optimizer/ConstantIdentifierReplacer.kt
index 8bdd43272..d0c16913d 100644
--- a/codeOptimizers/src/prog8/optimizer/ConstantIdentifierReplacer.kt
+++ b/codeOptimizers/src/prog8/optimizer/ConstantIdentifierReplacer.kt
@@ -1,11 +1,11 @@
 package prog8.optimizer
 
+import prog8.ast.FatalAstException
 import prog8.ast.IFunctionCall
 import prog8.ast.IStatementContainer
 import prog8.ast.Node
 import prog8.ast.Program
-import prog8.ast.base.FatalAstException
-import prog8.ast.base.UndefinedSymbolError
+import prog8.ast.UndefinedSymbolError
 import prog8.ast.expressions.*
 import prog8.ast.statements.*
 import prog8.ast.walk.AstWalker
diff --git a/codeOptimizers/src/prog8/optimizer/ExpressionSimplifier.kt b/codeOptimizers/src/prog8/optimizer/ExpressionSimplifier.kt
index bb1c01eba..ae56a347c 100644
--- a/codeOptimizers/src/prog8/optimizer/ExpressionSimplifier.kt
+++ b/codeOptimizers/src/prog8/optimizer/ExpressionSimplifier.kt
@@ -1,7 +1,6 @@
 package prog8.optimizer
 
 import prog8.ast.*
-import prog8.ast.base.FatalAstException
 import prog8.ast.expressions.*
 import prog8.ast.statements.AnonymousScope
 import prog8.ast.statements.IfElse
diff --git a/compiler/src/prog8/CompilerMain.kt b/compiler/src/prog8/CompilerMain.kt
index ba8d92211..3fe1615f3 100644
--- a/compiler/src/prog8/CompilerMain.kt
+++ b/compiler/src/prog8/CompilerMain.kt
@@ -1,7 +1,7 @@
 package prog8
 
 import kotlinx.cli.*
-import prog8.ast.base.AstException
+import prog8.ast.AstException
 import prog8.code.core.CbmPrgLauncherType
 import prog8.code.target.CompilationTargets
 import prog8.code.target.Cx16Target
diff --git a/compiler/src/prog8/compiler/BuiltinFunctions.kt b/compiler/src/prog8/compiler/BuiltinFunctions.kt
index 3a792b910..047c55f91 100644
--- a/compiler/src/prog8/compiler/BuiltinFunctions.kt
+++ b/compiler/src/prog8/compiler/BuiltinFunctions.kt
@@ -1,9 +1,9 @@
 package prog8.compiler
 
 import prog8.ast.Program
-import prog8.ast.base.AstException
-import prog8.ast.base.FatalAstException
-import prog8.ast.base.SyntaxError
+import prog8.ast.AstException
+import prog8.ast.FatalAstException
+import prog8.ast.SyntaxError
 import prog8.ast.expressions.*
 import prog8.ast.statements.VarDecl
 import prog8.code.core.*
diff --git a/compiler/src/prog8/compiler/Compiler.kt b/compiler/src/prog8/compiler/Compiler.kt
index 4f75753bf..df897ee45 100644
--- a/compiler/src/prog8/compiler/Compiler.kt
+++ b/compiler/src/prog8/compiler/Compiler.kt
@@ -1,9 +1,9 @@
 package prog8.compiler
 
 import com.github.michaelbull.result.onFailure
+import prog8.ast.AstException
 import prog8.ast.IBuiltinFunctions
 import prog8.ast.Program
-import prog8.ast.base.AstException
 import prog8.ast.expressions.Expression
 import prog8.ast.expressions.NumericLiteral
 import prog8.ast.printProgram
diff --git a/compiler/src/prog8/compiler/ModuleImporter.kt b/compiler/src/prog8/compiler/ModuleImporter.kt
index 953780188..7aac1cb5f 100644
--- a/compiler/src/prog8/compiler/ModuleImporter.kt
+++ b/compiler/src/prog8/compiler/ModuleImporter.kt
@@ -3,7 +3,7 @@ package prog8.compiler
 import com.github.michaelbull.result.*
 import prog8.ast.Module
 import prog8.ast.Program
-import prog8.ast.base.SyntaxError
+import prog8.ast.SyntaxError
 import prog8.ast.statements.Directive
 import prog8.ast.statements.DirectiveArg
 import prog8.code.core.IErrorReporter
diff --git a/compiler/src/prog8/compiler/astprocessing/AstChecker.kt b/compiler/src/prog8/compiler/astprocessing/AstChecker.kt
index b1f4632d1..5740c13ca 100644
--- a/compiler/src/prog8/compiler/astprocessing/AstChecker.kt
+++ b/compiler/src/prog8/compiler/astprocessing/AstChecker.kt
@@ -1,8 +1,8 @@
 package prog8.compiler.astprocessing
 
 import prog8.ast.*
-import prog8.ast.base.FatalAstException
-import prog8.ast.base.SyntaxError
+import prog8.ast.FatalAstException
+import prog8.ast.SyntaxError
 import prog8.ast.expressions.*
 import prog8.ast.statements.*
 import prog8.ast.walk.IAstVisitor
diff --git a/compiler/src/prog8/compiler/astprocessing/AstPreprocessor.kt b/compiler/src/prog8/compiler/astprocessing/AstPreprocessor.kt
index 02775fcfd..39a6f6cea 100644
--- a/compiler/src/prog8/compiler/astprocessing/AstPreprocessor.kt
+++ b/compiler/src/prog8/compiler/astprocessing/AstPreprocessor.kt
@@ -3,8 +3,8 @@ package prog8.compiler.astprocessing
 import prog8.ast.IFunctionCall
 import prog8.ast.Node
 import prog8.ast.Program
-import prog8.ast.base.FatalAstException
-import prog8.ast.base.SyntaxError
+import prog8.ast.FatalAstException
+import prog8.ast.SyntaxError
 import prog8.ast.expressions.*
 import prog8.ast.findParentNode
 import prog8.ast.statements.*
diff --git a/compiler/src/prog8/compiler/astprocessing/IntermediateAstMaker.kt b/compiler/src/prog8/compiler/astprocessing/IntermediateAstMaker.kt
index 4890e10d8..3750d4d27 100644
--- a/compiler/src/prog8/compiler/astprocessing/IntermediateAstMaker.kt
+++ b/compiler/src/prog8/compiler/astprocessing/IntermediateAstMaker.kt
@@ -5,7 +5,7 @@ import com.github.michaelbull.result.Result
 import com.github.michaelbull.result.getOrElse
 import com.github.michaelbull.result.mapError
 import prog8.ast.Program
-import prog8.ast.base.FatalAstException
+import prog8.ast.FatalAstException
 import prog8.ast.expressions.*
 import prog8.ast.statements.*
 import prog8.code.ast.*
diff --git a/compiler/src/prog8/compiler/astprocessing/ParentNodeChecker.kt b/compiler/src/prog8/compiler/astprocessing/ParentNodeChecker.kt
index f5f5726d0..996c52dfe 100644
--- a/compiler/src/prog8/compiler/astprocessing/ParentNodeChecker.kt
+++ b/compiler/src/prog8/compiler/astprocessing/ParentNodeChecker.kt
@@ -2,7 +2,7 @@ package prog8.compiler.astprocessing
 
 import prog8.ast.Module
 import prog8.ast.Node
-import prog8.ast.base.FatalAstException
+import prog8.ast.FatalAstException
 import prog8.ast.expressions.*
 import prog8.ast.statements.*
 import prog8.ast.walk.AstWalker
diff --git a/compiler/src/prog8/compiler/astprocessing/TypecastsAdder.kt b/compiler/src/prog8/compiler/astprocessing/TypecastsAdder.kt
index b25c8de60..b3fa7056e 100644
--- a/compiler/src/prog8/compiler/astprocessing/TypecastsAdder.kt
+++ b/compiler/src/prog8/compiler/astprocessing/TypecastsAdder.kt
@@ -3,7 +3,7 @@ package prog8.compiler.astprocessing
 import prog8.ast.IFunctionCall
 import prog8.ast.Node
 import prog8.ast.Program
-import prog8.ast.base.FatalAstException
+import prog8.ast.FatalAstException
 import prog8.ast.expressions.*
 import prog8.ast.statements.*
 import prog8.ast.walk.AstWalker
diff --git a/compiler/src/prog8/compiler/astprocessing/Utility.kt b/compiler/src/prog8/compiler/astprocessing/Utility.kt
index b984caa29..cd63ee004 100644
--- a/compiler/src/prog8/compiler/astprocessing/Utility.kt
+++ b/compiler/src/prog8/compiler/astprocessing/Utility.kt
@@ -1,6 +1,6 @@
 package prog8.compiler.astprocessing
 
-import prog8.ast.base.FatalAstException
+import prog8.ast.FatalAstException
 import prog8.code.ast.PtExpression
 import prog8.code.ast.PtFunctionCall
 import prog8.code.ast.PtTypeCast
diff --git a/compiler/src/prog8/compiler/astprocessing/VariousCleanups.kt b/compiler/src/prog8/compiler/astprocessing/VariousCleanups.kt
index 0d97b2d1a..df5b87a5f 100644
--- a/compiler/src/prog8/compiler/astprocessing/VariousCleanups.kt
+++ b/compiler/src/prog8/compiler/astprocessing/VariousCleanups.kt
@@ -4,7 +4,7 @@ import prog8.ast.IFunctionCall
 import prog8.ast.IStatementContainer
 import prog8.ast.Node
 import prog8.ast.Program
-import prog8.ast.base.FatalAstException
+import prog8.ast.FatalAstException
 import prog8.ast.expressions.*
 import prog8.ast.statements.*
 import prog8.ast.walk.AstWalker
diff --git a/compiler/test/TestNumericLiteral.kt b/compiler/test/TestNumericLiteral.kt
index 6c9200832..bc0644c06 100644
--- a/compiler/test/TestNumericLiteral.kt
+++ b/compiler/test/TestNumericLiteral.kt
@@ -5,7 +5,7 @@ import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.shouldNotBe
 import io.kotest.matchers.string.shouldContain
-import prog8.ast.base.ExpressionError
+import prog8.ast.ExpressionError
 import prog8.ast.expressions.ArrayLiteral
 import prog8.ast.expressions.InferredTypes
 import prog8.ast.expressions.NumericLiteral
diff --git a/compilerAst/src/prog8/ast/AstToplevel.kt b/compilerAst/src/prog8/ast/AstToplevel.kt
index a6909278f..ddd3f9434 100644
--- a/compilerAst/src/prog8/ast/AstToplevel.kt
+++ b/compilerAst/src/prog8/ast/AstToplevel.kt
@@ -1,6 +1,5 @@
 package prog8.ast
 
-import prog8.ast.base.FatalAstException
 import prog8.ast.expressions.Expression
 import prog8.ast.expressions.IdentifierReference
 import prog8.ast.expressions.InferredTypes
diff --git a/compilerAst/src/prog8/ast/base/Errors.kt b/compilerAst/src/prog8/ast/Errors.kt
similarity index 97%
rename from compilerAst/src/prog8/ast/base/Errors.kt
rename to compilerAst/src/prog8/ast/Errors.kt
index 7095d4dd9..00b574d4c 100644
--- a/compilerAst/src/prog8/ast/base/Errors.kt
+++ b/compilerAst/src/prog8/ast/Errors.kt
@@ -1,4 +1,4 @@
-package prog8.ast.base
+package prog8.ast
 
 import prog8.ast.expressions.IdentifierReference
 import prog8.code.core.Position
diff --git a/compilerAst/src/prog8/ast/Program.kt b/compilerAst/src/prog8/ast/Program.kt
index 319f9342c..f61c55104 100644
--- a/compilerAst/src/prog8/ast/Program.kt
+++ b/compilerAst/src/prog8/ast/Program.kt
@@ -1,6 +1,5 @@
 package prog8.ast
 
-import prog8.ast.base.FatalAstException
 import prog8.ast.expressions.IdentifierReference
 import prog8.ast.expressions.StringLiteral
 import prog8.ast.statements.*
diff --git a/compilerAst/src/prog8/ast/antlr/Antlr2Kotlin.kt b/compilerAst/src/prog8/ast/antlr/Antlr2Kotlin.kt
index 4a510e815..b57b3de97 100644
--- a/compilerAst/src/prog8/ast/antlr/Antlr2Kotlin.kt
+++ b/compilerAst/src/prog8/ast/antlr/Antlr2Kotlin.kt
@@ -3,8 +3,8 @@ package prog8.ast.antlr
 import org.antlr.v4.runtime.ParserRuleContext
 import org.antlr.v4.runtime.Token
 import org.antlr.v4.runtime.tree.TerminalNode
-import prog8.ast.base.FatalAstException
-import prog8.ast.base.SyntaxError
+import prog8.ast.FatalAstException
+import prog8.ast.SyntaxError
 import prog8.ast.expressions.*
 import prog8.ast.statements.*
 import prog8.code.core.*
diff --git a/compilerAst/src/prog8/ast/expressions/AstExpressions.kt b/compilerAst/src/prog8/ast/expressions/AstExpressions.kt
index 0ff19581d..0d2587789 100644
--- a/compilerAst/src/prog8/ast/expressions/AstExpressions.kt
+++ b/compilerAst/src/prog8/ast/expressions/AstExpressions.kt
@@ -1,10 +1,10 @@
 package prog8.ast.expressions
 
+import prog8.ast.ExpressionError
+import prog8.ast.FatalAstException
 import prog8.ast.IFunctionCall
 import prog8.ast.Node
 import prog8.ast.Program
-import prog8.ast.base.ExpressionError
-import prog8.ast.base.FatalAstException
 import prog8.ast.statements.*
 import prog8.ast.walk.AstWalker
 import prog8.ast.walk.IAstVisitor
diff --git a/compilerAst/src/prog8/ast/statements/AstStatements.kt b/compilerAst/src/prog8/ast/statements/AstStatements.kt
index bd6982291..4fe86dddc 100644
--- a/compilerAst/src/prog8/ast/statements/AstStatements.kt
+++ b/compilerAst/src/prog8/ast/statements/AstStatements.kt
@@ -1,7 +1,6 @@
 package prog8.ast.statements
 
 import prog8.ast.*
-import prog8.ast.base.FatalAstException
 import prog8.ast.expressions.*
 import prog8.ast.walk.AstWalker
 import prog8.ast.walk.IAstVisitor
diff --git a/compilerAst/src/prog8/ast/walk/AstWalker.kt b/compilerAst/src/prog8/ast/walk/AstWalker.kt
index 56a5d29f3..df2e3ebe9 100644
--- a/compilerAst/src/prog8/ast/walk/AstWalker.kt
+++ b/compilerAst/src/prog8/ast/walk/AstWalker.kt
@@ -1,7 +1,6 @@
 package prog8.ast.walk
 
 import prog8.ast.*
-import prog8.ast.base.FatalAstException
 import prog8.ast.expressions.*
 import prog8.ast.statements.*
 import prog8.code.core.AssociativeOperators