diff --git a/.travis.yml b/.travis.yml
index 41fc6733..18b37593 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: java
 dist: trusty
 jdk:
-  - oraclejdk8
+  - oraclejdk11
 script:
   - sh travis-build.sh
diff --git a/build.gradle b/build.gradle
index 74aefea2..3875d3f9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,6 +37,7 @@ plugins {
     id 'io.franzbecker.gradle-lombok' version '3.2.0' apply false
     id "com.jfrog.artifactory" version "4.11.0" apply false
     id "biz.aQute.bnd.builder" version "5.0.0" apply false
+    id "org.javamodularity.moduleplugin" version "1.5.0" apply false
 }
 
 subprojects {
@@ -46,6 +47,7 @@ subprojects {
     apply plugin: "com.jfrog.bintray"
     apply plugin: 'io.franzbecker.gradle-lombok'
     apply plugin: 'com.jfrog.artifactory'
+    apply plugin: 'org.javamodularity.moduleplugin'
 
     repositories {
         mavenLocal()
diff --git a/gradle.properties b/gradle.properties
index 95005284..f849f2ee 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,7 @@ PROJECT_DEV_NAME = Andrew Potter
 LIB_GRAPHQL_JAVA_VER = 14.0
 LIB_JACKSON_VER = 2.10.0
 
-SOURCE_COMPATIBILITY = 1.8
-TARGET_COMPATIBILITY = 1.8
+SOURCE_COMPATIBILITY = 9
+TARGET_COMPATIBILITY = 9
 
 GRADLE_WRAPPER_VER = 6.0.1
diff --git a/graphql-java-kickstart/src/main/java/module-info.java b/graphql-java-kickstart/src/main/java/module-info.java
new file mode 100644
index 00000000..805974b2
--- /dev/null
+++ b/graphql-java-kickstart/src/main/java/module-info.java
@@ -0,0 +1,25 @@
+module graphql.kickstart.execution {
+	requires lombok;
+	requires graphql.java;
+	requires com.fasterxml.jackson.annotation;
+	requires com.fasterxml.jackson.databind;
+	requires com.fasterxml.jackson.datatype.jdk8;
+
+	exports graphql.kickstart.execution;
+	exports graphql.kickstart.execution.config;
+	exports graphql.kickstart.execution.context;
+	exports graphql.kickstart.execution.error;
+	exports graphql.kickstart.execution.input;
+	exports graphql.kickstart.execution.instrumentation;
+	exports graphql.kickstart.execution.subscriptions;
+	exports graphql.kickstart.execution.subscriptions.apollo;
+
+	opens graphql.kickstart.execution;
+	opens graphql.kickstart.execution.config;
+	opens graphql.kickstart.execution.context;
+	opens graphql.kickstart.execution.error;
+	opens graphql.kickstart.execution.input;
+	opens graphql.kickstart.execution.instrumentation;
+	opens graphql.kickstart.execution.subscriptions;
+	opens graphql.kickstart.execution.subscriptions.apollo;
+}
diff --git a/graphql-java-servlet/bnd.bnd b/graphql-java-servlet/bnd.bnd
index 070b4e21..9fd06cae 100644
--- a/graphql-java-servlet/bnd.bnd
+++ b/graphql-java-servlet/bnd.bnd
@@ -1,2 +1,2 @@
-Export-Package: graphql.kickstart.*
+Export-Package: graphql.kickstart.servlet.*
 Require-Capability: osgi.extender
diff --git a/graphql-java-servlet/src/main/java/module-info.java b/graphql-java-servlet/src/main/java/module-info.java
new file mode 100644
index 00000000..f990b43a
--- /dev/null
+++ b/graphql-java-servlet/src/main/java/module-info.java
@@ -0,0 +1,23 @@
+module graphql.kickstart.servlet {
+	requires graphql.java;
+	requires lombok;
+	requires graphql.kickstart.execution;
+
+	exports graphql.kickstart.servlet;
+	exports graphql.kickstart.servlet.apollo;
+	exports graphql.kickstart.servlet.config;
+	exports graphql.kickstart.servlet.context;
+	exports graphql.kickstart.servlet.core;
+	exports graphql.kickstart.servlet.input;
+	exports graphql.kickstart.servlet.osgi;
+	exports graphql.kickstart.servlet.subscriptions;
+
+	opens graphql.kickstart.servlet;
+	opens graphql.kickstart.servlet.apollo;
+	opens graphql.kickstart.servlet.config;
+	opens graphql.kickstart.servlet.context;
+	opens graphql.kickstart.servlet.core;
+	opens graphql.kickstart.servlet.input;
+	opens graphql.kickstart.servlet.osgi;
+	opens graphql.kickstart.servlet.subscriptions;
+}