diff --git a/bigquery/stackoverflow/stackoverflow.php b/bigquery/stackoverflow/stackoverflow.php
index 7f070587f5..2745258def 100644
--- a/bigquery/stackoverflow/stackoverflow.php
+++ b/bigquery/stackoverflow/stackoverflow.php
@@ -1,4 +1,6 @@
+# [START bigquery_simple_app_all]
 <?php
+# [START_EXCLUDE]
 /**
  * Copyright 2016 Google Inc.
  *
@@ -20,8 +22,8 @@
  *
  * @see https://github.com/GoogleCloudPlatform/php-docs-samples/tree/main/bigquery/api/README.md
  */
+# [END_EXCLUDE]
 
-# [START bigquery_simple_app_all]
 require __DIR__ . '/vendor/autoload.php';
 
 # [START bigquery_simple_app_deps]
diff --git a/compute/README.md b/compute/README.md
index b6e6530047..9be58b4e74 100644
--- a/compute/README.md
+++ b/compute/README.md
@@ -1,10 +1,17 @@
 # Google Compute Engine PHP Samples
 
 ## Description
-This is a simple web-based example of calling the Google Compute Engine API
-in PHP. These samples include calling the API with both the
-[Google API client](api-client) and [Google Cloud Client](cloud-client) (GA).
+This is a set of examples of calling the Google Compute Engine API
+in PHP. These samples include calling the API with the
+[Google Cloud Client](https://github.com/googleapis/google-cloud-php).
 
+Following samples are available:
+  * [Hello world](helloworld): a simple web-based example of calling the Google Compute Engine API
+  * [Instances](instances): GCE instances manipulation samples
+  * [Firewall](firewall): firewall rules manipulation samples
+  * [Logging](logging): app demonstrating how to log to Compute Engine from a PHP application
+ 
+## Google Cloud Samples
 
- * [Google Cloud Client](cloud-client) (**Recommended**): Under active development, currently in GA.
- * [Google API client](api-client): Stable and generally available, but no longer under active development
+To browse ready to use code samples check
+[Google Cloud Samples](https://cloud.google.com/docs/samples?language=php&product=computeengine).
\ No newline at end of file
diff --git a/compute/api-client/helloworld/README.md b/compute/api-client/helloworld/README.md
deleted file mode 100644
index 212db44e1b..0000000000
--- a/compute/api-client/helloworld/README.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# Google Compute Engine PHP Sample Application
-
-**NOTE: This sample is outdated. It is recommended you use the [ALPHA Compute
-Client](../../cloud-client/helloworld) instead**
-
-## Description
-This is a simple web-based example of calling the Google Compute Engine API
-in PHP.
-
-## Prerequisites
-Please make sure that all of the following is installed before trying to run
-the sample application.
-
-- [PHP 5.2.x or higher](http://www.php.net/)
-- [PHP Curl extension](http://www.php.net/manual/en/intro.curl.php)
-- [PHP JSON extension](http://php.net/manual/en/book.json.php)
-- The [`google-api-php-client`](https://github.com/google/google-api-php-client)
-  library checked out locally
-
-## Setup Authentication
-NOTE: This README assumes that you have enabled access to the Google Compute
-Engine API via the Google API Console page.
-
-1) Visit https://code.google.com/apis/console/?api=compute to register your
-application.
-- Click on "API Access" in the left column
-- Click the button labeled "Create an OAuth2 client ID..." if you have not
-  generated any client IDs, or "Create another client ID..." if you have
-- Give your application a name and click "Next"
-- Select "Web Application" as the "Application type"
-- Click "Create client ID"
-- Click "Edit settings..." for your new client ID
-- Under the redirect URI, enter the location of your application
-- Click "Update"
-- Click on "Overview" in the left column and note the Project ID
-
-2) Update app.php with the redirect uri, consumer key, secret, and Project ID
-obtained in step 1.
-- Update `YOUR_CLIENT_ID` with your oauth2 client id.
-- Update `YOUR_CLIENT_SECRET` with your oauth2 client secret.
-- Update `YOUR_REDIRECT_URI` with the fully qualified
-  redirect URI.
-- Update `YOUR_GOOGLE_COMPUTE_ENGINE_PROJECT` with your Project ID from the
-  API Console.
-
-## Running the Sample Application
-3) Load app.php on your web server, and visit the appropriate website in
-your web browser.
diff --git a/compute/api-client/helloworld/app.php b/compute/api-client/helloworld/app.php
deleted file mode 100755
index f482f6dd38..0000000000
--- a/compute/api-client/helloworld/app.php
+++ /dev/null
@@ -1,380 +0,0 @@
-<?php
-/*
- * Copyright 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Follow the instructions on https://code.google/com/p/google-api-php-client
- * to download, extract and include the Google APIs client library for PHP into
- * your project.
- */
-require_once 'google-api-php-client/src/Google_Client.php';
-require_once 'google-api-php-client/src/contrib/Google_ComputeService.php';
-
-session_start();
-
-/**
- * Visit https://code.google.com/apis/console to generate your
- * oauth2_client_id, oauth2_client_secret, and to register your
- * oauth2_redirect_uri.
- */
-$client = new Google_Client();
-$client->setApplicationName('Google Compute Engine PHP Starter Application');
-$client->setClientId('YOUR_CLIENT_ID');
-$client->setClientSecret('YOUR_CLIENT_SECRET');
-$client->setRedirectUri('YOUR_REDIRECT_URI');
-$computeService = new Google_ComputeService($client);
-
-/**
- * The name of your Google Compute Engine Project.
- */
-$project = 'YOUR_GOOGLE_COMPUTE_ENGINE_PROJECT';
-
-/**
- * Constants for sample request parameters.
- */
-define('API_VERSION', 'v1beta14');
-define('BASE_URL', 'https://www.googleapis.com/compute/' .
-  API_VERSION . '/projects/');
-define('GOOGLE_PROJECT', 'google');
-define('DEFAULT_PROJECT', $project);
-define('DEFAULT_NAME', 'new-node');
-define('DEFAULT_NAME_WITH_METADATA', 'new-node-with-metadata');
-define('DEFAULT_MACHINE_TYPE', BASE_URL . DEFAULT_PROJECT .
-  '/global/machineTypes/n1-standard-1');
-define('DEFAULT_ZONE_NAME', 'us-central1-a');
-define('DEFAULT_ZONE', BASE_URL . DEFAULT_PROJECT . '/zones/' . DEFAULT_ZONE_NAME);
-define('DEFAULT_IMAGE', BASE_URL . GOOGLE_PROJECT .
-  '/global/images/gcel-12-04-v20130104');
-define('DEFAULT_NETWORK', BASE_URL . DEFAULT_PROJECT .
-  '/global/networks/default');
-
-/**
- * Generates the markup for a specific Google Compute Engine API request.
- * @param string $apiRequestName The name of the API request to process.
- * @param string $apiResponse The API response to process.
- * @return string Markup for the specific Google Compute Engine API request.
- */
-function generateMarkup($apiRequestName, $apiResponse)
-{
-    $apiRequestMarkup = '';
-    $apiRequestMarkup .= '<header><h2>' . $apiRequestName . '</h2></header>';
-
-    if ($apiResponse['items'] == '') {
-        $apiRequestMarkup .= '<pre>';
-        $apiRequestMarkup .= print_r(json_decode(json_encode($apiResponse), true), true);
-        $apiRequestMarkup .= '</pre>';
-    } else {
-        foreach ($apiResponse['items'] as $response) {
-            $apiRequestMarkup .= '<pre>';
-            $apiRequestMarkup .= print_r(json_decode(json_encode($response), true), true);
-            $apiRequestMarkup .= '</pre>';
-        }
-    }
-
-    return $apiRequestMarkup;
-}
-
-/**
- * Clear access token whenever a logout is requested.
- */
-if (isset($_REQUEST['logout'])) {
-    unset($_SESSION['access_token']);
-}
-
-/**
- * Authenticate and set client access token.
- */
-if (isset($_GET['code'])) {
-    $client->authenticate($_GET['code']);
-    $_SESSION['access_token'] = $client->getAccessToken();
-    $redirect = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
-    header('Location: ' . filter_var($redirect, FILTER_SANITIZE_URL));
-}
-
-/**
- * Set client access token.
- */
-if (isset($_SESSION['access_token'])) {
-    $client->setAccessToken($_SESSION['access_token']);
-}
-
-/**
- * If all authentication has been successfully completed, make Google Compute
- * Engine API requests.
- */
-if ($client->getAccessToken()) {
-    /**
-   * Google Compute Engine API request to retrieve the list of instances in your
-   * Google Compute Engine project.
-   */
-    $instances = $computeService->instances->listInstances(
-        DEFAULT_PROJECT,
-        DEFAULT_ZONE_NAME
-    );
-
-    $instancesListMarkup = generateMarkup(
-        'List Instances',
-        $instances
-    );
-
-    /**
-     * Google Compute Engine API request to retrieve the list of all data center
-     * locations associated with your Google Compute Engine project.
-     */
-    $zones = $computeService->zones->listZones(DEFAULT_PROJECT);
-    $zonesListMarkup = generateMarkup('List Zones', $zones);
-
-    /**
-     * Google Compute Engine API request to retrieve the list of all machine types
-     * associated with your Google Compute Engine project.
-     */
-    $machineTypes = $computeService->machineTypes->listMachineTypes(DEFAULT_PROJECT);
-    $machineTypesListMarkup = generateMarkup(
-        'List Machine Types',
-        $machineTypes
-    );
-
-    /**
-     * Google Compute Engine API request to retrieve the list of all image types
-     * associated with your Google Compute Engine project.
-     */
-    $images = $computeService->images->listImages(GOOGLE_PROJECT);
-    $imagesListMarkup = generateMarkup('List Images', $images);
-
-    /**
-     * Google Compute Engine API request to retrieve the list of all firewalls
-     * associated with your Google Compute Engine project.
-     */
-    $firewalls = $computeService->firewalls->listFirewalls(DEFAULT_PROJECT);
-    $firewallsListMarkup = generateMarkup('List Firewalls', $firewalls);
-
-    /**
-     * Google Compute Engine API request to retrieve the list of all networks
-     * associated with your Google Compute Engine project.
-     */
-    $networks = $computeService->networks->listNetworks(DEFAULT_PROJECT);
-    $networksListMarkup = generateMarkup('List Networks', $networks);
-    ;
-
-    /**
-     * Google Compute Engine API request to insert a new instance into your Google
-     * Compute Engine project.
-     */
-    $name = DEFAULT_NAME;
-    $machineType = DEFAULT_MACHINE_TYPE;
-    $zone = DEFAULT_ZONE_NAME;
-    $image = DEFAULT_IMAGE;
-
-    $googleNetworkInterfaceObj = new Google_NetworkInterface();
-    $network = DEFAULT_NETWORK;
-    $googleNetworkInterfaceObj->setNetwork($network);
-
-    $new_instance = new Google_Instance();
-    $new_instance->setName($name);
-    $new_instance->setImage($image);
-    $new_instance->setMachineType($machineType);
-    $new_instance->setNetworkInterfaces(array($googleNetworkInterfaceObj));
-
-    $insertInstance = $computeService->instances->insert(DEFAULT_PROJECT, $zone, $new_instance);
-    $insertInstanceMarkup = generateMarkup('Insert Instance', $insertInstance);
-
-    /**
-     * Google Compute Engine API request to insert a new instance (with metadata)
-     * into your Google Compute Engine project.
-     */
-    $name = DEFAULT_NAME_WITH_METADATA;
-    $machineType = DEFAULT_MACHINE_TYPE;
-    $zone = DEFAULT_ZONE_NAME;
-    $image = DEFAULT_IMAGE;
-
-    $googleNetworkInterfaceObj = new Google_NetworkInterface();
-    $network = DEFAULT_NETWORK;
-    $googleNetworkInterfaceObj->setNetwork($network);
-
-    $metadataItemsObj = new Google_MetadataItems();
-    $metadataItemsObj->setKey('startup-script');
-    $metadataItemsObj->setValue('apt-get install apache2');
-
-    $metadata = new Google_Metadata();
-    $metadata->setItems(array($metadataItemsObj));
-
-    $new_instance = new Google_Instance();
-    $new_instance->setName($name);
-    $new_instance->setImage($image);
-    $new_instance->setMachineType($machineType);
-    $new_instance->setNetworkInterfaces(array($googleNetworkInterfaceObj));
-    $new_instance->setMetadata($metadata);
-
-    $insertInstanceWithMetadata = $computeService->instances->insert(
-        DEFAULT_PROJECT,
-        $zone,
-        $new_instance
-    );
-
-    $insertInstanceWithMetadataMarkup = generateMarkup(
-        'Insert Instance With Metadata',
-        $insertInstanceWithMetadata
-    );
-
-    /**
-     * Google Compute Engine API request to get an instance matching the outlined
-     * parameters from your Google Compute Engine project.
-     */
-    $getInstance = $computeService->instances->get(
-        DEFAULT_PROJECT,
-        DEFAULT_ZONE_NAME,
-        DEFAULT_NAME
-    );
-
-    $getInstanceMarkup = generateMarkup('Get Instance', $getInstance);
-
-    /**
-     * Google Compute Engine API request to get an instance matching the outlined
-     * parameters from your Google Compute Engine project.
-     */
-    $getInstanceWithMetadata = $computeService->instances->get(
-        DEFAULT_PROJECT,
-        DEFAULT_ZONE_NAME,
-        DEFAULT_NAME_WITH_METADATA
-    );
-
-    $getInstanceWithMetadataMarkup = generateMarkup(
-        'Get Instance With Metadata',
-        $getInstanceWithMetadata
-    );
-
-    /**
-     * Google Compute Engine API request to delete an instance matching the
-     * outlined parameters from your Google Compute Engine project.
-     */
-    $deleteInstance = $computeService->instances->delete(
-        DEFAULT_PROJECT,
-        DEFAULT_ZONE_NAME,
-        DEFAULT_NAME
-    );
-
-    $deleteInstanceMarkup = generateMarkup('Delete Instance', $deleteInstance);
-
-    /**
-     * Google Compute Engine API request to delete an instance matching the
-     * outlined parameters from your Google Compute Engine project.
-     */
-    $deleteInstanceWithMetadata = $computeService->instances->delete(
-        DEFAULT_PROJECT,
-        DEFAULT_ZONE_NAME,
-        DEFAULT_NAME_WITH_METADATA
-    );
-
-    $deleteInstanceWithMetadataMarkup = generateMarkup(
-        'Delete Instance With Metadata',
-        $deleteInstanceWithMetadata
-    );
-
-    /**
-     * Google Compute Engine API request to retrieve the list of all global
-     * operations associated with your Google Compute Engine project.
-     */
-    $globalOperations = $computeService->globalOperations->listGlobalOperations(
-        DEFAULT_PROJECT
-    );
-
-    $operationsListMarkup = generateMarkup(
-        'List Global Operations',
-        $globalOperations
-    );
-
-    // The access token may have been updated lazily.
-    $_SESSION['access_token'] = $client->getAccessToken();
-} else {
-    $authUrl = $client->createAuthUrl();
-}
-?>
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-  </head>
-  <body>
-    <header><h1>Google Compute Engine Sample App</h1></header>
-    <div class="main-content">
-      <?php if (isset($instancesListMarkup)): ?>
-        <div id="listInstances"><?php print $instancesListMarkup ?></div>
-      <?php endif ?>
-
-      <?php if (isset($zonesListMarkup)): ?>
-        <div id="listZones"><?php print $zonesListMarkup ?></div>
-      <?php endif ?>
-
-      <?php if (isset($machineTypesListMarkup)): ?>
-        <div id="listMachineTypes"><?php print $machineTypesListMarkup ?></div>
-      <?php endif ?>
-
-      <?php if (isset($imagesListMarkup)): ?>
-        <div id="listImages"><?php print $imagesListMarkup ?></div>
-      <?php endif ?>
-
-      <?php if (isset($firewallsListMarkup)): ?>
-        <div id="listFirewalls"><?php print $firewallsListMarkup ?></div>
-      <?php endif ?>
-
-      <?php if (isset($networksListMarkup)): ?>
-        <div id="listNetworks"><?php print $networksListMarkup ?></div>
-      <?php endif ?>
-
-      <?php if (isset($getInstanceWithMetadataMarkup)): ?>
-        <div id="getInstanceWithMetadata">
-          <?php print $getInstanceWithMetadataMarkup ?>
-        </div>
-      <?php endif ?>
-
-      <?php if (isset($getInstanceMarkup)): ?>
-        <div id="getInstance"><?php print $getInstanceMarkup ?></div>
-      <?php endif ?>
-
-      <?php if (isset($deleteInstanceMarkup)): ?>
-        <div id="deleteInstance"><?php print $deleteInstanceMarkup ?></div>
-      <?php endif ?>
-
-      <?php if (isset($deleteInstanceWithMetadataMarkup)): ?>
-        <div id="deleteInstanceWithMetadata">
-          <?php print $deleteInstanceWithMetadataMarkup ?>
-        </div>
-      <?php endif ?>
-
-      <?php if (isset($insertInstanceMarkup)): ?>
-        <div id="insertInstance"><?php print $insertInstanceMarkup ?></div>
-      <?php endif ?>
-
-      <?php if (isset($insertInstanceWithMetadataMarkup)): ?>
-        <div id="insertInstanceWithMetadata">
-          <?php print $insertInstanceWithMetadataMarkup?>
-        </div>
-      <?php endif ?>
-
-      <?php if (isset($operationsListMarkup)): ?>
-        <div id="listGlobalOperations"><?php print $operationsListMarkup ?></div>
-      <?php endif ?>
-
-      <?php
-        if (isset($authUrl)) {
-            print "<a class='login' href='$authUrl'>Connect Me!</a>";
-        } else {
-            print "<a class='logout' href='?logout'>Logout</a>";
-        }
-      ?>
-    </div>
-  </body>
-</html>
diff --git a/compute/api-client/helloworld/composer.json b/compute/api-client/helloworld/composer.json
deleted file mode 100644
index e45348a583..0000000000
--- a/compute/api-client/helloworld/composer.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "require": {
-        "google/apiclient": "^2.9"
-    },
-    "scripts": {
-        "pre-autoload-dump": "Google\\Task\\Composer::cleanup"
-    },
-    "extra": {
-        "google/apiclient-services": [
-            "Compute"
-        ]
-    }
-}
diff --git a/compute/cloud-client/firewall/composer.json b/compute/cloud-client/firewall/composer.json
deleted file mode 100644
index 12d067ded4..0000000000
--- a/compute/cloud-client/firewall/composer.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "require": {
-        "google/cloud-compute": "^1.0.2",
-        "google/cloud-storage": "^1.26"
-    }
-}
diff --git a/compute/cloud-client/firewall/README.md b/compute/firewall/README.md
similarity index 100%
rename from compute/cloud-client/firewall/README.md
rename to compute/firewall/README.md
diff --git a/compute/firewall/composer.json b/compute/firewall/composer.json
new file mode 100644
index 0000000000..0a46e3fdea
--- /dev/null
+++ b/compute/firewall/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "google/cloud-compute": "^1.6"
+    }
+}
diff --git a/compute/cloud-client/firewall/phpunit.xml.dist b/compute/firewall/phpunit.xml.dist
similarity index 95%
rename from compute/cloud-client/firewall/phpunit.xml.dist
rename to compute/firewall/phpunit.xml.dist
index e3f3b067ee..a5f3b8ae59 100644
--- a/compute/cloud-client/firewall/phpunit.xml.dist
+++ b/compute/firewall/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="../../../testing/bootstrap.php">
+<phpunit bootstrap="../../testing/bootstrap.php">
     <testsuites>
         <testsuite name="Google Compute Cloud Client Instances Tests">
             <directory>test</directory>
