diff --git a/core b/core
index a45001a..d965055 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit a45001aa3926f57d9d457e7c12800b264010b5dd
+Subproject commit d965055ac90308ced33c6c0b95a3db38c6e43a69
diff --git a/src/bld/java/rife/BldBuild.java b/src/bld/java/rife/BldBuild.java
index a085102..4ef38a4 100644
--- a/src/bld/java/rife/BldBuild.java
+++ b/src/bld/java/rife/BldBuild.java
@@ -40,8 +40,7 @@ public class BldBuild extends AbstractRife2Build {
         var core_src_main_dir = new File(core_src_dir, "main");
 
         antlr4Operation
-            .sourceDirectories(List.of(new File(core_src_main_dir, "antlr")))
-            .outputDirectory(new File(buildDirectory(), "generated/rife/template/antlr"));
+            .sourceDirectories(List.of(new File(core_src_main_dir, "antlr")));
 
         var core_src_test_dir = new File(core_src_dir, "test");
         var core_src_test_java_dir = new File(core_src_test_dir, "java");
@@ -110,6 +109,14 @@ public class BldBuild extends AbstractRife2Build {
                 new PublishArtifact(zipBldOperation.destinationFile(), "", "zip"));
     }
 
+    @Override
+    public void javadoc()
+    throws Exception {
+        javadocOperation().executeOnce(() -> javadocOperation()
+            .fromProject(this)
+            .sourceFiles(FileUtils.getJavaFileList(buildGeneratedDir)));
+    }
+
     final ZipOperation zipBldOperation = new ZipOperation();
     @BuildCommand(value = "zip-bld", summary = "Creates the bld zip archive")
     public void zipBld()
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 0000000..61e430e
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,54 @@
+/**
+ * bld is a new build system that allows you to write your build logic in pure Java.
+ * <p>
+ * More information can be found on the <a href="https://rife2.com/bld">`bld` website</a>.
+ *
+ * @since 2.1.0
+ */
+module rife.bld {
+    requires java.compiler;
+    requires java.desktop;
+    requires java.logging;
+    requires java.net.http;
+    requires java.prefs;
+    requires static java.sql;
+    requires java.xml;
+
+    exports rife.bld;
+    exports rife.bld.blueprints;
+    exports rife.bld.dependencies;
+    exports rife.bld.dependencies.exceptions;
+    exports rife.bld.help;
+    exports rife.bld.operations;
+    exports rife.bld.operations.exceptions;
+    exports rife.bld.publish;
+
+    exports rife;
+    exports rife.cmf;
+    exports rife.cmf.transform;
+    exports rife.config;
+    exports rife.config.exceptions;
+    exports rife.database;
+    exports rife.database.exceptions;
+    exports rife.database.queries;
+    exports rife.database.querymanagers.generic;
+    exports rife.database.querymanagers.generic.exceptions;
+    exports rife.database.types;
+    exports rife.datastructures;
+    exports rife.engine;
+    exports rife.forms;
+    exports rife.ioc;
+    exports rife.ioc.exceptions;
+    exports rife.resources;
+    exports rife.resources.exceptions;
+    exports rife.selector;
+    exports rife.template;
+    exports rife.template.exceptions;
+    exports rife.tools;
+    exports rife.tools.exceptions;
+    exports rife.validation;
+    exports rife.validation.annotations;
+    exports rife.validation.exceptions;
+    exports rife.xml;
+    exports rife.xml.exceptions;
+}
\ No newline at end of file
diff --git a/src/main/resources/BLD_VERSION b/src/main/resources/BLD_VERSION
index 10bf840..19d5f5f 100644
--- a/src/main/resources/BLD_VERSION
+++ b/src/main/resources/BLD_VERSION
@@ -1 +1 @@
-2.0.1
\ No newline at end of file
+2.1.0-SNAPSHOT
\ No newline at end of file