From 0797e39dd65249ad0b5461e8009de38c9519c772 Mon Sep 17 00:00:00 2001
From: Geert Bevin <gbevin@uwyn.com>
Date: Thu, 22 Aug 2024 19:04:56 -0400
Subject: [PATCH] Added native support for Java modules

---
 .idea/app.iml                                 |   1 -
 .idea/libraries/bld.xml                       |   4 +-
 .idea/libraries/runtime.xml                   |   1 +
 .idea/libraries/test.xml                      |   4 +-
 .../{Run Tests.xml => Run_all_tests.xml}      |   3 +-
 .idea/runConfigurations/Run_bld_tests.xml     |  20 +
 .idea/scala_compiler.xml                      |   6 +
 core                                          |   2 +-
 lib/bld/bld-wrapper.jar                       | Bin 29577 -> 29585 bytes
 lib/bld/bld-wrapper.properties                |   2 +-
 src/main/java/rife/bld/BaseProject.java       | 376 ++++++++-
 src/main/java/rife/bld/WebProject.java        |   5 +
 .../rife/bld/dependencies/Dependency.java     | 194 ++++-
 .../bld/dependencies/DependencyResolver.java  |   4 +-
 .../rife/bld/dependencies/DependencySet.java  |  77 +-
 .../rife/bld/dependencies/LocalModule.java    |  17 +
 .../java/rife/bld/dependencies/Module.java    |  67 ++
 .../rife/bld/dependencies/Xml2MavenPom.java   |   4 +-
 .../DependencyTransferException.java          |  16 +
 .../operations/AbstractProcessOperation.java  |  39 +
 .../rife/bld/operations/CompileOperation.java |  95 ++-
 .../bld/operations/DownloadOperation.java     | 143 +++-
 .../rife/bld/operations/JavadocOperation.java |  56 +-
 .../rife/bld/operations/PublishOperation.java |  11 +-
 .../rife/bld/operations/PurgeOperation.java   | 175 ++++-
 .../rife/bld/operations/RunOperation.java     |   5 +
 .../rife/bld/operations/TestOperation.java    |  13 +-
 .../java/rife/bld/publish/PomBuilder.java     |   4 +-
 .../rife/bld/publish/PublishArtifact.java     |   4 +-
 .../bld/wrapper/WrapperExtensionResolver.java |   2 +-
 src/test/java/rife/bld/TestProject.java       |  17 +-
 src/test/java/rife/bld/TestWebProject.java    | 168 +++++
 .../rife/bld/dependencies/TestDependency.java | 165 +++-
 .../dependencies/TestDependencyResolver.java  | 707 ++++++++++++++---
 .../rife/bld/dependencies/TestModule.java     | 111 +++
 .../bld/operations/TestCleanOperation.java    |  10 +
 .../operations/TestCreateAppOperation.java    |  20 +
 .../operations/TestCreateBaseOperation.java   |  16 +
 .../operations/TestCreateLibOperation.java    |   8 +
 .../operations/TestCreateRife2Operation.java  |  27 +-
 .../TestDependencyTreeOperation.java          |  53 +-
 .../bld/operations/TestDownloadOperation.java | 276 +++++--
 .../bld/operations/TestPurgeOperation.java    | 712 ++++++++++++++----
 43 files changed, 3196 insertions(+), 444 deletions(-)
 rename .idea/runConfigurations/{Run Tests.xml => Run_all_tests.xml} (78%)
 create mode 100644 .idea/runConfigurations/Run_bld_tests.xml
 create mode 100644 .idea/scala_compiler.xml
 create mode 100644 src/main/java/rife/bld/dependencies/LocalModule.java
 create mode 100644 src/main/java/rife/bld/dependencies/Module.java
 create mode 100644 src/test/java/rife/bld/dependencies/TestModule.java

diff --git a/.idea/app.iml b/.idea/app.iml
index 707518b..0809558 100644
--- a/.idea/app.iml
+++ b/.idea/app.iml
@@ -27,6 +27,5 @@
     <orderEntry type="library" name="compile" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="runtime" level="project" />
     <orderEntry type="library" scope="TEST" name="test" level="project" />
-    <orderEntry type="module" module-name="bld" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml
index 867d049..0a7a3e9 100644
--- a/.idea/libraries/bld.xml
+++ b/.idea/libraries/bld.xml
@@ -2,12 +2,12 @@
   <library name="bld">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.bld/dist/bld-2.0.1.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.0.0-SNAPSHOT.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.bld/dist/bld-2.0.1-sources.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-2.0.0-SNAPSHOT-sources.jar!/" />
     </SOURCES>
     <excluded>
       <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />
diff --git a/.idea/libraries/runtime.xml b/.idea/libraries/runtime.xml
index 2ae5c4b..0ac86f6 100644
--- a/.idea/libraries/runtime.xml
+++ b/.idea/libraries/runtime.xml
@@ -3,6 +3,7 @@
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/runtime" />
       <root url="file://$PROJECT_DIR$/src/main/resources" />
+      <root url="file://$PROJECT_DIR$/core/src/main/resources" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/test.xml b/.idea/libraries/test.xml
index ce3c795..8e2361c 100644
--- a/.idea/libraries/test.xml
+++ b/.idea/libraries/test.xml
@@ -11,9 +11,9 @@
       <root url="file://$PROJECT_DIR$/lib/test" />
       <root url="file://$PROJECT_DIR$/lib/provided" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
     <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
     <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Run Tests.xml b/.idea/runConfigurations/Run_all_tests.xml
similarity index 78%
rename from .idea/runConfigurations/Run Tests.xml
rename to .idea/runConfigurations/Run_all_tests.xml
index f60aaeb..2388b07 100644
--- a/.idea/runConfigurations/Run Tests.xml	
+++ b/.idea/runConfigurations/Run_all_tests.xml
@@ -1,6 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run Tests" type="JUnit" factoryName="JUnit">
+  <configuration default="false" name="Run all tests" type="JUnit" factoryName="JUnit">
     <module name="app" />
+    <useClassPathOnly />
     <option name="PACKAGE_NAME" value="rife" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
diff --git a/.idea/runConfigurations/Run_bld_tests.xml b/.idea/runConfigurations/Run_bld_tests.xml
new file mode 100644
index 0000000..94ce292
--- /dev/null
+++ b/.idea/runConfigurations/Run_bld_tests.xml
@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run bld tests" type="JUnit" factoryName="JUnit">
+    <module name="app" />
+    <useClassPathOnly />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="rife.bld.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <option name="PACKAGE_NAME" value="rife.bld" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <dir value="$PROJECT_DIR$/src/test/java" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/scala_compiler.xml b/.idea/scala_compiler.xml
new file mode 100644
index 0000000..3c0e0f6
--- /dev/null
+++ b/.idea/scala_compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ScalaCompilerConfiguration">
+    <option name="separateProdTestSources" value="false" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/core b/core
index d965055..b94124f 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit d965055ac90308ced33c6c0b95a3db38c6e43a69
+Subproject commit b94124fe6d0fd40974f3e882f2ac1335f095ce80
diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar
index 28104f0e86c2ccbd377f4939b3a4cdc027cf737a..3fa65577c475d16afa102f00b2f02fb0d7546d98 100644
GIT binary patch
delta 14875
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