diff --git a/compute/cloud-client/firewall/src/create_firewall_rule.php b/compute/firewall/src/create_firewall_rule.php
similarity index 98%
rename from compute/cloud-client/firewall/src/create_firewall_rule.php
rename to compute/firewall/src/create_firewall_rule.php
index f7135f109a..daea3ddc3b 100644
--- a/compute/cloud-client/firewall/src/create_firewall_rule.php
+++ b/compute/firewall/src/create_firewall_rule.php
@@ -87,5 +87,5 @@ function create_firewall_rule(string $projectId, string $firewallRuleName, strin
 }
 # [END compute_firewall_create]
 
-require_once __DIR__ . '/../../../../testing/sample_helpers.php';
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);
diff --git a/compute/cloud-client/firewall/src/delete_firewall_rule.php b/compute/firewall/src/delete_firewall_rule.php
similarity index 96%
rename from compute/cloud-client/firewall/src/delete_firewall_rule.php
rename to compute/firewall/src/delete_firewall_rule.php
index 485ae9d3e8..fe9fea8a4a 100644
--- a/compute/cloud-client/firewall/src/delete_firewall_rule.php
+++ b/compute/firewall/src/delete_firewall_rule.php
@@ -53,5 +53,5 @@ function delete_firewall_rule(string $projectId, string $firewallRuleName)
 }
 # [END compute_firewall_delete]
 
