diff --git a/examples/README.md b/examples/java/README.md
similarity index 100%
rename from examples/README.md
rename to examples/java/README.md
diff --git a/examples/pom.xml b/examples/java/pom.xml
similarity index 82%
rename from examples/pom.xml
rename to examples/java/pom.xml
index ea44b01fe3a2..b762c844f8f9 100644
--- a/examples/pom.xml
+++ b/examples/java/pom.xml
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright (C) 2015 Google Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  ~ use this file except in compliance with the License. You may obtain a copy of
-  ~ the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  ~ License for the specific language governing permissions and limitations under
-  ~ the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.google.cloud.dataflow</groupId>
-    <artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <groupId>org.apache.beam</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.1.0-incubating-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
-  <groupId>com.google.cloud.dataflow</groupId>
-  <artifactId>google-cloud-dataflow-java-examples-all</artifactId>
-  <name>Google Cloud Dataflow Java Examples - All</name>
-  <description>Google Cloud Dataflow Java SDK provides a simple, Java-based
-    interface for processing virtually any size data using Google cloud
-    resources. This artifact includes all Dataflow Java SDK
-    examples.</description>
-  <url>http://cloud.google.com/dataflow</url>
+  <artifactId>java-examples-all</artifactId>
+  <name>Apache Beam :: Examples :: Java All</name>
+  <description>Apache Beam SDK provides a simple, Java-based
+  interface for processing virtually any size data. This
+  artifact includes all Apache Beam Java SDK examples.</description>
 
   <packaging>jar</packaging>
 
@@ -70,7 +70,7 @@
           </dependency>
         </dependencies>
         <configuration>
-          <configLocation>../checkstyle.xml</configLocation>
+          <configLocation>../../checkstyle.xml</configLocation>
           <consoleOutput>true</consoleOutput>
           <failOnViolation>true</failOnViolation>
           <includeTestSourceDirectory>true</includeTestSourceDirectory>
@@ -112,8 +112,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
-          <windowtitle>Google Cloud Dataflow Examples</windowtitle>
-          <doctitle>Google Cloud Dataflow Examples</doctitle>
+          <windowtitle>Apache Beam Examples</windowtitle>
+          <doctitle>Apache Beam Examples</doctitle>
 
           <subpackages>com.google.cloud.dataflow.examples</subpackages>
           <additionalparam>-exclude com.google.cloud.dataflow.sdk.runners.worker:com.google.cloud.dataflow.sdk.runners.dataflow:com.google.cloud.dataflow.sdk.util ${dataflow.javadoc_opts}</additionalparam>
@@ -125,44 +125,44 @@
             <!-- The Dataflow SDK docs -->
             <offlineLink>
               <url>https://cloud.google.com/dataflow/java-sdk/JavaDoc/</url>
-              <location>${basedir}/../javadoc/dataflow-sdk-docs</location>
+              <location>${basedir}/../../sdks/java/javadoc/dataflow-sdk-docs</location>
             </offlineLink>
             <!-- Other dependencies -->
             <offlineLink>
               <url>https://developers.google.com/api-client-library/java/google-api-java-client/reference/1.20.0/</url>
-              <location>${basedir}/../javadoc/apiclient-docs</location>
+              <location>${basedir}/../../sdks/java/javadoc/apiclient-docs</location>
             </offlineLink>
             <offlineLink>
               <url>http://avro.apache.org/docs/1.7.7/api/java/</url>
-              <location>${basedir}/../javadoc/avro-docs</location>
+              <location>${basedir}/../../sdks/java/javadoc/avro-docs</location>
             </offlineLink>
             <offlineLink>
               <url>https://developers.google.com/resources/api-libraries/documentation/bigquery/v2/java/latest/</url>
-              <location>${basedir}/../javadoc/bq-docs</location>
+              <location>${basedir}/../../sdks/java/javadoc/bq-docs</location>
             </offlineLink>
             <offlineLink>
               <url>https://cloud.google.com/datastore/docs/apis/javadoc/</url>
-              <location>${basedir}/../javadoc/datastore-docs</location>
+              <location>${basedir}/../../sdks/java/javadoc/datastore-docs</location>
             </offlineLink>
             <offlineLink>
               <url>http://docs.guava-libraries.googlecode.com/git-history/release18/javadoc/</url>
-              <location>${basedir}/../javadoc/guava-docs</location>
+              <location>${basedir}/../../sdks/java/javadoc/guava-docs</location>
             </offlineLink>
             <offlineLink>
               <url>http://fasterxml.github.io/jackson-annotations/javadoc/2.7/</url>
-              <location>${basedir}/../javadoc/jackson-annotations-docs</location>
+              <location>${basedir}/../../sdks/java/javadoc/jackson-annotations-docs</location>
             </offlineLink>
             <offlineLink>
               <url>http://fasterxml.github.io/jackson-databind/javadoc/2.7/</url>
-              <location>${basedir}/../javadoc/jackson-databind-docs</location>
+              <location>${basedir}/../../sdks/java/javadoc/jackson-databind-docs</location>
             </offlineLink>
             <offlineLink>
               <url>http://www.joda.org/joda-time/apidocs</url>
-              <location>${basedir}/../javadoc/joda-docs</location>
+              <location>${basedir}/../../sdks/java/javadoc/joda-docs</location>
             </offlineLink>
             <offlineLink>
               <url>https://developers.google.com/api-client-library/java/google-oauth-java-client/reference/1.20.0/</url>
-              <location>${basedir}/../javadoc/oauth-docs</location>
+              <location>${basedir}/../../sdks/java/javadoc/oauth-docs</location>
             </offlineLink>
           </offlineLinks>
         </configuration>
@@ -237,8 +237,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.google.cloud.dataflow</groupId>
-      <artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
+      <groupId>org.apache.beam</groupId>
+      <artifactId>java-sdk-all</artifactId>
       <version>${project.version}</version>
     </dependency>
 
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/DebuggingWordCount.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/DebuggingWordCount.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/DebuggingWordCount.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/DebuggingWordCount.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/MinimalWordCount.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/MinimalWordCount.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/MinimalWordCount.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/MinimalWordCount.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/WindowedWordCount.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/WindowedWordCount.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/WindowedWordCount.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/WindowedWordCount.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/WordCount.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/WordCount.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/WordCount.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/WordCount.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/common/DataflowExampleOptions.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/common/DataflowExampleOptions.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/common/DataflowExampleOptions.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/common/DataflowExampleOptions.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/common/DataflowExampleUtils.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/common/DataflowExampleUtils.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/common/DataflowExampleUtils.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/common/DataflowExampleUtils.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/common/ExampleBigQueryTableOptions.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/common/ExampleBigQueryTableOptions.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/common/ExampleBigQueryTableOptions.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/common/ExampleBigQueryTableOptions.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/common/ExamplePubsubTopicAndSubscriptionOptions.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/common/ExamplePubsubTopicAndSubscriptionOptions.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/common/ExamplePubsubTopicAndSubscriptionOptions.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/common/ExamplePubsubTopicAndSubscriptionOptions.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/common/ExamplePubsubTopicOptions.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/common/ExamplePubsubTopicOptions.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/common/ExamplePubsubTopicOptions.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/common/ExamplePubsubTopicOptions.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/common/PubsubFileInjector.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/common/PubsubFileInjector.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/common/PubsubFileInjector.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/common/PubsubFileInjector.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/complete/AutoComplete.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/complete/AutoComplete.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/complete/AutoComplete.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/complete/AutoComplete.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/complete/README.md b/examples/java/src/main/java/com/google/cloud/dataflow/examples/complete/README.md
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/complete/README.md
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/complete/README.md
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/complete/StreamingWordExtract.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/complete/StreamingWordExtract.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/complete/StreamingWordExtract.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/complete/StreamingWordExtract.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/complete/TfIdf.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/complete/TfIdf.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/complete/TfIdf.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/complete/TfIdf.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/complete/TopWikipediaSessions.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/complete/TopWikipediaSessions.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/complete/TopWikipediaSessions.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/complete/TopWikipediaSessions.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/complete/TrafficMaxLaneFlow.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/complete/TrafficMaxLaneFlow.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/complete/TrafficMaxLaneFlow.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/complete/TrafficMaxLaneFlow.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/complete/TrafficRoutes.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/complete/TrafficRoutes.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/complete/TrafficRoutes.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/complete/TrafficRoutes.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/cookbook/BigQueryTornadoes.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/cookbook/BigQueryTornadoes.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/cookbook/BigQueryTornadoes.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/cookbook/BigQueryTornadoes.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/cookbook/CombinePerKeyExamples.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/cookbook/CombinePerKeyExamples.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/cookbook/CombinePerKeyExamples.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/cookbook/CombinePerKeyExamples.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/cookbook/DatastoreWordCount.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/cookbook/DatastoreWordCount.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/cookbook/DatastoreWordCount.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/cookbook/DatastoreWordCount.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/cookbook/DeDupExample.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/cookbook/DeDupExample.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/cookbook/DeDupExample.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/cookbook/DeDupExample.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/cookbook/FilterExamples.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/cookbook/FilterExamples.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/cookbook/FilterExamples.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/cookbook/FilterExamples.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/cookbook/JoinExamples.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/cookbook/JoinExamples.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/cookbook/JoinExamples.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/cookbook/JoinExamples.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/cookbook/MaxPerKeyExamples.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/cookbook/MaxPerKeyExamples.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/cookbook/MaxPerKeyExamples.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/cookbook/MaxPerKeyExamples.java
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/cookbook/README.md b/examples/java/src/main/java/com/google/cloud/dataflow/examples/cookbook/README.md
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/cookbook/README.md
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/cookbook/README.md
diff --git a/examples/src/main/java/com/google/cloud/dataflow/examples/cookbook/TriggerExample.java b/examples/java/src/main/java/com/google/cloud/dataflow/examples/cookbook/TriggerExample.java
similarity index 100%
rename from examples/src/main/java/com/google/cloud/dataflow/examples/cookbook/TriggerExample.java
rename to examples/java/src/main/java/com/google/cloud/dataflow/examples/cookbook/TriggerExample.java
diff --git a/examples/src/test/java/com/google/cloud/dataflow/examples/DebuggingWordCountTest.java b/examples/java/src/test/java/com/google/cloud/dataflow/examples/DebuggingWordCountTest.java
similarity index 100%
rename from examples/src/test/java/com/google/cloud/dataflow/examples/DebuggingWordCountTest.java
rename to examples/java/src/test/java/com/google/cloud/dataflow/examples/DebuggingWordCountTest.java
diff --git a/examples/src/test/java/com/google/cloud/dataflow/examples/WordCountTest.java b/examples/java/src/test/java/com/google/cloud/dataflow/examples/WordCountTest.java
similarity index 100%
rename from examples/src/test/java/com/google/cloud/dataflow/examples/WordCountTest.java
rename to examples/java/src/test/java/com/google/cloud/dataflow/examples/WordCountTest.java
diff --git a/examples/src/test/java/com/google/cloud/dataflow/examples/complete/AutoCompleteTest.java b/examples/java/src/test/java/com/google/cloud/dataflow/examples/complete/AutoCompleteTest.java
similarity index 100%
rename from examples/src/test/java/com/google/cloud/dataflow/examples/complete/AutoCompleteTest.java
rename to examples/java/src/test/java/com/google/cloud/dataflow/examples/complete/AutoCompleteTest.java
diff --git a/examples/src/test/java/com/google/cloud/dataflow/examples/complete/TfIdfTest.java b/examples/java/src/test/java/com/google/cloud/dataflow/examples/complete/TfIdfTest.java
similarity index 100%
rename from examples/src/test/java/com/google/cloud/dataflow/examples/complete/TfIdfTest.java
rename to examples/java/src/test/java/com/google/cloud/dataflow/examples/complete/TfIdfTest.java
diff --git a/examples/src/test/java/com/google/cloud/dataflow/examples/complete/TopWikipediaSessionsTest.java b/examples/java/src/test/java/com/google/cloud/dataflow/examples/complete/TopWikipediaSessionsTest.java
similarity index 100%
rename from examples/src/test/java/com/google/cloud/dataflow/examples/complete/TopWikipediaSessionsTest.java
rename to examples/java/src/test/java/com/google/cloud/dataflow/examples/complete/TopWikipediaSessionsTest.java
diff --git a/examples/src/test/java/com/google/cloud/dataflow/examples/cookbook/BigQueryTornadoesTest.java b/examples/java/src/test/java/com/google/cloud/dataflow/examples/cookbook/BigQueryTornadoesTest.java
similarity index 100%
rename from examples/src/test/java/com/google/cloud/dataflow/examples/cookbook/BigQueryTornadoesTest.java
rename to examples/java/src/test/java/com/google/cloud/dataflow/examples/cookbook/BigQueryTornadoesTest.java
diff --git a/examples/src/test/java/com/google/cloud/dataflow/examples/cookbook/CombinePerKeyExamplesTest.java b/examples/java/src/test/java/com/google/cloud/dataflow/examples/cookbook/CombinePerKeyExamplesTest.java
similarity index 100%
rename from examples/src/test/java/com/google/cloud/dataflow/examples/cookbook/CombinePerKeyExamplesTest.java
rename to examples/java/src/test/java/com/google/cloud/dataflow/examples/cookbook/CombinePerKeyExamplesTest.java
diff --git a/examples/src/test/java/com/google/cloud/dataflow/examples/cookbook/DeDupExampleTest.java b/examples/java/src/test/java/com/google/cloud/dataflow/examples/cookbook/DeDupExampleTest.java
similarity index 100%
rename from examples/src/test/java/com/google/cloud/dataflow/examples/cookbook/DeDupExampleTest.java
rename to examples/java/src/test/java/com/google/cloud/dataflow/examples/cookbook/DeDupExampleTest.java
diff --git a/examples/src/test/java/com/google/cloud/dataflow/examples/cookbook/FilterExamplesTest.java b/examples/java/src/test/java/com/google/cloud/dataflow/examples/cookbook/FilterExamplesTest.java
similarity index 100%
rename from examples/src/test/java/com/google/cloud/dataflow/examples/cookbook/FilterExamplesTest.java
rename to examples/java/src/test/java/com/google/cloud/dataflow/examples/cookbook/FilterExamplesTest.java
diff --git a/examples/src/test/java/com/google/cloud/dataflow/examples/cookbook/JoinExamplesTest.java b/examples/java/src/test/java/com/google/cloud/dataflow/examples/cookbook/JoinExamplesTest.java
similarity index 100%
rename from examples/src/test/java/com/google/cloud/dataflow/examples/cookbook/JoinExamplesTest.java
rename to examples/java/src/test/java/com/google/cloud/dataflow/examples/cookbook/JoinExamplesTest.java
diff --git a/examples/src/test/java/com/google/cloud/dataflow/examples/cookbook/MaxPerKeyExamplesTest.java b/examples/java/src/test/java/com/google/cloud/dataflow/examples/cookbook/MaxPerKeyExamplesTest.java
similarity index 100%
rename from examples/src/test/java/com/google/cloud/dataflow/examples/cookbook/MaxPerKeyExamplesTest.java
rename to examples/java/src/test/java/com/google/cloud/dataflow/examples/cookbook/MaxPerKeyExamplesTest.java
diff --git a/examples/src/test/java/com/google/cloud/dataflow/examples/cookbook/TriggerExampleTest.java b/examples/java/src/test/java/com/google/cloud/dataflow/examples/cookbook/TriggerExampleTest.java
similarity index 100%
rename from examples/src/test/java/com/google/cloud/dataflow/examples/cookbook/TriggerExampleTest.java
rename to examples/java/src/test/java/com/google/cloud/dataflow/examples/cookbook/TriggerExampleTest.java
diff --git a/java8examples/pom.xml b/examples/java8/pom.xml
similarity index 81%
rename from java8examples/pom.xml
rename to examples/java8/pom.xml
index 60d7e0f0125f..7d55c317d277 100644
--- a/java8examples/pom.xml
+++ b/examples/java8/pom.xml
@@ -1,38 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright (C) 2015 Google Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  ~ use this file except in compliance with the License. You may obtain a copy of
-  ~ the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  ~ License for the specific language governing permissions and limitations under
-  ~ the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.google.cloud.dataflow</groupId>
-    <artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <groupId>org.apache.beam</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.1.0-incubating-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
-  <groupId>com.google.cloud.dataflow</groupId>
-  <artifactId>google-cloud-dataflow-java-java8examples-all</artifactId>
-  <name>Google Cloud Dataflow Java 8 Examples - All</name>
-  <description>Google Cloud Dataflow Java SDK provides a simple, Java-based
-    interface for processing virtually any size data using Google cloud
-    resources. This artifact includes examples of the SDK from a Java 8
+  <artifactId>java8examples-all</artifactId>
+  <name>Apache Beam :: Examples :: Java 8 All</name>
+  <description>Apache Beam Java SDK provides a simple, Java-based
+    interface for processing virtually any size data.
+    This artifact includes examples of the SDK from a Java 8
     user.</description>
