Rename directories to be less redundant.

cloud-storage/xml-api/README.md

@@ -3,6 +3,6 @@ java-docs-samples/cloud-storage XML API Examples
 
 Samples used in Google Cloud Storage documentation (https://developers.google.com/storage/docs/xml-api-java-samples).
 
-- **storage-serviceaccount-cmdline-sample** - Uses a service account private key and client ID to generate credentials to access a specified bucket. 
+- **serviceaccount-cmdline-sample** - Uses a service account private key and client ID to generate credentials to access a specified bucket. 
 
-- **storage-serviceaccount-appengine-sample** - Uses Google App Engine credentials to access a specified bucket. You must add the App Engine Service Account Name to the Permissions of the project that contains the bucket. 
+- **serviceaccount-appengine-sample** - Uses Google App Engine credentials to access a specified bucket. You must add the App Engine Service Account Name to the Permissions of the project that contains the bucket. 

cloud-storage/xml-api/storage-serviceaccount-appengine-sample/README.md → cloud-storage/xml-api/serviceaccount-appengine-sample/README.md

@@ -4,7 +4,7 @@ Using the Service Account App Engine Sample
 Browse Online
 -------------
 
-The main code file is [StorageSample.java](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/cloud-storage/xml-api/storage-serviceaccount-cmdline-sample/src/main/java/StorageServiceAccountSample.java). 
+The main code file is [StorageSample.java](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/cloud-storage/xml-api/serviceaccount-appengine-sample/src/main/java/StorageServiceAccountSample.java). 
 
 Add Your App Engine Service Account Name to the Project Team
 ------------------------------------------------------------
@@ -22,7 +22,7 @@ https://help.github.com/articles/set-up-git).
 
     cd [someDirectory]
     git clone https://github.com/GoogleCloudPlatform/java-docs-samples.git
-    cd java-docs-samples/cloud-storage/xml-api/storage-serviceaccount-appengine-sample
+    cd java-docs-samples/cloud-storage/xml-api/serviceaccount-appengine-sample
     mvn clean package
 
 To enable logging of HTTP requests and responses (highly recommended when 

cloud-storage/xml-api/storage-serviceaccount-appengine-sample/pom.xml → cloud-storage/xml-api/serviceaccount-appengine-sample/pom.xml

@@ -7,7 +7,7 @@
     <version>5</version>
   </parent>
   <groupId>com.google.apis-samples</groupId>
-  <artifactId>storage-serviceaccounts-appengine-sample</artifactId>
+  <artifactId>serviceaccounts-appengine-sample</artifactId>
   <version>1.0.0</version>
   <name>Example for Google Cloud Storage using OAuth 2.0 Service Accounts on Google App Engine</name>
   <packaging>war</packaging>

cloud-storage/xml-api/storage-serviceaccount-cmdline-sample/README.md → cloud-storage/xml-api/serviceaccount-cmdline-sample/README.md

@@ -4,7 +4,7 @@ Using the Service Account Command Line Sample
 Browse Online
 --------------
 
-The main file is [StorageServiceAccountSample.java](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/cloud-storage/xml-api/storage-serviceaccount-cmdline-sample/src/main/java/StorageServiceAccountSample.java).
+The main file is [StorageServiceAccountSample.java](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/cloud-storage/xml-api/serviceaccount-cmdline-sample/src/main/java/StorageServiceAccountSample.java).
 
 Get a Service Account
 ---------------------
@@ -24,7 +24,7 @@ You may need to set your `JAVA_HOME`.
 
         cd [someDirectory]
         git clone https://github.com/GoogleCloudPlatform/java-docs-samples.git
-        cd java-docs-samples/cloud-storage/xml-api/storage-serviceaccount-cmdline-sample
+        cd java-docs-samples/cloud-storage/xml-api/serviceaccount-cmdline-sample
 
 2. Update key.p12 file.
 3. Edit `StorageServiceAccountSample.java` to add your bucket and service account email.
@@ -51,12 +51,12 @@ Set Up a Project in Eclipse
         * check on "Download Artifact Sources"
         * check on "Download Artifact JavaDoc"
 
-* Clone the `storage-serviceaccount-cmdline-sample` to your computer
+* Clone the `serviceaccount-cmdline-sample` to your computer
 
     * You can use either a plugin with Eclipse or any other tool you normally use
 to work with GitHub repositories.
 
-* Create a new project using `storage-serviceaccount-cmdline-sample`
+* Create a new project using `serviceaccount-cmdline-sample`
 
     * Create a new Java Project.
     * Choose the **Location** of the project to be the root directory of the sample you cloned locally.