-require_once __DIR__ . '/../../../../testing/sample_helpers.php';
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);
diff --git a/compute/cloud-client/firewall/src/list_firewall_rules.php b/compute/firewall/src/list_firewall_rules.php
similarity index 96%
rename from compute/cloud-client/firewall/src/list_firewall_rules.php
rename to compute/firewall/src/list_firewall_rules.php
index f888286f66..2651cc5e74 100644
--- a/compute/cloud-client/firewall/src/list_firewall_rules.php
+++ b/compute/firewall/src/list_firewall_rules.php
@@ -47,5 +47,5 @@ function list_firewall_rules(string $projectId)
 }
 # [END compute_firewall_list]
 
-require_once __DIR__ . '/../../../../testing/sample_helpers.php';
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);
diff --git a/compute/cloud-client/firewall/src/patch_firewall_priority.php b/compute/firewall/src/patch_firewall_priority.php
similarity index 97%
rename from compute/cloud-client/firewall/src/patch_firewall_priority.php
rename to compute/firewall/src/patch_firewall_priority.php
index d10a730b4a..a024ed55a3 100644
--- a/compute/cloud-client/firewall/src/patch_firewall_priority.php
+++ b/compute/firewall/src/patch_firewall_priority.php
@@ -57,5 +57,5 @@ function patch_firewall_priority(string $projectId, string $firewallRuleName, in
 }
 # [END compute_firewall_patch]
 
