diff --git a/.gitmodules b/.gitmodules
index cc5edadc2028bc1f4db584f19862852cda5830e8..5172070ff4338a2cdf5e3b2d30184c4ddb7cb9bf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "dumpAst/src/main/jastadd/mustache"]
-	path = dumpAst/src/main/jastadd/mustache
+	path = dumpAst.base/src/main/jastadd/mustache
 	url = ../mustache
diff --git a/README.md b/README.md
index 1b001cb8f7f67d2362aff1ea9f911948dbd1adde..2095d42224d2b4f05aab7d403dd5d1b996282a81 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
 # DumpAst
 
-For documentation, please see https://jastadd.pages.st.inf.tu-dresden.de/relast2uml/
+For documentation, please see https://jastadd.pages.st.inf.tu-dresden.de/dumpAst/
diff --git a/dumpAst/.gitignore b/dumpAst.base/.gitignore
similarity index 100%
rename from dumpAst/.gitignore
rename to dumpAst.base/.gitignore
diff --git a/dumpAst/build.gradle b/dumpAst.base/build.gradle
similarity index 98%
rename from dumpAst/build.gradle
rename to dumpAst.base/build.gradle
index 11c2716e20e3a033ab67f9f7bd8567489aaf5933..525420f200a00ea1fbc485117d29b3bb11095ac3 100644
--- a/dumpAst/build.gradle
+++ b/dumpAst.base/build.gradle
@@ -126,7 +126,7 @@ task fatJar(type: Jar) {
     }
 }
 
