diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d422fab6776..c922090aae0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -123,7 +123,7 @@ To run one particular test suite or provide additional parameters to
 *Note*: The ``gae`` environment can't be told to run one particular
  test at this time.
 
-## Adding new tests
+### Adding new tests
 
 There are a handful of common testing utilities are located under
 ``tests``, see existing tests for example usage.
@@ -135,4 +135,3 @@ To add new tests that require Google App Engine, please place them in
 the ``appengine`` directory if possible. If you place them elsewhere,
 you will need to modify ``tox.ini`` to make the environments
 appropriately run or ignore your test.
-
diff --git a/bigquery/samples/__init__.py b/bigquery/api/__init__.py
similarity index 100%
rename from bigquery/samples/__init__.py
rename to bigquery/api/__init__.py
diff --git a/bigquery/samples/async_query.py b/bigquery/api/async_query.py
similarity index 100%
rename from bigquery/samples/async_query.py
rename to bigquery/api/async_query.py
diff --git a/bigquery/samples/async_query_test.py b/bigquery/api/async_query_test.py
similarity index 100%
rename from bigquery/samples/async_query_test.py
rename to bigquery/api/async_query_test.py
diff --git a/bigquery/samples/export_data_to_cloud_storage.py b/bigquery/api/export_data_to_cloud_storage.py
similarity index 100%
rename from bigquery/samples/export_data_to_cloud_storage.py
rename to bigquery/api/export_data_to_cloud_storage.py
diff --git a/bigquery/samples/export_data_to_cloud_storage_test.py b/bigquery/api/export_data_to_cloud_storage_test.py
similarity index 100%
rename from bigquery/samples/export_data_to_cloud_storage_test.py
rename to bigquery/api/export_data_to_cloud_storage_test.py
diff --git a/bigquery/samples/getting_started.py b/bigquery/api/getting_started.py
similarity index 100%
rename from bigquery/samples/getting_started.py
rename to bigquery/api/getting_started.py
diff --git a/bigquery/samples/getting_started_test.py b/bigquery/api/getting_started_test.py
similarity index 100%
rename from bigquery/samples/getting_started_test.py
rename to bigquery/api/getting_started_test.py
diff --git a/bigquery/samples/list_datasets_projects.py b/bigquery/api/list_datasets_projects.py
similarity index 100%
rename from bigquery/samples/list_datasets_projects.py
rename to bigquery/api/list_datasets_projects.py
diff --git a/bigquery/samples/list_datasets_projects_test.py b/bigquery/api/list_datasets_projects_test.py
similarity index 100%
rename from bigquery/samples/list_datasets_projects_test.py
rename to bigquery/api/list_datasets_projects_test.py
diff --git a/bigquery/samples/load_data_by_post.py b/bigquery/api/load_data_by_post.py
similarity index 100%
rename from bigquery/samples/load_data_by_post.py
rename to bigquery/api/load_data_by_post.py
diff --git a/bigquery/samples/load_data_from_csv.py b/bigquery/api/load_data_from_csv.py
similarity index 100%
rename from bigquery/samples/load_data_from_csv.py
rename to bigquery/api/load_data_from_csv.py
diff --git a/bigquery/samples/load_data_from_csv_test.py b/bigquery/api/load_data_from_csv_test.py
similarity index 100%
rename from bigquery/samples/load_data_from_csv_test.py
rename to bigquery/api/load_data_from_csv_test.py
diff --git a/bigquery/samples/streaming.py b/bigquery/api/streaming.py
similarity index 100%
rename from bigquery/samples/streaming.py
rename to bigquery/api/streaming.py
diff --git a/bigquery/samples/streaming_test.py b/bigquery/api/streaming_test.py
similarity index 100%
rename from bigquery/samples/streaming_test.py
rename to bigquery/api/streaming_test.py
diff --git a/bigquery/samples/sync_query.py b/bigquery/api/sync_query.py
similarity index 100%
rename from bigquery/samples/sync_query.py
rename to bigquery/api/sync_query.py
diff --git a/bigquery/samples/sync_query_test.py b/bigquery/api/sync_query_test.py
similarity index 100%
rename from bigquery/samples/sync_query_test.py
rename to bigquery/api/sync_query_test.py
diff --git a/monitoring/samples/__init__.py b/monitoring/api/__init__.py
similarity index 100%
rename from monitoring/samples/__init__.py
rename to monitoring/api/__init__.py
diff --git a/monitoring/samples/auth.py b/monitoring/api/auth.py
similarity index 100%
rename from monitoring/samples/auth.py
rename to monitoring/api/auth.py
diff --git a/monitoring/samples/auth_test.py b/monitoring/api/auth_test.py
similarity index 100%
rename from monitoring/samples/auth_test.py
rename to monitoring/api/auth_test.py