-require_once __DIR__ . '/../../../../testing/sample_helpers.php';
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);
diff --git a/compute/cloud-client/firewall/src/print_firewall_rule.php b/compute/firewall/src/print_firewall_rule.php
similarity index 97%
rename from compute/cloud-client/firewall/src/print_firewall_rule.php
rename to compute/firewall/src/print_firewall_rule.php
index 25d4cb7f0d..1d10ee4618 100644
--- a/compute/cloud-client/firewall/src/print_firewall_rule.php
+++ b/compute/firewall/src/print_firewall_rule.php
@@ -62,5 +62,5 @@ function print_firewall_rule(string $projectId, string $firewallRuleName)
     }
 }
 
-require_once __DIR__ . '/../../../../testing/sample_helpers.php';
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);
diff --git a/compute/cloud-client/firewall/test/firewallTest.php b/compute/firewall/test/firewallTest.php
similarity index 100%
rename from compute/cloud-client/firewall/test/firewallTest.php
rename to compute/firewall/test/firewallTest.php
diff --git a/compute/cloud-client/helloworld/README.md b/compute/helloworld/README.md
similarity index 100%
rename from compute/cloud-client/helloworld/README.md
rename to compute/helloworld/README.md
diff --git a/compute/cloud-client/helloworld/app.php b/compute/helloworld/app.php
similarity index 100%
rename from compute/cloud-client/helloworld/app.php
rename to compute/helloworld/app.php
diff --git a/compute/cloud-client/helloworld/composer.json b/compute/helloworld/composer.json
similarity index 100%
rename from compute/cloud-client/helloworld/composer.json
rename to compute/helloworld/composer.json
diff --git a/compute/cloud-client/instances/README.md b/compute/instances/README.md
similarity index 100%
rename from compute/cloud-client/instances/README.md
rename to compute/instances/README.md
diff --git a/compute/cloud-client/instances/composer.json b/compute/instances/composer.json
similarity index 61%
rename from compute/cloud-client/instances/composer.json
rename to compute/instances/composer.json
index 12d067ded4..d84859482a 100644
--- a/compute/cloud-client/instances/composer.json
+++ b/compute/instances/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "google/cloud-compute": "^1.0.2",
+        "google/cloud-compute": "^1.6",
         "google/cloud-storage": "^1.26"
     }
 }