-def versionFile = "src/main/resources/${project.getName()}Version.properties"
+def versionFile = "src/main/resources/${rootProject.getName()}Version.properties"
 
 try {
     def oldProps = new Properties()
diff --git a/dumpAst/src/main/jastadd/ClassAnalysis.jrag b/dumpAst.base/src/main/jastadd/ClassAnalysis.jrag
similarity index 100%
rename from dumpAst/src/main/jastadd/ClassAnalysis.jrag
rename to dumpAst.base/src/main/jastadd/ClassAnalysis.jrag
diff --git a/dumpAst/src/main/jastadd/DumpAst.relast b/dumpAst.base/src/main/jastadd/DumpAst.relast
similarity index 100%
rename from dumpAst/src/main/jastadd/DumpAst.relast
rename to dumpAst.base/src/main/jastadd/DumpAst.relast
diff --git a/dumpAst/src/main/jastadd/Frontend.jrag b/dumpAst.base/src/main/jastadd/Frontend.jrag
similarity index 100%
rename from dumpAst/src/main/jastadd/Frontend.jrag
rename to dumpAst.base/src/main/jastadd/Frontend.jrag
diff --git a/dumpAst/src/main/jastadd/GeneratedNavigation.jrag b/dumpAst.base/src/main/jastadd/GeneratedNavigation.jrag
similarity index 100%
rename from dumpAst/src/main/jastadd/GeneratedNavigation.jrag
rename to dumpAst.base/src/main/jastadd/GeneratedNavigation.jrag
diff --git a/dumpAst/src/main/jastadd/Imports.jadd b/dumpAst.base/src/main/jastadd/Imports.jadd
similarity index 100%
rename from dumpAst/src/main/jastadd/Imports.jadd
rename to dumpAst.base/src/main/jastadd/Imports.jadd
diff --git a/dumpAst/src/main/jastadd/Mustache.jrag b/dumpAst.base/src/main/jastadd/Mustache.jrag
similarity index 100%
rename from dumpAst/src/main/jastadd/Mustache.jrag
rename to dumpAst.base/src/main/jastadd/Mustache.jrag
diff --git a/dumpAst/src/main/jastadd/Navigation.jrag b/dumpAst.base/src/main/jastadd/Navigation.jrag
similarity index 100%
rename from dumpAst/src/main/jastadd/Navigation.jrag
rename to dumpAst.base/src/main/jastadd/Navigation.jrag
diff --git a/dumpAst/src/main/jastadd/Printing.jrag b/dumpAst.base/src/main/jastadd/Printing.jrag
similarity index 100%
rename from dumpAst/src/main/jastadd/Printing.jrag
rename to dumpAst.base/src/main/jastadd/Printing.jrag
diff --git a/dumpAst/src/main/jastadd/TemplateContext.jrag b/dumpAst.base/src/main/jastadd/TemplateContext.jrag
similarity index 100%
rename from dumpAst/src/main/jastadd/TemplateContext.jrag
rename to dumpAst.base/src/main/jastadd/TemplateContext.jrag
diff --git a/dumpAst/src/main/jastadd/ToYaml.jrag b/dumpAst.base/src/main/jastadd/ToYaml.jrag
similarity index 100%
rename from dumpAst/src/main/jastadd/ToYaml.jrag
rename to dumpAst.base/src/main/jastadd/ToYaml.jrag
diff --git a/dumpAst/src/main/jastadd/Transform.jadd b/dumpAst.base/src/main/jastadd/Transform.jadd
similarity index 100%
rename from dumpAst/src/main/jastadd/Transform.jadd
rename to dumpAst.base/src/main/jastadd/Transform.jadd
diff --git a/dumpAst/src/main/jastadd/Util.jrag b/dumpAst.base/src/main/jastadd/Util.jrag
similarity index 100%
rename from dumpAst/src/main/jastadd/Util.jrag
rename to dumpAst.base/src/main/jastadd/Util.jrag
diff --git a/dumpAst/src/main/jastadd/mustache b/dumpAst.base/src/main/jastadd/mustache
similarity index 100%
rename from dumpAst/src/main/jastadd/mustache
rename to dumpAst.base/src/main/jastadd/mustache
diff --git a/dumpAst/src/main/java/de/tudresden/inf/st/jastadd/dumpAst/ast/DumpBuilder.java b/dumpAst.base/src/main/java/de/tudresden/inf/st/jastadd/dumpAst/ast/DumpBuilder.java
similarity index 100%
rename from dumpAst/src/main/java/de/tudresden/inf/st/jastadd/dumpAst/ast/DumpBuilder.java
rename to dumpAst.base/src/main/java/de/tudresden/inf/st/jastadd/dumpAst/ast/DumpBuilder.java
diff --git a/dumpAst/src/main/java/de/tudresden/inf/st/jastadd/dumpAst/ast/Dumper.java b/dumpAst.base/src/main/java/de/tudresden/inf/st/jastadd/dumpAst/ast/Dumper.java
similarity index 100%
rename from dumpAst/src/main/java/de/tudresden/inf/st/jastadd/dumpAst/ast/Dumper.java
rename to dumpAst.base/src/main/java/de/tudresden/inf/st/jastadd/dumpAst/ast/Dumper.java
diff --git a/dumpAst/src/main/java/de/tudresden/inf/st/jastadd/dumpAst/ast/SkinParamBooleanSetting.java b/dumpAst.base/src/main/java/de/tudresden/inf/st/jastadd/dumpAst/ast/SkinParamBooleanSetting.java
similarity index 100%
rename from dumpAst/src/main/java/de/tudresden/inf/st/jastadd/dumpAst/ast/SkinParamBooleanSetting.java
rename to dumpAst.base/src/main/java/de/tudresden/inf/st/jastadd/dumpAst/ast/SkinParamBooleanSetting.java
diff --git a/dumpAst/src/main/java/de/tudresden/inf/st/jastadd/dumpAst/ast/SkinParamStringSetting.java b/dumpAst.base/src/main/java/de/tudresden/inf/st/jastadd/dumpAst/ast/SkinParamStringSetting.java
similarity index 100%
rename from dumpAst/src/main/java/de/tudresden/inf/st/jastadd/dumpAst/ast/SkinParamStringSetting.java
rename to dumpAst.base/src/main/java/de/tudresden/inf/st/jastadd/dumpAst/ast/SkinParamStringSetting.java
diff --git a/dumpAst/src/main/resources/dumpAst.mustache b/dumpAst.base/src/main/resources/dumpAst.mustache
similarity index 100%
rename from dumpAst/src/main/resources/dumpAst.mustache
rename to dumpAst.base/src/main/resources/dumpAst.mustache
diff --git a/dumpAst/src/main/resources/dumpAstVersion.properties b/dumpAst.base/src/main/resources/dumpAstVersion.properties
similarity index 100%
rename from dumpAst/src/main/resources/dumpAstVersion.properties
rename to dumpAst.base/src/main/resources/dumpAstVersion.properties
diff --git a/featureTest/.gitignore b/dumpAst.prototyping/.gitignore
similarity index 100%
rename from featureTest/.gitignore
rename to dumpAst.prototyping/.gitignore
diff --git a/featureTest/build.gradle b/dumpAst.prototyping/build.gradle
similarity index 98%
rename from featureTest/build.gradle
rename to dumpAst.prototyping/build.gradle
index a5568a3caef9deae942db4027162dca40f838205..311ff4b2c9804477a09ab63fe5187d393e20aa06 100644
--- a/featureTest/build.gradle
+++ b/dumpAst.prototyping/build.gradle
@@ -31,7 +31,7 @@ configurations {
 }
 
 dependencies {
-    implementation project(":dumpAst")
+    implementation project(":dumpAst.base")
     jastadd2 group: 'org.jastadd', name: 'jastadd2', version: '2.3.5-dresden'
     relast group: 'org.jastadd', name: 'relast', version: "${relast_version}"
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.3'
diff --git a/featureTest/src/main/jastadd/featureTest.jrag b/dumpAst.prototyping/src/main/jastadd/featureTest.jrag
similarity index 100%
rename from featureTest/src/main/jastadd/featureTest.jrag
rename to dumpAst.prototyping/src/main/jastadd/featureTest.jrag
diff --git a/featureTest/src/main/jastadd/featureTest.relast b/dumpAst.prototyping/src/main/jastadd/featureTest.relast
similarity index 100%
rename from featureTest/src/main/jastadd/featureTest.relast
rename to dumpAst.prototyping/src/main/jastadd/featureTest.relast
diff --git a/featureTest/src/main/java/de/tudresden/inf/st/jastadd/featureTest/FeatureTestMain.java b/dumpAst.prototyping/src/main/java/de/tudresden/inf/st/jastadd/featureTest/FeatureTestMain.java
similarity index 100%
rename from featureTest/src/main/java/de/tudresden/inf/st/jastadd/featureTest/FeatureTestMain.java
rename to dumpAst.prototyping/src/main/java/de/tudresden/inf/st/jastadd/featureTest/FeatureTestMain.java
diff --git a/testDumper/.gitignore b/dumpAst.tests/.gitignore
similarity index 100%
rename from testDumper/.gitignore
rename to dumpAst.tests/.gitignore
diff --git a/testDumper/build.gradle b/dumpAst.tests/build.gradle
similarity index 98%
rename from testDumper/build.gradle
rename to dumpAst.tests/build.gradle
index cddc1fd606004b579fe3a694303071fad8a68a53..f650182e681404878435d6b7500fab0838c17805 100644
--- a/testDumper/build.gradle
+++ b/dumpAst.tests/build.gradle
@@ -30,7 +30,7 @@ configurations {
 }
 
 dependencies {
-    implementation project(':dumpAst')
+    implementation project(':dumpAst.base')
     relast group: 'org.jastadd', name: 'relast', version: "${relast_version}"
     jastadd2 "org.jastadd:jastadd2:2.3.5-dresden-6"
 
diff --git a/testDumper/src/main/jastadd/testDumper.jrag b/dumpAst.tests/src/main/jastadd/testDumper.jrag
similarity index 100%
rename from testDumper/src/main/jastadd/testDumper.jrag
rename to dumpAst.tests/src/main/jastadd/testDumper.jrag
diff --git a/testDumper/src/main/jastadd/testDumper.relast b/dumpAst.tests/src/main/jastadd/testDumper.relast
similarity index 100%
rename from testDumper/src/main/jastadd/testDumper.relast
rename to dumpAst.tests/src/main/jastadd/testDumper.relast
diff --git a/testDumper/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestComplex.java b/dumpAst.tests/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestComplex.java
similarity index 100%
rename from testDumper/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestComplex.java
rename to dumpAst.tests/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestComplex.java
diff --git a/testDumper/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestExcluded.java b/dumpAst.tests/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestExcluded.java
similarity index 100%
rename from testDumper/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestExcluded.java
rename to dumpAst.tests/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestExcluded.java
diff --git a/testDumper/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestIncluded.java b/dumpAst.tests/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestIncluded.java
similarity index 100%
rename from testDumper/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestIncluded.java
rename to dumpAst.tests/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestIncluded.java
diff --git a/testDumper/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestSimple.java b/dumpAst.tests/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestSimple.java
similarity index 100%
rename from testDumper/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestSimple.java
rename to dumpAst.tests/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestSimple.java
diff --git a/testDumper/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestTypeLevel3.java b/dumpAst.tests/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestTypeLevel3.java
similarity index 100%
rename from testDumper/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestTypeLevel3.java
rename to dumpAst.tests/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestTypeLevel3.java
diff --git a/testDumper/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestTypeLevel4.java b/dumpAst.tests/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestTypeLevel4.java
similarity index 100%
rename from testDumper/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestTypeLevel4.java
rename to dumpAst.tests/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestTypeLevel4.java
diff --git a/testDumper/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestUtils.java b/dumpAst.tests/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestUtils.java
similarity index 100%
rename from testDumper/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestUtils.java
rename to dumpAst.tests/src/test/java/de/tudresden/inf/st/jastadd/testDumper/TestUtils.java
diff --git a/pages/docs/adding.md b/pages/docs/adding.md
index 6b5c91c5f7cb6a63f35157df466500b4adf4e9c3..07a828074301dd100dd34d6426de26c047df248d 100644
--- a/pages/docs/adding.md
+++ b/pages/docs/adding.md
@@ -1,6 +1,6 @@
 # Add DumpAst to your project
 
-Check the [package overview page](https://git-st.inf.tu-dresden.de/jastadd/relast2uml/-/packages) to find the latest versions of the individual packages.
+Check the [package overview page](https://git-st.inf.tu-dresden.de/jastadd/dumpAst/-/packages) to find the latest versions of the individual packages.
 
 To use `dumpAst`, adjust your `build.gradle` as follows.
 
@@ -25,12 +25,12 @@ dependencies {
 
 ## Build from source (not recommended)
 
-If you want to build the tools of `DumpAst` from source, first build the jar from the [repository](https://git-st.inf.tu-dresden.de/jastadd/relast2uml).
+If you want to build the tools of `DumpAst` from source, first build the jar from the [repository](https://git-st.inf.tu-dresden.de/jastadd/dumpAst).
 The normal jar does not suffice, as it lacks the information on needed dependencies.
 
 ```bash
-git clone https://git-st.inf.tu-dresden.de/jastadd/relast2uml.git
-cd relast2uml
+git clone https://git-st.inf.tu-dresden.de/jastadd/dumpAst.git
+cd dumpAst
 ./gradlew fatJar
 ls dumpAst/build/libs/
 ```
diff --git a/pages/docs/index.md b/pages/docs/index.md
index e8f11ced151c84d6105f804427ae7f40cd6901ac..0910060203c01660960cf1904dcb8fe0a5ee3537 100644
--- a/pages/docs/index.md
+++ b/pages/docs/index.md
@@ -1,6 +1,6 @@
 # DumpAst
 
-The tool called `DumpAst` ([see in repo](https://git-st.inf.tu-dresden.de/jastadd/relast2uml)) is used to create a snapshot of an AST and visualize it.
+The tool called `DumpAst` ([see in repo](https://git-st.inf.tu-dresden.de/jastadd/dumpAst)) is used to create a snapshot of an AST and visualize it.
 
 ![](img/dumpAst.png)
 
diff --git a/pages/mkdocs.yml b/pages/mkdocs.yml
index ae9514a5623852167e6414dc757c2f8ae28fba5e..ac59250d32152419ed9a44f44d83207f2d954397 100644
--- a/pages/mkdocs.yml
+++ b/pages/mkdocs.yml
@@ -1,5 +1,5 @@
 site_name: DumpAst
-repo_url: https://git-st.inf.tu-dresden.de/jastadd/relast2uml
+repo_url: https://git-st.inf.tu-dresden.de/jastadd/dumpAst
 site_dir: ../public
 
 nav:
diff --git a/settings.gradle b/settings.gradle
index b5b5e2aba025ed461a508cd5fb5846993f43d7f7..7fd9b64b29629f9b5e2fc5fd0b275433da5cb4f5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,8 +4,8 @@ pluginManagement {
     }
 }
 
-rootProject.name = 'relast2uml'
+rootProject.name = 'dumpAst'
 
-include 'dumpAst'
-include 'testDumper'
-include 'featureTest'
+include 'dumpAst.base'
+include 'dumpAst.tests'
+include 'dumpAst.prototyping'