delta 14776
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
N>|6+;z8wDp{(se8zhwXb

diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties
index 5370ffd..0116e67 100644
--- a/lib/bld/bld-wrapper.properties
+++ b/lib/bld/bld-wrapper.properties
@@ -8,4 +8,4 @@ bld.javaOptions=
 bld.javacOptions=
 bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES
 bld.sourceDirectories=core/src/bld/java
-bld.version=2.0.1
\ No newline at end of file
+bld.version=2.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/src/main/java/rife/bld/BaseProject.java b/src/main/java/rife/bld/BaseProject.java
index 74d0bd8..3fd1f10 100644
--- a/src/main/java/rife/bld/BaseProject.java
+++ b/src/main/java/rife/bld/BaseProject.java
@@ -5,6 +5,7 @@
 package rife.bld;
 
 import rife.bld.dependencies.*;
+import rife.bld.dependencies.Module;
 import rife.bld.help.*;
 import rife.bld.operations.*;
 import rife.tools.FileUtils;
@@ -245,6 +246,13 @@ public class BaseProject extends BuildExecutor {
      * @since 1.5
      */
     protected File libCompileDirectory = null;
+    /**
+     * The modules compile scope lib directory.
+     *
+     * @see #libCompileModulesDirectory()
+     * @since 2.1
+     */
+    protected File libCompileModulesDirectory = null;
     /**
      * The provided scope lib directory.
      *
@@ -252,6 +260,13 @@ public class BaseProject extends BuildExecutor {
      * @since 1.8
      */
     protected File libProvidedDirectory = null;
+    /**
+     * The modules provided scope lib directory.
+     *
+     * @see #libProvidedModulesDirectory()
+     * @since 2.1
+     */
+    protected File libProvidedModulesDirectory = null;
     /**
      * The runtime scope lib directory.
      *
@@ -259,6 +274,13 @@ public class BaseProject extends BuildExecutor {
      * @since 1.5
      */
     protected File libRuntimeDirectory = null;
+    /**
+     * The modules runtime scope lib directory.
+     *
+     * @see #libRuntimeModulesDirectory()
+     * @since 2.1
+     */
+    protected File libRuntimeModulesDirectory = null;
     /**
      * The standalone scope lib directory.
      *
@@ -267,12 +289,26 @@ public class BaseProject extends BuildExecutor {
      */
     protected File libStandaloneDirectory = null;
     /**
-     * The standalone scope lib directory.
+     * The modules standalone scope lib directory.
+     *
+     * @see #libStandaloneModulesDirectory()
+     * @since 2.1
+     */
+    protected File libStandaloneModulesDirectory = null;
+    /**
+     * The test scope lib directory.
      *
      * @see #libTestDirectory()
      * @since 1.5
      */
     protected File libTestDirectory = null;
+    /**
+     * The modules test scope lib directory.
+     *
+     * @see #libTestModulesDirectory()
+     * @since 2.1
+     */
+    protected File libTestModulesDirectory = null;
     /**
      * The build directory.
      *
@@ -860,6 +896,101 @@ public class BaseProject extends BuildExecutor {
         return new LocalDependency(path);
     }
 
+    /**
+     * Creates a new module instance.
+     *
+     * @param groupId    the module group identifier
+     * @param artifactId the module artifact identifier
+     * @return a newly created {@code Module} instance
+     * @since 2.1
+     */
+    public Module module(String groupId, String artifactId) {
+        return new Module(groupId, artifactId);
+    }
+
+    /**
+     * Creates a new module instance.
+     *
+     * @param groupId    the module group identifier
+     * @param artifactId the module artifact identifier
+     * @param version    the module version
+     * @return a newly created {@code Module} instance
+     * @since 2.1
+     */
+    public Module module(String groupId, String artifactId, String version) {
+        return new Module(groupId, artifactId, version(version));
+    }
+
+    /**
+     * Creates a new module instance.
+     *
+     * @param groupId    the module group identifier
+     * @param artifactId the module artifact identifier
+     * @param version    the module version
+     * @param classifier the module classifier
+     * @return a newly created {@code Module} instance
+     * @since 2.1
+     */
+    public Module module(String groupId, String artifactId, String version, String classifier) {
+        return new Module(groupId, artifactId, version(version), classifier);
+    }
+
+    /**
+     * Creates a new module instance.
+     *
+     * @param groupId    the module group identifier
+     * @param artifactId the module artifact identifier
+     * @param version    the module version
+     * @return a newly created {@code Module} instance
+     * @since 2.1
+     */
+    public Module module(String groupId, String artifactId, Version version) {
+        return new Module(groupId, artifactId, version);
+    }
+
+    /**
+     * Creates a new module instance.
+     *
+     * @param groupId    the module group identifier
+     * @param artifactId the module artifact identifier
+     * @param version    the module version
+     * @param classifier the module classifier
+     * @return a newly created {@code Module} instance
+     * @since 2.1
+     */
+    public Module module(String groupId, String artifactId, Version version, String classifier) {
+        return new Module(groupId, artifactId, version, classifier);
+    }
+
+    /**
+     * Creates a new module instance from a string representation.
+     * The format is {@code groupId:artifactId:version:classifier}.
+     * The {@code version} and {@code classifier} are optional.
+     * <p>
+     * If the string can't be successfully parsed, {@code null} will be returned.
+     *
+     * @param description the module string to parse
+     * @return a parsed instance of {@code Module}; or
+     * {@code null} when the string couldn't be parsed
+     * @since 2.1
+     */
+    public Module module(String description) {
+        return Module.parse(description);
+    }
+
+    /**
+     * Creates a local module instance.
+     * <p>
+     * If the local module points to a directory, it will be scanned for jar files.
+     *
+     * @param path the file system path of the local module
+     * @since 2.1
+     */
+
+    public LocalModule localModule(String path) {
+        return new LocalModule(path);
+    }
+
     /*
      * Project directories
      */
@@ -1012,6 +1143,16 @@ public class BaseProject extends BuildExecutor {
         return Objects.requireNonNullElseGet(libCompileDirectory, () -> new File(libDirectory(), "compile"));
     }
 
+    /**
+     * Returns the project modules compile scope lib directory.
+     * Defaults to {@code "modules"} relative to {@link #libCompileDirectory()}.
+     *
+     * @since 2.1
+     */
+    public File libCompileModulesDirectory() {
+        return Objects.requireNonNullElseGet(libCompileModulesDirectory, () -> new File(libCompileDirectory(), "modules"));
+    }
+
     /**
      * Returns the project provided scope lib directory.
      * Defaults to {@code "provided"} relative to {@link #libDirectory()}.
@@ -1022,6 +1163,16 @@ public class BaseProject extends BuildExecutor {
         return Objects.requireNonNullElseGet(libProvidedDirectory, () -> new File(libDirectory(), "provided"));
     }
 
+    /**
+     * Returns the project modules provided scope lib directory.
+     * Defaults to {@code "modules"} relative to {@link #libProvidedDirectory()}.
+     *
+     * @since 2.1
+     */
+    public File libProvidedModulesDirectory() {
+        return Objects.requireNonNullElseGet(libProvidedModulesDirectory, () -> new File(libProvidedDirectory(), "modules"));
+    }
+
     /**
      * Returns the project runtime scope lib directory.
      * Defaults to {@code "runtime"} relative to {@link #libDirectory()}.
@@ -1032,6 +1183,16 @@ public class BaseProject extends BuildExecutor {
         return Objects.requireNonNullElseGet(libRuntimeDirectory, () -> new File(libDirectory(), "runtime"));
     }
 
+    /**
+     * Returns the project modules runtime scope lib directory.
+     * Defaults to {@code "modules"} relative to {@link #libRuntimeDirectory()}.
+     *
+     * @since 1.5
+     */
+    public File libRuntimeModulesDirectory() {
+        return Objects.requireNonNullElseGet(libRuntimeModulesDirectory, () -> new File(libRuntimeDirectory(), "modules"));
+    }
+
     /**
      * Returns the project standalone scope lib directory.
      * Defaults to {@code null}.
@@ -1039,7 +1200,17 @@ public class BaseProject extends BuildExecutor {
      * @since 1.5
      */
     public File libStandaloneDirectory() {
-        return null;
+        return libStandaloneDirectory;
+    }
+
+    /**
+     * Returns the project standalone scope lib directory.
+     * Defaults to {@code null}.
+     *
+     * @since 2.1
+     */
+    public File libStandaloneModulesDirectory() {
+        return libStandaloneModulesDirectory;
     }
 
     /**
@@ -1052,6 +1223,16 @@ public class BaseProject extends BuildExecutor {
         return Objects.requireNonNullElseGet(libTestDirectory, () -> new File(libDirectory(), "test"));
     }
 
+    /**
+     * Returns the project modules test scope lib directory.
+     * Defaults to {@code "modules"} relative to {@link #libTestDirectory()}.
+     *
+     * @since 2.1
+     */
+    public File libTestModulesDirectory() {
+        return Objects.requireNonNullElseGet(libTestModulesDirectory, () -> new File(libTestDirectory(), "modules"));
+    }
+
     /**
      * Returns the project build directory.
      * Defaults to {@code "build"} relative to {@link #workDirectory()}.
@@ -1142,12 +1323,19 @@ public class BaseProject extends BuildExecutor {
         libDirectory().mkdirs();
         libBldDirectory().mkdirs();
         libCompileDirectory().mkdirs();
+        libCompileModulesDirectory().mkdirs();
         libProvidedDirectory().mkdirs();
+        libProvidedModulesDirectory().mkdirs();
         libRuntimeDirectory().mkdirs();
+        libRuntimeModulesDirectory().mkdirs();
         if (libStandaloneDirectory() != null) {
             libStandaloneDirectory().mkdirs();
         }
+        if (libStandaloneModulesDirectory() != null) {
+            libStandaloneModulesDirectory().mkdirs();
+        }
         libTestDirectory().mkdirs();
+        libTestModulesDirectory().mkdirs();
     }
 
     /**
@@ -1415,6 +1603,25 @@ public class BaseProject extends BuildExecutor {
         return classpath;
     }
 
+    /**
+     * Returns all the jar files that are in the compile scope module path.
+     * <p>
+     * By default, this collects all the jar files in the {@link #libCompileModulesDirectory()}
+     * and adds all the jar files from the compile scope local modules.
+     *
+     * @since 2.1
+     */
+    public List<File> compileModulePathJars() {
+        // detect the jar files in the modules compile lib directory
+        var dir_abs = libCompileModulesDirectory().getAbsoluteFile();
+        var jar_files = FileUtils.getFileList(dir_abs, INCLUDED_JARS, EXCLUDED_JARS);
+
+        // build the compilation module path
+        var module_path = new ArrayList<>(jar_files.stream().map(file -> new File(dir_abs, file)).toList());
+        addLocalModules(module_path, Scope.compile);
+        return module_path;
+    }
+
     /**
      * Returns all the jar files that are in the provided scope classpath.
      * <p>
@@ -1434,6 +1641,25 @@ public class BaseProject extends BuildExecutor {
         return classpath;
     }
 
+    /**
+     * Returns all the jar files that are in the provided scope module path.
+     * <p>
+     * By default, this collects all the jar files in the {@link #libProvidedModulesDirectory()}
+     * and adds all the jar files from the provided scope local modules.
+     *
+     * @since 2.1
+     */
+    public List<File> providedModulePathJars() {
+        // detect the jar files in the modules provided lib directory
+        var dir_abs = libProvidedModulesDirectory().getAbsoluteFile();
+        var jar_files = FileUtils.getFileList(dir_abs, INCLUDED_JARS, EXCLUDED_JARS);
+
+        // build the provided module path
+        var module_path = new ArrayList<>(jar_files.stream().map(file -> new File(dir_abs, file)).toList());
+        addLocalModules(module_path, Scope.provided);
+        return module_path;
+    }
+
     /**
      * Returns all the jar files that are in the runtime scope classpath.
      * <p>
@@ -1453,6 +1679,25 @@ public class BaseProject extends BuildExecutor {
         return classpath;
     }
 
+    /**
+     * Returns all the jar files that are in the runtime scope module path.
+     * <p>
+     * By default, this collects all the jar files in the {@link #libRuntimeModulesDirectory()}
+     * and adds all the jar files from the runtime scope local modules.
+     *
+     * @since 2.1
+     */
+    public List<File> runtimeModulePathJars() {
+        // detect the jar files in the modules runtime lib directory
+        var dir_abs = libRuntimeModulesDirectory().getAbsoluteFile();
+        var jar_files = FileUtils.getFileList(dir_abs, INCLUDED_JARS, EXCLUDED_JARS);
+
+        // build the runtime module path
+        var module_path = new ArrayList<>(jar_files.stream().map(file -> new File(dir_abs, file)).toList());
+        addLocalModules(module_path, Scope.runtime);
+        return module_path;
+    }
+
     /**
      * Returns all the jar files that are in the standalone scope classpath.
      * <p>
@@ -1477,6 +1722,30 @@ public class BaseProject extends BuildExecutor {
         return classpath;
     }
 
+    /**
+     * Returns all the jar files that are in the standalone scope module path.
+     * <p>
+     * By default, this collects all the jar files in the {@link #libStandaloneModulesDirectory()}
+     * and adds all the jar files from the standalone scope local modules.
+     *
+     * @since 2.1
+     */
+    public List<File> standaloneModulePathJars() {
+        // build the standalone classpath
+        List<File> module_path;
+        if (libStandaloneModulesDirectory() == null) {
+            module_path = new ArrayList<>();
+        } else {
+            // detect the jar files in the modules standalone lib directory
+            var dir_abs = libStandaloneModulesDirectory().getAbsoluteFile();
+            var jar_files = FileUtils.getFileList(dir_abs, INCLUDED_JARS, EXCLUDED_JARS);
+
+            module_path = new ArrayList<>(jar_files.stream().map(file -> new File(dir_abs, file)).toList());
+        }
+        addLocalModules(module_path, Scope.standalone);
+        return module_path;
+    }
+
     /**
      * Returns all the jar files that are in the test scope classpath.
      * <p>
@@ -1496,20 +1765,51 @@ public class BaseProject extends BuildExecutor {
         return classpath;
     }
 
+    /**
+     * Returns all the jar files that are in the test scope module path.
+     * <p>
+     * By default, this collects all the jar files in the {@link #libTestModulesDirectory()}
+     * and adds all the jar files from the test scope local modules.
+     *
+     * @since 2.1
+     */
+    public List<File> testModulePathJars() {
+        // detect the jar files in the test lib directory
+        var dir_abs = libTestModulesDirectory().getAbsoluteFile();
+        var jar_files = FileUtils.getFileList(dir_abs, INCLUDED_JARS, EXCLUDED_JARS);
+
+        // build the test module path
+        var module_path = new ArrayList<>(jar_files.stream().map(file -> new File(dir_abs, file)).toList());
+        addLocalModules(module_path, Scope.test);
+        return module_path;
+    }
+
     private void addLocalDependencies(List<File> classpath, Scope scope) {
         if (dependencies.get(scope) == null) {
             return;
         }
-
         for (var dependency : dependencies.get(scope).localDependencies()) {
-            var local_file = new File(workDirectory(), dependency.path());
-            if (local_file.exists()) {
-                if (local_file.isDirectory()) {
-                    var local_jar_files = FileUtils.getFileList(local_file.getAbsoluteFile(), INCLUDED_JARS, EXCLUDED_JARS);
-                    classpath.addAll(new ArrayList<>(local_jar_files.stream().map(file -> new File(local_file, file)).toList()));
-                } else {
-                    classpath.add(local_file);
-                }
+            addLocalJars(classpath, dependency.path());
+        }
+    }
+
+    private void addLocalModules(List<File> classpath, Scope scope) {
+        if (dependencies.get(scope) == null) {
+            return;
+        }
+        for (var module : dependencies.get(scope).localModules()) {
+            addLocalJars(classpath, module.path());
+        }
+    }
+
+    private void addLocalJars(List<File> jars, String path) {
+        var local_file = new File(workDirectory(), path);
+        if (local_file.exists()) {
+            if (local_file.isDirectory()) {
+                var local_jar_files = FileUtils.getFileList(local_file.getAbsoluteFile(), INCLUDED_JARS, EXCLUDED_JARS);
+                jars.addAll(new ArrayList<>(local_jar_files.stream().map(file -> new File(local_file, file)).toList()));
+            } else {
+                jars.add(local_file);
             }
         }
     }
@@ -1517,7 +1817,7 @@ public class BaseProject extends BuildExecutor {
     /**
      * Returns all the classpath entries for compiling the main sources.
      * <p>
-     * By default, this converts the files from {@link #compileClasspathJars()} to absolute paths.
+     * By default, this converts the files from {@link #compileClasspathJars()} and {@link #providedClasspathJars()} to absolute paths.
      *
      * @since 1.5
      */
@@ -1525,10 +1825,21 @@ public class BaseProject extends BuildExecutor {
         return FileUtils.combineToAbsolutePaths(compileClasspathJars(), providedClasspathJars());
     }
 
+    /**
+     * Returns all the module path entries for compiling the main sources.
+     * <p>
+     * By default, this converts the files from {@link #compileModulePathJars()} and {@link #providedModulePathJars()} to absolute paths.
+     *
+     * @since 2.1
+     */
+    public List<String> compileMainModulePath() {
+        return FileUtils.combineToAbsolutePaths(compileModulePathJars(), providedModulePathJars());
+    }
+
     /**
      * Returns all the classpath entries for compiling the test sources.
      * <p>
-     * By default, this converts the files from {@link #compileClasspathJars()} and
+     * By default, this converts the files from {@link #compileClasspathJars()}, {@link #providedClasspathJars()} and
      * {@link #testClasspathJars()} to absolute paths, as well as the {@link #buildMainDirectory()}
      *
      * @since 1.5
@@ -1540,6 +1851,18 @@ public class BaseProject extends BuildExecutor {
         return paths;
     }
 
+    /**
+     * Returns all the module path entries for compiling the test sources.
+     * <p>
+     * By default, this converts the files from {@link #compileModulePathJars()}, {@link #providedModulePathJars()} and
+     * {@link #testModulePathJars()} to absolute paths.
+     *
+     * @since 2.1
+     */
+    public List<String> compileTestModulePath() {
+       return FileUtils.combineToAbsolutePaths(compileModulePathJars(), providedModulePathJars(), testModulePathJars());
+    }
+
     /**
      * Returns all the classpath entries for running the application.
      * <p>
@@ -1557,10 +1880,22 @@ public class BaseProject extends BuildExecutor {
         return paths;
     }
 
+    /**
+     * Returns all the module path entries for running the application.
+     * <p>
+     * By default, this converts the files from {@link #compileModulePathJars()},
+     * {@link #runtimeModulePathJars()} and {@link #standaloneModulePathJars()} to absolute paths.
+     *
+     * @since 2.1
+     */
+    public List<String> runModulePath() {
+       return FileUtils.combineToAbsolutePaths(compileModulePathJars(), runtimeModulePathJars(), standaloneModulePathJars());
+    }
+
     /**
      * Returns all the classpath entries for testing the application.
      * <p>
-     * By default, this converts the files from {@link #compileClasspathJars()},
+     * By default, this converts the files from {@link #compileClasspathJars()}, {@link #providedClasspathJars()},
      * {@link #runtimeClasspathJars()}  and {@link #testClasspathJars()}
      * to absolute paths, as well as the {@link #srcMainResourcesDirectory()},
      * {@link #buildMainDirectory()} and {@link #buildTestDirectory()}
@@ -1577,6 +1912,19 @@ public class BaseProject extends BuildExecutor {
         return paths;
     }
 
+    /**
+     * Returns all the module path entries for testing the application.
+     * <p>
+     * By default, this converts the files from {@link #compileModulePathJars()}, {@link #providedModulePathJars()},
+     * {@link #runtimeModulePathJars()}  and {@link #testModulePathJars()}
+     * to absolute paths.
+     *
+     * @since 2.1
+     */
+    public List<String> testModulePath() {
+        return FileUtils.combineToAbsolutePaths(compileModulePathJars(), providedModulePathJars(), runtimeModulePathJars(), standaloneModulePathJars(), testModulePathJars());
+    }
+
     /**
      * Executes download and purge commands automatically when the
      * {@code autoDownloadPurge} flag is set and changes have been detected.
diff --git a/src/main/java/rife/bld/WebProject.java b/src/main/java/rife/bld/WebProject.java
index 1314525..2ac96a2 100644
--- a/src/main/java/rife/bld/WebProject.java
+++ b/src/main/java/rife/bld/WebProject.java
@@ -108,6 +108,11 @@ public class WebProject extends Project {
         return Objects.requireNonNullElseGet(libStandaloneDirectory, () -> new File(libDirectory(), "standalone"));
     }
 
+    @Override
+    public File libStandaloneModulesDirectory() {
+        return Objects.requireNonNullElseGet(libStandaloneModulesDirectory, () -> new File(libStandaloneDirectory(), "modules"));
+    }
+
     /**
      * Returns the project main webapp directory.
      * Defaults to {@code "webapp"} relative to {@link #srcMainDirectory()}.
diff --git a/src/main/java/rife/bld/dependencies/Dependency.java b/src/main/java/rife/bld/dependencies/Dependency.java
index 9dd28c3..e926f6e 100644
--- a/src/main/java/rife/bld/dependencies/Dependency.java
+++ b/src/main/java/rife/bld/dependencies/Dependency.java
@@ -8,22 +8,45 @@ import java.util.Objects;
 import java.util.regex.Pattern;
 
 /**
- * Contains the information required to describe an url dependency in the build system.
+ * Contains the information required to describe a dependency in the build system.
  *
- * @param groupId    the dependency group identifier
- * @param artifactId the dependency url identifier
- * @param version    the dependency version
- * @param classifier the dependency classier
- * @param type       the dependency type
- * @param exclusions the dependency exclusions for transitive resolution
- * @param parent     the parent dependency that created this dependency (only for information purposes)
  * @author Geert Bevin (gbevin[remove] at uwyn dot com)
  * @since 1.5
  */
-public record Dependency(String groupId, String artifactId, Version version, String classifier, String type, ExclusionSet exclusions, Dependency parent) {
+public class Dependency {
     public static final String CLASSIFIER_SOURCES = "sources";
     public static final String CLASSIFIER_JAVADOC = "javadoc";
 
+    /**
+     * The dependency type name for a JAR file that can be placed either on the class-path or on the module-path.
+     *
+     * @since 2.1
+     */
+    public static final String TYPE_JAR = "jar";
+
+    /**
+     * The dependency type name for a JAR file to unconditionally place on the class-path.
+     *
+     * @since 2.1
+     */
+    public static final String TYPE_CLASSPATH_JAR = "classpath-jar";
+
+    /**
+     * The dependency type name for a JAR file to unconditionally place on the module-path.
+     *
+     * @since 2.1
+     */
+    // see https://github.com/apache/maven/blob/maven-4.0.0-beta-3/api/maven-api-core/src/main/java/org/apache/maven/api/Type.java
+    public static final String TYPE_MODULAR_JAR = "modular-jar";
+
+    private final String groupId_;
+    private final String artifactId_;
+    private final Version version_;
+    private final String classifier_;
+    private final String type_;
+    private final ExclusionSet exclusions_;
+    private final Dependency parent_;
+
     public Dependency(String groupId, String artifactId) {
         this(groupId, artifactId, null, null, null);
     }
@@ -45,13 +68,20 @@ public record Dependency(String groupId, String artifactId, Version version, Str
     }
 
     public Dependency(String groupId, String artifactId, Version version, String classifier, String type, ExclusionSet exclusions, Dependency parent) {
-        this.groupId = groupId;
-        this.artifactId = artifactId;
-        this.version = (version == null ? VersionNumber.UNKNOWN : version);
-        this.classifier = (classifier == null ? "" : classifier);
-        this.type = (type == null ? "jar" : type);
-        this.exclusions = (exclusions == null ? new ExclusionSet() : exclusions);
-        this.parent = parent;
+        if (type == null) {
+            type = TYPE_JAR;
+        }
+        if (parent != null && parent.isModularJar() && TYPE_JAR.equals(type)) {
+            type = TYPE_MODULAR_JAR;
+        }
+
+        this.groupId_ = groupId;
+        this.artifactId_ = artifactId;
+        this.version_ = (version == null ? VersionNumber.UNKNOWN : version);
+        this.classifier_ = (classifier == null ? "" : classifier);
+        this.type_ = type;
+        this.exclusions_ = (exclusions == null ? new ExclusionSet() : exclusions);
+        this.parent_ = parent;
     }
 
     private static final Pattern DEPENDENCY_PATTERN = Pattern.compile("^(?<groupId>[^:@]+):(?<artifactId>[^:@]+)(?::(?<version>[^:@]+)(?::(?<classifier>[^:@]+))?)?(?:@(?<type>[^:@]+))?$");
@@ -95,7 +125,7 @@ public record Dependency(String groupId, String artifactId, Version version, Str
      * @since 1.5
      */
     public Dependency baseDependency() {
-        return new Dependency(groupId, artifactId, VersionNumber.UNKNOWN, classifier, type);
+        return new Dependency(groupId_, artifactId_, VersionNumber.UNKNOWN, classifier_, type_);
     }
 
     /**
@@ -107,7 +137,7 @@ public record Dependency(String groupId, String artifactId, Version version, Str
      * @since 1.5
      */
     public Dependency exclude(String groupId, String artifactId) {
-        exclusions.add(new DependencyExclusion(groupId, artifactId));
+        exclusions_.add(new DependencyExclusion(groupId, artifactId));
         return this;
     }
 
@@ -119,7 +149,7 @@ public record Dependency(String groupId, String artifactId, Version version, Str
      * @since 1.5.6
      */
     public Dependency withClassifier(String classifier) {
-        return new Dependency(groupId, artifactId, version, classifier, type);
+        return new Dependency(groupId_, artifactId_, version_, classifier, type_);
     }
 
     /**
@@ -146,34 +176,130 @@ public record Dependency(String groupId, String artifactId, Version version, Str
      * @since 2.0
      */
     public String toArtifactString() {
-        return groupId + ':' + artifactId;
+        return groupId_ + ':' + artifactId_;
     }
 
     public String toString() {
-        var result = new StringBuilder(groupId).append(':').append(artifactId);
-        if (!version.equals(VersionNumber.UNKNOWN)) {
-            result.append(':').append(version);
+        var result = new StringBuilder(groupId_).append(':').append(artifactId_);
+        if (!version_.equals(VersionNumber.UNKNOWN)) {
+            result.append(':').append(version_);
         }
-        if (!classifier.isEmpty()) {
-            result.append(':').append(classifier);
+        if (!classifier_.isEmpty()) {
+            result.append(':').append(classifier_);
         }
-        if (!type.isEmpty() && !"jar".equals(type)) {
-            result.append('@').append(type);
+        if (!type_.isEmpty() && !TYPE_JAR.equals(type_)) {
+            result.append('@').append(type_);
         }
         return result.toString();
     }
 
+    /**
+     * Returns this dependency's {@code groupId}.
+     *
+     * @return the {@code groupId} of this dependency
+     * @since 1.5
+     */
+    public String groupId() {
+        return groupId_;
+    }
+
+    /**
+     * Returns this dependency's {@code artifactId}.
+     *
+     * @return the {@code artifactId} of this dependency
+     * @since 1.5
+     */
+    public String artifactId() {
+        return artifactId_;
+    }
+
+    /**
+     * Returns this dependency's {@code version}.
+     *
+     * @return the {@code version} of this dependency
+     * @since 1.5
+     */
+    public Version version() {
+        return version_;
+    }
+
+    /**
+     * Returns this dependency's {@code classifier}.
+     *
+     * @return the {@code classifier} of this dependency
+     * @since 1.5
+     */
+    public String classifier() {
+        return classifier_;
+    }
+
+    /**
+     * Returns this dependency's {@code type}.
+     *
+     * @return the {@code type} of this dependency
+     * @since 1.5
+     */
+    public String type() {
+        return type_;
+    }
+
+    /**
+     * Returns this dependency's {@code exclusions} for transitive resolution.
+     *
+     * @return the {@code exclusions} of this dependency
+     * @since 1.5
+     */
+    public ExclusionSet exclusions() {
+        return exclusions_;
+    }
+
+    /**
+     * Returns this dependency's {@code parent} dependency that created this
+     * dependency (only for information purposes).
+     *
+     * @return the {@code parent} of this dependency
+     * @since 1.5
+     */
+    public Dependency parent() {
+        return parent_;
+    }
+
+    /**
+     * Indicates whether this dependency specifically is a classpath jar or not.
+     *
+     * @return {@code true} when this dependency specifically is a classpath jar; or {@code false} otherwise
+     * @since 2.1
+     */
+    public boolean isClasspathJar() {
+        return Module.TYPE_CLASSPATH_JAR.equals(type_);
+    }
+
+    /**
+     * Indicates whether this dependency is a modular jar or not.
+     *
+     * @return {@code true} when this dependency is a modular jar; or {@code false} otherwise
+     * @since 2.1
+     */
+    public boolean isModularJar() {
+        return Module.TYPE_MODULAR_JAR.equals(type_);
+    }
+
+    private static String normalizedJarType(String type) {
+        if (TYPE_JAR.equals(type) || TYPE_MODULAR_JAR.equals(type) || TYPE_CLASSPATH_JAR.equals(type)) {
+            return TYPE_JAR;
+        }
+        return type;
+    }
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        var that = (Dependency) o;
-        return groupId.equals(that.groupId) &&
-               artifactId.equals(that.artifactId) &&
-               classifier.equals(that.classifier) &&
-               type.equals(that.type);
+        if (!(o instanceof Dependency that)) return false;
+        return groupId_.equals(that.groupId_) &&
+            artifactId_.equals(that.artifactId_) &&
+            classifier_.equals(that.classifier_) &&
+            normalizedJarType(type_).equals(normalizedJarType(that.type_));
     }
 
     public int hashCode() {
-        return Objects.hash(groupId, artifactId, classifier, type);
+        return Objects.hash(groupId_, artifactId_, classifier_, normalizedJarType(type_));
     }
 }
diff --git a/src/main/java/rife/bld/dependencies/DependencyResolver.java b/src/main/java/rife/bld/dependencies/DependencyResolver.java
index 24b7bef..b671f90 100644
--- a/src/main/java/rife/bld/dependencies/DependencyResolver.java
+++ b/src/main/java/rife/bld/dependencies/DependencyResolver.java
@@ -11,6 +11,8 @@ import java.io.*;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static rife.bld.dependencies.Dependency.*;
+
 /**
  * Resolves a dependency within a list of Maven-compatible repositories.
  *
@@ -333,7 +335,7 @@ public class DependencyResolver {
                 result.append('-').append(dependency_.classifier());
             }
             var type = dependency_.type();
-            if (type == null) {
+            if (type == null || TYPE_JAR.equals(type) || TYPE_MODULAR_JAR.equals(type) || TYPE_CLASSPATH_JAR.equals(type)) {
                 type = "jar";
             }
             result.append('.').append(type);
diff --git a/src/main/java/rife/bld/dependencies/DependencySet.java b/src/main/java/rife/bld/dependencies/DependencySet.java
index 6232ba0..9df7b4f 100644
--- a/src/main/java/rife/bld/dependencies/DependencySet.java
+++ b/src/main/java/rife/bld/dependencies/DependencySet.java
@@ -23,6 +23,7 @@ import java.util.*;
 public class DependencySet extends AbstractSet<Dependency> implements Set<Dependency> {
     private final Map<Dependency, Dependency> dependencies_ = new LinkedHashMap<>();
     private final Set<LocalDependency> localDependencies_ = new LinkedHashSet<>();
+    private final Set<LocalModule> localModules_ = new LinkedHashSet<>();
 
     /**
      * Creates an empty dependency set.
@@ -79,42 +80,86 @@ public class DependencySet extends AbstractSet<Dependency> implements Set<Depend
         return localDependencies_;
     }
 
+    /**
+     * Includes a local module into the dependency set.
+     * <p>
+     * Local modules aren't resolved and point to a location on
+     * the file system.
+     *
+     * @param module the module to include
+     * @return this dependency set instance
+     * @since 2.1
+     */
+    public DependencySet include(LocalModule module) {
+        localModules_.add(module);
+        return this;
+    }
+
+    /**
+     * Retrieves the local modules.
+     *
+     * @return the set of local modules
+     * @since 2.1
+     */
+    public Set<LocalModule> localModules() {
+        return localModules_;
+    }
+
     /**
      * Transfers the artifacts for the dependencies into the provided directory.
      * <p>
      * The destination directory must exist and be writable.
      *
-     * @param resolution   the version resolution state that can be cached
-     * @param retriever    the retriever to use to get artifacts
-     * @param repositories the repositories to use for the transfer
-     * @param directory    the directory to transfer the artifacts into
+     * @param resolution        the version resolution state that can be cached
+     * @param retriever         the retriever to use to get artifacts
+     * @param repositories      the repositories to use for the transfer
+     * @param directory         the directory to transfer the artifacts into
+     * @param modulesDirectory  the directory to download the modules into
      * @return the list of artifacts that were transferred successfully
      * @throws DependencyTransferException when an error occurred during the transfer
-     * @since 2.0
+     * @since 2.1
      */
-    public List<RepositoryArtifact> transferIntoDirectory(VersionResolution resolution, ArtifactRetriever retriever, List<Repository> repositories, File directory) {
-        return transferIntoDirectory(resolution, retriever, repositories, directory, (String[]) null);
+    public List<RepositoryArtifact> transferIntoDirectory(VersionResolution resolution, ArtifactRetriever retriever, List<Repository> repositories, File directory, File modulesDirectory) {
+        return transferIntoDirectory(resolution, retriever, repositories, directory, modulesDirectory, (String[]) null);
     }
 
     /**
-     * Transfers the artifacts for the dependencies into the provided directory,
+     * Transfers the artifacts for the dependencies into the provided directories,
      * including other classifiers.
      * <p>
      * The destination directory must exist and be writable.
      *
-     * @param resolution   the version resolution state that can be cached
-     * @param retriever    the retriever to use to get artifacts
-     * @param repositories the repositories to use for the download
-     * @param directory    the directory to download the artifacts into
+     * @param resolution        the version resolution state that can be cached
+     * @param retriever         the retriever to use to get artifacts
+     * @param repositories      the repositories to use for the download
+     * @param directory         the directory to download the artifacts into
+     * @param modulesDirectory  the directory to download the modules into
      * @param classifiers  the additional classifiers to transfer
      * @return the list of artifacts that were transferred successfully
      * @throws DependencyTransferException when an error occurred during the transfer
-     * @since 2.0
+     * @since 2.1
      */
-    public List<RepositoryArtifact> transferIntoDirectory(VersionResolution resolution, ArtifactRetriever retriever, List<Repository> repositories, File directory, String... classifiers) {
+    public List<RepositoryArtifact> transferIntoDirectory(VersionResolution resolution, ArtifactRetriever retriever, List<Repository> repositories, File directory, File modulesDirectory, String... classifiers) {
         var result = new ArrayList<RepositoryArtifact>();
         for (var dependency : this) {
-            var artifact = new DependencyResolver(resolution, retriever, repositories, dependency).transferIntoDirectory(directory);
+            var transfer_directory = directory;
+            if (dependency.isModularJar()) {
+                if (modulesDirectory == null) {
+                    throw new DependencyTransferException(dependency, "modules directory is not provided");
+                }
+                transfer_directory = modulesDirectory;
+            }
+            else if (directory == null) {
+                throw new DependencyTransferException(dependency, "artifacts directory is not provided");
+            }
+
+            if (!transfer_directory.exists()) {
+                if (!transfer_directory.mkdirs()) {
+                    throw new DependencyTransferException(dependency, transfer_directory, "couldn't create directory");
+                }
+            }
+
+            var artifact = new DependencyResolver(resolution, retriever, repositories, dependency).transferIntoDirectory(transfer_directory);
             if (artifact != null) {
                 result.add(artifact);
             }
@@ -122,7 +167,7 @@ public class DependencySet extends AbstractSet<Dependency> implements Set<Depend
             if (classifiers != null) {
                 for (var classifier : classifiers) {
                     if (classifier != null) {
-                        var classifier_artifact = new DependencyResolver(resolution, retriever, repositories, dependency.withClassifier(classifier)).transferIntoDirectory(directory);
+                        var classifier_artifact = new DependencyResolver(resolution, retriever, repositories, dependency.withClassifier(classifier)).transferIntoDirectory(transfer_directory);
                         if (classifier_artifact != null) {
                             result.add(classifier_artifact);
                         }
diff --git a/src/main/java/rife/bld/dependencies/LocalModule.java b/src/main/java/rife/bld/dependencies/LocalModule.java
new file mode 100644
index 0000000..5461aca
--- /dev/null
+++ b/src/main/java/rife/bld/dependencies/LocalModule.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2001-2024 Geert Bevin (gbevin[remove] at uwyn dot com)
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ */
+package rife.bld.dependencies;
+
+/**
+ * Contains the information required to describe a local module for the build system.
+ * <p>
+ * If the local module points to a directory, it will be scanned for jar files.
+ *
+ * @param path the file system path of the local module
+ * @author Geert Bevin (gbevin[remove] at uwyn dot com)
+ * @since 2.1
+ */
+public record LocalModule(String path) {
+}
diff --git a/src/main/java/rife/bld/dependencies/Module.java b/src/main/java/rife/bld/dependencies/Module.java
new file mode 100644
index 0000000..7dbb5f1
--- /dev/null
+++ b/src/main/java/rife/bld/dependencies/Module.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2001-2024 Geert Bevin (gbevin[remove] at uwyn dot com)
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ */
+package rife.bld.dependencies;
+
+import java.util.regex.Pattern;
+
+/**
+ * Contains the information required to describe a Java module dependency in the build system.
+ *
+ * @author Geert Bevin (gbevin[remove] at uwyn dot com)
+ * @since 2.1
+ */
+public class Module extends Dependency {
+    public Module(String groupId, String artifactId) {
+        this(groupId, artifactId, null, null, null, null);
+    }
+
+    public Module(String groupId, String artifactId, Version version) {
+        this(groupId, artifactId, version, null, null, null);
+    }
+
+    public Module(String groupId, String artifactId, Version version, String classifier) {
+        this(groupId, artifactId, version, classifier, null, null);
+    }
+
+    public Module(String groupId, String artifactId, Version version, String classifier, ExclusionSet exclusions) {
+        this(groupId, artifactId, version, classifier, exclusions, null);
+    }
+
+    public Module(String groupId, String artifactId, Version version, String classifier, ExclusionSet exclusions, Dependency parent) {
+        super(groupId, artifactId, version, classifier, TYPE_MODULAR_JAR, exclusions, parent);
+    }
+
+    private static final Pattern MODULE_PATTERN = Pattern.compile("^(?<groupId>[^:@]+):(?<artifactId>[^:@]+)(?::(?<version>[^:@]+)(?::(?<classifier>[^:@]+))?)?(?:@modular-jar)?$");
+
+    /**
+     * Parses a module from a string representation.
+     * The format is {@code groupId:artifactId:version:classifier}.
+     * The {@code version} and {@code classifier} are optional.
+     * <p>
+     * If the string can't be successfully parsed, {@code null} will be returned.
+     *
+     * @param module the module string to parse
+     * @return a parsed instance of {@code Module}; or
+     * {@code null} when the string couldn't be parsed
+     * @since 2.1
+     */
+    public static Module parse(String module) {
+        if (module == null || module.isEmpty()) {
+            return null;
+        }
+
+        var matcher = MODULE_PATTERN.matcher(module);
+        if (!matcher.matches()) {
+            return null;
+        }
+
+        var groupId = matcher.group("groupId");
+        var artifactId = matcher.group("artifactId");
+        var version = Version.parse(matcher.group("version"));
+        var classifier = matcher.group("classifier");
+
+        return new Module(groupId, artifactId, version, classifier);
+    }
+}
diff --git a/src/main/java/rife/bld/dependencies/Xml2MavenPom.java b/src/main/java/rife/bld/dependencies/Xml2MavenPom.java
index 7bdb3d1..ec315df 100644
--- a/src/main/java/rife/bld/dependencies/Xml2MavenPom.java
+++ b/src/main/java/rife/bld/dependencies/Xml2MavenPom.java
@@ -10,6 +10,8 @@ import rife.xml.Xml2Data;
 import java.util.*;
 import java.util.regex.Pattern;
 
+import static rife.bld.dependencies.Dependency.TYPE_JAR;
+
 /**
  * Parses an XML document to retrieve POM information, this is an internal class.
  *
@@ -103,7 +105,7 @@ class Xml2MavenPom extends Xml2Data {
                         "false",
                         exclusions,
                         dependency.parent());
-                    if (resolved_dependency.type() == null || resolved_dependency.type().equals("jar")) {
+                    if (resolved_dependency.type() == null || TYPE_JAR.equals(resolved_dependency.type())) {
                         var scope = Scope.valueOf(resolved_dependency.scope());
                         if (scopes_list.contains(scope)) {
                             var resolved_dependency_set = resolved_dependencies.computeIfAbsent(scope, k -> new LinkedHashSet<>());
diff --git a/src/main/java/rife/bld/dependencies/exceptions/DependencyTransferException.java b/src/main/java/rife/bld/dependencies/exceptions/DependencyTransferException.java
index febbe4d..888d708 100644
--- a/src/main/java/rife/bld/dependencies/exceptions/DependencyTransferException.java
+++ b/src/main/java/rife/bld/dependencies/exceptions/DependencyTransferException.java
@@ -24,6 +24,22 @@ public class DependencyTransferException extends DependencyException {
         destination_ = destination;
     }
 
+    public DependencyTransferException(Dependency dependency, File destination, String message) {
+        super("Unable to transfer dependency '" + dependency + "' into '" + destination + "': " + message);
+
+        dependency_ = dependency;
+        location_ = null;
+        destination_ = destination;
+    }
+
+    public DependencyTransferException(Dependency dependency, String message) {
+        super("Unable to transfer dependency '" + dependency + "': " + message);
+
+        dependency_ = dependency;
+        location_ = null;
+        destination_ = null;
+    }
+
     public Dependency getDependency() {
         return dependency_;
     }
diff --git a/src/main/java/rife/bld/operations/AbstractProcessOperation.java b/src/main/java/rife/bld/operations/AbstractProcessOperation.java
index 7c85a89..acc49a1 100644
--- a/src/main/java/rife/bld/operations/AbstractProcessOperation.java
+++ b/src/main/java/rife/bld/operations/AbstractProcessOperation.java
@@ -27,6 +27,7 @@ public abstract class AbstractProcessOperation<T extends AbstractProcessOperatio
     protected String javaTool_ = DEFAULT_JAVA_TOOL;
     protected final JavaOptions javaOptions_ = new JavaOptions();
     protected final List<String> classpath_ = new ArrayList<>();
+    protected final List<String> modulePath_ = new ArrayList<>();
     protected String mainClass_;
     protected Function<String, Boolean> outputProcessor_;
     protected Function<String, Boolean> errorProcessor_;
@@ -213,6 +214,32 @@ public abstract class AbstractProcessOperation<T extends AbstractProcessOperatio
         return (T) this;
     }
 
+    /**
+     * Provides module path entries to use for the operation.
+     *
+     * @param modulePath module path entries for the operation
+     * @return this operation instance
+     * @since 2.1
+     */
+    public T modulePath(String... modulePath) {
+        modulePath_.addAll(List.of(modulePath));
+        return (T) this;
+    }
+
+    /**
+     * Provides a list of module path entries to use for the operation.
+     * <p>
+     * A copy will be created to allow this list to be independently modifiable.
+     *
+     * @param modulePath a list of module path entries for the operation
+     * @return this operation instance
+     * @since 2.1
+     */
+    public T modulePath(List<String> modulePath) {
+        modulePath_.addAll(modulePath);
+        return (T) this;
+    }
+
     /**
      * Provides the main class to launch with the java tool.
      *
@@ -297,6 +324,18 @@ public abstract class AbstractProcessOperation<T extends AbstractProcessOperatio
         return classpath_;
     }
 
+    /**
+     * Retrieves the module path to use for the operation.
+     * <p>
+     * This is a modifiable list that can be retrieved and changed.
+     *
+     * @return the operation's module path
+     * @since 2.1
+     */
+    public List<String> modulePath() {
+        return modulePath_;
+    }
+
     /**
      * Retrieves the main class to launch with the java tool.
      *
diff --git a/src/main/java/rife/bld/operations/CompileOperation.java b/src/main/java/rife/bld/operations/CompileOperation.java
index 6805926..651ff16 100644
--- a/src/main/java/rife/bld/operations/CompileOperation.java
+++ b/src/main/java/rife/bld/operations/CompileOperation.java
@@ -26,6 +26,8 @@ public class CompileOperation extends AbstractOperation<CompileOperation> {
     private File buildTestDirectory_;
     private final List<String> compileMainClasspath_ = new ArrayList<>();
     private final List<String> compileTestClasspath_ = new ArrayList<>();
+    private final List<String> compileMainModulePath_ = new ArrayList<>();
+    private final List<String> compileTestModulePath_ = new ArrayList<>();
     private final List<File> mainSourceFiles_ = new ArrayList<>();
     private final List<File> testSourceFiles_ = new ArrayList<>();
     private final List<File> mainSourceDirectories_ = new ArrayList<>();
@@ -78,6 +80,7 @@ public class CompileOperation extends AbstractOperation<CompileOperation> {
         }
         executeBuildSources(
             compileMainClasspath(),
+            compileMainModulePath(),
             sources,
             buildMainDirectory());
     }
@@ -95,6 +98,7 @@ public class CompileOperation extends AbstractOperation<CompileOperation> {
         }
         executeBuildSources(
             compileTestClasspath(),
+            compileTestModulePath(),
             sources,
             buildTestDirectory());
     }
@@ -103,11 +107,12 @@ public class CompileOperation extends AbstractOperation<CompileOperation> {
      * Part of the {@link #execute} operation, build sources to a destination.
      *
      * @param classpath   the classpath list used for the compilation
+     * @param modulePath  the module path list used for the compilation
      * @param sources     the source files to compile
      * @param destination the destination directory
-     * @since 1.5
+     * @since 2.1
      */
-    protected void executeBuildSources(List<String> classpath, List<File> sources, File destination)
+    protected void executeBuildSources(List<String> classpath, List<String> modulePath, List<File> sources, File destination)
     throws IOException {
         if (sources.isEmpty() || destination == null) {
             return;
@@ -117,7 +122,13 @@ public class CompileOperation extends AbstractOperation<CompileOperation> {
         try (var file_manager = compiler.getStandardFileManager(null, null, null)) {
             var compilation_units = file_manager.getJavaFileObjectsFromFiles(sources);
             var diagnostics = new DiagnosticCollector<JavaFileObject>();
-            var options = new ArrayList<>(List.of("-d", destination.getAbsolutePath(), "-cp", FileUtils.joinPaths(classpath)));
+            var options = new ArrayList<>(List.of("-d", destination.getAbsolutePath()));
+            if (!classpath.isEmpty()) {
+                options.addAll(List.of("-cp", FileUtils.joinPaths(classpath)));
+            }
+            if (!modulePath.isEmpty()) {
+                options.addAll(List.of("-p", FileUtils.joinPaths(modulePath)));
+            }
             options.addAll(compileOptions());
             var compilation_task = compiler.getTask(null, file_manager, diagnostics, options, null, compilation_units);
             if (!compilation_task.call()) {
@@ -161,6 +172,8 @@ public class CompileOperation extends AbstractOperation<CompileOperation> {
             .buildTestDirectory(project.buildTestDirectory())
             .compileMainClasspath(project.compileMainClasspath())
             .compileTestClasspath(project.compileTestClasspath())
+            .compileMainModulePath(project.compileMainModulePath())
+            .compileTestModulePath(project.compileTestModulePath())
             .mainSourceFiles(project.mainSourceFiles())
             .testSourceFiles(project.testSourceFiles());
         if (project.javaRelease() != null && !compileOptions().containsRelease()) {
@@ -245,6 +258,58 @@ public class CompileOperation extends AbstractOperation<CompileOperation> {
         return this;
     }
 
+    /**
+     * Provides entries for the main compilation module path.
+     *
+     * @param modulePath module path entries
+     * @return this operation instance
+     * @since 2.1
+     */
+    public CompileOperation compileMainModulePath(String... modulePath) {
+        compileMainModulePath_.addAll(Arrays.asList(modulePath));
+        return this;
+    }
+
+    /**
+     * Provides a list of entries for the main compilation module path.
+     * <p>
+     * A copy will be created to allow this list to be independently modifiable.
+     *
+     * @param modulePath a list of module path entries
+     * @return this operation instance
+     * @since 2.1
+     */
+    public CompileOperation compileMainModulePath(List<String> modulePath) {
+        compileMainModulePath_.addAll(modulePath);
+        return this;
+    }
+
+    /**
+     * Provides entries for the test compilation module path.
+     *
+     * @param modulePath module path entries
+     * @return this operation instance
+     * @since 2.1
+     */
+    public CompileOperation compileTestModulePath(String... modulePath) {
+        compileTestModulePath_.addAll(Arrays.asList(modulePath));
+        return this;
+    }
+
+    /**
+     * Provides a list of entries for the test compilation module path.
+     * <p>
+     * A copy will be created to allow this list to be independently modifiable.
+     *
+     * @param modulePath a list of module path entries
+     * @return this operation instance
+     * @since 2.1
+     */
+    public CompileOperation compileTestModulePath(List<String> modulePath) {
+        compileTestModulePath_.addAll(modulePath);
+        return this;
+    }
+
     /**
      * Provides main files that should be compiled.
      *
@@ -407,6 +472,30 @@ public class CompileOperation extends AbstractOperation<CompileOperation> {
         return compileTestClasspath_;
     }
 
+    /**
+     * Retrieves the list of entries for the main compilation module path.
+     * <p>
+     * This is a modifiable list that can be retrieved and changed.
+     *
+     * @return the main compilation module path list
+     * @since 2.1
+     */
+    public List<String> compileMainModulePath() {
+        return compileMainModulePath_;
+    }
+
+    /**
+     * Retrieves the list of entries for the test compilation module path.
+     * <p>
+     * This is a modifiable list that can be retrieved and changed.
+     *
+     * @return the test compilation module path list
+     * @since 2.1
+     */
+    public List<String> compileTestModulePath() {
+        return compileTestModulePath_;
+    }
+
     /**
      * Retrieves the list of main files that should be compiled.
      * <p>
diff --git a/src/main/java/rife/bld/operations/DownloadOperation.java b/src/main/java/rife/bld/operations/DownloadOperation.java
index de1a569..be6d397 100644
--- a/src/main/java/rife/bld/operations/DownloadOperation.java
+++ b/src/main/java/rife/bld/operations/DownloadOperation.java
@@ -31,10 +31,15 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
     private final List<Repository> repositories_ = new ArrayList<>();
     private final DependencyScopes dependencies_ = new DependencyScopes();
     private File libCompileDirectory_;
+    private File libCompileModulesDirectory_;
     private File libProvidedDirectory_;
+    private File libProvidedModulesDirectory_;
     private File libRuntimeDirectory_;
+    private File libRuntimeModulesDirectory_;
     private File libStandaloneDirectory_;
+    private File libStandaloneModulesDirectory_;
     private File libTestDirectory_;
+    private File libTestModulesDirectory_;
     private boolean downloadSources_ = false;
     private boolean downloadJavadoc_ = false;
 
@@ -65,7 +70,7 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
      * @since 1.5
      */
     protected void executeDownloadCompileDependencies() {
-        executeDownloadDependencies(libCompileDirectory(), dependencies().resolveCompileDependencies(properties(), artifactRetriever(), repositories()));
+        executeDownloadDependencies(libCompileDirectory(), libCompileModulesDirectory(), dependencies().resolveCompileDependencies(properties(), artifactRetriever(), repositories()));
     }
 
     /**
@@ -74,7 +79,7 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
      * @since 1.8
      */
     protected void executeDownloadProvidedDependencies() {
-        executeDownloadDependencies(libProvidedDirectory(), dependencies().resolveProvidedDependencies(properties(), artifactRetriever(), repositories()));
+        executeDownloadDependencies(libProvidedDirectory(), libProvidedModulesDirectory(), dependencies().resolveProvidedDependencies(properties(), artifactRetriever(), repositories()));
     }
 
     /**
@@ -83,7 +88,7 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
      * @since 1.5
      */
     protected void executeDownloadRuntimeDependencies() {
-        executeDownloadDependencies(libRuntimeDirectory(), dependencies().resolveRuntimeDependencies(properties(), artifactRetriever(), repositories()));
+        executeDownloadDependencies(libRuntimeDirectory(), libRuntimeModulesDirectory(), dependencies().resolveRuntimeDependencies(properties(), artifactRetriever(), repositories()));
     }
 
     /**
@@ -92,7 +97,7 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
      * @since 1.5
      */
     protected void executeDownloadStandaloneDependencies() {
-        executeDownloadDependencies(libStandaloneDirectory(), dependencies().resolveStandaloneDependencies(properties(), artifactRetriever(), repositories()));
+        executeDownloadDependencies(libStandaloneDirectory(), libStandaloneModulesDirectory(), dependencies().resolveStandaloneDependencies(properties(), artifactRetriever(), repositories()));
     }
 
     /**
@@ -101,23 +106,18 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
      * @since 1.5
      */
     protected void executeDownloadTestDependencies() {
-        executeDownloadDependencies(libTestDirectory(), dependencies().resolveTestDependencies(properties(), artifactRetriever(), repositories()));
+        executeDownloadDependencies(libTestDirectory(), libTestModulesDirectory(), dependencies().resolveTestDependencies(properties(), artifactRetriever(), repositories()));
     }
 
     /**
      * Part of the {@link #execute} operation, download the artifacts for a particular dependency scope.
      *
      * @param destinationDirectory the directory in which the artifacts should be downloaded
+     * @param modulesDirectory     the directory in which the modules should be downloaded
      * @param dependencies         the dependencies to download
-     * @since 1.6
+     * @since 2.1
      */
-    protected void executeDownloadDependencies(File destinationDirectory, DependencySet dependencies) {
-        if (destinationDirectory == null) {
-            return;
-        }
-
-        destinationDirectory.mkdirs();
-
+    protected void executeDownloadDependencies(File destinationDirectory, File modulesDirectory, DependencySet dependencies) {
         var additional_classifiers = new String[0];
 
         if (downloadSources_ || downloadJavadoc_) {
@@ -128,7 +128,7 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
             additional_classifiers = classifiers.toArray(new String[0]);
         }
 
-        dependencies.transferIntoDirectory(new VersionResolution(properties()), artifactRetriever(), repositories(), destinationDirectory, additional_classifiers);
+        dependencies.transferIntoDirectory(new VersionResolution(properties()), artifactRetriever(), repositories(), destinationDirectory, modulesDirectory, additional_classifiers);
     }
 
     /**
@@ -145,10 +145,15 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
             .repositories(project.repositories())
             .dependencies(project.dependencies())
             .libCompileDirectory(project.libCompileDirectory())
+            .libCompileModulesDirectory(project.libCompileModulesDirectory())
             .libProvidedDirectory(project.libProvidedDirectory())
+            .libProvidedModulesDirectory(project.libProvidedModulesDirectory())
             .libRuntimeDirectory(project.libRuntimeDirectory())
+            .libRuntimeModulesDirectory(project.libRuntimeModulesDirectory())
             .libStandaloneDirectory(project.libStandaloneDirectory())
+            .libStandaloneModulesDirectory(project.libStandaloneModulesDirectory())
             .libTestDirectory(project.libTestDirectory())
+            .libTestModulesDirectory(project.libTestModulesDirectory())
             .downloadSources(project.downloadSources())
             .downloadJavadoc(project.downloadJavadoc());
     }
@@ -227,6 +232,18 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
         return this;
     }
 
+    /**
+     * Provides the {@code compile} scope modules download directory.
+     *
+     * @param directory the directory to download the {@code compile} scope modules into
+     * @return this operation instance
+     * @since 2.1
+     */
+    public DownloadOperation libCompileModulesDirectory(File directory) {
+        libCompileModulesDirectory_ = directory;
+        return this;
+    }
+
     /**
      * Provides the {@code provided} scope download directory.
      *
@@ -239,6 +256,18 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
         return this;
     }
 
+    /**
+     * Provides the {@code provided} scope modules download directory.
+     *
+     * @param directory the directory to download the {@code provided} scope modules into
+     * @return this operation instance
+     * @since 2.1
+     */
+    public DownloadOperation libProvidedModulesDirectory(File directory) {
+        libProvidedModulesDirectory_ = directory;
+        return this;
+    }
+
     /**
      * Provides the {@code runtime} scope download directory.
      *
@@ -251,6 +280,18 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
         return this;
     }
 
+    /**
+     * Provides the {@code runtime} scope modules download directory.
+     *
+     * @param directory the directory to download the {@code runtime} scope modules into
+     * @return this operation instance
+     * @since 2.1
+     */
+    public DownloadOperation libRuntimeModulesDirectory(File directory) {
+        libRuntimeModulesDirectory_ = directory;
+        return this;
+    }
+
     /**
      * Provides the {@code standalone} scope download directory.
      *
@@ -263,6 +304,18 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
         return this;
     }
 
+    /**
+     * Provides the {@code standalone} scope modules download directory.
+     *
+     * @param directory the directory to download the {@code standalone} scope modules into
+     * @return this operation instance
+     * @since 2.1
+     */
+    public DownloadOperation libStandaloneModulesDirectory(File directory) {
+        libStandaloneModulesDirectory_ = directory;
+        return this;
+    }
+
     /**
      * Provides the {@code test} scope download directory.
      *
@@ -275,6 +328,18 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
         return this;
     }
 
+    /**
+     * Provides the {@code test} scope modules download directory.
+     *
+     * @param directory the directory to download the {@code test} scope modules into
+     * @return this operation instance
+     * @since 2.1
+     */
+    public DownloadOperation libTestModulesDirectory(File directory) {
+        libTestModulesDirectory_ = directory;
+        return this;
+    }
+
     /**
      * Indicates whether the sources classifier should also be downloaded.
      *
@@ -359,6 +424,16 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
         return libCompileDirectory_;
     }
 
+    /**
+     * Retrieves the {@code compile} scope modules download directory.
+     *
+     * @return the {@code compile} scope modules download directory
+     * @since 2.1
+     */
+    public File libCompileModulesDirectory() {
+        return libCompileModulesDirectory_;
+    }
+
     /**
      * Retrieves the {@code provided} scope download directory.
      *
@@ -369,6 +444,16 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
         return libProvidedDirectory_;
     }
 
+    /**
+     * Retrieves the {@code provided} scope modules download directory.
+     *
+     * @return the {@code provided} scope modules download directory
+     * @since 2.1
+     */
+    public File libProvidedModulesDirectory() {
+        return libProvidedModulesDirectory_;
+    }
+
     /**
      * Retrieves the {@code runtime} scope download directory.
      *
@@ -379,6 +464,16 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
         return libRuntimeDirectory_;
     }
 
+    /**
+     * Retrieves the {@code runtime} scope modules download directory.
+     *
+     * @return the {@code runtime} scope modules download directory
+     * @since 2.1
+     */
+    public File libRuntimeModulesDirectory() {
+        return libRuntimeModulesDirectory_;
+    }
+
     /**
      * Retrieves the {@code standalone} scope download directory.
      *
@@ -389,6 +484,16 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
         return libStandaloneDirectory_;
     }
 
+    /**
+     * Retrieves the {@code standalone} scope modules download directory.
+     *
+     * @return the {@code standalone} scope modules download directory
+     * @since 2.1
+     */
+    public File libStandaloneModulesDirectory() {
+        return libStandaloneModulesDirectory_;
+    }
+
     /**
      * Retrieves the {@code test} scope download directory.
      *
@@ -399,6 +504,16 @@ public class DownloadOperation extends AbstractOperation<DownloadOperation> {
         return libTestDirectory_;
     }
 
+    /**
+     * Retrieves the {@code test} scope modules download directory.
+     *
+     * @return the {@code test} scope modules download directory
+     * @since 2.1
+     */
+    public File libTestModulesDirectory() {
+        return libTestModulesDirectory_;
+    }
+
     /**
      * Retrieves whether the sources classifier should also be downloaded.
      *
diff --git a/src/main/java/rife/bld/operations/JavadocOperation.java b/src/main/java/rife/bld/operations/JavadocOperation.java
index 29573ca..b754b67 100644
--- a/src/main/java/rife/bld/operations/JavadocOperation.java
+++ b/src/main/java/rife/bld/operations/JavadocOperation.java
@@ -26,6 +26,7 @@ import java.util.regex.Pattern;
 public class JavadocOperation extends AbstractOperation<JavadocOperation> {
     private File buildDirectory_;
     private final List<String> classpath_ = new ArrayList<>();
+    private final List<String> modulePath_ = new ArrayList<>();
     private final List<File> sourceFiles_ = new ArrayList<>();
     private final List<File> sourceDirectories_ = new ArrayList<>();
     private final JavadocOptions javadocOptions_ = new JavadocOptions();
@@ -74,6 +75,7 @@ public class JavadocOperation extends AbstractOperation<JavadocOperation> {
         }
         executeBuildSources(
             classpath(),
+            modulePath(),
             sources,
             buildDirectory());
     }
@@ -81,12 +83,13 @@ public class JavadocOperation extends AbstractOperation<JavadocOperation> {
     /**
      * Part of the {@link #execute} operation, build sources to a destination.
      *
-     * @param classpath   the classpath list used for the compilation
+     * @param classpath   the classpath list used for the javadoc generation
+     * @param modulePath  the module path list used for the javadoc generation
      * @param sources     the source files to compile
      * @param destination the destination directory
-     * @since 1.5.10
+     * @since 2.1
      */
-    protected void executeBuildSources(List<String> classpath, List<File> sources, File destination)
+    protected void executeBuildSources(List<String> classpath, List<String> modulePath, List<File> sources, File destination)
     throws IOException {
         if (sources.isEmpty() || destination == null) {
             return;
@@ -103,7 +106,13 @@ public class JavadocOperation extends AbstractOperation<JavadocOperation> {
         try (var file_manager = documentation.getStandardFileManager(null, null, null)) {
             var compilation_units = file_manager.getJavaFileObjectsFromFiles(filtered_sources);
             var diagnostics = new DiagnosticCollector<JavaFileObject>();
-            var options = new ArrayList<>(List.of("-d", destination.getAbsolutePath(), "-cp", FileUtils.joinPaths(classpath)));
+            var options = new ArrayList<>(List.of("-d", destination.getAbsolutePath()));
+            if (!classpath.isEmpty()) {
+                options.addAll(List.of("-cp", FileUtils.joinPaths(classpath)));
+            }
+            if (!modulePath.isEmpty()) {
+                options.addAll(List.of("-p", FileUtils.joinPaths(modulePath)));
+            }
             options.addAll(javadocOptions());
             var documentation_task = documentation.getTask(null, file_manager, diagnostics, null, options, compilation_units);
             if (!documentation_task.call()) {
@@ -146,6 +155,7 @@ public class JavadocOperation extends AbstractOperation<JavadocOperation> {
         var operation = buildDirectory(project.buildJavadocDirectory())
             .classpath(project.compileMainClasspath())
             .classpath(project.buildMainDirectory().getAbsolutePath())
+            .modulePath(project.compileMainModulePath())
             .sourceFiles(project.mainSourceFiles());
         if (project.javaRelease() != null && !javadocOptions().containsRelease()) {
             javadocOptions().release(project.javaRelease());
@@ -191,6 +201,32 @@ public class JavadocOperation extends AbstractOperation<JavadocOperation> {
         return this;
     }
 
+    /**
+     * Provides entries for the javadoc module path.
+     *
+     * @param modulePath module path entries
+     * @return this operation instance
+     * @since 2.1
+     */
+    public JavadocOperation modulePath(String... modulePath) {
+        modulePath_.addAll(Arrays.asList(modulePath));
+        return this;
+    }
+
+    /**
+     * Provides a list of entries for the javadoc moduel path.
+     * <p>
+     * A copy will be created to allow this list to be independently modifiable.
+     *
+     * @param modulePath a list of module path entries
+     * @return this operation instance
+     * @since 2.1
+     */
+    public JavadocOperation modulePath(List<String> modulePath) {
+        modulePath_.addAll(modulePath);
+        return this;
+    }
+
     /**
      * Provides files for which documentation should be generated.
      *
@@ -361,6 +397,18 @@ public class JavadocOperation extends AbstractOperation<JavadocOperation> {
         return classpath_;
     }
 
+    /**
+     * Retrieves the list of entries for the javadoc module path.
+     * <p>
+     * This is a modifiable list that can be retrieved and changed.
+     *
+     * @return the javadoc module path list
+     * @since 2.1
+     */
+    public List<String> modulePath() {
+        return modulePath_;
+    }
+
     /**
      * Retrieves the list of files for which documentation should be generation.
      * <p>
diff --git a/src/main/java/rife/bld/operations/PublishOperation.java b/src/main/java/rife/bld/operations/PublishOperation.java
index 8181725..c732f7d 100644
--- a/src/main/java/rife/bld/operations/PublishOperation.java
+++ b/src/main/java/rife/bld/operations/PublishOperation.java
@@ -28,6 +28,7 @@ import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
+import static rife.bld.dependencies.Dependency.*;
 import static rife.bld.publish.MetadataBuilder.SNAPSHOT_TIMESTAMP_FORMATTER;
 import static rife.tools.HttpUtils.*;
 import static rife.tools.StringUtils.encodeHexLower;
@@ -180,8 +181,8 @@ public class PublishOperation extends AbstractOperation<PublishOperation> {
                 artifact_name.append('-').append(artifact.classifier());
             }
             var type = artifact.type();
-            if (type == null) {
-                type = "jar";
+            if (type == null || TYPE_JAR.equals(type) || TYPE_MODULAR_JAR.equals(type) || TYPE_CLASSPATH_JAR.equals(type)) {
+                type = TYPE_JAR;
             }
             artifact_name.append('.').append(type);
 
@@ -517,9 +518,9 @@ public class PublishOperation extends AbstractOperation<PublishOperation> {
         artifactRetriever(project.artifactRetriever());
         dependencies().include(project.dependencies());
         artifacts(List.of(
-            new PublishArtifact(new File(project.buildDistDirectory(), project.jarFileName()), "", "jar"),
-            new PublishArtifact(new File(project.buildDistDirectory(), project.sourcesJarFileName()), "sources", "jar"),
-            new PublishArtifact(new File(project.buildDistDirectory(), project.javadocJarFileName()), "javadoc", "jar")));
+            new PublishArtifact(new File(project.buildDistDirectory(), project.jarFileName()), "", TYPE_JAR),
+            new PublishArtifact(new File(project.buildDistDirectory(), project.sourcesJarFileName()), CLASSIFIER_SOURCES, TYPE_JAR),
+            new PublishArtifact(new File(project.buildDistDirectory(), project.javadocJarFileName()), CLASSIFIER_JAVADOC, TYPE_JAR)));
         if (info().groupId() == null) {
             info().groupId(project.pkg());
         }
diff --git a/src/main/java/rife/bld/operations/PurgeOperation.java b/src/main/java/rife/bld/operations/PurgeOperation.java
index 267a121..c958faf 100644
--- a/src/main/java/rife/bld/operations/PurgeOperation.java
+++ b/src/main/java/rife/bld/operations/PurgeOperation.java
@@ -31,10 +31,15 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
     private final List<Repository> repositories_ = new ArrayList<>();
     private final DependencyScopes dependencies_ = new DependencyScopes();
     private File libCompileDirectory_;
+    private File libCompileModulesDirectory_;
     private File libProvidedDirectory_;
+    private File libProvidedModulesDirectory_;
     private File libRuntimeDirectory_;
+    private File libRuntimeModulesDirectory_;
     private File libStandaloneDirectory_;
+    private File libStandaloneModulesDirectory_;
     private File libTestDirectory_;
+    private File libTestModulesDirectory_;
     private boolean preserveSources_ = false;
     private boolean preserveJavadoc_ = false;
 
@@ -65,7 +70,7 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
      * @since 1.5
      */
     protected void executePurgeCompileDependencies() {
-        executePurgeDependencies(libCompileDirectory(), dependencies().resolveCompileDependencies(properties(), artifactRetriever(), repositories()));
+        executePurgeDependencies(libCompileDirectory(), libCompileModulesDirectory(), dependencies().resolveCompileDependencies(properties(), artifactRetriever(), repositories()));
     }
 
     /**
@@ -74,7 +79,7 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
      * @since 1.8
      */
     protected void executePurgeProvidedDependencies() {
-        executePurgeDependencies(libProvidedDirectory(), dependencies().resolveProvidedDependencies(properties(), artifactRetriever(), repositories()));
+        executePurgeDependencies(libProvidedDirectory(), libProvidedModulesDirectory(), dependencies().resolveProvidedDependencies(properties(), artifactRetriever(), repositories()));
     }
 
     /**
@@ -83,7 +88,7 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
      * @since 1.5
      */
     protected void executePurgeRuntimeDependencies() {
-        executePurgeDependencies(libRuntimeDirectory(), dependencies().resolveRuntimeDependencies(properties(), artifactRetriever(), repositories()));
+        executePurgeDependencies(libRuntimeDirectory(), libRuntimeModulesDirectory(), dependencies().resolveRuntimeDependencies(properties(), artifactRetriever(), repositories()));
     }
 
     /**
@@ -92,7 +97,7 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
      * @since 1.5
      */
     protected void executePurgeStandaloneDependencies() {
-        executePurgeDependencies(libStandaloneDirectory(), dependencies().resolveStandaloneDependencies(properties(), artifactRetriever(), repositories()));
+        executePurgeDependencies(libStandaloneDirectory(), libStandaloneModulesDirectory(), dependencies().resolveStandaloneDependencies(properties(), artifactRetriever(), repositories()));
     }
 
     /**
@@ -101,22 +106,29 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
      * @since 1.5
      */
     protected void executePurgeTestDependencies() {
-        executePurgeDependencies(libTestDirectory(), dependencies().resolveTestDependencies(properties(), artifactRetriever(), repositories()));
+        executePurgeDependencies(libTestDirectory(), libTestModulesDirectory(), dependencies().resolveTestDependencies(properties(), artifactRetriever(), repositories()));
     }
 
     /**
      * Part of the {@link #execute} operation, purge the artifacts for a particular dependency scope.
      *
-     * @param destinationDirectory the directory from which the artifacts should be purged
-     * @param dependencies         the dependencies to purge
-     * @since 1.6
+     * @param classpathDirectory the directory from which the artifacts should be purged
+     * @param modulesDirectory   the directory from which the modules should be purged
+     * @param dependencies       the dependencies to purge
+     * @since 2.1
      */
-    protected void executePurgeDependencies(File destinationDirectory, DependencySet dependencies) {
-        if (destinationDirectory == null) {
+    protected void executePurgeDependencies(File classpathDirectory, File modulesDirectory, DependencySet dependencies) {
+        if (classpathDirectory == null && modulesDirectory == null) {
             return;
         }
-        var filenames = new HashSet<String>();
+
+        var classpath_names = new HashSet<String>();
+        var modules_names = new HashSet<String>();
         for (var dependency : dependencies) {
+            var filenames = classpath_names;
+            if (dependency.isModularJar()) {
+                filenames = modules_names;
+            }
             addTransferLocations(filenames, dependency);
             if (preserveSources_) {
                 addTransferLocations(filenames, dependency.withClassifier(CLASSIFIER_SOURCES));
@@ -126,15 +138,27 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
             }
         }
 
+        purgeFromDirectory(classpathDirectory, modulesDirectory, classpath_names);
+        purgeFromDirectory(modulesDirectory, classpathDirectory, modules_names);
+    }
+
+    private static void purgeFromDirectory(File directory, File preserveDirectory, HashSet<String> preservedFileNames) {
+        if (directory == null) {
+            return;
+        }
+
         boolean printed_header = false;
-        for (var file : destinationDirectory.listFiles()) {
-            if (!filenames.contains(file.getName())) {
-                if (!printed_header) {
-                    printed_header = true;
-                    System.out.println("Deleting from " + destinationDirectory.getName() + ":");
+        var classpath_files = directory.listFiles();
+        if (classpath_files != null) {
+            for (var file : classpath_files) {
+                if (!preservedFileNames.contains(file.getName()) && !file.equals(preserveDirectory)) {
+                    if (!printed_header) {
+                        printed_header = true;
+                        System.out.println("Deleting from " + directory.getName() + ":");
+                    }
+                    System.out.println("    " + file.getName());
+                    file.delete();
                 }
-                System.out.println("    " + file.getName());
-                file.delete();
             }
         }
     }
@@ -159,10 +183,15 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
             .repositories(project.repositories())
             .dependencies(project.dependencies())
             .libCompileDirectory(project.libCompileDirectory())
+            .libCompileModulesDirectory(project.libCompileModulesDirectory())
             .libProvidedDirectory(project.libProvidedDirectory())
+            .libProvidedModulesDirectory(project.libProvidedModulesDirectory())
             .libRuntimeDirectory(project.libRuntimeDirectory())
+            .libRuntimeModulesDirectory(project.libRuntimeModulesDirectory())
             .libStandaloneDirectory(project.libStandaloneDirectory())
+            .libStandaloneModulesDirectory(project.libStandaloneModulesDirectory())
             .libTestDirectory(project.libTestDirectory())
+            .libTestModulesDirectory(project.libTestModulesDirectory())
             .preserveSources(project.downloadSources())
             .preserveJavadoc(project.downloadJavadoc());
     }
@@ -267,6 +296,18 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
         return this;
     }
 
+    /**
+     * Provides the {@code compile} scope modules purge directory.
+     *
+     * @param directory the directory to purge the {@code compile} scope modules from
+     * @return this operation instance
+     * @since 2.1
+     */
+    public PurgeOperation libCompileModulesDirectory(File directory) {
+        libCompileModulesDirectory_ = directory;
+        return this;
+    }
+
     /**
      * Provides the {@code provided} scope purge directory.
      *
@@ -279,6 +320,18 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
         return this;
     }
 
+    /**
+     * Provides the {@code provided} scope modules purge directory.
+     *
+     * @param directory the directory to purge the {@code provided} scope modules from
+     * @return this operation instance
+     * @since 2.1
+     */
+    public PurgeOperation libProvidedModulesDirectory(File directory) {
+        libProvidedModulesDirectory_ = directory;
+        return this;
+    }
+
     /**
      * Provides the {@code runtime} scope purge directory.
      *
@@ -291,6 +344,18 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
         return this;
     }
 
+    /**
+     * Provides the {@code runtime} scope modules purge directory.
+     *
+     * @param directory the directory to purge the {@code runtime} scope modules from
+     * @return this operation instance
+     * @since 2.1
+     */
+    public PurgeOperation libRuntimeModulesDirectory(File directory) {
+        libRuntimeModulesDirectory_ = directory;
+        return this;
+    }
+
     /**
      * Provides the {@code standalone} scope purge directory.
      *
@@ -303,6 +368,18 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
         return this;
     }
 
+    /**
+     * Provides the {@code standalone} scope modules purge directory.
+     *
+     * @param directory the directory to purge the {@code standalone} scope modules from
+     * @return this operation instance
+     * @since 2.1
+     */
+    public PurgeOperation libStandaloneModulesDirectory(File directory) {
+        libStandaloneModulesDirectory_ = directory;
+        return this;
+    }
+
     /**
      * Provides the {@code test} scope purge directory.
      *
@@ -315,6 +392,18 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
         return this;
     }
 
+    /**
+     * Provides the {@code test} scope modules purge directory.
+     *
+     * @param directory the directory to purge the {@code test} scope modules from
+     * @return this operation instance
+     * @since 2.1
+     */
+    public PurgeOperation libTestModulesDirectory(File directory) {
+        libTestModulesDirectory_ = directory;
+        return this;
+    }
+
     /**
      * Provides the artifact retriever to use.
      *
@@ -373,6 +462,16 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
         return libCompileDirectory_;
     }
 
+    /**
+     * Retrieves the {@code compile} scope modules purge directory.
+     *
+     * @return the {@code compile} scope modules purge directory
+     * @since 2.1
+     */
+    public File libCompileModulesDirectory() {
+        return libCompileModulesDirectory_;
+    }
+
     /**
      * Retrieves the {@code provided} scope purge directory.
      *
@@ -383,6 +482,16 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
         return libProvidedDirectory_;
     }
 
+    /**
+     * Retrieves the {@code provided} scope modules purge directory.
+     *
+     * @return the {@code provided} scope modules purge directory
+     * @since 2.1
+     */
+    public File libProvidedModulesDirectory() {
+        return libProvidedModulesDirectory_;
+    }
+
     /**
      * Retrieves the {@code runtime} scope purge directory.
      *
@@ -393,6 +502,16 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
         return libRuntimeDirectory_;
     }
 
+    /**
+     * Retrieves the {@code runtime} scope modules purge directory.
+     *
+     * @return the {@code runtime} scope modules purge directory
+     * @since 2.1
+     */
+    public File libRuntimeModulesDirectory() {
+        return libRuntimeModulesDirectory_;
+    }
+
     /**
      * Retrieves the {@code standalone} scope purge directory.
      *
@@ -403,6 +522,16 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
         return libStandaloneDirectory_;
     }
 
+    /**
+     * Retrieves the {@code standalone} scope modules purge directory.
+     *
+     * @return the {@code standalone} scope modules purge directory
+     * @since 2.1
+     */
+    public File libStandaloneModulesDirectory() {
+        return libStandaloneModulesDirectory_;
+    }
+
     /**
      * Retrieves the {@code test} scope purge directory.
      *
@@ -413,6 +542,16 @@ public class PurgeOperation extends AbstractOperation<PurgeOperation> {
         return libTestDirectory_;
     }
 
+    /**
+     * Retrieves the {@code test} scope modules purge directory.
+     *
+     * @return the {@code test} scope modules purge directory
+     * @since 2.1
+     */
+    public File libTestModulesDirectory() {
+        return libTestModulesDirectory_;
+    }
+
     /**
      * Retrieves whether the sources classifier files should be preserved.
      *
diff --git a/src/main/java/rife/bld/operations/RunOperation.java b/src/main/java/rife/bld/operations/RunOperation.java
index 35968cb..e59f6e2 100644
--- a/src/main/java/rife/bld/operations/RunOperation.java
+++ b/src/main/java/rife/bld/operations/RunOperation.java
@@ -35,6 +35,10 @@ public class RunOperation extends AbstractProcessOperation<RunOperation> {
             args.add("-cp");
             args.add(FileUtils.joinPaths(classpath()));
         }
+        if (!modulePath().isEmpty()) {
+            args.add("-p");
+            args.add(FileUtils.joinPaths(modulePath()));
+        }
         args.add(mainClass());
         args.addAll(runOptions());
         return args;
@@ -50,6 +54,7 @@ public class RunOperation extends AbstractProcessOperation<RunOperation> {
         var operation = workDirectory(project.workDirectory())
                 .javaTool(project.javaTool())
                 .classpath(project.runClasspath())
+                .modulePath(project.runModulePath())
                 .mainClass(project.mainClass());
         if (project.usesRife2Agent()) {
             operation.javaOptions().javaAgent(project.getRife2AgentFile());
diff --git a/src/main/java/rife/bld/operations/TestOperation.java b/src/main/java/rife/bld/operations/TestOperation.java
index 184e8ba..5fcd5b5 100644
--- a/src/main/java/rife/bld/operations/TestOperation.java
+++ b/src/main/java/rife/bld/operations/TestOperation.java
@@ -51,8 +51,14 @@ public class TestOperation<T extends TestOperation<T, O>, O extends List<String>
         var args = new ArrayList<String>();
         args.add(javaTool());
         args.addAll(javaOptions());
-        args.add("-cp");
-        args.add(FileUtils.joinPaths(classpath()));
+        if (!classpath().isEmpty()) {
+            args.add("-cp");
+            args.add(FileUtils.joinPaths(classpath()));
+        }
+        if (!modulePath().isEmpty()) {
+            args.add("-p");
+            args.add(FileUtils.joinPaths(modulePath()));
+        }
         args.add(mainClass());
         args.addAll(testToolOptions());
 
@@ -68,7 +74,8 @@ public class TestOperation<T extends TestOperation<T, O>, O extends List<String>
     public T fromProject(BaseProject project) {
         var operation = workDirectory(project.workDirectory())
             .javaTool(project.javaTool())
-            .classpath(project.testClasspath());
+            .classpath(project.testClasspath())
+            .modulePath(project.testModulePath());
         if (project.usesRife2Agent()) {
             operation.javaOptions().javaAgent(project.getRife2AgentFile());
         }
diff --git a/src/main/java/rife/bld/publish/PomBuilder.java b/src/main/java/rife/bld/publish/PomBuilder.java
index a850486..fa2bceb 100644
--- a/src/main/java/rife/bld/publish/PomBuilder.java
+++ b/src/main/java/rife/bld/publish/PomBuilder.java
@@ -14,6 +14,8 @@ import rife.tools.exceptions.FileUtilsErrorException;
 import java.io.File;
 import java.util.Objects;
 
+import static rife.bld.dependencies.Dependency.TYPE_JAR;
+
 /**
  * Provides the functionalities to build a Maven POM xml file.
  *
@@ -186,7 +188,7 @@ public class PomBuilder {
 
                 t.blankValue("dependency-type");
                 t.blankValue("dependency-type-tag");
-                if (!"jar".equals(dependency.type())) {
+                if (!TYPE_JAR.equals(dependency.type())) {
                     t.setValueEncoded("dependency-type", dependency.type());
                     t.setBlock("dependency-type-tag");
                 }
diff --git a/src/main/java/rife/bld/publish/PublishArtifact.java b/src/main/java/rife/bld/publish/PublishArtifact.java
index 4f70148..ff32b69 100644
--- a/src/main/java/rife/bld/publish/PublishArtifact.java
+++ b/src/main/java/rife/bld/publish/PublishArtifact.java
@@ -6,6 +6,8 @@ package rife.bld.publish;
 
 import java.io.File;
 
+import static rife.bld.dependencies.Dependency.TYPE_JAR;
+
 /**
  * Contains the information about an artifact that will be published.
  *
@@ -19,6 +21,6 @@ public record PublishArtifact(File file, String classifier, String type) {
     public PublishArtifact(File file, String classifier, String type) {
         this.file = file;
         this.classifier = (classifier == null ? "" : classifier);
-        this.type = (type == null ? "jar" : type);
+        this.type = (type == null ? TYPE_JAR : type);
     }
 }
diff --git a/src/main/java/rife/bld/wrapper/WrapperExtensionResolver.java b/src/main/java/rife/bld/wrapper/WrapperExtensionResolver.java
index 17ad1bd..af5671a 100644
--- a/src/main/java/rife/bld/wrapper/WrapperExtensionResolver.java
+++ b/src/main/java/rife/bld/wrapper/WrapperExtensionResolver.java
@@ -109,7 +109,7 @@ public class WrapperExtensionResolver {
                 additional_classifiers = classifiers.toArray(new String[0]);
             }
 
-            var artifacts = dependencies.transferIntoDirectory(resolution_, retriever_, repositories_, destinationDirectory_, additional_classifiers);
+            var artifacts = dependencies.transferIntoDirectory(resolution_, retriever_, repositories_, destinationDirectory_, destinationDirectory_, additional_classifiers);
             for (var artifact : artifacts) {
                 var location = artifact.location();
 
diff --git a/src/test/java/rife/bld/TestProject.java b/src/test/java/rife/bld/TestProject.java
index 26c1b56..6b3da04 100644
--- a/src/test/java/rife/bld/TestProject.java
+++ b/src/test/java/rife/bld/TestProject.java
@@ -114,6 +114,11 @@ public class TestProject {
         assertNotNull(project.compileTestClasspath());
         assertNotNull(project.runClasspath());
         assertNotNull(project.testClasspath());
+
+        assertNotNull(project.compileMainModulePath());
+        assertNotNull(project.compileTestModulePath());
+        assertNotNull(project.runModulePath());
+        assertNotNull(project.testModulePath());
     }
 
     static class CustomProject extends Project {
@@ -321,10 +326,6 @@ public class TestProject {
                 .include(dependency("org.jsoup", "jsoup", version(1, 15, 4)))
                 .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 2)))
                 .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 9, 2)));
-            scope(standalone)
-                .include(dependency("org.eclipse.jetty", "jetty-server", version(11, 0, 14)))
-                .include(dependency("org.eclipse.jetty", "jetty-servlet", version(11, 0, 14)))
-                .include(dependency("org.slf4j", "slf4j-simple", version(2, 0, 7)));
         }
 
         public void enableAutoDownloadPurge() {
@@ -364,8 +365,6 @@ public class TestProject {
                 /lib/bld/bld.cache
                 /lib/compile
                 /lib/compile/rife2-1.5.11.jar
-                /lib/provided
-                /lib/runtime
                 /lib/test
                 /lib/test/apiguardian-api-1.1.2.jar
                 /lib/test/jsoup-1.15.4.jar
@@ -379,8 +378,6 @@ public class TestProject {
                 /lib/test/opentest4j-1.2.0.jar""", FileUtils.generateDirectoryListing(tmp));
 
             FileUtils.deleteDirectory(new File(tmp, "lib/compile"));
-            FileUtils.deleteDirectory(new File(tmp, "lib/provided"));
-            FileUtils.deleteDirectory(new File(tmp, "lib/runtime"));
             FileUtils.deleteDirectory(new File(tmp, "lib/test"));
             assertEquals("""
                 /lib
@@ -405,8 +402,6 @@ public class TestProject {
                 /lib/bld/bld.cache
                 /lib/compile
                 /lib/compile/rife2-1.5.12.jar
-                /lib/provided
-                /lib/runtime
                 /lib/test
                 /lib/test/apiguardian-api-1.1.2.jar
                 /lib/test/jsoup-1.15.4.jar
@@ -429,8 +424,6 @@ public class TestProject {
                 /lib/bld/bld.cache
                 /lib/compile
                 /lib/compile/rife2-1.5.15.jar
-                /lib/provided
-                /lib/runtime
                 /lib/test
                 /lib/test/apiguardian-api-1.1.2.jar
                 /lib/test/jsoup-1.15.4.jar
diff --git a/src/test/java/rife/bld/TestWebProject.java b/src/test/java/rife/bld/TestWebProject.java
index f794adc..79816c9 100644
--- a/src/test/java/rife/bld/TestWebProject.java
+++ b/src/test/java/rife/bld/TestWebProject.java
@@ -8,9 +8,14 @@ import org.junit.jupiter.api.Test;
 import rife.bld.dependencies.VersionNumber;
 import rife.tools.FileUtils;
 
+import java.io.File;
 import java.nio.file.Files;
+import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
+import static rife.bld.dependencies.Repository.MAVEN_CENTRAL;
+import static rife.bld.dependencies.Scope.*;
+import static rife.bld.dependencies.Scope.compile;
 
 public class TestWebProject {
     @Test
@@ -149,4 +154,167 @@ public class TestWebProject {
             FileUtils.deleteDirectory(tmp);
         }
     }
+
+    static class CustomWebProjectAutoPurge extends WebProject {
+        CustomWebProjectAutoPurge(File tmp) {
+            workDirectory = tmp;
+            pkg = "test.pkg";
+            name = "my_project";
+            version = new VersionNumber(0, 0, 1);
+
+            repositories = List.of(MAVEN_CENTRAL);
+            scope(compile)
+                .include(dependency("com.uwyn.rife2", "rife2", version(1, 5, 11)));
+            scope(test)
+                .include(dependency("org.jsoup", "jsoup", version(1, 15, 4)))
+                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 2)))
+                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 9, 2)));
+            scope(standalone)
+                .include(dependency("org.eclipse.jetty", "jetty-server", version(11, 0, 14)))
+                .include(dependency("org.eclipse.jetty", "jetty-servlet", version(11, 0, 14)))
+                .include(dependency("org.slf4j", "slf4j-simple", version(2, 0, 7)));
+        }
+
+        public void enableAutoDownloadPurge() {
+            autoDownloadPurge = true;
+        }
+
+        public void increaseRife2Version() {
+            scope(compile).clear();
+            scope(compile)
+                .include(dependency("com.uwyn.rife2", "rife2", version(1, 5, 12)));
+        }
+
+        public void increaseRife2VersionMore() {
+            scope(compile).clear();
+            scope(compile)
+                .include(dependency("com.uwyn.rife2", "rife2", version(1, 5, 15)));
+        }
+    }
+
+    @Test
+    void testAutoDownloadPurge()
+    throws Exception {
+        var tmp = Files.createTempDirectory("test").toFile();
+        try {
+            var project = new CustomWebProjectAutoPurge(tmp);
+            project.execute(new String[]{"version"});
+
+            assertEquals("", FileUtils.generateDirectoryListing(tmp));
+
+            project = new CustomWebProjectAutoPurge(tmp);
+            project.enableAutoDownloadPurge();
+            project.execute(new String[]{"version"});
+
+            assertEquals("""
+                /lib
+                /lib/bld
+                /lib/bld/bld.cache
+                /lib/compile
+                /lib/compile/rife2-1.5.11.jar
+                /lib/standalone
+                /lib/standalone/jetty-http-11.0.14.jar
+                /lib/standalone/jetty-io-11.0.14.jar
+                /lib/standalone/jetty-jakarta-servlet-api-5.0.2.jar
+                /lib/standalone/jetty-security-11.0.14.jar
+                /lib/standalone/jetty-server-11.0.14.jar
+                /lib/standalone/jetty-servlet-11.0.14.jar
+                /lib/standalone/jetty-util-11.0.14.jar
+                /lib/standalone/slf4j-api-2.0.7.jar
+                /lib/standalone/slf4j-simple-2.0.7.jar
+                /lib/test
+                /lib/test/apiguardian-api-1.1.2.jar
+                /lib/test/jsoup-1.15.4.jar
+                /lib/test/junit-jupiter-5.9.2.jar
+                /lib/test/junit-jupiter-api-5.9.2.jar
+                /lib/test/junit-jupiter-engine-5.9.2.jar
+                /lib/test/junit-jupiter-params-5.9.2.jar
+                /lib/test/junit-platform-commons-1.9.2.jar
+                /lib/test/junit-platform-console-standalone-1.9.2.jar
+                /lib/test/junit-platform-engine-1.9.2.jar
+                /lib/test/opentest4j-1.2.0.jar""", FileUtils.generateDirectoryListing(tmp));
+
+            FileUtils.deleteDirectory(new File(tmp, "lib/compile"));
+            FileUtils.deleteDirectory(new File(tmp, "lib/standalone"));
+            FileUtils.deleteDirectory(new File(tmp, "lib/test"));
+            assertEquals("""
+                /lib
+                /lib/bld
+                /lib/bld/bld.cache""", FileUtils.generateDirectoryListing(tmp));
+
+            project = new CustomWebProjectAutoPurge(tmp);
+            project.enableAutoDownloadPurge();
+            project.execute(new String[]{"version"});
+            assertEquals("""
+                /lib
+                /lib/bld
+                /lib/bld/bld.cache""", FileUtils.generateDirectoryListing(tmp));
+
+            project = new CustomWebProjectAutoPurge(tmp);
+            project.enableAutoDownloadPurge();
+            project.increaseRife2Version();
+            project.execute(new String[]{"version"});
+            assertEquals("""
+                /lib
+                /lib/bld
+                /lib/bld/bld.cache
+                /lib/compile
+                /lib/compile/rife2-1.5.12.jar
+                /lib/standalone
+                /lib/standalone/jetty-http-11.0.14.jar
+                /lib/standalone/jetty-io-11.0.14.jar
+                /lib/standalone/jetty-jakarta-servlet-api-5.0.2.jar
+                /lib/standalone/jetty-security-11.0.14.jar
+                /lib/standalone/jetty-server-11.0.14.jar
+                /lib/standalone/jetty-servlet-11.0.14.jar
+                /lib/standalone/jetty-util-11.0.14.jar
+                /lib/standalone/slf4j-api-2.0.7.jar
+                /lib/standalone/slf4j-simple-2.0.7.jar
+                /lib/test
+                /lib/test/apiguardian-api-1.1.2.jar
+                /lib/test/jsoup-1.15.4.jar
+                /lib/test/junit-jupiter-5.9.2.jar
+                /lib/test/junit-jupiter-api-5.9.2.jar
+                /lib/test/junit-jupiter-engine-5.9.2.jar
+                /lib/test/junit-jupiter-params-5.9.2.jar
+                /lib/test/junit-platform-commons-1.9.2.jar
+                /lib/test/junit-platform-console-standalone-1.9.2.jar
+                /lib/test/junit-platform-engine-1.9.2.jar
+                /lib/test/opentest4j-1.2.0.jar""", FileUtils.generateDirectoryListing(tmp));
+
+            project = new CustomWebProjectAutoPurge(tmp);
+            project.enableAutoDownloadPurge();
+            project.increaseRife2VersionMore();
+            project.execute(new String[]{"version"});
+            assertEquals("""
+                /lib
+                /lib/bld
+                /lib/bld/bld.cache
+                /lib/compile
+                /lib/compile/rife2-1.5.15.jar
+                /lib/standalone
+                /lib/standalone/jetty-http-11.0.14.jar
+                /lib/standalone/jetty-io-11.0.14.jar
+                /lib/standalone/jetty-jakarta-servlet-api-5.0.2.jar
+                /lib/standalone/jetty-security-11.0.14.jar
+                /lib/standalone/jetty-server-11.0.14.jar
+                /lib/standalone/jetty-servlet-11.0.14.jar
+                /lib/standalone/jetty-util-11.0.14.jar
+                /lib/standalone/slf4j-api-2.0.7.jar
+                /lib/standalone/slf4j-simple-2.0.7.jar
+                /lib/test
+                /lib/test/apiguardian-api-1.1.2.jar
+                /lib/test/jsoup-1.15.4.jar
+                /lib/test/junit-jupiter-5.9.2.jar
+                /lib/test/junit-jupiter-api-5.9.2.jar
+                /lib/test/junit-jupiter-engine-5.9.2.jar
+                /lib/test/junit-jupiter-params-5.9.2.jar
+                /lib/test/junit-platform-commons-1.9.2.jar
+                /lib/test/junit-platform-console-standalone-1.9.2.jar
+                /lib/test/junit-platform-engine-1.9.2.jar
+                /lib/test/opentest4j-1.2.0.jar""", FileUtils.generateDirectoryListing(tmp));
+        } finally {
+            FileUtils.deleteDirectory(tmp);
+        }
+    }
 }
diff --git a/src/test/java/rife/bld/dependencies/TestDependency.java b/src/test/java/rife/bld/dependencies/TestDependency.java
index f91cc15..1ecb079 100644
--- a/src/test/java/rife/bld/dependencies/TestDependency.java
+++ b/src/test/java/rife/bld/dependencies/TestDependency.java
@@ -18,6 +18,8 @@ public class TestDependency {
         assertEquals(VersionNumber.UNKNOWN, dependency1.version());
         assertEquals("", dependency1.classifier());
         assertEquals("jar", dependency1.type());
+        assertFalse(dependency1.isModularJar());
+        assertFalse(dependency1.isClasspathJar());
 
         var dependency2 = new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0));
         assertNotNull(dependency2);
@@ -26,6 +28,8 @@ public class TestDependency {
         assertEquals(new VersionNumber(1, 4, 0), dependency2.version());
         assertEquals("", dependency2.classifier());
         assertEquals("jar", dependency2.type());
+        assertFalse(dependency2.isModularJar());
+        assertFalse(dependency2.isClasspathJar());
 
         var dependency3 = new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0), "agent");
         assertNotNull(dependency3);
@@ -34,6 +38,8 @@ public class TestDependency {
         assertEquals(new VersionNumber(1, 4, 0), dependency3.version());
         assertEquals("agent", dependency3.classifier());
         assertEquals("jar", dependency3.type());
+        assertFalse(dependency3.isModularJar());
+        assertFalse(dependency3.isClasspathJar());
 
         var dependency4 = new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0), "bld", "zip");
         assertNotNull(dependency4);
@@ -42,6 +48,65 @@ public class TestDependency {
         assertEquals(new VersionNumber(1, 4, 0), dependency4.version());
         assertEquals("bld", dependency4.classifier());
         assertEquals("zip", dependency4.type());
+        assertFalse(dependency4.isModularJar());
+        assertFalse(dependency4.isClasspathJar());
+
+        var dependency5 = new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0), null, "modular-jar");
+        assertNotNull(dependency5);
+        assertEquals("com.uwyn.rife2", dependency5.groupId());
+        assertEquals("rife2", dependency5.artifactId());
+        assertEquals(new VersionNumber(1, 4, 0), dependency5.version());
+        assertEquals("", dependency5.classifier());
+        assertEquals("modular-jar", dependency5.type());
+        assertTrue(dependency5.isModularJar());
+        assertFalse(dependency5.isClasspathJar());
+
+        var dependency6 = new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0), null, "classpath-jar");
+        assertNotNull(dependency6);
+        assertEquals("com.uwyn.rife2", dependency6.groupId());
+        assertEquals("rife2", dependency6.artifactId());
+        assertEquals(new VersionNumber(1, 4, 0), dependency6.version());
+        assertEquals("", dependency6.classifier());
+        assertEquals("classpath-jar", dependency6.type());
+        assertFalse(dependency6.isModularJar());
+        assertTrue(dependency6.isClasspathJar());
+    }
+
+    @Test
+    void testParent() {
+        var parent1 = new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0));
+        var parent2 = new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0), null, "modular-jar");
+        var parent3 = new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0), null, "classpath-jar");
+
+        var child1a = new Dependency("com.uwyn.rife2", "bld", new VersionNumber(1, 5, 0), null, null, null, parent1);
+        assertFalse(child1a.isModularJar());
+        assertFalse(child1a.isClasspathJar());
+        var child1b = new Dependency("com.uwyn.rife2", "bld", new VersionNumber(1, 5, 0), null, null, null, parent2);
+        assertTrue(child1b.isModularJar());
+        assertFalse(child1b.isClasspathJar());
+        var child1c = new Dependency("com.uwyn.rife2", "bld", new VersionNumber(1, 5, 0), null, null, null, parent3);
+        assertFalse(child1c.isModularJar());
+        assertFalse(child1c.isClasspathJar());
+
+        var child2a = new Dependency("com.uwyn.rife2", "bld", new VersionNumber(1, 5, 0), null, "modular-jar", null, parent1);
+        assertTrue(child2a.isModularJar());
+        assertFalse(child2a.isClasspathJar());
+        var child2b = new Dependency("com.uwyn.rife2", "bld", new VersionNumber(1, 5, 0), null, "modular-jar", null, parent2);
+        assertTrue(child2b.isModularJar());
+        assertFalse(child2b.isClasspathJar());
+        var child2c = new Dependency("com.uwyn.rife2", "bld", new VersionNumber(1, 5, 0), null, "modular-jar", null, parent3);
+        assertTrue(child2c.isModularJar());
+        assertFalse(child2c.isClasspathJar());
+
+        var child3a = new Dependency("com.uwyn.rife2", "bld", new VersionNumber(1, 5, 0), null, "classpath-jar", null, parent1);
+        assertFalse(child3a.isModularJar());
+        assertTrue(child3a.isClasspathJar());
+        var child3b = new Dependency("com.uwyn.rife2", "bld", new VersionNumber(1, 5, 0), null, "classpath-jar", null, parent2);
+        assertFalse(child3b.isModularJar());
+        assertTrue(child3b.isClasspathJar());
+        var child3c = new Dependency("com.uwyn.rife2", "bld", new VersionNumber(1, 5, 0), null, "classpath-jar", null, parent3);
+        assertFalse(child3c.isModularJar());
+        assertTrue(child3c.isClasspathJar());
     }
 
     @Test
@@ -99,7 +164,7 @@ public class TestDependency {
     }
 
     @Test
-    void testToParse() {
+    void testParse() {
         assertEquals("com.uwyn.rife2:rife2", Dependency.parse("com.uwyn.rife2:rife2").toString());
         assertEquals("com.uwyn.rife2:rife2:1.4.0", Dependency.parse("com.uwyn.rife2:rife2:1.4.0").toString());
         assertEquals("com.uwyn.rife2:rife2:1.4.0:agent", Dependency.parse("com.uwyn.rife2:rife2:1.4.0:agent").toString());
@@ -114,4 +179,102 @@ public class TestDependency {
         assertEquals(new Dependency("com.uwyn.rife2", "rife2", null, null, "zip").toString(), Dependency.parse("com.uwyn.rife2:rife2@zip").toString());
         assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0), null, "zip").toString(), Dependency.parse("com.uwyn.rife2:rife2:1.4.0@zip").toString());
     }
+
+    @Test
+    void testEquals() {
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2"), new Dependency("com.uwyn.rife2", "rife2"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2"), new Dependency("com.uwyn.rife2", "rife1"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2"), new Dependency("com.uwyn.rife1", "rife2"));
+
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)));
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,1)));
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)), new Dependency("com.uwyn.rife2", "rife2", null));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)), new Dependency("com.uwyn.rife2", "rife1", new VersionNumber(1,4,0)));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)), new Dependency("com.uwyn.rife1", "rife2", new VersionNumber(1,4,0)));
+
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)));
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,1)));
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife2", null));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife1", new VersionNumber(1,4,0)));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife1", "rife2", new VersionNumber(1,4,0)));
+
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"));
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,1), null, "jar"));
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife2", null, null, "jar"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife1", new VersionNumber(1,4,0), null, "jar"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife1", "rife2", new VersionNumber(1,4,0), null, "jar"));
+
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "modular-jar"));
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,1), null, "modular-jar"));
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife2", null, null, "modular-jar"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife1", new VersionNumber(1,4,0), null, "modular-jar"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife1", "rife2", new VersionNumber(1,4,0), null, "modular-jar"));
+
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "classpath-jar"));
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,1), null, "classpath-jar"));
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife2", null, null, "classpath-jar"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife1", new VersionNumber(1,4,0), null, "classpath-jar"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife1", "rife2", new VersionNumber(1,4,0), null, "classpath-jar"));
+
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "zip"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,1), null, "zip"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife2", null, null, "zip"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife1", new VersionNumber(1,4,0), null, "zip"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife1", "rife2", new VersionNumber(1,4,0), null, "zip"));
+
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), "agent", "jar"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,1), "agent", "jar"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife2", null, "agent", "jar"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife2", "rife1", new VersionNumber(1,4,0), "agent", "jar"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Dependency("com.uwyn.rife1", "rife2", new VersionNumber(1,4,0), "agent", "jar"));
+    }
+
+    @Test
+    void testHashcode() {
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2").hashCode(), new Dependency("com.uwyn.rife2", "rife2").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2").hashCode(), new Dependency("com.uwyn.rife2", "rife1").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2").hashCode(), new Dependency("com.uwyn.rife1", "rife2").hashCode());
+
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)).hashCode(), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)).hashCode());
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)).hashCode(), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,1)).hashCode());
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)).hashCode(), new Dependency("com.uwyn.rife2", "rife2", null).hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)).hashCode(), new Dependency("com.uwyn.rife2", "rife1", new VersionNumber(1,4,0)).hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)).hashCode(), new Dependency("com.uwyn.rife1", "rife2", new VersionNumber(1,4,0)).hashCode());
+
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)).hashCode());
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,1)).hashCode());
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife2", null).hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife1", new VersionNumber(1,4,0)).hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife1", "rife2", new VersionNumber(1,4,0)).hashCode());
+
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode());
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,1), null, "jar").hashCode());
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife2", null, null, "jar").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife1", new VersionNumber(1,4,0), null, "jar").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife1", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode());
+
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "modular-jar").hashCode());
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,1), null, "modular-jar").hashCode());
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife2", null, null, "modular-jar").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife1", new VersionNumber(1,4,0), null, "modular-jar").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife1", "rife2", new VersionNumber(1,4,0), null, "modular-jar").hashCode());
+
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "classpath-jar").hashCode());
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,1), null, "classpath-jar").hashCode());
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife2", null, null, "classpath-jar").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife1", new VersionNumber(1,4,0), null, "classpath-jar").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife1", "rife2", new VersionNumber(1,4,0), null, "classpath-jar").hashCode());
+
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "zip").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,1), null, "zip").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife2", null, null, "zip").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife1", new VersionNumber(1,4,0), null, "zip").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife1", "rife2", new VersionNumber(1,4,0), null, "zip").hashCode());
+
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), "agent", "jar").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,1), "agent", "jar").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife2", null, "agent", "jar").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife2", "rife1", new VersionNumber(1,4,0), "agent", "jar").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Dependency("com.uwyn.rife1", "rife2", new VersionNumber(1,4,0), "agent", "jar").hashCode());
+    }
 }
diff --git a/src/test/java/rife/bld/dependencies/TestDependencyResolver.java b/src/test/java/rife/bld/dependencies/TestDependencyResolver.java
index 9ee0492..ab22722 100644
--- a/src/test/java/rife/bld/dependencies/TestDependencyResolver.java
+++ b/src/test/java/rife/bld/dependencies/TestDependencyResolver.java
@@ -111,10 +111,10 @@ public class TestDependencyResolver {
 
     @Test
     void testSnapshotMetadata() {
-        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0, "SNAPSHOT")));
+        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 1, "SNAPSHOT")));
         var metadata = resolver.getSnapshotMavenMetadata();
         assertNotNull(metadata);
-        assertEquals("20230303.130437", metadata.getSnapshotTimestamp());
+        assertEquals("20230307.195509", metadata.getSnapshotTimestamp());
         assertEquals(4, metadata.getSnapshotBuildNumber());
     }
 
@@ -128,7 +128,7 @@ public class TestDependencyResolver {
 
     @Test
     void testGetCompileDependenciesRIFE2Snapshot() {
-        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0, "SNAPSHOT")));
+        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 1, "SNAPSHOT")));
         var dependencies = resolver.getDirectDependencies(compile);
         assertNotNull(dependencies);
         assertEquals(0, dependencies.size());
@@ -334,12 +334,12 @@ public class TestDependencyResolver {
 
     @Test
     void testGetCompileTransitiveDependenciesRIFE2Snapshot() {
-        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0, "SNAPSHOT")));
+        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 1, "SNAPSHOT")));
         var dependencies = resolver.getAllDependencies(compile);
         assertNotNull(dependencies);
         assertEquals(1, dependencies.size());
         assertEquals("""
-            com.uwyn.rife2:rife2:1.4.0-SNAPSHOT""", StringUtils.join(dependencies, "\n"));
+            com.uwyn.rife2:rife2:1.4.1-SNAPSHOT""", StringUtils.join(dependencies, "\n"));
     }
 
     @Test
@@ -727,17 +727,21 @@ public class TestDependencyResolver {
     void testTransferDependency()
     throws Exception {
         var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2"));
-        var tmp = Files.createTempDirectory("transfers").toFile();
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
         try {
-            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp);
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
             assertTrue(StringUtils.join(result, "\n").matches("""
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/uwyn/rife2/rife2/.*/rife2-.*.jar"""));
 
-            var files = FileUtils.getFileList(tmp);
+            var files = FileUtils.getFileList(tmp1);
             assertEquals(1, files.size());
             assertTrue(files.get(0).matches("rife2-.+\\.jar"));
+
+            assertTrue(FileUtils.getFileList(tmp2).isEmpty());
         } finally {
-            FileUtils.deleteDirectory(tmp);
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
         }
     }
 
@@ -745,18 +749,22 @@ public class TestDependencyResolver {
     void testTransferDependencySources()
     throws Exception {
         var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2"));
-        var tmp = Files.createTempDirectory("transfers").toFile();
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
         try {
-            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp, CLASSIFIER_SOURCES);
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2, CLASSIFIER_SOURCES);
             assertTrue(StringUtils.join(result, "\n").matches("""
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/uwyn/rife2/rife2/.*/rife2-.*.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/uwyn/rife2/rife2/.*/rife2-.*-sources.jar"""));
 
-            var files = FileUtils.getFileList(tmp);
+            var files = FileUtils.getFileList(tmp1);
             assertEquals(2, files.size());
             assertTrue(files.get(0).matches("rife2-.+\\.jar"));
+
+            assertTrue(FileUtils.getFileList(tmp2).isEmpty());
         } finally {
-            FileUtils.deleteDirectory(tmp);
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
         }
     }
 
@@ -764,79 +772,214 @@ public class TestDependencyResolver {
     void testTransferDependencySourcesJavadoc()
     throws Exception {
         var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2"));
-        var tmp = Files.createTempDirectory("transfers").toFile();
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
         try {
-            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp, CLASSIFIER_SOURCES, CLASSIFIER_JAVADOC);
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2, CLASSIFIER_SOURCES, CLASSIFIER_JAVADOC);
             assertTrue(StringUtils.join(result, "\n").matches("""
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/uwyn/rife2/rife2/.*/rife2-.*.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/uwyn/rife2/rife2/.*/rife2-.*-sources.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/uwyn/rife2/rife2/.*/rife2-.*-javadoc.jar"""));
 
-            var files = FileUtils.getFileList(tmp);
+            var files = FileUtils.getFileList(tmp1);
             assertEquals(3, files.size());
             assertTrue(files.get(0).matches("rife2-.+\\.jar"));
+
+            assertTrue(FileUtils.getFileList(tmp2).isEmpty());
         } finally {
-            FileUtils.deleteDirectory(tmp);
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
         }
     }
 
     @Test
     void testTransferDependencySnapshot()
     throws Exception {
-        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0, "SNAPSHOT")));
-        var tmp = Files.createTempDirectory("transfers").toFile();
+        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 1, "SNAPSHOT")));
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
         try {
-            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp);
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
             assertEquals("""
-                https://s01.oss.sonatype.org/content/repositories/snapshots/:https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/rife2/1.4.0-SNAPSHOT/rife2-1.4.0-20230303.130437-4.jar""", StringUtils.join(result, "\n"));
+                https://s01.oss.sonatype.org/content/repositories/snapshots/:https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/rife2/1.4.1-SNAPSHOT/rife2-1.4.1-20230307.195509-4.jar""", StringUtils.join(result, "\n"));
 
-            var files = FileUtils.getFileList(tmp);
+            var files = FileUtils.getFileList(tmp1);
             assertEquals(1, files.size());
-            assertTrue(files.contains("rife2-1.4.0-20230303.130437-4.jar"));
+            assertTrue(files.contains("rife2-1.4.1-20230307.195509-4.jar"));
+
+            assertTrue(FileUtils.getFileList(tmp2).isEmpty());
         } finally {
-            FileUtils.deleteDirectory(tmp);
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
         }
     }
 
     @Test
     void testTransferDependencySnapshotSources()
     throws Exception {
-        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0, "SNAPSHOT")));
-        var tmp = Files.createTempDirectory("transfers").toFile();
+        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 1, "SNAPSHOT")));
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
         try {
-            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp, CLASSIFIER_SOURCES);
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2, CLASSIFIER_SOURCES);
             assertEquals("""
-                https://s01.oss.sonatype.org/content/repositories/snapshots/:https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/rife2/1.4.0-SNAPSHOT/rife2-1.4.0-20230303.130437-4.jar
-                https://s01.oss.sonatype.org/content/repositories/snapshots/:https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/rife2/1.4.0-SNAPSHOT/rife2-1.4.0-20230303.130437-4-sources.jar""", StringUtils.join(result, "\n"));
+                https://s01.oss.sonatype.org/content/repositories/snapshots/:https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/rife2/1.4.1-SNAPSHOT/rife2-1.4.1-20230307.195509-4.jar
+                https://s01.oss.sonatype.org/content/repositories/snapshots/:https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/rife2/1.4.1-SNAPSHOT/rife2-1.4.1-20230307.195509-4-sources.jar""", StringUtils.join(result, "\n"));
 
-            var files = FileUtils.getFileList(tmp);
+            var files = FileUtils.getFileList(tmp1);
             assertEquals(2, files.size());
-            assertTrue(files.contains("rife2-1.4.0-20230303.130437-4.jar"));
-            assertTrue(files.contains("rife2-1.4.0-20230303.130437-4-sources.jar"));
+            assertTrue(files.contains("rife2-1.4.1-20230307.195509-4.jar"));
+            assertTrue(files.contains("rife2-1.4.1-20230307.195509-4-sources.jar"));
+
+            assertTrue(FileUtils.getFileList(tmp2).isEmpty());
         } finally {
-            FileUtils.deleteDirectory(tmp);
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
         }
     }
 
     @Test
     void testTransferDependencySnapshotSourcesJavadoc()
     throws Exception {
-        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0, "SNAPSHOT")));
-        var tmp = Files.createTempDirectory("transfers").toFile();
+        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 1, "SNAPSHOT")));
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
         try {
-            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp, CLASSIFIER_SOURCES, CLASSIFIER_JAVADOC);
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2, CLASSIFIER_SOURCES, CLASSIFIER_JAVADOC);
             assertEquals("""
-                https://s01.oss.sonatype.org/content/repositories/snapshots/:https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/rife2/1.4.0-SNAPSHOT/rife2-1.4.0-20230303.130437-4.jar
-                https://s01.oss.sonatype.org/content/repositories/snapshots/:https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/rife2/1.4.0-SNAPSHOT/rife2-1.4.0-20230303.130437-4-sources.jar
-                https://s01.oss.sonatype.org/content/repositories/snapshots/:https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/rife2/1.4.0-SNAPSHOT/rife2-1.4.0-20230303.130437-4-javadoc.jar""", StringUtils.join(result, "\n"));
+                https://s01.oss.sonatype.org/content/repositories/snapshots/:https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/rife2/1.4.1-SNAPSHOT/rife2-1.4.1-20230307.195509-4.jar
+                https://s01.oss.sonatype.org/content/repositories/snapshots/:https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/rife2/1.4.1-SNAPSHOT/rife2-1.4.1-20230307.195509-4-sources.jar
+                https://s01.oss.sonatype.org/content/repositories/snapshots/:https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/rife2/1.4.1-SNAPSHOT/rife2-1.4.1-20230307.195509-4-javadoc.jar""", StringUtils.join(result, "\n"));
 
-            var files = FileUtils.getFileList(tmp);
+            var files = FileUtils.getFileList(tmp1);
             assertEquals(3, files.size());
-            assertTrue(files.contains("rife2-1.4.0-20230303.130437-4.jar"));
-            assertTrue(files.contains("rife2-1.4.0-20230303.130437-4-javadoc.jar"));
-            assertTrue(files.contains("rife2-1.4.0-20230303.130437-4-sources.jar"));
+            assertTrue(files.contains("rife2-1.4.1-20230307.195509-4.jar"));
+            assertTrue(files.contains("rife2-1.4.1-20230307.195509-4-javadoc.jar"));
+            assertTrue(files.contains("rife2-1.4.1-20230307.195509-4-sources.jar"));
+
+            assertTrue(FileUtils.getFileList(tmp2).isEmpty());
         } finally {
-            FileUtils.deleteDirectory(tmp);
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
+        }
+    }
+
+    @Test
+    void testTransferDependencySourcesModule()
+    throws Exception {
+        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Module("com.uwyn.rife2", "rife2"));
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
+        try {
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2, CLASSIFIER_SOURCES);
+            assertTrue(StringUtils.join(result, "\n").matches("""
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/uwyn/rife2/rife2/.*/rife2-.*.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/uwyn/rife2/rife2/.*/rife2-.*-sources.jar"""));
+
+            assertTrue(FileUtils.getFileList(tmp1).isEmpty());
+
+            var files = FileUtils.getFileList(tmp2);
+            assertEquals(2, files.size());
+            assertTrue(files.get(0).matches("rife2-.+\\.jar"));
+        } finally {
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
+        }
+    }
+
+    @Test
+    void testTransferDependencySourcesJavadocModule()
+    throws Exception {
+        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Module("com.uwyn.rife2", "rife2"));
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
+        try {
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2, CLASSIFIER_SOURCES, CLASSIFIER_JAVADOC);
+            assertTrue(StringUtils.join(result, "\n").matches("""
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/uwyn/rife2/rife2/.*/rife2-.*.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/uwyn/rife2/rife2/.*/rife2-.*-sources.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/uwyn/rife2/rife2/.*/rife2-.*-javadoc.jar"""));
+
+            assertTrue(FileUtils.getFileList(tmp1).isEmpty());
+
+            var files = FileUtils.getFileList(tmp2);
+            assertEquals(3, files.size());
+            assertTrue(files.get(0).matches("rife2-.+\\.jar"));
+        } finally {
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
+        }
+    }
+
+    @Test
+    void testTransferDependencySnapshotModule()
+    throws Exception {
+        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Module("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 1, "SNAPSHOT")));
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
+        try {
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
+            assertEquals("""
+                https://s01.oss.sonatype.org/content/repositories/snapshots/:https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/rife2/1.4.1-SNAPSHOT/rife2-1.4.1-20230307.195509-4.jar""", StringUtils.join(result, "\n"));
+
+            assertTrue(FileUtils.getFileList(tmp1).isEmpty());
+
+            var files = FileUtils.getFileList(tmp2);
+            assertEquals(1, files.size());
+            assertTrue(files.contains("rife2-1.4.1-20230307.195509-4.jar"));
+        } finally {
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
+        }
+    }
+
+    @Test
+    void testTransferDependencySnapshotSourcesModule()
+    throws Exception {
+        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Module("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 1, "SNAPSHOT")));
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
+        try {
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2, CLASSIFIER_SOURCES);
+            assertEquals("""
+                https://s01.oss.sonatype.org/content/repositories/snapshots/:https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/rife2/1.4.1-SNAPSHOT/rife2-1.4.1-20230307.195509-4.jar
+                https://s01.oss.sonatype.org/content/repositories/snapshots/:https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/rife2/1.4.1-SNAPSHOT/rife2-1.4.1-20230307.195509-4-sources.jar""", StringUtils.join(result, "\n"));
+
+            assertTrue(FileUtils.getFileList(tmp1).isEmpty());
+
+            var files = FileUtils.getFileList(tmp2);
+            assertEquals(2, files.size());
+            assertTrue(files.contains("rife2-1.4.1-20230307.195509-4.jar"));
+            assertTrue(files.contains("rife2-1.4.1-20230307.195509-4-sources.jar"));
+        } finally {
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
+        }
+    }
+
+    @Test
+    void testTransferDependencySnapshotSourcesJavadocModule()
+    throws Exception {
+        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Module("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 1, "SNAPSHOT")));
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
+        try {
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2, CLASSIFIER_SOURCES, CLASSIFIER_JAVADOC);
+            assertEquals("""
+                https://s01.oss.sonatype.org/content/repositories/snapshots/:https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/rife2/1.4.1-SNAPSHOT/rife2-1.4.1-20230307.195509-4.jar
+                https://s01.oss.sonatype.org/content/repositories/snapshots/:https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/rife2/1.4.1-SNAPSHOT/rife2-1.4.1-20230307.195509-4-sources.jar
+                https://s01.oss.sonatype.org/content/repositories/snapshots/:https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/rife2/1.4.1-SNAPSHOT/rife2-1.4.1-20230307.195509-4-javadoc.jar""", StringUtils.join(result, "\n"));
+
+            assertTrue(FileUtils.getFileList(tmp1).isEmpty());
+
+            var files = FileUtils.getFileList(tmp2);
+            assertEquals(3, files.size());
+            assertTrue(files.contains("rife2-1.4.1-20230307.195509-4.jar"));
+            assertTrue(files.contains("rife2-1.4.1-20230307.195509-4-javadoc.jar"));
+            assertTrue(files.contains("rife2-1.4.1-20230307.195509-4-sources.jar"));
+        } finally {
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
         }
     }
 
@@ -844,9 +987,10 @@ public class TestDependencyResolver {
     void testTransferDependencyJetty()
     throws Exception {
         var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
-        var tmp = Files.createTempDirectory("transfers").toFile();
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
         try {
-            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp);
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
             assertEquals("""
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/11.0.14/jetty-server-11.0.14.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/toolchain/jetty-jakarta-servlet-api/5.0.2/jetty-jakarta-servlet-api-5.0.2.jar
@@ -855,7 +999,43 @@ public class TestDependencyResolver {
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.5/slf4j-api-2.0.5.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/11.0.14/jetty-util-11.0.14.jar""", StringUtils.join(result, "\n"));
 
-            var files = FileUtils.getFileList(tmp);
+            var files = FileUtils.getFileList(tmp1);
+            assertEquals(6, files.size());
+            Collections.sort(files);
+            assertEquals("""
+                jetty-http-11.0.14.jar
+                jetty-io-11.0.14.jar
+                jetty-jakarta-servlet-api-5.0.2.jar
+                jetty-server-11.0.14.jar
+                jetty-util-11.0.14.jar
+                slf4j-api-2.0.5.jar""", StringUtils.join(files, "\n"));
+
+            assertTrue(FileUtils.getFileList(tmp2).isEmpty());
+        } finally {
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
+        }
+    }
+
+    @Test
+    void testTransferDependencyJettyModule()
+    throws Exception {
+        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Module("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
+        try {
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
+            assertEquals("""
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/11.0.14/jetty-server-11.0.14.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/toolchain/jetty-jakarta-servlet-api/5.0.2/jetty-jakarta-servlet-api-5.0.2.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/11.0.14/jetty-http-11.0.14.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io/11.0.14/jetty-io-11.0.14.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.5/slf4j-api-2.0.5.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/11.0.14/jetty-util-11.0.14.jar""", StringUtils.join(result, "\n"));
+
+            assertTrue(FileUtils.getFileList(tmp1).isEmpty())
+            ;
+            var files = FileUtils.getFileList(tmp2);
             assertEquals(6, files.size());
             Collections.sort(files);
             assertEquals("""
@@ -866,7 +1046,8 @@ public class TestDependencyResolver {
                 jetty-util-11.0.14.jar
                 slf4j-api-2.0.5.jar""", StringUtils.join(files, "\n"));
         } finally {
-            FileUtils.deleteDirectory(tmp);
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
         }
     }
 
@@ -874,9 +1055,10 @@ public class TestDependencyResolver {
     void testTransferDependencyGoogleApi()
     throws Exception {
         var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("com.google.apis", "google-api-services-youtube", new VersionGeneric("v3-rev20240514-2.0.0")));
-        var tmp = Files.createTempDirectory("transfers").toFile();
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
         try {
-            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp);
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
             assertEquals("""
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/google/apis/google-api-services-youtube/v3-rev20240514-2.0.0/google-api-services-youtube-v3-rev20240514-2.0.0.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/google/api-client/google-api-client/2.5.0/google-api-client-2.5.0.jar
@@ -903,7 +1085,79 @@ public class TestDependencyResolver {
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/io/opencensus/opencensus-api/0.31.1/opencensus-api-0.31.1.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/io/opencensus/opencensus-contrib-http-util/0.31.1/opencensus-contrib-http-util-0.31.1.jar""", StringUtils.join(result, "\n"));
 
-            var files = FileUtils.getFileList(tmp);
+            var files = FileUtils.getFileList(tmp1);
+            assertEquals(24, files.size());
+            Collections.sort(files);
+            assertEquals("""
+                auto-value-annotations-1.10.4.jar
+                checker-qual-3.42.0.jar
+                commons-codec-1.17.0.jar
+                commons-logging-1.2.jar
+                error_prone_annotations-2.18.0.jar
+                failureaccess-1.0.2.jar
+                google-api-client-2.5.0.jar
+                google-api-services-youtube-v3-rev20240514-2.0.0.jar
+                google-auth-library-credentials-1.23.0.jar
+                google-auth-library-oauth2-http-1.23.0.jar
+                google-http-client-1.44.1.jar
+                google-http-client-apache-v2-1.44.1.jar
+                google-http-client-gson-1.44.1.jar
+                google-oauth-client-1.35.0.jar
+                grpc-context-1.60.1.jar
+                gson-2.10.1.jar
+                guava-33.2.0-jre.jar
+                httpclient-4.5.14.jar
+                httpcore-4.4.16.jar
+                j2objc-annotations-3.0.0.jar
+                jsr305-3.0.2.jar
+                listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
+                opencensus-api-0.31.1.jar
+                opencensus-contrib-http-util-0.31.1.jar""", StringUtils.join(files, "\n"));
+
+            assertTrue(FileUtils.getFileList(tmp2).isEmpty());
+        } finally {
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
+        }
+    }
+
+    @Test
+    void testTransferDependencyGoogleApiModule()
+    throws Exception {
+        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Module("com.google.apis", "google-api-services-youtube", new VersionGeneric("v3-rev20240514-2.0.0")));
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
+        try {
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
+            assertEquals("""
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/google/apis/google-api-services-youtube/v3-rev20240514-2.0.0/google-api-services-youtube-v3-rev20240514-2.0.0.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/google/api-client/google-api-client/2.5.0/google-api-client-2.5.0.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/commons-codec/commons-codec/1.17.0/commons-codec-1.17.0.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client/1.35.0/google-oauth-client-1.35.0.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/google/auth/google-auth-library-credentials/1.23.0/google-auth-library-credentials-1.23.0.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/google/auth/google-auth-library-oauth2-http/1.23.0/google-auth-library-oauth2-http-1.23.0.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/google/http-client/google-http-client-gson/1.44.1/google-http-client-gson-1.44.1.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/google/guava/guava/33.2.0-jre/guava-33.2.0-jre.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/google/http-client/google-http-client-apache-v2/1.44.1/google-http-client-apache-v2-1.44.1.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.16/httpcore-4.4.16.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.5.14/httpclient-4.5.14.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/google/http-client/google-http-client/1.44.1/google-http-client-1.44.1.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations/1.10.4/auto-value-annotations-1.10.4.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.18.0/error_prone_annotations-2.18.0.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/google/code/gson/gson/2.10.1/gson-2.10.1.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.2/failureaccess-1.0.2.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/checkerframework/checker-qual/3.42.0/checker-qual-3.42.0.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/3.0.0/j2objc-annotations-3.0.0.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/io/grpc/grpc-context/1.60.1/grpc-context-1.60.1.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/io/opencensus/opencensus-api/0.31.1/opencensus-api-0.31.1.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/io/opencensus/opencensus-contrib-http-util/0.31.1/opencensus-contrib-http-util-0.31.1.jar""", StringUtils.join(result, "\n"));
+
+            assertTrue(FileUtils.getFileList(tmp1).isEmpty());
+
+            var files = FileUtils.getFileList(tmp2);
             assertEquals(24, files.size());
             Collections.sort(files);
             assertEquals("""
@@ -932,7 +1186,8 @@ public class TestDependencyResolver {
                 opencensus-api-0.31.1.jar
                 opencensus-contrib-http-util-0.31.1.jar""", StringUtils.join(files, "\n"));
         } finally {
-            FileUtils.deleteDirectory(tmp);
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
         }
     }
 
@@ -944,9 +1199,10 @@ public class TestDependencyResolver {
             .put(PROPERTY_OVERRIDE_PREFIX + "1", "org.eclipse.jetty:jetty-io:11.0.13")
             .put(PROPERTY_OVERRIDE_PREFIX + "2", "org.eclipse.jetty:jetty-server:11.0.15"));
         var resolver = new DependencyResolver(resolution, ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
-        var tmp = Files.createTempDirectory("transfers").toFile();
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
         try {
-            var result = resolver.getAllDependencies(compile).transferIntoDirectory(resolution, ArtifactRetriever.instance(), resolver.repositories(), tmp);
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(resolution, ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
             assertEquals("""
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/11.0.15/jetty-server-11.0.15.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/toolchain/jetty-jakarta-servlet-api/5.0.2/jetty-jakarta-servlet-api-5.0.2.jar
@@ -955,7 +1211,47 @@ public class TestDependencyResolver {
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.11/slf4j-api-2.0.11.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/11.0.15/jetty-util-11.0.15.jar""", StringUtils.join(result, "\n"));
 
-            var files = FileUtils.getFileList(tmp);
+            var files = FileUtils.getFileList(tmp1);
+            assertEquals(6, files.size());
+            Collections.sort(files);
+            assertEquals("""
+                jetty-http-11.0.15.jar
+                jetty-io-11.0.13.jar
+                jetty-jakarta-servlet-api-5.0.2.jar
+                jetty-server-11.0.15.jar
+                jetty-util-11.0.15.jar
+                slf4j-api-2.0.11.jar""", StringUtils.join(files, "\n"));
+
+            assertTrue(FileUtils.getFileList(tmp2).isEmpty());
+        } finally {
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
+        }
+    }
+
+    @Test
+    void testTransferDependencyJettyOverriddenVersionsModule()
+    throws Exception {
+        var resolution = new VersionResolution(new HierarchicalProperties()
+            .put(PROPERTY_OVERRIDE_PREFIX, "org.slf4j:slf4j-api:2.0.11")
+            .put(PROPERTY_OVERRIDE_PREFIX + "1", "org.eclipse.jetty:jetty-io:11.0.13")
+            .put(PROPERTY_OVERRIDE_PREFIX + "2", "org.eclipse.jetty:jetty-server:11.0.15"));
+        var resolver = new DependencyResolver(resolution, ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Module("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
+        try {
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(resolution, ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
+            assertEquals("""
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/11.0.15/jetty-server-11.0.15.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/toolchain/jetty-jakarta-servlet-api/5.0.2/jetty-jakarta-servlet-api-5.0.2.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/11.0.15/jetty-http-11.0.15.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io/11.0.13/jetty-io-11.0.13.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.11/slf4j-api-2.0.11.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/11.0.15/jetty-util-11.0.15.jar""", StringUtils.join(result, "\n"));
+
+            assertTrue(FileUtils.getFileList(tmp1).isEmpty());
+
+            var files = FileUtils.getFileList(tmp2);
             assertEquals(6, files.size());
             Collections.sort(files);
             assertEquals("""
@@ -966,7 +1262,8 @@ public class TestDependencyResolver {
                 jetty-util-11.0.15.jar
                 slf4j-api-2.0.11.jar""", StringUtils.join(files, "\n"));
         } finally {
-            FileUtils.deleteDirectory(tmp);
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
         }
     }
 
@@ -974,9 +1271,10 @@ public class TestDependencyResolver {
     void testTransferDependencyJettySources()
     throws Exception {
         var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
-        var tmp = Files.createTempDirectory("transfers").toFile();
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
         try {
-            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp, CLASSIFIER_SOURCES);
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2, CLASSIFIER_SOURCES);
             assertEquals("""
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/11.0.14/jetty-server-11.0.14.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/11.0.14/jetty-server-11.0.14-sources.jar
@@ -991,7 +1289,55 @@ public class TestDependencyResolver {
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/11.0.14/jetty-util-11.0.14.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/11.0.14/jetty-util-11.0.14-sources.jar""", StringUtils.join(result, "\n"));
 
-            var files = FileUtils.getFileList(tmp);
+            var files = FileUtils.getFileList(tmp1);
+            assertEquals(12, files.size());
+            Collections.sort(files);
+            assertEquals("""
+                jetty-http-11.0.14-sources.jar
+                jetty-http-11.0.14.jar
+                jetty-io-11.0.14-sources.jar
+                jetty-io-11.0.14.jar
+                jetty-jakarta-servlet-api-5.0.2-sources.jar
+                jetty-jakarta-servlet-api-5.0.2.jar
+                jetty-server-11.0.14-sources.jar
+                jetty-server-11.0.14.jar
+                jetty-util-11.0.14-sources.jar
+                jetty-util-11.0.14.jar
+                slf4j-api-2.0.5-sources.jar
+                slf4j-api-2.0.5.jar""", StringUtils.join(files, "\n"));
+
+            assertTrue(FileUtils.getFileList(tmp2).isEmpty());
+        } finally {
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
+        }
+    }
+
+    @Test
+    void testTransferDependencyJettySourcesModule()
+    throws Exception {
+        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Module("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
+        try {
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2, CLASSIFIER_SOURCES);
+            assertEquals("""
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/11.0.14/jetty-server-11.0.14.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/11.0.14/jetty-server-11.0.14-sources.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/toolchain/jetty-jakarta-servlet-api/5.0.2/jetty-jakarta-servlet-api-5.0.2.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/toolchain/jetty-jakarta-servlet-api/5.0.2/jetty-jakarta-servlet-api-5.0.2-sources.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/11.0.14/jetty-http-11.0.14.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/11.0.14/jetty-http-11.0.14-sources.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io/11.0.14/jetty-io-11.0.14.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io/11.0.14/jetty-io-11.0.14-sources.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.5/slf4j-api-2.0.5.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.5/slf4j-api-2.0.5-sources.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/11.0.14/jetty-util-11.0.14.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/11.0.14/jetty-util-11.0.14-sources.jar""", StringUtils.join(result, "\n"));
+
+            assertTrue(FileUtils.getFileList(tmp1).isEmpty());
+
+            var files = FileUtils.getFileList(tmp2);
             assertEquals(12, files.size());
             Collections.sort(files);
             assertEquals("""
@@ -1008,7 +1354,8 @@ public class TestDependencyResolver {
                 slf4j-api-2.0.5-sources.jar
                 slf4j-api-2.0.5.jar""", StringUtils.join(files, "\n"));
         } finally {
-            FileUtils.deleteDirectory(tmp);
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
         }
     }
 
@@ -1016,9 +1363,10 @@ public class TestDependencyResolver {
     void testTransferDependencyJettySourcesJavadoc()
     throws Exception {
         var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
-        var tmp = Files.createTempDirectory("transfers").toFile();
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
         try {
-            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp, CLASSIFIER_SOURCES, CLASSIFIER_JAVADOC);
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2, CLASSIFIER_SOURCES, CLASSIFIER_JAVADOC);
             assertEquals("""
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/11.0.14/jetty-server-11.0.14.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/11.0.14/jetty-server-11.0.14-sources.jar
@@ -1039,7 +1387,67 @@ public class TestDependencyResolver {
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/11.0.14/jetty-util-11.0.14-sources.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/11.0.14/jetty-util-11.0.14-javadoc.jar""", StringUtils.join(result, "\n"));
 
-            var files = FileUtils.getFileList(tmp);
+            var files = FileUtils.getFileList(tmp1);
+            assertEquals(18, files.size());
+            Collections.sort(files);
+            assertEquals("""
+                jetty-http-11.0.14-javadoc.jar
+                jetty-http-11.0.14-sources.jar
+                jetty-http-11.0.14.jar
+                jetty-io-11.0.14-javadoc.jar
+                jetty-io-11.0.14-sources.jar
+                jetty-io-11.0.14.jar
+                jetty-jakarta-servlet-api-5.0.2-javadoc.jar
+                jetty-jakarta-servlet-api-5.0.2-sources.jar
+                jetty-jakarta-servlet-api-5.0.2.jar
+                jetty-server-11.0.14-javadoc.jar
+                jetty-server-11.0.14-sources.jar
+                jetty-server-11.0.14.jar
+                jetty-util-11.0.14-javadoc.jar
+                jetty-util-11.0.14-sources.jar
+                jetty-util-11.0.14.jar
+                slf4j-api-2.0.5-javadoc.jar
+                slf4j-api-2.0.5-sources.jar
+                slf4j-api-2.0.5.jar""", StringUtils.join(files, "\n"));
+
+            assertTrue(FileUtils.getFileList(tmp2).isEmpty());
+        } finally {
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
+        }
+    }
+
+    @Test
+    void testTransferDependencyJettySourcesJavadocModule()
+    throws Exception {
+        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Module("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
+        try {
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2, CLASSIFIER_SOURCES, CLASSIFIER_JAVADOC);
+            assertEquals("""
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/11.0.14/jetty-server-11.0.14.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/11.0.14/jetty-server-11.0.14-sources.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/11.0.14/jetty-server-11.0.14-javadoc.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/toolchain/jetty-jakarta-servlet-api/5.0.2/jetty-jakarta-servlet-api-5.0.2.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/toolchain/jetty-jakarta-servlet-api/5.0.2/jetty-jakarta-servlet-api-5.0.2-sources.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/toolchain/jetty-jakarta-servlet-api/5.0.2/jetty-jakarta-servlet-api-5.0.2-javadoc.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/11.0.14/jetty-http-11.0.14.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/11.0.14/jetty-http-11.0.14-sources.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/11.0.14/jetty-http-11.0.14-javadoc.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io/11.0.14/jetty-io-11.0.14.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io/11.0.14/jetty-io-11.0.14-sources.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io/11.0.14/jetty-io-11.0.14-javadoc.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.5/slf4j-api-2.0.5.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.5/slf4j-api-2.0.5-sources.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.5/slf4j-api-2.0.5-javadoc.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/11.0.14/jetty-util-11.0.14.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/11.0.14/jetty-util-11.0.14-sources.jar
+                https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/11.0.14/jetty-util-11.0.14-javadoc.jar""", StringUtils.join(result, "\n"));
+
+            assertTrue(FileUtils.getFileList(tmp1).isEmpty());
+
+            var files = FileUtils.getFileList(tmp2);
             assertEquals(18, files.size());
             Collections.sort(files);
             assertEquals("""
@@ -1062,7 +1470,8 @@ public class TestDependencyResolver {
                 slf4j-api-2.0.5-sources.jar
                 slf4j-api-2.0.5.jar""", StringUtils.join(files, "\n"));
         } finally {
-            FileUtils.deleteDirectory(tmp);
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
         }
     }
 
@@ -1070,9 +1479,10 @@ public class TestDependencyResolver {
     void testTransferDependenciesJunit()
     throws Exception {
         var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("org.junit.jupiter", "junit-jupiter", new VersionNumber(5, 9, 2)));
-        var tmp = Files.createTempDirectory("transfers").toFile();
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
         try {
-            var result = resolver.getAllDependencies(compile, runtime).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp);
+            var result = resolver.getAllDependencies(compile, runtime).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
             assertEquals("""
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter/5.9.2/junit-jupiter-5.9.2.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-api/5.9.2/junit-jupiter-api-5.9.2.jar
@@ -1083,7 +1493,7 @@ public class TestDependencyResolver {
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/junit/platform/junit-platform-engine/1.9.2/junit-platform-engine-1.9.2.jar""", StringUtils.join(result, "\n"));
 
-            var files = FileUtils.getFileList(tmp);
+            var files = FileUtils.getFileList(tmp1);
             assertEquals(8, files.size());
             Collections.sort(files);
             assertEquals("""
@@ -1095,8 +1505,11 @@ public class TestDependencyResolver {
                 junit-platform-commons-1.9.2.jar
                 junit-platform-engine-1.9.2.jar
                 opentest4j-1.2.0.jar""", StringUtils.join(files, "\n"));
+
+            assertTrue(FileUtils.getFileList(tmp2).isEmpty());
         } finally {
-            FileUtils.deleteDirectory(tmp);
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
         }
     }
 
@@ -1104,9 +1517,10 @@ public class TestDependencyResolver {
     void testTransferDependencySpringBoot()
     throws Exception {
         var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("org.springframework.boot", "spring-boot-starter", new VersionNumber(3, 0, 4)));
-        var tmp = Files.createTempDirectory("transfers").toFile();
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
         try {
-            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp);
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
             assertEquals("""
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-starter/3.0.4/spring-boot-starter-3.0.4.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/springframework/boot/spring-boot/3.0.4/spring-boot-3.0.4.jar
@@ -1127,7 +1541,7 @@ public class TestDependencyResolver {
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.4/slf4j-api-2.0.4.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.19.0/log4j-api-2.19.0.jar""", StringUtils.join(result, "\n"));
 
-            var files = FileUtils.getFileList(tmp);
+            var files = FileUtils.getFileList(tmp1);
             assertEquals(18, files.size());
             Collections.sort(files);
             assertEquals("""
@@ -1149,8 +1563,11 @@ public class TestDependencyResolver {
                 spring-core-6.0.6.jar
                 spring-expression-6.0.6.jar
                 spring-jcl-6.0.6.jar""", StringUtils.join(files, "\n"));
+
+            assertTrue(FileUtils.getFileList(tmp2).isEmpty());
         } finally {
-            FileUtils.deleteDirectory(tmp);
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
         }
     }
 
@@ -1158,9 +1575,10 @@ public class TestDependencyResolver {
     void testTransferDependencyMaven()
     throws Exception {
         var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("org.apache.maven", "maven-core", new VersionNumber(3, 9, 0)));
-        var tmp = Files.createTempDirectory("transfers").toFile();
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
         try {
-            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp);
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
             assertEquals("""
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/apache/maven/maven-core/3.9.0/maven-core-3.9.0.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/apache/maven/maven-model/3.9.0/maven-model-3.9.0.jar
@@ -1195,7 +1613,7 @@ public class TestDependencyResolver {
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-cipher/2.0/plexus-cipher-2.0.jar""", StringUtils.join(result, "\n"));
 
-            var files = FileUtils.getFileList(tmp);
+            var files = FileUtils.getFileList(tmp1);
             assertEquals(32, files.size());
             Collections.sort(files);
             assertEquals("""
@@ -1231,8 +1649,11 @@ public class TestDependencyResolver {
                 plexus-sec-dispatcher-2.0.jar
                 plexus-utils-3.4.2.jar
                 slf4j-api-1.7.36.jar""", StringUtils.join(files, "\n"));
+
+            assertTrue(FileUtils.getFileList(tmp2).isEmpty());
         } finally {
-            FileUtils.deleteDirectory(tmp);
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
         }
     }
 
@@ -1240,9 +1661,10 @@ public class TestDependencyResolver {
     void testTransferDependencyPlay()
     throws Exception {
         var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("com.typesafe.play", "play_2.13", new VersionNumber(2, 8, 19)));
-        var tmp = Files.createTempDirectory("transfers").toFile();
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
         try {
-            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp);
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
             assertEquals("""
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/typesafe/play/play_2.13/2.8.19/play_2.13-2.8.19.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.10/scala-library-2.13.10.jar
@@ -1293,7 +1715,7 @@ public class TestDependencyResolver {
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-paranamer/2.11.4/jackson-module-paranamer-2.11.4.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/thoughtworks/paranamer/paranamer/2.8/paranamer-2.8.jar""", StringUtils.join(result, "\n"));
 
-            var files = FileUtils.getFileList(tmp);
+            var files = FileUtils.getFileList(tmp1);
             assertEquals(48, files.size());
             Collections.sort(files);
             assertEquals("""
@@ -1345,8 +1767,11 @@ public class TestDependencyResolver {
                 slf4j-api-1.7.36.jar
                 ssl-config-core_2.13-0.4.3.jar
                 twirl-api_2.13-1.5.1.jar""", StringUtils.join(files, "\n"));
+
+            assertTrue(FileUtils.getFileList(tmp2).isEmpty());
         } finally {
-            FileUtils.deleteDirectory(tmp);
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
         }
     }
 
@@ -1356,9 +1781,10 @@ public class TestDependencyResolver {
         var resolution = new VersionResolution(new HierarchicalProperties()
             .put(PROPERTY_OVERRIDE_PREFIX, "org.scala-lang:scala-library:2.13.12,org.slf4j:slf4j-api:2.0.11,com.google.guava:guava:31.1-jre"));
         var resolver = new DependencyResolver(resolution, ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("com.typesafe.play", "play_2.13", new VersionNumber(2, 8, 19)));
-        var tmp = Files.createTempDirectory("transfers").toFile();
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
         try {
-            var result = resolver.getAllDependencies(compile).transferIntoDirectory(resolution, ArtifactRetriever.instance(), resolver.repositories(), tmp);
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(resolution, ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
             assertEquals("""
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/typesafe/play/play_2.13/2.8.19/play_2.13-2.8.19.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.12/scala-library-2.13.12.jar
@@ -1409,7 +1835,7 @@ public class TestDependencyResolver {
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-paranamer/2.11.4/jackson-module-paranamer-2.11.4.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/thoughtworks/paranamer/paranamer/2.8/paranamer-2.8.jar""", StringUtils.join(result, "\n"));
 
-            var files = FileUtils.getFileList(tmp);
+            var files = FileUtils.getFileList(tmp1);
             assertEquals(48, files.size());
             Collections.sort(files);
             assertEquals("""
@@ -1461,8 +1887,11 @@ public class TestDependencyResolver {
                 slf4j-api-2.0.11.jar
                 ssl-config-core_2.13-0.4.3.jar
                 twirl-api_2.13-1.5.1.jar""", StringUtils.join(files, "\n"));
+
+            assertTrue(FileUtils.getFileList(tmp2).isEmpty());
         } finally {
-            FileUtils.deleteDirectory(tmp);
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
         }
     }
 
@@ -1470,9 +1899,10 @@ public class TestDependencyResolver {
     void testTransferDependencyVaadin()
     throws Exception {
         var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("com.vaadin", "vaadin", new VersionNumber(23, 3, 7)));
-        var tmp = Files.createTempDirectory("transfers").toFile();
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
         try {
-            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp);
+            var result = resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
             assertEquals("""
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/vaadin/vaadin/23.3.7/vaadin-23.3.7.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/vaadin/vaadin-core/23.3.7/vaadin-core-23.3.7.jar
@@ -1563,7 +1993,7 @@ public class TestDependencyResolver {
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/5.11.0/jna-platform-5.11.0.jar
                 https://repo1.maven.org/maven2/:https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar""", StringUtils.join(result, "\n"));
 
-            var files = FileUtils.getFileList(tmp);
+            var files = FileUtils.getFileList(tmp1);
             assertEquals(88, files.size());
             Collections.sort(files);
             assertEquals("""
@@ -1655,8 +2085,11 @@ public class TestDependencyResolver {
                 vaadin-virtual-list-flow-23.3.7.jar
                 vaadin__vaadin-mobile-drag-drop-1.0.1.jar
                 validation-api-2.0.1.Final.jar""", StringUtils.join(files, "\n"));
+
+            assertTrue(FileUtils.getFileList(tmp2).isEmpty());
         } finally {
-            FileUtils.deleteDirectory(tmp);
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
         }
     }
 
@@ -1664,49 +2097,115 @@ public class TestDependencyResolver {
     void testTransferCheckExisting()
     throws Exception {
         var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
-        var tmp = Files.createTempDirectory("transfers").toFile();
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
         try {
-            resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp);
+            resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
 
             var modification_map = new HashMap<String, Long>();
-            Files.walk(Path.of(tmp.getAbsolutePath()))
+            Files.walk(Path.of(tmp1.getAbsolutePath()))
                 .map(path -> path.toAbsolutePath().toString())
-                .filter(s -> !s.equals(tmp.getAbsolutePath()))
+                .filter(s -> !s.equals(tmp1.getAbsolutePath()))
                 .forEach(it -> modification_map.put(it, new File(it).lastModified()));
 
+            assertTrue(FileUtils.getFileList(tmp2).isEmpty());
+
             // re-transfer and check the modification time didn't change
-            resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp);
-            Files.walk(Path.of(tmp.getAbsolutePath()))
+            resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
+            Files.walk(Path.of(tmp1.getAbsolutePath()))
                 .map(path -> path.toAbsolutePath().toString())
-                .filter(s -> !s.equals(tmp.getAbsolutePath()))
+                .filter(s -> !s.equals(tmp1.getAbsolutePath()))
                 .forEach(it -> assertEquals(modification_map.get(it), new File(it).lastModified()));
 
-            // delete one file and check that this is transfered again
+            assertTrue(FileUtils.getFileList(tmp2).isEmpty());
+
+            // delete one file and check that this is transferred again
             var first = modification_map.keySet().stream().findFirst().get();
             var first_file = new File(first);
             first_file.delete();
-            resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp);
+            resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
             assertNotEquals(first_file.lastModified(), modification_map.get(first));
             modification_map.put(first, first_file.lastModified());
-            Files.walk(Path.of(tmp.getAbsolutePath()))
+            Files.walk(Path.of(tmp1.getAbsolutePath()))
                 .map(path -> path.toAbsolutePath().toString())
-                .filter(s -> !s.equals(tmp.getAbsolutePath()))
+                .filter(s -> !s.equals(tmp1.getAbsolutePath()))
                 .forEach(it -> assertEquals(modification_map.get(it), new File(it).lastModified()));
 
-            // change one file and check that this is transfered again
+            assertTrue(FileUtils.getFileList(tmp2).isEmpty());
+
+            // change one file and check that this is transferred again
             FileUtils.writeString("stuff", first_file);
             var before_transfer_modified = first_file.lastModified();
-            resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp);
+            resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
             assertNotEquals(first_file.lastModified(), before_transfer_modified);
             modification_map.put(first, first_file.lastModified());
-            Files.walk(Path.of(tmp.getAbsolutePath()))
+            Files.walk(Path.of(tmp1.getAbsolutePath()))
                 .map(path -> path.toAbsolutePath().toString())
-                .filter(s -> !s.equals(tmp.getAbsolutePath()))
+                .filter(s -> !s.equals(tmp1.getAbsolutePath()))
                 .forEach(it -> assertEquals(modification_map.get(it), new File(it).lastModified()));
 
+            assertTrue(FileUtils.getFileList(tmp2).isEmpty());
         } finally {
-            FileUtils.deleteDirectory(tmp);
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
         }
     }
 
+    @Test
+    void testTransferCheckExistingModule()
+    throws Exception {
+        var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Module("org.eclipse.jetty", "jetty-server", new VersionNumber(11, 0, 14)));
+        var tmp1 = Files.createTempDirectory("transfers").toFile();
+        var tmp2 = Files.createTempDirectory("modules").toFile();
+        try {
+            resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
+
+            assertTrue(FileUtils.getFileList(tmp1).isEmpty());
+
+            var modification_map = new HashMap<String, Long>();
+            Files.walk(Path.of(tmp2.getAbsolutePath()))
+                .map(path -> path.toAbsolutePath().toString())
+                .filter(s -> !s.equals(tmp2.getAbsolutePath()))
+                .forEach(it -> modification_map.put(it, new File(it).lastModified()));
+
+            // re-transfer and check the modification time didn't change
+            assertTrue(FileUtils.getFileList(tmp1).isEmpty());
+
+            resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
+            Files.walk(Path.of(tmp2.getAbsolutePath()))
+                .map(path -> path.toAbsolutePath().toString())
+                .filter(s -> !s.equals(tmp2.getAbsolutePath()))
+                .forEach(it -> assertEquals(modification_map.get(it), new File(it).lastModified()));
+
+            // delete one file and check that this is transferred again
+            assertTrue(FileUtils.getFileList(tmp1).isEmpty());
+
+            var first = modification_map.keySet().stream().findFirst().get();
+            var first_file = new File(first);
+            first_file.delete();
+            resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
+            assertNotEquals(first_file.lastModified(), modification_map.get(first));
+            modification_map.put(first, first_file.lastModified());
+            Files.walk(Path.of(tmp2.getAbsolutePath()))
+                .map(path -> path.toAbsolutePath().toString())
+                .filter(s -> !s.equals(tmp2.getAbsolutePath()))
+                .forEach(it -> assertEquals(modification_map.get(it), new File(it).lastModified()));
+
+            // change one file and check that this is transferred again
+            assertTrue(FileUtils.getFileList(tmp1).isEmpty());
+
+            FileUtils.writeString("stuff", first_file);
+            var before_transfer_modified = first_file.lastModified();
+            resolver.getAllDependencies(compile).transferIntoDirectory(VersionResolution.dummy(), ArtifactRetriever.instance(), resolver.repositories(), tmp1, tmp2);
+            assertNotEquals(first_file.lastModified(), before_transfer_modified);
+            modification_map.put(first, first_file.lastModified());
+            Files.walk(Path.of(tmp2.getAbsolutePath()))
+                .map(path -> path.toAbsolutePath().toString())
+                .filter(s -> !s.equals(tmp2.getAbsolutePath()))
+                .forEach(it -> assertEquals(modification_map.get(it), new File(it).lastModified()));
+        } finally {
+            FileUtils.deleteDirectory(tmp1);
+            FileUtils.deleteDirectory(tmp2);
+        }
+    }
 }
diff --git a/src/test/java/rife/bld/dependencies/TestModule.java b/src/test/java/rife/bld/dependencies/TestModule.java
new file mode 100644
index 0000000..e788e87
--- /dev/null
+++ b/src/test/java/rife/bld/dependencies/TestModule.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2001-2023 Geert Bevin (gbevin[remove] at uwyn dot com)
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ */
+package rife.bld.dependencies;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class TestModule {
+    @Test
+    void testModule() {
+        var module1 = new Module("com.uwyn.rife2", "rife2");
+        assertNotNull(module1);
+        assertEquals("com.uwyn.rife2", module1.groupId());
+        assertEquals("rife2", module1.artifactId());
+        assertEquals(VersionNumber.UNKNOWN, module1.version());
+        assertEquals("", module1.classifier());
+        assertEquals("modular-jar", module1.type());
+        assertTrue(module1.isModularJar());
+        assertFalse(module1.isClasspathJar());
+
+        var module2 = new Module("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0));
+        assertNotNull(module2);
+        assertEquals("com.uwyn.rife2", module2.groupId());
+        assertEquals("rife2", module2.artifactId());
+        assertEquals(new VersionNumber(1, 4, 0), module2.version());
+        assertEquals("", module2.classifier());
+        assertEquals("modular-jar", module2.type());
+        assertTrue(module2.isModularJar());
+        assertFalse(module2.isClasspathJar());
+
+        var module3 = new Module("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0), "agent");
+        assertNotNull(module3);
+        assertEquals("com.uwyn.rife2", module3.groupId());
+        assertEquals("rife2", module3.artifactId());
+        assertEquals(new VersionNumber(1, 4, 0), module3.version());
+        assertEquals("agent", module3.classifier());
+        assertEquals("modular-jar", module3.type());
+        assertTrue(module3.isModularJar());
+        assertFalse(module3.isClasspathJar());
+    }
+
+    @Test
+    void testParse() {
+        assertEquals("com.uwyn.rife2:rife2@modular-jar", Module.parse("com.uwyn.rife2:rife2").toString());
+        assertEquals("com.uwyn.rife2:rife2:1.4.0@modular-jar", Module.parse("com.uwyn.rife2:rife2:1.4.0").toString());
+        assertEquals("com.uwyn.rife2:rife2:1.4.0:agent@modular-jar", Module.parse("com.uwyn.rife2:rife2:1.4.0:agent").toString());
+        assertEquals("com.uwyn.rife2:rife2@modular-jar", Module.parse("com.uwyn.rife2:rife2@modular-jar").toString());
+        assertEquals("com.uwyn.rife2:rife2:1.4.0@modular-jar", Module.parse("com.uwyn.rife2:rife2:1.4.0@modular-jar").toString());
+        assertEquals("com.uwyn.rife2:rife2:1.4.0:agent@modular-jar", Module.parse("com.uwyn.rife2:rife2:1.4.0:agent@modular-jar").toString());
+
+        assertEquals(new Module("com.uwyn.rife2", "rife2").toString(), Module.parse("com.uwyn.rife2:rife2").toString());
+        assertEquals(new Module("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0)).toString(), Module.parse("com.uwyn.rife2:rife2:1.4.0").toString());
+        assertEquals(new Module("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0), "agent").toString(), Module.parse("com.uwyn.rife2:rife2:1.4.0:agent").toString());
+        assertEquals(new Module("com.uwyn.rife2", "rife2").toString(), Module.parse("com.uwyn.rife2:rife2@modular-jar").toString());
+        assertEquals(new Module("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0)).toString(), Module.parse("com.uwyn.rife2:rife2:1.4.0@modular-jar").toString());
+        assertEquals(new Module("com.uwyn.rife2", "rife2", new VersionNumber(1, 4, 0), "agent").toString(), Module.parse("com.uwyn.rife2:rife2:1.4.0:agent@modular-jar").toString());
+    }
+
+    @Test
+    void testEquals() {
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2"), new Module("com.uwyn.rife2", "rife2"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2"), new Module("com.uwyn.rife2", "rife1"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2"), new Module("com.uwyn.rife1", "rife2"));
+
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)), new Module("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)));
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)), new Module("com.uwyn.rife2", "rife2", new VersionNumber(1,4,1)));
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)), new Module("com.uwyn.rife2", "rife2", null));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)), new Module("com.uwyn.rife2", "rife1", new VersionNumber(1,4,0)));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)), new Module("com.uwyn.rife1", "rife2", new VersionNumber(1,4,0)));
+
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Module("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)));
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Module("com.uwyn.rife2", "rife2", new VersionNumber(1,4,1)));
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Module("com.uwyn.rife2", "rife2", null));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Module("com.uwyn.rife2", "rife1", new VersionNumber(1,4,0)));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Module("com.uwyn.rife1", "rife2", new VersionNumber(1,4,0)));
+
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Module("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), "agent"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Module("com.uwyn.rife2", "rife2", new VersionNumber(1,4,1), "agent"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Module("com.uwyn.rife2", "rife2", null, "agent"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Module("com.uwyn.rife2", "rife1", new VersionNumber(1,4,0), "agent"));
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar"), new Module("com.uwyn.rife1", "rife2", new VersionNumber(1,4,0), "agent"));
+    }
+
+    @Test
+    void testHashcode() {
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2").hashCode(), new Module("com.uwyn.rife2", "rife2").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2").hashCode(), new Module("com.uwyn.rife2", "rife1").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2").hashCode(), new Module("com.uwyn.rife1", "rife2").hashCode());
+
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)).hashCode(), new Module("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)).hashCode());
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)).hashCode(), new Module("com.uwyn.rife2", "rife2", new VersionNumber(1,4,1)).hashCode());
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)).hashCode(), new Module("com.uwyn.rife2", "rife2", null).hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)).hashCode(), new Module("com.uwyn.rife2", "rife1", new VersionNumber(1,4,0)).hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)).hashCode(), new Module("com.uwyn.rife1", "rife2", new VersionNumber(1,4,0)).hashCode());
+
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Module("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0)).hashCode());
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Module("com.uwyn.rife2", "rife2", new VersionNumber(1,4,1)).hashCode());
+        assertEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Module("com.uwyn.rife2", "rife2", null).hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Module("com.uwyn.rife2", "rife1", new VersionNumber(1,4,0)).hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Module("com.uwyn.rife1", "rife2", new VersionNumber(1,4,0)).hashCode());
+
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Module("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), "agent").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Module("com.uwyn.rife2", "rife2", new VersionNumber(1,4,1), "agent").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Module("com.uwyn.rife2", "rife2", null, "agent").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Module("com.uwyn.rife2", "rife1", new VersionNumber(1,4,0), "agent").hashCode());
+        assertNotEquals(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,4,0), null, "jar").hashCode(), new Module("com.uwyn.rife1", "rife2", new VersionNumber(1,4,0), "agent").hashCode());
+    }
+}
diff --git a/src/test/java/rife/bld/operations/TestCleanOperation.java b/src/test/java/rife/bld/operations/TestCleanOperation.java
index ed8a76c..77881ce 100644
--- a/src/test/java/rife/bld/operations/TestCleanOperation.java
+++ b/src/test/java/rife/bld/operations/TestCleanOperation.java
@@ -116,10 +116,15 @@ public class TestCleanOperation {
                     /lib
                     /lib/bld
                     /lib/compile
+                    /lib/compile/modules
                     /lib/provided
+                    /lib/provided/modules
                     /lib/runtime
+                    /lib/runtime/modules
                     /lib/standalone
+                    /lib/standalone/modules
                     /lib/test
+                    /lib/test/modules
                     /src
                     /src/bld
                     /src/bld/java
@@ -140,10 +145,15 @@ public class TestCleanOperation {
                     /lib
                     /lib/bld
                     /lib/compile
+                    /lib/compile/modules
                     /lib/provided
+                    /lib/provided/modules
                     /lib/runtime
+                    /lib/runtime/modules
                     /lib/standalone
+                    /lib/standalone/modules
                     /lib/test
+                    /lib/test/modules
                     /src
                     /src/bld
                     /src/bld/java
diff --git a/src/test/java/rife/bld/operations/TestCreateAppOperation.java b/src/test/java/rife/bld/operations/TestCreateAppOperation.java
index d4d5c32..0eed360 100644
--- a/src/test/java/rife/bld/operations/TestCreateAppOperation.java
+++ b/src/test/java/rife/bld/operations/TestCreateAppOperation.java
@@ -95,8 +95,11 @@ public class TestCreateAppOperation {
                     /myapp/lib/bld/bld-wrapper\\.jar
                     /myapp/lib/bld/bld-wrapper\\.properties
                     /myapp/lib/compile
+                    /myapp/lib/compile/modules
                     /myapp/lib/provided
+                    /myapp/lib/provided/modules
                     /myapp/lib/runtime
+                    /myapp/lib/runtime/modules
                     /myapp/lib/test
                     /myapp/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar
                     /myapp/lib/test/apiguardian-api-1\\.1\\.2\\.jar
@@ -114,6 +117,7 @@ public class TestCreateAppOperation {
                     /myapp/lib/test/junit-platform-console-standalone-1\\.10\\.3\\.jar
                     /myapp/lib/test/junit-platform-engine-1\\.10\\.3-sources\\.jar
                     /myapp/lib/test/junit-platform-engine-1\\.10\\.3\\.jar
+                    /myapp/lib/test/modules
                     /myapp/lib/test/opentest4j-1\\.3\\.0-sources\\.jar
                     /myapp/lib/test/opentest4j-1\\.3\\.0\\.jar
                     /myapp/src
@@ -175,8 +179,11 @@ public class TestCreateAppOperation {
                     /myapp/lib/bld/bld-wrapper\\.jar
                     /myapp/lib/bld/bld-wrapper\\.properties
                     /myapp/lib/compile
+                    /myapp/lib/compile/modules
                     /myapp/lib/provided
+                    /myapp/lib/provided/modules
                     /myapp/lib/runtime
+                    /myapp/lib/runtime/modules
                     /myapp/lib/test
                     /myapp/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar
                     /myapp/lib/test/apiguardian-api-1\\.1\\.2\\.jar
@@ -194,6 +201,7 @@ public class TestCreateAppOperation {
                     /myapp/lib/test/junit-platform-console-standalone-1\\.10\\.3\\.jar
                     /myapp/lib/test/junit-platform-engine-1\\.10\\.3-sources\\.jar
                     /myapp/lib/test/junit-platform-engine-1\\.10\\.3\\.jar
+                    /myapp/lib/test/modules
                     /myapp/lib/test/opentest4j-1\\.3\\.0-sources\\.jar
                     /myapp/lib/test/opentest4j-1\\.3\\.0\\.jar
                     /myapp/src
@@ -268,9 +276,13 @@ public class TestCreateAppOperation {
                     /yourthing/lib/bld/bld-wrapper.jar
                     /yourthing/lib/bld/bld-wrapper.properties
                     /yourthing/lib/compile
+                    /yourthing/lib/compile/modules
                     /yourthing/lib/provided
+                    /yourthing/lib/provided/modules
                     /yourthing/lib/runtime
+                    /yourthing/lib/runtime/modules
                     /yourthing/lib/test
+                    /yourthing/lib/test/modules
                     /yourthing/src
                     /yourthing/src/bld
                     /yourthing/src/bld/java
@@ -374,6 +386,7 @@ public class TestCreateAppOperation {
                 /myapp/lib/bld/bld-wrapper\\.jar
                 /myapp/lib/bld/bld-wrapper\\.properties
                 /myapp/lib/compile
+                /myapp/lib/compile/modules
                 /myapp/lib/local
                 /myapp/lib/local/apiguardian-api-1\\.1\\.2-sources\\.jar
                 /myapp/lib/local/apiguardian-api-1\\.1\\.2\\.jar
@@ -394,8 +407,11 @@ public class TestCreateAppOperation {
                 /myapp/lib/local/opentest4j-1\\.3\\.0-sources\\.jar
                 /myapp/lib/local/opentest4j-1\\.3\\.0\\.jar
                 /myapp/lib/provided
+                /myapp/lib/provided/modules
                 /myapp/lib/runtime
+                /myapp/lib/runtime/modules
                 /myapp/lib/test
+                /myapp/lib/test/modules
                 /myapp/src
                 /myapp/src/bld
                 /myapp/src/bld/java
@@ -495,6 +511,7 @@ public class TestCreateAppOperation {
                 /myapp/lib/bld/bld-wrapper\\.jar
                 /myapp/lib/bld/bld-wrapper\\.properties
                 /myapp/lib/compile
+                /myapp/lib/compile/modules
                 /myapp/lib/local_compile
                 /myapp/lib/local_test
                 /myapp/lib/local_test/apiguardian-api-1\\.1\\.2-sources\\.jar
@@ -516,8 +533,11 @@ public class TestCreateAppOperation {
                 /myapp/lib/local_test/opentest4j-1\\.3\\.0-sources\\.jar
                 /myapp/lib/local_test/opentest4j-1\\.3\\.0\\.jar
                 /myapp/lib/provided
+                /myapp/lib/provided/modules
                 /myapp/lib/runtime
+                /myapp/lib/runtime/modules
                 /myapp/lib/test
+                /myapp/lib/test/modules
                 /myapp/src
                 /myapp/src/bld
                 /myapp/src/bld/java
diff --git a/src/test/java/rife/bld/operations/TestCreateBaseOperation.java b/src/test/java/rife/bld/operations/TestCreateBaseOperation.java
index d410755..9731537 100644
--- a/src/test/java/rife/bld/operations/TestCreateBaseOperation.java
+++ b/src/test/java/rife/bld/operations/TestCreateBaseOperation.java
@@ -88,9 +88,13 @@ public class TestCreateBaseOperation {
                     /myapp/lib/bld/bld-wrapper\\.jar
                     /myapp/lib/bld/bld-wrapper\\.properties
                     /myapp/lib/compile
+                    /myapp/lib/compile/modules
                     /myapp/lib/provided
+                    /myapp/lib/provided/modules
                     /myapp/lib/runtime
+                    /myapp/lib/runtime/modules
                     /myapp/lib/test
+                    /myapp/lib/test/modules
                     /myapp/src
                     /myapp/src/bld
                     /myapp/src/bld/java
@@ -150,9 +154,13 @@ public class TestCreateBaseOperation {
                     /myapp/lib/bld/bld-wrapper\\.jar
                     /myapp/lib/bld/bld-wrapper\\.properties
                     /myapp/lib/compile
+                    /myapp/lib/compile/modules
                     /myapp/lib/provided
+                    /myapp/lib/provided/modules
                     /myapp/lib/runtime
+                    /myapp/lib/runtime/modules
                     /myapp/lib/test
+                    /myapp/lib/test/modules
                     /myapp/src
                     /myapp/src/bld
                     /myapp/src/bld/java
@@ -225,9 +233,13 @@ public class TestCreateBaseOperation {
                     /yourthing/lib/bld/bld-wrapper.jar
                     /yourthing/lib/bld/bld-wrapper.properties
                     /yourthing/lib/compile
+                    /yourthing/lib/compile/modules
                     /yourthing/lib/provided
+                    /yourthing/lib/provided/modules
                     /yourthing/lib/runtime
+                    /yourthing/lib/runtime/modules
                     /yourthing/lib/test
+                    /yourthing/lib/test/modules
                     /yourthing/src
                     /yourthing/src/bld
                     /yourthing/src/bld/java
@@ -288,9 +300,13 @@ public class TestCreateBaseOperation {
                     /yourthing/lib/bld/bld-wrapper.jar
                     /yourthing/lib/bld/bld-wrapper.properties
                     /yourthing/lib/compile
+                    /yourthing/lib/compile/modules
                     /yourthing/lib/provided
+                    /yourthing/lib/provided/modules
                     /yourthing/lib/runtime
+                    /yourthing/lib/runtime/modules
                     /yourthing/lib/test
+                    /yourthing/lib/test/modules
                     /yourthing/src
                     /yourthing/src/bld
                     /yourthing/src/bld/java
diff --git a/src/test/java/rife/bld/operations/TestCreateLibOperation.java b/src/test/java/rife/bld/operations/TestCreateLibOperation.java
index 9e7066e..0aa7b99 100644
--- a/src/test/java/rife/bld/operations/TestCreateLibOperation.java
+++ b/src/test/java/rife/bld/operations/TestCreateLibOperation.java
@@ -87,8 +87,11 @@ public class TestCreateLibOperation {
                 /myapp/lib/bld/bld-wrapper\\.jar
                 /myapp/lib/bld/bld-wrapper\\.properties
                 /myapp/lib/compile
+                /myapp/lib/compile/modules
                 /myapp/lib/provided
+                /myapp/lib/provided/modules
                 /myapp/lib/runtime
+                /myapp/lib/runtime/modules
                 /myapp/lib/test
                 /myapp/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar
                 /myapp/lib/test/apiguardian-api-1\\.1\\.2\\.jar
@@ -106,6 +109,7 @@ public class TestCreateLibOperation {
                 /myapp/lib/test/junit-platform-console-standalone-1\\.10\\.3\\.jar
                 /myapp/lib/test/junit-platform-engine-1\\.10\\.3-sources\\.jar
                 /myapp/lib/test/junit-platform-engine-1\\.10\\.3\\.jar
+                /myapp/lib/test/modules
                 /myapp/lib/test/opentest4j-1\\.3\\.0-sources\\.jar
                 /myapp/lib/test/opentest4j-1\\.3\\.0\\.jar
                 /myapp/src
@@ -166,8 +170,11 @@ public class TestCreateLibOperation {
                 /myapp/lib/bld/bld-wrapper\\.jar
                 /myapp/lib/bld/bld-wrapper\\.properties
                 /myapp/lib/compile
+                /myapp/lib/compile/modules
                 /myapp/lib/provided
+                /myapp/lib/provided/modules
                 /myapp/lib/runtime
+                /myapp/lib/runtime/modules
                 /myapp/lib/test
                 /myapp/lib/test/apiguardian-api-1\\.1\\.2-sources\\.jar
                 /myapp/lib/test/apiguardian-api-1\\.1\\.2\\.jar
@@ -185,6 +192,7 @@ public class TestCreateLibOperation {
                 /myapp/lib/test/junit-platform-console-standalone-1\\.10\\.3\\.jar
                 /myapp/lib/test/junit-platform-engine-1\\.10\\.3-sources\\.jar
                 /myapp/lib/test/junit-platform-engine-1\\.10\\.3\\.jar
+                /myapp/lib/test/modules
                 /myapp/lib/test/opentest4j-1\\.3\\.0-sources\\.jar
                 /myapp/lib/test/opentest4j-1\\.3\\.0\\.jar
                 /myapp/src
diff --git a/src/test/java/rife/bld/operations/TestCreateRife2Operation.java b/src/test/java/rife/bld/operations/TestCreateRife2Operation.java
index 97025be..9934cbd 100644
--- a/src/test/java/rife/bld/operations/TestCreateRife2Operation.java
+++ b/src/test/java/rife/bld/operations/TestCreateRife2Operation.java
@@ -100,10 +100,13 @@ public class TestCreateRife2Operation {
                     /myapp/lib/bld/bld-wrapper\\.jar
                     /myapp/lib/bld/bld-wrapper\\.properties
                     /myapp/lib/compile
+                    /myapp/lib/compile/modules
                     /myapp/lib/compile/rife2-.+-sources\\.jar
                     /myapp/lib/compile/rife2-.+\\.jar
                     /myapp/lib/provided
+                    /myapp/lib/provided/modules
                     /myapp/lib/runtime
+                    /myapp/lib/runtime/modules
                     /myapp/lib/standalone
                     /myapp/lib/standalone/jakarta\\.servlet-api-6\\.0\\.0-sources\\.jar
                     /myapp/lib/standalone/jakarta\\.servlet-api-6\\.0\\.0\\.jar
@@ -121,6 +124,7 @@ public class TestCreateRife2Operation {
                     /myapp/lib/standalone/jetty-session-12\\.0\\.11\\.jar
                     /myapp/lib/standalone/jetty-util-12\\.0\\.11-sources\\.jar
                     /myapp/lib/standalone/jetty-util-12\\.0\\.11\\.jar
+                    /myapp/lib/standalone/modules
                     /myapp/lib/standalone/slf4j-api-2\\.0\\.13-sources\\.jar
                     /myapp/lib/standalone/slf4j-api-2\\.0\\.13\\.jar
                     /myapp/lib/standalone/slf4j-simple-2\\.0\\.13-sources\\.jar
@@ -144,6 +148,7 @@ public class TestCreateRife2Operation {
                     /myapp/lib/test/junit-platform-console-standalone-1\\.10\\.3\\.jar
                     /myapp/lib/test/junit-platform-engine-1\\.10\\.3-sources\\.jar
                     /myapp/lib/test/junit-platform-engine-1\\.10\\.3\\.jar
+                    /myapp/lib/test/modules
                     /myapp/lib/test/opentest4j-1\\.3\\.0-sources\\.jar
                     /myapp/lib/test/opentest4j-1\\.3\\.0\\.jar
                     /myapp/src
@@ -214,10 +219,13 @@ public class TestCreateRife2Operation {
                     /myapp/lib/bld/bld-wrapper\\.jar
                     /myapp/lib/bld/bld-wrapper\\.properties
                     /myapp/lib/compile
+                    /myapp/lib/compile/modules
                     /myapp/lib/compile/rife2-.+-sources\\.jar
                     /myapp/lib/compile/rife2-.+\\.jar
                     /myapp/lib/provided
+                    /myapp/lib/provided/modules
                     /myapp/lib/runtime
+                    /myapp/lib/runtime/modules
                     /myapp/lib/standalone
                     /myapp/lib/standalone/jakarta\\.servlet-api-6\\.0\\.0-sources\\.jar
                     /myapp/lib/standalone/jakarta\\.servlet-api-6\\.0\\.0\\.jar
@@ -235,6 +243,7 @@ public class TestCreateRife2Operation {
                     /myapp/lib/standalone/jetty-session-12\\.0\\.11\\.jar
                     /myapp/lib/standalone/jetty-util-12\\.0\\.11-sources\\.jar
                     /myapp/lib/standalone/jetty-util-12\\.0\\.11\\.jar
+                    /myapp/lib/standalone/modules
                     /myapp/lib/standalone/slf4j-api-2\\.0\\.13-sources\\.jar
                     /myapp/lib/standalone/slf4j-api-2\\.0\\.13\\.jar
                     /myapp/lib/standalone/slf4j-simple-2\\.0\\.13-sources\\.jar
@@ -258,6 +267,7 @@ public class TestCreateRife2Operation {
                     /myapp/lib/test/junit-platform-console-standalone-1\\.10\\.3\\.jar
                     /myapp/lib/test/junit-platform-engine-1\\.10\\.3-sources\\.jar
                     /myapp/lib/test/junit-platform-engine-1\\.10\\.3\\.jar
+                    /myapp/lib/test/modules
                     /myapp/lib/test/opentest4j-1\\.3\\.0-sources\\.jar
                     /myapp/lib/test/opentest4j-1\\.3\\.0\\.jar
                     /myapp/src
@@ -347,10 +357,15 @@ public class TestCreateRife2Operation {
                     /yourthing/lib/bld/bld-wrapper.jar
                     /yourthing/lib/bld/bld-wrapper.properties
                     /yourthing/lib/compile
+                    /yourthing/lib/compile/modules
                     /yourthing/lib/provided
+                    /yourthing/lib/provided/modules
                     /yourthing/lib/runtime
+                    /yourthing/lib/runtime/modules
                     /yourthing/lib/standalone
+                    /yourthing/lib/standalone/modules
                     /yourthing/lib/test
+                    /yourthing/lib/test/modules
                     /yourthing/src
                     /yourthing/src/bld
                     /yourthing/src/bld/java
@@ -388,7 +403,7 @@ public class TestCreateRife2Operation {
             compile_operation.fromProject(create_operation.project());
             assertThrows(ExitStatusException.class, compile_operation::execute);
             var diagnostics = compile_operation.diagnostics();
-            assertEquals(16, diagnostics.size());
+            assertFalse(diagnostics.isEmpty());
         } finally {
             FileUtils.deleteDirectory(tmp);
         }
@@ -468,6 +483,7 @@ public class TestCreateRife2Operation {
                 /myapp/lib/bld/bld-wrapper\\.jar
                 /myapp/lib/bld/bld-wrapper\\.properties
                 /myapp/lib/compile
+                /myapp/lib/compile/modules
                 /myapp/lib/local
                 /myapp/lib/local/apiguardian-api-1\\.1\\.2-sources\\.jar
                 /myapp/lib/local/apiguardian-api-1\\.1\\.2\\.jar
@@ -512,9 +528,13 @@ public class TestCreateRife2Operation {
                 /myapp/lib/local/slf4j-simple-2\\.0\\.13-sources\\.jar
                 /myapp/lib/local/slf4j-simple-2\\.0\\.13\\.jar
                 /myapp/lib/provided
+                /myapp/lib/provided/modules
                 /myapp/lib/runtime
+                /myapp/lib/runtime/modules
                 /myapp/lib/standalone
+                /myapp/lib/standalone/modules
                 /myapp/lib/test
+                /myapp/lib/test/modules
                 /myapp/src
                 /myapp/src/bld
                 /myapp/src/bld/java
@@ -636,6 +656,7 @@ public class TestCreateRife2Operation {
                 /myapp/lib/bld/bld-wrapper\\.jar
                 /myapp/lib/bld/bld-wrapper\\.properties
                 /myapp/lib/compile
+                /myapp/lib/compile/modules
                 /myapp/lib/local_compile
                 /myapp/lib/local_compile/rife2-.*-sources\\.jar
                 /myapp/lib/local_compile/rife2-.*\\.jar
@@ -682,9 +703,13 @@ public class TestCreateRife2Operation {
                 /myapp/lib/local_test/opentest4j-1\\.3\\.0-sources\\.jar
                 /myapp/lib/local_test/opentest4j-1\\.3\\.0\\.jar
                 /myapp/lib/provided
+                /myapp/lib/provided/modules
                 /myapp/lib/runtime
+                /myapp/lib/runtime/modules
                 /myapp/lib/standalone
+                /myapp/lib/standalone/modules
                 /myapp/lib/test
+                /myapp/lib/test/modules
                 /myapp/src
                 /myapp/src/bld
                 /myapp/src/bld/java
diff --git a/src/test/java/rife/bld/operations/TestDependencyTreeOperation.java b/src/test/java/rife/bld/operations/TestDependencyTreeOperation.java
index 4b5fe73..9f35202 100644
--- a/src/test/java/rife/bld/operations/TestDependencyTreeOperation.java
+++ b/src/test/java/rife/bld/operations/TestDependencyTreeOperation.java
@@ -8,6 +8,7 @@ import org.junit.jupiter.api.Test;
 import rife.bld.BldVersion;
 import rife.bld.WebProject;
 import rife.bld.dependencies.*;
+import rife.bld.dependencies.Module;
 import rife.bld.wrapper.Wrapper;
 import rife.tools.FileUtils;
 import rife.tools.StringUtils;
@@ -72,7 +73,7 @@ public class TestDependencyTreeOperation {
                 .repositories(List.of(Repository.MAVEN_CENTRAL));
             operation.dependencies().scope(Scope.compile)
                 .include(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,5,20)))
-                .include(new Dependency("com.stripe", "stripe-java", new VersionNumber(20,136,0)))
+                .include(new Module("com.stripe", "stripe-java", new VersionNumber(20,136,0)))
                 .include(new Dependency("org.json", "json", new VersionNumber(20230227)))
                 .include(new Dependency("com.itextpdf", "itext7-core", new VersionNumber(7,2,5)))
                 .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2,0,7)))
@@ -93,7 +94,7 @@ public class TestDependencyTreeOperation {
                 
                 compile:
                 ├─ com.uwyn.rife2:rife2:1.5.20
-                ├─ com.stripe:stripe-java:20.136.0
+                ├─ com.stripe:stripe-java:20.136.0@modular-jar
                 ├─ org.json:json:20230227
                 ├─ com.itextpdf:itext7-core:7.2.5
                 │  ├─ com.itextpdf:barcodes:7.2.5
@@ -150,12 +151,12 @@ public class TestDependencyTreeOperation {
                 .include(new Dependency("org.eclipse.jetty", "jetty-servlet", new VersionNumber(11,0,15)).exclude("*", "jetty-jakarta-servlet-api"))
                 .include(new Dependency("org.apache.tomcat.embed", "tomcat-embed-core", new VersionNumber(10,1,12)))
                 .include(new Dependency("org.apache.tomcat.embed", "tomcat-embed-jasper", new VersionNumber(10,1,12)))
-                .include(new Dependency("net.imagej", "ij", Version.parse("1.54d")));
+                .include(new Module("net.imagej", "ij", Version.parse("1.54d")));
             operation.dependencies().scope(Scope.test)
                 .include(new Dependency("org.jsoup", "jsoup", new VersionNumber(1,16,1)))
                 .include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(5,0,0)))
                 .include(new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11,0,15)).exclude("*", "jetty-jakarta-servlet-api"))
-                .include(new Dependency("org.eclipse.jetty", "jetty-servlet", new VersionNumber(11,0,15)).exclude("*", "jetty-jakarta-servlet-api"))
+                .include(new Module("org.eclipse.jetty", "jetty-servlet", new VersionNumber(11,0,15)).exclude("*", "jetty-jakarta-servlet-api"))
                 .include(new Dependency("net.imagej", "ij", Version.parse("1.54d")));
 
             operation.execute();
@@ -184,7 +185,7 @@ public class TestDependencyTreeOperation {
                 ├─ org.apache.tomcat.embed:tomcat-embed-jasper:10.1.12
                 │  ├─ org.apache.tomcat.embed:tomcat-embed-el:10.1.12
                 │  └─ org.eclipse.jdt:ecj:3.33.0
-                └─ net.imagej:ij:1.54d
+                └─ net.imagej:ij:1.54d@modular-jar
                                 
                 runtime:
                 no dependencies
@@ -197,8 +198,8 @@ public class TestDependencyTreeOperation {
                 │  │  └─ org.eclipse.jetty:jetty-util:11.0.15
                 │  ├─ org.eclipse.jetty:jetty-io:11.0.15
                 │  └─ org.slf4j:slf4j-api:2.0.5
-                ├─ org.eclipse.jetty:jetty-servlet:11.0.15
-                │  └─ org.eclipse.jetty:jetty-security:11.0.15
+                ├─ org.eclipse.jetty:jetty-servlet:11.0.15@modular-jar
+                │  └─ org.eclipse.jetty:jetty-security:11.0.15@modular-jar
                 └─ net.imagej:ij:1.54d
                 
                 """), tree);
@@ -390,7 +391,7 @@ public class TestDependencyTreeOperation {
                 .include(new Dependency("com.uwyn.rife2", "rife2", new VersionNumber(1,5,20)))
                 .include(new Dependency("com.stripe", "stripe-java", new VersionNumber(20,136,0)))
                 .include(new Dependency("org.json", "json", new VersionNumber(20230227)))
-                .include(new Dependency("com.itextpdf", "itext7-core", new VersionNumber(7,2,5)))
+                .include(new Module("com.itextpdf", "itext7-core", new VersionNumber(7,2,5)))
                 .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2,0,7)))
                 .include(new Dependency("org.apache.thrift", "libthrift", new VersionNumber(0,17,0)))
                 .include(new Dependency("commons-codec", "commons-codec", new VersionNumber(1,15)))
@@ -411,7 +412,7 @@ public class TestDependencyTreeOperation {
                 .include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(5,0,0)))
                 .include(new Dependency("org.eclipse.jetty", "jetty-server", new VersionNumber(11,0,15)).exclude("*", "jetty-jakarta-servlet-api"))
                 .include(new Dependency("org.eclipse.jetty", "jetty-servlet", new VersionNumber(11,0,15)).exclude("*", "jetty-jakarta-servlet-api"))
-                .include(new Dependency("net.imagej", "ij", Version.parse("1.54d")));
+                .include(new Module("net.imagej", "ij", Version.parse("1.54d")));
 
             var operation = new DependencyTreeOperation()
                 .fromProject(project);
@@ -442,22 +443,22 @@ public class TestDependencyTreeOperation {
                 ├─ com.uwyn.rife2:rife2:1.5.20
                 ├─ com.stripe:stripe-java:20.136.0
                 ├─ org.json:json:20230227
-                ├─ com.itextpdf:itext7-core:7.2.5
-                │  ├─ com.itextpdf:barcodes:7.2.5
-                │  ├─ com.itextpdf:font-asian:7.2.5
-                │  ├─ com.itextpdf:forms:7.2.5
-                │  ├─ com.itextpdf:hyph:7.2.5
-                │  ├─ com.itextpdf:io:7.2.5
-                │  │  └─ com.itextpdf:commons:7.2.5
-                │  ├─ com.itextpdf:kernel:7.2.5
-                │  │  ├─ org.bouncycastle:bcpkix-jdk15on:1.70
-                │  │  │  └─ org.bouncycastle:bcutil-jdk15on:1.70
-                │  │  └─ org.bouncycastle:bcprov-jdk15on:1.70
-                │  ├─ com.itextpdf:layout:7.2.5
-                │  ├─ com.itextpdf:pdfa:7.2.5
-                │  ├─ com.itextpdf:sign:7.2.5
-                │  ├─ com.itextpdf:styled-xml-parser:7.2.5
-                │  └─ com.itextpdf:svg:7.2.5
+                ├─ com.itextpdf:itext7-core:7.2.5@modular-jar
+                │  ├─ com.itextpdf:barcodes:7.2.5@modular-jar
+                │  ├─ com.itextpdf:font-asian:7.2.5@modular-jar
+                │  ├─ com.itextpdf:forms:7.2.5@modular-jar
+                │  ├─ com.itextpdf:hyph:7.2.5@modular-jar
+                │  ├─ com.itextpdf:io:7.2.5@modular-jar
+                │  │  └─ com.itextpdf:commons:7.2.5@modular-jar
+                │  ├─ com.itextpdf:kernel:7.2.5@modular-jar
+                │  │  ├─ org.bouncycastle:bcpkix-jdk15on:1.70@modular-jar
+                │  │  │  └─ org.bouncycastle:bcutil-jdk15on:1.70@modular-jar
+                │  │  └─ org.bouncycastle:bcprov-jdk15on:1.70@modular-jar
+                │  ├─ com.itextpdf:layout:7.2.5@modular-jar
+                │  ├─ com.itextpdf:pdfa:7.2.5@modular-jar
+                │  ├─ com.itextpdf:sign:7.2.5@modular-jar
+                │  ├─ com.itextpdf:styled-xml-parser:7.2.5@modular-jar
+                │  └─ com.itextpdf:svg:7.2.5@modular-jar
                 ├─ org.slf4j:slf4j-simple:2.0.7
                 │  └─ org.slf4j:slf4j-api:2.0.7
                 ├─ org.apache.thrift:libthrift:0.17.0
@@ -498,7 +499,7 @@ public class TestDependencyTreeOperation {
                 │  └─ org.slf4j:slf4j-api:2.0.5
                 ├─ org.eclipse.jetty:jetty-servlet:11.0.15
                 │  └─ org.eclipse.jetty:jetty-security:11.0.15
-                └─ net.imagej:ij:1.54d
+                └─ net.imagej:ij:1.54d@modular-jar
                 
                 """), tree);
         } finally {
diff --git a/src/test/java/rife/bld/operations/TestDownloadOperation.java b/src/test/java/rife/bld/operations/TestDownloadOperation.java
index e44d947..57f4223 100644
--- a/src/test/java/rife/bld/operations/TestDownloadOperation.java
+++ b/src/test/java/rife/bld/operations/TestDownloadOperation.java
@@ -7,6 +7,7 @@ package rife.bld.operations;
 import org.junit.jupiter.api.Test;
 import rife.bld.WebProject;
 import rife.bld.dependencies.*;
+import rife.bld.dependencies.Module;
 import rife.tools.FileUtils;
 
 import java.io.File;
@@ -23,10 +24,15 @@ public class TestDownloadOperation {
         assertTrue(operation.dependencies().isEmpty());
         assertTrue(operation.repositories().isEmpty());
         assertNull(operation.libCompileDirectory());
+        assertNull(operation.libCompileModulesDirectory());
         assertNull(operation.libProvidedDirectory());
+        assertNull(operation.libProvidedModulesDirectory());
         assertNull(operation.libRuntimeDirectory());
+        assertNull(operation.libRuntimeModulesDirectory());
         assertNull(operation.libStandaloneDirectory());
+        assertNull(operation.libStandaloneModulesDirectory());
         assertNull(operation.libTestDirectory());
+        assertNull(operation.libTestModulesDirectory());
     }
 
     @Test
@@ -40,6 +46,11 @@ public class TestDownloadOperation {
         var dir3 = new File("dir3");
         var dir4 = new File("dir4");
         var dir5 = new File("dir5");
+        var dir6 = new File("dir6");
+        var dir7 = new File("dir7");
+        var dir8 = new File("dir8");
+        var dir9 = new File("dir9");
+        var dir10 = new File("dir10");
 
         var operation1 = new DownloadOperation()
             .repositories(List.of(repository1, repository2))
@@ -47,7 +58,12 @@ public class TestDownloadOperation {
             .libProvidedDirectory(dir2)
             .libRuntimeDirectory(dir3)
             .libStandaloneDirectory(dir4)
-            .libTestDirectory(dir5);
+            .libTestDirectory(dir5)
+            .libCompileModulesDirectory(dir6)
+            .libProvidedModulesDirectory(dir7)
+            .libRuntimeModulesDirectory(dir8)
+            .libStandaloneModulesDirectory(dir9)
+            .libTestModulesDirectory(dir10);
         var dependency_scopes = new DependencyScopes();
         dependency_scopes.scope(Scope.compile).include(dependency1).include(dependency2);
         operation1.dependencies(dependency_scopes);
@@ -60,13 +76,23 @@ public class TestDownloadOperation {
         assertEquals(dir3, operation1.libRuntimeDirectory());
         assertEquals(dir4, operation1.libStandaloneDirectory());
         assertEquals(dir5, operation1.libTestDirectory());
+        assertEquals(dir6, operation1.libCompileModulesDirectory());
+        assertEquals(dir7, operation1.libProvidedModulesDirectory());
+        assertEquals(dir8, operation1.libRuntimeModulesDirectory());
+        assertEquals(dir9, operation1.libStandaloneModulesDirectory());
+        assertEquals(dir10, operation1.libTestModulesDirectory());
 
         var operation2 = new DownloadOperation()
             .libCompileDirectory(dir1)
             .libProvidedDirectory(dir2)
             .libRuntimeDirectory(dir3)
             .libStandaloneDirectory(dir4)
-            .libTestDirectory(dir5);
+            .libTestDirectory(dir5)
+            .libCompileModulesDirectory(dir6)
+            .libProvidedModulesDirectory(dir7)
+            .libRuntimeModulesDirectory(dir8)
+            .libStandaloneModulesDirectory(dir9)
+            .libTestModulesDirectory(dir10);
         operation2.repositories().add(repository1);
         operation2.repositories().add(repository2);
         operation2.dependencies().scope(Scope.compile).include(dependency1).include(dependency2);
@@ -80,6 +106,11 @@ public class TestDownloadOperation {
         assertEquals(dir3, operation2.libRuntimeDirectory());
         assertEquals(dir4, operation2.libStandaloneDirectory());
         assertEquals(dir5, operation2.libTestDirectory());
+        assertEquals(dir6, operation2.libCompileModulesDirectory());
+        assertEquals(dir7, operation2.libProvidedModulesDirectory());
+        assertEquals(dir8, operation2.libRuntimeModulesDirectory());
+        assertEquals(dir9, operation2.libStandaloneModulesDirectory());
+        assertEquals(dir10, operation2.libTestModulesDirectory());
 
         var operation3 = new DownloadOperation()
             .offline(true)
@@ -96,14 +127,14 @@ public class TestDownloadOperation {
         try {
             var dir1 = new File(tmp, "dir1");
             var dir2 = new File(tmp, "dir2");
-            var dir3 = new File(tmp, "dir3");
+            var dir8 = new File(tmp, "dir8");
+            var dir3 = new File(dir8, "dir3");
             var dir4 = new File(tmp, "dir4");
             var dir5 = new File(tmp, "dir5");
-            dir1.mkdirs();
-            dir2.mkdirs();
-            dir3.mkdirs();
-            dir4.mkdirs();
-            dir5.mkdirs();
+            var dir6 = new File(tmp, "dir6");
+            var dir7 = new File(tmp, "dir7");
+            var dir9 = new File(dir4, "dir9");
+            var dir10 = new File(dir5, "dir10");
 
             var operation = new DownloadOperation()
                 .repositories(List.of(Repository.MAVEN_CENTRAL))
@@ -111,17 +142,27 @@ public class TestDownloadOperation {
                 .libProvidedDirectory(dir2)
                 .libRuntimeDirectory(dir3)
                 .libStandaloneDirectory(dir4)
-                .libTestDirectory(dir5);
+                .libTestDirectory(dir5)
+                .libCompileModulesDirectory(dir6)
+                .libProvidedModulesDirectory(dir7)
+                .libRuntimeModulesDirectory(dir8)
+                .libStandaloneModulesDirectory(dir9)
+                .libTestModulesDirectory(dir10);
             operation.dependencies().scope(Scope.compile)
-                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
+                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3,12,0)))
+                .include(new Module("org.json", "json", new VersionNumber(20240303)));
             operation.dependencies().scope(Scope.provided)
-                .include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(6, 0, 0)));
+                .include(new Dependency("commons-codec", "commons-codec", new VersionNumber(1,17,0)))
+                .include(new Module("com.google.zxing", "javase", new VersionNumber(3,5,3)));
             operation.dependencies().scope(Scope.runtime)
-                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
+                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4,4)))
+                .include(new Module("org.postgresql", "postgresql", new VersionNumber(42,7,3)));
             operation.dependencies().scope(Scope.standalone)
-                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2, 0, 6)));
+                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2,0,6)))
+                .include(new Module("org.eclipse.jetty.ee10", "jetty-ee10-servlet", new VersionNumber(12,0,11)));
             operation.dependencies().scope(Scope.test)
-                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5, 2, 1)));
+                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5,2,1)))
+                .include(new Module("org.jsoup", "jsoup", new VersionNumber(1,18,1)));
 
             operation.execute();
 
@@ -129,17 +170,38 @@ public class TestDownloadOperation {
                     /dir1
                     /dir1/commons-lang3-3.12.0.jar
                     /dir2
-                    /dir2/jakarta.servlet-api-6.0.0.jar
-                    /dir3
-                    /dir3/commons-collections4-4.4.jar
+                    /dir2/commons-codec-1.17.0.jar
                     /dir4
-                    /dir4/slf4j-api-2.0.6.jar
+                    /dir4/dir9
+                    /dir4/dir9/jakarta.servlet-api-6.0.0.jar
+                    /dir4/dir9/jetty-ee10-servlet-12.0.11.jar
+                    /dir4/dir9/jetty-http-12.0.11.jar
+                    /dir4/dir9/jetty-io-12.0.11.jar
+                    /dir4/dir9/jetty-security-12.0.11.jar
+                    /dir4/dir9/jetty-server-12.0.11.jar
+                    /dir4/dir9/jetty-session-12.0.11.jar
+                    /dir4/dir9/jetty-util-12.0.11.jar
+                    /dir4/dir9/slf4j-api-2.0.12.jar
                     /dir4/slf4j-simple-2.0.6.jar
                     /dir5
+                    /dir5/dir10
+                    /dir5/dir10/jsoup-1.18.1.jar
                     /dir5/httpclient5-5.2.1.jar
                     /dir5/httpcore5-5.2.jar
                     /dir5/httpcore5-h2-5.2.jar
-                    /dir5/slf4j-api-1.7.36.jar""",
+                    /dir5/slf4j-api-1.7.36.jar
+                    /dir6
+                    /dir6/json-20240303.jar
+                    /dir7
+                    /dir7/core-3.5.3.jar
+                    /dir7/jai-imageio-core-1.4.0.jar
+                    /dir7/javase-3.5.3.jar
+                    /dir7/jcommander-1.82.jar
+                    /dir8
+                    /dir8/checker-qual-3.42.0.jar
+                    /dir8/dir3
+                    /dir8/dir3/commons-collections4-4.4.jar
+                    /dir8/postgresql-42.7.3.jar""",
                 FileUtils.generateDirectoryListing(tmp));
         } finally {
             FileUtils.deleteDirectory(tmp);
@@ -153,14 +215,14 @@ public class TestDownloadOperation {
         try {
             var dir1 = new File(tmp, "dir1");
             var dir2 = new File(tmp, "dir2");
-            var dir3 = new File(tmp, "dir3");
+            var dir8 = new File(tmp, "dir8");
+            var dir3 = new File(dir8, "dir3");
             var dir4 = new File(tmp, "dir4");
             var dir5 = new File(tmp, "dir5");
-            dir1.mkdirs();
-            dir2.mkdirs();
-            dir3.mkdirs();
-            dir4.mkdirs();
-            dir5.mkdirs();
+            var dir6 = new File(tmp, "dir6");
+            var dir7 = new File(tmp, "dir7");
+            var dir9 = new File(dir4, "dir9");
+            var dir10 = new File(dir5, "dir10");
 
             var operation = new DownloadOperation()
                 .repositories(List.of(Repository.MAVEN_CENTRAL))
@@ -169,18 +231,28 @@ public class TestDownloadOperation {
                 .libRuntimeDirectory(dir3)
                 .libStandaloneDirectory(dir4)
                 .libTestDirectory(dir5)
+                .libCompileModulesDirectory(dir6)
+                .libProvidedModulesDirectory(dir7)
+                .libRuntimeModulesDirectory(dir8)
+                .libStandaloneModulesDirectory(dir9)
+                .libTestModulesDirectory(dir10)
                 .downloadJavadoc(true)
                 .downloadSources(true);
             operation.dependencies().scope(Scope.compile)
-                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
+                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3,12,0)))
+                .include(new Module("org.json", "json", new VersionNumber(20240303)));
             operation.dependencies().scope(Scope.provided)
-                .include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(6, 0, 0)));
+                .include(new Dependency("commons-codec", "commons-codec", new VersionNumber(1,17,0)))
+                .include(new Module("com.google.zxing", "javase", new VersionNumber(3,5,3)));
             operation.dependencies().scope(Scope.runtime)
-                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
+                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4,4)))
+                .include(new Module("org.postgresql", "postgresql", new VersionNumber(42,7,3)));
             operation.dependencies().scope(Scope.standalone)
-                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2, 0, 6)));
+                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2,0,6)))
+                .include(new Module("org.eclipse.jetty.ee10", "jetty-ee10-servlet", new VersionNumber(12,0,11)));
             operation.dependencies().scope(Scope.test)