diff --git a/compute/cloud-client/instances/phpunit.xml.dist b/compute/instances/phpunit.xml.dist
similarity index 95%
rename from compute/cloud-client/instances/phpunit.xml.dist
rename to compute/instances/phpunit.xml.dist
index e3f3b067ee..a5f3b8ae59 100644
--- a/compute/cloud-client/instances/phpunit.xml.dist
+++ b/compute/instances/phpunit.xml.dist
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<phpunit bootstrap="../../../testing/bootstrap.php">
+<phpunit bootstrap="../../testing/bootstrap.php">
     <testsuites>
         <testsuite name="Google Compute Cloud Client Instances Tests">
             <directory>test</directory>
diff --git a/compute/cloud-client/instances/src/create_instance.php b/compute/instances/src/create_instance.php
similarity index 98%
rename from compute/cloud-client/instances/src/create_instance.php
rename to compute/instances/src/create_instance.php
index 583d106b88..2a6675891b 100644
--- a/compute/cloud-client/instances/src/create_instance.php
+++ b/compute/instances/src/create_instance.php
@@ -97,5 +97,5 @@ function create_instance(
 }
 # [END compute_instances_create]
 
-require_once __DIR__ . '/../../../../testing/sample_helpers.php';
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);
diff --git a/compute/cloud-client/instances/src/create_instance_with_encryption_key.php b/compute/instances/src/create_instance_with_encryption_key.php
similarity index 98%
rename from compute/cloud-client/instances/src/create_instance_with_encryption_key.php
rename to compute/instances/src/create_instance_with_encryption_key.php
index ce8f9aeee0..8e84d6a97b 100644
--- a/compute/cloud-client/instances/src/create_instance_with_encryption_key.php
+++ b/compute/instances/src/create_instance_with_encryption_key.php
@@ -107,5 +107,5 @@ function create_instance_with_encryption_key(
 }
 # [END compute_instances_create_encrypted]
 
