diff --git a/aws-lambda-java-core/module-info.java b/aws-lambda-java-core/module-info.java
new file mode 100644
index 00000000..d1cacb3c
--- /dev/null
+++ b/aws-lambda-java-core/module-info.java
@@ -0,0 +1,5 @@
+module aws.lambda.core {
+
+  exports com.amazonaws.services.lambda.runtime;
+  exports com.amazonaws.services.lambda.runtime.logging;
+}
diff --git a/aws-lambda-java-core/pom.xml b/aws-lambda-java-core/pom.xml
index 0dd848a9..174f6118 100644
--- a/aws-lambda-java-core/pom.xml
+++ b/aws-lambda-java-core/pom.xml
@@ -43,6 +43,32 @@
     </repository>
   </distributionManagement>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+        <version>1.2.2.Final</version>
+        <executions>
+          <execution>
+            <id>add-module-infos</id>
+            <phase>package</phase>
+            <goals>
+              <goal>add-module-info</goal>
+            </goals>
+            <configuration>
+              <failOnWarning>false</failOnWarning>
+              <overwriteExistingFiles>true</overwriteExistingFiles>
+              <module>
+                <moduleInfoFile>./module-info.java
+                </moduleInfoFile>
+              </module>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
   <profiles>
     <profile>
       <id>dev</id>
diff --git a/aws-lambda-java-events-sdk-transformer/module-info.java b/aws-lambda-java-events-sdk-transformer/module-info.java
new file mode 100644
index 00000000..c4ab43ef
--- /dev/null
+++ b/aws-lambda-java-events-sdk-transformer/module-info.java
@@ -0,0 +1,10 @@
+module aws.lambda.events.sdk.transformer {
+
+  exports com.amazonaws.services.lambda.runtime.events.transformers.v1;
+  exports com.amazonaws.services.lambda.runtime.events.transformers.v1.dynamodb;
+  exports com.amazonaws.services.lambda.runtime.events.transformers.v2;
+  exports com.amazonaws.services.lambda.runtime.events.transformers.v2.dynamodb;
+
+  requires transitive aws.lambda.events;
+  requires static aws.java.sdk.dynamodb;
+}
diff --git a/aws-lambda-java-events-sdk-transformer/pom.xml b/aws-lambda-java-events-sdk-transformer/pom.xml
index 6a2b1735..4abfa1a9 100644
--- a/aws-lambda-java-events-sdk-transformer/pom.xml
+++ b/aws-lambda-java-events-sdk-transformer/pom.xml
@@ -85,6 +85,28 @@
         <artifactId>maven-failsafe-plugin</artifactId>
         <version>2.22.2</version>
       </plugin>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+        <version>1.2.2.Final</version>
+        <executions>
+          <execution>
+            <id>add-module-infos</id>
+            <phase>package</phase>
+            <goals>
+              <goal>add-module-info</goal>
+            </goals>
+            <configuration>
+              <failOnWarning>false</failOnWarning>
+              <overwriteExistingFiles>true</overwriteExistingFiles>
+              <module>
+                <moduleInfoFile>./module-info.java
+                </moduleInfoFile>
+              </module>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/aws-lambda-java-events/module-info.java b/aws-lambda-java-events/module-info.java
new file mode 100644
index 00000000..5b1172c9
--- /dev/null
+++ b/aws-lambda-java-events/module-info.java
@@ -0,0 +1,11 @@
+module aws.lambda.events {
+
+  exports com.amazonaws.services.lambda.runtime.events;
+  exports com.amazonaws.services.lambda.runtime.events.models;
+  exports com.amazonaws.services.lambda.runtime.events.models.dynamodb;
+  exports com.amazonaws.services.lambda.runtime.events.models.kinesis;
+  exports com.amazonaws.services.lambda.runtime.events.models.s3;
+
+  requires static lombok;
+  requires org.joda.time;
+}
diff --git a/aws-lambda-java-events/pom.xml b/aws-lambda-java-events/pom.xml
index f1364e7a..2fb837dc 100644
--- a/aws-lambda-java-events/pom.xml
+++ b/aws-lambda-java-events/pom.xml
@@ -80,6 +80,32 @@
         </dependency>
     </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+        <version>1.2.2.Final</version>
+        <executions>
+          <execution>
+            <id>add-module-infos</id>
+            <phase>package</phase>
+            <goals>
+              <goal>add-module-info</goal>
+            </goals>
+            <configuration>
+              <failOnWarning>false</failOnWarning>
+              <overwriteExistingFiles>true</overwriteExistingFiles>
+              <module>
+                <moduleInfoFile>./module-info.java
+                </moduleInfoFile>
+              </module>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
     <profiles>
         <profile>
             <id>dev</id>