-  <url>http://cloud.google.com/dataflow</url>
 
   <packaging>jar</packaging>
 
@@ -84,7 +85,7 @@
           </dependency>
         </dependencies>
         <configuration>
-          <configLocation>../checkstyle.xml</configLocation>
+          <configLocation>../../checkstyle.xml</configLocation>
           <consoleOutput>true</consoleOutput>
           <failOnViolation>true</failOnViolation>
           <includeTestSourceDirectory>true</includeTestSourceDirectory>
@@ -151,14 +152,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.google.cloud.dataflow</groupId>
-      <artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
+      <groupId>org.apache.beam</groupId>
+      <artifactId>java-sdk-all</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>com.google.cloud.dataflow</groupId>
-      <artifactId>google-cloud-dataflow-java-examples-all</artifactId>
+      <groupId>org.apache.beam</groupId>
+      <artifactId>java-examples-all</artifactId>
       <version>${project.version}</version>
     </dependency>
 
diff --git a/java8examples/src/main/java/com/google/cloud/dataflow/examples/MinimalWordCountJava8.java b/examples/java8/src/main/java/com/google/cloud/dataflow/examples/MinimalWordCountJava8.java
similarity index 100%
rename from java8examples/src/main/java/com/google/cloud/dataflow/examples/MinimalWordCountJava8.java
rename to examples/java8/src/main/java/com/google/cloud/dataflow/examples/MinimalWordCountJava8.java
diff --git a/java8examples/src/main/java/com/google/cloud/dataflow/examples/complete/game/GameStats.java b/examples/java8/src/main/java/com/google/cloud/dataflow/examples/complete/game/GameStats.java
similarity index 100%
rename from java8examples/src/main/java/com/google/cloud/dataflow/examples/complete/game/GameStats.java
rename to examples/java8/src/main/java/com/google/cloud/dataflow/examples/complete/game/GameStats.java
diff --git a/java8examples/src/main/java/com/google/cloud/dataflow/examples/complete/game/HourlyTeamScore.java b/examples/java8/src/main/java/com/google/cloud/dataflow/examples/complete/game/HourlyTeamScore.java
similarity index 100%
rename from java8examples/src/main/java/com/google/cloud/dataflow/examples/complete/game/HourlyTeamScore.java
rename to examples/java8/src/main/java/com/google/cloud/dataflow/examples/complete/game/HourlyTeamScore.java
diff --git a/java8examples/src/main/java/com/google/cloud/dataflow/examples/complete/game/LeaderBoard.java b/examples/java8/src/main/java/com/google/cloud/dataflow/examples/complete/game/LeaderBoard.java
similarity index 100%
rename from java8examples/src/main/java/com/google/cloud/dataflow/examples/complete/game/LeaderBoard.java
rename to examples/java8/src/main/java/com/google/cloud/dataflow/examples/complete/game/LeaderBoard.java
diff --git a/java8examples/src/main/java/com/google/cloud/dataflow/examples/complete/game/README.md b/examples/java8/src/main/java/com/google/cloud/dataflow/examples/complete/game/README.md
similarity index 100%
rename from java8examples/src/main/java/com/google/cloud/dataflow/examples/complete/game/README.md
rename to examples/java8/src/main/java/com/google/cloud/dataflow/examples/complete/game/README.md
diff --git a/java8examples/src/main/java/com/google/cloud/dataflow/examples/complete/game/UserScore.java b/examples/java8/src/main/java/com/google/cloud/dataflow/examples/complete/game/UserScore.java
similarity index 100%
rename from java8examples/src/main/java/com/google/cloud/dataflow/examples/complete/game/UserScore.java
rename to examples/java8/src/main/java/com/google/cloud/dataflow/examples/complete/game/UserScore.java
diff --git a/java8examples/src/main/java/com/google/cloud/dataflow/examples/complete/game/injector/Injector.java b/examples/java8/src/main/java/com/google/cloud/dataflow/examples/complete/game/injector/Injector.java
similarity index 100%
rename from java8examples/src/main/java/com/google/cloud/dataflow/examples/complete/game/injector/Injector.java
rename to examples/java8/src/main/java/com/google/cloud/dataflow/examples/complete/game/injector/Injector.java
diff --git a/java8examples/src/main/java/com/google/cloud/dataflow/examples/complete/game/injector/InjectorUtils.java b/examples/java8/src/main/java/com/google/cloud/dataflow/examples/complete/game/injector/InjectorUtils.java
similarity index 100%
rename from java8examples/src/main/java/com/google/cloud/dataflow/examples/complete/game/injector/InjectorUtils.java
rename to examples/java8/src/main/java/com/google/cloud/dataflow/examples/complete/game/injector/InjectorUtils.java
diff --git a/java8examples/src/main/java/com/google/cloud/dataflow/examples/complete/game/injector/RetryHttpInitializerWrapper.java b/examples/java8/src/main/java/com/google/cloud/dataflow/examples/complete/game/injector/RetryHttpInitializerWrapper.java
similarity index 100%
rename from java8examples/src/main/java/com/google/cloud/dataflow/examples/complete/game/injector/RetryHttpInitializerWrapper.java
rename to examples/java8/src/main/java/com/google/cloud/dataflow/examples/complete/game/injector/RetryHttpInitializerWrapper.java
diff --git a/java8examples/src/main/java/com/google/cloud/dataflow/examples/complete/game/utils/WriteToBigQuery.java b/examples/java8/src/main/java/com/google/cloud/dataflow/examples/complete/game/utils/WriteToBigQuery.java
similarity index 100%
rename from java8examples/src/main/java/com/google/cloud/dataflow/examples/complete/game/utils/WriteToBigQuery.java
rename to examples/java8/src/main/java/com/google/cloud/dataflow/examples/complete/game/utils/WriteToBigQuery.java
diff --git a/java8examples/src/main/java/com/google/cloud/dataflow/examples/complete/game/utils/WriteWindowedToBigQuery.java b/examples/java8/src/main/java/com/google/cloud/dataflow/examples/complete/game/utils/WriteWindowedToBigQuery.java
similarity index 100%
rename from java8examples/src/main/java/com/google/cloud/dataflow/examples/complete/game/utils/WriteWindowedToBigQuery.java
rename to examples/java8/src/main/java/com/google/cloud/dataflow/examples/complete/game/utils/WriteWindowedToBigQuery.java
diff --git a/java8examples/src/test/java/com/google/cloud/dataflow/examples/MinimalWordCountJava8Test.java b/examples/java8/src/test/java/com/google/cloud/dataflow/examples/MinimalWordCountJava8Test.java
similarity index 100%
rename from java8examples/src/test/java/com/google/cloud/dataflow/examples/MinimalWordCountJava8Test.java
rename to examples/java8/src/test/java/com/google/cloud/dataflow/examples/MinimalWordCountJava8Test.java
diff --git a/java8examples/src/test/java/com/google/cloud/dataflow/examples/complete/game/GameStatsTest.java b/examples/java8/src/test/java/com/google/cloud/dataflow/examples/complete/game/GameStatsTest.java
similarity index 100%
rename from java8examples/src/test/java/com/google/cloud/dataflow/examples/complete/game/GameStatsTest.java
rename to examples/java8/src/test/java/com/google/cloud/dataflow/examples/complete/game/GameStatsTest.java
diff --git a/java8examples/src/test/java/com/google/cloud/dataflow/examples/complete/game/HourlyTeamScoreTest.java b/examples/java8/src/test/java/com/google/cloud/dataflow/examples/complete/game/HourlyTeamScoreTest.java
similarity index 100%
rename from java8examples/src/test/java/com/google/cloud/dataflow/examples/complete/game/HourlyTeamScoreTest.java
rename to examples/java8/src/test/java/com/google/cloud/dataflow/examples/complete/game/HourlyTeamScoreTest.java
diff --git a/java8examples/src/test/java/com/google/cloud/dataflow/examples/complete/game/UserScoreTest.java b/examples/java8/src/test/java/com/google/cloud/dataflow/examples/complete/game/UserScoreTest.java
similarity index 100%
rename from java8examples/src/test/java/com/google/cloud/dataflow/examples/complete/game/UserScoreTest.java
rename to examples/java8/src/test/java/com/google/cloud/dataflow/examples/complete/game/UserScoreTest.java
diff --git a/maven-archetypes/examples/pom.xml b/maven-archetypes/examples/pom.xml
deleted file mode 100644
index 4e999083b0b9..000000000000
--- a/maven-archetypes/examples/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright (C) 2015 Google Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  ~ use this file except in compliance with the License. You may obtain a copy of
-  ~ the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  ~ License for the specific language governing permissions and limitations under
-  ~ the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.google.cloud.dataflow</groupId>
-    <artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-
-  <groupId>com.google.cloud.dataflow</groupId>
-  <artifactId>google-cloud-dataflow-java-archetypes-examples</artifactId>
-  <name>Google Cloud Dataflow Java SDK - Examples Archetype</name>
-  <description>A Maven Archetype to create a project containing all the
-    example pipelines from the Google Cloud Dataflow Java SDK.</description>
-  <url>http://cloud.google.com/dataflow</url>
-
-  <packaging>maven-archetype</packaging>
-
-  <build>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.archetype</groupId>
-        <artifactId>archetype-packaging</artifactId>
-        <version>2.4</version>
-      </extension>
-    </extensions>
-
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-archetype-plugin</artifactId>
-          <version>2.4</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>
diff --git a/maven-archetypes/starter/pom.xml b/maven-archetypes/starter/pom.xml
deleted file mode 100644
index 0aa71c49f928..000000000000
--- a/maven-archetypes/starter/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright (C) 2015 Google Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  ~ use this file except in compliance with the License. You may obtain a copy of
-  ~ the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  ~ License for the specific language governing permissions and limitations under
-  ~ the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.google.cloud.dataflow</groupId>
-    <artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-
-  <groupId>com.google.cloud.dataflow</groupId>
-  <artifactId>google-cloud-dataflow-java-archetypes-starter</artifactId>
-  <name>Google Cloud Dataflow Java SDK - Starter Archetype</name>
-  <description>A Maven archetype to create a simple starter pipeline to
-    get started using the Google Cloud Dataflow Java SDK. </description>
-  <url>http://cloud.google.com/dataflow</url>
-
-  <packaging>maven-archetype</packaging>
-
-  <build>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.archetype</groupId>
-        <artifactId>archetype-packaging</artifactId>
-        <version>2.4</version>
-      </extension>
-    </extensions>
-
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-archetype-plugin</artifactId>
-          <version>2.4</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>
diff --git a/pom.xml b/pom.xml
index da4c24fd437f..b79ddf65e1fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,41 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright (C) 2015 Google Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  ~ use this file except in compliance with the License. You may obtain a copy of
-  ~ the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  ~ License for the specific language governing permissions and limitations under
-  ~ the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.google</groupId>
-    <artifactId>google</artifactId>
-    <version>5</version>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>17</version>
   </parent>
 
-  <groupId>com.google.cloud.dataflow</groupId>
-  <artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
-  <name>Google Cloud Dataflow Java SDK - Parent</name>
-  <description>Google Cloud Dataflow Java SDK provides a simple, Java-based
-    interface for processing virtually any size data using Google cloud
-    resources. This artifact includes the parent POM for other Dataflow
-    artifacts.</description>
-  <url>http://cloud.google.com/dataflow</url>
-  <inceptionYear>2013</inceptionYear>
+  <groupId>org.apache.beam</groupId>
+  <artifactId>parent</artifactId>
+  <name>Apache Beam :: Parent</name>
+  <description>Apache Beam provides a simple, Java-based interface
+  for processing virtually any size data. This artifact includes the parent POM
+  for other Beam artifacts.</description>
+  <url>http://beam.incubator.apache.org</url>
+  <inceptionYear>2016</inceptionYear>
 
-  <version>1.6.0-SNAPSHOT</version>
+  <version>0.1.0-incubating-SNAPSHOT</version>
 
   <licenses>
     <license>
@@ -45,19 +46,51 @@
     </license>
   </licenses>
 
+  <scm>
+    <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-beam.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-beam.git</developerConnection>
+    <url>https://git-wip-us.apache.org/repos/asf?p=incubator-beam.git;a=summary</url>
+  </scm>
+
+  <issueManagement>
+    <system>jira</system>
+    <url>https://issues.apache.org/jira/browse/BEAM</url>
+  </issueManagement>
+
+  <mailingLists>
+    <mailingList>
+      <name>Beam Dev</name>
+      <subscribe>dev-subscribe@beam.incubator.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@beam.incubator.apache.org</unsubscribe>
+      <post>dev@beam.incubator.apache.org</post>
+      <archive>http://www.mail-archive.com/dev%beam.incubator.apache.org</archive>
+    </mailingList>
+    <mailingList>
+      <name>Beam User</name>
+      <subscribe>user-subscribe@beam.incubator.apache.org</subscribe>
+      <unsubscribe>user-unsubscribe@beam.incubator.apache.org</unsubscribe>
+      <post>user@beam.incubator.apache.org</post>
+      <archive>http://www.mail-archive.com/user%beam.incubator.apache.org</archive>
+    </mailingList>
+    <mailingList>
+      <name>Beam Commits</name>
+      <subscribe>commits-subscribe@beam.incubator.apache.org</subscribe>
+      <unsubscribe>commits-unsubscribe@beam.incubator.apache.org</unsubscribe>
+      <post>commits@beam.incubator.apache.org</post>
+      <archive>http://www.mail-archive.com/commits%beam.incubator.apache.org</archive>
+    </mailingList>
+  </mailingLists>
+
   <developers>
     <developer>
-      <organization>Google Inc.</organization>
-      <organizationUrl>http://www.google.com</organizationUrl>
+      <name>The Apache Beam Team</name>
+      <email>dev@beam.incubator.apache.org</email>
+      <url>http://beam.incubator.apache.org</url>
+      <organization>Apache Software Foundation</organization>
+      <organizationUrl>http://www.apache.org</organizationUrl>
     </developer>
   </developers>
 
-  <scm>
-    <connection>scm:git:git@github.com:GoogleCloudPlatform/DataflowJavaSDK.git</connection>
-    <developerConnection>scm:git:git@github.com:GoogleCloudPlatform/DataflowJavaSDK.git</developerConnection>
-    <url>git@github.com:GoogleCloudPlatform/DataflowJavaSDK.git</url>
-  </scm>
-
   <prerequisites>
     <maven>3.0.3</maven>
   </prerequisites>
@@ -90,12 +123,12 @@
   </properties>
 
   <packaging>pom</packaging>
+
   <modules>
-    <module>sdk</module>
+    <module>sdks/java/core</module>
     <module>runners</module>
-    <module>examples</module>
-    <module>maven-archetypes/starter</module>
-    <module>maven-archetypes/examples</module>
+    <module>examples/java</module>
+    <module>sdks/java/maven-archetypes</module>
   </modules>
 
   <profiles>
@@ -105,7 +138,7 @@
         <jdk>[1.8,)</jdk>
       </activation>
       <modules>
-        <module>java8tests</module>
+        <module>sdks/java/java8tests</module>
       </modules>
     </profile>
     <profile>
@@ -114,7 +147,7 @@
         <jdk>[1.8,)</jdk>
       </activation>
       <modules>
-        <module>java8examples</module>
+        <module>examples/java8</module>
       </modules>
     </profile>
     <profile>