-require_once __DIR__ . '/../../../../testing/sample_helpers.php';
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);
diff --git a/compute/cloud-client/instances/src/delete_instance.php b/compute/instances/src/delete_instance.php
similarity index 96%
rename from compute/cloud-client/instances/src/delete_instance.php
rename to compute/instances/src/delete_instance.php
index d59ca9991c..12a62a667f 100644
--- a/compute/cloud-client/instances/src/delete_instance.php
+++ b/compute/instances/src/delete_instance.php
@@ -56,5 +56,5 @@ function delete_instance(
 }
 # [END compute_instances_delete]
 
-require_once __DIR__ . '/../../../../testing/sample_helpers.php';
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);
diff --git a/compute/cloud-client/instances/src/disable_usage_export_bucket.php b/compute/instances/src/disable_usage_export_bucket.php
similarity index 96%
rename from compute/cloud-client/instances/src/disable_usage_export_bucket.php
rename to compute/instances/src/disable_usage_export_bucket.php
index bc4b244b14..4e9bc75815 100644
--- a/compute/cloud-client/instances/src/disable_usage_export_bucket.php
+++ b/compute/instances/src/disable_usage_export_bucket.php
@@ -51,5 +51,5 @@ function disable_usage_export_bucket(string $projectId)
 }
 # [END compute_usage_report_disable]
 