-                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5, 2, 1)));
+                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5,2,1)))
+                .include(new Module("org.jsoup", "jsoup", new VersionNumber(1,18,1)));
 
             operation.execute();
 
@@ -190,21 +262,46 @@ public class TestDownloadOperation {
                     /dir1/commons-lang3-3.12.0-sources.jar
                     /dir1/commons-lang3-3.12.0.jar
                     /dir2
-                    /dir2/jakarta.servlet-api-6.0.0-javadoc.jar
-                    /dir2/jakarta.servlet-api-6.0.0-sources.jar
-                    /dir2/jakarta.servlet-api-6.0.0.jar
-                    /dir3
-                    /dir3/commons-collections4-4.4-javadoc.jar
-                    /dir3/commons-collections4-4.4-sources.jar
-                    /dir3/commons-collections4-4.4.jar
+                    /dir2/commons-codec-1.17.0-javadoc.jar
+                    /dir2/commons-codec-1.17.0-sources.jar
+                    /dir2/commons-codec-1.17.0.jar
                     /dir4
-                    /dir4/slf4j-api-2.0.6-javadoc.jar
-                    /dir4/slf4j-api-2.0.6-sources.jar
-                    /dir4/slf4j-api-2.0.6.jar
+                    /dir4/dir9
+                    /dir4/dir9/jakarta.servlet-api-6.0.0-javadoc.jar
+                    /dir4/dir9/jakarta.servlet-api-6.0.0-sources.jar
+                    /dir4/dir9/jakarta.servlet-api-6.0.0.jar
+                    /dir4/dir9/jetty-ee10-servlet-12.0.11-javadoc.jar
+                    /dir4/dir9/jetty-ee10-servlet-12.0.11-sources.jar
+                    /dir4/dir9/jetty-ee10-servlet-12.0.11.jar
+                    /dir4/dir9/jetty-http-12.0.11-javadoc.jar
+                    /dir4/dir9/jetty-http-12.0.11-sources.jar
+                    /dir4/dir9/jetty-http-12.0.11.jar
+                    /dir4/dir9/jetty-io-12.0.11-javadoc.jar
+                    /dir4/dir9/jetty-io-12.0.11-sources.jar
+                    /dir4/dir9/jetty-io-12.0.11.jar
+                    /dir4/dir9/jetty-security-12.0.11-javadoc.jar
+                    /dir4/dir9/jetty-security-12.0.11-sources.jar
+                    /dir4/dir9/jetty-security-12.0.11.jar
+                    /dir4/dir9/jetty-server-12.0.11-javadoc.jar
+                    /dir4/dir9/jetty-server-12.0.11-sources.jar
+                    /dir4/dir9/jetty-server-12.0.11.jar
+                    /dir4/dir9/jetty-session-12.0.11-javadoc.jar
+                    /dir4/dir9/jetty-session-12.0.11-sources.jar
+                    /dir4/dir9/jetty-session-12.0.11.jar
+                    /dir4/dir9/jetty-util-12.0.11-javadoc.jar
+                    /dir4/dir9/jetty-util-12.0.11-sources.jar
+                    /dir4/dir9/jetty-util-12.0.11.jar
+                    /dir4/dir9/slf4j-api-2.0.12-javadoc.jar
+                    /dir4/dir9/slf4j-api-2.0.12-sources.jar
+                    /dir4/dir9/slf4j-api-2.0.12.jar
                     /dir4/slf4j-simple-2.0.6-javadoc.jar
                     /dir4/slf4j-simple-2.0.6-sources.jar
                     /dir4/slf4j-simple-2.0.6.jar
                     /dir5
+                    /dir5/dir10
+                    /dir5/dir10/jsoup-1.18.1-javadoc.jar
+                    /dir5/dir10/jsoup-1.18.1-sources.jar
+                    /dir5/dir10/jsoup-1.18.1.jar
                     /dir5/httpclient5-5.2.1-javadoc.jar
                     /dir5/httpclient5-5.2.1-sources.jar
                     /dir5/httpclient5-5.2.1.jar
@@ -216,7 +313,35 @@ public class TestDownloadOperation {
                     /dir5/httpcore5-h2-5.2.jar
                     /dir5/slf4j-api-1.7.36-javadoc.jar
                     /dir5/slf4j-api-1.7.36-sources.jar
-                    /dir5/slf4j-api-1.7.36.jar""",
+                    /dir5/slf4j-api-1.7.36.jar
+                    /dir6
+                    /dir6/json-20240303-javadoc.jar
+                    /dir6/json-20240303-sources.jar
+                    /dir6/json-20240303.jar
+                    /dir7
+                    /dir7/core-3.5.3-javadoc.jar
+                    /dir7/core-3.5.3-sources.jar
+                    /dir7/core-3.5.3.jar
+                    /dir7/jai-imageio-core-1.4.0-javadoc.jar
+                    /dir7/jai-imageio-core-1.4.0-sources.jar
+                    /dir7/jai-imageio-core-1.4.0.jar
+                    /dir7/javase-3.5.3-javadoc.jar
+                    /dir7/javase-3.5.3-sources.jar
+                    /dir7/javase-3.5.3.jar
+                    /dir7/jcommander-1.82-javadoc.jar
+                    /dir7/jcommander-1.82-sources.jar
+                    /dir7/jcommander-1.82.jar
+                    /dir8
+                    /dir8/checker-qual-3.42.0-javadoc.jar
+                    /dir8/checker-qual-3.42.0-sources.jar
+                    /dir8/checker-qual-3.42.0.jar
+                    /dir8/dir3
+                    /dir8/dir3/commons-collections4-4.4-javadoc.jar
+                    /dir8/dir3/commons-collections4-4.4-sources.jar
+                    /dir8/dir3/commons-collections4-4.4.jar
+                    /dir8/postgresql-42.7.3-javadoc.jar
+                    /dir8/postgresql-42.7.3-sources.jar
+                    /dir8/postgresql-42.7.3.jar""",
                 FileUtils.generateDirectoryListing(tmp));
         } finally {
             FileUtils.deleteDirectory(tmp);
@@ -240,15 +365,20 @@ public class TestDownloadOperation {
             project.createProjectStructure();
             project.repositories().add(Repository.MAVEN_CENTRAL);
             project.dependencies().scope(Scope.compile)
-                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
+                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3,12,0)))
+                .include(new Module("org.json", "json", new VersionNumber(20240303)));
             project.dependencies().scope(Scope.provided)
