diff --git a/.idea/modules.xml b/.idea/modules.xml
index 55adcb9..a15b3ca 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/app.iml" filepath="$PROJECT_DIR$/.idea/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/bld.iml" filepath="$PROJECT_DIR$/.idea/bld.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/rife.bld.iml" filepath="$PROJECT_DIR$/.idea/rife.bld.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/app.iml b/.idea/rife.bld.iml
similarity index 100%
rename from .idea/app.iml
rename to .idea/rife.bld.iml
diff --git a/.idea/runConfigurations/Run Tests.xml b/.idea/runConfigurations/Run Tests.xml
index f60aaeb..5b6b584 100644
--- a/.idea/runConfigurations/Run Tests.xml	
+++ b/.idea/runConfigurations/Run Tests.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Tests" type="JUnit" factoryName="JUnit">
-    <module name="app" />
+    <module name="rife.bld" />
     <option name="PACKAGE_NAME" value="rife" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 0000000..e466489
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,55 @@
+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.capabilities;
+    exports rife.database.exceptions;
+    exports rife.database.queries;
+    exports rife.database.querymanagers.generic;
+    exports rife.database.querymanagers.generic.databasedrivers;
+    exports rife.database.querymanagers.generic.exceptions;
+    exports rife.database.querymanagers.generic.instrument;
+    exports rife.database.types;
+    exports rife.database.types.databasedrivers;
+    exports rife.datastructures;
+    exports rife.engine;
+    exports rife.forms;
+    exports rife.instrument;
+    exports rife.instrument.exceptions;
+    exports rife.ioc;
+    exports rife.ioc.exceptions;
+    exports rife.resources;
+    exports rife.resources.databasedrivers;
+    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.validation.instrument;
+    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