diff --git a/runners/flink/examples/pom.xml b/runners/flink/examples/pom.xml
index 91cc1b7bbd97..1c0a4dd5aa7b 100644
--- a/runners/flink/examples/pom.xml
+++ b/runners/flink/examples/pom.xml
@@ -1,48 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.beam</groupId>
     <artifactId>flink-runner-parent</artifactId>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.1.0-incubating-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>flink-runner-examples_2.10</artifactId>
-  <version>0.4-SNAPSHOT</version>
 
-  <name>Flink Beam Runner Examples</name>
-  <packaging>jar</packaging>
-
-  <inceptionYear>2015</inceptionYear>
+  <name>Apache Beam :: Runners :: Flink :: Examples</name>
 
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
+  <packaging>jar</packaging>
 
   <properties>
     <!-- Default parameters for mvn exec:exec -->
diff --git a/runners/flink/pom.xml b/runners/flink/pom.xml
index 31713cd0d446..608dc7c0020a 100644
--- a/runners/flink/pom.xml
+++ b/runners/flink/pom.xml
@@ -1,59 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-     xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.beam</groupId>
     <artifactId>runners-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>0.1.0-incubating-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>flink-runner-parent</artifactId>
-  <version>0.4-SNAPSHOT</version>
+  <version>0.1.0-incubating-SNAPSHOT</version>
 
-  <name>Flink Beam Runner</name>
-  <packaging>pom</packaging>
+  <name>Apache Beam :: Runners :: Flink</name>
 
-  <inceptionYear>2015</inceptionYear>
+  <packaging>pom</packaging>
 
   <modules>
     <module>runner</module>
     <module>examples</module>
   </modules>
 
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <flink.version>1.0.0</flink.version>
-    <beam.version>1.6.0-SNAPSHOT</beam.version>
+    <beam.version>0.1.0-incubating-SNAPSHOT</beam.version>
   </properties>
 
   <repositories>
diff --git a/runners/flink/runner/pom.xml b/runners/flink/runner/pom.xml
index ff4b368ab206..109eb256d533 100644
--- a/runners/flink/runner/pom.xml
+++ b/runners/flink/runner/pom.xml
@@ -1,48 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+       http://www.apache.org/licenses/LICENSE-2.0
 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.beam</groupId>
     <artifactId>flink-runner-parent</artifactId>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.1.0-incubating-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>flink-runner_2.10</artifactId>
-  <version>0.4-SNAPSHOT</version>
 
-  <name>Flink Beam Runner Core</name>
-  <packaging>jar</packaging>
+  <name>Apache Beam :: Runners :: Flink :: Core</name>
 
-  <inceptionYear>2015</inceptionYear>
+  <packaging>jar</packaging>
 
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
 
   <dependencies>
     <!-- Flink dependencies -->
@@ -72,10 +63,10 @@
       <artifactId>flink-avro_2.10</artifactId>
       <version>${flink.version}</version>
     </dependency>
-    <!--- Dataflow -->
+    <!--- Beam -->
     <dependency>
-      <groupId>com.google.cloud.dataflow</groupId>
-      <artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
+      <groupId>org.apache.beam</groupId>
+      <artifactId>java-sdk-all</artifactId>
       <version>${beam.version}</version>
       <exclusions>
         <exclusion>
@@ -86,8 +77,8 @@
     </dependency>
     <!-- Test scoped -->
     <dependency>
-      <groupId>com.google.cloud.dataflow</groupId>
-      <artifactId>google-cloud-dataflow-java-examples-all</artifactId>
+      <groupId>org.apache.beam</groupId>
+      <artifactId>java-examples-all</artifactId>
       <version>${beam.version}</version>
       <exclusions>
         <exclusion>
diff --git a/runners/pom.xml b/runners/pom.xml
index b2e9eb1f6727..fc379ce0fe16 100644
--- a/runners/pom.xml
+++ b/runners/pom.xml
@@ -1,40 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.google.cloud.dataflow</groupId>
-    <artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <groupId>org.apache.beam</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.1.0-incubating-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.apache.beam</groupId>
   <artifactId>runners-parent</artifactId>
-  <version>1.6.0-SNAPSHOT</version>
 
   <packaging>pom</packaging>
 
-  <name>Beam Runners</name>
+  <name>Apache Beam :: Runners</name>
 
   <modules>
     <module>flink</module>
diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml
index 9d653a046468..05a601af1766 100644
--- a/runners/spark/pom.xml
+++ b/runners/spark/pom.xml
@@ -1,63 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (c) 2014, Cloudera, Inc. All Rights Reserved.
-Cloudera, Inc. licenses this file to you under the Apache License,
-Version 2.0 (the "License"). You may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-This software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for
-the specific language governing permissions and limitations under the
-License.
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.beam</groupId>
         <artifactId>runners-parent</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>0.1.0-incubating-SNAPSHOT</version>
     </parent>
 
     <artifactId>spark-runner</artifactId>
-    <version>0.4.3-SNAPSHOT</version>
 
-    <name>Spark Beam Runner</name>
+    <name>Apache Beam :: Runners :: Spark</name>
     <packaging>jar</packaging>
 
-    <inceptionYear>2014</inceptionYear>
-
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.7</java.version>
         <spark.version>1.5.2</spark.version>