-                .include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(6, 0, 0)));
+                .include(new Dependency("commons-codec", "commons-codec", new VersionNumber(1,17,0)))
+                .include(new Module("com.google.zxing", "javase", new VersionNumber(3,5,3)));
             project.dependencies().scope(Scope.runtime)
-                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
+                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4,4)))
+                .include(new Module("org.postgresql", "postgresql", new VersionNumber(42,7,3)));
             project.dependencies().scope(Scope.standalone)
-                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2, 0, 6)));
+                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2,0,6)))
+                .include(new Module("org.eclipse.jetty.ee10", "jetty-ee10-servlet", new VersionNumber(12,0,11)));
             project.dependencies().scope(Scope.test)
-                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5, 2, 1)));
+                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5,2,1)))
+                .include(new Module("org.jsoup", "jsoup", new VersionNumber(1,18,1)));
 
             var operation = new DownloadOperation()
                 .fromProject(project);
@@ -261,15 +391,49 @@ public class TestDownloadOperation {
                     /lib/compile
                     /lib/compile/commons-lang3-3.12.0-sources.jar
                     /lib/compile/commons-lang3-3.12.0.jar
+                    /lib/compile/modules
+                    /lib/compile/modules/json-20240303-sources.jar
+                    /lib/compile/modules/json-20240303.jar
                     /lib/provided
-                    /lib/provided/jakarta.servlet-api-6.0.0-sources.jar
-                    /lib/provided/jakarta.servlet-api-6.0.0.jar
+                    /lib/provided/commons-codec-1.17.0-sources.jar
+                    /lib/provided/commons-codec-1.17.0.jar
+                    /lib/provided/modules
+                    /lib/provided/modules/core-3.5.3-sources.jar
+                    /lib/provided/modules/core-3.5.3.jar
+                    /lib/provided/modules/jai-imageio-core-1.4.0-sources.jar
+                    /lib/provided/modules/jai-imageio-core-1.4.0.jar
+                    /lib/provided/modules/javase-3.5.3-sources.jar
+                    /lib/provided/modules/javase-3.5.3.jar
+                    /lib/provided/modules/jcommander-1.82-sources.jar
+                    /lib/provided/modules/jcommander-1.82.jar
                     /lib/runtime
                     /lib/runtime/commons-collections4-4.4-sources.jar
                     /lib/runtime/commons-collections4-4.4.jar
+                    /lib/runtime/modules
+                    /lib/runtime/modules/checker-qual-3.42.0-sources.jar
+                    /lib/runtime/modules/checker-qual-3.42.0.jar
+                    /lib/runtime/modules/postgresql-42.7.3-sources.jar
+                    /lib/runtime/modules/postgresql-42.7.3.jar
                     /lib/standalone
-                    /lib/standalone/slf4j-api-2.0.6-sources.jar
-                    /lib/standalone/slf4j-api-2.0.6.jar
+                    /lib/standalone/modules
+                    /lib/standalone/modules/jakarta.servlet-api-6.0.0-sources.jar
+                    /lib/standalone/modules/jakarta.servlet-api-6.0.0.jar
+                    /lib/standalone/modules/jetty-ee10-servlet-12.0.11-sources.jar
+                    /lib/standalone/modules/jetty-ee10-servlet-12.0.11.jar
+                    /lib/standalone/modules/jetty-http-12.0.11-sources.jar
+                    /lib/standalone/modules/jetty-http-12.0.11.jar
+                    /lib/standalone/modules/jetty-io-12.0.11-sources.jar
+                    /lib/standalone/modules/jetty-io-12.0.11.jar
+                    /lib/standalone/modules/jetty-security-12.0.11-sources.jar
+                    /lib/standalone/modules/jetty-security-12.0.11.jar
+                    /lib/standalone/modules/jetty-server-12.0.11-sources.jar
+                    /lib/standalone/modules/jetty-server-12.0.11.jar
+                    /lib/standalone/modules/jetty-session-12.0.11-sources.jar
+                    /lib/standalone/modules/jetty-session-12.0.11.jar
+                    /lib/standalone/modules/jetty-util-12.0.11-sources.jar
+                    /lib/standalone/modules/jetty-util-12.0.11.jar
+                    /lib/standalone/modules/slf4j-api-2.0.12-sources.jar
+                    /lib/standalone/modules/slf4j-api-2.0.12.jar
                     /lib/standalone/slf4j-simple-2.0.6-sources.jar
                     /lib/standalone/slf4j-simple-2.0.6.jar
                     /lib/test
@@ -279,6 +443,9 @@ public class TestDownloadOperation {
                     /lib/test/httpcore5-5.2.jar
                     /lib/test/httpcore5-h2-5.2-sources.jar
                     /lib/test/httpcore5-h2-5.2.jar
+                    /lib/test/modules
+                    /lib/test/modules/jsoup-1.18.1-sources.jar
+                    /lib/test/modules/jsoup-1.18.1.jar
                     /lib/test/slf4j-api-1.7.36-sources.jar
                     /lib/test/slf4j-api-1.7.36.jar
                     /src
@@ -308,6 +475,8 @@ public class TestDownloadOperation {
             project.repositories().add(Repository.MAVEN_CENTRAL);
             project.dependencies().scope(Scope.compile)
                 .include(new Dependency("com.stripe", "stripe-java", new VersionNumber(20,136,0)));
+            project.dependencies().scope(Scope.runtime)
+                .include(new Module("org.json", "json", new VersionNumber(20240303)));
 
             var operation = new DownloadOperation()
                 .fromProject(project);
@@ -318,14 +487,21 @@ public class TestDownloadOperation {
                     /lib
                     /lib/bld
                     /lib/compile
+                    /lib/compile/modules
                     /lib/compile/stripe-java-20.136.0-sources.jar
                     /lib/compile/stripe-java-20.136.0.jar
                     /lib/provided
+                    /lib/provided/modules
                     /lib/runtime
                     /lib/runtime/gson-2.9.0-sources.jar
                     /lib/runtime/gson-2.9.0.jar
+                    /lib/runtime/modules
+                    /lib/runtime/modules/json-20240303-sources.jar
+                    /lib/runtime/modules/json-20240303.jar
                     /lib/standalone
+                    /lib/standalone/modules
                     /lib/test
+                    /lib/test/modules
                     /src
                     /src/bld
                     /src/bld/java
diff --git a/src/test/java/rife/bld/operations/TestPurgeOperation.java b/src/test/java/rife/bld/operations/TestPurgeOperation.java
index d9f7917..ec4b227 100644
--- a/src/test/java/rife/bld/operations/TestPurgeOperation.java
+++ b/src/test/java/rife/bld/operations/TestPurgeOperation.java
@@ -7,6 +7,7 @@ package rife.bld.operations;
 import org.junit.jupiter.api.Test;
 import rife.bld.WebProject;
 import rife.bld.dependencies.*;
+import rife.bld.dependencies.Module;
 import rife.tools.FileUtils;
 
 import java.io.File;
@@ -40,6 +41,11 @@ public class TestPurgeOperation {
         var dir3 = new File("dir3");
         var dir4 = new File("dir4");
         var dir5 = new File("dir5");
+        var dir6 = new File("dir6");
+        var dir7 = new File("dir7");
+        var dir8 = new File("dir8");
+        var dir9 = new File("dir9");
+        var dir10 = new File("dir10");
 
         var operation1 = new PurgeOperation()
             .repositories(List.of(repository1, repository2))
@@ -47,7 +53,12 @@ public class TestPurgeOperation {
             .libProvidedDirectory(dir2)
             .libRuntimeDirectory(dir3)
             .libStandaloneDirectory(dir4)
-            .libTestDirectory(dir5);
+            .libTestDirectory(dir5)
+            .libCompileModulesDirectory(dir6)
+            .libProvidedModulesDirectory(dir7)
+            .libRuntimeModulesDirectory(dir8)
+            .libStandaloneModulesDirectory(dir9)
+            .libTestModulesDirectory(dir10);
         var dependency_scopes = new DependencyScopes();
         dependency_scopes.scope(Scope.compile).include(dependency1).include(dependency2);
         operation1.dependencies(dependency_scopes);
@@ -60,13 +71,23 @@ public class TestPurgeOperation {
         assertEquals(dir3, operation1.libRuntimeDirectory());
         assertEquals(dir4, operation1.libStandaloneDirectory());
         assertEquals(dir5, operation1.libTestDirectory());
+        assertEquals(dir6, operation1.libCompileModulesDirectory());
+        assertEquals(dir7, operation1.libProvidedModulesDirectory());
+        assertEquals(dir8, operation1.libRuntimeModulesDirectory());
+        assertEquals(dir9, operation1.libStandaloneModulesDirectory());
+        assertEquals(dir10, operation1.libTestModulesDirectory());
 
         var operation2 = new PurgeOperation()
             .libCompileDirectory(dir1)
             .libProvidedDirectory(dir2)
             .libRuntimeDirectory(dir3)
             .libStandaloneDirectory(dir4)
-            .libTestDirectory(dir5);
+            .libTestDirectory(dir5)
+            .libCompileModulesDirectory(dir6)
+            .libProvidedModulesDirectory(dir7)
+            .libRuntimeModulesDirectory(dir8)
+            .libStandaloneModulesDirectory(dir9)
+            .libTestModulesDirectory(dir10);
         operation2.repositories().add(repository1);
         operation2.repositories().add(repository2);
         operation2.dependencies().scope(Scope.compile).include(dependency1).include(dependency2);
@@ -80,6 +101,11 @@ public class TestPurgeOperation {
         assertEquals(dir3, operation2.libRuntimeDirectory());
         assertEquals(dir4, operation2.libStandaloneDirectory());
         assertEquals(dir5, operation2.libTestDirectory());
+        assertEquals(dir6, operation2.libCompileModulesDirectory());
+        assertEquals(dir7, operation2.libProvidedModulesDirectory());
+        assertEquals(dir8, operation2.libRuntimeModulesDirectory());
+        assertEquals(dir9, operation2.libStandaloneModulesDirectory());
+        assertEquals(dir10, operation2.libTestModulesDirectory());
 
         var operation3 = new PurgeOperation()
             .offline(true)
@@ -96,14 +122,14 @@ public class TestPurgeOperation {
         try {
             var dir1 = new File(tmp, "dir1");
             var dir2 = new File(tmp, "dir2");
-            var dir3 = new File(tmp, "dir3");
+            var dir8 = new File(tmp, "dir8");
+            var dir3 = new File(dir8, "dir3");
             var dir4 = new File(tmp, "dir4");
             var dir5 = new File(tmp, "dir5");
-            dir1.mkdirs();
-            dir2.mkdirs();
-            dir3.mkdirs();
-            dir4.mkdirs();
-            dir5.mkdirs();
+            var dir6 = new File(tmp, "dir6");
+            var dir7 = new File(tmp, "dir7");
+            var dir9 = new File(dir4, "dir9");
+            var dir10 = new File(dir5, "dir10");
 
             var operation_download1 = new DownloadOperation()
                 .repositories(List.of(Repository.MAVEN_CENTRAL))
@@ -111,17 +137,27 @@ public class TestPurgeOperation {
                 .libProvidedDirectory(dir2)
                 .libRuntimeDirectory(dir3)
                 .libStandaloneDirectory(dir4)
-                .libTestDirectory(dir5);
+                .libTestDirectory(dir5)
+                .libCompileModulesDirectory(dir6)
+                .libProvidedModulesDirectory(dir7)
+                .libRuntimeModulesDirectory(dir8)
+                .libStandaloneModulesDirectory(dir9)
+                .libTestModulesDirectory(dir10);
             operation_download1.dependencies().scope(Scope.compile)
-                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 1)));
+                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3,1)))
+                .include(new Module("org.json", "json", new VersionNumber(20240205)));
             operation_download1.dependencies().scope(Scope.provided)
-                .include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(5, 0, 0)));
+                .include(new Dependency("commons-codec", "commons-codec", new VersionNumber(1,14)))
+                .include(new Module("com.google.zxing", "javase", new VersionNumber(3,4,0)));
             operation_download1.dependencies().scope(Scope.runtime)
-                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 3)));
+                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4,3)))
+                .include(new Module("org.postgresql", "postgresql", new VersionNumber(42,4,5)));
             operation_download1.dependencies().scope(Scope.standalone)
