diff --git a/.idea/modules.xml b/.idea/modules.xml
index bbe8216bb..f6640d8ce 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/codeAst/codeAst.iml" filepath="$PROJECT_DIR$/codeAst/codeAst.iml" />
       <module fileurl="file://$PROJECT_DIR$/codeCore/codeCore.iml" filepath="$PROJECT_DIR$/codeCore/codeCore.iml" />
       <module fileurl="file://$PROJECT_DIR$/codeGenCpu6502/codeGenCpu6502.iml" filepath="$PROJECT_DIR$/codeGenCpu6502/codeGenCpu6502.iml" />
       <module fileurl="file://$PROJECT_DIR$/codeGenExperimental/codeGenExperimental.iml" filepath="$PROJECT_DIR$/codeGenExperimental/codeGenExperimental.iml" />
diff --git a/codeAst/build.gradle b/codeAst/build.gradle
deleted file mode 100644
index 76e25e62d..000000000
--- a/codeAst/build.gradle
+++ /dev/null
@@ -1,42 +0,0 @@
-
-plugins {
-    id 'java'
-    id 'application'
-    id "org.jetbrains.kotlin.jvm"
-}
-
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(javaVersion)
-    }
-}
-
-compileKotlin {
-    kotlinOptions {
-        jvmTarget = javaVersion
-    }
-}
-
-compileTestKotlin {
-    kotlinOptions {
-        jvmTarget = javaVersion
-    }
-}
-
-dependencies {
-    implementation project(':codeCore')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-}
-
-sourceSets {
-    main {
-        java {
-            srcDirs = ["${project.projectDir}/src"]
-        }
-        resources {
-            srcDirs = ["${project.projectDir}/res"]
-        }
-    }
-}
-
-// note: there are no unit tests in this module!
diff --git a/codeAst/codeAst.iml b/codeAst/codeAst.iml
deleted file mode 100644
index ae36eb05a..000000000
--- a/codeAst/codeAst.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="module" module-name="codeCore" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/codeAst/src/prog8/code/SymbolTable.kt b/codeCore/src/prog8/code/SymbolTable.kt
similarity index 100%
rename from codeAst/src/prog8/code/SymbolTable.kt
rename to codeCore/src/prog8/code/SymbolTable.kt
diff --git a/codeAst/src/prog8/code/ast/AstBase.kt b/codeCore/src/prog8/code/ast/AstBase.kt
similarity index 100%
rename from codeAst/src/prog8/code/ast/AstBase.kt
rename to codeCore/src/prog8/code/ast/AstBase.kt
diff --git a/codeAst/src/prog8/code/ast/AstExpressions.kt b/codeCore/src/prog8/code/ast/AstExpressions.kt
similarity index 100%
rename from codeAst/src/prog8/code/ast/AstExpressions.kt
rename to codeCore/src/prog8/code/ast/AstExpressions.kt
diff --git a/codeAst/src/prog8/code/ast/AstStatements.kt b/codeCore/src/prog8/code/ast/AstStatements.kt
similarity index 100%
rename from codeAst/src/prog8/code/ast/AstStatements.kt
rename to codeCore/src/prog8/code/ast/AstStatements.kt
diff --git a/codeGenCpu6502/build.gradle b/codeGenCpu6502/build.gradle
index ade618336..4d3442e25 100644
--- a/codeGenCpu6502/build.gradle
+++ b/codeGenCpu6502/build.gradle
@@ -24,7 +24,6 @@ compileTestKotlin {
 }
 
 dependencies {
-    implementation project(':codeAst')
     implementation project(':codeCore')
     implementation project(':compilerAst')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
diff --git a/codeGenCpu6502/codeGenCpu6502.iml b/codeGenCpu6502/codeGenCpu6502.iml
index 356fb39bd..4e52dfb59 100644
--- a/codeGenCpu6502/codeGenCpu6502.iml
+++ b/codeGenCpu6502/codeGenCpu6502.iml
@@ -9,7 +9,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="module" module-name="codeAst" />
     <orderEntry type="module" module-name="codeCore" />
     <orderEntry type="module" module-name="compilerAst" />
     <orderEntry type="library" name="michael.bull.kotlin.result.jvm" level="project" />
diff --git a/codeGenExperimental/build.gradle b/codeGenExperimental/build.gradle
index 8daf3a484..986446b25 100644
--- a/codeGenExperimental/build.gradle
+++ b/codeGenExperimental/build.gradle
@@ -24,7 +24,6 @@ compileTestKotlin {
 }
 
 dependencies {
-    implementation project(':codeAst')
     implementation project(':codeCore')
     implementation project(':intermediate')
     implementation project(':virtualmachine')
diff --git a/codeGenExperimental/codeGenExperimental.iml b/codeGenExperimental/codeGenExperimental.iml
index 34bc8a8e4..9e18d4b8e 100644
--- a/codeGenExperimental/codeGenExperimental.iml
+++ b/codeGenExperimental/codeGenExperimental.iml
@@ -10,7 +10,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
     <orderEntry type="library" name="michael.bull.kotlin.result.jvm" level="project" />
-    <orderEntry type="module" module-name="codeAst" />
     <orderEntry type="module" module-name="codeCore" />
     <orderEntry type="module" module-name="virtualmachine" />
     <orderEntry type="module" module-name="intermediate" />
diff --git a/codeGenVirtual/build.gradle b/codeGenVirtual/build.gradle
index 8fd71e9dd..613699e25 100644
--- a/codeGenVirtual/build.gradle
+++ b/codeGenVirtual/build.gradle
@@ -25,7 +25,6 @@ compileTestKotlin {
 }
 
 dependencies {
-    implementation project(':codeAst')
     implementation project(':codeCore')
     implementation project(':intermediate')
     implementation project(':virtualmachine')
@@ -63,4 +62,4 @@ test {
     testLogging {
         events "skipped", "failed"
     }
-}
\ No newline at end of file
+}
diff --git a/codeGenVirtual/codeGenVirtual.iml b/codeGenVirtual/codeGenVirtual.iml
index f62c96020..2d66ce34d 100644
--- a/codeGenVirtual/codeGenVirtual.iml
+++ b/codeGenVirtual/codeGenVirtual.iml
@@ -12,7 +12,6 @@
     <orderEntry type="library" name="michael.bull.kotlin.result.jvm" level="project" />
     <orderEntry type="library" name="io.kotest.assertions.core.jvm" level="project" />
     <orderEntry type="library" name="io.kotest.runner.junit5.jvm" level="project" />
-    <orderEntry type="module" module-name="codeAst" />
     <orderEntry type="module" module-name="codeCore" />
     <orderEntry type="module" module-name="virtualmachine" />
     <orderEntry type="module" module-name="intermediate" />
diff --git a/compiler/build.gradle b/compiler/build.gradle
index a5e238277..12fa1af93 100644
--- a/compiler/build.gradle
+++ b/compiler/build.gradle
@@ -27,7 +27,6 @@ compileTestKotlin {
 def prog8version = rootProject.file('compiler/res/version.txt').text.trim()
 
 dependencies {
-    implementation project(':codeAst')
     implementation project(':codeCore')
     implementation project(':codeOptimizers')
     implementation project(':compilerAst')
diff --git a/compiler/compiler.iml b/compiler/compiler.iml
index 943a0528b..c2b444f50 100644
--- a/compiler/compiler.iml
+++ b/compiler/compiler.iml
@@ -17,7 +17,6 @@
     <orderEntry type="library" name="io.kotest.runner.junit5.jvm" level="project" />
     <orderEntry type="library" name="antlr.antlr4" level="project" />
     <orderEntry type="module" module-name="codeCore" />
-    <orderEntry type="module" module-name="codeAst" />
     <orderEntry type="module" module-name="compilerAst" />
     <orderEntry type="module" module-name="codeOptimizers" />
     <orderEntry type="module" module-name="codeGenCpu6502" />
diff --git a/docs/source/todo.rst b/docs/source/todo.rst
index c6fc90eb9..93615f2f4 100644
--- a/docs/source/todo.rst
+++ b/docs/source/todo.rst
@@ -3,12 +3,12 @@ TODO
 
 For next release
 ^^^^^^^^^^^^^^^^
-- Join codeAst and codeCore modules?
-- IR: option to save IR in file
 - Replace existing vm codegen by expericodegen, expericodegen just stops at saving IR in file.
-- vm: implement remaining sin/cos functions in virtual/math.p8 and merge tables
-- write some documentation about the compiler architecture and where to plug a code generator onto.
+- AFTER THIS, MERGE TO MASTER.
+- IR: option to save IR in file
 - IR/VM: improve unit tests
+- write some documentation about the compiler architecture and where to plug a code generator onto.
+- vm: implement remaining sin/cos functions in virtual/math.p8 and merge tables
 
 ...
 
diff --git a/intermediate/build.gradle b/intermediate/build.gradle
index 8c496fe71..40187015f 100644
--- a/intermediate/build.gradle
+++ b/intermediate/build.gradle
@@ -26,7 +26,6 @@ compileTestKotlin {
 
 dependencies {
     implementation project(':codeCore')
-    implementation project(':codeAst')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.3.2'
 }
diff --git a/intermediate/intermediate.iml b/intermediate/intermediate.iml
index a90974cc3..296a24a8e 100644
--- a/intermediate/intermediate.iml
+++ b/intermediate/intermediate.iml
@@ -10,7 +10,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="module" module-name="codeAst" />
     <orderEntry type="module" module-name="codeCore" />
     <orderEntry type="library" name="io.kotest.assertions.core.jvm" level="project" />
     <orderEntry type="library" name="io.kotest.runner.junit5.jvm" level="project" />
diff --git a/settings.gradle b/settings.gradle
index 21c168c76..90ec93fc3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,6 @@
 include(
     ':parser',
     ':codeCore',
-    ':codeAst',
     ':intermediate',
     ':compilerAst',
     ':codeOptimizers',