diff --git a/api/build.gradle b/api/build.gradle
index 6529a2bf..f8fd005f 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -1,4 +1,22 @@
 description = "reactive-streams"
+def jdkFlow = false
+try {
+    Class.forName("java.util.concurrent.Flow")
+    jdkFlow = true
+} catch (ClassNotFoundException cnfe) {
+
+}
+
+sourceSets {
+    main {
+        java {
+            if (jdkFlow)
+              srcDirs = ['src/main/java', 'src/main/java9']
+            else
+              srcDirs = ['src/main/java']
+        }
+    }
+}
 
 jar {
     manifest {
diff --git a/flow-adapters/src/main/java/org/reactivestreams/FlowAdapters.java b/api/src/main/java9/org/reactivestreams/FlowAdapters.java
similarity index 100%
rename from flow-adapters/src/main/java/org/reactivestreams/FlowAdapters.java
rename to api/src/main/java9/org/reactivestreams/FlowAdapters.java
diff --git a/build.gradle b/build.gradle
index 9677b7ec..877906aa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -49,8 +49,7 @@ subprojects {
     if (name in ["reactive-streams",
                  "reactive-streams-tck",
                  "reactive-streams-tck-flow",
-                 "reactive-streams-examples",
-                 "reactive-streams-flow-adapters"]) {
+                 "reactive-streams-examples"]) {
         apply plugin: "maven"
         apply plugin: "signing"
 
diff --git a/flow-adapters/.gitignore b/flow-adapters/.gitignore
deleted file mode 100644
index 7447f89a..00000000
--- a/flow-adapters/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin
\ No newline at end of file
diff --git a/flow-adapters/build.gradle b/flow-adapters/build.gradle
deleted file mode 100644
index 8a7f1a96..00000000
--- a/flow-adapters/build.gradle
+++ /dev/null
@@ -1,20 +0,0 @@
-description = 'reactive-streams-flow-adapters'
-
-dependencies {
-    compile project(':reactive-streams')
-
-    testCompile project(':reactive-streams-tck')
-    testCompile group: 'org.testng', name: 'testng', version: '5.14.10'
-}
-
-jar {
-    manifest {
-        attributes('Automatic-Module-Name': 'org.reactivestreams.flowadapters')
-    }
-}
-
-test.useTestNG()
-
-javadoc {
-    options.links("https://docs.oracle.com/javase/9/docs/api")
-}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index a1cbab78..866ecf93 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -11,12 +11,12 @@ try {
     Class.forName("java.util.concurrent.Flow")
     jdkFlow = true
     println(ANSI_GREEN + "   INFO: ------------------ JDK9 classes detected ---------------------------------" + ANSI_RESET)
-    println(ANSI_GREEN + "   INFO: Java 9 Flow API found; Including [flow-adapters, tck-flow] in build.      " + ANSI_RESET)
+    println(ANSI_GREEN + "   INFO: Java 9 Flow API found; Including [tck-flow] & FlowAdapters in build.      " + ANSI_RESET)
     println(ANSI_GREEN + "   INFO: --------------------------------------------------------------------------" + ANSI_RESET)
 } catch (Throwable ex) {
     // Flow API not available
     println(ANSI_RED + "WARNING: -------------------- JDK9 classes NOT detected -----------------------------" + ANSI_RESET)
-    println(ANSI_RED + "WARNING: Java 9 Flow API not found; Not including [flow-adapters, tck-flow] in build." + ANSI_RESET)
+    println(ANSI_RED + "WARNING: Java 9 Flow API not found; Not including [tck-flow] & FlowAdapters in build." + ANSI_RESET)
     println(ANSI_RED + "WARNING: In order to execute the complete test-suite run the build using JDK9+.      " + ANSI_RESET)
     println(ANSI_RED + "WARNING: ----------------------------------------------------------------------------" + ANSI_RESET)
 }
@@ -26,7 +26,6 @@ include ':reactive-streams-tck'
 include ':reactive-streams-examples'
 
 if (jdkFlow) {
-    include ':reactive-streams-flow-adapters'
     include ':reactive-streams-tck-flow'
 }
 
@@ -34,6 +33,5 @@ project(':reactive-streams').projectDir = "$rootDir/api" as File
 project(':reactive-streams-tck').projectDir = "$rootDir/tck" as File
 project(':reactive-streams-examples').projectDir = "$rootDir/examples" as File
 if (jdkFlow) {
-    project(':reactive-streams-flow-adapters').projectDir = "$rootDir/flow-adapters" as File
     project(':reactive-streams-tck-flow').projectDir = "$rootDir/tck-flow" as File
 }
diff --git a/tck-flow/build.gradle b/tck-flow/build.gradle
index 2ad8aa94..bf661453 100644
--- a/tck-flow/build.gradle
+++ b/tck-flow/build.gradle
@@ -2,7 +2,6 @@ description = 'reactive-streams-tck-flow'
 dependencies {
     compile group: 'org.testng', name: 'testng', version:'5.14.10'
     compile project(':reactive-streams-tck')
-    compile project(':reactive-streams-flow-adapters')
 }
 
 jar {
diff --git a/flow-adapters/src/test/java/org/reactivestreams/FlowAdaptersTest.java b/tck-flow/src/test/java/org/reactivestreams/FlowAdaptersTest.java
similarity index 100%
rename from flow-adapters/src/test/java/org/reactivestreams/FlowAdaptersTest.java
rename to tck-flow/src/test/java/org/reactivestreams/FlowAdaptersTest.java
diff --git a/flow-adapters/src/test/java/org/reactivestreams/MulticastPublisher.java b/tck-flow/src/test/java/org/reactivestreams/MulticastPublisher.java
similarity index 100%
rename from flow-adapters/src/test/java/org/reactivestreams/MulticastPublisher.java
rename to tck-flow/src/test/java/org/reactivestreams/MulticastPublisher.java
diff --git a/flow-adapters/src/test/java/org/reactivestreams/SubmissionPublisherTckTest.java b/tck-flow/src/test/java/org/reactivestreams/SubmissionPublisherTckTest.java
similarity index 100%
rename from flow-adapters/src/test/java/org/reactivestreams/SubmissionPublisherTckTest.java
rename to tck-flow/src/test/java/org/reactivestreams/SubmissionPublisherTckTest.java
diff --git a/flow-adapters/src/test/java/org/reactivestreams/TestEitherConsumer.java b/tck-flow/src/test/java/org/reactivestreams/TestEitherConsumer.java
similarity index 100%
rename from flow-adapters/src/test/java/org/reactivestreams/TestEitherConsumer.java
rename to tck-flow/src/test/java/org/reactivestreams/TestEitherConsumer.java