diff --git a/README.md b/README.md
index 5b1d117fd3..dcd031475c 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,25 @@
 # Professional Services
-This respository is owned by Google's Professional Services team and is organized by service-areas.
+Common solutions and tools developed by Google Cloud's Professional Services team.
 
-## Service areas
- * [Application development](/application-development/README.md)
- * [Data analytics](/data-analytics/README.md)
- * [Infrastructure](/infrastructure/README.md)
- * [Machine learning](/machine-learning/README.md)
+## Examples
+The examples folder contains example solutions across a variety of Google Cloud Platform products. Use these solutions as a reference for your own or extend them to fit your particular use case.
+
+* [BigQuery Cross Project Slot Monitoring](/examples/bigquery-cross-project-slot-monitoring) - Solution to help monitoring slot utilization across multiple projects, while breaking down allocation per project.
+* [Cloud Composer Examples](/examples/cloud-composer-examples) - Examples of using Cloud Composer, GCP's managed Apache Airflow service.
+* [CloudML Energy Price Forecasting](/examples/cloudml-energy-price-forecasting) - Predicting the future energy price based on historical price and weather.
+* [CloudML Fraud Detection](/examples/cloudml-fraud-detection) - Fraud detection model for credit-cards transactions
+* [Dataflow Elasticsearch Indexer](/examples/dataflow-elasticsearch-indexer) - An example pipeline that demonstrates the process of reading JSON documents from Cloud Pub/Sub, enhancing the document using metadata stored in Cloud Bigtable and indexing those documents into [Elasticsearch](https://www.elastic.co/).
+* [Dataflow Python Examples](/examples/dataflow-python-examples) - Various ETL examples using the Dataflow Python SDK.
+* [IoT Nirvana](/examples/iot-nirvana) - An end-to-end Internet of Things architecture running on Google Cloud Platform.
+* [Spinnaker](/examples/spinnaker) - Example pipelines for a Canary / Production deployment process.
+
+## Tools
+The tools folder contains ready-made utilities which can simpilfy Google Cloud Platform usage.
+
+* [CloudConnect](/tools/cloudconnect) - A package that automates the setup of dual VPN tunnels between AWS and GCP.
+* [DNS Sync](/tools/dns-sync) - Sync a Cloud DNS zone with GCE resources. Instances and load balancers are added to the cloud DNS zone as they start from compute_engine_activity log events sent from a pub/sub push subscription. Can sync multiple projects to a single Cloud DNS zone.
+* [GKE Billing Export](/tools/gke-billing-export) - Google Kubernetes Engine fine grained billing export.
+* [LabelMaker](/tools/labelmaker) - A tool that reads key:value pairs from a json file and labels the running instance and all attached drives accordingly.
 
 ## Contributing
 The team is currently not accepting contributions.
@@ -18,4 +32,4 @@ This repository and its contents are not an official Google Product.
 
 ## Contact
 Questions, issues, and comments should be directed to
-[professional-services-oss@google.com](mailto:professional-services@google.com).
+[professional-services-oss@google.com](mailto:professional-services-oss@google.com).
diff --git a/application-development/README.md b/application-development/README.md
deleted file mode 100644
index a32da0766b..0000000000
--- a/application-development/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Professional Services
-## Application development
-A repository of application development solutions.
-
-  * [examples](#examples)
-
-### [examples](examples/)
-  A collection of example config files for various applications.
diff --git a/data-analytics/README.md b/data-analytics/README.md
deleted file mode 100644
index 0d1a6c6670..0000000000
--- a/data-analytics/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Data analytics
-This is a repository of data and analytics solutions.  
-
-## Python Dataflow examples
-The [Dataflow python examples](dataflow-python-examples/README.md) contain several end to end examples demonstrating 
-the Dataflow Python API.  The examples are solutions to common use cases we see in the field.
-
-The solutions below become more complex as we incorporate more Dataflow features.
-
-## Cloud Composer examples
-The [Cloud Composer examples](cloud-composer-examples/README.md) contains an end to end example demonstrating the use
-of a Cloud Composer workflow to run a Cloud Dataflow job. The example uses Cloud Function to trigger the workflow.
-
-## Cloud Dataflow - Elasticsearch Indexer example
-The [Dataflow Elasticsearch Indexer](dataflow-elasticsearch-indexer/README.md) contains an example pipeline that demonstrates the process of reading JSON documents from Cloud Pub/Sub, enhancing the document using metadata stored in Cloud Bigtable and indexing those documents into [Elasticsearch](https://www.elastic.co/). The pipeline also validates the documents for correctness and availability of metadata and publishes any documents that fail validation into another Cloud PubSub topic for debugging and eventual reprocessing.
-
-## IoT Nirvana
-The [IoT Nirvana](iot-nirvana/README.md) folder contains an end to end solution
-demonstrating a complete Internet of Things architecture built on Google Cloud
-Platform. It uses the following Google Cloud products: IoT Core, Pub/Sub,
-Dataflow, BigQuery, Datastore, AppEngine and Compute Engine.
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/README.md b/examples/bigquery-cross-project-slot-monitoring/README.md
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/README.md
rename to examples/bigquery-cross-project-slot-monitoring/README.md
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/app.yaml b/examples/bigquery-cross-project-slot-monitoring/app.yaml
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/app.yaml
rename to examples/bigquery-cross-project-slot-monitoring/app.yaml
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/appengine_config.py b/examples/bigquery-cross-project-slot-monitoring/appengine_config.py
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/appengine_config.py
rename to examples/bigquery-cross-project-slot-monitoring/appengine_config.py
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/__init__.py b/examples/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/__init__.py
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/__init__.py
rename to examples/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/__init__.py
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/config.py b/examples/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/config.py
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/config.py
rename to examples/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/config.py
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/constants.py b/examples/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/constants.py
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/constants.py
rename to examples/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/constants.py
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/helpers.py b/examples/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/helpers.py
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/helpers.py
rename to examples/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/helpers.py
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/main.py b/examples/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/main.py
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/main.py
rename to examples/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/main.py
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/metrics.py b/examples/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/metrics.py
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/metrics.py
rename to examples/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/metrics.py
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/schema.py b/examples/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/schema.py
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/schema.py
rename to examples/bigquery-cross-project-slot-monitoring/bigquery_slots_monitoring/schema.py
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/cron.yaml b/examples/bigquery-cross-project-slot-monitoring/cron.yaml
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/cron.yaml
rename to examples/bigquery-cross-project-slot-monitoring/cron.yaml
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/img/add_chart.png b/examples/bigquery-cross-project-slot-monitoring/img/add_chart.png
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/img/add_chart.png
rename to examples/bigquery-cross-project-slot-monitoring/img/add_chart.png
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/img/stacked_chart.png b/examples/bigquery-cross-project-slot-monitoring/img/stacked_chart.png
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/img/stacked_chart.png
rename to examples/bigquery-cross-project-slot-monitoring/img/stacked_chart.png
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/queue.yaml b/examples/bigquery-cross-project-slot-monitoring/queue.yaml
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/queue.yaml
rename to examples/bigquery-cross-project-slot-monitoring/queue.yaml
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/requirements.txt b/examples/bigquery-cross-project-slot-monitoring/requirements.txt
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/requirements.txt
rename to examples/bigquery-cross-project-slot-monitoring/requirements.txt
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/setup.py b/examples/bigquery-cross-project-slot-monitoring/setup.py
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/setup.py
rename to examples/bigquery-cross-project-slot-monitoring/setup.py
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/tests/README.md b/examples/bigquery-cross-project-slot-monitoring/tests/README.md
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/tests/README.md
rename to examples/bigquery-cross-project-slot-monitoring/tests/README.md
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/tests/helpers_test.py b/examples/bigquery-cross-project-slot-monitoring/tests/helpers_test.py
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/tests/helpers_test.py
rename to examples/bigquery-cross-project-slot-monitoring/tests/helpers_test.py
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/tests/main_test.py b/examples/bigquery-cross-project-slot-monitoring/tests/main_test.py
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/tests/main_test.py
rename to examples/bigquery-cross-project-slot-monitoring/tests/main_test.py
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/tests/metrics_test.py b/examples/bigquery-cross-project-slot-monitoring/tests/metrics_test.py
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/tests/metrics_test.py
rename to examples/bigquery-cross-project-slot-monitoring/tests/metrics_test.py
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/tests/requirements.txt b/examples/bigquery-cross-project-slot-monitoring/tests/requirements.txt
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/tests/requirements.txt
rename to examples/bigquery-cross-project-slot-monitoring/tests/requirements.txt
diff --git a/data-analytics/bigquery-cross-project-slot-monitoring/tests/runner.py b/examples/bigquery-cross-project-slot-monitoring/tests/runner.py
similarity index 100%
rename from data-analytics/bigquery-cross-project-slot-monitoring/tests/runner.py
rename to examples/bigquery-cross-project-slot-monitoring/tests/runner.py
diff --git a/data-analytics/cloud-composer-examples/README.md b/examples/cloud-composer-examples/README.md
similarity index 100%
rename from data-analytics/cloud-composer-examples/README.md
rename to examples/cloud-composer-examples/README.md
diff --git a/data-analytics/cloud-composer-examples/composer_dataflow_examples/README.md b/examples/cloud-composer-examples/composer_dataflow_examples/README.md
similarity index 100%
rename from data-analytics/cloud-composer-examples/composer_dataflow_examples/README.md
rename to examples/cloud-composer-examples/composer_dataflow_examples/README.md
diff --git a/data-analytics/cloud-composer-examples/composer_dataflow_examples/__init__.py b/examples/cloud-composer-examples/composer_dataflow_examples/__init__.py
similarity index 100%
rename from data-analytics/cloud-composer-examples/composer_dataflow_examples/__init__.py
rename to examples/cloud-composer-examples/composer_dataflow_examples/__init__.py
diff --git a/data-analytics/cloud-composer-examples/composer_dataflow_examples/dataflow/__init__.py b/examples/cloud-composer-examples/composer_dataflow_examples/dataflow/__init__.py
similarity index 100%
rename from data-analytics/cloud-composer-examples/composer_dataflow_examples/dataflow/__init__.py
rename to examples/cloud-composer-examples/composer_dataflow_examples/dataflow/__init__.py
diff --git a/data-analytics/cloud-composer-examples/composer_dataflow_examples/dataflow/process_delimited.py b/examples/cloud-composer-examples/composer_dataflow_examples/dataflow/process_delimited.py
similarity index 100%
rename from data-analytics/cloud-composer-examples/composer_dataflow_examples/dataflow/process_delimited.py
rename to examples/cloud-composer-examples/composer_dataflow_examples/dataflow/process_delimited.py
diff --git a/data-analytics/cloud-composer-examples/composer_dataflow_examples/resources/usa_names.csv b/examples/cloud-composer-examples/composer_dataflow_examples/resources/usa_names.csv
similarity index 100%
rename from data-analytics/cloud-composer-examples/composer_dataflow_examples/resources/usa_names.csv
rename to examples/cloud-composer-examples/composer_dataflow_examples/resources/usa_names.csv
diff --git a/data-analytics/cloud-composer-examples/composer_dataflow_examples/simple_load_dag.py b/examples/cloud-composer-examples/composer_dataflow_examples/simple_load_dag.py
similarity index 100%
rename from data-analytics/cloud-composer-examples/composer_dataflow_examples/simple_load_dag.py
rename to examples/cloud-composer-examples/composer_dataflow_examples/simple_load_dag.py
diff --git a/data-analytics/cloud-composer-examples/composer_http_post_example/README.md b/examples/cloud-composer-examples/composer_http_post_example/README.md
similarity index 100%
rename from data-analytics/cloud-composer-examples/composer_http_post_example/README.md
rename to examples/cloud-composer-examples/composer_http_post_example/README.md
diff --git a/data-analytics/cloud-composer-examples/composer_http_post_example/__init__.py b/examples/cloud-composer-examples/composer_http_post_example/__init__.py
similarity index 100%
rename from data-analytics/cloud-composer-examples/composer_http_post_example/__init__.py
rename to examples/cloud-composer-examples/composer_http_post_example/__init__.py
diff --git a/data-analytics/cloud-composer-examples/composer_http_post_example/airflow-ui.png b/examples/cloud-composer-examples/composer_http_post_example/airflow-ui.png
similarity index 100%
rename from data-analytics/cloud-composer-examples/composer_http_post_example/airflow-ui.png
rename to examples/cloud-composer-examples/composer_http_post_example/airflow-ui.png
diff --git a/data-analytics/cloud-composer-examples/composer_http_post_example/dag_trigger.py b/examples/cloud-composer-examples/composer_http_post_example/dag_trigger.py
similarity index 100%
rename from data-analytics/cloud-composer-examples/composer_http_post_example/dag_trigger.py
rename to examples/cloud-composer-examples/composer_http_post_example/dag_trigger.py
diff --git a/data-analytics/cloud-composer-examples/composer_http_post_example/ephemeral_dataproc_spark_dag.py b/examples/cloud-composer-examples/composer_http_post_example/ephemeral_dataproc_spark_dag.py
similarity index 100%
rename from data-analytics/cloud-composer-examples/composer_http_post_example/ephemeral_dataproc_spark_dag.py
rename to examples/cloud-composer-examples/composer_http_post_example/ephemeral_dataproc_spark_dag.py
diff --git a/data-analytics/cloud-composer-examples/composer_http_post_example/make_iap_request.py b/examples/cloud-composer-examples/composer_http_post_example/make_iap_request.py
similarity index 100%
rename from data-analytics/cloud-composer-examples/composer_http_post_example/make_iap_request.py
rename to examples/cloud-composer-examples/composer_http_post_example/make_iap_request.py
diff --git a/data-analytics/cloud-composer-examples/composer_http_post_example/spark_avg_speed.py b/examples/cloud-composer-examples/composer_http_post_example/spark_avg_speed.py
similarity index 100%
rename from data-analytics/cloud-composer-examples/composer_http_post_example/spark_avg_speed.py
rename to examples/cloud-composer-examples/composer_http_post_example/spark_avg_speed.py
diff --git a/data-analytics/cloud-composer-examples/img/airflow-ui.png b/examples/cloud-composer-examples/img/airflow-ui.png
similarity index 100%
rename from data-analytics/cloud-composer-examples/img/airflow-ui.png
rename to examples/cloud-composer-examples/img/airflow-ui.png
diff --git a/data-analytics/cloud-composer-examples/img/bucket-example.png b/examples/cloud-composer-examples/img/bucket-example.png
similarity index 100%
rename from data-analytics/cloud-composer-examples/img/bucket-example.png
rename to examples/cloud-composer-examples/img/bucket-example.png
diff --git a/data-analytics/cloud-composer-examples/img/composer-http-post-arch.png b/examples/cloud-composer-examples/img/composer-http-post-arch.png
similarity index 100%
rename from data-analytics/cloud-composer-examples/img/composer-http-post-arch.png
rename to examples/cloud-composer-examples/img/composer-http-post-arch.png
diff --git a/data-analytics/cloud-composer-examples/img/dag-folder-example.png b/examples/cloud-composer-examples/img/dag-folder-example.png
similarity index 100%
rename from data-analytics/cloud-composer-examples/img/dag-folder-example.png
rename to examples/cloud-composer-examples/img/dag-folder-example.png
diff --git a/data-analytics/cloud-composer-examples/img/sample-dag.png b/examples/cloud-composer-examples/img/sample-dag.png
similarity index 100%
rename from data-analytics/cloud-composer-examples/img/sample-dag.png
rename to examples/cloud-composer-examples/img/sample-dag.png
diff --git a/data-analytics/cloud-composer-examples/img/workflow-overview.png b/examples/cloud-composer-examples/img/workflow-overview.png
similarity index 100%
rename from data-analytics/cloud-composer-examples/img/workflow-overview.png
rename to examples/cloud-composer-examples/img/workflow-overview.png
diff --git a/data-analytics/cloud-composer-examples/requirements.txt b/examples/cloud-composer-examples/requirements.txt
similarity index 100%
rename from data-analytics/cloud-composer-examples/requirements.txt
rename to examples/cloud-composer-examples/requirements.txt
diff --git a/data-analytics/cloud-composer-examples/tests/test_cloud_composer_examples.py b/examples/cloud-composer-examples/tests/test_cloud_composer_examples.py
similarity index 100%
rename from data-analytics/cloud-composer-examples/tests/test_cloud_composer_examples.py
rename to examples/cloud-composer-examples/tests/test_cloud_composer_examples.py
diff --git a/data-analytics/cloud-composer-examples/tests/test_spark_avg_speed.py b/examples/cloud-composer-examples/tests/test_spark_avg_speed.py
similarity index 100%
rename from data-analytics/cloud-composer-examples/tests/test_spark_avg_speed.py
rename to examples/cloud-composer-examples/tests/test_spark_avg_speed.py
diff --git a/machine-learning/solutions/energy_price_forecasting/.ipynb_checkpoints/Triple+Exponential+Smoothing+Forecasting-checkpoint.ipynb b/examples/cloudml-energy-price-forecasting/.ipynb_checkpoints/Triple+Exponential+Smoothing+Forecasting-checkpoint.ipynb
similarity index 100%
rename from machine-learning/solutions/energy_price_forecasting/.ipynb_checkpoints/Triple+Exponential+Smoothing+Forecasting-checkpoint.ipynb
rename to examples/cloudml-energy-price-forecasting/.ipynb_checkpoints/Triple+Exponential+Smoothing+Forecasting-checkpoint.ipynb
diff --git a/machine-learning/solutions/energy_price_forecasting/README.md b/examples/cloudml-energy-price-forecasting/README.md
similarity index 100%
rename from machine-learning/solutions/energy_price_forecasting/README.md
rename to examples/cloudml-energy-price-forecasting/README.md
diff --git a/machine-learning/solutions/energy_price_forecasting/config.yaml b/examples/cloudml-energy-price-forecasting/config.yaml
similarity index 100%
rename from machine-learning/solutions/energy_price_forecasting/config.yaml
rename to examples/cloudml-energy-price-forecasting/config.yaml
diff --git a/machine-learning/solutions/energy_price_forecasting/config_continue_tuning.yaml b/examples/cloudml-energy-price-forecasting/config_continue_tuning.yaml
similarity index 100%
rename from machine-learning/solutions/energy_price_forecasting/config_continue_tuning.yaml
rename to examples/cloudml-energy-price-forecasting/config_continue_tuning.yaml
diff --git a/data-analytics/dataflow-python-examples/dataflow_python_examples/__init__.py b/examples/cloudml-energy-price-forecasting/constants/__init__.py
similarity index 100%
rename from data-analytics/dataflow-python-examples/dataflow_python_examples/__init__.py
rename to examples/cloudml-energy-price-forecasting/constants/__init__.py
diff --git a/machine-learning/solutions/energy_price_forecasting/constants/constants.py b/examples/cloudml-energy-price-forecasting/constants/constants.py
similarity index 100%
rename from machine-learning/solutions/energy_price_forecasting/constants/constants.py
rename to examples/cloudml-energy-price-forecasting/constants/constants.py
diff --git a/machine-learning/solutions/energy_price_forecasting/constants/__init__.py b/examples/cloudml-energy-price-forecasting/data_preparation/__init__.py
similarity index 100%
rename from machine-learning/solutions/energy_price_forecasting/constants/__init__.py
rename to examples/cloudml-energy-price-forecasting/data_preparation/__init__.py
diff --git a/machine-learning/solutions/energy_price_forecasting/data_preparation/data_prep.py b/examples/cloudml-energy-price-forecasting/data_preparation/data_prep.py
similarity index 100%
rename from machine-learning/solutions/energy_price_forecasting/data_preparation/data_prep.py
rename to examples/cloudml-energy-price-forecasting/data_preparation/data_prep.py
diff --git a/machine-learning/solutions/energy_price_forecasting/data_preparation/prepare_data.sql b/examples/cloudml-energy-price-forecasting/data_preparation/prepare_data.sql
similarity index 100%
rename from machine-learning/solutions/energy_price_forecasting/data_preparation/prepare_data.sql
rename to examples/cloudml-energy-price-forecasting/data_preparation/prepare_data.sql
diff --git a/machine-learning/solutions/energy_price_forecasting/data_preparation/weather_mean_std.sql b/examples/cloudml-energy-price-forecasting/data_preparation/weather_mean_std.sql
similarity index 100%
rename from machine-learning/solutions/energy_price_forecasting/data_preparation/weather_mean_std.sql
rename to examples/cloudml-energy-price-forecasting/data_preparation/weather_mean_std.sql
diff --git a/machine-learning/solutions/energy_price_forecasting/setup.py b/examples/cloudml-energy-price-forecasting/setup.py
similarity index 100%
rename from machine-learning/solutions/energy_price_forecasting/setup.py
rename to examples/cloudml-energy-price-forecasting/setup.py
diff --git a/machine-learning/solutions/energy_price_forecasting/data_preparation/__init__.py b/examples/cloudml-energy-price-forecasting/trainer/__init__.py
similarity index 100%
rename from machine-learning/solutions/energy_price_forecasting/data_preparation/__init__.py
rename to examples/cloudml-energy-price-forecasting/trainer/__init__.py
diff --git a/machine-learning/solutions/energy_price_forecasting/trainer/inputs.py b/examples/cloudml-energy-price-forecasting/trainer/inputs.py
similarity index 100%
rename from machine-learning/solutions/energy_price_forecasting/trainer/inputs.py
rename to examples/cloudml-energy-price-forecasting/trainer/inputs.py
diff --git a/machine-learning/solutions/energy_price_forecasting/trainer/model.py b/examples/cloudml-energy-price-forecasting/trainer/model.py
similarity index 100%
rename from machine-learning/solutions/energy_price_forecasting/trainer/model.py
rename to examples/cloudml-energy-price-forecasting/trainer/model.py
diff --git a/machine-learning/solutions/energy_price_forecasting/trainer/task.py b/examples/cloudml-energy-price-forecasting/trainer/task.py
similarity index 100%
rename from machine-learning/solutions/energy_price_forecasting/trainer/task.py
rename to examples/cloudml-energy-price-forecasting/trainer/task.py
diff --git a/machine-learning/solutions/fraud_detection/README.MD b/examples/cloudml-fraud-detection/README.MD
similarity index 100%
rename from machine-learning/solutions/fraud_detection/README.MD
rename to examples/cloudml-fraud-detection/README.MD
diff --git a/machine-learning/solutions/energy_price_forecasting/trainer/__init__.py b/examples/cloudml-fraud-detection/__init__.py
similarity index 100%
rename from machine-learning/solutions/energy_price_forecasting/trainer/__init__.py
rename to examples/cloudml-fraud-detection/__init__.py
diff --git a/machine-learning/solutions/fraud_detection/__init__.py b/examples/cloudml-fraud-detection/constants/__init__.py
similarity index 100%
rename from machine-learning/solutions/fraud_detection/__init__.py
rename to examples/cloudml-fraud-detection/constants/__init__.py
diff --git a/machine-learning/solutions/fraud_detection/constants/constants.py b/examples/cloudml-fraud-detection/constants/constants.py
similarity index 100%
rename from machine-learning/solutions/fraud_detection/constants/constants.py
rename to examples/cloudml-fraud-detection/constants/constants.py
diff --git a/machine-learning/solutions/fraud_detection/fraud_detection.ipynb b/examples/cloudml-fraud-detection/fraud_detection.ipynb
similarity index 100%
rename from machine-learning/solutions/fraud_detection/fraud_detection.ipynb
rename to examples/cloudml-fraud-detection/fraud_detection.ipynb
diff --git a/machine-learning/solutions/fraud_detection/hyperparams.yaml b/examples/cloudml-fraud-detection/hyperparams.yaml
similarity index 100%
rename from machine-learning/solutions/fraud_detection/hyperparams.yaml
rename to examples/cloudml-fraud-detection/hyperparams.yaml
diff --git a/machine-learning/solutions/fraud_detection/out_of_sample_analysis.py b/examples/cloudml-fraud-detection/out_of_sample_analysis.py
similarity index 100%
rename from machine-learning/solutions/fraud_detection/out_of_sample_analysis.py
rename to examples/cloudml-fraud-detection/out_of_sample_analysis.py
diff --git a/machine-learning/solutions/fraud_detection/preprocess.py b/examples/cloudml-fraud-detection/preprocess.py
similarity index 100%
rename from machine-learning/solutions/fraud_detection/preprocess.py
rename to examples/cloudml-fraud-detection/preprocess.py
diff --git a/machine-learning/solutions/fraud_detection/requirements.txt b/examples/cloudml-fraud-detection/requirements.txt
similarity index 100%
rename from machine-learning/solutions/fraud_detection/requirements.txt
rename to examples/cloudml-fraud-detection/requirements.txt
diff --git a/machine-learning/solutions/fraud_detection/setup.py b/examples/cloudml-fraud-detection/setup.py
similarity index 100%
rename from machine-learning/solutions/fraud_detection/setup.py
rename to examples/cloudml-fraud-detection/setup.py
diff --git a/machine-learning/solutions/fraud_detection/constants/__init__.py b/examples/cloudml-fraud-detection/trainer/__init__.py
similarity index 100%
rename from machine-learning/solutions/fraud_detection/constants/__init__.py
rename to examples/cloudml-fraud-detection/trainer/__init__.py
diff --git a/machine-learning/solutions/fraud_detection/trainer/input_fn_utils.py b/examples/cloudml-fraud-detection/trainer/input_fn_utils.py
similarity index 100%
rename from machine-learning/solutions/fraud_detection/trainer/input_fn_utils.py
rename to examples/cloudml-fraud-detection/trainer/input_fn_utils.py
diff --git a/machine-learning/solutions/fraud_detection/trainer/model.py b/examples/cloudml-fraud-detection/trainer/model.py
similarity index 100%
rename from machine-learning/solutions/fraud_detection/trainer/model.py
rename to examples/cloudml-fraud-detection/trainer/model.py
diff --git a/machine-learning/solutions/fraud_detection/trainer/task.py b/examples/cloudml-fraud-detection/trainer/task.py
similarity index 100%
rename from machine-learning/solutions/fraud_detection/trainer/task.py
rename to examples/cloudml-fraud-detection/trainer/task.py
diff --git a/machine-learning/solutions/fraud_detection/trainer/__init__.py b/examples/cloudml-fraud-detection/utils/__init__.py
similarity index 100%
rename from machine-learning/solutions/fraud_detection/trainer/__init__.py
rename to examples/cloudml-fraud-detection/utils/__init__.py
diff --git a/machine-learning/solutions/fraud_detection/utils/datasettype.py b/examples/cloudml-fraud-detection/utils/datasettype.py
similarity index 100%
rename from machine-learning/solutions/fraud_detection/utils/datasettype.py
rename to examples/cloudml-fraud-detection/utils/datasettype.py
diff --git a/data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/pom.xml b/examples/dataflow-elasticsearch-indexer/ElasticIndexer/pom.xml
similarity index 100%
rename from data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/pom.xml
rename to examples/dataflow-elasticsearch-indexer/ElasticIndexer/pom.xml
diff --git a/data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/IndexerMain.java b/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/IndexerMain.java
similarity index 100%
rename from data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/IndexerMain.java
rename to examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/IndexerMain.java
diff --git a/data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/coders/ErrorMessageCoder.java b/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/coders/ErrorMessageCoder.java
similarity index 100%
rename from data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/coders/ErrorMessageCoder.java
rename to examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/coders/ErrorMessageCoder.java
diff --git a/data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/coders/JsonNodeCoder.java b/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/coders/JsonNodeCoder.java
similarity index 100%
rename from data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/coders/JsonNodeCoder.java
rename to examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/coders/JsonNodeCoder.java
diff --git a/data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ErrorMessage.java b/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ErrorMessage.java
similarity index 100%
rename from data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ErrorMessage.java
rename to examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ErrorMessage.java
diff --git a/data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ExtractKeyFn.java b/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ExtractKeyFn.java
similarity index 100%
rename from data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ExtractKeyFn.java
rename to examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ExtractKeyFn.java
diff --git a/data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ExtractMetadata.java b/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ExtractMetadata.java
similarity index 100%
rename from data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ExtractMetadata.java
rename to examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/ExtractMetadata.java
diff --git a/data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/FailSafeValidate.java b/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/FailSafeValidate.java
similarity index 100%
rename from data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/FailSafeValidate.java
rename to examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/FailSafeValidate.java
diff --git a/data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/InsertMetadataFn.java b/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/InsertMetadataFn.java
similarity index 100%
rename from data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/InsertMetadataFn.java
rename to examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/common/InsertMetadataFn.java
diff --git a/data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/options/BigtableOptions.java b/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/options/BigtableOptions.java
similarity index 100%
rename from data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/options/BigtableOptions.java
rename to examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/options/BigtableOptions.java
diff --git a/data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/options/IndexerOptions.java b/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/options/IndexerOptions.java
similarity index 100%
rename from data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/options/IndexerOptions.java
rename to examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/options/IndexerOptions.java
diff --git a/data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/utils/PublishProducts.java b/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/utils/PublishProducts.java
similarity index 100%
rename from data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/utils/PublishProducts.java
rename to examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/main/java/com/google/cloud/pso/utils/PublishProducts.java
diff --git a/data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/ExtractKeyFnTest.java b/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/ExtractKeyFnTest.java
similarity index 100%
rename from data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/ExtractKeyFnTest.java
rename to examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/ExtractKeyFnTest.java
diff --git a/data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/FailSafeValidateTest.java b/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/FailSafeValidateTest.java
similarity index 100%
rename from data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/FailSafeValidateTest.java
rename to examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/FailSafeValidateTest.java
diff --git a/data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/InsertMetadataFnTest.java b/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/InsertMetadataFnTest.java
similarity index 100%
rename from data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/InsertMetadataFnTest.java
rename to examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/common/InsertMetadataFnTest.java
diff --git a/data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/utils/PublishProductsTest.java b/examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/utils/PublishProductsTest.java
similarity index 100%
rename from data-analytics/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/utils/PublishProductsTest.java
rename to examples/dataflow-elasticsearch-indexer/ElasticIndexer/src/test/java/com/google/cloud/pso/utils/PublishProductsTest.java
diff --git a/data-analytics/dataflow-elasticsearch-indexer/README.md b/examples/dataflow-elasticsearch-indexer/README.md
similarity index 100%
rename from data-analytics/dataflow-elasticsearch-indexer/README.md
rename to examples/dataflow-elasticsearch-indexer/README.md
diff --git a/data-analytics/dataflow-elasticsearch-indexer/img/dataflow_elastic_workflow.png b/examples/dataflow-elasticsearch-indexer/img/dataflow_elastic_workflow.png
similarity index 100%
rename from data-analytics/dataflow-elasticsearch-indexer/img/dataflow_elastic_workflow.png
rename to examples/dataflow-elasticsearch-indexer/img/dataflow_elastic_workflow.png
diff --git a/data-analytics/dataflow-elasticsearch-indexer/img/sample_data_gen_pipeline.png b/examples/dataflow-elasticsearch-indexer/img/sample_data_gen_pipeline.png
similarity index 100%
rename from data-analytics/dataflow-elasticsearch-indexer/img/sample_data_gen_pipeline.png
rename to examples/dataflow-elasticsearch-indexer/img/sample_data_gen_pipeline.png
diff --git a/data-analytics/dataflow-python-examples/README.md b/examples/dataflow-python-examples/README.md
similarity index 100%
rename from data-analytics/dataflow-python-examples/README.md
rename to examples/dataflow-python-examples/README.md
diff --git a/machine-learning/solutions/fraud_detection/utils/__init__.py b/examples/dataflow-python-examples/dataflow_python_examples/__init__.py
similarity index 100%
rename from machine-learning/solutions/fraud_detection/utils/__init__.py
rename to examples/dataflow-python-examples/dataflow_python_examples/__init__.py
diff --git a/data-analytics/dataflow-python-examples/dataflow_python_examples/data_enrichment.py b/examples/dataflow-python-examples/dataflow_python_examples/data_enrichment.py
similarity index 100%
rename from data-analytics/dataflow-python-examples/dataflow_python_examples/data_enrichment.py
rename to examples/dataflow-python-examples/dataflow_python_examples/data_enrichment.py
diff --git a/data-analytics/dataflow-python-examples/dataflow_python_examples/data_generation_for_benchmarking.py b/examples/dataflow-python-examples/dataflow_python_examples/data_generation_for_benchmarking.py
similarity index 100%
rename from data-analytics/dataflow-python-examples/dataflow_python_examples/data_generation_for_benchmarking.py
rename to examples/dataflow-python-examples/dataflow_python_examples/data_generation_for_benchmarking.py
diff --git a/data-analytics/dataflow-python-examples/dataflow_python_examples/data_ingestion.py b/examples/dataflow-python-examples/dataflow_python_examples/data_ingestion.py
similarity index 100%
rename from data-analytics/dataflow-python-examples/dataflow_python_examples/data_ingestion.py
rename to examples/dataflow-python-examples/dataflow_python_examples/data_ingestion.py
diff --git a/data-analytics/dataflow-python-examples/dataflow_python_examples/data_lake_to_mart.py b/examples/dataflow-python-examples/dataflow_python_examples/data_lake_to_mart.py
similarity index 100%
rename from data-analytics/dataflow-python-examples/dataflow_python_examples/data_lake_to_mart.py
rename to examples/dataflow-python-examples/dataflow_python_examples/data_lake_to_mart.py
diff --git a/data-analytics/dataflow-python-examples/dataflow_python_examples/data_lake_to_mart_cogroupbykey.py b/examples/dataflow-python-examples/dataflow_python_examples/data_lake_to_mart_cogroupbykey.py
similarity index 100%
rename from data-analytics/dataflow-python-examples/dataflow_python_examples/data_lake_to_mart_cogroupbykey.py
rename to examples/dataflow-python-examples/dataflow_python_examples/data_lake_to_mart_cogroupbykey.py
diff --git a/data-analytics/dataflow-python-examples/dataflow_python_examples/data_transformation.py b/examples/dataflow-python-examples/dataflow_python_examples/data_transformation.py
similarity index 100%
rename from data-analytics/dataflow-python-examples/dataflow_python_examples/data_transformation.py
rename to examples/dataflow-python-examples/dataflow_python_examples/data_transformation.py
diff --git a/data-analytics/dataflow-python-examples/dataflow_python_examples/image_labels.py b/examples/dataflow-python-examples/dataflow_python_examples/image_labels.py
similarity index 100%
rename from data-analytics/dataflow-python-examples/dataflow_python_examples/image_labels.py
rename to examples/dataflow-python-examples/dataflow_python_examples/image_labels.py
diff --git a/data-analytics/dataflow-python-examples/dataflow_python_examples/resources/customer-schema.json b/examples/dataflow-python-examples/dataflow_python_examples/resources/customer-schema.json
similarity index 100%
rename from data-analytics/dataflow-python-examples/dataflow_python_examples/resources/customer-schema.json
rename to examples/dataflow-python-examples/dataflow_python_examples/resources/customer-schema.json
diff --git a/data-analytics/dataflow-python-examples/dataflow_python_examples/resources/image-list.txt b/examples/dataflow-python-examples/dataflow_python_examples/resources/image-list.txt
similarity index 100%
rename from data-analytics/dataflow-python-examples/dataflow_python_examples/resources/image-list.txt
rename to examples/dataflow-python-examples/dataflow_python_examples/resources/image-list.txt
diff --git a/data-analytics/dataflow-python-examples/dataflow_python_examples/resources/lineorder-schema.json b/examples/dataflow-python-examples/dataflow_python_examples/resources/lineorder-schema.json
similarity index 100%
rename from data-analytics/dataflow-python-examples/dataflow_python_examples/resources/lineorder-schema.json
rename to examples/dataflow-python-examples/dataflow_python_examples/resources/lineorder-schema.json
diff --git a/data-analytics/dataflow-python-examples/dataflow_python_examples/resources/orders_denormalized.json b/examples/dataflow-python-examples/dataflow_python_examples/resources/orders_denormalized.json
similarity index 100%
rename from data-analytics/dataflow-python-examples/dataflow_python_examples/resources/orders_denormalized.json
rename to examples/dataflow-python-examples/dataflow_python_examples/resources/orders_denormalized.json
diff --git a/data-analytics/dataflow-python-examples/dataflow_python_examples/resources/orders_schema.json b/examples/dataflow-python-examples/dataflow_python_examples/resources/orders_schema.json
similarity index 100%
rename from data-analytics/dataflow-python-examples/dataflow_python_examples/resources/orders_schema.json
rename to examples/dataflow-python-examples/dataflow_python_examples/resources/orders_schema.json
diff --git a/data-analytics/dataflow-python-examples/dataflow_python_examples/resources/part-schema.json b/examples/dataflow-python-examples/dataflow_python_examples/resources/part-schema.json
similarity index 100%
rename from data-analytics/dataflow-python-examples/dataflow_python_examples/resources/part-schema.json
rename to examples/dataflow-python-examples/dataflow_python_examples/resources/part-schema.json
diff --git a/data-analytics/dataflow-python-examples/dataflow_python_examples/resources/supplier-schema.json b/examples/dataflow-python-examples/dataflow_python_examples/resources/supplier-schema.json
similarity index 100%
rename from data-analytics/dataflow-python-examples/dataflow_python_examples/resources/supplier-schema.json
rename to examples/dataflow-python-examples/dataflow_python_examples/resources/supplier-schema.json
diff --git a/data-analytics/dataflow-python-examples/dataflow_python_examples/resources/usa_names.json b/examples/dataflow-python-examples/dataflow_python_examples/resources/usa_names.json
similarity index 100%
rename from data-analytics/dataflow-python-examples/dataflow_python_examples/resources/usa_names.json
rename to examples/dataflow-python-examples/dataflow_python_examples/resources/usa_names.json
diff --git a/data-analytics/dataflow-python-examples/dataflow_python_examples/resources/usa_names_with_full_state_name.json b/examples/dataflow-python-examples/dataflow_python_examples/resources/usa_names_with_full_state_name.json
similarity index 100%
rename from data-analytics/dataflow-python-examples/dataflow_python_examples/resources/usa_names_with_full_state_name.json
rename to examples/dataflow-python-examples/dataflow_python_examples/resources/usa_names_with_full_state_name.json
diff --git a/data-analytics/dataflow-python-examples/dataflow_python_examples/resources/usa_names_year_as_date.json b/examples/dataflow-python-examples/dataflow_python_examples/resources/usa_names_year_as_date.json
similarity index 100%
rename from data-analytics/dataflow-python-examples/dataflow_python_examples/resources/usa_names_year_as_date.json
rename to examples/dataflow-python-examples/dataflow_python_examples/resources/usa_names_year_as_date.json
diff --git a/data-analytics/dataflow-python-examples/image-list.txt b/examples/dataflow-python-examples/image-list.txt
similarity index 100%
rename from data-analytics/dataflow-python-examples/image-list.txt
rename to examples/dataflow-python-examples/image-list.txt
diff --git a/data-analytics/dataflow-python-examples/img/1_query_orders.png b/examples/dataflow-python-examples/img/1_query_orders.png
similarity index 100%
rename from data-analytics/dataflow-python-examples/img/1_query_orders.png
rename to examples/dataflow-python-examples/img/1_query_orders.png
diff --git a/data-analytics/dataflow-python-examples/img/2_query_account_details.png b/examples/dataflow-python-examples/img/2_query_account_details.png
similarity index 100%
rename from data-analytics/dataflow-python-examples/img/2_query_account_details.png
rename to examples/dataflow-python-examples/img/2_query_account_details.png
diff --git a/data-analytics/dataflow-python-examples/img/3_custom_python_code.png b/examples/dataflow-python-examples/img/3_custom_python_code.png
similarity index 100%
rename from data-analytics/dataflow-python-examples/img/3_custom_python_code.png
rename to examples/dataflow-python-examples/img/3_custom_python_code.png
diff --git a/data-analytics/dataflow-python-examples/img/4_output_to_bigquery.png b/examples/dataflow-python-examples/img/4_output_to_bigquery.png
similarity index 100%
rename from data-analytics/dataflow-python-examples/img/4_output_to_bigquery.png
rename to examples/dataflow-python-examples/img/4_output_to_bigquery.png
diff --git a/data-analytics/dataflow-python-examples/img/csv_file.png b/examples/dataflow-python-examples/img/csv_file.png
similarity index 100%
rename from data-analytics/dataflow-python-examples/img/csv_file.png
rename to examples/dataflow-python-examples/img/csv_file.png
diff --git a/data-analytics/dataflow-python-examples/img/csv_file_to_bigquery.png b/examples/dataflow-python-examples/img/csv_file_to_bigquery.png
similarity index 100%
rename from data-analytics/dataflow-python-examples/img/csv_file_to_bigquery.png
rename to examples/dataflow-python-examples/img/csv_file_to_bigquery.png
diff --git a/data-analytics/dataflow-python-examples/img/csv_join_bigquery_to_bigquery.png b/examples/dataflow-python-examples/img/csv_join_bigquery_to_bigquery.png
similarity index 100%
rename from data-analytics/dataflow-python-examples/img/csv_join_bigquery_to_bigquery.png
rename to examples/dataflow-python-examples/img/csv_join_bigquery_to_bigquery.png
diff --git a/data-analytics/dataflow-python-examples/img/custom_python_code.png b/examples/dataflow-python-examples/img/custom_python_code.png
similarity index 100%
rename from data-analytics/dataflow-python-examples/img/custom_python_code.png
rename to examples/dataflow-python-examples/img/custom_python_code.png
diff --git a/data-analytics/dataflow-python-examples/img/data_lake_to_data_mart.png b/examples/dataflow-python-examples/img/data_lake_to_data_mart.png
similarity index 100%
rename from data-analytics/dataflow-python-examples/img/data_lake_to_data_mart.png
rename to examples/dataflow-python-examples/img/data_lake_to_data_mart.png
diff --git a/data-analytics/dataflow-python-examples/img/import_state_name_from_bigquery.png b/examples/dataflow-python-examples/img/import_state_name_from_bigquery.png
similarity index 100%
rename from data-analytics/dataflow-python-examples/img/import_state_name_from_bigquery.png
rename to examples/dataflow-python-examples/img/import_state_name_from_bigquery.png
diff --git a/data-analytics/dataflow-python-examples/img/output_to_bigquery.png b/examples/dataflow-python-examples/img/output_to_bigquery.png
similarity index 100%
rename from data-analytics/dataflow-python-examples/img/output_to_bigquery.png
rename to examples/dataflow-python-examples/img/output_to_bigquery.png
diff --git a/data-analytics/dataflow-python-examples/requirements.txt b/examples/dataflow-python-examples/requirements.txt
similarity index 100%
rename from data-analytics/dataflow-python-examples/requirements.txt
rename to examples/dataflow-python-examples/requirements.txt
diff --git a/data-analytics/dataflow-python-examples/setup.py b/examples/dataflow-python-examples/setup.py
similarity index 100%
rename from data-analytics/dataflow-python-examples/setup.py
rename to examples/dataflow-python-examples/setup.py
diff --git a/data-analytics/dataflow-python-examples/tests/test_data_generator.py b/examples/dataflow-python-examples/tests/test_data_generator.py
similarity index 100%
rename from data-analytics/dataflow-python-examples/tests/test_data_generator.py
rename to examples/dataflow-python-examples/tests/test_data_generator.py
diff --git a/data-analytics/dataflow-python-examples/tests/test_image_labels.py b/examples/dataflow-python-examples/tests/test_image_labels.py
similarity index 100%
rename from data-analytics/dataflow-python-examples/tests/test_image_labels.py
rename to examples/dataflow-python-examples/tests/test_image_labels.py
diff --git a/data-analytics/dataflow-python-examples/tests/test_parsing_logic.py b/examples/dataflow-python-examples/tests/test_parsing_logic.py
similarity index 100%
rename from data-analytics/dataflow-python-examples/tests/test_parsing_logic.py
rename to examples/dataflow-python-examples/tests/test_parsing_logic.py
diff --git a/data-analytics/iot-nirvana/.gitignore b/examples/iot-nirvana/.gitignore
similarity index 100%
rename from data-analytics/iot-nirvana/.gitignore
rename to examples/iot-nirvana/.gitignore
diff --git a/data-analytics/iot-nirvana/LICENSE b/examples/iot-nirvana/LICENSE
similarity index 100%
rename from data-analytics/iot-nirvana/LICENSE
rename to examples/iot-nirvana/LICENSE
diff --git a/data-analytics/iot-nirvana/README.md b/examples/iot-nirvana/README.md
similarity index 100%
rename from data-analytics/iot-nirvana/README.md
rename to examples/iot-nirvana/README.md
diff --git a/data-analytics/iot-nirvana/app-engine/pom.xml b/examples/iot-nirvana/app-engine/pom.xml
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/pom.xml
rename to examples/iot-nirvana/app-engine/pom.xml
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/datastore/CityEntity.java b/examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/datastore/CityEntity.java
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/datastore/CityEntity.java
rename to examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/datastore/CityEntity.java
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/datastore/CityTemperature.java b/examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/datastore/CityTemperature.java
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/datastore/CityTemperature.java
rename to examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/datastore/CityTemperature.java
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/datastore/DatastoreService.java b/examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/datastore/DatastoreService.java
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/datastore/DatastoreService.java
rename to examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/datastore/DatastoreService.java
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/ApiInterface.java b/examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/ApiInterface.java
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/ApiInterface.java
rename to examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/ApiInterface.java
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/LoadCities.java b/examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/LoadCities.java
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/LoadCities.java
rename to examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/LoadCities.java
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/LoadCityTemperatures.java b/examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/LoadCityTemperatures.java
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/LoadCityTemperatures.java
rename to examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/LoadCityTemperatures.java
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/RestResponse.java b/examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/RestResponse.java
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/RestResponse.java
rename to examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/RestResponse.java
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/SaveCities.java b/examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/SaveCities.java
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/SaveCities.java
rename to examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/SaveCities.java
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/StartSimulation.java b/examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/StartSimulation.java
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/StartSimulation.java
rename to examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/StartSimulation.java
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/StopSimulation.java b/examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/StopSimulation.java
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/StopSimulation.java
rename to examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/api/StopSimulation.java
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/tasks/AbstractTask.java b/examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/tasks/AbstractTask.java
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/tasks/AbstractTask.java
rename to examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/tasks/AbstractTask.java
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/tasks/CreateInstance.java b/examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/tasks/CreateInstance.java
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/tasks/CreateInstance.java
rename to examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/tasks/CreateInstance.java
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/tasks/RemoveInstances.java b/examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/tasks/RemoveInstances.java
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/tasks/RemoveInstances.java
rename to examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/tasks/RemoveInstances.java
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/tasks/UnregisterDevices.java b/examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/tasks/UnregisterDevices.java
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/tasks/UnregisterDevices.java
rename to examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/servlet/tasks/UnregisterDevices.java
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/shared/CorsFilter.java b/examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/shared/CorsFilter.java
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/shared/CorsFilter.java
rename to examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/shared/CorsFilter.java
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/shared/RetryHttpInitializerWrapper.java b/examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/shared/RetryHttpInitializerWrapper.java
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/shared/RetryHttpInitializerWrapper.java
rename to examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/shared/RetryHttpInitializerWrapper.java
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/shared/Utils.java b/examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/shared/Utils.java
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/shared/Utils.java
rename to examples/iot-nirvana/app-engine/src/main/java/com/google/cloud/demo/iot/nirvana/frontend/shared/Utils.java
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/webapp/WEB-INF/appengine-web.xml b/examples/iot-nirvana/app-engine/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/webapp/WEB-INF/appengine-web.xml
rename to examples/iot-nirvana/app-engine/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/webapp/WEB-INF/datastore-indexes.xml b/examples/iot-nirvana/app-engine/src/main/webapp/WEB-INF/datastore-indexes.xml
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/webapp/WEB-INF/datastore-indexes.xml
rename to examples/iot-nirvana/app-engine/src/main/webapp/WEB-INF/datastore-indexes.xml
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/webapp/WEB-INF/logging.properties b/examples/iot-nirvana/app-engine/src/main/webapp/WEB-INF/logging.properties
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/webapp/WEB-INF/logging.properties
rename to examples/iot-nirvana/app-engine/src/main/webapp/WEB-INF/logging.properties
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/webapp/WEB-INF/queue.xml b/examples/iot-nirvana/app-engine/src/main/webapp/WEB-INF/queue.xml
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/webapp/WEB-INF/queue.xml
rename to examples/iot-nirvana/app-engine/src/main/webapp/WEB-INF/queue.xml
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/webapp/WEB-INF/web.xml b/examples/iot-nirvana/app-engine/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/webapp/WEB-INF/web.xml
rename to examples/iot-nirvana/app-engine/src/main/webapp/WEB-INF/web.xml
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/webapp/config/client.properties b/examples/iot-nirvana/app-engine/src/main/webapp/config/client.properties
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/webapp/config/client.properties
rename to examples/iot-nirvana/app-engine/src/main/webapp/config/client.properties
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/webapp/index.html b/examples/iot-nirvana/app-engine/src/main/webapp/index.html
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/webapp/index.html
rename to examples/iot-nirvana/app-engine/src/main/webapp/index.html
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/webapp/js/main.js b/examples/iot-nirvana/app-engine/src/main/webapp/js/main.js
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/webapp/js/main.js
rename to examples/iot-nirvana/app-engine/src/main/webapp/js/main.js
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/webapp/nodeServer.js b/examples/iot-nirvana/app-engine/src/main/webapp/nodeServer.js
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/webapp/nodeServer.js
rename to examples/iot-nirvana/app-engine/src/main/webapp/nodeServer.js
diff --git a/data-analytics/iot-nirvana/app-engine/src/main/webapp/startup.sh b/examples/iot-nirvana/app-engine/src/main/webapp/startup.sh
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/main/webapp/startup.sh
rename to examples/iot-nirvana/app-engine/src/main/webapp/startup.sh
diff --git a/data-analytics/iot-nirvana/app-engine/src/test/java/com/google/cloud/demo/iot/nirvana/frontend/datastore/entity/CityEntityTemperatureTest.java b/examples/iot-nirvana/app-engine/src/test/java/com/google/cloud/demo/iot/nirvana/frontend/datastore/entity/CityEntityTemperatureTest.java
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/test/java/com/google/cloud/demo/iot/nirvana/frontend/datastore/entity/CityEntityTemperatureTest.java
rename to examples/iot-nirvana/app-engine/src/test/java/com/google/cloud/demo/iot/nirvana/frontend/datastore/entity/CityEntityTemperatureTest.java
diff --git a/data-analytics/iot-nirvana/app-engine/src/test/java/com/google/cloud/demo/iot/nirvana/frontend/datastore/entity/CityEntityTest.java b/examples/iot-nirvana/app-engine/src/test/java/com/google/cloud/demo/iot/nirvana/frontend/datastore/entity/CityEntityTest.java
similarity index 100%
rename from data-analytics/iot-nirvana/app-engine/src/test/java/com/google/cloud/demo/iot/nirvana/frontend/datastore/entity/CityEntityTest.java
rename to examples/iot-nirvana/app-engine/src/test/java/com/google/cloud/demo/iot/nirvana/frontend/datastore/entity/CityEntityTest.java
diff --git a/data-analytics/iot-nirvana/client/pom.xml b/examples/iot-nirvana/client/pom.xml
similarity index 100%
rename from data-analytics/iot-nirvana/client/pom.xml
rename to examples/iot-nirvana/client/pom.xml
diff --git a/data-analytics/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/ClientException.java b/examples/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/ClientException.java
similarity index 100%
rename from data-analytics/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/ClientException.java
rename to examples/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/ClientException.java
diff --git a/data-analytics/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/ClientOptions.java b/examples/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/ClientOptions.java
similarity index 100%
rename from data-analytics/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/ClientOptions.java
rename to examples/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/ClientOptions.java
diff --git a/data-analytics/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/IotDevice.java b/examples/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/IotDevice.java
similarity index 100%
rename from data-analytics/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/IotDevice.java
rename to examples/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/IotDevice.java
diff --git a/data-analytics/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/IotDeviceMgr.java b/examples/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/IotDeviceMgr.java
similarity index 100%
rename from data-analytics/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/IotDeviceMgr.java
rename to examples/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/IotDeviceMgr.java
diff --git a/data-analytics/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/LogUtils.java b/examples/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/LogUtils.java
similarity index 100%
rename from data-analytics/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/LogUtils.java
rename to examples/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/LogUtils.java
diff --git a/data-analytics/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/Main.java b/examples/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/Main.java
similarity index 100%
rename from data-analytics/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/Main.java
rename to examples/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/Main.java
diff --git a/data-analytics/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/RetryHttpInitializerWrapper.java b/examples/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/RetryHttpInitializerWrapper.java
similarity index 100%
rename from data-analytics/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/RetryHttpInitializerWrapper.java
rename to examples/iot-nirvana/client/src/main/java/com/google/cloud/demo/iot/nirvana/client/RetryHttpInitializerWrapper.java
diff --git a/data-analytics/iot-nirvana/client/src/test/java/com/google/cloud/demo/iot/nirvana/client/ClientOptionsTest.java b/examples/iot-nirvana/client/src/test/java/com/google/cloud/demo/iot/nirvana/client/ClientOptionsTest.java
similarity index 100%
rename from data-analytics/iot-nirvana/client/src/test/java/com/google/cloud/demo/iot/nirvana/client/ClientOptionsTest.java
rename to examples/iot-nirvana/client/src/test/java/com/google/cloud/demo/iot/nirvana/client/ClientOptionsTest.java
diff --git a/data-analytics/iot-nirvana/client/src/test/java/com/google/cloud/demo/iot/nirvana/client/IotDeviceMgrTest.java b/examples/iot-nirvana/client/src/test/java/com/google/cloud/demo/iot/nirvana/client/IotDeviceMgrTest.java
similarity index 100%
rename from data-analytics/iot-nirvana/client/src/test/java/com/google/cloud/demo/iot/nirvana/client/IotDeviceMgrTest.java
rename to examples/iot-nirvana/client/src/test/java/com/google/cloud/demo/iot/nirvana/client/IotDeviceMgrTest.java
diff --git a/data-analytics/iot-nirvana/client/src/test/java/com/google/cloud/demo/iot/nirvana/client/IotDeviceTest.java b/examples/iot-nirvana/client/src/test/java/com/google/cloud/demo/iot/nirvana/client/IotDeviceTest.java
similarity index 100%
rename from data-analytics/iot-nirvana/client/src/test/java/com/google/cloud/demo/iot/nirvana/client/IotDeviceTest.java
rename to examples/iot-nirvana/client/src/test/java/com/google/cloud/demo/iot/nirvana/client/IotDeviceTest.java
diff --git a/data-analytics/iot-nirvana/common/pom.xml b/examples/iot-nirvana/common/pom.xml
similarity index 100%
rename from data-analytics/iot-nirvana/common/pom.xml
rename to examples/iot-nirvana/common/pom.xml
diff --git a/data-analytics/iot-nirvana/common/src/main/java/com/google/cloud/demo/iot/nirvana/common/City.java b/examples/iot-nirvana/common/src/main/java/com/google/cloud/demo/iot/nirvana/common/City.java
similarity index 100%
rename from data-analytics/iot-nirvana/common/src/main/java/com/google/cloud/demo/iot/nirvana/common/City.java
rename to examples/iot-nirvana/common/src/main/java/com/google/cloud/demo/iot/nirvana/common/City.java
diff --git a/data-analytics/iot-nirvana/common/src/main/java/com/google/cloud/demo/iot/nirvana/common/FormatException.java b/examples/iot-nirvana/common/src/main/java/com/google/cloud/demo/iot/nirvana/common/FormatException.java
similarity index 100%
rename from data-analytics/iot-nirvana/common/src/main/java/com/google/cloud/demo/iot/nirvana/common/FormatException.java
rename to examples/iot-nirvana/common/src/main/java/com/google/cloud/demo/iot/nirvana/common/FormatException.java
diff --git a/data-analytics/iot-nirvana/common/src/main/java/com/google/cloud/demo/iot/nirvana/common/Message.java b/examples/iot-nirvana/common/src/main/java/com/google/cloud/demo/iot/nirvana/common/Message.java
similarity index 100%
rename from data-analytics/iot-nirvana/common/src/main/java/com/google/cloud/demo/iot/nirvana/common/Message.java
rename to examples/iot-nirvana/common/src/main/java/com/google/cloud/demo/iot/nirvana/common/Message.java
diff --git a/data-analytics/iot-nirvana/common/src/main/java/com/google/cloud/demo/iot/nirvana/common/TemperatureUtils.java b/examples/iot-nirvana/common/src/main/java/com/google/cloud/demo/iot/nirvana/common/TemperatureUtils.java
similarity index 100%
rename from data-analytics/iot-nirvana/common/src/main/java/com/google/cloud/demo/iot/nirvana/common/TemperatureUtils.java
rename to examples/iot-nirvana/common/src/main/java/com/google/cloud/demo/iot/nirvana/common/TemperatureUtils.java
diff --git a/data-analytics/iot-nirvana/common/src/main/resources/cities.json b/examples/iot-nirvana/common/src/main/resources/cities.json
similarity index 100%
rename from data-analytics/iot-nirvana/common/src/main/resources/cities.json
rename to examples/iot-nirvana/common/src/main/resources/cities.json
diff --git a/data-analytics/iot-nirvana/common/src/test/java/com/google/cloud/demo/iot/nirvana/common/CityTest.java b/examples/iot-nirvana/common/src/test/java/com/google/cloud/demo/iot/nirvana/common/CityTest.java
similarity index 100%
rename from data-analytics/iot-nirvana/common/src/test/java/com/google/cloud/demo/iot/nirvana/common/CityTest.java
rename to examples/iot-nirvana/common/src/test/java/com/google/cloud/demo/iot/nirvana/common/CityTest.java
diff --git a/data-analytics/iot-nirvana/common/src/test/java/com/google/cloud/demo/iot/nirvana/common/MessageTest.java b/examples/iot-nirvana/common/src/test/java/com/google/cloud/demo/iot/nirvana/common/MessageTest.java
similarity index 100%
rename from data-analytics/iot-nirvana/common/src/test/java/com/google/cloud/demo/iot/nirvana/common/MessageTest.java
rename to examples/iot-nirvana/common/src/test/java/com/google/cloud/demo/iot/nirvana/common/MessageTest.java
diff --git a/data-analytics/iot-nirvana/img/architecture.png b/examples/iot-nirvana/img/architecture.png
similarity index 100%
rename from data-analytics/iot-nirvana/img/architecture.png
rename to examples/iot-nirvana/img/architecture.png
diff --git a/data-analytics/iot-nirvana/pipeline/pom.xml b/examples/iot-nirvana/pipeline/pom.xml
similarity index 100%
rename from data-analytics/iot-nirvana/pipeline/pom.xml
rename to examples/iot-nirvana/pipeline/pom.xml
diff --git a/data-analytics/iot-nirvana/pipeline/src/main/java/com/google/cloud/demo/iot/nirvana/pipeline/FilterMessages.java b/examples/iot-nirvana/pipeline/src/main/java/com/google/cloud/demo/iot/nirvana/pipeline/FilterMessages.java
similarity index 100%
rename from data-analytics/iot-nirvana/pipeline/src/main/java/com/google/cloud/demo/iot/nirvana/pipeline/FilterMessages.java
rename to examples/iot-nirvana/pipeline/src/main/java/com/google/cloud/demo/iot/nirvana/pipeline/FilterMessages.java
diff --git a/data-analytics/iot-nirvana/pipeline/src/main/java/com/google/cloud/demo/iot/nirvana/pipeline/MessageToEntity.java b/examples/iot-nirvana/pipeline/src/main/java/com/google/cloud/demo/iot/nirvana/pipeline/MessageToEntity.java
similarity index 100%
rename from data-analytics/iot-nirvana/pipeline/src/main/java/com/google/cloud/demo/iot/nirvana/pipeline/MessageToEntity.java
rename to examples/iot-nirvana/pipeline/src/main/java/com/google/cloud/demo/iot/nirvana/pipeline/MessageToEntity.java
diff --git a/data-analytics/iot-nirvana/pipeline/src/main/java/com/google/cloud/demo/iot/nirvana/pipeline/MessageToTableRow.java b/examples/iot-nirvana/pipeline/src/main/java/com/google/cloud/demo/iot/nirvana/pipeline/MessageToTableRow.java
similarity index 100%
rename from data-analytics/iot-nirvana/pipeline/src/main/java/com/google/cloud/demo/iot/nirvana/pipeline/MessageToTableRow.java
rename to examples/iot-nirvana/pipeline/src/main/java/com/google/cloud/demo/iot/nirvana/pipeline/MessageToTableRow.java
diff --git a/data-analytics/iot-nirvana/pipeline/src/main/java/com/google/cloud/demo/iot/nirvana/pipeline/TemperaturePipeline.java b/examples/iot-nirvana/pipeline/src/main/java/com/google/cloud/demo/iot/nirvana/pipeline/TemperaturePipeline.java
similarity index 100%
rename from data-analytics/iot-nirvana/pipeline/src/main/java/com/google/cloud/demo/iot/nirvana/pipeline/TemperaturePipeline.java
rename to examples/iot-nirvana/pipeline/src/main/java/com/google/cloud/demo/iot/nirvana/pipeline/TemperaturePipeline.java
diff --git a/data-analytics/iot-nirvana/pipeline/src/main/java/com/google/cloud/demo/iot/nirvana/pipeline/TemperaturePipelineOptions.java b/examples/iot-nirvana/pipeline/src/main/java/com/google/cloud/demo/iot/nirvana/pipeline/TemperaturePipelineOptions.java
similarity index 100%
rename from data-analytics/iot-nirvana/pipeline/src/main/java/com/google/cloud/demo/iot/nirvana/pipeline/TemperaturePipelineOptions.java
rename to examples/iot-nirvana/pipeline/src/main/java/com/google/cloud/demo/iot/nirvana/pipeline/TemperaturePipelineOptions.java
diff --git a/data-analytics/iot-nirvana/pipeline/src/test/java/com/google/cloud/demo/iot/nirvana/pipeline/FilterMessagesTest.java b/examples/iot-nirvana/pipeline/src/test/java/com/google/cloud/demo/iot/nirvana/pipeline/FilterMessagesTest.java
similarity index 100%
rename from data-analytics/iot-nirvana/pipeline/src/test/java/com/google/cloud/demo/iot/nirvana/pipeline/FilterMessagesTest.java
rename to examples/iot-nirvana/pipeline/src/test/java/com/google/cloud/demo/iot/nirvana/pipeline/FilterMessagesTest.java
diff --git a/data-analytics/iot-nirvana/pipeline/src/test/java/com/google/cloud/demo/iot/nirvana/pipeline/MessageToEntityTest.java b/examples/iot-nirvana/pipeline/src/test/java/com/google/cloud/demo/iot/nirvana/pipeline/MessageToEntityTest.java
similarity index 100%
rename from data-analytics/iot-nirvana/pipeline/src/test/java/com/google/cloud/demo/iot/nirvana/pipeline/MessageToEntityTest.java
rename to examples/iot-nirvana/pipeline/src/test/java/com/google/cloud/demo/iot/nirvana/pipeline/MessageToEntityTest.java
diff --git a/data-analytics/iot-nirvana/pipeline/src/test/java/com/google/cloud/demo/iot/nirvana/pipeline/MessageToTableRowTest.java b/examples/iot-nirvana/pipeline/src/test/java/com/google/cloud/demo/iot/nirvana/pipeline/MessageToTableRowTest.java
similarity index 100%
rename from data-analytics/iot-nirvana/pipeline/src/test/java/com/google/cloud/demo/iot/nirvana/pipeline/MessageToTableRowTest.java
rename to examples/iot-nirvana/pipeline/src/test/java/com/google/cloud/demo/iot/nirvana/pipeline/MessageToTableRowTest.java
diff --git a/data-analytics/iot-nirvana/pom.xml b/examples/iot-nirvana/pom.xml
similarity index 100%
rename from data-analytics/iot-nirvana/pom.xml
rename to examples/iot-nirvana/pom.xml
diff --git a/data-analytics/iot-nirvana/run_oncloud.sh b/examples/iot-nirvana/run_oncloud.sh
similarity index 100%
rename from data-analytics/iot-nirvana/run_oncloud.sh
rename to examples/iot-nirvana/run_oncloud.sh
diff --git a/data-analytics/iot-nirvana/setup_gcp_environment.sh b/examples/iot-nirvana/setup_gcp_environment.sh
similarity index 100%
rename from data-analytics/iot-nirvana/setup_gcp_environment.sh
rename to examples/iot-nirvana/setup_gcp_environment.sh
diff --git a/data-analytics/iot-nirvana/startup_install_java8.sh b/examples/iot-nirvana/startup_install_java8.sh
similarity index 100%
rename from data-analytics/iot-nirvana/startup_install_java8.sh
rename to examples/iot-nirvana/startup_install_java8.sh
diff --git a/application-development/examples/spinnaker/halyard/example_multi_cluster_halyard_config.yaml b/examples/spinnaker/halyard/example_multi_cluster_halyard_config.yaml
similarity index 100%
rename from application-development/examples/spinnaker/halyard/example_multi_cluster_halyard_config.yaml
rename to examples/spinnaker/halyard/example_multi_cluster_halyard_config.yaml
diff --git a/application-development/examples/spinnaker/pipeline/example_pipeline_deploy_to_staging.json b/examples/spinnaker/pipeline/example_pipeline_deploy_to_staging.json
similarity index 100%
rename from application-development/examples/spinnaker/pipeline/example_pipeline_deploy_to_staging.json
rename to examples/spinnaker/pipeline/example_pipeline_deploy_to_staging.json
diff --git a/application-development/examples/spinnaker/pipeline/example_pipeline_promote_to_prod.json b/examples/spinnaker/pipeline/example_pipeline_promote_to_prod.json
similarity index 100%
rename from application-development/examples/spinnaker/pipeline/example_pipeline_promote_to_prod.json
rename to examples/spinnaker/pipeline/example_pipeline_promote_to_prod.json
diff --git a/application-development/examples/spinnaker/pipeline/example_pipeline_with_canary.json b/examples/spinnaker/pipeline/example_pipeline_with_canary.json
similarity index 100%
rename from application-development/examples/spinnaker/pipeline/example_pipeline_with_canary.json
rename to examples/spinnaker/pipeline/example_pipeline_with_canary.json
diff --git a/application-development/examples/spinnaker/pipeline/example_spinnaker_pipeline_template.yml b/examples/spinnaker/pipeline/example_spinnaker_pipeline_template.yml
similarity index 100%
rename from application-development/examples/spinnaker/pipeline/example_spinnaker_pipeline_template.yml
rename to examples/spinnaker/pipeline/example_spinnaker_pipeline_template.yml
diff --git a/infrastructure/README.md b/infrastructure/README.md
deleted file mode 100644
index f35dd8eaf4..0000000000
--- a/infrastructure/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Professional Services
-## Infrastructure
-A repository of Infrastructure solutions.
-
- * [dns-sync](#dns-sync)
- * [labelmaker](#labelmaker)
- * [cloudconnect](#cloudconnect)
-
-### [dns-sync](dns-sync/)
-  Sync a Cloud DNS zone with GCE resources. Instances and load balancers are added to the cloud DNS zone as they start from compute_engine_activity log events sent from a pub/sub push subscription. Can sync multiple projects to a single Cloud DNS zone.
-
-### [labelmaker](labelmaker/)
-  _labelmaker.py_ is a tool that reads key:value pairs from a json file and labels the running instance and all attached drives accordingly. It is designed to run on boot in a startup-script or userdata. Labels show up in billing exports to BigQuery, and allows organizations to run complex cost analysis over their cloud spend.
-
-### [cloudconnect](cloudconnect/)
-  CloudConnect is a package that automates the setup of dual VPN tunnels between AWS and GCP. While this connection is **NOT** meant for high throughput, low latency connections (1Gbps+), it can certainly support basic management and configuration traffic. Currently it supports the creation of both _static-routes_ and _bgp_ connections.
diff --git a/machine-learning/README.md b/machine-learning/README.md
deleted file mode 100644
index cf4ce76593..0000000000
--- a/machine-learning/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Professional Services
-## Machine learning
-A repository of machine-learning solutions.
diff --git a/infrastructure/cloudconnect/README.md b/tools/cloudconnect/README.md
similarity index 100%
rename from infrastructure/cloudconnect/README.md
rename to tools/cloudconnect/README.md
diff --git a/infrastructure/cloudconnect/aws-vpn-gateway.yaml b/tools/cloudconnect/aws-vpn-gateway.yaml
similarity index 100%
rename from infrastructure/cloudconnect/aws-vpn-gateway.yaml
rename to tools/cloudconnect/aws-vpn-gateway.yaml
diff --git a/infrastructure/cloudconnect/aws-vpn.yaml b/tools/cloudconnect/aws-vpn.yaml
similarity index 100%
rename from infrastructure/cloudconnect/aws-vpn.yaml
rename to tools/cloudconnect/aws-vpn.yaml
diff --git a/infrastructure/cloudconnect/gcp-vpn-buildconf.py b/tools/cloudconnect/gcp-vpn-buildconf.py
similarity index 100%
rename from infrastructure/cloudconnect/gcp-vpn-buildconf.py
rename to tools/cloudconnect/gcp-vpn-buildconf.py
diff --git a/infrastructure/cloudconnect/gcp-vpn.jinja b/tools/cloudconnect/gcp-vpn.jinja
similarity index 100%
rename from infrastructure/cloudconnect/gcp-vpn.jinja
rename to tools/cloudconnect/gcp-vpn.jinja
diff --git a/infrastructure/cloudconnect/pics/cloudconnect.png b/tools/cloudconnect/pics/cloudconnect.png
similarity index 100%
rename from infrastructure/cloudconnect/pics/cloudconnect.png
rename to tools/cloudconnect/pics/cloudconnect.png
diff --git a/infrastructure/cloudconnect/pics/conditions.png b/tools/cloudconnect/pics/conditions.png
similarity index 100%
rename from infrastructure/cloudconnect/pics/conditions.png
rename to tools/cloudconnect/pics/conditions.png
diff --git a/infrastructure/cloudconnect/pics/dropped_received_packets.png b/tools/cloudconnect/pics/dropped_received_packets.png
similarity index 100%
rename from infrastructure/cloudconnect/pics/dropped_received_packets.png
rename to tools/cloudconnect/pics/dropped_received_packets.png
diff --git a/infrastructure/cloudconnect/pics/dropped_sent_packets.png b/tools/cloudconnect/pics/dropped_sent_packets.png
similarity index 100%
rename from infrastructure/cloudconnect/pics/dropped_sent_packets.png
rename to tools/cloudconnect/pics/dropped_sent_packets.png
diff --git a/infrastructure/cloudconnect/pics/receive_test.png b/tools/cloudconnect/pics/receive_test.png
similarity index 100%
rename from infrastructure/cloudconnect/pics/receive_test.png
rename to tools/cloudconnect/pics/receive_test.png
diff --git a/infrastructure/cloudconnect/pics/sd_vpn_landing.png b/tools/cloudconnect/pics/sd_vpn_landing.png
similarity index 100%
rename from infrastructure/cloudconnect/pics/sd_vpn_landing.png
rename to tools/cloudconnect/pics/sd_vpn_landing.png
diff --git a/infrastructure/cloudconnect/pics/send_test.png b/tools/cloudconnect/pics/send_test.png
similarity index 100%
rename from infrastructure/cloudconnect/pics/send_test.png
rename to tools/cloudconnect/pics/send_test.png
diff --git a/infrastructure/cloudconnect/pics/tunnel_established.png b/tools/cloudconnect/pics/tunnel_established.png
similarity index 100%
rename from infrastructure/cloudconnect/pics/tunnel_established.png
rename to tools/cloudconnect/pics/tunnel_established.png
diff --git a/infrastructure/dns-sync/README.md b/tools/dns-sync/README.md
similarity index 100%
rename from infrastructure/dns-sync/README.md
rename to tools/dns-sync/README.md
diff --git a/infrastructure/dns-sync/app.yaml b/tools/dns-sync/app.yaml
similarity index 100%
rename from infrastructure/dns-sync/app.yaml
rename to tools/dns-sync/app.yaml
diff --git a/infrastructure/dns-sync/appengine_config.py b/tools/dns-sync/appengine_config.py
similarity index 100%
rename from infrastructure/dns-sync/appengine_config.py
rename to tools/dns-sync/appengine_config.py
diff --git a/infrastructure/dns-sync/dns_sync/__init__.py b/tools/dns-sync/dns_sync/__init__.py
similarity index 100%
rename from infrastructure/dns-sync/dns_sync/__init__.py
rename to tools/dns-sync/dns_sync/__init__.py
diff --git a/infrastructure/dns-sync/dns_sync/add_topic_editor.py b/tools/dns-sync/dns_sync/add_topic_editor.py
similarity index 100%
rename from infrastructure/dns-sync/dns_sync/add_topic_editor.py
rename to tools/dns-sync/dns_sync/add_topic_editor.py
diff --git a/infrastructure/dns-sync/dns_sync/api.py b/tools/dns-sync/dns_sync/api.py
similarity index 100%
rename from infrastructure/dns-sync/dns_sync/api.py
rename to tools/dns-sync/dns_sync/api.py
diff --git a/infrastructure/dns-sync/dns_sync/audit_log.py b/tools/dns-sync/dns_sync/audit_log.py
similarity index 100%
rename from infrastructure/dns-sync/dns_sync/audit_log.py
rename to tools/dns-sync/dns_sync/audit_log.py
diff --git a/infrastructure/dns-sync/dns_sync/auth.py b/tools/dns-sync/dns_sync/auth.py
similarity index 100%
rename from infrastructure/dns-sync/dns_sync/auth.py
rename to tools/dns-sync/dns_sync/auth.py
diff --git a/infrastructure/dns-sync/dns_sync/config.py b/tools/dns-sync/dns_sync/config.py
similarity index 100%
rename from infrastructure/dns-sync/dns_sync/config.py
rename to tools/dns-sync/dns_sync/config.py
diff --git a/infrastructure/dns-sync/dns_sync/connect_with_dns_sync.sh b/tools/dns-sync/dns_sync/connect_with_dns_sync.sh
similarity index 100%
rename from infrastructure/dns-sync/dns_sync/connect_with_dns_sync.sh
rename to tools/dns-sync/dns_sync/connect_with_dns_sync.sh
diff --git a/infrastructure/dns-sync/dns_sync/main.py b/tools/dns-sync/dns_sync/main.py
similarity index 100%
rename from infrastructure/dns-sync/dns_sync/main.py
rename to tools/dns-sync/dns_sync/main.py
diff --git a/infrastructure/dns-sync/dns_sync/zones.py b/tools/dns-sync/dns_sync/zones.py
similarity index 100%
rename from infrastructure/dns-sync/dns_sync/zones.py
rename to tools/dns-sync/dns_sync/zones.py
diff --git a/infrastructure/dns-sync/logging.ini b/tools/dns-sync/logging.ini
similarity index 100%
rename from infrastructure/dns-sync/logging.ini
rename to tools/dns-sync/logging.ini
diff --git a/infrastructure/dns-sync/requirements.txt b/tools/dns-sync/requirements.txt
similarity index 100%
rename from infrastructure/dns-sync/requirements.txt
rename to tools/dns-sync/requirements.txt
diff --git a/infrastructure/dns-sync/setup.cfg b/tools/dns-sync/setup.cfg
similarity index 100%
rename from infrastructure/dns-sync/setup.cfg
rename to tools/dns-sync/setup.cfg
diff --git a/infrastructure/dns-sync/setup.py b/tools/dns-sync/setup.py
similarity index 100%
rename from infrastructure/dns-sync/setup.py
rename to tools/dns-sync/setup.py
diff --git a/infrastructure/dns-sync/static/css/style.css b/tools/dns-sync/static/css/style.css
similarity index 100%
rename from infrastructure/dns-sync/static/css/style.css
rename to tools/dns-sync/static/css/style.css
diff --git a/infrastructure/dns-sync/static/images/diagram_1.png b/tools/dns-sync/static/images/diagram_1.png
similarity index 100%
rename from infrastructure/dns-sync/static/images/diagram_1.png
rename to tools/dns-sync/static/images/diagram_1.png
diff --git a/infrastructure/dns-sync/static/images/favicon.ico b/tools/dns-sync/static/images/favicon.ico
similarity index 100%
rename from infrastructure/dns-sync/static/images/favicon.ico
rename to tools/dns-sync/static/images/favicon.ico
diff --git a/infrastructure/dns-sync/static/images/loader.gif b/tools/dns-sync/static/images/loader.gif
similarity index 100%
rename from infrastructure/dns-sync/static/images/loader.gif
rename to tools/dns-sync/static/images/loader.gif
diff --git a/infrastructure/dns-sync/static/images/screenshot_1.png b/tools/dns-sync/static/images/screenshot_1.png
similarity index 100%
rename from infrastructure/dns-sync/static/images/screenshot_1.png
rename to tools/dns-sync/static/images/screenshot_1.png
diff --git a/infrastructure/dns-sync/static/images/screenshot_2.png b/tools/dns-sync/static/images/screenshot_2.png
similarity index 100%
rename from infrastructure/dns-sync/static/images/screenshot_2.png
rename to tools/dns-sync/static/images/screenshot_2.png
diff --git a/infrastructure/dns-sync/static/images/screenshot_3.png b/tools/dns-sync/static/images/screenshot_3.png
similarity index 100%
rename from infrastructure/dns-sync/static/images/screenshot_3.png
rename to tools/dns-sync/static/images/screenshot_3.png
diff --git a/infrastructure/dns-sync/static/images/screenshot_4.png b/tools/dns-sync/static/images/screenshot_4.png
similarity index 100%
rename from infrastructure/dns-sync/static/images/screenshot_4.png
rename to tools/dns-sync/static/images/screenshot_4.png
diff --git a/infrastructure/dns-sync/static/images/screenshot_5.png b/tools/dns-sync/static/images/screenshot_5.png
similarity index 100%
rename from infrastructure/dns-sync/static/images/screenshot_5.png
rename to tools/dns-sync/static/images/screenshot_5.png
diff --git a/infrastructure/dns-sync/static/images/screenshot_6.png b/tools/dns-sync/static/images/screenshot_6.png
similarity index 100%
rename from infrastructure/dns-sync/static/images/screenshot_6.png
rename to tools/dns-sync/static/images/screenshot_6.png
diff --git a/infrastructure/dns-sync/static/index.html b/tools/dns-sync/static/index.html
similarity index 100%
rename from infrastructure/dns-sync/static/index.html
rename to tools/dns-sync/static/index.html
diff --git a/infrastructure/dns-sync/static/js/dns-sync.js b/tools/dns-sync/static/js/dns-sync.js
similarity index 100%
rename from infrastructure/dns-sync/static/js/dns-sync.js
rename to tools/dns-sync/static/js/dns-sync.js
diff --git a/infrastructure/dns-sync/tests/common.py b/tools/dns-sync/tests/common.py
similarity index 100%
rename from infrastructure/dns-sync/tests/common.py
rename to tools/dns-sync/tests/common.py
diff --git a/infrastructure/dns-sync/tests/data/audit-log-loop-compute-operation.json b/tools/dns-sync/tests/data/audit-log-loop-compute-operation.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/audit-log-loop-compute-operation.json
rename to tools/dns-sync/tests/data/audit-log-loop-compute-operation.json
diff --git a/infrastructure/dns-sync/tests/data/audit-log-loop-message.json b/tools/dns-sync/tests/data/audit-log-loop-message.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/audit-log-loop-message.json
rename to tools/dns-sync/tests/data/audit-log-loop-message.json
diff --git a/infrastructure/dns-sync/tests/data/audit-log-resource-get.json b/tools/dns-sync/tests/data/audit-log-resource-get.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/audit-log-resource-get.json
rename to tools/dns-sync/tests/data/audit-log-resource-get.json
diff --git a/infrastructure/dns-sync/tests/data/audit-log-start-metric-create.json b/tools/dns-sync/tests/data/audit-log-start-metric-create.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/audit-log-start-metric-create.json
rename to tools/dns-sync/tests/data/audit-log-start-metric-create.json
diff --git a/infrastructure/dns-sync/tests/data/audit-log-start-metric-list.json b/tools/dns-sync/tests/data/audit-log-start-metric-list.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/audit-log-start-metric-list.json
rename to tools/dns-sync/tests/data/audit-log-start-metric-list.json
diff --git a/infrastructure/dns-sync/tests/data/audit-log-start-resource-insert.json b/tools/dns-sync/tests/data/audit-log-start-resource-insert.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/audit-log-start-resource-insert.json
rename to tools/dns-sync/tests/data/audit-log-start-resource-insert.json
diff --git a/infrastructure/dns-sync/tests/data/audit-log-stop-metric-list.json b/tools/dns-sync/tests/data/audit-log-stop-metric-list.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/audit-log-stop-metric-list.json
rename to tools/dns-sync/tests/data/audit-log-stop-metric-list.json
diff --git a/infrastructure/dns-sync/tests/data/audit-log-stop-resource-delete.json b/tools/dns-sync/tests/data/audit-log-stop-resource-delete.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/audit-log-stop-resource-delete.json
rename to tools/dns-sync/tests/data/audit-log-stop-resource-delete.json
diff --git a/infrastructure/dns-sync/tests/data/compute.v1.json b/tools/dns-sync/tests/data/compute.v1.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/compute.v1.json
rename to tools/dns-sync/tests/data/compute.v1.json
diff --git a/infrastructure/dns-sync/tests/data/config-default-zone.yaml b/tools/dns-sync/tests/data/config-default-zone.yaml
similarity index 100%
rename from infrastructure/dns-sync/tests/data/config-default-zone.yaml
rename to tools/dns-sync/tests/data/config-default-zone.yaml
diff --git a/infrastructure/dns-sync/tests/data/dns-zone-response.json b/tools/dns-sync/tests/data/dns-zone-response.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/dns-zone-response.json
rename to tools/dns-sync/tests/data/dns-zone-response.json
diff --git a/infrastructure/dns-sync/tests/data/dns.v1.json b/tools/dns-sync/tests/data/dns.v1.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/dns.v1.json
rename to tools/dns-sync/tests/data/dns.v1.json
diff --git a/infrastructure/dns-sync/tests/data/instance-creation-compute-operation.json b/tools/dns-sync/tests/data/instance-creation-compute-operation.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/instance-creation-compute-operation.json
rename to tools/dns-sync/tests/data/instance-creation-compute-operation.json
diff --git a/infrastructure/dns-sync/tests/data/instance-creation-dns-done-operation.json b/tools/dns-sync/tests/data/instance-creation-dns-done-operation.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/instance-creation-dns-done-operation.json
rename to tools/dns-sync/tests/data/instance-creation-dns-done-operation.json
diff --git a/infrastructure/dns-sync/tests/data/instance-creation-dns-pending-operation.json b/tools/dns-sync/tests/data/instance-creation-dns-pending-operation.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/instance-creation-dns-pending-operation.json
rename to tools/dns-sync/tests/data/instance-creation-dns-pending-operation.json
diff --git a/infrastructure/dns-sync/tests/data/instance-creation-dns-record-set-response.json b/tools/dns-sync/tests/data/instance-creation-dns-record-set-response.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/instance-creation-dns-record-set-response.json
rename to tools/dns-sync/tests/data/instance-creation-dns-record-set-response.json
diff --git a/infrastructure/dns-sync/tests/data/instance-creation-insert-done-message.json b/tools/dns-sync/tests/data/instance-creation-insert-done-message.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/instance-creation-insert-done-message.json
rename to tools/dns-sync/tests/data/instance-creation-insert-done-message.json
diff --git a/infrastructure/dns-sync/tests/data/instance-creation-instance-get.json b/tools/dns-sync/tests/data/instance-creation-instance-get.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/instance-creation-instance-get.json
rename to tools/dns-sync/tests/data/instance-creation-instance-get.json
diff --git a/infrastructure/dns-sync/tests/data/monitoring.v3.json b/tools/dns-sync/tests/data/monitoring.v3.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/monitoring.v3.json
rename to tools/dns-sync/tests/data/monitoring.v3.json
diff --git a/infrastructure/dns-sync/tests/data/project-sync-dns-pending-operation.json b/tools/dns-sync/tests/data/project-sync-dns-pending-operation.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/project-sync-dns-pending-operation.json
rename to tools/dns-sync/tests/data/project-sync-dns-pending-operation.json
diff --git a/infrastructure/dns-sync/tests/data/project-sync-dns-record-set-response.json b/tools/dns-sync/tests/data/project-sync-dns-record-set-response.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/project-sync-dns-record-set-response.json
rename to tools/dns-sync/tests/data/project-sync-dns-record-set-response.json
diff --git a/infrastructure/dns-sync/tests/data/project-sync-forwarding-rules-list-project-1.json b/tools/dns-sync/tests/data/project-sync-forwarding-rules-list-project-1.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/project-sync-forwarding-rules-list-project-1.json
rename to tools/dns-sync/tests/data/project-sync-forwarding-rules-list-project-1.json
diff --git a/infrastructure/dns-sync/tests/data/project-sync-forwarding-rules-list-project-2.json b/tools/dns-sync/tests/data/project-sync-forwarding-rules-list-project-2.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/project-sync-forwarding-rules-list-project-2.json
rename to tools/dns-sync/tests/data/project-sync-forwarding-rules-list-project-2.json
diff --git a/infrastructure/dns-sync/tests/data/project-sync-instance-list-project-1.json b/tools/dns-sync/tests/data/project-sync-instance-list-project-1.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/project-sync-instance-list-project-1.json
rename to tools/dns-sync/tests/data/project-sync-instance-list-project-1.json
diff --git a/infrastructure/dns-sync/tests/data/project-sync-instance-list-project-2.json b/tools/dns-sync/tests/data/project-sync-instance-list-project-2.json
similarity index 100%
rename from infrastructure/dns-sync/tests/data/project-sync-instance-list-project-2.json
rename to tools/dns-sync/tests/data/project-sync-instance-list-project-2.json
diff --git a/infrastructure/dns-sync/tests/test_audit_log_loop.py b/tools/dns-sync/tests/test_audit_log_loop.py
similarity index 100%
rename from infrastructure/dns-sync/tests/test_audit_log_loop.py
rename to tools/dns-sync/tests/test_audit_log_loop.py
diff --git a/infrastructure/dns-sync/tests/test_instance_creation.py b/tools/dns-sync/tests/test_instance_creation.py
similarity index 100%
rename from infrastructure/dns-sync/tests/test_instance_creation.py
rename to tools/dns-sync/tests/test_instance_creation.py
diff --git a/infrastructure/dns-sync/tests/test_project_sync.py b/tools/dns-sync/tests/test_project_sync.py
similarity index 100%
rename from infrastructure/dns-sync/tests/test_project_sync.py
rename to tools/dns-sync/tests/test_project_sync.py
diff --git a/infrastructure/dns-sync/tox.ini b/tools/dns-sync/tox.ini
similarity index 100%
rename from infrastructure/dns-sync/tox.ini
rename to tools/dns-sync/tox.ini
diff --git a/infrastructure/gke-billing-export/.gitignore b/tools/gke-billing-export/.gitignore
similarity index 100%
rename from infrastructure/gke-billing-export/.gitignore
rename to tools/gke-billing-export/.gitignore
diff --git a/infrastructure/gke-billing-export/Dockerfile b/tools/gke-billing-export/Dockerfile
similarity index 100%
rename from infrastructure/gke-billing-export/Dockerfile
rename to tools/gke-billing-export/Dockerfile
diff --git a/infrastructure/gke-billing-export/README.md b/tools/gke-billing-export/README.md
similarity index 100%
rename from infrastructure/gke-billing-export/README.md
rename to tools/gke-billing-export/README.md
diff --git a/infrastructure/gke-billing-export/billing.go b/tools/gke-billing-export/billing.go
similarity index 100%
rename from infrastructure/gke-billing-export/billing.go
rename to tools/gke-billing-export/billing.go
diff --git a/infrastructure/gke-billing-export/config.json b/tools/gke-billing-export/config.json
similarity index 100%
rename from infrastructure/gke-billing-export/config.json
rename to tools/gke-billing-export/config.json
diff --git a/infrastructure/gke-billing-export/deploy.yaml b/tools/gke-billing-export/deploy.yaml
similarity index 100%
rename from infrastructure/gke-billing-export/deploy.yaml
rename to tools/gke-billing-export/deploy.yaml
diff --git a/infrastructure/labelmaker/README.md b/tools/labelmaker/README.md
similarity index 100%
rename from infrastructure/labelmaker/README.md
rename to tools/labelmaker/README.md
diff --git a/infrastructure/labelmaker/config.yaml b/tools/labelmaker/config.yaml
similarity index 100%
rename from infrastructure/labelmaker/config.yaml
rename to tools/labelmaker/config.yaml
diff --git a/infrastructure/labelmaker/labelmaker.py b/tools/labelmaker/labelmaker.py
similarity index 100%
rename from infrastructure/labelmaker/labelmaker.py
rename to tools/labelmaker/labelmaker.py
diff --git a/infrastructure/labelmaker/labeltester.jinja b/tools/labelmaker/labeltester.jinja
similarity index 100%
rename from infrastructure/labelmaker/labeltester.jinja
rename to tools/labelmaker/labeltester.jinja
diff --git a/infrastructure/labelmaker/labeltester.jinja.schema b/tools/labelmaker/labeltester.jinja.schema
similarity index 100%
rename from infrastructure/labelmaker/labeltester.jinja.schema
rename to tools/labelmaker/labeltester.jinja.schema