-                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2, 0, 0)));
+                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2,0,0)))
+                .include(new Module("org.eclipse.jetty.ee10", "jetty-ee10-servlet", new VersionNumber(12,0,6)));
             operation_download1.dependencies().scope(Scope.test)
-                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5, 0)));
+                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5,0)))
+                .include(new Module("org.jsoup", "jsoup", new VersionNumber(1,15,3)));
 
             operation_download1.execute();
 
@@ -131,17 +167,27 @@ public class TestPurgeOperation {
                 .libProvidedDirectory(dir2)
                 .libRuntimeDirectory(dir3)
                 .libStandaloneDirectory(dir4)
-                .libTestDirectory(dir5);
+                .libTestDirectory(dir5)
+                .libCompileModulesDirectory(dir6)
+                .libProvidedModulesDirectory(dir7)
+                .libRuntimeModulesDirectory(dir8)
+                .libStandaloneModulesDirectory(dir9)
+                .libTestModulesDirectory(dir10);
             operation_download2.dependencies().scope(Scope.compile)
-                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
+                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3,12,0)))
+                .include(new Module("org.json", "json", new VersionNumber(20240303)));
             operation_download2.dependencies().scope(Scope.provided)
-                .include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(6, 0, 0)));
+                .include(new Dependency("commons-codec", "commons-codec", new VersionNumber(1,17,0)))
+                .include(new Module("com.google.zxing", "javase", new VersionNumber(3,5,3)));
             operation_download2.dependencies().scope(Scope.runtime)
