diff --git a/examples/dataflow-custom-templates/.gitignore b/examples/dataflow-examples/dataflow-custom-templates/.gitignore
similarity index 100%
rename from examples/dataflow-custom-templates/.gitignore
rename to examples/dataflow-examples/dataflow-custom-templates/.gitignore
diff --git a/examples/dataflow-custom-templates/README.md b/examples/dataflow-examples/dataflow-custom-templates/README.md
similarity index 100%
rename from examples/dataflow-custom-templates/README.md
rename to examples/dataflow-examples/dataflow-custom-templates/README.md
diff --git a/examples/dataflow-custom-templates/cloud_shell_tutorial.md b/examples/dataflow-examples/dataflow-custom-templates/cloud_shell_tutorial.md
similarity index 100%
rename from examples/dataflow-custom-templates/cloud_shell_tutorial.md
rename to examples/dataflow-examples/dataflow-custom-templates/cloud_shell_tutorial.md
diff --git a/examples/dataflow-custom-templates/go/Dockerfile b/examples/dataflow-examples/dataflow-custom-templates/go/Dockerfile
similarity index 100%
rename from examples/dataflow-custom-templates/go/Dockerfile
rename to examples/dataflow-examples/dataflow-custom-templates/go/Dockerfile
diff --git a/examples/dataflow-custom-templates/go/README.md b/examples/dataflow-examples/dataflow-custom-templates/go/README.md
similarity index 100%
rename from examples/dataflow-custom-templates/go/README.md
rename to examples/dataflow-examples/dataflow-custom-templates/go/README.md
diff --git a/examples/dataflow-custom-templates/go/cmd/wordcount.go b/examples/dataflow-examples/dataflow-custom-templates/go/cmd/wordcount.go
similarity index 100%
rename from examples/dataflow-custom-templates/go/cmd/wordcount.go
rename to examples/dataflow-examples/dataflow-custom-templates/go/cmd/wordcount.go
diff --git a/examples/dataflow-custom-templates/go/go.mod b/examples/dataflow-examples/dataflow-custom-templates/go/go.mod
similarity index 100%
rename from examples/dataflow-custom-templates/go/go.mod
rename to examples/dataflow-examples/dataflow-custom-templates/go/go.mod
diff --git a/examples/dataflow-custom-templates/go/go.sum b/examples/dataflow-examples/dataflow-custom-templates/go/go.sum
similarity index 100%
rename from examples/dataflow-custom-templates/go/go.sum
rename to examples/dataflow-examples/dataflow-custom-templates/go/go.sum
diff --git a/examples/dataflow-custom-templates/go/internal/wordcount/display.go b/examples/dataflow-examples/dataflow-custom-templates/go/internal/wordcount/display.go
similarity index 100%
rename from examples/dataflow-custom-templates/go/internal/wordcount/display.go
rename to examples/dataflow-examples/dataflow-custom-templates/go/internal/wordcount/display.go
diff --git a/examples/dataflow-custom-templates/go/internal/wordcount/filters.go b/examples/dataflow-examples/dataflow-custom-templates/go/internal/wordcount/filters.go
similarity index 100%
rename from examples/dataflow-custom-templates/go/internal/wordcount/filters.go
rename to examples/dataflow-examples/dataflow-custom-templates/go/internal/wordcount/filters.go
diff --git a/examples/dataflow-custom-templates/go/internal/wordcount/strings.go b/examples/dataflow-examples/dataflow-custom-templates/go/internal/wordcount/strings.go
similarity index 100%
rename from examples/dataflow-custom-templates/go/internal/wordcount/strings.go
rename to examples/dataflow-examples/dataflow-custom-templates/go/internal/wordcount/strings.go
diff --git a/examples/dataflow-custom-templates/go/testdata/catsum.txt b/examples/dataflow-examples/dataflow-custom-templates/go/testdata/catsum.txt
similarity index 100%
rename from examples/dataflow-custom-templates/go/testdata/catsum.txt
rename to examples/dataflow-examples/dataflow-custom-templates/go/testdata/catsum.txt
diff --git a/examples/dataflow-custom-templates/infrastructure/01.setup/README.md b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/01.setup/README.md
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/01.setup/README.md
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/01.setup/README.md
diff --git a/examples/dataflow-custom-templates/infrastructure/01.setup/iam.tf b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/01.setup/iam.tf
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/01.setup/iam.tf
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/01.setup/iam.tf
diff --git a/examples/dataflow-custom-templates/infrastructure/01.setup/provider.tf b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/01.setup/provider.tf
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/01.setup/provider.tf
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/01.setup/provider.tf
diff --git a/examples/dataflow-custom-templates/infrastructure/01.setup/registry.tf b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/01.setup/registry.tf
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/01.setup/registry.tf
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/01.setup/registry.tf
diff --git a/examples/dataflow-custom-templates/infrastructure/01.setup/services.tf b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/01.setup/services.tf
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/01.setup/services.tf
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/01.setup/services.tf
diff --git a/examples/dataflow-custom-templates/infrastructure/01.setup/variables.tf b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/01.setup/variables.tf
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/01.setup/variables.tf
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/01.setup/variables.tf
diff --git a/examples/dataflow-custom-templates/infrastructure/02.network/README.md b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/02.network/README.md
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/02.network/README.md
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/02.network/README.md
diff --git a/examples/dataflow-custom-templates/infrastructure/02.network/nat.tf b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/02.network/nat.tf
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/02.network/nat.tf
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/02.network/nat.tf
diff --git a/examples/dataflow-custom-templates/infrastructure/02.network/network.tf b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/02.network/network.tf
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/02.network/network.tf
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/02.network/network.tf
diff --git a/examples/dataflow-custom-templates/infrastructure/02.network/provider.tf b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/02.network/provider.tf
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/02.network/provider.tf
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/02.network/provider.tf
diff --git a/examples/dataflow-custom-templates/infrastructure/02.network/variables.tf b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/02.network/variables.tf
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/02.network/variables.tf
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/02.network/variables.tf
diff --git a/examples/dataflow-custom-templates/infrastructure/03.io/README.md b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/03.io/README.md
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/03.io/README.md
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/03.io/README.md
diff --git a/examples/dataflow-custom-templates/infrastructure/03.io/provider.tf b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/03.io/provider.tf
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/03.io/provider.tf
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/03.io/provider.tf
diff --git a/examples/dataflow-custom-templates/infrastructure/03.io/storage.tf b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/03.io/storage.tf
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/03.io/storage.tf
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/03.io/storage.tf
diff --git a/examples/dataflow-custom-templates/infrastructure/03.io/variables.tf b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/03.io/variables.tf
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/03.io/variables.tf
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/03.io/variables.tf
diff --git a/examples/dataflow-custom-templates/infrastructure/04.template/README.md b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/04.template/README.md
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/04.template/README.md
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/04.template/README.md
diff --git a/examples/dataflow-custom-templates/infrastructure/04.template/build.tf b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/04.template/build.tf
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/04.template/build.tf
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/04.template/build.tf
diff --git a/examples/dataflow-custom-templates/infrastructure/04.template/dataflow-template.json b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/04.template/dataflow-template.json
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/04.template/dataflow-template.json
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/04.template/dataflow-template.json
diff --git a/examples/dataflow-custom-templates/infrastructure/04.template/provider.tf b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/04.template/provider.tf
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/04.template/provider.tf
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/04.template/provider.tf
diff --git a/examples/dataflow-custom-templates/infrastructure/04.template/storage.tf b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/04.template/storage.tf
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/04.template/storage.tf
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/04.template/storage.tf
diff --git a/examples/dataflow-custom-templates/infrastructure/04.template/variables.tf b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/04.template/variables.tf
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/04.template/variables.tf
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/04.template/variables.tf
diff --git a/examples/dataflow-custom-templates/infrastructure/README.md b/examples/dataflow-examples/dataflow-custom-templates/infrastructure/README.md
similarity index 100%
rename from examples/dataflow-custom-templates/infrastructure/README.md
rename to examples/dataflow-examples/dataflow-custom-templates/infrastructure/README.md
diff --git a/examples/dataflow-custom-templates/java/README.md b/examples/dataflow-examples/dataflow-custom-templates/java/README.md
similarity index 100%
rename from examples/dataflow-custom-templates/java/README.md
rename to examples/dataflow-examples/dataflow-custom-templates/java/README.md
diff --git a/examples/dataflow-custom-templates/java/build.gradle.kts b/examples/dataflow-examples/dataflow-custom-templates/java/build.gradle.kts
similarity index 100%
rename from examples/dataflow-custom-templates/java/build.gradle.kts
rename to examples/dataflow-examples/dataflow-custom-templates/java/build.gradle.kts
diff --git a/examples/dataflow-custom-templates/java/gradle.properties b/examples/dataflow-examples/dataflow-custom-templates/java/gradle.properties
similarity index 100%
rename from examples/dataflow-custom-templates/java/gradle.properties
rename to examples/dataflow-examples/dataflow-custom-templates/java/gradle.properties
diff --git a/examples/dataflow-custom-templates/java/gradle/wrapper/gradle-wrapper.jar b/examples/dataflow-examples/dataflow-custom-templates/java/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from examples/dataflow-custom-templates/java/gradle/wrapper/gradle-wrapper.jar
rename to examples/dataflow-examples/dataflow-custom-templates/java/gradle/wrapper/gradle-wrapper.jar
diff --git a/examples/dataflow-custom-templates/java/gradle/wrapper/gradle-wrapper.properties b/examples/dataflow-examples/dataflow-custom-templates/java/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from examples/dataflow-custom-templates/java/gradle/wrapper/gradle-wrapper.properties
rename to examples/dataflow-examples/dataflow-custom-templates/java/gradle/wrapper/gradle-wrapper.properties
diff --git a/examples/dataflow-custom-templates/java/gradlew b/examples/dataflow-examples/dataflow-custom-templates/java/gradlew
similarity index 100%
rename from examples/dataflow-custom-templates/java/gradlew
rename to examples/dataflow-examples/dataflow-custom-templates/java/gradlew
diff --git a/examples/dataflow-custom-templates/java/gradlew.bat b/examples/dataflow-examples/dataflow-custom-templates/java/gradlew.bat
similarity index 100%
rename from examples/dataflow-custom-templates/java/gradlew.bat
rename to examples/dataflow-examples/dataflow-custom-templates/java/gradlew.bat
diff --git a/examples/dataflow-custom-templates/java/settings.gradle.kts b/examples/dataflow-examples/dataflow-custom-templates/java/settings.gradle.kts
similarity index 100%
rename from examples/dataflow-custom-templates/java/settings.gradle.kts
rename to examples/dataflow-examples/dataflow-custom-templates/java/settings.gradle.kts
diff --git a/examples/dataflow-custom-templates/java/src/main/java/com/google/example/DisplayCounts.java b/examples/dataflow-examples/dataflow-custom-templates/java/src/main/java/com/google/example/DisplayCounts.java
similarity index 100%
rename from examples/dataflow-custom-templates/java/src/main/java/com/google/example/DisplayCounts.java
rename to examples/dataflow-examples/dataflow-custom-templates/java/src/main/java/com/google/example/DisplayCounts.java
diff --git a/examples/dataflow-custom-templates/java/src/main/java/com/google/example/FilterNonEmpty.java b/examples/dataflow-examples/dataflow-custom-templates/java/src/main/java/com/google/example/FilterNonEmpty.java
similarity index 100%
rename from examples/dataflow-custom-templates/java/src/main/java/com/google/example/FilterNonEmpty.java
rename to examples/dataflow-examples/dataflow-custom-templates/java/src/main/java/com/google/example/FilterNonEmpty.java
diff --git a/examples/dataflow-custom-templates/java/src/main/java/com/google/example/SplitString.java b/examples/dataflow-examples/dataflow-custom-templates/java/src/main/java/com/google/example/SplitString.java
similarity index 100%
rename from examples/dataflow-custom-templates/java/src/main/java/com/google/example/SplitString.java
rename to examples/dataflow-examples/dataflow-custom-templates/java/src/main/java/com/google/example/SplitString.java
diff --git a/examples/dataflow-custom-templates/java/src/main/java/com/google/example/ToLowerCase.java b/examples/dataflow-examples/dataflow-custom-templates/java/src/main/java/com/google/example/ToLowerCase.java
similarity index 100%
rename from examples/dataflow-custom-templates/java/src/main/java/com/google/example/ToLowerCase.java
rename to examples/dataflow-examples/dataflow-custom-templates/java/src/main/java/com/google/example/ToLowerCase.java
diff --git a/examples/dataflow-custom-templates/java/src/main/java/com/google/example/WordCount.java b/examples/dataflow-examples/dataflow-custom-templates/java/src/main/java/com/google/example/WordCount.java
similarity index 100%
rename from examples/dataflow-custom-templates/java/src/main/java/com/google/example/WordCount.java
rename to examples/dataflow-examples/dataflow-custom-templates/java/src/main/java/com/google/example/WordCount.java
diff --git a/examples/dataflow-custom-templates/java/src/main/java/com/google/example/WordCountOptions.java b/examples/dataflow-examples/dataflow-custom-templates/java/src/main/java/com/google/example/WordCountOptions.java
similarity index 100%
rename from examples/dataflow-custom-templates/java/src/main/java/com/google/example/WordCountOptions.java
rename to examples/dataflow-examples/dataflow-custom-templates/java/src/main/java/com/google/example/WordCountOptions.java
diff --git a/examples/dataflow-custom-templates/java/src/main/resources/catsum.txt b/examples/dataflow-examples/dataflow-custom-templates/java/src/main/resources/catsum.txt
similarity index 100%
rename from examples/dataflow-custom-templates/java/src/main/resources/catsum.txt
rename to examples/dataflow-examples/dataflow-custom-templates/java/src/main/resources/catsum.txt
diff --git a/examples/dataflow-custom-templates/python/Dockerfile b/examples/dataflow-examples/dataflow-custom-templates/python/Dockerfile
similarity index 100%
rename from examples/dataflow-custom-templates/python/Dockerfile
rename to examples/dataflow-examples/dataflow-custom-templates/python/Dockerfile
diff --git a/examples/dataflow-custom-templates/python/README.md b/examples/dataflow-examples/dataflow-custom-templates/python/README.md
similarity index 100%
rename from examples/dataflow-custom-templates/python/README.md
rename to examples/dataflow-examples/dataflow-custom-templates/python/README.md
diff --git a/examples/dataflow-custom-templates/python/gradle/wrapper/gradle-wrapper.jar b/examples/dataflow-examples/dataflow-custom-templates/python/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from examples/dataflow-custom-templates/python/gradle/wrapper/gradle-wrapper.jar
rename to examples/dataflow-examples/dataflow-custom-templates/python/gradle/wrapper/gradle-wrapper.jar
diff --git a/examples/dataflow-custom-templates/python/gradle/wrapper/gradle-wrapper.properties b/examples/dataflow-examples/dataflow-custom-templates/python/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from examples/dataflow-custom-templates/python/gradle/wrapper/gradle-wrapper.properties
rename to examples/dataflow-examples/dataflow-custom-templates/python/gradle/wrapper/gradle-wrapper.properties
diff --git a/examples/dataflow-custom-templates/python/main.py b/examples/dataflow-examples/dataflow-custom-templates/python/main.py
similarity index 100%
rename from examples/dataflow-custom-templates/python/main.py
rename to examples/dataflow-examples/dataflow-custom-templates/python/main.py
diff --git a/examples/dataflow-custom-templates/python/requirements.txt b/examples/dataflow-examples/dataflow-custom-templates/python/requirements.txt
similarity index 100%
rename from examples/dataflow-custom-templates/python/requirements.txt
rename to examples/dataflow-examples/dataflow-custom-templates/python/requirements.txt
diff --git a/examples/dataflow-custom-templates/python/resources/catsum.txt b/examples/dataflow-examples/dataflow-custom-templates/python/resources/catsum.txt
similarity index 100%
rename from examples/dataflow-custom-templates/python/resources/catsum.txt
rename to examples/dataflow-examples/dataflow-custom-templates/python/resources/catsum.txt
diff --git a/examples/dataflow-custom-templates/python/setup.py b/examples/dataflow-examples/dataflow-custom-templates/python/setup.py
similarity index 100%
rename from examples/dataflow-custom-templates/python/setup.py
rename to examples/dataflow-examples/dataflow-custom-templates/python/setup.py
diff --git a/examples/dataflow-custom-templates/python/wordcount/__init__.py b/examples/dataflow-examples/dataflow-custom-templates/python/wordcount/__init__.py
similarity index 100%
rename from examples/dataflow-custom-templates/python/wordcount/__init__.py
rename to examples/dataflow-examples/dataflow-custom-templates/python/wordcount/__init__.py
diff --git a/examples/dataflow-custom-templates/python/wordcount/split_string.py b/examples/dataflow-examples/dataflow-custom-templates/python/wordcount/split_string.py
similarity index 100%
rename from examples/dataflow-custom-templates/python/wordcount/split_string.py
rename to examples/dataflow-examples/dataflow-custom-templates/python/wordcount/split_string.py
diff --git a/examples/dataflow-custom-templates/python/wordcount/word_count_options.py b/examples/dataflow-examples/dataflow-custom-templates/python/wordcount/word_count_options.py
similarity index 100%
rename from examples/dataflow-custom-templates/python/wordcount/word_count_options.py
rename to examples/dataflow-examples/dataflow-custom-templates/python/wordcount/word_count_options.py
diff --git a/examples/dataflow-production-ready/.gitignore b/examples/dataflow-examples/dataflow-production-ready/.gitignore
similarity index 100%
rename from examples/dataflow-production-ready/.gitignore
rename to examples/dataflow-examples/dataflow-production-ready/.gitignore
diff --git a/examples/dataflow-production-ready/CONTRIBUTORS.MD b/examples/dataflow-examples/dataflow-production-ready/CONTRIBUTORS.MD
similarity index 100%
rename from examples/dataflow-production-ready/CONTRIBUTORS.MD
rename to examples/dataflow-examples/dataflow-production-ready/CONTRIBUTORS.MD
diff --git a/examples/dataflow-production-ready/README.MD b/examples/dataflow-examples/dataflow-production-ready/README.MD
similarity index 100%
rename from examples/dataflow-production-ready/README.MD
rename to examples/dataflow-examples/dataflow-production-ready/README.MD
diff --git a/examples/dataflow-production-ready/cloudbuild_tf.yaml b/examples/dataflow-examples/dataflow-production-ready/cloudbuild_tf.yaml
similarity index 100%
rename from examples/dataflow-production-ready/cloudbuild_tf.yaml
rename to examples/dataflow-examples/dataflow-production-ready/cloudbuild_tf.yaml
diff --git a/examples/dataflow-production-ready/data/integration_test_input.csv b/examples/dataflow-examples/dataflow-production-ready/data/integration_test_input.csv
similarity index 100%
rename from examples/dataflow-production-ready/data/integration_test_input.csv
rename to examples/dataflow-examples/dataflow-production-ready/data/integration_test_input.csv
diff --git a/examples/dataflow-production-ready/java/README.md b/examples/dataflow-examples/dataflow-production-ready/java/README.md
similarity index 100%
rename from examples/dataflow-production-ready/java/README.md
rename to examples/dataflow-examples/dataflow-production-ready/java/README.md
diff --git a/examples/dataflow-production-ready/python/.dockerignore b/examples/dataflow-examples/dataflow-production-ready/python/.dockerignore
similarity index 100%
rename from examples/dataflow-production-ready/python/.dockerignore
rename to examples/dataflow-examples/dataflow-production-ready/python/.dockerignore
diff --git a/examples/dataflow-production-ready/python/Dockerfile b/examples/dataflow-examples/dataflow-production-ready/python/Dockerfile
similarity index 100%
rename from examples/dataflow-production-ready/python/Dockerfile
rename to examples/dataflow-examples/dataflow-production-ready/python/Dockerfile
diff --git a/examples/dataflow-production-ready/python/README.md b/examples/dataflow-examples/dataflow-production-ready/python/README.md
similarity index 100%
rename from examples/dataflow-production-ready/python/README.md
rename to examples/dataflow-examples/dataflow-production-ready/python/README.md
diff --git a/examples/dataflow-production-ready/python/cloudbuild.yaml b/examples/dataflow-examples/dataflow-production-ready/python/cloudbuild.yaml
similarity index 100%
rename from examples/dataflow-production-ready/python/cloudbuild.yaml
rename to examples/dataflow-examples/dataflow-production-ready/python/cloudbuild.yaml
diff --git a/examples/dataflow-production-ready/python/ml_preproc/main.py b/examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/main.py
similarity index 100%
rename from examples/dataflow-production-ready/python/ml_preproc/main.py
rename to examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/main.py
diff --git a/examples/dataflow-data-generator/__init__.py b/examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/__init__.py
similarity index 100%
rename from examples/dataflow-data-generator/__init__.py
rename to examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/__init__.py
diff --git a/examples/dataflow-data-generator/bigquery-scripts/__init__.py b/examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/__init__.py
similarity index 100%
rename from examples/dataflow-data-generator/bigquery-scripts/__init__.py
rename to examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/__init__.py
diff --git a/examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/clean_records.py b/examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/clean_records.py
similarity index 100%
rename from examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/clean_records.py
rename to examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/clean_records.py
diff --git a/examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/extract.py b/examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/extract.py
similarity index 100%
rename from examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/extract.py
rename to examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/extract.py
diff --git a/examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/parse_csv.py b/examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/parse_csv.py
similarity index 100%
rename from examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/parse_csv.py
rename to examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/parse_csv.py
diff --git a/examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/preprocess.py b/examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/preprocess.py
similarity index 100%
rename from examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/preprocess.py
rename to examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/preprocess.py
diff --git a/examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/similarities.py b/examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/similarities.py
similarity index 100%
rename from examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/similarities.py
rename to examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/similarities.py
diff --git a/examples/dataflow-data-generator/data-generator-pipeline/__init__.py b/examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/features/__init__.py
similarity index 100%
rename from examples/dataflow-data-generator/data-generator-pipeline/__init__.py
rename to examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/features/__init__.py
diff --git a/examples/dataflow-production-ready/python/ml_preproc/pipeline/features/clean_input.py b/examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/features/clean_input.py
similarity index 100%
rename from examples/dataflow-production-ready/python/ml_preproc/pipeline/features/clean_input.py
rename to examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/features/clean_input.py
diff --git a/examples/dataflow-data-generator/data-generator-pipeline/data_generator/__init__.py b/examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/model/__init__.py
similarity index 100%
rename from examples/dataflow-data-generator/data-generator-pipeline/data_generator/__init__.py
rename to examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/model/__init__.py
diff --git a/examples/dataflow-production-ready/python/ml_preproc/pipeline/model/data_classes.py b/examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/model/data_classes.py
similarity index 100%
rename from examples/dataflow-production-ready/python/ml_preproc/pipeline/model/data_classes.py
rename to examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/model/data_classes.py
diff --git a/examples/dataflow-data-generator/data-generator-pipeline/tests/__init__.py b/examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/utils/__init__.py
similarity index 100%
rename from examples/dataflow-data-generator/data-generator-pipeline/tests/__init__.py
rename to examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/utils/__init__.py
diff --git a/examples/dataflow-production-ready/python/ml_preproc/pipeline/utils/utils.py b/examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/utils/utils.py
similarity index 100%
rename from examples/dataflow-production-ready/python/ml_preproc/pipeline/utils/utils.py
rename to examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/pipeline/utils/utils.py
diff --git a/examples/dataflow-production-ready/python/ml_preproc/setup.py b/examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/setup.py
similarity index 100%
rename from examples/dataflow-production-ready/python/ml_preproc/setup.py
rename to examples/dataflow-examples/dataflow-production-ready/python/ml_preproc/setup.py
diff --git a/examples/dataflow-production-ready/python/requirements.txt b/examples/dataflow-examples/dataflow-production-ready/python/requirements.txt
similarity index 100%
rename from examples/dataflow-production-ready/python/requirements.txt
rename to examples/dataflow-examples/dataflow-production-ready/python/requirements.txt
diff --git a/examples/dataflow-production-ready/python/resources/abbreviations.txt b/examples/dataflow-examples/dataflow-production-ready/python/resources/abbreviations.txt
similarity index 100%
rename from examples/dataflow-production-ready/python/resources/abbreviations.txt
rename to examples/dataflow-examples/dataflow-production-ready/python/resources/abbreviations.txt
diff --git a/examples/dataflow-production-ready/python/resources/training_data.csv b/examples/dataflow-examples/dataflow-production-ready/python/resources/training_data.csv
similarity index 100%
rename from examples/dataflow-production-ready/python/resources/training_data.csv
rename to examples/dataflow-examples/dataflow-production-ready/python/resources/training_data.csv
diff --git a/examples/dataflow-production-ready/python/run_dataflow_runner.sh b/examples/dataflow-examples/dataflow-production-ready/python/run_dataflow_runner.sh
similarity index 100%
rename from examples/dataflow-production-ready/python/run_dataflow_runner.sh
rename to examples/dataflow-examples/dataflow-production-ready/python/run_dataflow_runner.sh
diff --git a/examples/dataflow-production-ready/python/run_dataflow_template.sh b/examples/dataflow-examples/dataflow-production-ready/python/run_dataflow_template.sh
similarity index 100%
rename from examples/dataflow-production-ready/python/run_dataflow_template.sh
rename to examples/dataflow-examples/dataflow-production-ready/python/run_dataflow_template.sh
diff --git a/examples/dataflow-production-ready/python/run_direct_runner.sh b/examples/dataflow-examples/dataflow-production-ready/python/run_direct_runner.sh
similarity index 100%
rename from examples/dataflow-production-ready/python/run_direct_runner.sh
rename to examples/dataflow-examples/dataflow-production-ready/python/run_direct_runner.sh
diff --git a/examples/dataflow-production-ready/python/run_unit_tests.sh b/examples/dataflow-examples/dataflow-production-ready/python/run_unit_tests.sh
similarity index 100%
rename from examples/dataflow-production-ready/python/run_unit_tests.sh
rename to examples/dataflow-examples/dataflow-production-ready/python/run_unit_tests.sh
diff --git a/examples/dataflow-production-ready/python/template_spec/metadata.json b/examples/dataflow-examples/dataflow-production-ready/python/template_spec/metadata.json
similarity index 100%
rename from examples/dataflow-production-ready/python/template_spec/metadata.json
rename to examples/dataflow-examples/dataflow-production-ready/python/template_spec/metadata.json
diff --git a/examples/dataflow-production-ready/python/ml_preproc/pipeline/__init__.py b/examples/dataflow-examples/dataflow-production-ready/python/tests/__init__.py
similarity index 100%
rename from examples/dataflow-production-ready/python/ml_preproc/pipeline/__init__.py
rename to examples/dataflow-examples/dataflow-production-ready/python/tests/__init__.py
diff --git a/examples/dataflow-production-ready/python/tests/test_clean_input.py b/examples/dataflow-examples/dataflow-production-ready/python/tests/test_clean_input.py
similarity index 100%
rename from examples/dataflow-production-ready/python/tests/test_clean_input.py
rename to examples/dataflow-examples/dataflow-production-ready/python/tests/test_clean_input.py
diff --git a/examples/dataflow-production-ready/python/tests/test_parse_csv.py b/examples/dataflow-examples/dataflow-production-ready/python/tests/test_parse_csv.py
similarity index 100%
rename from examples/dataflow-production-ready/python/tests/test_parse_csv.py
rename to examples/dataflow-examples/dataflow-production-ready/python/tests/test_parse_csv.py
diff --git a/examples/dataflow-production-ready/python/tests/test_transform.py b/examples/dataflow-examples/dataflow-production-ready/python/tests/test_transform.py
similarity index 100%
rename from examples/dataflow-production-ready/python/tests/test_transform.py
rename to examples/dataflow-examples/dataflow-production-ready/python/tests/test_transform.py
diff --git a/examples/dataflow-production-ready/run_system_integration_test.sh b/examples/dataflow-examples/dataflow-production-ready/run_system_integration_test.sh
similarity index 100%
rename from examples/dataflow-production-ready/run_system_integration_test.sh
rename to examples/dataflow-examples/dataflow-production-ready/run_system_integration_test.sh
diff --git a/examples/dataflow-production-ready/schema/ml_preproc_errors.json b/examples/dataflow-examples/dataflow-production-ready/schema/ml_preproc_errors.json
similarity index 100%
rename from examples/dataflow-production-ready/schema/ml_preproc_errors.json
rename to examples/dataflow-examples/dataflow-production-ready/schema/ml_preproc_errors.json
diff --git a/examples/dataflow-production-ready/schema/ml_preproc_results.json b/examples/dataflow-examples/dataflow-production-ready/schema/ml_preproc_results.json
similarity index 100%
rename from examples/dataflow-production-ready/schema/ml_preproc_results.json
rename to examples/dataflow-examples/dataflow-production-ready/schema/ml_preproc_results.json
diff --git a/examples/dataflow-production-ready/terraform/README.MD b/examples/dataflow-examples/dataflow-production-ready/terraform/README.MD
similarity index 100%
rename from examples/dataflow-production-ready/terraform/README.MD
rename to examples/dataflow-examples/dataflow-production-ready/terraform/README.MD
diff --git a/examples/dataflow-production-ready/terraform/backend.tf b/examples/dataflow-examples/dataflow-production-ready/terraform/backend.tf
similarity index 100%
rename from examples/dataflow-production-ready/terraform/backend.tf
rename to examples/dataflow-examples/dataflow-production-ready/terraform/backend.tf
diff --git a/examples/dataflow-production-ready/terraform/main.tf b/examples/dataflow-examples/dataflow-production-ready/terraform/main.tf
similarity index 100%
rename from examples/dataflow-production-ready/terraform/main.tf
rename to examples/dataflow-examples/dataflow-production-ready/terraform/main.tf
diff --git a/examples/dataflow-production-ready/terraform/modules/bigquery/main.tf b/examples/dataflow-examples/dataflow-production-ready/terraform/modules/bigquery/main.tf
similarity index 100%
rename from examples/dataflow-production-ready/terraform/modules/bigquery/main.tf
rename to examples/dataflow-examples/dataflow-production-ready/terraform/modules/bigquery/main.tf
diff --git a/examples/dataflow-production-ready/terraform/modules/bigquery/output.tf b/examples/dataflow-examples/dataflow-production-ready/terraform/modules/bigquery/output.tf
similarity index 100%
rename from examples/dataflow-production-ready/terraform/modules/bigquery/output.tf
rename to examples/dataflow-examples/dataflow-production-ready/terraform/modules/bigquery/output.tf
diff --git a/examples/dataflow-production-ready/terraform/modules/bigquery/variables.tf b/examples/dataflow-examples/dataflow-production-ready/terraform/modules/bigquery/variables.tf
similarity index 100%
rename from examples/dataflow-production-ready/terraform/modules/bigquery/variables.tf
rename to examples/dataflow-examples/dataflow-production-ready/terraform/modules/bigquery/variables.tf
diff --git a/examples/dataflow-production-ready/terraform/variables.tf b/examples/dataflow-examples/dataflow-production-ready/terraform/variables.tf
similarity index 100%
rename from examples/dataflow-production-ready/terraform/variables.tf
rename to examples/dataflow-examples/dataflow-production-ready/terraform/variables.tf
diff --git a/examples/dataflow-dlp-hash-pipeline/.gitignore b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/.gitignore
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/.gitignore
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/.gitignore
diff --git a/examples/dataflow-dlp-hash-pipeline/Makefile b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/Makefile
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/Makefile
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/Makefile
diff --git a/examples/dataflow-dlp-hash-pipeline/README.md b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/README.md
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/README.md
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/README.md
diff --git a/examples/dataflow-dlp-hash-pipeline/img/arch.png b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/img/arch.png
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/img/arch.png
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/img/arch.png
diff --git a/examples/dataflow-dlp-hash-pipeline/infrastructure/iam.tf b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/infrastructure/iam.tf
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/infrastructure/iam.tf
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/infrastructure/iam.tf
diff --git a/examples/dataflow-dlp-hash-pipeline/infrastructure/main.tf b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/infrastructure/main.tf
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/infrastructure/main.tf
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/infrastructure/main.tf
diff --git a/examples/dataflow-dlp-hash-pipeline/infrastructure/terraform.tfvars.sample b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/infrastructure/terraform.tfvars.sample
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/infrastructure/terraform.tfvars.sample
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/infrastructure/terraform.tfvars.sample
diff --git a/examples/dataflow-dlp-hash-pipeline/infrastructure/variables.tf b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/infrastructure/variables.tf
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/infrastructure/variables.tf
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/infrastructure/variables.tf
diff --git a/examples/dataflow-dlp-hash-pipeline/inputs/.gitkeep b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/inputs/.gitkeep
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/inputs/.gitkeep
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/inputs/.gitkeep
diff --git a/examples/dataflow-dlp-hash-pipeline/pom.xml b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/pom.xml
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/pom.xml
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/pom.xml
diff --git a/examples/dataflow-dlp-hash-pipeline/scripts/generate-input-file.py b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/scripts/generate-input-file.py
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/scripts/generate-input-file.py
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/scripts/generate-input-file.py
diff --git a/examples/dataflow-dlp-hash-pipeline/scripts/generate-test-socials.py b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/scripts/generate-test-socials.py
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/scripts/generate-test-socials.py
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/scripts/generate-test-socials.py
diff --git a/examples/dataflow-dlp-hash-pipeline/scripts/hasher.py b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/scripts/hasher.py
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/scripts/hasher.py
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/scripts/hasher.py
diff --git a/examples/dataflow-dlp-hash-pipeline/scripts/poller.py b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/scripts/poller.py
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/scripts/poller.py
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/scripts/poller.py
diff --git a/examples/dataflow-dlp-hash-pipeline/scripts/requirements.txt b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/scripts/requirements.txt
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/scripts/requirements.txt
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/scripts/requirements.txt
diff --git a/examples/dataflow-dlp-hash-pipeline/src/license/license-header-style.xml b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/license/license-header-style.xml
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/src/license/license-header-style.xml
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/license/license-header-style.xml
diff --git a/examples/dataflow-dlp-hash-pipeline/src/license/license-header.txt b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/license/license-header.txt
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/src/license/license-header.txt
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/license/license-header.txt
diff --git a/examples/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/ChunkFileDoFn.java b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/ChunkFileDoFn.java
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/ChunkFileDoFn.java
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/ChunkFileDoFn.java
diff --git a/examples/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/DLPFindingsDoFn.java b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/DLPFindingsDoFn.java
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/DLPFindingsDoFn.java
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/DLPFindingsDoFn.java
diff --git a/examples/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/HashQuotesDoFn.java b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/HashQuotesDoFn.java
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/HashQuotesDoFn.java
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/HashQuotesDoFn.java
diff --git a/examples/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/Hashpipeline.java b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/Hashpipeline.java
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/Hashpipeline.java
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/Hashpipeline.java
diff --git a/examples/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/KVtoJSONDoFn.java b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/KVtoJSONDoFn.java
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/KVtoJSONDoFn.java
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/KVtoJSONDoFn.java
diff --git a/examples/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/MatchHashDoFn.java b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/MatchHashDoFn.java
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/MatchHashDoFn.java
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/MatchHashDoFn.java
diff --git a/examples/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/package-info.java b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/package-info.java
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/package-info.java
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/main/java/com/google/cloud/pso/hashpipeline/package-info.java
diff --git a/examples/dataflow-dlp-hash-pipeline/src/test/java/com/google/cloud/pso/hashpipeline/ChunkFileDoFnTest.java b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/test/java/com/google/cloud/pso/hashpipeline/ChunkFileDoFnTest.java
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/src/test/java/com/google/cloud/pso/hashpipeline/ChunkFileDoFnTest.java
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/test/java/com/google/cloud/pso/hashpipeline/ChunkFileDoFnTest.java
diff --git a/examples/dataflow-dlp-hash-pipeline/src/test/resources/tiny.txt b/examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/test/resources/tiny.txt
similarity index 100%
rename from examples/dataflow-dlp-hash-pipeline/src/test/resources/tiny.txt
rename to examples/dataflow-examples/java/dataflow-dlp-hash-pipeline/src/test/resources/tiny.txt
diff --git a/examples/dataflow-elasticsearch-indexer/ElasticIndexer/pom.xml b/examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/pom.xml
similarity index 100%
rename from examples/dataflow-elasticsearch-indexer/ElasticIndexer/pom.xml
rename to examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/pom.xml
diff --git a/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/IndexerMain.java b/examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/IndexerMain.java
similarity index 100%
rename from examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/IndexerMain.java
rename to examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/IndexerMain.java
diff --git a/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/coders/ErrorMessageCoder.java b/examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/coders/ErrorMessageCoder.java
similarity index 100%
rename from examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/coders/ErrorMessageCoder.java
rename to examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/coders/ErrorMessageCoder.java
diff --git a/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/coders/JsonNodeCoder.java b/examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/coders/JsonNodeCoder.java
similarity index 100%
rename from examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/coders/JsonNodeCoder.java
rename to examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/coders/JsonNodeCoder.java
diff --git a/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ErrorMessage.java b/examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ErrorMessage.java
similarity index 100%
rename from examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ErrorMessage.java
rename to examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ErrorMessage.java
diff --git a/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ExtractKeyFn.java b/examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ExtractKeyFn.java
similarity index 100%
rename from examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ExtractKeyFn.java
rename to examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ExtractKeyFn.java
diff --git a/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ExtractMetadata.java b/examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ExtractMetadata.java
similarity index 100%
rename from examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ExtractMetadata.java
rename to examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ExtractMetadata.java
diff --git a/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/FailSafeValidate.java b/examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/FailSafeValidate.java
similarity index 100%
rename from examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/FailSafeValidate.java
rename to examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/FailSafeValidate.java
diff --git a/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/InsertMetadataFn.java b/examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/InsertMetadataFn.java
similarity index 100%
rename from examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/InsertMetadataFn.java
rename to examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/InsertMetadataFn.java
diff --git a/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/options/BigtableOptions.java b/examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/options/BigtableOptions.java
similarity index 100%
rename from examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/options/BigtableOptions.java
rename to examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/options/BigtableOptions.java
diff --git a/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/options/IndexerOptions.java b/examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/options/IndexerOptions.java
similarity index 100%
rename from examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/options/IndexerOptions.java
rename to examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/options/IndexerOptions.java
diff --git a/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/utils/PublishProducts.java b/examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/utils/PublishProducts.java
similarity index 100%
rename from examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/utils/PublishProducts.java
rename to examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/utils/PublishProducts.java
diff --git a/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/ExtractKeyFnTest.java b/examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/ExtractKeyFnTest.java
similarity index 100%
rename from examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/ExtractKeyFnTest.java
rename to examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/ExtractKeyFnTest.java
diff --git a/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/FailSafeValidateTest.java b/examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/FailSafeValidateTest.java
similarity index 100%
rename from examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/FailSafeValidateTest.java
rename to examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/FailSafeValidateTest.java
diff --git a/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/InsertMetadataFnTest.java b/examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/InsertMetadataFnTest.java
similarity index 100%
rename from examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/InsertMetadataFnTest.java
rename to examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/InsertMetadataFnTest.java
diff --git a/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/utils/PublishProductsTest.java b/examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/utils/PublishProductsTest.java
similarity index 100%
rename from examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/utils/PublishProductsTest.java
rename to examples/dataflow-examples/java/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/utils/PublishProductsTest.java
diff --git a/examples/dataflow-elasticsearch-indexer/README.md b/examples/dataflow-examples/java/dataflow-elasticsearch-indexer/README.md
similarity index 100%
rename from examples/dataflow-elasticsearch-indexer/README.md
rename to examples/dataflow-examples/java/dataflow-elasticsearch-indexer/README.md
diff --git a/examples/dataflow-elasticsearch-indexer/img/dataflow_elastic_workflow.png b/examples/dataflow-examples/java/dataflow-elasticsearch-indexer/img/dataflow_elastic_workflow.png
similarity index 100%
rename from examples/dataflow-elasticsearch-indexer/img/dataflow_elastic_workflow.png
rename to examples/dataflow-examples/java/dataflow-elasticsearch-indexer/img/dataflow_elastic_workflow.png
diff --git a/examples/dataflow-elasticsearch-indexer/img/sample_data_gen_pipeline.png b/examples/dataflow-examples/java/dataflow-elasticsearch-indexer/img/sample_data_gen_pipeline.png
similarity index 100%
rename from examples/dataflow-elasticsearch-indexer/img/sample_data_gen_pipeline.png
rename to examples/dataflow-examples/java/dataflow-elasticsearch-indexer/img/sample_data_gen_pipeline.png
diff --git a/examples/dataflow-near-realtime-feature-engineering/README.md b/examples/dataflow-examples/java/dataflow-near-realtime-feature-engineering/README.md
similarity index 100%
rename from examples/dataflow-near-realtime-feature-engineering/README.md
rename to examples/dataflow-examples/java/dataflow-near-realtime-feature-engineering/README.md
diff --git a/examples/dataflow-near-realtime-feature-engineering/pom.xml b/examples/dataflow-examples/java/dataflow-near-realtime-feature-engineering/pom.xml
similarity index 100%
rename from examples/dataflow-near-realtime-feature-engineering/pom.xml
rename to examples/dataflow-examples/java/dataflow-near-realtime-feature-engineering/pom.xml
diff --git a/examples/dataflow-near-realtime-feature-engineering/src/main/java/com/google/dataflow/feature/ExpireValue.java b/examples/dataflow-examples/java/dataflow-near-realtime-feature-engineering/src/main/java/com/google/dataflow/feature/ExpireValue.java
similarity index 100%
rename from examples/dataflow-near-realtime-feature-engineering/src/main/java/com/google/dataflow/feature/ExpireValue.java
rename to examples/dataflow-examples/java/dataflow-near-realtime-feature-engineering/src/main/java/com/google/dataflow/feature/ExpireValue.java
diff --git a/examples/dataflow-near-realtime-feature-engineering/src/main/java/com/google/dataflow/feature/MergeFeaturesToCSV.java b/examples/dataflow-examples/java/dataflow-near-realtime-feature-engineering/src/main/java/com/google/dataflow/feature/MergeFeaturesToCSV.java
similarity index 100%
rename from examples/dataflow-near-realtime-feature-engineering/src/main/java/com/google/dataflow/feature/MergeFeaturesToCSV.java
rename to examples/dataflow-examples/java/dataflow-near-realtime-feature-engineering/src/main/java/com/google/dataflow/feature/MergeFeaturesToCSV.java
diff --git a/examples/dataflow-near-realtime-feature-engineering/src/main/java/com/google/dataflow/feature/NRTFeature.java b/examples/dataflow-examples/java/dataflow-near-realtime-feature-engineering/src/main/java/com/google/dataflow/feature/NRTFeature.java
similarity index 100%
rename from examples/dataflow-near-realtime-feature-engineering/src/main/java/com/google/dataflow/feature/NRTFeature.java
rename to examples/dataflow-examples/java/dataflow-near-realtime-feature-engineering/src/main/java/com/google/dataflow/feature/NRTFeature.java
diff --git a/examples/dataflow-near-realtime-feature-engineering/src/main/java/com/google/dataflow/feature/model/ClickstreamEvent.java b/examples/dataflow-examples/java/dataflow-near-realtime-feature-engineering/src/main/java/com/google/dataflow/feature/model/ClickstreamEvent.java
similarity index 100%
rename from examples/dataflow-near-realtime-feature-engineering/src/main/java/com/google/dataflow/feature/model/ClickstreamEvent.java
rename to examples/dataflow-examples/java/dataflow-near-realtime-feature-engineering/src/main/java/com/google/dataflow/feature/model/ClickstreamEvent.java
diff --git a/examples/dataflow-near-realtime-feature-engineering/src/main/java/com/google/dataflow/feature/pipeline/TaxiNRTPipeline.java b/examples/dataflow-examples/java/dataflow-near-realtime-feature-engineering/src/main/java/com/google/dataflow/feature/pipeline/TaxiNRTPipeline.java
similarity index 100%
rename from examples/dataflow-near-realtime-feature-engineering/src/main/java/com/google/dataflow/feature/pipeline/TaxiNRTPipeline.java
rename to examples/dataflow-examples/java/dataflow-near-realtime-feature-engineering/src/main/java/com/google/dataflow/feature/pipeline/TaxiNRTPipeline.java
diff --git a/examples/dataflow-near-realtime-feature-engineering/src/test/java/com/google/dataflow/feature/FeatureCalculationTest.java b/examples/dataflow-examples/java/dataflow-near-realtime-feature-engineering/src/test/java/com/google/dataflow/feature/FeatureCalculationTest.java
similarity index 100%
rename from examples/dataflow-near-realtime-feature-engineering/src/test/java/com/google/dataflow/feature/FeatureCalculationTest.java
rename to examples/dataflow-examples/java/dataflow-near-realtime-feature-engineering/src/test/java/com/google/dataflow/feature/FeatureCalculationTest.java
diff --git a/examples/dataflow-near-realtime-feature-engineering/viz.png b/examples/dataflow-examples/java/dataflow-near-realtime-feature-engineering/viz.png
similarity index 100%
rename from examples/dataflow-near-realtime-feature-engineering/viz.png
rename to examples/dataflow-examples/java/dataflow-near-realtime-feature-engineering/viz.png
diff --git a/examples/dataflow-streaming-benchmark/.gitignore b/examples/dataflow-examples/java/dataflow-streaming-benchmark/.gitignore
similarity index 100%
rename from examples/dataflow-streaming-benchmark/.gitignore
rename to examples/dataflow-examples/java/dataflow-streaming-benchmark/.gitignore
diff --git a/examples/dataflow-streaming-benchmark/README.md b/examples/dataflow-examples/java/dataflow-streaming-benchmark/README.md
similarity index 100%
rename from examples/dataflow-streaming-benchmark/README.md
rename to examples/dataflow-examples/java/dataflow-streaming-benchmark/README.md
diff --git a/examples/dataflow-streaming-benchmark/img/pipeline-dag.png b/examples/dataflow-examples/java/dataflow-streaming-benchmark/img/pipeline-dag.png
similarity index 100%
rename from examples/dataflow-streaming-benchmark/img/pipeline-dag.png
rename to examples/dataflow-examples/java/dataflow-streaming-benchmark/img/pipeline-dag.png
diff --git a/examples/dataflow-streaming-benchmark/pom.xml b/examples/dataflow-examples/java/dataflow-streaming-benchmark/pom.xml
similarity index 100%
rename from examples/dataflow-streaming-benchmark/pom.xml
rename to examples/dataflow-examples/java/dataflow-streaming-benchmark/pom.xml
diff --git a/examples/dataflow-streaming-benchmark/src/license/license-header-style.xml b/examples/dataflow-examples/java/dataflow-streaming-benchmark/src/license/license-header-style.xml
similarity index 100%
rename from examples/dataflow-streaming-benchmark/src/license/license-header-style.xml
rename to examples/dataflow-examples/java/dataflow-streaming-benchmark/src/license/license-header-style.xml
diff --git a/examples/dataflow-streaming-benchmark/src/license/license-header.txt b/examples/dataflow-examples/java/dataflow-streaming-benchmark/src/license/license-header.txt
similarity index 100%
rename from examples/dataflow-streaming-benchmark/src/license/license-header.txt
rename to examples/dataflow-examples/java/dataflow-streaming-benchmark/src/license/license-header.txt
diff --git a/examples/dataflow-streaming-benchmark/src/main/java/com/google/cloud/pso/pipeline/StreamingBenchmark.java b/examples/dataflow-examples/java/dataflow-streaming-benchmark/src/main/java/com/google/cloud/pso/pipeline/StreamingBenchmark.java
similarity index 100%
rename from examples/dataflow-streaming-benchmark/src/main/java/com/google/cloud/pso/pipeline/StreamingBenchmark.java
rename to examples/dataflow-examples/java/dataflow-streaming-benchmark/src/main/java/com/google/cloud/pso/pipeline/StreamingBenchmark.java
diff --git a/examples/dataflow-streaming-benchmark/src/main/java/com/google/cloud/pso/pipeline/package-info.java b/examples/dataflow-examples/java/dataflow-streaming-benchmark/src/main/java/com/google/cloud/pso/pipeline/package-info.java
similarity index 100%
rename from examples/dataflow-streaming-benchmark/src/main/java/com/google/cloud/pso/pipeline/package-info.java
rename to examples/dataflow-examples/java/dataflow-streaming-benchmark/src/main/java/com/google/cloud/pso/pipeline/package-info.java
diff --git a/examples/dataflow-streaming-benchmark/src/main/resources/spotbugs-exclude.xml b/examples/dataflow-examples/java/dataflow-streaming-benchmark/src/main/resources/spotbugs-exclude.xml
similarity index 100%
rename from examples/dataflow-streaming-benchmark/src/main/resources/spotbugs-exclude.xml
rename to examples/dataflow-examples/java/dataflow-streaming-benchmark/src/main/resources/spotbugs-exclude.xml
diff --git a/examples/dataflow-streaming-benchmark/src/test/java/com/google/cloud/pso/pipeline/StreamingBenchmarkTest.java b/examples/dataflow-examples/java/dataflow-streaming-benchmark/src/test/java/com/google/cloud/pso/pipeline/StreamingBenchmarkTest.java
similarity index 100%
rename from examples/dataflow-streaming-benchmark/src/test/java/com/google/cloud/pso/pipeline/StreamingBenchmarkTest.java
rename to examples/dataflow-examples/java/dataflow-streaming-benchmark/src/test/java/com/google/cloud/pso/pipeline/StreamingBenchmarkTest.java
diff --git a/examples/dataflow-streaming-schema-handler/.gitignore b/examples/dataflow-examples/java/dataflow-streaming-schema-handler/.gitignore
similarity index 100%
rename from examples/dataflow-streaming-schema-handler/.gitignore
rename to examples/dataflow-examples/java/dataflow-streaming-schema-handler/.gitignore
diff --git a/examples/dataflow-streaming-schema-handler/README.md b/examples/dataflow-examples/java/dataflow-streaming-schema-handler/README.md
similarity index 100%
rename from examples/dataflow-streaming-schema-handler/README.md
rename to examples/dataflow-examples/java/dataflow-streaming-schema-handler/README.md
diff --git a/examples/dataflow-streaming-schema-handler/img/architecture.png b/examples/dataflow-examples/java/dataflow-streaming-schema-handler/img/architecture.png
similarity index 100%
rename from examples/dataflow-streaming-schema-handler/img/architecture.png
rename to examples/dataflow-examples/java/dataflow-streaming-schema-handler/img/architecture.png
diff --git a/examples/dataflow-streaming-schema-handler/pom.xml b/examples/dataflow-examples/java/dataflow-streaming-schema-handler/pom.xml
similarity index 100%
rename from examples/dataflow-streaming-schema-handler/pom.xml
rename to examples/dataflow-examples/java/dataflow-streaming-schema-handler/pom.xml
diff --git a/examples/dataflow-streaming-schema-handler/src/license/license-header-style.xml b/examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/license/license-header-style.xml
similarity index 100%
rename from examples/dataflow-streaming-schema-handler/src/license/license-header-style.xml
rename to examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/license/license-header-style.xml
diff --git a/examples/dataflow-streaming-schema-handler/src/license/license-header.txt b/examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/license/license-header.txt
similarity index 100%
rename from examples/dataflow-streaming-schema-handler/src/license/license-header.txt
rename to examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/license/license-header.txt
diff --git a/examples/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/pipeline/PubsubToBigQueryJSON.java b/examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/pipeline/PubsubToBigQueryJSON.java
similarity index 100%
rename from examples/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/pipeline/PubsubToBigQueryJSON.java
rename to examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/pipeline/PubsubToBigQueryJSON.java
diff --git a/examples/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/transforms/JsonEventMatcher.java b/examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/transforms/JsonEventMatcher.java
similarity index 100%
rename from examples/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/transforms/JsonEventMatcher.java
rename to examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/transforms/JsonEventMatcher.java
diff --git a/examples/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/transforms/JsonSchemaExist.java b/examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/transforms/JsonSchemaExist.java
similarity index 100%
rename from examples/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/transforms/JsonSchemaExist.java
rename to examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/transforms/JsonSchemaExist.java
diff --git a/examples/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/transforms/ReadPubSub.java b/examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/transforms/ReadPubSub.java
similarity index 100%
rename from examples/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/transforms/ReadPubSub.java
rename to examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/transforms/ReadPubSub.java
diff --git a/examples/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/util/BQDatasetSchemas.java b/examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/util/BQDatasetSchemas.java
similarity index 100%
rename from examples/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/util/BQDatasetSchemas.java
rename to examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/util/BQDatasetSchemas.java
diff --git a/examples/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/util/BigQueryConverters.java b/examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/util/BigQueryConverters.java
similarity index 100%
rename from examples/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/util/BigQueryConverters.java
rename to examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/util/BigQueryConverters.java
diff --git a/examples/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/util/Constants.java b/examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/util/Constants.java
similarity index 100%
rename from examples/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/util/Constants.java
rename to examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/util/Constants.java
diff --git a/examples/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/util/ConvertEventToGenericFailureRow.java b/examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/util/ConvertEventToGenericFailureRow.java
similarity index 100%
rename from examples/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/util/ConvertEventToGenericFailureRow.java
rename to examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/main/java/com/google/cloud/pso/util/ConvertEventToGenericFailureRow.java
diff --git a/examples/dataflow-streaming-schema-handler/src/resources/person.json b/examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/resources/person.json
similarity index 100%
rename from examples/dataflow-streaming-schema-handler/src/resources/person.json
rename to examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/resources/person.json
diff --git a/examples/dataflow-streaming-schema-handler/src/test/java/com/google/cloud/pso/transforms/JsonEventMatcherTest.java b/examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/test/java/com/google/cloud/pso/transforms/JsonEventMatcherTest.java
similarity index 100%
rename from examples/dataflow-streaming-schema-handler/src/test/java/com/google/cloud/pso/transforms/JsonEventMatcherTest.java
rename to examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/test/java/com/google/cloud/pso/transforms/JsonEventMatcherTest.java
diff --git a/examples/dataflow-streaming-schema-handler/src/test/java/com/google/cloud/pso/transforms/JsonSchemaExistTest.java b/examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/test/java/com/google/cloud/pso/transforms/JsonSchemaExistTest.java
similarity index 100%
rename from examples/dataflow-streaming-schema-handler/src/test/java/com/google/cloud/pso/transforms/JsonSchemaExistTest.java
rename to examples/dataflow-examples/java/dataflow-streaming-schema-handler/src/test/java/com/google/cloud/pso/transforms/JsonSchemaExistTest.java
diff --git a/examples/dataflow-xmlio-to-bq/.gitattributes b/examples/dataflow-examples/java/dataflow-xmlio-to-bq/.gitattributes
similarity index 100%
rename from examples/dataflow-xmlio-to-bq/.gitattributes
rename to examples/dataflow-examples/java/dataflow-xmlio-to-bq/.gitattributes
diff --git a/examples/dataflow-xmlio-to-bq/.gitignore b/examples/dataflow-examples/java/dataflow-xmlio-to-bq/.gitignore
similarity index 100%
rename from examples/dataflow-xmlio-to-bq/.gitignore
rename to examples/dataflow-examples/java/dataflow-xmlio-to-bq/.gitignore
diff --git a/examples/dataflow-xmlio-to-bq/README.md b/examples/dataflow-examples/java/dataflow-xmlio-to-bq/README.md
similarity index 100%
rename from examples/dataflow-xmlio-to-bq/README.md
rename to examples/dataflow-examples/java/dataflow-xmlio-to-bq/README.md
diff --git a/examples/dataflow-xmlio-to-bq/example_input/default.xml b/examples/dataflow-examples/java/dataflow-xmlio-to-bq/example_input/default.xml
similarity index 100%
rename from examples/dataflow-xmlio-to-bq/example_input/default.xml
rename to examples/dataflow-examples/java/dataflow-xmlio-to-bq/example_input/default.xml
diff --git a/examples/dataflow-xmlio-to-bq/img/graph.png b/examples/dataflow-examples/java/dataflow-xmlio-to-bq/img/graph.png
similarity index 100%
rename from examples/dataflow-xmlio-to-bq/img/graph.png
rename to examples/dataflow-examples/java/dataflow-xmlio-to-bq/img/graph.png
diff --git a/examples/dataflow-xmlio-to-bq/pom.xml b/examples/dataflow-examples/java/dataflow-xmlio-to-bq/pom.xml
similarity index 100%
rename from examples/dataflow-xmlio-to-bq/pom.xml
rename to examples/dataflow-examples/java/dataflow-xmlio-to-bq/pom.xml
diff --git a/examples/dataflow-xmlio-to-bq/run.sh b/examples/dataflow-examples/java/dataflow-xmlio-to-bq/run.sh
similarity index 100%
rename from examples/dataflow-xmlio-to-bq/run.sh
rename to examples/dataflow-examples/java/dataflow-xmlio-to-bq/run.sh
diff --git a/examples/dataflow-xmlio-to-bq/src/main/java/xml2bq/Order.java b/examples/dataflow-examples/java/dataflow-xmlio-to-bq/src/main/java/xml2bq/Order.java
similarity index 100%
rename from examples/dataflow-xmlio-to-bq/src/main/java/xml2bq/Order.java
rename to examples/dataflow-examples/java/dataflow-xmlio-to-bq/src/main/java/xml2bq/Order.java
diff --git a/examples/dataflow-xmlio-to-bq/src/main/java/xml2bq/ShipInfo.java b/examples/dataflow-examples/java/dataflow-xmlio-to-bq/src/main/java/xml2bq/ShipInfo.java
similarity index 100%
rename from examples/dataflow-xmlio-to-bq/src/main/java/xml2bq/ShipInfo.java
rename to examples/dataflow-examples/java/dataflow-xmlio-to-bq/src/main/java/xml2bq/ShipInfo.java
diff --git a/examples/dataflow-xmlio-to-bq/src/main/java/xml2bq/XmlIoDemo.java b/examples/dataflow-examples/java/dataflow-xmlio-to-bq/src/main/java/xml2bq/XmlIoDemo.java
similarity index 100%
rename from examples/dataflow-xmlio-to-bq/src/main/java/xml2bq/XmlIoDemo.java
rename to examples/dataflow-examples/java/dataflow-xmlio-to-bq/src/main/java/xml2bq/XmlIoDemo.java
diff --git a/examples/dataflow-bigquery-to-alloydb/.gitignore b/examples/dataflow-examples/python/dataflow-bigquery-to-alloydb/.gitignore
similarity index 100%
rename from examples/dataflow-bigquery-to-alloydb/.gitignore
rename to examples/dataflow-examples/python/dataflow-bigquery-to-alloydb/.gitignore
diff --git a/examples/dataflow-bigquery-to-alloydb/README.md b/examples/dataflow-examples/python/dataflow-bigquery-to-alloydb/README.md
similarity index 100%
rename from examples/dataflow-bigquery-to-alloydb/README.md
rename to examples/dataflow-examples/python/dataflow-bigquery-to-alloydb/README.md
diff --git a/examples/dataflow-bigquery-to-alloydb/main.py b/examples/dataflow-examples/python/dataflow-bigquery-to-alloydb/main.py
similarity index 100%
rename from examples/dataflow-bigquery-to-alloydb/main.py
rename to examples/dataflow-examples/python/dataflow-bigquery-to-alloydb/main.py
diff --git a/examples/dataflow-bigquery-to-alloydb/requirements.txt b/examples/dataflow-examples/python/dataflow-bigquery-to-alloydb/requirements.txt
similarity index 100%
rename from examples/dataflow-bigquery-to-alloydb/requirements.txt
rename to examples/dataflow-examples/python/dataflow-bigquery-to-alloydb/requirements.txt
diff --git a/examples/dataflow-data-generator/.gitignore b/examples/dataflow-examples/python/dataflow-data-generator/.gitignore
similarity index 100%
rename from examples/dataflow-data-generator/.gitignore
rename to examples/dataflow-examples/python/dataflow-data-generator/.gitignore
diff --git a/examples/dataflow-data-generator/README.md b/examples/dataflow-examples/python/dataflow-data-generator/README.md
similarity index 100%
rename from examples/dataflow-data-generator/README.md
rename to examples/dataflow-examples/python/dataflow-data-generator/README.md
diff --git a/examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/__init__.py b/examples/dataflow-examples/python/dataflow-data-generator/__init__.py
similarity index 100%
rename from examples/dataflow-production-ready/python/ml_preproc/pipeline/beam_classes/__init__.py
rename to examples/dataflow-examples/python/dataflow-data-generator/__init__.py
diff --git a/examples/dataflow-production-ready/python/ml_preproc/pipeline/features/__init__.py b/examples/dataflow-examples/python/dataflow-data-generator/bigquery-scripts/__init__.py
similarity index 100%
rename from examples/dataflow-production-ready/python/ml_preproc/pipeline/features/__init__.py
rename to examples/dataflow-examples/python/dataflow-data-generator/bigquery-scripts/__init__.py
diff --git a/examples/dataflow-data-generator/bigquery-scripts/bq_histogram_tool.py b/examples/dataflow-examples/python/dataflow-data-generator/bigquery-scripts/bq_histogram_tool.py
similarity index 100%
rename from examples/dataflow-data-generator/bigquery-scripts/bq_histogram_tool.py
rename to examples/dataflow-examples/python/dataflow-data-generator/bigquery-scripts/bq_histogram_tool.py
diff --git a/examples/dataflow-data-generator/bigquery-scripts/bq_load_batches.py b/examples/dataflow-examples/python/dataflow-data-generator/bigquery-scripts/bq_load_batches.py
similarity index 100%
rename from examples/dataflow-data-generator/bigquery-scripts/bq_load_batches.py
rename to examples/dataflow-examples/python/dataflow-data-generator/bigquery-scripts/bq_load_batches.py
diff --git a/examples/dataflow-data-generator/bigquery-scripts/bq_table_resizer.py b/examples/dataflow-examples/python/dataflow-data-generator/bigquery-scripts/bq_table_resizer.py
similarity index 100%
rename from examples/dataflow-data-generator/bigquery-scripts/bq_table_resizer.py
rename to examples/dataflow-examples/python/dataflow-data-generator/bigquery-scripts/bq_table_resizer.py
diff --git a/examples/dataflow-data-generator/bigquery-scripts/tests/test_bq_load_batches.py b/examples/dataflow-examples/python/dataflow-data-generator/bigquery-scripts/tests/test_bq_load_batches.py
similarity index 100%
rename from examples/dataflow-data-generator/bigquery-scripts/tests/test_bq_load_batches.py
rename to examples/dataflow-examples/python/dataflow-data-generator/bigquery-scripts/tests/test_bq_load_batches.py
diff --git a/examples/dataflow-data-generator/bigquery-scripts/tests/test_bq_table_resizer.py b/examples/dataflow-examples/python/dataflow-data-generator/bigquery-scripts/tests/test_bq_table_resizer.py
similarity index 100%
rename from examples/dataflow-data-generator/bigquery-scripts/tests/test_bq_table_resizer.py
rename to examples/dataflow-examples/python/dataflow-data-generator/bigquery-scripts/tests/test_bq_table_resizer.py
diff --git a/examples/dataflow-production-ready/python/ml_preproc/pipeline/model/__init__.py b/examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/__init__.py
similarity index 100%
rename from examples/dataflow-production-ready/python/ml_preproc/pipeline/model/__init__.py
rename to examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/__init__.py
diff --git a/examples/dataflow-data-generator/data-generator-pipeline/data_distribution_matcher.py b/examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_distribution_matcher.py
similarity index 100%
rename from examples/dataflow-data-generator/data-generator-pipeline/data_distribution_matcher.py
rename to examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_distribution_matcher.py
diff --git a/examples/dataflow-data-generator/data-generator-pipeline/data_generator/AvroUtil.py b/examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_generator/AvroUtil.py
similarity index 100%
rename from examples/dataflow-data-generator/data-generator-pipeline/data_generator/AvroUtil.py
rename to examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_generator/AvroUtil.py
diff --git a/examples/dataflow-data-generator/data-generator-pipeline/data_generator/CsvUtil.py b/examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_generator/CsvUtil.py
similarity index 100%
rename from examples/dataflow-data-generator/data-generator-pipeline/data_generator/CsvUtil.py
rename to examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_generator/CsvUtil.py
diff --git a/examples/dataflow-data-generator/data-generator-pipeline/data_generator/ParquetUtil.py b/examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_generator/ParquetUtil.py
similarity index 100%
rename from examples/dataflow-data-generator/data-generator-pipeline/data_generator/ParquetUtil.py
rename to examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_generator/ParquetUtil.py
diff --git a/examples/dataflow-data-generator/data-generator-pipeline/data_generator/PerformantDataGenerator.py b/examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_generator/PerformantDataGenerator.py
similarity index 100%
rename from examples/dataflow-data-generator/data-generator-pipeline/data_generator/PerformantDataGenerator.py
rename to examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_generator/PerformantDataGenerator.py
diff --git a/examples/dataflow-data-generator/data-generator-pipeline/data_generator/PrettyDataGenerator.py b/examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_generator/PrettyDataGenerator.py
similarity index 100%
rename from examples/dataflow-data-generator/data-generator-pipeline/data_generator/PrettyDataGenerator.py
rename to examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_generator/PrettyDataGenerator.py
diff --git a/examples/dataflow-data-generator/data-generator-pipeline/data_generator/TimeUtil.py b/examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_generator/TimeUtil.py
similarity index 100%
rename from examples/dataflow-data-generator/data-generator-pipeline/data_generator/TimeUtil.py
rename to examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_generator/TimeUtil.py
diff --git a/examples/dataflow-production-ready/python/ml_preproc/pipeline/utils/__init__.py b/examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_generator/__init__.py
similarity index 100%
rename from examples/dataflow-production-ready/python/ml_preproc/pipeline/utils/__init__.py
rename to examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_generator/__init__.py
diff --git a/examples/dataflow-data-generator/data-generator-pipeline/data_generator/enforce_primary_keys.py b/examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_generator/enforce_primary_keys.py
similarity index 100%
rename from examples/dataflow-data-generator/data-generator-pipeline/data_generator/enforce_primary_keys.py
rename to examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_generator/enforce_primary_keys.py
diff --git a/examples/dataflow-data-generator/data-generator-pipeline/data_generator_joinable_table.py b/examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_generator_joinable_table.py
similarity index 100%
rename from examples/dataflow-data-generator/data-generator-pipeline/data_generator_joinable_table.py
rename to examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_generator_joinable_table.py
diff --git a/examples/dataflow-data-generator/data-generator-pipeline/data_generator_pipeline.py b/examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_generator_pipeline.py
similarity index 100%
rename from examples/dataflow-data-generator/data-generator-pipeline/data_generator_pipeline.py
rename to examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/data_generator_pipeline.py
diff --git a/examples/dataflow-data-generator/data-generator-pipeline/resources/lineorder-schema.json b/examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/resources/lineorder-schema.json
similarity index 100%
rename from examples/dataflow-data-generator/data-generator-pipeline/resources/lineorder-schema.json
rename to examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/resources/lineorder-schema.json
diff --git a/examples/dataflow-data-generator/data-generator-pipeline/resources/lineorders-schema.avsc b/examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/resources/lineorders-schema.avsc
similarity index 100%
rename from examples/dataflow-data-generator/data-generator-pipeline/resources/lineorders-schema.avsc
rename to examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/resources/lineorders-schema.avsc
diff --git a/examples/dataflow-data-generator/data-generator-pipeline/setup.py b/examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/setup.py
similarity index 100%
rename from examples/dataflow-data-generator/data-generator-pipeline/setup.py
rename to examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/setup.py
diff --git a/examples/dataflow-production-ready/python/tests/__init__.py b/examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/tests/__init__.py
similarity index 100%
rename from examples/dataflow-production-ready/python/tests/__init__.py
rename to examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/tests/__init__.py
diff --git a/examples/dataflow-data-generator/data-generator-pipeline/tests/test_dict_to_csv.py b/examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/tests/test_dict_to_csv.py
similarity index 100%
rename from examples/dataflow-data-generator/data-generator-pipeline/tests/test_dict_to_csv.py
rename to examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/tests/test_dict_to_csv.py
diff --git a/examples/dataflow-data-generator/data-generator-pipeline/tests/test_fix_record_for_avro.py b/examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/tests/test_fix_record_for_avro.py
similarity index 100%
rename from examples/dataflow-data-generator/data-generator-pipeline/tests/test_fix_record_for_avro.py
rename to examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/tests/test_fix_record_for_avro.py
diff --git a/examples/dataflow-data-generator/data-generator-pipeline/tests/test_parquet_util.py b/examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/tests/test_parquet_util.py
similarity index 100%
rename from examples/dataflow-data-generator/data-generator-pipeline/tests/test_parquet_util.py
rename to examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/tests/test_parquet_util.py
diff --git a/examples/dataflow-data-generator/data-generator-pipeline/tests/test_performant_data_generator.py b/examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/tests/test_performant_data_generator.py
similarity index 100%
rename from examples/dataflow-data-generator/data-generator-pipeline/tests/test_performant_data_generator.py
rename to examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/tests/test_performant_data_generator.py
diff --git a/examples/dataflow-data-generator/data-generator-pipeline/tests/test_pretty_data_generator.py b/examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/tests/test_pretty_data_generator.py
similarity index 100%
rename from examples/dataflow-data-generator/data-generator-pipeline/tests/test_pretty_data_generator.py
rename to examples/dataflow-examples/python/dataflow-data-generator/data-generator-pipeline/tests/test_pretty_data_generator.py
diff --git a/examples/dataflow-data-generator/img/data-generator.png b/examples/dataflow-examples/python/dataflow-data-generator/img/data-generator.png
similarity index 100%
rename from examples/dataflow-data-generator/img/data-generator.png
rename to examples/dataflow-examples/python/dataflow-data-generator/img/data-generator.png
diff --git a/examples/dataflow-data-generator/img/distribution-matcher.png b/examples/dataflow-examples/python/dataflow-data-generator/img/distribution-matcher.png
similarity index 100%
rename from examples/dataflow-data-generator/img/distribution-matcher.png
rename to examples/dataflow-examples/python/dataflow-data-generator/img/distribution-matcher.png
diff --git a/examples/dataflow-data-generator/requirements.txt b/examples/dataflow-examples/python/dataflow-data-generator/requirements.txt
similarity index 100%
rename from examples/dataflow-data-generator/requirements.txt
rename to examples/dataflow-examples/python/dataflow-data-generator/requirements.txt
diff --git a/examples/dataflow-flex-python/Dockerfile_Launcher b/examples/dataflow-examples/python/dataflow-flex-python/Dockerfile_Launcher
similarity index 100%
rename from examples/dataflow-flex-python/Dockerfile_Launcher
rename to examples/dataflow-examples/python/dataflow-flex-python/Dockerfile_Launcher
diff --git a/examples/dataflow-flex-python/Dockerfile_SDK b/examples/dataflow-examples/python/dataflow-flex-python/Dockerfile_SDK
similarity index 100%
rename from examples/dataflow-flex-python/Dockerfile_SDK
rename to examples/dataflow-examples/python/dataflow-flex-python/Dockerfile_SDK
diff --git a/examples/dataflow-flex-python/README.md b/examples/dataflow-examples/python/dataflow-flex-python/README.md
similarity index 100%
rename from examples/dataflow-flex-python/README.md
rename to examples/dataflow-examples/python/dataflow-flex-python/README.md
diff --git a/examples/dataflow-flex-python/cloudbuild_base.yaml b/examples/dataflow-examples/python/dataflow-flex-python/cloudbuild_base.yaml
similarity index 100%
rename from examples/dataflow-flex-python/cloudbuild_base.yaml
rename to examples/dataflow-examples/python/dataflow-flex-python/cloudbuild_base.yaml
diff --git a/examples/dataflow-flex-python/cloudbuild_df_job.yaml b/examples/dataflow-examples/python/dataflow-flex-python/cloudbuild_df_job.yaml
similarity index 100%
rename from examples/dataflow-flex-python/cloudbuild_df_job.yaml
rename to examples/dataflow-examples/python/dataflow-flex-python/cloudbuild_df_job.yaml
diff --git a/examples/dataflow-flex-python/composer_variables.template b/examples/dataflow-examples/python/dataflow-flex-python/composer_variables.template
similarity index 100%
rename from examples/dataflow-flex-python/composer_variables.template
rename to examples/dataflow-examples/python/dataflow-flex-python/composer_variables.template
diff --git a/examples/dataflow-flex-python/dag/xml-to-bq-dag.py b/examples/dataflow-examples/python/dataflow-flex-python/dag/xml-to-bq-dag.py
similarity index 100%
rename from examples/dataflow-flex-python/dag/xml-to-bq-dag.py
rename to examples/dataflow-examples/python/dataflow-flex-python/dag/xml-to-bq-dag.py
diff --git a/examples/dataflow-flex-python/df-package/corder/__init__.py b/examples/dataflow-examples/python/dataflow-flex-python/df-package/corder/__init__.py
similarity index 100%
rename from examples/dataflow-flex-python/df-package/corder/__init__.py
rename to examples/dataflow-examples/python/dataflow-flex-python/df-package/corder/__init__.py
diff --git a/examples/dataflow-flex-python/df-package/corder/bq_schema.py b/examples/dataflow-examples/python/dataflow-flex-python/df-package/corder/bq_schema.py
similarity index 100%
rename from examples/dataflow-flex-python/df-package/corder/bq_schema.py
rename to examples/dataflow-examples/python/dataflow-flex-python/df-package/corder/bq_schema.py
diff --git a/examples/dataflow-flex-python/df-package/corder/customer_orders.py b/examples/dataflow-examples/python/dataflow-flex-python/df-package/corder/customer_orders.py
similarity index 100%
rename from examples/dataflow-flex-python/df-package/corder/customer_orders.py
rename to examples/dataflow-examples/python/dataflow-flex-python/df-package/corder/customer_orders.py
diff --git a/examples/dataflow-flex-python/df-package/corder/customer_orders_test.py b/examples/dataflow-examples/python/dataflow-flex-python/df-package/corder/customer_orders_test.py
similarity index 100%
rename from examples/dataflow-flex-python/df-package/corder/customer_orders_test.py
rename to examples/dataflow-examples/python/dataflow-flex-python/df-package/corder/customer_orders_test.py
diff --git a/examples/dataflow-flex-python/df-package/corder/models.py b/examples/dataflow-examples/python/dataflow-flex-python/df-package/corder/models.py
similarity index 100%
rename from examples/dataflow-flex-python/df-package/corder/models.py
rename to examples/dataflow-examples/python/dataflow-flex-python/df-package/corder/models.py
diff --git a/examples/dataflow-flex-python/df-package/main.py b/examples/dataflow-examples/python/dataflow-flex-python/df-package/main.py
similarity index 100%
rename from examples/dataflow-flex-python/df-package/main.py
rename to examples/dataflow-examples/python/dataflow-flex-python/df-package/main.py
diff --git a/examples/dataflow-flex-python/df-package/setup.py b/examples/dataflow-examples/python/dataflow-flex-python/df-package/setup.py
similarity index 100%
rename from examples/dataflow-flex-python/df-package/setup.py
rename to examples/dataflow-examples/python/dataflow-flex-python/df-package/setup.py
diff --git a/examples/dataflow-flex-python/metadata.json b/examples/dataflow-examples/python/dataflow-flex-python/metadata.json
similarity index 100%
rename from examples/dataflow-flex-python/metadata.json
rename to examples/dataflow-examples/python/dataflow-flex-python/metadata.json
diff --git a/examples/dataflow-flex-python/requirements-test.txt b/examples/dataflow-examples/python/dataflow-flex-python/requirements-test.txt
similarity index 100%
rename from examples/dataflow-flex-python/requirements-test.txt
rename to examples/dataflow-examples/python/dataflow-flex-python/requirements-test.txt
diff --git a/examples/dataflow-flex-python/requirements.txt b/examples/dataflow-examples/python/dataflow-flex-python/requirements.txt
similarity index 100%
rename from examples/dataflow-flex-python/requirements.txt
rename to examples/dataflow-examples/python/dataflow-flex-python/requirements.txt
diff --git a/examples/dataflow-flex-python/sample-data/customer-orders.xml b/examples/dataflow-examples/python/dataflow-flex-python/sample-data/customer-orders.xml
similarity index 100%
rename from examples/dataflow-flex-python/sample-data/customer-orders.xml
rename to examples/dataflow-examples/python/dataflow-flex-python/sample-data/customer-orders.xml
diff --git a/examples/dataflow-flex-python/sample-data/customer_orders.xsd b/examples/dataflow-examples/python/dataflow-flex-python/sample-data/customer_orders.xsd
similarity index 100%
rename from examples/dataflow-flex-python/sample-data/customer_orders.xsd
rename to examples/dataflow-examples/python/dataflow-flex-python/sample-data/customer_orders.xsd
diff --git a/examples/dataflow-flex-python/sample-data/customers.xml b/examples/dataflow-examples/python/dataflow-flex-python/sample-data/customers.xml
similarity index 100%
rename from examples/dataflow-flex-python/sample-data/customers.xml
rename to examples/dataflow-examples/python/dataflow-flex-python/sample-data/customers.xml
diff --git a/examples/dataflow-flex-python/sample-data/empty_data.xml b/examples/dataflow-examples/python/dataflow-flex-python/sample-data/empty_data.xml
similarity index 100%
rename from examples/dataflow-flex-python/sample-data/empty_data.xml
rename to examples/dataflow-examples/python/dataflow-flex-python/sample-data/empty_data.xml
diff --git a/examples/dataflow-flex-python/sample-data/headers_only.xml b/examples/dataflow-examples/python/dataflow-flex-python/sample-data/headers_only.xml
similarity index 100%
rename from examples/dataflow-flex-python/sample-data/headers_only.xml
rename to examples/dataflow-examples/python/dataflow-flex-python/sample-data/headers_only.xml
diff --git a/examples/dataflow-flex-python/sample-data/invalid.xml b/examples/dataflow-examples/python/dataflow-flex-python/sample-data/invalid.xml
similarity index 100%
rename from examples/dataflow-flex-python/sample-data/invalid.xml
rename to examples/dataflow-examples/python/dataflow-flex-python/sample-data/invalid.xml
diff --git a/examples/dataflow-flex-python/sample-data/orders.xml b/examples/dataflow-examples/python/dataflow-flex-python/sample-data/orders.xml
similarity index 100%
rename from examples/dataflow-flex-python/sample-data/orders.xml
rename to examples/dataflow-examples/python/dataflow-flex-python/sample-data/orders.xml
diff --git a/examples/dataflow-xml-pubsub-to-gcs/README.md b/examples/dataflow-examples/python/dataflow-xml-pubsub-to-gcs/README.md
similarity index 100%
rename from examples/dataflow-xml-pubsub-to-gcs/README.md
rename to examples/dataflow-examples/python/dataflow-xml-pubsub-to-gcs/README.md
diff --git a/examples/dataflow-xml-pubsub-to-gcs/img/Dataflow PubSub XML to GCS.png b/examples/dataflow-examples/python/dataflow-xml-pubsub-to-gcs/img/Dataflow PubSub XML to GCS.png
similarity index 100%
rename from examples/dataflow-xml-pubsub-to-gcs/img/Dataflow PubSub XML to GCS.png
rename to examples/dataflow-examples/python/dataflow-xml-pubsub-to-gcs/img/Dataflow PubSub XML to GCS.png
diff --git a/examples/dataflow-xml-pubsub-to-gcs/python/README.md b/examples/dataflow-examples/python/dataflow-xml-pubsub-to-gcs/python/README.md
similarity index 100%
rename from examples/dataflow-xml-pubsub-to-gcs/python/README.md
rename to examples/dataflow-examples/python/dataflow-xml-pubsub-to-gcs/python/README.md
diff --git a/examples/dataflow-xml-pubsub-to-gcs/python/beamPubSubXml2Gcs.py b/examples/dataflow-examples/python/dataflow-xml-pubsub-to-gcs/python/beamPubSubXml2Gcs.py
similarity index 100%
rename from examples/dataflow-xml-pubsub-to-gcs/python/beamPubSubXml2Gcs.py
rename to examples/dataflow-examples/python/dataflow-xml-pubsub-to-gcs/python/beamPubSubXml2Gcs.py
diff --git a/examples/dataflow-xml-pubsub-to-gcs/python/publish2PubSub.py b/examples/dataflow-examples/python/dataflow-xml-pubsub-to-gcs/python/publish2PubSub.py
similarity index 100%
rename from examples/dataflow-xml-pubsub-to-gcs/python/publish2PubSub.py
rename to examples/dataflow-examples/python/dataflow-xml-pubsub-to-gcs/python/publish2PubSub.py
diff --git a/examples/dataflow-xml-pubsub-to-gcs/python/requirements.txt b/examples/dataflow-examples/python/dataflow-xml-pubsub-to-gcs/python/requirements.txt
similarity index 100%
rename from examples/dataflow-xml-pubsub-to-gcs/python/requirements.txt
rename to examples/dataflow-examples/python/dataflow-xml-pubsub-to-gcs/python/requirements.txt
diff --git a/examples/dataflow-xml-pubsub-to-gcs/python/.vscode/launch.json b/examples/dataflow-xml-pubsub-to-gcs/python/.vscode/launch.json
deleted file mode 100644
index 6b23294ede..0000000000
--- a/examples/dataflow-xml-pubsub-to-gcs/python/.vscode/launch.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    // Copyright 2023 Google LLC
-
-    // 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
-    
-    //     https://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.
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Debug pipeline locally",
-            "type": "python",
-            "request": "launch",
-            "program": "./beamPubSubXml2Gcs.py",
-            "console": "integratedTerminal",
-            "justMyCode": true,
-            "args": ["--project=my-test-project",
-                "--input_topic=xml_messages",
-                "--runner=DirectRunner",
-                "--gcs_path=gs://test-pubsub-xml-bucket/",
-                "--window_size=1.0",
-                "--num_shards=2"
-            ],
-        }
-    ]
-}
\ No newline at end of file