diff --git a/javax-money/pom.xml b/javax-money/pom.xml
index 4a8f1dc..29952bc 100644
--- a/javax-money/pom.xml
+++ b/javax-money/pom.xml
@@ -85,10 +85,6 @@
                 <groupId>com.google.code.maven-replacer-plugin</groupId>
                 <artifactId>replacer</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-            </plugin>
             <!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
             <plugin>
                 <groupId>org.gradlex</groupId>
diff --git a/javax-money/src/moditect/module-info.java b/javax-money/src/main/java/module-info.java
similarity index 72%
rename from javax-money/src/moditect/module-info.java
rename to javax-money/src/main/java/module-info.java
index 03f9e25..c15a174 100644
--- a/javax-money/src/moditect/module-info.java
+++ b/javax-money/src/main/java/module-info.java
@@ -1,4 +1,4 @@
-// Hand-crafted 05-Nov-2024
+// Javax-money module Main artifact Module descriptor
 module tools.jackson.datatype.javax.money
 {
     requires com.fasterxml.jackson.annotation;
@@ -7,6 +7,9 @@
 
     requires java.money;
 
+    // compile-time only dependencies
+    requires static org.apiguardian.api;
+    
     exports tools.jackson.datatype.javax.money;
 
     provides tools.jackson.databind.JacksonModule with
diff --git a/javax-money/src/main/java/tools/jackson/datatype/javax/money/MonetaryAmountDeserializer.java b/javax-money/src/main/java/tools/jackson/datatype/javax/money/MonetaryAmountDeserializer.java
index c7e5831..d64d52b 100644
--- a/javax-money/src/main/java/tools/jackson/datatype/javax/money/MonetaryAmountDeserializer.java
+++ b/javax-money/src/main/java/tools/jackson/datatype/javax/money/MonetaryAmountDeserializer.java
@@ -6,6 +6,9 @@
 import javax.money.CurrencyUnit;
 import javax.money.MonetaryAmount;
 
+import javax.money.CurrencyUnit;
+import javax.money.MonetaryAmount;
+
 import tools.jackson.core.JsonParser;
 import tools.jackson.core.JsonToken;
 import tools.jackson.databind.DeserializationContext;
diff --git a/javax-money/src/test/java/module-info.java b/javax-money/src/test/java/module-info.java
new file mode 100644
index 0000000..0c91219
--- /dev/null
+++ b/javax-money/src/test/java/module-info.java
@@ -0,0 +1,26 @@
+// Javax-money module (unit) Test Module descriptor
+module tools.jackson.datatype.javax.money
+{
+    // Since we are not split from Main artifact, will not
+    // need to depend on Main artifact -- but need its dependencies
+
+    requires com.fasterxml.jackson.annotation;
+    requires tools.jackson.core;
+    requires tools.jackson.databind;
+
+    requires java.money;
+
+    // compile-time only dependencies
+    requires static org.apiguardian.api;
+
+    // Additional test lib/framework dependencies
+    requires org.assertj.core;
+    requires org.mockito;
+    requires org.junit.jupiter.api;
+    requires org.junit.jupiter.params;
+
+    requires org.javamoney.moneta;
+
+    // Further, need to open up test packages for JUnit et al
+    opens tools.jackson.datatype.javax.money;
+}
diff --git a/moneta/pom.xml b/moneta/pom.xml
index 6da0fd6..860bfb1 100644
--- a/moneta/pom.xml
+++ b/moneta/pom.xml
@@ -89,10 +89,6 @@
                 <groupId>com.google.code.maven-replacer-plugin</groupId>
                 <artifactId>replacer</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.moditect</groupId>
-                <artifactId>moditect-maven-plugin</artifactId>
-            </plugin>
             <!-- 28-Feb-2025, jjohannes: Apply plugin last as it has to be the last of all 'package phase' plugins -->
             <plugin>
                 <groupId>org.gradlex</groupId>
diff --git a/moneta/src/moditect/module-info.java b/moneta/src/main/java/module-info.java
similarity index 69%
rename from moneta/src/moditect/module-info.java
rename to moneta/src/main/java/module-info.java
index a2cd4a8..cde8f16 100644
--- a/moneta/src/moditect/module-info.java
+++ b/moneta/src/main/java/module-info.java
@@ -1,4 +1,4 @@
-// Hand-crafted 29-Jan-2025
+// Moneta module Main artifact Module descriptor
 module tools.jackson.datatype.moneta
 {
     requires com.fasterxml.jackson.annotation;
@@ -6,9 +6,13 @@
     requires tools.jackson.databind;
 
     requires tools.jackson.datatype.javax.money;
-
     requires java.money;
+    requires org.javamoney.moneta;
+
+    // compile-time only dependencies
+    requires static org.apiguardian.api;
 
+    
     exports tools.jackson.datatype.moneta;
 
     provides tools.jackson.databind.JacksonModule with
diff --git a/moneta/src/test/java/module-info.java b/moneta/src/test/java/module-info.java
new file mode 100644
index 0000000..036de6a
--- /dev/null
+++ b/moneta/src/test/java/module-info.java
@@ -0,0 +1,26 @@
+// Moneta module (unit) Test Module descriptor
+module tools.jackson.datatype.moneta
+{
+    // Since we are not split from Main artifact, will not
+    // need to depend on Main artifact -- but need its dependencies
+
+    requires com.fasterxml.jackson.annotation;
+    requires tools.jackson.core;
+    requires tools.jackson.databind;
+
+    requires tools.jackson.datatype.javax.money;
+    requires java.money;
+    requires org.javamoney.moneta;
+
+    // compile-time only dependencies
+    requires static org.apiguardian.api;
+
+    // Additional test lib/framework dependencies
+    requires org.assertj.core;
+    requires org.mockito;
+    requires org.junit.jupiter.api;
+    requires org.junit.jupiter.params;
+
+    // Further, need to open up test packages for JUnit et al
+    opens tools.jackson.datatype.moneta;
+}
diff --git a/release-notes/VERSION b/release-notes/VERSION
index f7ebd58..0dec429 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -15,6 +15,8 @@ Modules:
 
 3.0.0-rc3 (not yet released)
 
+#56: Change `jackson-datatype-javax-money`, `jackson-datatype-moneta`
+  to directly use JPMS [JSTEP-11]
 - Branch rename "master" -> "3.x" [JSTEP-12]
 
 3.0.0-rc2 (28-Mar-2025)