-require_once __DIR__ . '/../../../../testing/sample_helpers.php';
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);
diff --git a/compute/cloud-client/instances/src/get_usage_export_bucket.php b/compute/instances/src/get_usage_export_bucket.php
similarity index 97%
rename from compute/cloud-client/instances/src/get_usage_export_bucket.php
rename to compute/instances/src/get_usage_export_bucket.php
index 6097cd6c96..6fdfed344b 100644
--- a/compute/cloud-client/instances/src/get_usage_export_bucket.php
+++ b/compute/instances/src/get_usage_export_bucket.php
@@ -70,5 +70,5 @@ function get_usage_export_bucket(string $projectId)
 }
 # [END compute_usage_report_get]
 
-require_once __DIR__ . '/../../../../testing/sample_helpers.php';
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);
diff --git a/compute/cloud-client/instances/src/list_all_images.php b/compute/instances/src/list_all_images.php
similarity index 96%
rename from compute/cloud-client/instances/src/list_all_images.php
rename to compute/instances/src/list_all_images.php
index e4c4230357..9dc4f901f4 100644
--- a/compute/cloud-client/instances/src/list_all_images.php
+++ b/compute/instances/src/list_all_images.php
@@ -52,5 +52,5 @@ function list_all_images(string $projectId)
 }
 # [END compute_images_list]
 
-require_once __DIR__ . '/../../../../testing/sample_helpers.php';
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);
diff --git a/compute/cloud-client/instances/src/list_all_instances.php b/compute/instances/src/list_all_instances.php
similarity index 96%
rename from compute/cloud-client/instances/src/list_all_instances.php
rename to compute/instances/src/list_all_instances.php
index 194f407dd8..b539d838ee 100644
--- a/compute/cloud-client/instances/src/list_all_instances.php
+++ b/compute/instances/src/list_all_instances.php
@@ -52,5 +52,5 @@ function list_all_instances(string $projectId)
 }
 # [END compute_instances_list_all]
 
-require_once __DIR__ . '/../../../../testing/sample_helpers.php';
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);
diff --git a/compute/cloud-client/instances/src/list_images_by_page.php b/compute/instances/src/list_images_by_page.php
similarity index 97%
rename from compute/cloud-client/instances/src/list_images_by_page.php
rename to compute/instances/src/list_images_by_page.php
index 6a1069a91a..ee0efae30d 100644
--- a/compute/cloud-client/instances/src/list_images_by_page.php
+++ b/compute/instances/src/list_images_by_page.php
@@ -59,5 +59,5 @@ function list_images_by_page(string $projectId, int $pageSize = 10)
 }
 # [END compute_images_list_page]
 
-require_once __DIR__ . '/../../../../testing/sample_helpers.php';
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);
diff --git a/compute/cloud-client/instances/src/list_instances.php b/compute/instances/src/list_instances.php
similarity index 96%
rename from compute/cloud-client/instances/src/list_instances.php
rename to compute/instances/src/list_instances.php
index 8fd33393a6..efc4f2829f 100644
--- a/compute/cloud-client/instances/src/list_instances.php
+++ b/compute/instances/src/list_instances.php
@@ -47,5 +47,5 @@ function list_instances(string $projectId, string $zone)
 }
 # [END compute_instances_list]
 