-        <beam.version>1.6.0-SNAPSHOT</beam.version>
+        <beam.version>0.1.0-incubating-SNAPSHOT</beam.version>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>apache.snapshots</id>
-            <name>Apache Development Snapshot Repository</name>
-            <url>https://repository.apache.org/content/repositories/snapshots/</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.spark</groupId>
@@ -89,8 +71,8 @@ License.
             <version>${guava.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.google.cloud.dataflow</groupId>
-            <artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
+            <groupId>org.apache.beam</groupId>
+            <artifactId>java-sdk-all</artifactId>
             <version>${beam.version}</version>
             <exclusions>
                 <!-- Use Hadoop/Spark's backend logger -->
@@ -101,8 +83,8 @@ License.
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>com.google.cloud.dataflow</groupId>
-            <artifactId>google-cloud-dataflow-java-examples-all</artifactId>
+            <groupId>org.apache.beam</groupId>
+            <artifactId>java-examples-all</artifactId>
             <version>${beam.version}</version>
             <exclusions>
                 <!-- Use Hadoop/Spark's backend logger -->
@@ -411,42 +393,7 @@ License.
         </plugins>
     </reporting>
 
-
-    <developers>
-        <developer>
-            <name>Cloudera, Inc.</name>
-        </developer>
-    </developers>
-
-    <scm>
-        <connection>scm:git:https://github.com/cloudera/spark-dataflow.git</connection>
-        <developerConnection>scm:git:https://github.com/cloudera/spark-dataflow.git</developerConnection>
-        <url>scm:git:https://github.com/cloudera/spark-dataflow.git</url>
-        <tag>HEAD</tag>
-    </scm>
-
-    <prerequisites>
-        <maven>3.2.1</maven>
-    </prerequisites>
-
     <profiles>
-        <profile>
-            <id>release-sign-artifacts</id>
-            <activation>
-                <property>
-                    <name>performRelease</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>jacoco</id>
             <build>
diff --git a/sdk/pom.xml b/sdks/java/core/pom.xml
similarity index 94%
rename from sdk/pom.xml
rename to sdks/java/core/pom.xml
index 185abc2ae770..2b9e4a974feb 100644
--- a/sdk/pom.xml
+++ b/sdks/java/core/pom.xml
@@ -1,37 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright (C) 2015 Google Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  ~ use this file except in compliance with the License. You may obtain a copy of
-  ~ the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  ~ License for the specific language governing permissions and limitations under
-  ~ the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.google.cloud.dataflow</groupId>
-    <artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <groupId>org.apache.beam</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.1.0-incubating-SNAPSHOT</version>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 
-  <groupId>com.google.cloud.dataflow</groupId>
-  <artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
-  <name>Google Cloud Dataflow Java SDK - All</name>
-  <description>Google Cloud Dataflow Java SDK provides a simple, Java-based
-    interface for processing virtually any size data using Google cloud
-    resources. This artifact includes entire Dataflow Java SDK.</description>
-  <url>http://cloud.google.com/dataflow</url>
+  <artifactId>java-sdk-all</artifactId>
+  <name>Apache Beam :: SDK :: Java All</name>
+  <description>Beam SDK Java All provides a simple, Java-based
+  interface for processing virtually any size data. This
+  artifact includes entire Apache Beam Java SDK.</description>
 
   <packaging>jar</packaging>
 
@@ -97,7 +98,7 @@
           </dependency>
         </dependencies>
         <configuration>
-          <configLocation>../checkstyle.xml</configLocation>
+          <configLocation>../../../checkstyle.xml</configLocation>
           <consoleOutput>true</consoleOutput>
           <failOnViolation>true</failOnViolation>
           <includeResources>false</includeResources>
@@ -156,7 +157,8 @@
       </plugin>
 
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <windowtitle>Google Cloud Dataflow SDK ${project.version} API</windowtitle>
           <doctitle>Google Cloud Dataflow SDK for Java, version ${project.version}</doctitle>
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/Pipeline.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/Pipeline.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/Pipeline.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/Pipeline.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/PipelineResult.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/PipelineResult.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/PipelineResult.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/PipelineResult.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/annotations/Experimental.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/annotations/Experimental.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/annotations/Experimental.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/annotations/Experimental.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/annotations/package-info.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/annotations/package-info.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/annotations/package-info.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/annotations/package-info.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/AtomicCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/AtomicCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/AtomicCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/AtomicCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/AvroCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/AvroCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/AvroCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/AvroCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/BigEndianIntegerCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/BigEndianIntegerCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/BigEndianIntegerCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/BigEndianIntegerCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/BigEndianLongCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/BigEndianLongCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/BigEndianLongCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/BigEndianLongCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/ByteArrayCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/ByteArrayCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/ByteArrayCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/ByteArrayCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/ByteCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/ByteCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/ByteCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/ByteCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/ByteStringCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/ByteStringCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/ByteStringCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/ByteStringCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/CannotProvideCoderException.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/CannotProvideCoderException.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/CannotProvideCoderException.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/CannotProvideCoderException.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/Coder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/Coder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/Coder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/Coder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderException.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderException.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderException.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderException.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderFactories.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderFactories.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderFactories.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderFactories.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderProvider.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderProvider.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderProvider.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderProvider.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderProviders.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderProviders.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderProviders.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderProviders.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderRegistry.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderRegistry.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderRegistry.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/CoderRegistry.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/CollectionCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/CollectionCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/CollectionCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/CollectionCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/CustomCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/CustomCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/CustomCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/CustomCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/DefaultCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/DefaultCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/DefaultCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/DefaultCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/DelegateCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/DelegateCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/DelegateCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/DelegateCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/DeterministicStandardCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/DeterministicStandardCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/DeterministicStandardCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/DeterministicStandardCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/DoubleCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/DoubleCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/DoubleCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/DoubleCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/DurationCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/DurationCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/DurationCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/DurationCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/EntityCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/EntityCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/EntityCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/EntityCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/InstantCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/InstantCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/InstantCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/InstantCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/IterableCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/IterableCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/IterableCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/IterableCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/IterableLikeCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/IterableLikeCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/IterableLikeCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/IterableLikeCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/JAXBCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/JAXBCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/JAXBCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/JAXBCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/KvCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/KvCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/KvCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/KvCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/KvCoderBase.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/KvCoderBase.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/KvCoderBase.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/KvCoderBase.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/ListCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/ListCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/ListCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/ListCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/MapCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/MapCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/MapCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/MapCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/MapCoderBase.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/MapCoderBase.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/MapCoderBase.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/MapCoderBase.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/NullableCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/NullableCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/NullableCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/NullableCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/Proto2Coder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/Proto2Coder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/Proto2Coder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/Proto2Coder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/SerializableCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/SerializableCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/SerializableCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/SerializableCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/SetCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/SetCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/SetCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/SetCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/StandardCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/StandardCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/StandardCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/StandardCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/StringDelegateCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/StringDelegateCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/StringDelegateCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/StringDelegateCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/StringUtf8Coder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/StringUtf8Coder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/StringUtf8Coder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/StringUtf8Coder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/StructuralByteArray.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/StructuralByteArray.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/StructuralByteArray.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/StructuralByteArray.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/TableRowJsonCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/TableRowJsonCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/TableRowJsonCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/TableRowJsonCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/TextualIntegerCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/TextualIntegerCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/TextualIntegerCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/TextualIntegerCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/VarIntCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/VarIntCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/VarIntCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/VarIntCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/VarLongCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/VarLongCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/VarLongCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/VarLongCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/VoidCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/VoidCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/VoidCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/VoidCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/package-info.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/package-info.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/package-info.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/package-info.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtoCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtoCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtoCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtoCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtobufUtil.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtobufUtil.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtobufUtil.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtobufUtil.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/package-info.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/package-info.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/package-info.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/package-info.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/AvroIO.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/AvroIO.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/AvroIO.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/AvroIO.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/AvroSource.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/AvroSource.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/AvroSource.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/AvroSource.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/BigQueryIO.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/BigQueryIO.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/BigQueryIO.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/BigQueryIO.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/BlockBasedSource.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/BlockBasedSource.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/BlockBasedSource.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/BlockBasedSource.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/BoundedReadFromUnboundedSource.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/BoundedReadFromUnboundedSource.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/BoundedReadFromUnboundedSource.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/BoundedReadFromUnboundedSource.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/BoundedSource.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/BoundedSource.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/BoundedSource.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/BoundedSource.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/CompressedSource.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/CompressedSource.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/CompressedSource.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/CompressedSource.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/CountingInput.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/CountingInput.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/CountingInput.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/CountingInput.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/CountingSource.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/CountingSource.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/CountingSource.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/CountingSource.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/DatastoreIO.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/DatastoreIO.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/DatastoreIO.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/DatastoreIO.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/FileBasedSink.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/FileBasedSink.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/FileBasedSink.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/FileBasedSink.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/FileBasedSource.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/FileBasedSource.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/FileBasedSource.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/FileBasedSource.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/OffsetBasedSource.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/OffsetBasedSource.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/OffsetBasedSource.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/OffsetBasedSource.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/PubsubIO.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/PubsubIO.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/PubsubIO.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/PubsubIO.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/Read.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Read.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/Read.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Read.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/ShardNameTemplate.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/ShardNameTemplate.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/ShardNameTemplate.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/ShardNameTemplate.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/Sink.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Sink.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/Sink.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Sink.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/Source.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Source.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/Source.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Source.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/TextIO.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/TextIO.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/TextIO.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/TextIO.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/UnboundedSource.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/UnboundedSource.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/UnboundedSource.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/UnboundedSource.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/Write.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Write.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/Write.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/Write.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/XmlSink.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/XmlSink.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/XmlSink.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/XmlSink.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/XmlSource.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/XmlSource.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/XmlSource.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/XmlSource.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableIO.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableIO.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableIO.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableIO.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableService.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableService.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableService.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableService.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableServiceImpl.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableServiceImpl.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableServiceImpl.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableServiceImpl.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/package-info.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/package-info.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/package-info.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/bigtable/package-info.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/package-info.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/package-info.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/package-info.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/package-info.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/range/ByteKey.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/range/ByteKey.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/range/ByteKey.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/range/ByteKey.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRange.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRange.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRange.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRange.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRangeTracker.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRangeTracker.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRangeTracker.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRangeTracker.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/range/OffsetRangeTracker.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/range/OffsetRangeTracker.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/range/OffsetRangeTracker.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/range/OffsetRangeTracker.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/range/RangeTracker.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/range/RangeTracker.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/range/RangeTracker.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/range/RangeTracker.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/io/range/package-info.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/range/package-info.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/io/range/package-info.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/range/package-info.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/ApplicationNameOptions.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/ApplicationNameOptions.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/ApplicationNameOptions.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/ApplicationNameOptions.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/BigQueryOptions.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/BigQueryOptions.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/BigQueryOptions.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/BigQueryOptions.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/BlockingDataflowPipelineOptions.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/BlockingDataflowPipelineOptions.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/BlockingDataflowPipelineOptions.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/BlockingDataflowPipelineOptions.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/CloudDebuggerOptions.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/CloudDebuggerOptions.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/CloudDebuggerOptions.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/CloudDebuggerOptions.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineOptions.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineOptions.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineOptions.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineOptions.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineWorkerPoolOptions.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineWorkerPoolOptions.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineWorkerPoolOptions.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineWorkerPoolOptions.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowProfilingOptions.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowProfilingOptions.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowProfilingOptions.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowProfilingOptions.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowWorkerHarnessOptions.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowWorkerHarnessOptions.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowWorkerHarnessOptions.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowWorkerHarnessOptions.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowWorkerLoggingOptions.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowWorkerLoggingOptions.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowWorkerLoggingOptions.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowWorkerLoggingOptions.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/Default.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/Default.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/Default.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/Default.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DefaultValueFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/DefaultValueFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DefaultValueFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/DefaultValueFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/Description.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/Description.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/Description.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/Description.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DirectPipelineOptions.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/DirectPipelineOptions.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DirectPipelineOptions.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/DirectPipelineOptions.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/GcpOptions.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/GcpOptions.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/GcpOptions.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/GcpOptions.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/GcsOptions.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/GcsOptions.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/GcsOptions.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/GcsOptions.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/GoogleApiDebugOptions.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/GoogleApiDebugOptions.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/GoogleApiDebugOptions.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/GoogleApiDebugOptions.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/Hidden.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/Hidden.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/Hidden.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/Hidden.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptions.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptions.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptions.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptions.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsRegistrar.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsRegistrar.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsRegistrar.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsRegistrar.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsValidator.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsValidator.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsValidator.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsValidator.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/ProxyInvocationHandler.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/ProxyInvocationHandler.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/ProxyInvocationHandler.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/ProxyInvocationHandler.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/StreamingOptions.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/StreamingOptions.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/StreamingOptions.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/StreamingOptions.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/Validation.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/Validation.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/Validation.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/Validation.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/package-info.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/package-info.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/options/package-info.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/package-info.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/package-info.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/package-info.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/package-info.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/package-info.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/AggregatorPipelineExtractor.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/AggregatorPipelineExtractor.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/AggregatorPipelineExtractor.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/AggregatorPipelineExtractor.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/AggregatorRetrievalException.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/AggregatorRetrievalException.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/AggregatorRetrievalException.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/AggregatorRetrievalException.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/AggregatorValues.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/AggregatorValues.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/AggregatorValues.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/AggregatorValues.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/BlockingDataflowPipelineRunner.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/BlockingDataflowPipelineRunner.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/BlockingDataflowPipelineRunner.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/BlockingDataflowPipelineRunner.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobAlreadyExistsException.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobAlreadyExistsException.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobAlreadyExistsException.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobAlreadyExistsException.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobAlreadyUpdatedException.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobAlreadyUpdatedException.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobAlreadyUpdatedException.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobAlreadyUpdatedException.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobCancelledException.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobCancelledException.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobCancelledException.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobCancelledException.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobException.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobException.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobException.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobException.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobExecutionException.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobExecutionException.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobExecutionException.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobExecutionException.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobUpdatedException.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobUpdatedException.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobUpdatedException.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowJobUpdatedException.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipeline.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipeline.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipeline.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipeline.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineJob.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineJob.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineJob.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineJob.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRegistrar.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRegistrar.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRegistrar.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRegistrar.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunnerHooks.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunnerHooks.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunnerHooks.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunnerHooks.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineTranslator.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineTranslator.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineTranslator.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineTranslator.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowServiceException.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowServiceException.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowServiceException.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowServiceException.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DirectPipeline.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DirectPipeline.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DirectPipeline.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DirectPipeline.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRegistrar.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRegistrar.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRegistrar.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRegistrar.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRunner.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRunner.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRunner.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRunner.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/PipelineRunner.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/PipelineRunner.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/PipelineRunner.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/PipelineRunner.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/PipelineRunnerRegistrar.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/PipelineRunnerRegistrar.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/PipelineRunnerRegistrar.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/PipelineRunnerRegistrar.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/RecordingPipelineVisitor.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/RecordingPipelineVisitor.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/RecordingPipelineVisitor.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/RecordingPipelineVisitor.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/TransformHierarchy.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/TransformHierarchy.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/TransformHierarchy.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/TransformHierarchy.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/TransformTreeNode.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/TransformTreeNode.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/TransformTreeNode.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/TransformTreeNode.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/AssignWindows.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/AssignWindows.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/AssignWindows.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/AssignWindows.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/BigQueryIOTranslator.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/BigQueryIOTranslator.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/BigQueryIOTranslator.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/BigQueryIOTranslator.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/CustomSources.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/CustomSources.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/CustomSources.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/CustomSources.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/DataflowAggregatorTransforms.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/DataflowAggregatorTransforms.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/DataflowAggregatorTransforms.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/DataflowAggregatorTransforms.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/DataflowMetricUpdateExtractor.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/DataflowMetricUpdateExtractor.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/DataflowMetricUpdateExtractor.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/DataflowMetricUpdateExtractor.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/PubsubIOTranslator.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/PubsubIOTranslator.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/PubsubIOTranslator.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/PubsubIOTranslator.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/ReadTranslator.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/ReadTranslator.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/ReadTranslator.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/ReadTranslator.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/package-info.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/package-info.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/package-info.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/dataflow/package-info.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/BoundedReadEvaluatorFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/BoundedReadEvaluatorFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/BoundedReadEvaluatorFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/BoundedReadEvaluatorFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/CachedThreadPoolExecutorServiceFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/CachedThreadPoolExecutorServiceFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/CachedThreadPoolExecutorServiceFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/CachedThreadPoolExecutorServiceFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/Clock.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/Clock.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/Clock.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/Clock.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/CompletionCallback.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/CompletionCallback.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/CompletionCallback.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/CompletionCallback.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ConsumerTrackingPipelineVisitor.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ConsumerTrackingPipelineVisitor.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ConsumerTrackingPipelineVisitor.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ConsumerTrackingPipelineVisitor.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/EmptyTransformEvaluator.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/EmptyTransformEvaluator.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/EmptyTransformEvaluator.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/EmptyTransformEvaluator.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/EvaluatorKey.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/EvaluatorKey.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/EvaluatorKey.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/EvaluatorKey.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ExecutorServiceFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ExecutorServiceFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ExecutorServiceFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ExecutorServiceFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ExecutorServiceParallelExecutor.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ExecutorServiceParallelExecutor.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ExecutorServiceParallelExecutor.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ExecutorServiceParallelExecutor.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/FlattenEvaluatorFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/FlattenEvaluatorFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/FlattenEvaluatorFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/FlattenEvaluatorFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ForwardingPTransform.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ForwardingPTransform.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ForwardingPTransform.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ForwardingPTransform.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/GroupByKeyEvaluatorFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/GroupByKeyEvaluatorFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/GroupByKeyEvaluatorFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/GroupByKeyEvaluatorFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InMemoryWatermarkManager.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InMemoryWatermarkManager.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InMemoryWatermarkManager.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InMemoryWatermarkManager.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessBundle.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessBundle.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessBundle.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessBundle.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessBundleOutputManager.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessBundleOutputManager.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessBundleOutputManager.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessBundleOutputManager.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessCreate.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessCreate.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessCreate.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessCreate.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessEvaluationContext.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessEvaluationContext.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessEvaluationContext.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessEvaluationContext.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessExecutionContext.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessExecutionContext.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessExecutionContext.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessExecutionContext.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessExecutor.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessExecutor.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessExecutor.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessExecutor.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessPipelineOptions.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessPipelineOptions.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessPipelineOptions.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessPipelineOptions.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessPipelineRunner.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessPipelineRunner.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessPipelineRunner.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessPipelineRunner.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessSideInputContainer.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessSideInputContainer.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessSideInputContainer.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessSideInputContainer.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessTimerInternals.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessTimerInternals.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessTimerInternals.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessTimerInternals.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessTransformResult.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessTransformResult.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessTransformResult.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessTransformResult.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/KeyedPValueTrackingVisitor.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/KeyedPValueTrackingVisitor.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/KeyedPValueTrackingVisitor.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/KeyedPValueTrackingVisitor.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/NanosOffsetClock.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/NanosOffsetClock.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/NanosOffsetClock.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/NanosOffsetClock.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoInProcessEvaluator.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoInProcessEvaluator.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoInProcessEvaluator.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoInProcessEvaluator.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoMultiEvaluatorFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoMultiEvaluatorFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoMultiEvaluatorFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoMultiEvaluatorFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoSingleEvaluatorFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoSingleEvaluatorFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoSingleEvaluatorFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoSingleEvaluatorFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/StepAndKey.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/StepAndKey.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/StepAndKey.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/StepAndKey.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/StepTransformResult.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/StepTransformResult.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/StepTransformResult.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/StepTransformResult.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformEvaluator.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformEvaluator.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformEvaluator.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformEvaluator.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformEvaluatorFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformEvaluatorFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformEvaluatorFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformEvaluatorFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformEvaluatorRegistry.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformEvaluatorRegistry.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformEvaluatorRegistry.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformEvaluatorRegistry.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformExecutor.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformExecutor.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformExecutor.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformExecutor.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformExecutorService.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformExecutorService.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformExecutorService.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformExecutorService.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformExecutorServices.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformExecutorServices.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformExecutorServices.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformExecutorServices.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/UnboundedReadEvaluatorFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/UnboundedReadEvaluatorFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/UnboundedReadEvaluatorFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/UnboundedReadEvaluatorFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ViewEvaluatorFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ViewEvaluatorFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ViewEvaluatorFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ViewEvaluatorFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/WatermarkCallbackExecutor.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/WatermarkCallbackExecutor.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/WatermarkCallbackExecutor.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/WatermarkCallbackExecutor.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/package-info.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/package-info.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/package-info.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/package-info.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/worker/IsmFormat.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/worker/IsmFormat.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/worker/IsmFormat.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/worker/IsmFormat.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/worker/package-info.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/worker/package-info.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/worker/package-info.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/worker/package-info.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/CoderProperties.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/CoderProperties.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/CoderProperties.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/CoderProperties.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/DataflowAssert.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/DataflowAssert.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/DataflowAssert.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/DataflowAssert.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/RunnableOnService.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/RunnableOnService.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/RunnableOnService.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/RunnableOnService.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/SerializableMatcher.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/SerializableMatcher.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/SerializableMatcher.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/SerializableMatcher.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/SerializableMatchers.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/SerializableMatchers.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/SerializableMatchers.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/SerializableMatchers.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/SourceTestUtils.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/SourceTestUtils.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/SourceTestUtils.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/SourceTestUtils.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/TestDataflowPipelineOptions.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/TestDataflowPipelineOptions.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/TestDataflowPipelineOptions.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/TestDataflowPipelineOptions.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/TestDataflowPipelineRunner.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/TestDataflowPipelineRunner.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/TestDataflowPipelineRunner.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/TestDataflowPipelineRunner.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/TestPipeline.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/TestPipeline.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/TestPipeline.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/TestPipeline.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/WindowFnTestUtils.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/WindowFnTestUtils.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/WindowFnTestUtils.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/WindowFnTestUtils.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/package-info.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/package-info.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/testing/package-info.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/package-info.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Aggregator.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Aggregator.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Aggregator.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Aggregator.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/AggregatorRetriever.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/AggregatorRetriever.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/AggregatorRetriever.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/AggregatorRetriever.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/AppliedPTransform.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/AppliedPTransform.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/AppliedPTransform.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/AppliedPTransform.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/ApproximateQuantiles.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/ApproximateQuantiles.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/ApproximateQuantiles.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/ApproximateQuantiles.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/ApproximateUnique.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/ApproximateUnique.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/ApproximateUnique.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/ApproximateUnique.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Combine.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Combine.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Combine.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Combine.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/CombineFnBase.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/CombineFnBase.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/CombineFnBase.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/CombineFnBase.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/CombineFns.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/CombineFns.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/CombineFns.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/CombineFns.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/CombineWithContext.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/CombineWithContext.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/CombineWithContext.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/CombineWithContext.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Count.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Count.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Count.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Count.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Create.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Create.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Create.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Create.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFn.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFn.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFn.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFn.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnReflector.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnReflector.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnReflector.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnReflector.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnTester.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnTester.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnTester.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnTester.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContext.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContext.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContext.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContext.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Filter.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Filter.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Filter.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Filter.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/FlatMapElements.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/FlatMapElements.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/FlatMapElements.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/FlatMapElements.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Flatten.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Flatten.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Flatten.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Flatten.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/GroupByKey.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/GroupByKey.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/GroupByKey.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/GroupByKey.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/IntraBundleParallelization.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/IntraBundleParallelization.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/IntraBundleParallelization.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/IntraBundleParallelization.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Keys.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Keys.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Keys.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Keys.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/KvSwap.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/KvSwap.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/KvSwap.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/KvSwap.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/MapElements.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/MapElements.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/MapElements.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/MapElements.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Max.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Max.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Max.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Max.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Mean.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Mean.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Mean.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Mean.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Min.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Min.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Min.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Min.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/PTransform.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/PTransform.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/PTransform.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/PTransform.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/ParDo.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/ParDo.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/ParDo.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/ParDo.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Partition.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Partition.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Partition.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Partition.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicates.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicates.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicates.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicates.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Sample.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Sample.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Sample.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Sample.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/SerializableComparator.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/SerializableComparator.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/SerializableComparator.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/SerializableComparator.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/SerializableFunction.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/SerializableFunction.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/SerializableFunction.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/SerializableFunction.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/SimpleFunction.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/SimpleFunction.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/SimpleFunction.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/SimpleFunction.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Sum.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Sum.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Sum.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Sum.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Top.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Top.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Top.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Top.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Values.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Values.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Values.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Values.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/View.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/View.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/View.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/View.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/WithKeys.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/WithKeys.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/WithKeys.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/WithKeys.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/WithTimestamps.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/WithTimestamps.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/WithTimestamps.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/WithTimestamps.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Write.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Write.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/Write.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/Write.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/display/DisplayData.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/display/DisplayData.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/display/DisplayData.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/display/DisplayData.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/display/HasDisplayData.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/display/HasDisplayData.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/display/HasDisplayData.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/display/HasDisplayData.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/CoGbkResult.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/CoGbkResult.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/CoGbkResult.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/CoGbkResult.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/CoGbkResultSchema.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/CoGbkResultSchema.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/CoGbkResultSchema.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/CoGbkResultSchema.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/CoGroupByKey.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/CoGroupByKey.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/CoGroupByKey.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/CoGroupByKey.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/KeyedPCollectionTuple.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/KeyedPCollectionTuple.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/KeyedPCollectionTuple.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/KeyedPCollectionTuple.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/RawUnionValue.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/RawUnionValue.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/RawUnionValue.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/RawUnionValue.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/UnionCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/UnionCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/UnionCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/UnionCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/package-info.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/package-info.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/package-info.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/join/package-info.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/package-info.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/package-info.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/package-info.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/package-info.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterAll.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterAll.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterAll.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterAll.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterDelayFromFirstElement.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterDelayFromFirstElement.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterDelayFromFirstElement.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterDelayFromFirstElement.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterEach.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterEach.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterEach.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterEach.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterFirst.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterFirst.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterFirst.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterFirst.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterPane.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterPane.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterPane.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterPane.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterProcessingTime.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterProcessingTime.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterProcessingTime.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterProcessingTime.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterSynchronizedProcessingTime.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterSynchronizedProcessingTime.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterSynchronizedProcessingTime.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterSynchronizedProcessingTime.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterWatermark.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterWatermark.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterWatermark.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterWatermark.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/BoundedWindow.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/BoundedWindow.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/BoundedWindow.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/BoundedWindow.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/CalendarWindows.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/CalendarWindows.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/CalendarWindows.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/CalendarWindows.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/DefaultTrigger.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/DefaultTrigger.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/DefaultTrigger.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/DefaultTrigger.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/FixedWindows.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/FixedWindows.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/FixedWindows.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/FixedWindows.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/GlobalWindow.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/GlobalWindow.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/GlobalWindow.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/GlobalWindow.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/GlobalWindows.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/GlobalWindows.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/GlobalWindows.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/GlobalWindows.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/IntervalWindow.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/IntervalWindow.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/IntervalWindow.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/IntervalWindow.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/InvalidWindows.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/InvalidWindows.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/InvalidWindows.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/InvalidWindows.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/MergeOverlappingIntervalWindows.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/MergeOverlappingIntervalWindows.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/MergeOverlappingIntervalWindows.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/MergeOverlappingIntervalWindows.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/NonMergingWindowFn.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/NonMergingWindowFn.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/NonMergingWindowFn.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/NonMergingWindowFn.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OrFinallyTrigger.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OrFinallyTrigger.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OrFinallyTrigger.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OrFinallyTrigger.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OutputTimeFn.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OutputTimeFn.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OutputTimeFn.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OutputTimeFn.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OutputTimeFns.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OutputTimeFns.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OutputTimeFns.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/OutputTimeFns.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/PaneInfo.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/PaneInfo.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/PaneInfo.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/PaneInfo.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/PartitioningWindowFn.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/PartitioningWindowFn.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/PartitioningWindowFn.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/PartitioningWindowFn.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Repeatedly.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Repeatedly.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Repeatedly.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Repeatedly.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Sessions.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Sessions.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Sessions.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Sessions.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/SlidingWindows.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/SlidingWindows.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/SlidingWindows.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/SlidingWindows.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Trigger.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Trigger.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Trigger.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Trigger.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/TriggerBuilder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/TriggerBuilder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/TriggerBuilder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/TriggerBuilder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Window.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Window.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Window.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/Window.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowFn.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowFn.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowFn.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowFn.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/package-info.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/package-info.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/package-info.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/windowing/package-info.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ActiveWindowSet.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ActiveWindowSet.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ActiveWindowSet.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ActiveWindowSet.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ApiSurface.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ApiSurface.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ApiSurface.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ApiSurface.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/AppEngineEnvironment.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/AppEngineEnvironment.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/AppEngineEnvironment.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/AppEngineEnvironment.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/AppliedCombineFn.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/AppliedCombineFn.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/AppliedCombineFn.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/AppliedCombineFn.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/AssignWindowsDoFn.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/AssignWindowsDoFn.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/AssignWindowsDoFn.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/AssignWindowsDoFn.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/AttemptAndTimeBoundedExponentialBackOff.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/AttemptAndTimeBoundedExponentialBackOff.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/AttemptAndTimeBoundedExponentialBackOff.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/AttemptAndTimeBoundedExponentialBackOff.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/AttemptBoundedExponentialBackOff.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/AttemptBoundedExponentialBackOff.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/AttemptBoundedExponentialBackOff.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/AttemptBoundedExponentialBackOff.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/AvroUtils.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/AvroUtils.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/AvroUtils.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/AvroUtils.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/BaseExecutionContext.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/BaseExecutionContext.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/BaseExecutionContext.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/BaseExecutionContext.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/BatchTimerInternals.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/BatchTimerInternals.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/BatchTimerInternals.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/BatchTimerInternals.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/BigQueryTableInserter.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/BigQueryTableInserter.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/BigQueryTableInserter.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/BigQueryTableInserter.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/BigQueryTableRowIterator.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/BigQueryTableRowIterator.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/BigQueryTableRowIterator.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/BigQueryTableRowIterator.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/BitSetCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/BitSetCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/BitSetCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/BitSetCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/BufferedElementCountingOutputStream.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/BufferedElementCountingOutputStream.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/BufferedElementCountingOutputStream.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/BufferedElementCountingOutputStream.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/CloudKnownType.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/CloudKnownType.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/CloudKnownType.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/CloudKnownType.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/CloudObject.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/CloudObject.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/CloudObject.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/CloudObject.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/CoderUtils.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/CoderUtils.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/CoderUtils.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/CoderUtils.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/CombineContextFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/CombineContextFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/CombineContextFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/CombineContextFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/CombineFnUtil.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/CombineFnUtil.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/CombineFnUtil.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/CombineFnUtil.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/CounterAggregator.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/CounterAggregator.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/CounterAggregator.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/CounterAggregator.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/CredentialFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/CredentialFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/CredentialFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/CredentialFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Credentials.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Credentials.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Credentials.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Credentials.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/DataflowPathValidator.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/DataflowPathValidator.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/DataflowPathValidator.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/DataflowPathValidator.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/DataflowReleaseInfo.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/DataflowReleaseInfo.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/DataflowReleaseInfo.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/DataflowReleaseInfo.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/DirectModeExecutionContext.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/DirectModeExecutionContext.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/DirectModeExecutionContext.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/DirectModeExecutionContext.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/DirectSideInputReader.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/DirectSideInputReader.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/DirectSideInputReader.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/DirectSideInputReader.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/DoFnInfo.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/DoFnInfo.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/DoFnInfo.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/DoFnInfo.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/DoFnRunner.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/DoFnRunner.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/DoFnRunner.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/DoFnRunner.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/DoFnRunnerBase.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/DoFnRunnerBase.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/DoFnRunnerBase.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/DoFnRunnerBase.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/DoFnRunners.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/DoFnRunners.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/DoFnRunners.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/DoFnRunners.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ExecutableTrigger.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ExecutableTrigger.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ExecutableTrigger.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ExecutableTrigger.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ExecutionContext.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ExecutionContext.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ExecutionContext.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ExecutionContext.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ExposedByteArrayInputStream.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ExposedByteArrayInputStream.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ExposedByteArrayInputStream.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ExposedByteArrayInputStream.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ExposedByteArrayOutputStream.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ExposedByteArrayOutputStream.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ExposedByteArrayOutputStream.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ExposedByteArrayOutputStream.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/FileIOChannelFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/FileIOChannelFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/FileIOChannelFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/FileIOChannelFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/FinishedTriggers.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/FinishedTriggers.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/FinishedTriggers.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/FinishedTriggers.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/FinishedTriggersBitSet.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/FinishedTriggersBitSet.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/FinishedTriggersBitSet.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/FinishedTriggersBitSet.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/FinishedTriggersSet.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/FinishedTriggersSet.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/FinishedTriggersSet.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/FinishedTriggersSet.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/GcpCredentialFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/GcpCredentialFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/GcpCredentialFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/GcpCredentialFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/GcsIOChannelFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/GcsIOChannelFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/GcsIOChannelFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/GcsIOChannelFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/GcsStager.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/GcsStager.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/GcsStager.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/GcsStager.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/GcsUtil.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/GcsUtil.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/GcsUtil.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/GcsUtil.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowViaWindowSetDoFn.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowViaWindowSetDoFn.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowViaWindowSetDoFn.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowViaWindowSetDoFn.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowsDoFn.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowsDoFn.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowsDoFn.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowsDoFn.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowsViaOutputBufferDoFn.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowsViaOutputBufferDoFn.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowsViaOutputBufferDoFn.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowsViaOutputBufferDoFn.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/IOChannelFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/IOChannelFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/IOChannelFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/IOChannelFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/IOChannelUtils.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/IOChannelUtils.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/IOChannelUtils.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/IOChannelUtils.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/IllegalMutationException.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/IllegalMutationException.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/IllegalMutationException.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/IllegalMutationException.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/InstanceBuilder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/InstanceBuilder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/InstanceBuilder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/InstanceBuilder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/IntervalBoundedExponentialBackOff.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/IntervalBoundedExponentialBackOff.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/IntervalBoundedExponentialBackOff.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/IntervalBoundedExponentialBackOff.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/KeyedWorkItem.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/KeyedWorkItem.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/KeyedWorkItem.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/KeyedWorkItem.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/KeyedWorkItemCoder.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/KeyedWorkItemCoder.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/KeyedWorkItemCoder.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/KeyedWorkItemCoder.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/KeyedWorkItems.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/KeyedWorkItems.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/KeyedWorkItems.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/KeyedWorkItems.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/LateDataDroppingDoFnRunner.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/LateDataDroppingDoFnRunner.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/LateDataDroppingDoFnRunner.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/LateDataDroppingDoFnRunner.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/MapAggregatorValues.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/MapAggregatorValues.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/MapAggregatorValues.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/MapAggregatorValues.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/MergingActiveWindowSet.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/MergingActiveWindowSet.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/MergingActiveWindowSet.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/MergingActiveWindowSet.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/MimeTypes.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/MimeTypes.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/MimeTypes.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/MimeTypes.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/MonitoringUtil.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/MonitoringUtil.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/MonitoringUtil.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/MonitoringUtil.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/MutationDetector.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/MutationDetector.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/MutationDetector.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/MutationDetector.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/MutationDetectors.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/MutationDetectors.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/MutationDetectors.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/MutationDetectors.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/NonEmptyPanes.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/NonEmptyPanes.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/NonEmptyPanes.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/NonEmptyPanes.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/NonMergingActiveWindowSet.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/NonMergingActiveWindowSet.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/NonMergingActiveWindowSet.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/NonMergingActiveWindowSet.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/NoopCredentialFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/NoopCredentialFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/NoopCredentialFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/NoopCredentialFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/NoopPathValidator.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/NoopPathValidator.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/NoopPathValidator.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/NoopPathValidator.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/NullSideInputReader.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/NullSideInputReader.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/NullSideInputReader.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/NullSideInputReader.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/OutputReference.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/OutputReference.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/OutputReference.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/OutputReference.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/PCollectionViewWindow.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/PCollectionViewWindow.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/PCollectionViewWindow.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/PCollectionViewWindow.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/PCollectionViews.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/PCollectionViews.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/PCollectionViews.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/PCollectionViews.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/PTuple.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/PTuple.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/PTuple.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/PTuple.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/PackageUtil.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/PackageUtil.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/PackageUtil.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/PackageUtil.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/PaneInfoTracker.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/PaneInfoTracker.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/PaneInfoTracker.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/PaneInfoTracker.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/PathValidator.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/PathValidator.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/PathValidator.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/PathValidator.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/PerKeyCombineFnRunner.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/PerKeyCombineFnRunner.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/PerKeyCombineFnRunner.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/PerKeyCombineFnRunner.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/PerKeyCombineFnRunners.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/PerKeyCombineFnRunners.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/PerKeyCombineFnRunners.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/PerKeyCombineFnRunners.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/PropertyNames.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/PropertyNames.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/PropertyNames.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/PropertyNames.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/RandomAccessData.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/RandomAccessData.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/RandomAccessData.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/RandomAccessData.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ReduceFn.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ReduceFn.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ReduceFn.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ReduceFn.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ReduceFnContextFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ReduceFnContextFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ReduceFnContextFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ReduceFnContextFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ReduceFnRunner.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ReduceFnRunner.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ReduceFnRunner.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ReduceFnRunner.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ReifyTimestampAndWindowsDoFn.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ReifyTimestampAndWindowsDoFn.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ReifyTimestampAndWindowsDoFn.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ReifyTimestampAndWindowsDoFn.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Reshuffle.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Reshuffle.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Reshuffle.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Reshuffle.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ReshuffleTrigger.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ReshuffleTrigger.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ReshuffleTrigger.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ReshuffleTrigger.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/RetryHttpRequestInitializer.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/RetryHttpRequestInitializer.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/RetryHttpRequestInitializer.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/RetryHttpRequestInitializer.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/SerializableUtils.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/SerializableUtils.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/SerializableUtils.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/SerializableUtils.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Serializer.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Serializer.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Serializer.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Serializer.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ShardingWritableByteChannel.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ShardingWritableByteChannel.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ShardingWritableByteChannel.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ShardingWritableByteChannel.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/SideInputReader.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/SideInputReader.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/SideInputReader.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/SideInputReader.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/SimpleDoFnRunner.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/SimpleDoFnRunner.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/SimpleDoFnRunner.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/SimpleDoFnRunner.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Stager.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Stager.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Stager.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Stager.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/StreamUtils.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/StreamUtils.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/StreamUtils.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/StreamUtils.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/StringUtils.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/StringUtils.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/StringUtils.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/StringUtils.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Structs.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Structs.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Structs.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Structs.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/SystemDoFnInternal.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/SystemDoFnInternal.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/SystemDoFnInternal.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/SystemDoFnInternal.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/SystemReduceFn.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/SystemReduceFn.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/SystemReduceFn.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/SystemReduceFn.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/TestCredential.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/TestCredential.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/TestCredential.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/TestCredential.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/TimeDomain.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/TimeDomain.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/TimeDomain.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/TimeDomain.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/TimeUtil.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/TimeUtil.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/TimeUtil.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/TimeUtil.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/TimerInternals.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/TimerInternals.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/TimerInternals.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/TimerInternals.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Timers.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Timers.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Timers.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Timers.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Transport.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Transport.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Transport.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Transport.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/TriggerContextFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/TriggerContextFactory.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/TriggerContextFactory.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/TriggerContextFactory.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/TriggerRunner.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/TriggerRunner.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/TriggerRunner.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/TriggerRunner.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/UnownedInputStream.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/UnownedInputStream.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/UnownedInputStream.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/UnownedInputStream.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/UnownedOutputStream.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/UnownedOutputStream.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/UnownedOutputStream.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/UnownedOutputStream.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/UploadIdResponseInterceptor.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/UploadIdResponseInterceptor.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/UploadIdResponseInterceptor.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/UploadIdResponseInterceptor.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/UserCodeException.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/UserCodeException.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/UserCodeException.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/UserCodeException.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ValueWithRecordId.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ValueWithRecordId.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ValueWithRecordId.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ValueWithRecordId.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Values.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Values.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Values.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Values.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/VarInt.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/VarInt.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/VarInt.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/VarInt.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/WatermarkHold.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/WatermarkHold.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/WatermarkHold.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/WatermarkHold.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Weighted.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Weighted.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Weighted.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Weighted.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/WeightedValue.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/WeightedValue.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/WeightedValue.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/WeightedValue.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/WindowTracing.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/WindowTracing.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/WindowTracing.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/WindowTracing.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/WindowedValue.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/WindowedValue.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/WindowedValue.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/WindowedValue.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/WindowingInternals.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/WindowingInternals.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/WindowingInternals.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/WindowingInternals.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/WindowingStrategy.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/WindowingStrategy.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/WindowingStrategy.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/WindowingStrategy.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ZipFiles.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ZipFiles.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/ZipFiles.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ZipFiles.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/Counter.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/Counter.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/Counter.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/Counter.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/CounterProvider.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/CounterProvider.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/CounterProvider.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/CounterProvider.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/CounterSet.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/CounterSet.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/CounterSet.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/CounterSet.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/ElementByteSizeObservable.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/ElementByteSizeObservable.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/ElementByteSizeObservable.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/ElementByteSizeObservable.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/ElementByteSizeObservableIterable.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/ElementByteSizeObservableIterable.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/ElementByteSizeObservableIterable.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/ElementByteSizeObservableIterable.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/ElementByteSizeObservableIterator.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/ElementByteSizeObservableIterator.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/ElementByteSizeObservableIterator.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/ElementByteSizeObservableIterator.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/ElementByteSizeObserver.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/ElementByteSizeObserver.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/ElementByteSizeObserver.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/ElementByteSizeObserver.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/PeekingReiterator.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/PeekingReiterator.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/PeekingReiterator.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/PeekingReiterator.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/ReflectHelpers.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/ReflectHelpers.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/ReflectHelpers.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/ReflectHelpers.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/Reiterable.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/Reiterable.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/Reiterable.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/Reiterable.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/Reiterator.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/Reiterator.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/Reiterator.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/Reiterator.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/package-info.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/package-info.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/package-info.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/package-info.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/worker/StateSampler.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/worker/StateSampler.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/worker/StateSampler.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/worker/StateSampler.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/worker/package-info.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/worker/package-info.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/common/worker/package-info.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/common/worker/package-info.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/gcsfs/GcsPath.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/gcsfs/GcsPath.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/gcsfs/GcsPath.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/gcsfs/GcsPath.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/gcsfs/package-info.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/gcsfs/package-info.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/gcsfs/package-info.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/gcsfs/package-info.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/package-info.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/package-info.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/package-info.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/package-info.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/AccumulatorCombiningState.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/AccumulatorCombiningState.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/AccumulatorCombiningState.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/AccumulatorCombiningState.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/BagState.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/BagState.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/BagState.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/BagState.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/CombiningState.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/CombiningState.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/CombiningState.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/CombiningState.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/CopyOnAccessInMemoryStateInternals.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/CopyOnAccessInMemoryStateInternals.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/CopyOnAccessInMemoryStateInternals.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/CopyOnAccessInMemoryStateInternals.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/InMemoryStateInternals.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/InMemoryStateInternals.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/InMemoryStateInternals.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/InMemoryStateInternals.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/MergingStateAccessor.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/MergingStateAccessor.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/MergingStateAccessor.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/MergingStateAccessor.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/ReadableState.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/ReadableState.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/ReadableState.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/ReadableState.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/State.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/State.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/State.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/State.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateAccessor.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateAccessor.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateAccessor.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateAccessor.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateContext.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateContext.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateContext.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateContext.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateContexts.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateContexts.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateContexts.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateContexts.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateInternals.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateInternals.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateInternals.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateInternals.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateMerging.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateMerging.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateMerging.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateMerging.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateNamespace.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateNamespace.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateNamespace.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateNamespace.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateNamespaceForTest.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateNamespaceForTest.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateNamespaceForTest.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateNamespaceForTest.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateNamespaces.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateNamespaces.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateNamespaces.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateNamespaces.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTable.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTable.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTable.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTable.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTag.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTag.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTag.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTag.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTags.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTags.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTags.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/StateTags.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/ValueState.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/ValueState.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/ValueState.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/ValueState.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/WatermarkHoldState.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/WatermarkHoldState.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/util/state/WatermarkHoldState.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/state/WatermarkHoldState.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/values/KV.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/KV.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/values/KV.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/KV.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/values/PBegin.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/PBegin.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/values/PBegin.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/PBegin.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/values/PCollection.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/PCollection.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/values/PCollection.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/PCollection.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/values/PCollectionList.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/PCollectionList.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/values/PCollectionList.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/PCollectionList.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/values/PCollectionTuple.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/PCollectionTuple.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/values/PCollectionTuple.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/PCollectionTuple.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/values/PCollectionView.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/PCollectionView.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/values/PCollectionView.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/PCollectionView.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/values/PDone.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/PDone.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/values/PDone.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/PDone.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/values/PInput.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/PInput.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/values/PInput.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/PInput.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/values/POutput.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/POutput.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/values/POutput.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/POutput.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/values/POutputValueBase.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/POutputValueBase.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/values/POutputValueBase.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/POutputValueBase.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/values/PValue.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/PValue.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/values/PValue.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/PValue.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/values/PValueBase.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/PValueBase.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/values/PValueBase.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/PValueBase.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/values/TimestampedValue.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/TimestampedValue.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/values/TimestampedValue.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/TimestampedValue.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/values/TupleTag.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/TupleTag.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/values/TupleTag.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/TupleTag.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/values/TupleTagList.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/TupleTagList.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/values/TupleTagList.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/TupleTagList.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/values/TypeDescriptor.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/TypeDescriptor.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/values/TypeDescriptor.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/TypeDescriptor.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/values/TypedPValue.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/TypedPValue.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/values/TypedPValue.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/TypedPValue.java
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/values/package-info.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/package-info.java
similarity index 100%
rename from sdk/src/main/java/com/google/cloud/dataflow/sdk/values/package-info.java
rename to sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/values/package-info.java
diff --git a/sdk/src/main/proto/README.md b/sdks/java/core/src/main/proto/README.md
similarity index 100%
rename from sdk/src/main/proto/README.md
rename to sdks/java/core/src/main/proto/README.md
diff --git a/sdk/src/main/proto/proto2_coder_test_messages.proto b/sdks/java/core/src/main/proto/proto2_coder_test_messages.proto
similarity index 100%
rename from sdk/src/main/proto/proto2_coder_test_messages.proto
rename to sdks/java/core/src/main/proto/proto2_coder_test_messages.proto
diff --git a/sdk/src/main/resources/com/google/cloud/dataflow/sdk/sdk.properties b/sdks/java/core/src/main/resources/com/google/cloud/dataflow/sdk/sdk.properties
similarity index 100%
rename from sdk/src/main/resources/com/google/cloud/dataflow/sdk/sdk.properties
rename to sdks/java/core/src/main/resources/com/google/cloud/dataflow/sdk/sdk.properties
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/DataflowMatchers.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/DataflowMatchers.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/DataflowMatchers.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/DataflowMatchers.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/PipelineTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/PipelineTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/PipelineTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/PipelineTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/TestUtils.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/TestUtils.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/TestUtils.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/TestUtils.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/WindowMatchers.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/WindowMatchers.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/WindowMatchers.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/WindowMatchers.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/AvroCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/AvroCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/AvroCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/AvroCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/BigEndianIntegerCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/BigEndianIntegerCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/BigEndianIntegerCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/BigEndianIntegerCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/BigEndianLongCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/BigEndianLongCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/BigEndianLongCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/BigEndianLongCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/ByteArrayCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/ByteArrayCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/ByteArrayCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/ByteArrayCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/ByteCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/ByteCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/ByteCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/ByteCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/ByteStringCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/ByteStringCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/ByteStringCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/ByteStringCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/CoderFactoriesTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/CoderFactoriesTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/CoderFactoriesTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/CoderFactoriesTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/CoderProvidersTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/CoderProvidersTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/CoderProvidersTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/CoderProvidersTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/CoderRegistryTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/CoderRegistryTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/CoderRegistryTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/CoderRegistryTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/CoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/CoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/CoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/CoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/CollectionCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/CollectionCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/CollectionCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/CollectionCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/CustomCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/CustomCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/CustomCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/CustomCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/DefaultCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/DefaultCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/DefaultCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/DefaultCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/DelegateCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/DelegateCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/DelegateCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/DelegateCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/DoubleCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/DoubleCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/DoubleCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/DoubleCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/DurationCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/DurationCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/DurationCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/DurationCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/EntityCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/EntityCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/EntityCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/EntityCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/InstantCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/InstantCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/InstantCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/InstantCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/IterableCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/IterableCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/IterableCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/IterableCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/JAXBCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/JAXBCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/JAXBCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/JAXBCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/KvCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/KvCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/KvCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/KvCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/ListCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/ListCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/ListCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/ListCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/MapCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/MapCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/MapCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/MapCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/NullableCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/NullableCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/NullableCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/NullableCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/PrintBase64Encodings.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/PrintBase64Encodings.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/PrintBase64Encodings.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/PrintBase64Encodings.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/Proto2CoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/Proto2CoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/Proto2CoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/Proto2CoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/SerializableCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/SerializableCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/SerializableCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/SerializableCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/SetCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/SetCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/SetCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/SetCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/StandardCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/StandardCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/StandardCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/StandardCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/StringDelegateCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/StringDelegateCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/StringDelegateCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/StringDelegateCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/StringUtf8CoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/StringUtf8CoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/StringUtf8CoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/StringUtf8CoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/StructuralByteArrayTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/StructuralByteArrayTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/StructuralByteArrayTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/StructuralByteArrayTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/TableRowJsonCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/TableRowJsonCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/TableRowJsonCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/TableRowJsonCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/TextualIntegerCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/TextualIntegerCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/TextualIntegerCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/TextualIntegerCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/VarIntCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/VarIntCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/VarIntCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/VarIntCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/VarLongCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/VarLongCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/VarLongCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/VarLongCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtoCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtoCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtoCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtoCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtobufUtilTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtobufUtilTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtobufUtilTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtobufUtilTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/AvroIOGeneratedClassTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/AvroIOGeneratedClassTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/AvroIOGeneratedClassTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/AvroIOGeneratedClassTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/AvroIOTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/AvroIOTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/AvroIOTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/AvroIOTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/AvroSourceTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/AvroSourceTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/AvroSourceTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/AvroSourceTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/BigQueryIOTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/BigQueryIOTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/BigQueryIOTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/BigQueryIOTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/BoundedReadFromUnboundedSourceTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/BoundedReadFromUnboundedSourceTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/BoundedReadFromUnboundedSourceTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/BoundedReadFromUnboundedSourceTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/CompressedSourceTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/CompressedSourceTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/CompressedSourceTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/CompressedSourceTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/CountingInputTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/CountingInputTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/CountingInputTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/CountingInputTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/CountingSourceTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/CountingSourceTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/CountingSourceTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/CountingSourceTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/DatastoreIOTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/DatastoreIOTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/DatastoreIOTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/DatastoreIOTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/FileBasedSinkTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/FileBasedSinkTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/FileBasedSinkTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/FileBasedSinkTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/FileBasedSourceTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/FileBasedSourceTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/FileBasedSourceTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/FileBasedSourceTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/OffsetBasedSourceTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/OffsetBasedSourceTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/OffsetBasedSourceTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/OffsetBasedSourceTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/PubsubIOTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/PubsubIOTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/PubsubIOTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/PubsubIOTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/ReadTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/ReadTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/ReadTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/ReadTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/TextIOTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/TextIOTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/TextIOTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/TextIOTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/WriteTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/WriteTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/WriteTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/WriteTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/XmlSinkTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/XmlSinkTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/XmlSinkTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/XmlSinkTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/XmlSourceTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/XmlSourceTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/XmlSourceTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/XmlSourceTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableIOTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableIOTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableIOTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/bigtable/BigtableIOTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRangeEstimateFractionTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRangeEstimateFractionTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRangeEstimateFractionTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRangeEstimateFractionTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRangeInterpolateKeyTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRangeInterpolateKeyTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRangeInterpolateKeyTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRangeInterpolateKeyTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRangeTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRangeTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRangeTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRangeTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRangeTrackerTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRangeTrackerTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRangeTrackerTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyRangeTrackerTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/range/ByteKeyTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/range/OffsetRangeTrackerTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/range/OffsetRangeTrackerTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/range/OffsetRangeTrackerTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/range/OffsetRangeTrackerTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/io/user.avsc b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/user.avsc
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/io/user.avsc
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/user.avsc
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptionsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptionsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptionsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptionsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineOptionsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineOptionsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineOptionsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineOptionsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/options/DataflowProfilingOptionsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/DataflowProfilingOptionsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/options/DataflowProfilingOptionsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/DataflowProfilingOptionsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/options/DataflowWorkerLoggingOptionsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/DataflowWorkerLoggingOptionsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/options/DataflowWorkerLoggingOptionsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/DataflowWorkerLoggingOptionsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/options/GcpOptionsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/GcpOptionsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/options/GcpOptionsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/GcpOptionsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/options/GoogleApiDebugOptionsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/GoogleApiDebugOptionsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/options/GoogleApiDebugOptionsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/GoogleApiDebugOptionsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactoryTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactoryTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactoryTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactoryTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsValidatorTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsValidatorTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsValidatorTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsValidatorTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/options/ProxyInvocationHandlerTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/ProxyInvocationHandlerTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/options/ProxyInvocationHandlerTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/ProxyInvocationHandlerTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/AggregatorPipelineExtractorTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/AggregatorPipelineExtractorTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/AggregatorPipelineExtractorTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/AggregatorPipelineExtractorTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/BlockingDataflowPipelineRunnerTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/BlockingDataflowPipelineRunnerTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/BlockingDataflowPipelineRunnerTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/BlockingDataflowPipelineRunnerTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineJobTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineJobTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineJobTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineJobTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRegistrarTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRegistrarTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRegistrarTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRegistrarTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunnerTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunnerTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunnerTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunnerTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineTranslatorTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineTranslatorTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineTranslatorTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineTranslatorTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRegistrarTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRegistrarTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRegistrarTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRegistrarTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRunnerTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRunnerTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRunnerTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRunnerTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/PipelineRunnerTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/PipelineRunnerTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/PipelineRunnerTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/PipelineRunnerTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/TransformTreeTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/TransformTreeTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/TransformTreeTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/TransformTreeTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/dataflow/CustomSourcesTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/dataflow/CustomSourcesTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/dataflow/CustomSourcesTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/dataflow/CustomSourcesTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/dataflow/TestCountingSource.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/dataflow/TestCountingSource.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/dataflow/TestCountingSource.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/dataflow/TestCountingSource.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/BoundedReadEvaluatorFactoryTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/BoundedReadEvaluatorFactoryTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/BoundedReadEvaluatorFactoryTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/BoundedReadEvaluatorFactoryTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/ConsumerTrackingPipelineVisitorTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/ConsumerTrackingPipelineVisitorTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/ConsumerTrackingPipelineVisitorTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/ConsumerTrackingPipelineVisitorTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/FlattenEvaluatorFactoryTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/FlattenEvaluatorFactoryTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/FlattenEvaluatorFactoryTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/FlattenEvaluatorFactoryTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/ForwardingPTransformTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/ForwardingPTransformTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/ForwardingPTransformTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/ForwardingPTransformTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/GroupByKeyEvaluatorFactoryTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/GroupByKeyEvaluatorFactoryTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/GroupByKeyEvaluatorFactoryTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/GroupByKeyEvaluatorFactoryTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InMemoryWatermarkManagerTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InMemoryWatermarkManagerTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InMemoryWatermarkManagerTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InMemoryWatermarkManagerTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessBundleTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessBundleTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessBundleTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessBundleTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessCreateTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessCreateTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessCreateTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessCreateTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessEvaluationContextTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessEvaluationContextTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessEvaluationContextTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessEvaluationContextTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessPipelineRunnerTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessPipelineRunnerTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessPipelineRunnerTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessPipelineRunnerTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessSideInputContainerTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessSideInputContainerTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessSideInputContainerTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessSideInputContainerTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessTimerInternalsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessTimerInternalsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessTimerInternalsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/InProcessTimerInternalsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/KeyedPValueTrackingVisitorTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/KeyedPValueTrackingVisitorTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/KeyedPValueTrackingVisitorTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/KeyedPValueTrackingVisitorTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/MockClock.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/MockClock.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/MockClock.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/MockClock.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoMultiEvaluatorFactoryTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoMultiEvaluatorFactoryTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoMultiEvaluatorFactoryTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoMultiEvaluatorFactoryTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoSingleEvaluatorFactoryTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoSingleEvaluatorFactoryTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoSingleEvaluatorFactoryTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/ParDoSingleEvaluatorFactoryTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformExecutorServicesTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformExecutorServicesTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformExecutorServicesTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformExecutorServicesTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformExecutorTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformExecutorTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformExecutorTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/TransformExecutorTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/UnboundedReadEvaluatorFactoryTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/UnboundedReadEvaluatorFactoryTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/UnboundedReadEvaluatorFactoryTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/UnboundedReadEvaluatorFactoryTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/ViewEvaluatorFactoryTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/ViewEvaluatorFactoryTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/ViewEvaluatorFactoryTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/ViewEvaluatorFactoryTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/WatermarkCallbackExecutorTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/WatermarkCallbackExecutorTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/WatermarkCallbackExecutorTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/WatermarkCallbackExecutorTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/CoderPropertiesTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/CoderPropertiesTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/CoderPropertiesTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/CoderPropertiesTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/DataflowAssertTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/DataflowAssertTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/DataflowAssertTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/DataflowAssertTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/DataflowJUnitTestRunner.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/DataflowJUnitTestRunner.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/DataflowJUnitTestRunner.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/DataflowJUnitTestRunner.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/ExpectedLogs.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/ExpectedLogs.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/ExpectedLogs.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/ExpectedLogs.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/ExpectedLogsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/ExpectedLogsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/ExpectedLogsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/ExpectedLogsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/FastNanoClockAndSleeper.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/FastNanoClockAndSleeper.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/FastNanoClockAndSleeper.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/FastNanoClockAndSleeper.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/FastNanoClockAndSleeperTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/FastNanoClockAndSleeperTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/FastNanoClockAndSleeperTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/FastNanoClockAndSleeperTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/PCollectionViewTesting.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/PCollectionViewTesting.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/PCollectionViewTesting.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/PCollectionViewTesting.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/ResetDateTimeProvider.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/ResetDateTimeProvider.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/ResetDateTimeProvider.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/ResetDateTimeProvider.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/ResetDateTimeProviderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/ResetDateTimeProviderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/ResetDateTimeProviderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/ResetDateTimeProviderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/RestoreSystemProperties.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/RestoreSystemProperties.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/RestoreSystemProperties.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/RestoreSystemProperties.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/RestoreSystemPropertiesTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/RestoreSystemPropertiesTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/RestoreSystemPropertiesTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/RestoreSystemPropertiesTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/SerializableMatchersTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/SerializableMatchersTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/SerializableMatchersTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/SerializableMatchersTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/SystemNanoTimeSleeper.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/SystemNanoTimeSleeper.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/SystemNanoTimeSleeper.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/SystemNanoTimeSleeper.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/SystemNanoTimeSleeperTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/SystemNanoTimeSleeperTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/SystemNanoTimeSleeperTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/SystemNanoTimeSleeperTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/TestDataflowPipelineRunnerTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/TestDataflowPipelineRunnerTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/TestDataflowPipelineRunnerTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/TestDataflowPipelineRunnerTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/TestPipelineTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/TestPipelineTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/testing/TestPipelineTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/TestPipelineTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/ApproximateQuantilesTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/ApproximateQuantilesTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/ApproximateQuantilesTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/ApproximateQuantilesTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/ApproximateUniqueTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/ApproximateUniqueTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/ApproximateUniqueTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/ApproximateUniqueTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/CombineFnsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/CombineFnsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/CombineFnsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/CombineFnsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/CombineTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/CombineTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/CombineTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/CombineTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/CountTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/CountTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/CountTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/CountTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/CreateTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/CreateTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/CreateTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/CreateTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnContextTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnContextTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnContextTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnContextTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnDelegatingAggregatorTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnDelegatingAggregatorTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnDelegatingAggregatorTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnDelegatingAggregatorTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnReflectorTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnReflectorTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnReflectorTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnReflectorTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnTesterTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnTesterTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnTesterTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnTesterTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContextTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContextTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContextTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContextTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/FilterTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/FilterTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/FilterTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/FilterTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/FlatMapElementsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/FlatMapElementsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/FlatMapElementsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/FlatMapElementsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/FlattenTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/FlattenTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/FlattenTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/FlattenTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/GroupByKeyTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/GroupByKeyTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/GroupByKeyTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/GroupByKeyTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/IntraBundleParallelizationTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/IntraBundleParallelizationTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/IntraBundleParallelizationTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/IntraBundleParallelizationTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/KeysTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/KeysTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/KeysTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/KeysTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/KvSwapTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/KvSwapTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/KvSwapTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/KvSwapTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/MapElementsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/MapElementsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/MapElementsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/MapElementsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/MaxTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/MaxTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/MaxTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/MaxTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/MeanTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/MeanTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/MeanTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/MeanTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/MinTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/MinTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/MinTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/MinTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/NoOpDoFn.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/NoOpDoFn.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/NoOpDoFn.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/NoOpDoFn.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/PTransformTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/PTransformTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/PTransformTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/PTransformTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/ParDoTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/ParDoTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/ParDoTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/ParDoTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/PartitionTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/PartitionTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/PartitionTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/PartitionTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/SampleTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/SampleTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/SampleTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/SampleTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/SimpleStatsFnsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/SimpleStatsFnsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/SimpleStatsFnsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/SimpleStatsFnsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/SumTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/SumTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/SumTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/SumTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/TopTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/TopTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/TopTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/TopTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/ValuesTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/ValuesTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/ValuesTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/ValuesTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/ViewTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/ViewTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/ViewTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/ViewTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithKeysTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithKeysTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithKeysTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithKeysTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/display/DisplayDataMatchers.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/display/DisplayDataMatchers.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/display/DisplayDataMatchers.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/display/DisplayDataMatchers.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/display/DisplayDataMatchersTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/display/DisplayDataMatchersTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/display/DisplayDataMatchersTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/display/DisplayDataMatchersTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/display/DisplayDataTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/display/DisplayDataTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/display/DisplayDataTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/display/DisplayDataTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/join/CoGbkResultCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/join/CoGbkResultCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/join/CoGbkResultCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/join/CoGbkResultCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/join/CoGbkResultTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/join/CoGbkResultTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/join/CoGbkResultTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/join/CoGbkResultTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/join/CoGroupByKeyTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/join/CoGroupByKeyTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/join/CoGroupByKeyTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/join/CoGroupByKeyTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/join/UnionCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/join/UnionCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/join/UnionCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/join/UnionCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterAllTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterAllTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterAllTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterAllTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterEachTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterEachTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterEachTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterEachTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterFirstTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterFirstTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterFirstTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterFirstTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterPaneTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterPaneTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterPaneTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterPaneTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterProcessingTimeTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterProcessingTimeTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterProcessingTimeTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterProcessingTimeTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterSynchronizedProcessingTimeTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterSynchronizedProcessingTimeTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterSynchronizedProcessingTimeTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterSynchronizedProcessingTimeTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterWatermarkTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterWatermarkTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterWatermarkTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/AfterWatermarkTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/CalendarWindowsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/CalendarWindowsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/CalendarWindowsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/CalendarWindowsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/DefaultTriggerTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/DefaultTriggerTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/DefaultTriggerTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/DefaultTriggerTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/FixedWindowsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/FixedWindowsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/FixedWindowsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/FixedWindowsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/IntervalWindowTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/IntervalWindowTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/IntervalWindowTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/IntervalWindowTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/OrFinallyTriggerTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/OrFinallyTriggerTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/OrFinallyTriggerTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/OrFinallyTriggerTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/PaneInfoTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/PaneInfoTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/PaneInfoTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/PaneInfoTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/RepeatedlyTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/RepeatedlyTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/RepeatedlyTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/RepeatedlyTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/SessionsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/SessionsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/SessionsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/SessionsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/SlidingWindowsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/SlidingWindowsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/SlidingWindowsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/SlidingWindowsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/TriggerTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/TriggerTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/TriggerTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/TriggerTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowingTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowingTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowingTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/transforms/windowing/WindowingTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/ApiSurfaceTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ApiSurfaceTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/ApiSurfaceTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ApiSurfaceTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/AttemptAndTimeBoundedExponentialBackOffTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/AttemptAndTimeBoundedExponentialBackOffTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/AttemptAndTimeBoundedExponentialBackOffTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/AttemptAndTimeBoundedExponentialBackOffTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/AttemptBoundedExponentialBackOffTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/AttemptBoundedExponentialBackOffTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/AttemptBoundedExponentialBackOffTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/AttemptBoundedExponentialBackOffTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/AvroUtilsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/AvroUtilsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/AvroUtilsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/AvroUtilsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/BatchTimerInternalsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/BatchTimerInternalsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/BatchTimerInternalsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/BatchTimerInternalsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/BigQueryTableInserterTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/BigQueryTableInserterTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/BigQueryTableInserterTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/BigQueryTableInserterTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/BigQueryTableRowIteratorTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/BigQueryTableRowIteratorTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/BigQueryTableRowIteratorTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/BigQueryTableRowIteratorTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/BigQueryUtilTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/BigQueryUtilTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/BigQueryUtilTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/BigQueryUtilTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/BufferedElementCountingOutputStreamTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/BufferedElementCountingOutputStreamTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/BufferedElementCountingOutputStreamTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/BufferedElementCountingOutputStreamTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/CoderUtilsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/CoderUtilsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/CoderUtilsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/CoderUtilsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/CombineFnUtilTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/CombineFnUtilTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/CombineFnUtilTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/CombineFnUtilTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/CounterAggregatorTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/CounterAggregatorTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/CounterAggregatorTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/CounterAggregatorTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/DataflowPathValidatorTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/DataflowPathValidatorTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/DataflowPathValidatorTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/DataflowPathValidatorTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/ExecutableTriggerTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ExecutableTriggerTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/ExecutableTriggerTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ExecutableTriggerTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/ExposedByteArrayInputStreamTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ExposedByteArrayInputStreamTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/ExposedByteArrayInputStreamTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ExposedByteArrayInputStreamTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/ExposedByteArrayOutputStreamTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ExposedByteArrayOutputStreamTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/ExposedByteArrayOutputStreamTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ExposedByteArrayOutputStreamTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/FileIOChannelFactoryTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/FileIOChannelFactoryTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/FileIOChannelFactoryTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/FileIOChannelFactoryTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/FinishedTriggersBitSetTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/FinishedTriggersBitSetTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/FinishedTriggersBitSetTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/FinishedTriggersBitSetTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/FinishedTriggersProperties.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/FinishedTriggersProperties.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/FinishedTriggersProperties.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/FinishedTriggersProperties.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/FinishedTriggersSetTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/FinishedTriggersSetTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/FinishedTriggersSetTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/FinishedTriggersSetTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/GcsIOChannelFactoryTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/GcsIOChannelFactoryTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/GcsIOChannelFactoryTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/GcsIOChannelFactoryTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/GcsUtilTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/GcsUtilTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/GcsUtilTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/GcsUtilTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowsProperties.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowsProperties.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowsProperties.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowsProperties.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowsViaOutputBufferDoFnTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowsViaOutputBufferDoFnTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowsViaOutputBufferDoFnTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/GroupAlsoByWindowsViaOutputBufferDoFnTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/IOChannelUtilsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/IOChannelUtilsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/IOChannelUtilsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/IOChannelUtilsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/InstanceBuilderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/InstanceBuilderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/InstanceBuilderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/InstanceBuilderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/IntervalBoundedExponentialBackOffTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/IntervalBoundedExponentialBackOffTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/IntervalBoundedExponentialBackOffTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/IntervalBoundedExponentialBackOffTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/KeyedWorkItemCoderTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/KeyedWorkItemCoderTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/KeyedWorkItemCoderTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/KeyedWorkItemCoderTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/LateDataDroppingDoFnRunnerTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/LateDataDroppingDoFnRunnerTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/LateDataDroppingDoFnRunnerTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/LateDataDroppingDoFnRunnerTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/MergingActiveWindowSetTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/MergingActiveWindowSetTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/MergingActiveWindowSetTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/MergingActiveWindowSetTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/MonitoringUtilTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/MonitoringUtilTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/MonitoringUtilTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/MonitoringUtilTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/MutationDetectorsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/MutationDetectorsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/MutationDetectorsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/MutationDetectorsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/PTupleTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/PTupleTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/PTupleTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/PTupleTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/PackageUtilTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/PackageUtilTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/PackageUtilTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/PackageUtilTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/RandomAccessDataTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/RandomAccessDataTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/RandomAccessDataTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/RandomAccessDataTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/ReduceFnRunnerTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ReduceFnRunnerTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/ReduceFnRunnerTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ReduceFnRunnerTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/ReduceFnTester.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ReduceFnTester.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/ReduceFnTester.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ReduceFnTester.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/ReshuffleTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ReshuffleTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/ReshuffleTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ReshuffleTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/ReshuffleTriggerTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ReshuffleTriggerTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/ReshuffleTriggerTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ReshuffleTriggerTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/RetryHttpRequestInitializerTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/RetryHttpRequestInitializerTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/RetryHttpRequestInitializerTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/RetryHttpRequestInitializerTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/SerializableUtilsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/SerializableUtilsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/SerializableUtilsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/SerializableUtilsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/SerializerTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/SerializerTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/SerializerTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/SerializerTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/SimpleDoFnRunnerTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/SimpleDoFnRunnerTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/SimpleDoFnRunnerTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/SimpleDoFnRunnerTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/StreamUtilsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/StreamUtilsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/StreamUtilsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/StreamUtilsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/StringUtilsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/StringUtilsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/StringUtilsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/StringUtilsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/StructsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/StructsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/StructsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/StructsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/TimeUtilTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/TimeUtilTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/TimeUtilTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/TimeUtilTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/TimerInternalsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/TimerInternalsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/TimerInternalsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/TimerInternalsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/TriggerTester.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/TriggerTester.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/TriggerTester.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/TriggerTester.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/UnownedInputStreamTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/UnownedInputStreamTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/UnownedInputStreamTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/UnownedInputStreamTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/UnownedOutputStreamTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/UnownedOutputStreamTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/UnownedOutputStreamTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/UnownedOutputStreamTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/UploadIdResponseInterceptorTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/UploadIdResponseInterceptorTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/UploadIdResponseInterceptorTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/UploadIdResponseInterceptorTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/UserCodeExceptionTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/UserCodeExceptionTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/UserCodeExceptionTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/UserCodeExceptionTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/VarIntTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/VarIntTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/VarIntTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/VarIntTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/WindowedValueTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/WindowedValueTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/WindowedValueTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/WindowedValueTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/ZipFilesTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ZipFilesTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/ZipFilesTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/ZipFilesTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/common/CounterSetTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/common/CounterSetTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/common/CounterSetTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/common/CounterSetTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/common/CounterTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/common/CounterTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/common/CounterTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/common/CounterTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/common/CounterTestUtils.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/common/CounterTestUtils.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/common/CounterTestUtils.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/common/CounterTestUtils.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/common/ReflectHelpersTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/common/ReflectHelpersTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/common/ReflectHelpersTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/common/ReflectHelpersTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/gcsfs/GcsPathTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/gcsfs/GcsPathTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/gcsfs/GcsPathTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/gcsfs/GcsPathTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/state/CopyOnAccessInMemoryStateInternalsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/state/CopyOnAccessInMemoryStateInternalsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/state/CopyOnAccessInMemoryStateInternalsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/state/CopyOnAccessInMemoryStateInternalsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/state/InMemoryStateInternalsTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/state/InMemoryStateInternalsTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/state/InMemoryStateInternalsTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/state/InMemoryStateInternalsTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/state/StateNamespacesTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/state/StateNamespacesTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/state/StateNamespacesTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/state/StateNamespacesTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/state/StateTagTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/state/StateTagTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/util/state/StateTagTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/util/state/StateTagTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/values/KVTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/values/KVTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/values/KVTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/values/KVTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/values/PCollectionListTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/values/PCollectionListTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/values/PCollectionListTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/values/PCollectionListTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/values/PCollectionTupleTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/values/PCollectionTupleTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/values/PCollectionTupleTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/values/PCollectionTupleTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/values/PDoneTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/values/PDoneTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/values/PDoneTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/values/PDoneTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/values/TupleTagTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/values/TupleTagTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/values/TupleTagTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/values/TupleTagTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/values/TypeDescriptorTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/values/TypeDescriptorTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/values/TypeDescriptorTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/values/TypeDescriptorTest.java
diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/values/TypedPValueTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/values/TypedPValueTest.java
similarity index 100%
rename from sdk/src/test/java/com/google/cloud/dataflow/sdk/values/TypedPValueTest.java
rename to sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/values/TypedPValueTest.java
diff --git a/sdk/src/test/java8/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactoryJava8Test.java b/sdks/java/core/src/test/java8/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactoryJava8Test.java
similarity index 100%
rename from sdk/src/test/java8/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactoryJava8Test.java
rename to sdks/java/core/src/test/java8/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactoryJava8Test.java
diff --git a/java8tests/pom.xml b/sdks/java/java8tests/pom.xml
similarity index 74%
rename from java8tests/pom.xml
rename to sdks/java/java8tests/pom.xml
index de44ed49b7b7..bb8d6292d43b 100644
--- a/java8tests/pom.xml
+++ b/sdks/java/java8tests/pom.xml
@@ -1,38 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Copyright (C) 2015 Google Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  ~ use this file except in compliance with the License. You may obtain a copy of
-  ~ the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  ~ License for the specific language governing permissions and limitations under
-  ~ the License.
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.google.cloud.dataflow</groupId>
-    <artifactId>google-cloud-dataflow-java-sdk-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <groupId>org.apache.beam</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.1.0-incubating-SNAPSHOT</version>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 
-  <groupId>com.google.cloud.dataflow</groupId>
-  <artifactId>google-cloud-dataflow-java-java8tests-all</artifactId>
-  <name>Google Cloud Dataflow Java 8 Tests - All</name>
-  <description>Google Cloud Dataflow Java SDK provides a simple, Java-based
-    interface for processing virtually any size data using Google cloud
-    resources. This artifact includes tests of the SDK from a Java 8
+  <artifactId>java8tests-all</artifactId>
+  <name>Apache Beam :: Tests :: Java 8 All</name>
+  <description>Apache Beam Java SDK provides a simple, Java-based
+    interface for processing virtually any size data.
+    This artifact includes tests of the SDK from a Java 8
     user.</description>
-  <url>http://cloud.google.com/dataflow</url>
 
   <packaging>jar</packaging>
 
@@ -82,7 +83,7 @@
           </dependency>
         </dependencies>
         <configuration>
-          <configLocation>../checkstyle.xml</configLocation>
+          <configLocation>../../../checkstyle.xml</configLocation>
           <consoleOutput>true</consoleOutput>
           <failOnViolation>true</failOnViolation>
           <includeTestSourceDirectory>true</includeTestSourceDirectory>
@@ -149,8 +150,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.google.cloud.dataflow</groupId>
-      <artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
+      <groupId>org.apache.beam</groupId>
+      <artifactId>java-sdk-all</artifactId>
       <version>${project.version}</version>
     </dependency>
 
diff --git a/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/CombineJava8Test.java b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/CombineJava8Test.java
similarity index 100%
rename from java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/CombineJava8Test.java
rename to sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/CombineJava8Test.java
diff --git a/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FilterJava8Test.java b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FilterJava8Test.java
similarity index 100%
rename from java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FilterJava8Test.java
rename to sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FilterJava8Test.java
diff --git a/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FlatMapElementsJava8Test.java b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FlatMapElementsJava8Test.java
similarity index 100%
rename from java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FlatMapElementsJava8Test.java
rename to sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/FlatMapElementsJava8Test.java
diff --git a/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/MapElementsJava8Test.java b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/MapElementsJava8Test.java
similarity index 100%
rename from java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/MapElementsJava8Test.java
rename to sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/MapElementsJava8Test.java
diff --git a/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/PartitionJava8Test.java b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/PartitionJava8Test.java
similarity index 100%
rename from java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/PartitionJava8Test.java
rename to sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/PartitionJava8Test.java
diff --git a/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesJava8Test.java b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesJava8Test.java
similarity index 100%
rename from java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesJava8Test.java
rename to sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/RemoveDuplicatesJava8Test.java
diff --git a/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithKeysJava8Test.java b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithKeysJava8Test.java
similarity index 100%
rename from java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithKeysJava8Test.java
rename to sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithKeysJava8Test.java
diff --git a/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsJava8Test.java b/sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsJava8Test.java
similarity index 100%
rename from java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsJava8Test.java
rename to sdks/java/java8tests/src/test/java/com/google/cloud/dataflow/sdk/transforms/WithTimestampsJava8Test.java
diff --git a/javadoc/README.md b/sdks/java/javadoc/README.md
similarity index 100%
rename from javadoc/README.md
rename to sdks/java/javadoc/README.md
diff --git a/javadoc/apiclient-docs/package-list b/sdks/java/javadoc/apiclient-docs/package-list
similarity index 100%
rename from javadoc/apiclient-docs/package-list
rename to sdks/java/javadoc/apiclient-docs/package-list
diff --git a/javadoc/avro-docs/package-list b/sdks/java/javadoc/avro-docs/package-list
similarity index 100%
rename from javadoc/avro-docs/package-list
rename to sdks/java/javadoc/avro-docs/package-list
diff --git a/javadoc/bq-docs/package-list b/sdks/java/javadoc/bq-docs/package-list
similarity index 100%
rename from javadoc/bq-docs/package-list
rename to sdks/java/javadoc/bq-docs/package-list
diff --git a/javadoc/dataflow-sdk-docs/package-list b/sdks/java/javadoc/dataflow-sdk-docs/package-list
similarity index 100%
rename from javadoc/dataflow-sdk-docs/package-list
rename to sdks/java/javadoc/dataflow-sdk-docs/package-list
diff --git a/javadoc/datastore-docs/package-list b/sdks/java/javadoc/datastore-docs/package-list
similarity index 100%
rename from javadoc/datastore-docs/package-list
rename to sdks/java/javadoc/datastore-docs/package-list
diff --git a/javadoc/guava-docs/package-list b/sdks/java/javadoc/guava-docs/package-list
similarity index 100%
rename from javadoc/guava-docs/package-list
rename to sdks/java/javadoc/guava-docs/package-list
diff --git a/javadoc/hamcrest-docs/package-list b/sdks/java/javadoc/hamcrest-docs/package-list
similarity index 100%
rename from javadoc/hamcrest-docs/package-list
rename to sdks/java/javadoc/hamcrest-docs/package-list
diff --git a/javadoc/jackson-annotations-docs/package-list b/sdks/java/javadoc/jackson-annotations-docs/package-list
similarity index 100%
rename from javadoc/jackson-annotations-docs/package-list
rename to sdks/java/javadoc/jackson-annotations-docs/package-list
diff --git a/javadoc/jackson-databind-docs/package-list b/sdks/java/javadoc/jackson-databind-docs/package-list
similarity index 100%
rename from javadoc/jackson-databind-docs/package-list
rename to sdks/java/javadoc/jackson-databind-docs/package-list
diff --git a/javadoc/joda-docs/package-list b/sdks/java/javadoc/joda-docs/package-list
similarity index 100%
rename from javadoc/joda-docs/package-list
rename to sdks/java/javadoc/joda-docs/package-list
diff --git a/javadoc/junit-docs/package-list b/sdks/java/javadoc/junit-docs/package-list
similarity index 100%
rename from javadoc/junit-docs/package-list
rename to sdks/java/javadoc/junit-docs/package-list
diff --git a/javadoc/oauth-docs/package-list b/sdks/java/javadoc/oauth-docs/package-list
similarity index 100%
rename from javadoc/oauth-docs/package-list
rename to sdks/java/javadoc/oauth-docs/package-list
diff --git a/javadoc/overview.html b/sdks/java/javadoc/overview.html
similarity index 100%
rename from javadoc/overview.html
rename to sdks/java/javadoc/overview.html
diff --git a/sdks/java/maven-archetypes/examples/pom.xml b/sdks/java/maven-archetypes/examples/pom.xml
new file mode 100644
index 000000000000..7e74b9de6c62
--- /dev/null
+++ b/sdks/java/maven-archetypes/examples/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.beam</groupId>
+    <artifactId>maven-archetypes-parent</artifactId>
+    <version>0.1.0-incubating-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>maven-archetypes-examples</artifactId>
+  <name>Apache Beam :: Maven Archetypes :: Examples</name>
+  <description>A Maven Archetype to create a project containing all the
+    example pipelines from the Apache Beam Java SDK.</description>
+
+  <packaging>maven-archetype</packaging>
+
+  <build>
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.archetype</groupId>
+        <artifactId>archetype-packaging</artifactId>
+        <version>2.4</version>
+      </extension>
+    </extensions>
+
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-archetype-plugin</artifactId>
+          <version>2.4</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>
diff --git a/maven-archetypes/examples/src/main/resources/META-INF/maven/archetype-metadata.xml b/sdks/java/maven-archetypes/examples/src/main/resources/META-INF/maven/archetype-metadata.xml
similarity index 100%
rename from maven-archetypes/examples/src/main/resources/META-INF/maven/archetype-metadata.xml
rename to sdks/java/maven-archetypes/examples/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
similarity index 97%
rename from maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
rename to sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
index bffa376f5666..d19d0c61251f 100644
--- a/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
+++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
@@ -92,9 +92,9 @@
   <dependencies>
     <!-- Adds a dependency on a specific version of the Dataflow SDK. -->
     <dependency>
-      <groupId>com.google.cloud.dataflow</groupId>
-      <artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
-      <version>[1.0.0, 2.0.0)</version>
+      <groupId>org.apache.beam</groupId>
+      <artifactId>java-sdk-all</artifactId>
+      <version>[0-incubating, 2-incubating)</version>
     </dependency>
 
     <dependency>
diff --git a/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/DebuggingWordCount.java b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/DebuggingWordCount.java
similarity index 100%
rename from maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/DebuggingWordCount.java
rename to sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/DebuggingWordCount.java
diff --git a/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/MinimalWordCount.java b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/MinimalWordCount.java
similarity index 100%
rename from maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/MinimalWordCount.java
rename to sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/MinimalWordCount.java
diff --git a/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/WindowedWordCount.java b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/WindowedWordCount.java
similarity index 100%
rename from maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/WindowedWordCount.java
rename to sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/WindowedWordCount.java
diff --git a/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/WordCount.java b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/WordCount.java
similarity index 100%
rename from maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/WordCount.java
rename to sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/WordCount.java
diff --git a/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/DataflowExampleOptions.java b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/DataflowExampleOptions.java
similarity index 100%
rename from maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/DataflowExampleOptions.java
rename to sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/DataflowExampleOptions.java
diff --git a/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/DataflowExampleUtils.java b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/DataflowExampleUtils.java
similarity index 100%
rename from maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/DataflowExampleUtils.java
rename to sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/DataflowExampleUtils.java
diff --git a/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/ExampleBigQueryTableOptions.java b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/ExampleBigQueryTableOptions.java
similarity index 100%
rename from maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/ExampleBigQueryTableOptions.java
rename to sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/ExampleBigQueryTableOptions.java
diff --git a/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/ExamplePubsubTopicOptions.java b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/ExamplePubsubTopicOptions.java
similarity index 100%
rename from maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/ExamplePubsubTopicOptions.java
rename to sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/ExamplePubsubTopicOptions.java
diff --git a/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/PubsubFileInjector.java b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/PubsubFileInjector.java
similarity index 100%
rename from maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/PubsubFileInjector.java
rename to sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/PubsubFileInjector.java
diff --git a/maven-archetypes/examples/src/main/resources/archetype-resources/src/test/java/DebuggingWordCountTest.java b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/test/java/DebuggingWordCountTest.java
similarity index 100%
rename from maven-archetypes/examples/src/main/resources/archetype-resources/src/test/java/DebuggingWordCountTest.java
rename to sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/test/java/DebuggingWordCountTest.java
diff --git a/maven-archetypes/examples/src/main/resources/archetype-resources/src/test/java/WordCountTest.java b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/test/java/WordCountTest.java
similarity index 100%
rename from maven-archetypes/examples/src/main/resources/archetype-resources/src/test/java/WordCountTest.java
rename to sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/test/java/WordCountTest.java
diff --git a/maven-archetypes/examples/src/test/resources/projects/basic/archetype.properties b/sdks/java/maven-archetypes/examples/src/test/resources/projects/basic/archetype.properties
similarity index 100%
rename from maven-archetypes/examples/src/test/resources/projects/basic/archetype.properties
rename to sdks/java/maven-archetypes/examples/src/test/resources/projects/basic/archetype.properties
diff --git a/maven-archetypes/examples/src/test/resources/projects/basic/goal.txt b/sdks/java/maven-archetypes/examples/src/test/resources/projects/basic/goal.txt
similarity index 100%
rename from maven-archetypes/examples/src/test/resources/projects/basic/goal.txt
rename to sdks/java/maven-archetypes/examples/src/test/resources/projects/basic/goal.txt
diff --git a/sdks/java/maven-archetypes/pom.xml b/sdks/java/maven-archetypes/pom.xml
new file mode 100644
index 000000000000..59efe501e8ff
--- /dev/null
+++ b/sdks/java/maven-archetypes/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.beam</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.1.0-incubating-SNAPSHOT</version>
+    <relativePath>../../../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>maven-archetypes-parent</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Apache Beam :: Maven Archetypes</name>
+
+  <modules>
+    <module>starter</module>
+    <module>examples</module>
+  </modules>
+
+</project>
diff --git a/sdks/java/maven-archetypes/starter/pom.xml b/sdks/java/maven-archetypes/starter/pom.xml
new file mode 100644
index 000000000000..933e8b1a16b7
--- /dev/null
+++ b/sdks/java/maven-archetypes/starter/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.beam</groupId>
+    <artifactId>maven-archetypes-parent</artifactId>
+    <version>0.1.0-incubating-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <groupId>org.apache.beam</groupId>
+  <artifactId>maven-archetypes-starter</artifactId>
+  <name>Apache Beam :: Maven Archetypes :: Starter</name>
+  <description>A Maven archetype to create a simple starter pipeline to
+    get started using the Apache Beam Java SDK. </description>
+
+  <packaging>maven-archetype</packaging>
+
+  <build>
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.archetype</groupId>
+        <artifactId>archetype-packaging</artifactId>
+        <version>2.4</version>
+      </extension>
+    </extensions>
+
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-archetype-plugin</artifactId>
+          <version>2.4</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>
diff --git a/maven-archetypes/starter/src/main/resources/META-INF/maven/archetype-metadata.xml b/sdks/java/maven-archetypes/starter/src/main/resources/META-INF/maven/archetype-metadata.xml
similarity index 100%
rename from maven-archetypes/starter/src/main/resources/META-INF/maven/archetype-metadata.xml
rename to sdks/java/maven-archetypes/starter/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml
similarity index 87%
rename from maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml
rename to sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml
index bb679a00b4dc..19e7d2d0f6e2 100644
--- a/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml
+++ b/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml
@@ -23,9 +23,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.google.cloud.dataflow</groupId>
-      <artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
-      <version>[1.0.0, 2.0.0)</version>
+      <groupId>org.apache.beam</groupId>
+      <artifactId>java-sdk-all</artifactId>
+      <version>[0-incubating, 1-incubating)</version>
     </dependency>
 
     <!-- slf4j API frontend binding with JUL backend -->
diff --git a/maven-archetypes/starter/src/main/resources/archetype-resources/src/main/java/StarterPipeline.java b/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/src/main/java/StarterPipeline.java
similarity index 100%
rename from maven-archetypes/starter/src/main/resources/archetype-resources/src/main/java/StarterPipeline.java
rename to sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/src/main/java/StarterPipeline.java
diff --git a/maven-archetypes/starter/src/test/resources/projects/basic/archetype.properties b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/archetype.properties
similarity index 100%
rename from maven-archetypes/starter/src/test/resources/projects/basic/archetype.properties
rename to sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/archetype.properties
diff --git a/maven-archetypes/starter/src/test/resources/projects/basic/goal.txt b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/goal.txt
similarity index 100%
rename from maven-archetypes/starter/src/test/resources/projects/basic/goal.txt
rename to sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/goal.txt
diff --git a/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
similarity index 87%
rename from maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
rename to sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
index d8c563d07fe4..d29424afbf31 100644
--- a/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
+++ b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
@@ -23,9 +23,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.google.cloud.dataflow</groupId>
-      <artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
-      <version>[1.0.0, 2.0.0)</version>
+      <groupId>org.apache.beam</groupId>
+      <artifactId>java-sdk-all</artifactId>
+      <version>[0-incubating, 1-incubating)</version>
     </dependency>
 
     <!-- slf4j API frontend binding with JUL backend -->
diff --git a/maven-archetypes/starter/src/test/resources/projects/basic/reference/src/main/java/it/pkg/StarterPipeline.java b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/src/main/java/it/pkg/StarterPipeline.java
similarity index 100%
rename from maven-archetypes/starter/src/test/resources/projects/basic/reference/src/main/java/it/pkg/StarterPipeline.java
rename to sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/src/main/java/it/pkg/StarterPipeline.java
diff --git a/travis/test_wordcount.sh b/travis/test_wordcount.sh
index fdb9d10a85e6..fdd878d66fab 100755
--- a/travis/test_wordcount.sh
+++ b/travis/test_wordcount.sh
@@ -19,7 +19,7 @@ set -o pipefail
 
 PASS=1
 VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\[')
-JAR_FILE=examples/target/google-cloud-dataflow-java-examples-all-bundled-${VERSION}.jar
+JAR_FILE=examples/java/target/java-examples-all-bundled-${VERSION}.jar
 
 function check_result_hash {
   local name=$1
@@ -52,7 +52,7 @@ function run_via_mvn {
   local expected_hash=$3
 
   local outfile_prefix="$(get_outfile_prefix "$name")" || exit 2
-  local cmd='mvn exec:java -f pom.xml -pl examples \
+  local cmd='mvn exec:java -f pom.xml -pl examples/java \
     -Dexec.mainClass=com.google.cloud.dataflow.examples.WordCount \
     -Dexec.args="--runner=DirectPipelineRunner --inputFile='"$input"' --output='"$outfile_prefix"'"'
   echo "$name: Running $cmd" >&2