-                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
+                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4,4)))
+                .include(new Module("org.postgresql", "postgresql", new VersionNumber(42,7,3)));
             operation_download2.dependencies().scope(Scope.standalone)
-                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2, 0, 6)));
+                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2,0,6)))
+                .include(new Module("org.eclipse.jetty.ee10", "jetty-ee10-servlet", new VersionNumber(12,0,11)));
             operation_download2.dependencies().scope(Scope.test)
-                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5, 2, 1)));
+                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5,2,1)))
+                .include(new Module("org.jsoup", "jsoup", new VersionNumber(1,18,1)));
 
             operation_download2.execute();
 
@@ -150,18 +196,34 @@ public class TestPurgeOperation {
                     /dir1/commons-lang3-3.1.jar
                     /dir1/commons-lang3-3.12.0.jar
                     /dir2
-                    /dir2/jakarta.servlet-api-5.0.0.jar
-                    /dir2/jakarta.servlet-api-6.0.0.jar
-                    /dir3
-                    /dir3/commons-collections4-4.3.jar
-                    /dir3/commons-collections4-4.4.jar
+                    /dir2/commons-codec-1.14.jar
+                    /dir2/commons-codec-1.17.0.jar
                     /dir4
-                    /dir4/slf4j-api-2.0.0.jar
-                    /dir4/slf4j-api-2.0.6.jar
+                    /dir4/dir9
+                    /dir4/dir9/jakarta.servlet-api-6.0.0.jar
+                    /dir4/dir9/jetty-ee10-servlet-12.0.11.jar
+                    /dir4/dir9/jetty-ee10-servlet-12.0.6.jar
+                    /dir4/dir9/jetty-http-12.0.11.jar
+                    /dir4/dir9/jetty-http-12.0.6.jar
+                    /dir4/dir9/jetty-io-12.0.11.jar
+                    /dir4/dir9/jetty-io-12.0.6.jar
+                    /dir4/dir9/jetty-security-12.0.11.jar
+                    /dir4/dir9/jetty-security-12.0.6.jar
+                    /dir4/dir9/jetty-server-12.0.11.jar
+                    /dir4/dir9/jetty-server-12.0.6.jar
+                    /dir4/dir9/jetty-session-12.0.11.jar
+                    /dir4/dir9/jetty-session-12.0.6.jar
+                    /dir4/dir9/jetty-util-12.0.11.jar
+                    /dir4/dir9/jetty-util-12.0.6.jar
+                    /dir4/dir9/slf4j-api-2.0.12.jar
+                    /dir4/dir9/slf4j-api-2.0.9.jar
                     /dir4/slf4j-simple-2.0.0.jar
                     /dir4/slf4j-simple-2.0.6.jar
                     /dir5
                     /dir5/commons-codec-1.13.jar
+                    /dir5/dir10
+                    /dir5/dir10/jsoup-1.15.3.jar
+                    /dir5/dir10/jsoup-1.18.1.jar
                     /dir5/httpclient5-5.0.jar
                     /dir5/httpclient5-5.2.1.jar
                     /dir5/httpcore5-5.0.jar
@@ -169,7 +231,26 @@ public class TestPurgeOperation {
                     /dir5/httpcore5-h2-5.0.jar
                     /dir5/httpcore5-h2-5.2.jar
                     /dir5/slf4j-api-1.7.25.jar
-                    /dir5/slf4j-api-1.7.36.jar""",
+                    /dir5/slf4j-api-1.7.36.jar
+                    /dir6
+                    /dir6/json-20240205.jar
+                    /dir6/json-20240303.jar
+                    /dir7
+                    /dir7/core-3.4.0.jar
+                    /dir7/core-3.5.3.jar
+                    /dir7/jai-imageio-core-1.4.0.jar
+                    /dir7/javase-3.4.0.jar
+                    /dir7/javase-3.5.3.jar
+                    /dir7/jcommander-1.72.jar
+                    /dir7/jcommander-1.82.jar
+                    /dir8
+                    /dir8/checker-qual-3.42.0.jar
+                    /dir8/checker-qual-3.5.0.jar
+                    /dir8/dir3
+                    /dir8/dir3/commons-collections4-4.3.jar
+                    /dir8/dir3/commons-collections4-4.4.jar
+                    /dir8/postgresql-42.4.5.jar
+                    /dir8/postgresql-42.7.3.jar""",
                 FileUtils.generateDirectoryListing(tmp));
 
             var operation_purge = new PurgeOperation()
@@ -178,17 +259,27 @@ public class TestPurgeOperation {
                 .libProvidedDirectory(dir2)
                 .libRuntimeDirectory(dir3)
                 .libStandaloneDirectory(dir4)
-                .libTestDirectory(dir5);
+                .libTestDirectory(dir5)
+                .libCompileModulesDirectory(dir6)
+                .libProvidedModulesDirectory(dir7)
+                .libRuntimeModulesDirectory(dir8)
+                .libStandaloneModulesDirectory(dir9)
+                .libTestModulesDirectory(dir10);
             operation_purge.dependencies().scope(Scope.compile)
-                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
+                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3,12,0)))
+                .include(new Module("org.json", "json", new VersionNumber(20240303)));
             operation_purge.dependencies().scope(Scope.provided)
