diff --git a/core/src/main/java/module-info.java b/core/src/main/java/module-info.java
new file mode 100644
index 0000000..b4bf4ed
--- /dev/null
+++ b/core/src/main/java/module-info.java
@@ -0,0 +1,13 @@
+import com.garciat.typeclasses.processor.WitnessResolutionChecker;
+
+import javax.annotation.processing.Processor;
+
+module com.garciat.typeclasses.core {
+    requires jdk.compiler;
+
+    exports com.garciat.typeclasses;
+    exports com.garciat.typeclasses.api;
+    exports com.garciat.typeclasses.api.hkt;
+
+    provides Processor with WitnessResolutionChecker;
+}
diff --git a/core/src/test/java/com/garciat/typeclasses/TypeClassesTest.java b/core/src/test/java/com/garciat/typeclasses/typeclasses/TypeClassesTest.java
similarity index 98%
rename from core/src/test/java/com/garciat/typeclasses/TypeClassesTest.java
rename to core/src/test/java/com/garciat/typeclasses/typeclasses/TypeClassesTest.java
index 0159ff6..bc9d4ce 100644
--- a/core/src/test/java/com/garciat/typeclasses/TypeClassesTest.java
+++ b/core/src/test/java/com/garciat/typeclasses/typeclasses/TypeClassesTest.java
@@ -1,9 +1,10 @@
-package com.garciat.typeclasses;
+package com.garciat.typeclasses.typeclasses;
 
 import static com.garciat.typeclasses.TypeClasses.witness;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.garciat.typeclasses.TypeClasses;
 import com.garciat.typeclasses.api.Ty;
 import com.garciat.typeclasses.api.TypeClass;
 import com.garciat.typeclasses.testclasses.TestEq;
diff --git a/instances/src/main/java/module-info.java b/instances/src/main/java/module-info.java
new file mode 100644
index 0000000..5f5dc82
--- /dev/null
+++ b/instances/src/main/java/module-info.java
@@ -0,0 +1,6 @@
+module com.garciat.typeclasses.instances {
+    requires transitive com.garciat.typeclasses.core;
+
+    exports com.garciat.typeclasses.classes;
+    exports com.garciat.typeclasses.types;
+}
diff --git a/instances/src/test/java/com/garciat/typeclasses/ExamplesTest.java b/instances/src/test/java/com/garciat/typeclasses/examplestest/ExamplesTest.java
similarity index 98%
rename from instances/src/test/java/com/garciat/typeclasses/ExamplesTest.java
rename to instances/src/test/java/com/garciat/typeclasses/examplestest/ExamplesTest.java
index 353ef6e..b635c11 100644
--- a/instances/src/test/java/com/garciat/typeclasses/ExamplesTest.java
+++ b/instances/src/test/java/com/garciat/typeclasses/examplestest/ExamplesTest.java
@@ -1,4 +1,4 @@
-package com.garciat.typeclasses;
+package com.garciat.typeclasses.examplestest;
 
 import static com.garciat.typeclasses.TypeClasses.witness;