diff --git a/aws-lambda-java-log4j2/module-info.java b/aws-lambda-java-log4j2/module-info.java
new file mode 100644
index 00000000..80a39ba1
--- /dev/null
+++ b/aws-lambda-java-log4j2/module-info.java
@@ -0,0 +1,9 @@
+module aws.lambda.log4j2 {
+
+  exports com.amazonaws.services.lambda.runtime.log4j2;
+
+  requires aws.lambda.core;
+  requires org.apache.logging.log4j;
+  requires org.apache.logging.log4j.core;
+
+}
diff --git a/aws-lambda-java-log4j2/pom.xml b/aws-lambda-java-log4j2/pom.xml
index b33300ef..7fd37466 100644
--- a/aws-lambda-java-log4j2/pom.xml
+++ b/aws-lambda-java-log4j2/pom.xml
@@ -61,7 +61,32 @@
             <version>${log4j.version}</version>
         </dependency>
     </dependencies>
-
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+        <version>1.2.2.Final</version>
+        <executions>
+          <execution>
+            <id>add-module-infos</id>
+            <phase>package</phase>
+            <goals>
+              <goal>add-module-info</goal>
+            </goals>
+            <configuration>
+              <failOnWarning>false</failOnWarning>
+              <overwriteExistingFiles>true</overwriteExistingFiles>
+              <module>
+                <moduleInfoFile>./module-info.java
+                </moduleInfoFile>
+              </module>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
     <profiles>
         <profile>
             <id>dev</id>
diff --git a/aws-lambda-java-runtime-interface-client/module-info.java b/aws-lambda-java-runtime-interface-client/module-info.java
new file mode 100644
index 00000000..99bca665
--- /dev/null
+++ b/aws-lambda-java-runtime-interface-client/module-info.java
@@ -0,0 +1,16 @@
+module aws.lambda.runtime.client {
+
+  exports com.amazonaws.services.lambda.crac;
+  exports com.amazonaws.services.lambda.runtime.api.client;
+  exports com.amazonaws.services.lambda.runtime.api.client.api;
+  exports com.amazonaws.services.lambda.runtime.api.client.logging;
+  exports com.amazonaws.services.lambda.runtime.api.client.runtimeapi;
+  exports com.amazonaws.services.lambda.runtime.api.client.runtimeapi.converters;
+  exports com.amazonaws.services.lambda.runtime.api.client.runtimeapi.dto;
+  exports com.amazonaws.services.lambda.runtime.api.client.util;
+
+  requires transitive aws.lambda.core;
+  requires transitive aws.lambda.serialization;
+  requires jdk.unsupported;
+
+}
diff --git a/aws-lambda-java-runtime-interface-client/pom.xml b/aws-lambda-java-runtime-interface-client/pom.xml
index e84cac0d..828c767f 100644
--- a/aws-lambda-java-runtime-interface-client/pom.xml
+++ b/aws-lambda-java-runtime-interface-client/pom.xml
@@ -271,6 +271,28 @@
                     </execution>
                 </executions>
             </plugin>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+        <version>1.2.2.Final</version>
+        <executions>
+          <execution>
+            <id>add-module-infos</id>
+            <phase>package</phase>
+            <goals>
+              <goal>add-module-info</goal>
+            </goals>
+            <configuration>
+              <failOnWarning>false</failOnWarning>
+              <overwriteExistingFiles>true</overwriteExistingFiles>
+              <module>
+                <moduleInfoFile>./module-info.java
+                </moduleInfoFile>
+              </module>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
         </plugins>
     </build>
 
diff --git a/aws-lambda-java-serialization/module-info.java b/aws-lambda-java-serialization/module-info.java
new file mode 100644
index 00000000..74e83f8e
--- /dev/null
+++ b/aws-lambda-java-serialization/module-info.java
@@ -0,0 +1,18 @@
+module aws.lambda.serialization {
+
+  exports com.amazonaws.services.lambda.runtime.serialization;
+  exports com.amazonaws.services.lambda.runtime.serialization.events;
+  exports com.amazonaws.services.lambda.runtime.serialization.events.mixins;
+  exports com.amazonaws.services.lambda.runtime.serialization.events.modules;
+  exports com.amazonaws.services.lambda.runtime.serialization.events.serializers;
+  exports com.amazonaws.services.lambda.runtime.serialization.factories;
+  exports com.amazonaws.services.lambda.runtime.serialization.util;
+
+  requires transitive com.fasterxml.jackson.databind;
+  requires static com.fasterxml.jackson.datatype.joda;
+  requires static org.json;
+  requires static com.google.gson;
+  requires static com.fasterxml.jackson.datatype.jsr310;
+  requires static com.fasterxml.jackson.datatype.jdk8;
+
+}
diff --git a/aws-lambda-java-serialization/pom.xml b/aws-lambda-java-serialization/pom.xml
index 07ccecc8..63d4aa29 100644
--- a/aws-lambda-java-serialization/pom.xml
+++ b/aws-lambda-java-serialization/pom.xml
@@ -266,6 +266,28 @@
                     </execution>
                 </executions>
             </plugin>
-        </plugins>
-    </build>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+        <version>1.2.2.Final</version>
+        <executions>
+          <execution>
+            <id>add-module-infos</id>
+            <phase>package</phase>
+            <goals>
+              <goal>add-module-info</goal>
+            </goals>
+            <configuration>
+              <failOnWarning>false</failOnWarning>
+              <overwriteExistingFiles>true</overwriteExistingFiles>
+              <module>
+                <moduleInfoFile>./module-info.java
+                </moduleInfoFile>
+              </module>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>