-                .include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(6, 0, 0)));
+                .include(new Dependency("commons-codec", "commons-codec", new VersionNumber(1,17,0)))
+                .include(new Module("com.google.zxing", "javase", new VersionNumber(3,5,3)));
             operation_purge.dependencies().scope(Scope.runtime)
-                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
+                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4,4)))
+                .include(new Module("org.postgresql", "postgresql", new VersionNumber(42,7,3)));
             operation_purge.dependencies().scope(Scope.standalone)
-                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2, 0, 6)));
+                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2,0,6)))
+                .include(new Module("org.eclipse.jetty.ee10", "jetty-ee10-servlet", new VersionNumber(12,0,11)));
             operation_purge.dependencies().scope(Scope.test)
-                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5, 2, 1)));
+                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5,2,1)))
+                .include(new Module("org.jsoup", "jsoup", new VersionNumber(1,18,1)));
 
             operation_purge.execute();
 
@@ -196,19 +287,39 @@ public class TestPurgeOperation {
                     /dir1
                     /dir1/commons-lang3-3.12.0.jar
                     /dir2
-                    /dir2/jakarta.servlet-api-6.0.0.jar
-                    /dir3
-                    /dir3/commons-collections4-4.4.jar
+                    /dir2/commons-codec-1.17.0.jar
                     /dir4
-                    /dir4/slf4j-api-2.0.6.jar
+                    /dir4/dir9
+                    /dir4/dir9/jakarta.servlet-api-6.0.0.jar
+                    /dir4/dir9/jetty-ee10-servlet-12.0.11.jar
+                    /dir4/dir9/jetty-http-12.0.11.jar
+                    /dir4/dir9/jetty-io-12.0.11.jar
+                    /dir4/dir9/jetty-security-12.0.11.jar
+                    /dir4/dir9/jetty-server-12.0.11.jar
+                    /dir4/dir9/jetty-session-12.0.11.jar
+                    /dir4/dir9/jetty-util-12.0.11.jar
+                    /dir4/dir9/slf4j-api-2.0.12.jar
                     /dir4/slf4j-simple-2.0.6.jar
                     /dir5
+                    /dir5/dir10
+                    /dir5/dir10/jsoup-1.18.1.jar
                     /dir5/httpclient5-5.2.1.jar
                     /dir5/httpcore5-5.2.jar
                     /dir5/httpcore5-h2-5.2.jar
-                    /dir5/slf4j-api-1.7.36.jar""",
+                    /dir5/slf4j-api-1.7.36.jar
+                    /dir6
+                    /dir6/json-20240303.jar
+                    /dir7
+                    /dir7/core-3.5.3.jar
+                    /dir7/jai-imageio-core-1.4.0.jar
+                    /dir7/javase-3.5.3.jar
+                    /dir7/jcommander-1.82.jar
+                    /dir8
+                    /dir8/checker-qual-3.42.0.jar
+                    /dir8/dir3
+                    /dir8/dir3/commons-collections4-4.4.jar
+                    /dir8/postgresql-42.7.3.jar""",
                 FileUtils.generateDirectoryListing(tmp));
-
         } finally {
             FileUtils.deleteDirectory(tmp);
         }
@@ -221,13 +332,14 @@ public class TestPurgeOperation {
         try {
             var dir1 = new File(tmp, "dir1");
             var dir2 = new File(tmp, "dir2");
-            var dir3 = new File(tmp, "dir3");
+            var dir8 = new File(tmp, "dir8");
+            var dir3 = new File(dir8, "dir3");
             var dir4 = new File(tmp, "dir4");
             var dir5 = new File(tmp, "dir5");
-            dir1.mkdirs();
-            dir3.mkdirs();
-            dir4.mkdirs();
-            dir5.mkdirs();
+            var dir6 = new File(tmp, "dir6");
+            var dir7 = new File(tmp, "dir7");
+            var dir9 = new File(dir4, "dir9");
+            var dir10 = new File(dir5, "dir10");
 
             var operation_download1 = new DownloadOperation()
                 .repositories(List.of(Repository.MAVEN_CENTRAL))
@@ -236,18 +348,28 @@ public class TestPurgeOperation {
                 .libRuntimeDirectory(dir3)
                 .libStandaloneDirectory(dir4)
                 .libTestDirectory(dir5)
+                .libCompileModulesDirectory(dir6)
+                .libProvidedModulesDirectory(dir7)
+                .libRuntimeModulesDirectory(dir8)
+                .libStandaloneModulesDirectory(dir9)
+                .libTestModulesDirectory(dir10)
                 .downloadJavadoc(true)
                 .downloadSources(true);
             operation_download1.dependencies().scope(Scope.compile)
-                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 1)));
+                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3,1)))
+                .include(new Module("org.json", "json", new VersionNumber(20240205)));
             operation_download1.dependencies().scope(Scope.provided)
-                .include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(5, 0, 0)));
+                .include(new Dependency("commons-codec", "commons-codec", new VersionNumber(1,14)))
+                .include(new Module("com.google.zxing", "javase", new VersionNumber(3,4,0)));
             operation_download1.dependencies().scope(Scope.runtime)
-                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 3)));
+                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4,3)))
+                .include(new Module("org.postgresql", "postgresql", new VersionNumber(42,4,5)));
             operation_download1.dependencies().scope(Scope.standalone)
-                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2, 0, 0)));
+                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2,0,0)))
+                .include(new Module("org.eclipse.jetty.ee10", "jetty-ee10-servlet", new VersionNumber(12,0,6)));
             operation_download1.dependencies().scope(Scope.test)
-                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5, 0)));
+                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5,0)))
+                .include(new Module("org.jsoup", "jsoup", new VersionNumber(1,15,3)));
 
             operation_download1.execute();
 
@@ -258,18 +380,28 @@ public class TestPurgeOperation {
                 .libRuntimeDirectory(dir3)
                 .libStandaloneDirectory(dir4)
                 .libTestDirectory(dir5)
+                .libCompileModulesDirectory(dir6)
+                .libProvidedModulesDirectory(dir7)
+                .libRuntimeModulesDirectory(dir8)
+                .libStandaloneModulesDirectory(dir9)
+                .libTestModulesDirectory(dir10)
                 .downloadJavadoc(true)
                 .downloadSources(true);
             operation_download2.dependencies().scope(Scope.compile)
-                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
+                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3,12,0)))
+                .include(new Module("org.json", "json", new VersionNumber(20240303)));
             operation_download2.dependencies().scope(Scope.provided)
-                .include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(6, 0, 0)));
+                .include(new Dependency("commons-codec", "commons-codec", new VersionNumber(1,17,0)))
+                .include(new Module("com.google.zxing", "javase", new VersionNumber(3,5,3)));
             operation_download2.dependencies().scope(Scope.runtime)
-                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
+                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4,4)))
+                .include(new Module("org.postgresql", "postgresql", new VersionNumber(42,7,3)));
             operation_download2.dependencies().scope(Scope.standalone)
-                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2, 0, 6)));
+                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2,0,6)))
+                .include(new Module("org.eclipse.jetty.ee10", "jetty-ee10-servlet", new VersionNumber(12,0,11)));
             operation_download2.dependencies().scope(Scope.test)
-                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5, 2, 1)));
+                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5,2,1)))
+                .include(new Module("org.jsoup", "jsoup", new VersionNumber(1,18,1)));
 
             operation_download2.execute();
 