-require_once __DIR__ . '/../../../../testing/sample_helpers.php';
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);
diff --git a/compute/cloud-client/instances/src/reset_instance.php b/compute/instances/src/reset_instance.php
similarity index 96%
rename from compute/cloud-client/instances/src/reset_instance.php
rename to compute/instances/src/reset_instance.php
index f52fb85d53..2b0a797c58 100644
--- a/compute/cloud-client/instances/src/reset_instance.php
+++ b/compute/instances/src/reset_instance.php
@@ -57,5 +57,5 @@ function reset_instance(
 
 # [END compute_reset_instance]
 
-require_once __DIR__ . '/../../../../testing/sample_helpers.php';
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);
diff --git a/compute/cloud-client/instances/src/resume_instance.php b/compute/instances/src/resume_instance.php
similarity index 96%
rename from compute/cloud-client/instances/src/resume_instance.php
rename to compute/instances/src/resume_instance.php
index ff3f5d79ce..196fa60ce6 100644
--- a/compute/cloud-client/instances/src/resume_instance.php
+++ b/compute/instances/src/resume_instance.php
@@ -56,5 +56,5 @@ function resume_instance(
 }
 # [END compute_resume_instance]
 
-require_once __DIR__ . '/../../../../testing/sample_helpers.php';
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);
diff --git a/compute/cloud-client/instances/src/set_usage_export_bucket.php b/compute/instances/src/set_usage_export_bucket.php
similarity index 98%
rename from compute/cloud-client/instances/src/set_usage_export_bucket.php
rename to compute/instances/src/set_usage_export_bucket.php
index 5e7f29c2bd..688d8994e4 100644
--- a/compute/cloud-client/instances/src/set_usage_export_bucket.php
+++ b/compute/instances/src/set_usage_export_bucket.php
@@ -81,5 +81,5 @@ function set_usage_export_bucket(
 }
 # [END compute_usage_report_set]
 
-require_once __DIR__ . '/../../../../testing/sample_helpers.php';
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);
diff --git a/compute/cloud-client/instances/src/start_instance.php b/compute/instances/src/start_instance.php
similarity index 96%
rename from compute/cloud-client/instances/src/start_instance.php
rename to compute/instances/src/start_instance.php
index 396c167369..bad757cfd6 100644
--- a/compute/cloud-client/instances/src/start_instance.php
+++ b/compute/instances/src/start_instance.php
@@ -56,5 +56,5 @@ function start_instance(
 }
 # [END compute_start_instance]
 
-require_once __DIR__ . '/../../../../testing/sample_helpers.php';
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);
diff --git a/compute/cloud-client/instances/src/start_instance_with_encryption_key.php b/compute/instances/src/start_instance_with_encryption_key.php
similarity index 98%
rename from compute/cloud-client/instances/src/start_instance_with_encryption_key.php
rename to compute/instances/src/start_instance_with_encryption_key.php
index dc4a66c7a6..ca0023b1a6 100644
--- a/compute/cloud-client/instances/src/start_instance_with_encryption_key.php
+++ b/compute/instances/src/start_instance_with_encryption_key.php
@@ -82,5 +82,5 @@ function start_instance_with_encryption_key(
 }
 # [END compute_start_enc_instance]
 
-require_once __DIR__ . '/../../../../testing/sample_helpers.php';
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);
diff --git a/compute/cloud-client/instances/src/stop_instance.php b/compute/instances/src/stop_instance.php
similarity index 96%
rename from compute/cloud-client/instances/src/stop_instance.php
rename to compute/instances/src/stop_instance.php
index 6e36af9d0c..b77d0dc90e 100644
--- a/compute/cloud-client/instances/src/stop_instance.php
+++ b/compute/instances/src/stop_instance.php
@@ -57,5 +57,5 @@ function stop_instance(
 
 # [END compute_stop_instance]
 
-require_once __DIR__ . '/../../../../testing/sample_helpers.php';
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);
diff --git a/compute/cloud-client/instances/src/suspend_instance.php b/compute/instances/src/suspend_instance.php
similarity index 96%
rename from compute/cloud-client/instances/src/suspend_instance.php
rename to compute/instances/src/suspend_instance.php
index cbcb5b4a11..8c1a14b6a6 100644
--- a/compute/cloud-client/instances/src/suspend_instance.php
+++ b/compute/instances/src/suspend_instance.php
@@ -57,5 +57,5 @@ function suspend_instance(
 
 # [END compute_suspend_instance]
 
-require_once __DIR__ . '/../../../../testing/sample_helpers.php';
+require_once __DIR__ . '/../../../testing/sample_helpers.php';
 \Google\Cloud\Samples\execute_sample(__FILE__, __NAMESPACE__, $argv);
diff --git a/compute/cloud-client/instances/test/instancesTest.php b/compute/instances/test/instancesTest.php
similarity index 100%
rename from compute/cloud-client/instances/test/instancesTest.php
rename to compute/instances/test/instancesTest.php