@@ -282,26 +414,65 @@ public class TestPurgeOperation {
                     /dir1/commons-lang3-3.12.0-sources.jar
                     /dir1/commons-lang3-3.12.0.jar
                     /dir2
-                    /dir2/jakarta.servlet-api-5.0.0-javadoc.jar
-                    /dir2/jakarta.servlet-api-5.0.0-sources.jar
-                    /dir2/jakarta.servlet-api-5.0.0.jar
-                    /dir2/jakarta.servlet-api-6.0.0-javadoc.jar
-                    /dir2/jakarta.servlet-api-6.0.0-sources.jar
-                    /dir2/jakarta.servlet-api-6.0.0.jar
-                    /dir3
-                    /dir3/commons-collections4-4.3-javadoc.jar
-                    /dir3/commons-collections4-4.3-sources.jar
-                    /dir3/commons-collections4-4.3.jar
-                    /dir3/commons-collections4-4.4-javadoc.jar
-                    /dir3/commons-collections4-4.4-sources.jar
-                    /dir3/commons-collections4-4.4.jar
+                    /dir2/commons-codec-1.14-javadoc.jar
+                    /dir2/commons-codec-1.14-sources.jar
+                    /dir2/commons-codec-1.14.jar
+                    /dir2/commons-codec-1.17.0-javadoc.jar
+                    /dir2/commons-codec-1.17.0-sources.jar
+                    /dir2/commons-codec-1.17.0.jar
                     /dir4
-                    /dir4/slf4j-api-2.0.0-javadoc.jar
-                    /dir4/slf4j-api-2.0.0-sources.jar
-                    /dir4/slf4j-api-2.0.0.jar
-                    /dir4/slf4j-api-2.0.6-javadoc.jar
-                    /dir4/slf4j-api-2.0.6-sources.jar
-                    /dir4/slf4j-api-2.0.6.jar
+                    /dir4/dir9
+                    /dir4/dir9/jakarta.servlet-api-6.0.0-javadoc.jar
+                    /dir4/dir9/jakarta.servlet-api-6.0.0-sources.jar
+                    /dir4/dir9/jakarta.servlet-api-6.0.0.jar
+                    /dir4/dir9/jetty-ee10-servlet-12.0.11-javadoc.jar
+                    /dir4/dir9/jetty-ee10-servlet-12.0.11-sources.jar
+                    /dir4/dir9/jetty-ee10-servlet-12.0.11.jar
+                    /dir4/dir9/jetty-ee10-servlet-12.0.6-javadoc.jar
+                    /dir4/dir9/jetty-ee10-servlet-12.0.6-sources.jar
+                    /dir4/dir9/jetty-ee10-servlet-12.0.6.jar
+                    /dir4/dir9/jetty-http-12.0.11-javadoc.jar
+                    /dir4/dir9/jetty-http-12.0.11-sources.jar
+                    /dir4/dir9/jetty-http-12.0.11.jar
+                    /dir4/dir9/jetty-http-12.0.6-javadoc.jar
+                    /dir4/dir9/jetty-http-12.0.6-sources.jar
+                    /dir4/dir9/jetty-http-12.0.6.jar
+                    /dir4/dir9/jetty-io-12.0.11-javadoc.jar
+                    /dir4/dir9/jetty-io-12.0.11-sources.jar
+                    /dir4/dir9/jetty-io-12.0.11.jar
+                    /dir4/dir9/jetty-io-12.0.6-javadoc.jar
+                    /dir4/dir9/jetty-io-12.0.6-sources.jar
+                    /dir4/dir9/jetty-io-12.0.6.jar
+                    /dir4/dir9/jetty-security-12.0.11-javadoc.jar
+                    /dir4/dir9/jetty-security-12.0.11-sources.jar
+                    /dir4/dir9/jetty-security-12.0.11.jar
+                    /dir4/dir9/jetty-security-12.0.6-javadoc.jar
+                    /dir4/dir9/jetty-security-12.0.6-sources.jar
+                    /dir4/dir9/jetty-security-12.0.6.jar
+                    /dir4/dir9/jetty-server-12.0.11-javadoc.jar
+                    /dir4/dir9/jetty-server-12.0.11-sources.jar
+                    /dir4/dir9/jetty-server-12.0.11.jar
+                    /dir4/dir9/jetty-server-12.0.6-javadoc.jar
+                    /dir4/dir9/jetty-server-12.0.6-sources.jar
+                    /dir4/dir9/jetty-server-12.0.6.jar
+                    /dir4/dir9/jetty-session-12.0.11-javadoc.jar
+                    /dir4/dir9/jetty-session-12.0.11-sources.jar
+                    /dir4/dir9/jetty-session-12.0.11.jar
+                    /dir4/dir9/jetty-session-12.0.6-javadoc.jar
+                    /dir4/dir9/jetty-session-12.0.6-sources.jar
+                    /dir4/dir9/jetty-session-12.0.6.jar
+                    /dir4/dir9/jetty-util-12.0.11-javadoc.jar
+                    /dir4/dir9/jetty-util-12.0.11-sources.jar
+                    /dir4/dir9/jetty-util-12.0.11.jar
+                    /dir4/dir9/jetty-util-12.0.6-javadoc.jar
+                    /dir4/dir9/jetty-util-12.0.6-sources.jar
+                    /dir4/dir9/jetty-util-12.0.6.jar
+                    /dir4/dir9/slf4j-api-2.0.12-javadoc.jar
+                    /dir4/dir9/slf4j-api-2.0.12-sources.jar
+                    /dir4/dir9/slf4j-api-2.0.12.jar
+                    /dir4/dir9/slf4j-api-2.0.9-javadoc.jar
+                    /dir4/dir9/slf4j-api-2.0.9-sources.jar
+                    /dir4/dir9/slf4j-api-2.0.9.jar
                     /dir4/slf4j-simple-2.0.0-javadoc.jar
                     /dir4/slf4j-simple-2.0.0-sources.jar
                     /dir4/slf4j-simple-2.0.0.jar
@@ -312,6 +483,13 @@ public class TestPurgeOperation {
                     /dir5/commons-codec-1.13-javadoc.jar
                     /dir5/commons-codec-1.13-sources.jar
                     /dir5/commons-codec-1.13.jar
+                    /dir5/dir10
+                    /dir5/dir10/jsoup-1.15.3-javadoc.jar
+                    /dir5/dir10/jsoup-1.15.3-sources.jar
+                    /dir5/dir10/jsoup-1.15.3.jar
+                    /dir5/dir10/jsoup-1.18.1-javadoc.jar
+                    /dir5/dir10/jsoup-1.18.1-sources.jar
+                    /dir5/dir10/jsoup-1.18.1.jar
                     /dir5/httpclient5-5.0-javadoc.jar
                     /dir5/httpclient5-5.0-sources.jar
                     /dir5/httpclient5-5.0.jar
@@ -335,7 +513,56 @@ public class TestPurgeOperation {
                     /dir5/slf4j-api-1.7.25.jar
                     /dir5/slf4j-api-1.7.36-javadoc.jar
                     /dir5/slf4j-api-1.7.36-sources.jar
-                    /dir5/slf4j-api-1.7.36.jar""",
+                    /dir5/slf4j-api-1.7.36.jar
+                    /dir6
+                    /dir6/json-20240205-javadoc.jar
+                    /dir6/json-20240205-sources.jar
+                    /dir6/json-20240205.jar
+                    /dir6/json-20240303-javadoc.jar
+                    /dir6/json-20240303-sources.jar
+                    /dir6/json-20240303.jar
+                    /dir7
+                    /dir7/core-3.4.0-javadoc.jar
+                    /dir7/core-3.4.0-sources.jar
+                    /dir7/core-3.4.0.jar
+                    /dir7/core-3.5.3-javadoc.jar
+                    /dir7/core-3.5.3-sources.jar
+                    /dir7/core-3.5.3.jar
+                    /dir7/jai-imageio-core-1.4.0-javadoc.jar
+                    /dir7/jai-imageio-core-1.4.0-sources.jar
+                    /dir7/jai-imageio-core-1.4.0.jar
+                    /dir7/javase-3.4.0-javadoc.jar
+                    /dir7/javase-3.4.0-sources.jar
+                    /dir7/javase-3.4.0.jar
+                    /dir7/javase-3.5.3-javadoc.jar
+                    /dir7/javase-3.5.3-sources.jar
+                    /dir7/javase-3.5.3.jar
+                    /dir7/jcommander-1.72-javadoc.jar
+                    /dir7/jcommander-1.72-sources.jar
+                    /dir7/jcommander-1.72.jar
+                    /dir7/jcommander-1.82-javadoc.jar
+                    /dir7/jcommander-1.82-sources.jar
+                    /dir7/jcommander-1.82.jar
+                    /dir8
+                    /dir8/checker-qual-3.42.0-javadoc.jar
+                    /dir8/checker-qual-3.42.0-sources.jar
+                    /dir8/checker-qual-3.42.0.jar
+                    /dir8/checker-qual-3.5.0-javadoc.jar
+                    /dir8/checker-qual-3.5.0-sources.jar
+                    /dir8/checker-qual-3.5.0.jar
+                    /dir8/dir3
+                    /dir8/dir3/commons-collections4-4.3-javadoc.jar
+                    /dir8/dir3/commons-collections4-4.3-sources.jar
+                    /dir8/dir3/commons-collections4-4.3.jar
+                    /dir8/dir3/commons-collections4-4.4-javadoc.jar
+                    /dir8/dir3/commons-collections4-4.4-sources.jar
+                    /dir8/dir3/commons-collections4-4.4.jar
+                    /dir8/postgresql-42.4.5-javadoc.jar
+                    /dir8/postgresql-42.4.5-sources.jar
+                    /dir8/postgresql-42.4.5.jar
+                    /dir8/postgresql-42.7.3-javadoc.jar
+                    /dir8/postgresql-42.7.3-sources.jar
+                    /dir8/postgresql-42.7.3.jar""",
                 FileUtils.generateDirectoryListing(tmp));
 
             var operation_purge = new PurgeOperation()
@@ -345,18 +572,28 @@ public class TestPurgeOperation {
                 .libRuntimeDirectory(dir3)
                 .libStandaloneDirectory(dir4)
                 .libTestDirectory(dir5)
+                .libCompileModulesDirectory(dir6)
+                .libProvidedModulesDirectory(dir7)
+                .libRuntimeModulesDirectory(dir8)
+                .libStandaloneModulesDirectory(dir9)
+                .libTestModulesDirectory(dir10)
                 .preserveSources(true)
                 .preserveJavadoc(true);
             operation_purge.dependencies().scope(Scope.compile)
-                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
+                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3,12,0)))
+                .include(new Module("org.json", "json", new VersionNumber(20240303)));
             operation_purge.dependencies().scope(Scope.provided)
-                .include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(6, 0, 0)));
+                .include(new Dependency("commons-codec", "commons-codec", new VersionNumber(1,17,0)))
+                .include(new Module("com.google.zxing", "javase", new VersionNumber(3,5,3)));
             operation_purge.dependencies().scope(Scope.runtime)
-                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
+                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4,4)))
+                .include(new Module("org.postgresql", "postgresql", new VersionNumber(42,7,3)));
             operation_purge.dependencies().scope(Scope.standalone)
-                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2, 0, 6)));
+                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2,0,6)))
+                .include(new Module("org.eclipse.jetty.ee10", "jetty-ee10-servlet", new VersionNumber(12,0,11)));
             operation_purge.dependencies().scope(Scope.test)
-                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5, 2, 1)));
+                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5,2,1)))
+                .include(new Module("org.jsoup", "jsoup", new VersionNumber(1,18,1)));
 
             operation_purge.execute();
 
@@ -366,21 +603,46 @@ public class TestPurgeOperation {
                     /dir1/commons-lang3-3.12.0-sources.jar
                     /dir1/commons-lang3-3.12.0.jar
                     /dir2
-                    /dir2/jakarta.servlet-api-6.0.0-javadoc.jar
-                    /dir2/jakarta.servlet-api-6.0.0-sources.jar
-                    /dir2/jakarta.servlet-api-6.0.0.jar
-                    /dir3
-                    /dir3/commons-collections4-4.4-javadoc.jar
-                    /dir3/commons-collections4-4.4-sources.jar
-                    /dir3/commons-collections4-4.4.jar
+                    /dir2/commons-codec-1.17.0-javadoc.jar
+                    /dir2/commons-codec-1.17.0-sources.jar
+                    /dir2/commons-codec-1.17.0.jar
                     /dir4
-                    /dir4/slf4j-api-2.0.6-javadoc.jar
-                    /dir4/slf4j-api-2.0.6-sources.jar
-                    /dir4/slf4j-api-2.0.6.jar
+                    /dir4/dir9
+                    /dir4/dir9/jakarta.servlet-api-6.0.0-javadoc.jar
+                    /dir4/dir9/jakarta.servlet-api-6.0.0-sources.jar
+                    /dir4/dir9/jakarta.servlet-api-6.0.0.jar
+                    /dir4/dir9/jetty-ee10-servlet-12.0.11-javadoc.jar
+                    /dir4/dir9/jetty-ee10-servlet-12.0.11-sources.jar
+                    /dir4/dir9/jetty-ee10-servlet-12.0.11.jar
+                    /dir4/dir9/jetty-http-12.0.11-javadoc.jar
+                    /dir4/dir9/jetty-http-12.0.11-sources.jar
+                    /dir4/dir9/jetty-http-12.0.11.jar
+                    /dir4/dir9/jetty-io-12.0.11-javadoc.jar
+                    /dir4/dir9/jetty-io-12.0.11-sources.jar
+                    /dir4/dir9/jetty-io-12.0.11.jar
+                    /dir4/dir9/jetty-security-12.0.11-javadoc.jar
+                    /dir4/dir9/jetty-security-12.0.11-sources.jar
+                    /dir4/dir9/jetty-security-12.0.11.jar
+                    /dir4/dir9/jetty-server-12.0.11-javadoc.jar
+                    /dir4/dir9/jetty-server-12.0.11-sources.jar
+                    /dir4/dir9/jetty-server-12.0.11.jar
+                    /dir4/dir9/jetty-session-12.0.11-javadoc.jar
+                    /dir4/dir9/jetty-session-12.0.11-sources.jar
+                    /dir4/dir9/jetty-session-12.0.11.jar
+                    /dir4/dir9/jetty-util-12.0.11-javadoc.jar
+                    /dir4/dir9/jetty-util-12.0.11-sources.jar
+                    /dir4/dir9/jetty-util-12.0.11.jar
+                    /dir4/dir9/slf4j-api-2.0.12-javadoc.jar
+                    /dir4/dir9/slf4j-api-2.0.12-sources.jar
+                    /dir4/dir9/slf4j-api-2.0.12.jar
                     /dir4/slf4j-simple-2.0.6-javadoc.jar
                     /dir4/slf4j-simple-2.0.6-sources.jar
                     /dir4/slf4j-simple-2.0.6.jar
                     /dir5
+                    /dir5/dir10
+                    /dir5/dir10/jsoup-1.18.1-javadoc.jar
+                    /dir5/dir10/jsoup-1.18.1-sources.jar
+                    /dir5/dir10/jsoup-1.18.1.jar
                     /dir5/httpclient5-5.2.1-javadoc.jar
                     /dir5/httpclient5-5.2.1-sources.jar
                     /dir5/httpclient5-5.2.1.jar
@@ -392,7 +654,35 @@ public class TestPurgeOperation {
                     /dir5/httpcore5-h2-5.2.jar
                     /dir5/slf4j-api-1.7.36-javadoc.jar
                     /dir5/slf4j-api-1.7.36-sources.jar
-                    /dir5/slf4j-api-1.7.36.jar""",
+                    /dir5/slf4j-api-1.7.36.jar
+                    /dir6
+                    /dir6/json-20240303-javadoc.jar
+                    /dir6/json-20240303-sources.jar
+                    /dir6/json-20240303.jar
+                    /dir7
+                    /dir7/core-3.5.3-javadoc.jar
+                    /dir7/core-3.5.3-sources.jar
+                    /dir7/core-3.5.3.jar
+                    /dir7/jai-imageio-core-1.4.0-javadoc.jar
+                    /dir7/jai-imageio-core-1.4.0-sources.jar
+                    /dir7/jai-imageio-core-1.4.0.jar
+                    /dir7/javase-3.5.3-javadoc.jar
+                    /dir7/javase-3.5.3-sources.jar
+                    /dir7/javase-3.5.3.jar
+                    /dir7/jcommander-1.82-javadoc.jar
+                    /dir7/jcommander-1.82-sources.jar
+                    /dir7/jcommander-1.82.jar
+                    /dir8
+                    /dir8/checker-qual-3.42.0-javadoc.jar
+                    /dir8/checker-qual-3.42.0-sources.jar
+                    /dir8/checker-qual-3.42.0.jar
+                    /dir8/dir3
+                    /dir8/dir3/commons-collections4-4.4-javadoc.jar
+                    /dir8/dir3/commons-collections4-4.4-sources.jar
+                    /dir8/dir3/commons-collections4-4.4.jar
+                    /dir8/postgresql-42.7.3-javadoc.jar
+                    /dir8/postgresql-42.7.3-sources.jar
+                    /dir8/postgresql-42.7.3.jar""",
                 FileUtils.generateDirectoryListing(tmp));
 
             operation_purge
@@ -403,17 +693,34 @@ public class TestPurgeOperation {
                     /dir1/commons-lang3-3.12.0-sources.jar
                     /dir1/commons-lang3-3.12.0.jar
                     /dir2
-                    /dir2/jakarta.servlet-api-6.0.0-sources.jar
-                    /dir2/jakarta.servlet-api-6.0.0.jar
-                    /dir3
-                    /dir3/commons-collections4-4.4-sources.jar
-                    /dir3/commons-collections4-4.4.jar
+                    /dir2/commons-codec-1.17.0-sources.jar
+                    /dir2/commons-codec-1.17.0.jar
                     /dir4
-                    /dir4/slf4j-api-2.0.6-sources.jar
-                    /dir4/slf4j-api-2.0.6.jar
+                    /dir4/dir9
+                    /dir4/dir9/jakarta.servlet-api-6.0.0-sources.jar
+                    /dir4/dir9/jakarta.servlet-api-6.0.0.jar
+                    /dir4/dir9/jetty-ee10-servlet-12.0.11-sources.jar
+                    /dir4/dir9/jetty-ee10-servlet-12.0.11.jar
+                    /dir4/dir9/jetty-http-12.0.11-sources.jar
+                    /dir4/dir9/jetty-http-12.0.11.jar
+                    /dir4/dir9/jetty-io-12.0.11-sources.jar
+                    /dir4/dir9/jetty-io-12.0.11.jar
+                    /dir4/dir9/jetty-security-12.0.11-sources.jar
+                    /dir4/dir9/jetty-security-12.0.11.jar
+                    /dir4/dir9/jetty-server-12.0.11-sources.jar
+                    /dir4/dir9/jetty-server-12.0.11.jar
+                    /dir4/dir9/jetty-session-12.0.11-sources.jar
+                    /dir4/dir9/jetty-session-12.0.11.jar
+                    /dir4/dir9/jetty-util-12.0.11-sources.jar
+                    /dir4/dir9/jetty-util-12.0.11.jar
+                    /dir4/dir9/slf4j-api-2.0.12-sources.jar
+                    /dir4/dir9/slf4j-api-2.0.12.jar
                     /dir4/slf4j-simple-2.0.6-sources.jar
                     /dir4/slf4j-simple-2.0.6.jar
                     /dir5
+                    /dir5/dir10
+                    /dir5/dir10/jsoup-1.18.1-sources.jar
+                    /dir5/dir10/jsoup-1.18.1.jar
                     /dir5/httpclient5-5.2.1-sources.jar
                     /dir5/httpclient5-5.2.1.jar
                     /dir5/httpcore5-5.2-sources.jar
@@ -421,7 +728,27 @@ public class TestPurgeOperation {
                     /dir5/httpcore5-h2-5.2-sources.jar
                     /dir5/httpcore5-h2-5.2.jar
                     /dir5/slf4j-api-1.7.36-sources.jar
-                    /dir5/slf4j-api-1.7.36.jar""",
+                    /dir5/slf4j-api-1.7.36.jar
+                    /dir6
+                    /dir6/json-20240303-sources.jar
+                    /dir6/json-20240303.jar
+                    /dir7
+                    /dir7/core-3.5.3-sources.jar
+                    /dir7/core-3.5.3.jar
+                    /dir7/jai-imageio-core-1.4.0-sources.jar
+                    /dir7/jai-imageio-core-1.4.0.jar
+                    /dir7/javase-3.5.3-sources.jar
+                    /dir7/javase-3.5.3.jar
+                    /dir7/jcommander-1.82-sources.jar
+                    /dir7/jcommander-1.82.jar
+                    /dir8
+                    /dir8/checker-qual-3.42.0-sources.jar
+                    /dir8/checker-qual-3.42.0.jar
+                    /dir8/dir3
+                    /dir8/dir3/commons-collections4-4.4-sources.jar
+                    /dir8/dir3/commons-collections4-4.4.jar
+                    /dir8/postgresql-42.7.3-sources.jar
+                    /dir8/postgresql-42.7.3.jar""",
                 FileUtils.generateDirectoryListing(tmp));
 
             operation_purge
@@ -431,17 +758,38 @@ public class TestPurgeOperation {
                     /dir1
                     /dir1/commons-lang3-3.12.0.jar
                     /dir2
-                    /dir2/jakarta.servlet-api-6.0.0.jar
-                    /dir3
-                    /dir3/commons-collections4-4.4.jar
+                    /dir2/commons-codec-1.17.0.jar
                     /dir4
-                    /dir4/slf4j-api-2.0.6.jar
+                    /dir4/dir9
+                    /dir4/dir9/jakarta.servlet-api-6.0.0.jar
+                    /dir4/dir9/jetty-ee10-servlet-12.0.11.jar
+                    /dir4/dir9/jetty-http-12.0.11.jar
+                    /dir4/dir9/jetty-io-12.0.11.jar
+                    /dir4/dir9/jetty-security-12.0.11.jar
+                    /dir4/dir9/jetty-server-12.0.11.jar
+                    /dir4/dir9/jetty-session-12.0.11.jar
+                    /dir4/dir9/jetty-util-12.0.11.jar
+                    /dir4/dir9/slf4j-api-2.0.12.jar
                     /dir4/slf4j-simple-2.0.6.jar
                     /dir5
+                    /dir5/dir10
+                    /dir5/dir10/jsoup-1.18.1.jar
                     /dir5/httpclient5-5.2.1.jar
                     /dir5/httpcore5-5.2.jar
                     /dir5/httpcore5-h2-5.2.jar
-                    /dir5/slf4j-api-1.7.36.jar""",
+                    /dir5/slf4j-api-1.7.36.jar
+                    /dir6
+                    /dir6/json-20240303.jar
+                    /dir7
+                    /dir7/core-3.5.3.jar
+                    /dir7/jai-imageio-core-1.4.0.jar
+                    /dir7/javase-3.5.3.jar
+                    /dir7/jcommander-1.82.jar
+                    /dir8
+                    /dir8/checker-qual-3.42.0.jar
+                    /dir8/dir3
+                    /dir8/dir3/commons-collections4-4.4.jar
+                    /dir8/postgresql-42.7.3.jar""",
                 FileUtils.generateDirectoryListing(tmp));
         } finally {
             FileUtils.deleteDirectory(tmp);
@@ -465,29 +813,39 @@ public class TestPurgeOperation {
             project1.createProjectStructure();
             project1.repositories().add(Repository.MAVEN_CENTRAL);
             project1.dependencies().scope(Scope.compile)
-                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 1)));
+                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3,1)))
+                .include(new Module("org.json", "json", new VersionNumber(20240205)));
             project1.dependencies().scope(Scope.provided)
-                .include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(5, 0, 0)));
+                .include(new Dependency("commons-codec", "commons-codec", new VersionNumber(1,14)))
+                .include(new Module("com.google.zxing", "javase", new VersionNumber(3,4,0)));
             project1.dependencies().scope(Scope.runtime)
-                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 3)));
+                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4,3)))
+                .include(new Module("org.postgresql", "postgresql", new VersionNumber(42,4,5)));
             project1.dependencies().scope(Scope.standalone)
-                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2, 0, 0)));
+                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2,0,0)))
+                .include(new Module("org.eclipse.jetty.ee10", "jetty-ee10-servlet", new VersionNumber(12,0,6)));
             project1.dependencies().scope(Scope.test)
-                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5, 0)));
+                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5,0)))
+                .include(new Module("org.jsoup", "jsoup", new VersionNumber(1,15,3)));
 
             var project2 = new TestProject(tmp);
             project2.createProjectStructure();
             project2.repositories().add(Repository.MAVEN_CENTRAL);
             project2.dependencies().scope(Scope.compile)
-                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3, 12, 0)));
+                .include(new Dependency("org.apache.commons", "commons-lang3", new VersionNumber(3,12,0)))
+                .include(new Module("org.json", "json", new VersionNumber(20240303)));
             project2.dependencies().scope(Scope.provided)
-                .include(new Dependency("jakarta.servlet", "jakarta.servlet-api", new VersionNumber(6, 0, 0)));
+                .include(new Dependency("commons-codec", "commons-codec", new VersionNumber(1,17,0)))
+                .include(new Module("com.google.zxing", "javase", new VersionNumber(3,5,3)));
             project2.dependencies().scope(Scope.runtime)
-                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4, 4)));
+                .include(new Dependency("org.apache.commons", "commons-collections4", new VersionNumber(4,4)))
+                .include(new Module("org.postgresql", "postgresql", new VersionNumber(42,7,3)));
             project2.dependencies().scope(Scope.standalone)
-                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2, 0, 6)));
+                .include(new Dependency("org.slf4j", "slf4j-simple", new VersionNumber(2,0,6)))
+                .include(new Module("org.eclipse.jetty.ee10", "jetty-ee10-servlet", new VersionNumber(12,0,11)));
             project2.dependencies().scope(Scope.test)
-                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5, 2, 1)));
+                .include(new Dependency("org.apache.httpcomponents.client5", "httpclient5", new VersionNumber(5,2,1)))
+                .include(new Module("org.jsoup", "jsoup", new VersionNumber(1,18,1)));
 
             new DownloadOperation()
                 .fromProject(project1)
@@ -504,21 +862,81 @@ public class TestPurgeOperation {
                     /lib/compile/commons-lang3-3.1.jar
                     /lib/compile/commons-lang3-3.12.0-sources.jar
                     /lib/compile/commons-lang3-3.12.0.jar
+                    /lib/compile/modules
+                    /lib/compile/modules/json-20240205-sources.jar
+                    /lib/compile/modules/json-20240205.jar
+                    /lib/compile/modules/json-20240303-sources.jar
+                    /lib/compile/modules/json-20240303.jar
                     /lib/provided
-                    /lib/provided/jakarta.servlet-api-5.0.0-sources.jar
-                    /lib/provided/jakarta.servlet-api-5.0.0.jar
-                    /lib/provided/jakarta.servlet-api-6.0.0-sources.jar
-                    /lib/provided/jakarta.servlet-api-6.0.0.jar
+                    /lib/provided/commons-codec-1.14-sources.jar
+                    /lib/provided/commons-codec-1.14.jar
+                    /lib/provided/commons-codec-1.17.0-sources.jar
+                    /lib/provided/commons-codec-1.17.0.jar
+                    /lib/provided/modules
+                    /lib/provided/modules/core-3.4.0-sources.jar
+                    /lib/provided/modules/core-3.4.0.jar
+                    /lib/provided/modules/core-3.5.3-sources.jar
+                    /lib/provided/modules/core-3.5.3.jar
+                    /lib/provided/modules/jai-imageio-core-1.4.0-sources.jar
+                    /lib/provided/modules/jai-imageio-core-1.4.0.jar
+                    /lib/provided/modules/javase-3.4.0-sources.jar
+                    /lib/provided/modules/javase-3.4.0.jar
+                    /lib/provided/modules/javase-3.5.3-sources.jar
+                    /lib/provided/modules/javase-3.5.3.jar
+                    /lib/provided/modules/jcommander-1.72-sources.jar
+                    /lib/provided/modules/jcommander-1.72.jar
+                    /lib/provided/modules/jcommander-1.82-sources.jar
+                    /lib/provided/modules/jcommander-1.82.jar
                     /lib/runtime
                     /lib/runtime/commons-collections4-4.3-sources.jar
                     /lib/runtime/commons-collections4-4.3.jar
                     /lib/runtime/commons-collections4-4.4-sources.jar
                     /lib/runtime/commons-collections4-4.4.jar
+                    /lib/runtime/modules
+                    /lib/runtime/modules/checker-qual-3.42.0-sources.jar
+                    /lib/runtime/modules/checker-qual-3.42.0.jar
+                    /lib/runtime/modules/checker-qual-3.5.0-sources.jar
+                    /lib/runtime/modules/checker-qual-3.5.0.jar
+                    /lib/runtime/modules/postgresql-42.4.5-sources.jar
+                    /lib/runtime/modules/postgresql-42.4.5.jar
+                    /lib/runtime/modules/postgresql-42.7.3-sources.jar
+                    /lib/runtime/modules/postgresql-42.7.3.jar
                     /lib/standalone
-                    /lib/standalone/slf4j-api-2.0.0-sources.jar
-                    /lib/standalone/slf4j-api-2.0.0.jar
-                    /lib/standalone/slf4j-api-2.0.6-sources.jar
-                    /lib/standalone/slf4j-api-2.0.6.jar
+                    /lib/standalone/modules
+                    /lib/standalone/modules/jakarta.servlet-api-6.0.0-sources.jar
+                    /lib/standalone/modules/jakarta.servlet-api-6.0.0.jar
+                    /lib/standalone/modules/jetty-ee10-servlet-12.0.11-sources.jar
+                    /lib/standalone/modules/jetty-ee10-servlet-12.0.11.jar
+                    /lib/standalone/modules/jetty-ee10-servlet-12.0.6-sources.jar
+                    /lib/standalone/modules/jetty-ee10-servlet-12.0.6.jar
+                    /lib/standalone/modules/jetty-http-12.0.11-sources.jar
+                    /lib/standalone/modules/jetty-http-12.0.11.jar
+                    /lib/standalone/modules/jetty-http-12.0.6-sources.jar
+                    /lib/standalone/modules/jetty-http-12.0.6.jar
+                    /lib/standalone/modules/jetty-io-12.0.11-sources.jar
+                    /lib/standalone/modules/jetty-io-12.0.11.jar
+                    /lib/standalone/modules/jetty-io-12.0.6-sources.jar
+                    /lib/standalone/modules/jetty-io-12.0.6.jar
+                    /lib/standalone/modules/jetty-security-12.0.11-sources.jar
+                    /lib/standalone/modules/jetty-security-12.0.11.jar
+                    /lib/standalone/modules/jetty-security-12.0.6-sources.jar
+                    /lib/standalone/modules/jetty-security-12.0.6.jar
+                    /lib/standalone/modules/jetty-server-12.0.11-sources.jar
+                    /lib/standalone/modules/jetty-server-12.0.11.jar
+                    /lib/standalone/modules/jetty-server-12.0.6-sources.jar
+                    /lib/standalone/modules/jetty-server-12.0.6.jar
+                    /lib/standalone/modules/jetty-session-12.0.11-sources.jar
+                    /lib/standalone/modules/jetty-session-12.0.11.jar
+                    /lib/standalone/modules/jetty-session-12.0.6-sources.jar
+                    /lib/standalone/modules/jetty-session-12.0.6.jar
+                    /lib/standalone/modules/jetty-util-12.0.11-sources.jar
+                    /lib/standalone/modules/jetty-util-12.0.11.jar
+                    /lib/standalone/modules/jetty-util-12.0.6-sources.jar
+                    /lib/standalone/modules/jetty-util-12.0.6.jar
+                    /lib/standalone/modules/slf4j-api-2.0.12-sources.jar
+                    /lib/standalone/modules/slf4j-api-2.0.12.jar
+                    /lib/standalone/modules/slf4j-api-2.0.9-sources.jar
+                    /lib/standalone/modules/slf4j-api-2.0.9.jar
                     /lib/standalone/slf4j-simple-2.0.0-sources.jar
                     /lib/standalone/slf4j-simple-2.0.0.jar
                     /lib/standalone/slf4j-simple-2.0.6-sources.jar
@@ -538,6 +956,11 @@ public class TestPurgeOperation {
                     /lib/test/httpcore5-h2-5.0.jar
                     /lib/test/httpcore5-h2-5.2-sources.jar
                     /lib/test/httpcore5-h2-5.2.jar
+                    /lib/test/modules
+                    /lib/test/modules/jsoup-1.15.3-sources.jar
+                    /lib/test/modules/jsoup-1.15.3.jar
+                    /lib/test/modules/jsoup-1.18.1-sources.jar
+                    /lib/test/modules/jsoup-1.18.1.jar
                     /lib/test/slf4j-api-1.7.25-sources.jar
                     /lib/test/slf4j-api-1.7.25.jar
                     /lib/test/slf4j-api-1.7.36-sources.jar
@@ -565,15 +988,49 @@ public class TestPurgeOperation {
                     /lib/compile
                     /lib/compile/commons-lang3-3.12.0-sources.jar
                     /lib/compile/commons-lang3-3.12.0.jar
+                    /lib/compile/modules
+                    /lib/compile/modules/json-20240303-sources.jar
+                    /lib/compile/modules/json-20240303.jar
                     /lib/provided
-                    /lib/provided/jakarta.servlet-api-6.0.0-sources.jar
-                    /lib/provided/jakarta.servlet-api-6.0.0.jar
+                    /lib/provided/commons-codec-1.17.0-sources.jar
+                    /lib/provided/commons-codec-1.17.0.jar
+                    /lib/provided/modules
+                    /lib/provided/modules/core-3.5.3-sources.jar
+                    /lib/provided/modules/core-3.5.3.jar
+                    /lib/provided/modules/jai-imageio-core-1.4.0-sources.jar
+                    /lib/provided/modules/jai-imageio-core-1.4.0.jar
+                    /lib/provided/modules/javase-3.5.3-sources.jar
+                    /lib/provided/modules/javase-3.5.3.jar
+                    /lib/provided/modules/jcommander-1.82-sources.jar
+                    /lib/provided/modules/jcommander-1.82.jar
                     /lib/runtime
                     /lib/runtime/commons-collections4-4.4-sources.jar
                     /lib/runtime/commons-collections4-4.4.jar
+                    /lib/runtime/modules
+                    /lib/runtime/modules/checker-qual-3.42.0-sources.jar
+                    /lib/runtime/modules/checker-qual-3.42.0.jar
+                    /lib/runtime/modules/postgresql-42.7.3-sources.jar
+                    /lib/runtime/modules/postgresql-42.7.3.jar
                     /lib/standalone
-                    /lib/standalone/slf4j-api-2.0.6-sources.jar
-                    /lib/standalone/slf4j-api-2.0.6.jar
+                    /lib/standalone/modules
+                    /lib/standalone/modules/jakarta.servlet-api-6.0.0-sources.jar
+                    /lib/standalone/modules/jakarta.servlet-api-6.0.0.jar
+                    /lib/standalone/modules/jetty-ee10-servlet-12.0.11-sources.jar
+                    /lib/standalone/modules/jetty-ee10-servlet-12.0.11.jar
+                    /lib/standalone/modules/jetty-http-12.0.11-sources.jar
+                    /lib/standalone/modules/jetty-http-12.0.11.jar
+                    /lib/standalone/modules/jetty-io-12.0.11-sources.jar
+                    /lib/standalone/modules/jetty-io-12.0.11.jar
+                    /lib/standalone/modules/jetty-security-12.0.11-sources.jar
+                    /lib/standalone/modules/jetty-security-12.0.11.jar
+                    /lib/standalone/modules/jetty-server-12.0.11-sources.jar
+                    /lib/standalone/modules/jetty-server-12.0.11.jar
+                    /lib/standalone/modules/jetty-session-12.0.11-sources.jar
+                    /lib/standalone/modules/jetty-session-12.0.11.jar
+                    /lib/standalone/modules/jetty-util-12.0.11-sources.jar
+                    /lib/standalone/modules/jetty-util-12.0.11.jar
+                    /lib/standalone/modules/slf4j-api-2.0.12-sources.jar
+                    /lib/standalone/modules/slf4j-api-2.0.12.jar
                     /lib/standalone/slf4j-simple-2.0.6-sources.jar
                     /lib/standalone/slf4j-simple-2.0.6.jar
                     /lib/test
@@ -583,6 +1040,9 @@ public class TestPurgeOperation {
                     /lib/test/httpcore5-5.2.jar
                     /lib/test/httpcore5-h2-5.2-sources.jar
                     /lib/test/httpcore5-h2-5.2.jar
+                    /lib/test/modules
+                    /lib/test/modules/jsoup-1.18.1-sources.jar
+                    /lib/test/modules/jsoup-1.18.1.jar
                     /lib/test/slf4j-api-1.7.36-sources.jar
                     /lib/test/slf4j-api-1.7.36.jar
                     /src