Move all classes to com.google.common.jimfs.

-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=68905401

103 files changed, 200 insertions, 200 deletions

diff --git a/README.md b/README.md
index 8760585..368ae33 100644
--- a/README.md
+++ b/README.md
@@ -28,8 +28,8 @@ The simplest way to use Jimfs is to just get a new `FileSystem` instance from th
 start using it:
 
 ```java
-import com.google.jimfs.Configuration;
-import com.google.jimfs.Jimfs;
+import com.google.common.jimfs.Configuration;
+import com.google.common.jimfs.Jimfs;
 ...
 
 // For a simple file system with Unix-style paths and behavior:
diff --git a/jimfs/pom.xml b/jimfs/pom.xml
index 7b32a6a..4168986 100644
--- a/jimfs/pom.xml
+++ b/jimfs/pom.xml
@@ -122,7 +122,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Export-Package>com.google.jimfs.*</Export-Package>
+            <Export-Package>com.google.common.jimfs.*</Export-Package>
             <Include-Resource>
               META-INF/services=target/classes/META-INF/services
             </Include-Resource>
diff --git a/jimfs/src/main/java/com/google/jimfs/AbstractAttributeView.java b/jimfs/src/main/java/com/google/common/jimfs/AbstractAttributeView.java
index 7a336c8..aa203fa 100644
--- a/jimfs/src/main/java/com/google/jimfs/AbstractAttributeView.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/AbstractAttributeView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/AbstractWatchService.java b/jimfs/src/main/java/com/google/common/jimfs/AbstractWatchService.java
index 17ef33a..ed0fb83 100644
--- a/jimfs/src/main/java/com/google/jimfs/AbstractWatchService.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/AbstractWatchService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/jimfs/src/main/java/com/google/jimfs/AclAttributeProvider.java b/jimfs/src/main/java/com/google/common/jimfs/AclAttributeProvider.java
index fc686dc..6a52a70 100644
--- a/jimfs/src/main/java/com/google/jimfs/AclAttributeProvider.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/AclAttributeProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/AttributeCopyOption.java b/jimfs/src/main/java/com/google/common/jimfs/AttributeCopyOption.java
index 2ae5eaf..7d10e31 100644
--- a/jimfs/src/main/java/com/google/jimfs/AttributeCopyOption.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/AttributeCopyOption.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 /**
  * Options for how to handle copying of file attributes when copying a file.
diff --git a/jimfs/src/main/java/com/google/jimfs/AttributeProvider.java b/jimfs/src/main/java/com/google/common/jimfs/AttributeProvider.java
index a3e6794..82ceba1 100644
--- a/jimfs/src/main/java/com/google/jimfs/AttributeProvider.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/AttributeProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/AttributeService.java b/jimfs/src/main/java/com/google/common/jimfs/AttributeService.java
index d28eb84..fc6fec3 100644
--- a/jimfs/src/main/java/com/google/jimfs/AttributeService.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/AttributeService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/BasicAttributeProvider.java b/jimfs/src/main/java/com/google/common/jimfs/BasicAttributeProvider.java
index 55d0382..72cbcdc 100644
--- a/jimfs/src/main/java/com/google/jimfs/BasicAttributeProvider.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/BasicAttributeProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
diff --git a/jimfs/src/main/java/com/google/jimfs/Configuration.java b/jimfs/src/main/java/com/google/common/jimfs/Configuration.java
index fcf9623..d9d14fd 100644
--- a/jimfs/src/main/java/com/google/jimfs/Configuration.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/Configuration.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.jimfs.Feature.FILE_CHANNEL;
-import static com.google.jimfs.Feature.LINKS;
-import static com.google.jimfs.Feature.SECURE_DIRECTORY_STREAM;
-import static com.google.jimfs.Feature.SYMBOLIC_LINKS;
-import static com.google.jimfs.PathNormalization.CASE_FOLD_ASCII;
-import static com.google.jimfs.PathNormalization.NFC;
-import static com.google.jimfs.PathNormalization.NFD;
+import static com.google.common.jimfs.Feature.FILE_CHANNEL;
+import static com.google.common.jimfs.Feature.LINKS;
+import static com.google.common.jimfs.Feature.SECURE_DIRECTORY_STREAM;
+import static com.google.common.jimfs.Feature.SYMBOLIC_LINKS;
+import static com.google.common.jimfs.PathNormalization.CASE_FOLD_ASCII;
+import static com.google.common.jimfs.PathNormalization.NFC;
+import static com.google.common.jimfs.PathNormalization.NFD;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
diff --git a/jimfs/src/main/java/com/google/jimfs/Directory.java b/jimfs/src/main/java/com/google/common/jimfs/Directory.java
index 5831216..454c873 100644
--- a/jimfs/src/main/java/com/google/jimfs/Directory.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/Directory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.AbstractIterator;
diff --git a/jimfs/src/main/java/com/google/jimfs/DirectoryEntry.java b/jimfs/src/main/java/com/google/common/jimfs/DirectoryEntry.java
index 6a7ff89..e2902a7 100644
--- a/jimfs/src/main/java/com/google/jimfs/DirectoryEntry.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/DirectoryEntry.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
diff --git a/jimfs/src/main/java/com/google/jimfs/DosAttributeProvider.java b/jimfs/src/main/java/com/google/common/jimfs/DosAttributeProvider.java
index 425198b..c7d4a67 100644
--- a/jimfs/src/main/java/com/google/jimfs/DosAttributeProvider.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/DosAttributeProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/DowngradedDirectoryStream.java b/jimfs/src/main/java/com/google/common/jimfs/DowngradedDirectoryStream.java
index f7bd89f..c40d837 100644
--- a/jimfs/src/main/java/com/google/jimfs/DowngradedDirectoryStream.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/DowngradedDirectoryStream.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/DowngradedSeekableByteChannel.java b/jimfs/src/main/java/com/google/common/jimfs/DowngradedSeekableByteChannel.java
index 211ebee..f25dceb 100644
--- a/jimfs/src/main/java/com/google/jimfs/DowngradedSeekableByteChannel.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/DowngradedSeekableByteChannel.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/Feature.java b/jimfs/src/main/java/com/google/common/jimfs/Feature.java
index 2a05f89..1be3f55 100644
--- a/jimfs/src/main/java/com/google/jimfs/Feature.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/Feature.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import java.nio.channels.AsynchronousFileChannel;
 import java.nio.channels.FileChannel;
diff --git a/jimfs/src/main/java/com/google/jimfs/File.java b/jimfs/src/main/java/com/google/common/jimfs/File.java
index 4f0d4f8..9fd8c29 100644
--- a/jimfs/src/main/java/com/google/jimfs/File.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/File.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/FileFactory.java b/jimfs/src/main/java/com/google/common/jimfs/FileFactory.java
index 114c461..5cbd754 100644
--- a/jimfs/src/main/java/com/google/jimfs/FileFactory.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/FileFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/FileLookup.java b/jimfs/src/main/java/com/google/common/jimfs/FileLookup.java
index f1e4fd4..b427b0a 100644
--- a/jimfs/src/main/java/com/google/jimfs/FileLookup.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/FileLookup.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import java.io.IOException;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/FileSystemState.java b/jimfs/src/main/java/com/google/common/jimfs/FileSystemState.java
index 0e42935..a344894 100644
--- a/jimfs/src/main/java/com/google/jimfs/FileSystemState.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/FileSystemState.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/FileSystemView.java b/jimfs/src/main/java/com/google/common/jimfs/FileSystemView.java
index e0a4a6d..70555d3 100644
--- a/jimfs/src/main/java/com/google/jimfs/FileSystemView.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/FileSystemView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static java.nio.file.StandardCopyOption.COPY_ATTRIBUTES;
diff --git a/jimfs/src/main/java/com/google/jimfs/FileTree.java b/jimfs/src/main/java/com/google/common/jimfs/FileTree.java
index 23cbd35..d6d6603 100644
--- a/jimfs/src/main/java/com/google/jimfs/FileTree.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/FileTree.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/GlobToRegex.java b/jimfs/src/main/java/com/google/common/jimfs/GlobToRegex.java
index 98424bf..5a7cc2c 100644
--- a/jimfs/src/main/java/com/google/jimfs/GlobToRegex.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/GlobToRegex.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/HeapDisk.java b/jimfs/src/main/java/com/google/common/jimfs/HeapDisk.java
index b2954b8..3fd4652 100644
--- a/jimfs/src/main/java/com/google/jimfs/HeapDisk.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/HeapDisk.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/InternalCharMatcher.java b/jimfs/src/main/java/com/google/common/jimfs/InternalCharMatcher.java
index da20235..a3fba6a 100644
--- a/jimfs/src/main/java/com/google/jimfs/InternalCharMatcher.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/InternalCharMatcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import java.util.Arrays;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/Jimfs.java b/jimfs/src/main/java/com/google/common/jimfs/Jimfs.java
index 31338c1..3bafaa0 100644
--- a/jimfs/src/main/java/com/google/jimfs/Jimfs.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/Jimfs.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/JimfsAsynchronousFileChannel.java b/jimfs/src/main/java/com/google/common/jimfs/JimfsAsynchronousFileChannel.java
index 46a0ea3..0026660 100644
--- a/jimfs/src/main/java/com/google/jimfs/JimfsAsynchronousFileChannel.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/JimfsAsynchronousFileChannel.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/jimfs/src/main/java/com/google/jimfs/JimfsFileChannel.java b/jimfs/src/main/java/com/google/common/jimfs/JimfsFileChannel.java
index ae513aa..bc52103 100644
--- a/jimfs/src/main/java/com/google/jimfs/JimfsFileChannel.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/JimfsFileChannel.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkPositionIndexes;
diff --git a/jimfs/src/main/java/com/google/jimfs/JimfsFileStore.java b/jimfs/src/main/java/com/google/common/jimfs/JimfsFileStore.java
index 28bf2ec..cfdeafd 100644
--- a/jimfs/src/main/java/com/google/jimfs/JimfsFileStore.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/JimfsFileStore.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/JimfsFileSystem.java b/jimfs/src/main/java/com/google/common/jimfs/JimfsFileSystem.java
index bea8830..d687a8b 100644
--- a/jimfs/src/main/java/com/google/jimfs/JimfsFileSystem.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/JimfsFileSystem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -43,51 +43,51 @@ import javax.annotation.Nullable;
  *
  * <h3>Overview of file system design</h3>
  *
- * {@link com.google.jimfs.JimfsFileSystem JimfsFileSystem} instances are created by
- * {@link com.google.jimfs.JimfsFileSystems JimfsFileSystems} using a user-provided
- * {@link com.google.jimfs.Configuration Configuration}. The configuration is used to create the
- * various classes that implement the file system with the correct settings and to create the file
- * system root directories and working directory. The file system is then used to create the
+ * {@link com.google.common.jimfs.JimfsFileSystem JimfsFileSystem} instances are created by
+ * {@link com.google.common.jimfs.JimfsFileSystems JimfsFileSystems} using a user-provided
+ * {@link com.google.common.jimfs.Configuration Configuration}. The configuration is used to create
+ * the various classes that implement the file system with the correct settings and to create the
+ * file system root directories and working directory. The file system is then used to create the
  * {@code Path} objects that all file system operations use.
  *
  * <p>Once created, the primary entry points to the file system are
- * {@link com.google.jimfs.JimfsFileSystemProvider JimfsFileSystemProvider}, which handles
+ * {@link com.google.common.jimfs.JimfsFileSystemProvider JimfsFileSystemProvider}, which handles
  * calls to methods in {@link java.nio.file.Files}, and
- * {@link com.google.jimfs.JimfsSecureDirectoryStream JimfsSecureDirectoryStream}, which
+ * {@link com.google.common.jimfs.JimfsSecureDirectoryStream JimfsSecureDirectoryStream}, which
  * provides methods that are similar to those of the file system provider but which treat relative
  * paths as relative to the stream's directory rather than the file system's working directory.
  *
  * <p>The implementation of the methods on both of those classes is handled by the
- * {@link com.google.jimfs.FileSystemView FileSystemView} class, which acts as a view of
+ * {@link com.google.common.jimfs.FileSystemView FileSystemView} class, which acts as a view of
  * the file system with a specific working directory. The file system provider uses the file
  * system's default view, while each secure directory stream uses a view specific to that stream.
  *
  * <p>File system views make use of the file system's singleton
- * {@link com.google.jimfs.JimfsFileStore JimfsFileStore} which handles file creation,
+ * {@link com.google.common.jimfs.JimfsFileStore JimfsFileStore} which handles file creation,
  * storage and attributes. The file store delegates to several other classes to handle each of
  * these:
  *
  * <ul>
- *   <li>{@link com.google.jimfs.FileFactory FileFactory} handles creation of new file
+ *   <li>{@link com.google.common.jimfs.FileFactory FileFactory} handles creation of new file
  *   objects.</li>
- *   <li>{@link com.google.jimfs.HeapDisk HeapDisk} handles allocation of blocks to
+ *   <li>{@link com.google.common.jimfs.HeapDisk HeapDisk} handles allocation of blocks to
  *   {@link RegularFile RegularFile} instances.</li>
- *   <li>{@link com.google.jimfs.FileTree FileTree} stores the root of the file hierarchy
+ *   <li>{@link com.google.common.jimfs.FileTree FileTree} stores the root of the file hierarchy
  *   and handles file lookup.</li>
- *   <li>{@link com.google.jimfs.AttributeService AttributeService} handles file
+ *   <li>{@link com.google.common.jimfs.AttributeService AttributeService} handles file
  *   attributes, using a set of
- *   {@link com.google.jimfs.AttributeProvider AttributeProvider} implementations to
+ *   {@link com.google.common.jimfs.AttributeProvider AttributeProvider} implementations to
  *   handle each supported file attribute view.</li>
  * </ul>
  *
  * <h3>Paths</h3>
  *
  * The implementation of {@link java.nio.file.Path} for the file system is
- * {@link com.google.jimfs.JimfsPath JimfsPath}. Paths are created by a
- * {@link com.google.jimfs.PathService PathService} with help from the file system's
- * configured {@link com.google.jimfs.PathType PathType}.
+ * {@link com.google.common.jimfs.JimfsPath JimfsPath}. Paths are created by a
+ * {@link com.google.common.jimfs.PathService PathService} with help from the file system's
+ * configured {@link com.google.common.jimfs.PathType PathType}.
  *
- * <p>Paths are made up of {@link com.google.jimfs.Name Name} objects, which also serve as
+ * <p>Paths are made up of {@link com.google.common.jimfs.Name Name} objects, which also serve as
  * the file names in directories. A name has two forms:
  *
  * <ul>
@@ -108,36 +108,36 @@ import javax.annotation.Nullable;
  *
  * <h3>Files</h3>
  *
- * All files in the file system are an instance of {@link com.google.jimfs.File File}. A
+ * All files in the file system are an instance of {@link com.google.common.jimfs.File File}. A
  * file object contains both the file's attributes and content.
  *
  * <p>There are three types of files:
  *
  * <ul>
  *   <li>{@link Directory Directory} - contains a table linking file names
- *   to {@linkplain com.google.jimfs.DirectoryEntry directory entries}.
+ *   to {@linkplain com.google.common.jimfs.DirectoryEntry directory entries}.
  *   <li>{@link RegularFile RegularFile} - an in-memory store for raw bytes.
- *   <li>{@link com.google.jimfs.SymbolicLink SymbolicLink} - contains a path.
+ *   <li>{@link com.google.common.jimfs.SymbolicLink SymbolicLink} - contains a path.
  * </ul>
  *
- * <p>{@link com.google.jimfs.JimfsFileChannel JimfsFileChannel},
- * {@link com.google.jimfs.JimfsInputStream JimfsInputStream} and
- * {@link com.google.jimfs.JimfsOutputStream JimfsOutputStream} implement the standard
+ * <p>{@link com.google.common.jimfs.JimfsFileChannel JimfsFileChannel},
+ * {@link com.google.common.jimfs.JimfsInputStream JimfsInputStream} and
+ * {@link com.google.common.jimfs.JimfsOutputStream JimfsOutputStream} implement the standard
  * channel/stream APIs for regular files.
  *
- * <p>{@link com.google.jimfs.JimfsSecureDirectoryStream JimfsSecureDirectoryStream} handles
+ * <p>{@link com.google.common.jimfs.JimfsSecureDirectoryStream JimfsSecureDirectoryStream} handles
  * reading the entries of a directory. The secure directory stream additionally contains a
  * {@code FileSystemView} with its directory as the working directory, allowing for operations
  * relative to the actual directory file rather than just the path to the file. This allows the
  * operations to continue to work as expected even if the directory is moved.
  *
  * <p>A directory can be watched for changes using the {@link java.nio.file.WatchService}
- * implementation, {@link com.google.jimfs.PollingWatchService PollingWatchService}.
+ * implementation, {@link com.google.common.jimfs.PollingWatchService PollingWatchService}.
  *
  * <h3>Regular files</h3>
  *
  * {@link RegularFile RegularFile} makes use of a singleton
- * {@link com.google.jimfs.HeapDisk HeapDisk}. A disk is a resizable factory and cache for
+ * {@link com.google.common.jimfs.HeapDisk HeapDisk}. A disk is a resizable factory and cache for
  * fixed size blocks of memory. These blocks are allocated to files as needed and returned to the
  * disk when a file is deleted or truncated. When cached free blocks are available, those blocks
  * are allocated to files first. If more blocks are needed, they are created.
diff --git a/jimfs/src/main/java/com/google/jimfs/JimfsFileSystemProvider.java b/jimfs/src/main/java/com/google/common/jimfs/JimfsFileSystemProvider.java
index 622df09..237a9e0 100644
--- a/jimfs/src/main/java/com/google/jimfs/JimfsFileSystemProvider.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/JimfsFileSystemProvider.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Strings.isNullOrEmpty;
-import static com.google.jimfs.Feature.FILE_CHANNEL;
-import static com.google.jimfs.Jimfs.CONFIG_KEY;
-import static com.google.jimfs.Jimfs.URI_SCHEME;
+import static com.google.common.jimfs.Feature.FILE_CHANNEL;
+import static com.google.common.jimfs.Jimfs.CONFIG_KEY;
+import static com.google.common.jimfs.Jimfs.URI_SCHEME;
 import static java.nio.file.StandardOpenOption.APPEND;
 
 import com.google.auto.service.AutoService;
diff --git a/jimfs/src/main/java/com/google/jimfs/JimfsFileSystems.java b/jimfs/src/main/java/com/google/common/jimfs/JimfsFileSystems.java
index ce7f1c1..deb6863 100644
--- a/jimfs/src/main/java/com/google/jimfs/JimfsFileSystems.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/JimfsFileSystems.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/jimfs/src/main/java/com/google/jimfs/JimfsInputStream.java b/jimfs/src/main/java/com/google/common/jimfs/JimfsInputStream.java
index d75dae4..d1146b9 100644
--- a/jimfs/src/main/java/com/google/jimfs/JimfsInputStream.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/JimfsInputStream.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkPositionIndexes;
diff --git a/jimfs/src/main/java/com/google/jimfs/JimfsOutputStream.java b/jimfs/src/main/java/com/google/common/jimfs/JimfsOutputStream.java
index 392e347..0755489 100644
--- a/jimfs/src/main/java/com/google/jimfs/JimfsOutputStream.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/JimfsOutputStream.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkPositionIndexes;
diff --git a/jimfs/src/main/java/com/google/jimfs/JimfsPath.java b/jimfs/src/main/java/com/google/common/jimfs/JimfsPath.java
index cabe7ee..e157efa 100644
--- a/jimfs/src/main/java/com/google/jimfs/JimfsPath.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/JimfsPath.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/jimfs/src/main/java/com/google/jimfs/JimfsSecureDirectoryStream.java b/jimfs/src/main/java/com/google/common/jimfs/JimfsSecureDirectoryStream.java
index b687f0e..a4ee9e3 100644
--- a/jimfs/src/main/java/com/google/jimfs/JimfsSecureDirectoryStream.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/JimfsSecureDirectoryStream.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
diff --git a/jimfs/src/main/java/com/google/jimfs/Name.java b/jimfs/src/main/java/com/google/common/jimfs/Name.java
index a4162e6..c48da89 100644
--- a/jimfs/src/main/java/com/google/jimfs/Name.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/Name.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/Options.java b/jimfs/src/main/java/com/google/common/jimfs/Options.java
index 9af5821..0c50821 100644
--- a/jimfs/src/main/java/com/google/jimfs/Options.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/Options.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static java.nio.file.StandardCopyOption.ATOMIC_MOVE;
diff --git a/jimfs/src/main/java/com/google/jimfs/OwnerAttributeProvider.java b/jimfs/src/main/java/com/google/common/jimfs/OwnerAttributeProvider.java
index 02c90e4..c78cf93 100644
--- a/jimfs/src/main/java/com/google/jimfs/OwnerAttributeProvider.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/OwnerAttributeProvider.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.jimfs.UserLookupService.createUserPrincipal;
+import static com.google.common.jimfs.UserLookupService.createUserPrincipal;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
diff --git a/jimfs/src/main/java/com/google/jimfs/PathMatchers.java b/jimfs/src/main/java/com/google/common/jimfs/PathMatchers.java
index db090e4..473c1da 100644
--- a/jimfs/src/main/java/com/google/jimfs/PathMatchers.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/PathMatchers.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/jimfs/src/main/java/com/google/jimfs/PathNormalization.java b/jimfs/src/main/java/com/google/common/jimfs/PathNormalization.java
index ee294ee..38c34c8 100644
--- a/jimfs/src/main/java/com/google/jimfs/PathNormalization.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/PathNormalization.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import com.google.common.base.Ascii;
 import com.google.common.base.Function;
diff --git a/jimfs/src/main/java/com/google/jimfs/PathService.java b/jimfs/src/main/java/com/google/common/jimfs/PathService.java
index 5ba6391..ff06f6e 100644
--- a/jimfs/src/main/java/com/google/jimfs/PathService.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/PathService.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.jimfs.PathType.ParseResult;
+import static com.google.common.jimfs.PathType.ParseResult;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Functions;
diff --git a/jimfs/src/main/java/com/google/jimfs/PathType.java b/jimfs/src/main/java/com/google/common/jimfs/PathType.java
index 0c57987..dd4e891 100644
--- a/jimfs/src/main/java/com/google/jimfs/PathType.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/PathType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/PollingWatchService.java b/jimfs/src/main/java/com/google/common/jimfs/PollingWatchService.java
index f1514c2..bc2d7fa 100644
--- a/jimfs/src/main/java/com/google/jimfs/PollingWatchService.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/PollingWatchService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -56,7 +56,7 @@ final class PollingWatchService extends AbstractWatchService {
    * running if the user doesn't close the watch service or the file system.
    */
   private static final ThreadFactory THREAD_FACTORY = new ThreadFactoryBuilder()
-      .setNameFormat("com.google.jimfs.PollingWatchService-thread-%d")
+      .setNameFormat("com.google.common.jimfs.PollingWatchService-thread-%d")
       .setDaemon(true)
       .build();
 
diff --git a/jimfs/src/main/java/com/google/jimfs/PosixAttributeProvider.java b/jimfs/src/main/java/com/google/common/jimfs/PosixAttributeProvider.java
index c1b00d0..29f1a20 100644
--- a/jimfs/src/main/java/com/google/jimfs/PosixAttributeProvider.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/PosixAttributeProvider.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.jimfs.UserLookupService.createGroupPrincipal;
+import static com.google.common.jimfs.UserLookupService.createGroupPrincipal;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
diff --git a/jimfs/src/main/java/com/google/jimfs/RegularFile.java b/jimfs/src/main/java/com/google/common/jimfs/RegularFile.java
index 9ba6f70..04b8751 100644
--- a/jimfs/src/main/java/com/google/jimfs/RegularFile.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/RegularFile.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.jimfs.Util.clear;
-import static com.google.jimfs.Util.nextPowerOf2;
+import static com.google.common.jimfs.Util.clear;
+import static com.google.common.jimfs.Util.nextPowerOf2;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.primitives.UnsignedBytes;
diff --git a/jimfs/src/main/java/com/google/jimfs/StandardAttributeProviders.java b/jimfs/src/main/java/com/google/common/jimfs/StandardAttributeProviders.java
index fd10e83..0f5c2a9 100644
--- a/jimfs/src/main/java/com/google/jimfs/StandardAttributeProviders.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/StandardAttributeProviders.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import com.google.common.collect.ImmutableMap;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/SymbolicLink.java b/jimfs/src/main/java/com/google/common/jimfs/SymbolicLink.java
index 7bf057b..5d6e15e 100644
--- a/jimfs/src/main/java/com/google/jimfs/SymbolicLink.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/SymbolicLink.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/UnixAttributeProvider.java b/jimfs/src/main/java/com/google/common/jimfs/UnixAttributeProvider.java
index 3a6d3c2..b3bf055 100644
--- a/jimfs/src/main/java/com/google/jimfs/UnixAttributeProvider.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/UnixAttributeProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/UnixFileAttributeView.java b/jimfs/src/main/java/com/google/common/jimfs/UnixFileAttributeView.java
index 54d79db..cc326ff 100644
--- a/jimfs/src/main/java/com/google/jimfs/UnixFileAttributeView.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/UnixFileAttributeView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import java.nio.file.attribute.FileAttributeView;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/UnixPathType.java b/jimfs/src/main/java/com/google/common/jimfs/UnixPathType.java
index 11ca6bd..2f4832a 100644
--- a/jimfs/src/main/java/com/google/jimfs/UnixPathType.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/UnixPathType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/UserDefinedAttributeProvider.java b/jimfs/src/main/java/com/google/common/jimfs/UserDefinedAttributeProvider.java
index f98fe25..ed3e006 100644
--- a/jimfs/src/main/java/com/google/jimfs/UserDefinedAttributeProvider.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/UserDefinedAttributeProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/UserLookupService.java b/jimfs/src/main/java/com/google/common/jimfs/UserLookupService.java
index 4753748..0bcb488 100644
--- a/jimfs/src/main/java/com/google/jimfs/UserLookupService.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/UserLookupService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/jimfs/src/main/java/com/google/jimfs/Util.java b/jimfs/src/main/java/com/google/common/jimfs/Util.java
index cc77f12..d77f4e8 100644
--- a/jimfs/src/main/java/com/google/jimfs/Util.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/Util.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/jimfs/src/main/java/com/google/jimfs/WindowsPathType.java b/jimfs/src/main/java/com/google/common/jimfs/WindowsPathType.java
index bcf9f61..9348cab 100644
--- a/jimfs/src/main/java/com/google/jimfs/WindowsPathType.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/WindowsPathType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import java.nio.file.InvalidPathException;
 import java.util.Iterator;
diff --git a/jimfs/src/main/java/com/google/jimfs/package-info.java b/jimfs/src/main/java/com/google/common/jimfs/package-info.java
index 04cc5c9..8d9d6f4 100644
--- a/jimfs/src/main/java/com/google/jimfs/package-info.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/package-info.java
@@ -16,10 +16,10 @@
 
 /**
  * Package containing the Jimfs file system API and implementation. Most users should only need to
- * use the {@link com.google.jimfs.Jimfs Jimfs} and
- * {@link com.google.jimfs.Configuration Configuration} classes.
+ * use the {@link com.google.common.jimfs.Jimfs Jimfs} and
+ * {@link com.google.common.jimfs.Configuration Configuration} classes.
  */
 @ParametersAreNonnullByDefault
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import javax.annotation.ParametersAreNonnullByDefault;
\ No newline at end of file
diff --git a/jimfs/src/test/java/com/google/jimfs/AbstractAttributeProviderTest.java b/jimfs/src/test/java/com/google/common/jimfs/AbstractAttributeProviderTest.java
index a7ac78f..c525d66 100644
--- a/jimfs/src/test/java/com/google/jimfs/AbstractAttributeProviderTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/AbstractAttributeProviderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static org.junit.Assert.fail;
 import static org.truth0.Truth.ASSERT;
diff --git a/jimfs/src/test/java/com/google/jimfs/AbstractGlobMatcherTest.java b/jimfs/src/test/java/com/google/common/jimfs/AbstractGlobMatcherTest.java
index 4cf8fdf..c8594e2 100644
--- a/jimfs/src/test/java/com/google/jimfs/AbstractGlobMatcherTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/AbstractGlobMatcherTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import org.junit.Test;
 
diff --git a/jimfs/src/test/java/com/google/jimfs/AbstractJimfsIntegrationTest.java b/jimfs/src/test/java/com/google/common/jimfs/AbstractJimfsIntegrationTest.java
index 7671c49..e30416a 100644
--- a/jimfs/src/test/java/com/google/jimfs/AbstractJimfsIntegrationTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/AbstractJimfsIntegrationTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
-import static com.google.jimfs.PathSubject.paths;
+import static com.google.common.jimfs.PathSubject.paths;
 import static org.truth0.Truth.ASSERT;
 
 import org.junit.After;
diff --git a/jimfs/src/test/java/com/google/jimfs/AbstractPathMatcherTest.java b/jimfs/src/test/java/com/google/common/jimfs/AbstractPathMatcherTest.java
index 32c97d1..2995b04 100644
--- a/jimfs/src/test/java/com/google/jimfs/AbstractPathMatcherTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/AbstractPathMatcherTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
diff --git a/jimfs/src/test/java/com/google/jimfs/AbstractWatchServiceTest.java b/jimfs/src/test/java/com/google/common/jimfs/AbstractWatchServiceTest.java
index 5187701..e600f05 100644
--- a/jimfs/src/test/java/com/google/jimfs/AbstractWatchServiceTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/AbstractWatchServiceTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
-import static com.google.jimfs.AbstractWatchService.Key.State.READY;
-import static com.google.jimfs.AbstractWatchService.Key.State.SIGNALLED;
+import static com.google.common.jimfs.AbstractWatchService.Key.State.READY;
+import static com.google.common.jimfs.AbstractWatchService.Key.State.SIGNALLED;
 import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE;
 import static java.nio.file.StandardWatchEventKinds.ENTRY_DELETE;
 import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY;
diff --git a/jimfs/src/test/java/com/google/jimfs/AclAttributeProviderTest.java b/jimfs/src/test/java/com/google/common/jimfs/AclAttributeProviderTest.java
index 1f2811d..d11dde1 100644
--- a/jimfs/src/test/java/com/google/jimfs/AclAttributeProviderTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/AclAttributeProviderTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
-import static com.google.jimfs.UserLookupService.createUserPrincipal;
+import static com.google.common.jimfs.UserLookupService.createUserPrincipal;
 import static java.nio.file.attribute.AclEntryFlag.DIRECTORY_INHERIT;
 import static java.nio.file.attribute.AclEntryPermission.APPEND_DATA;
 import static java.nio.file.attribute.AclEntryPermission.DELETE;
diff --git a/jimfs/src/test/java/com/google/jimfs/AttributeServiceTest.java b/jimfs/src/test/java/com/google/common/jimfs/AttributeServiceTest.java
index 623ab79..ddca2ef 100644
--- a/jimfs/src/test/java/com/google/jimfs/AttributeServiceTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/AttributeServiceTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static org.junit.Assert.fail;
 import static org.truth0.Truth.ASSERT;
diff --git a/jimfs/src/test/java/com/google/jimfs/BasicAttributeProviderTest.java b/jimfs/src/test/java/com/google/common/jimfs/BasicAttributeProviderTest.java
index 5c67d69..0c7e9a5 100644
--- a/jimfs/src/test/java/com/google/jimfs/BasicAttributeProviderTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/BasicAttributeProviderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static org.truth0.Truth.ASSERT;
 
diff --git a/jimfs/src/test/java/com/google/jimfs/BasicFileAttribute.java b/jimfs/src/test/java/com/google/common/jimfs/BasicFileAttribute.java
index 091228e..bc0c8c5 100644
--- a/jimfs/src/test/java/com/google/jimfs/BasicFileAttribute.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/BasicFileAttribute.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/jimfs/src/test/java/com/google/jimfs/ByteBufferChannel.java b/jimfs/src/test/java/com/google/common/jimfs/ByteBufferChannel.java
index 3a4f9d1..fac8381 100644
--- a/jimfs/src/test/java/com/google/jimfs/ByteBufferChannel.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/ByteBufferChannel.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/jimfs/src/test/java/com/google/jimfs/ConfigurationTest.java b/jimfs/src/test/java/com/google/common/jimfs/ConfigurationTest.java
index 413349f..dc52cd4 100644
--- a/jimfs/src/test/java/com/google/jimfs/ConfigurationTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/ConfigurationTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
-import static com.google.jimfs.PathNormalization.CASE_FOLD_ASCII;
-import static com.google.jimfs.PathNormalization.CASE_FOLD_UNICODE;
-import static com.google.jimfs.PathNormalization.NFC;
-import static com.google.jimfs.PathNormalization.NFD;
+import static com.google.common.jimfs.PathNormalization.CASE_FOLD_ASCII;
+import static com.google.common.jimfs.PathNormalization.CASE_FOLD_UNICODE;
+import static com.google.common.jimfs.PathNormalization.NFC;
+import static com.google.common.jimfs.PathNormalization.NFD;
 import static org.junit.Assert.fail;
 import static org.truth0.Truth.ASSERT;
 
diff --git a/jimfs/src/test/java/com/google/jimfs/DirectoryTest.java b/jimfs/src/test/java/com/google/common/jimfs/DirectoryTest.java
index 8db01ea..d127240 100644
--- a/jimfs/src/test/java/com/google/jimfs/DirectoryTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/DirectoryTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
-import static com.google.jimfs.Name.PARENT;
-import static com.google.jimfs.Name.SELF;
-import static com.google.jimfs.TestUtils.regularFile;
+import static com.google.common.jimfs.Name.PARENT;
+import static com.google.common.jimfs.Name.SELF;
+import static com.google.common.jimfs.TestUtils.regularFile;
 import static org.junit.Assert.fail;
 import static org.truth0.Truth.ASSERT;
 
diff --git a/jimfs/src/test/java/com/google/jimfs/DosAttributeProviderTest.java b/jimfs/src/test/java/com/google/common/jimfs/DosAttributeProviderTest.java
index de90783..56279ca 100644
--- a/jimfs/src/test/java/com/google/jimfs/DosAttributeProviderTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/DosAttributeProviderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static org.junit.Assert.assertNotNull;
 import static org.truth0.Truth.ASSERT;
diff --git a/jimfs/src/test/java/com/google/jimfs/FileFactoryTest.java b/jimfs/src/test/java/com/google/common/jimfs/FileFactoryTest.java
index 0e50525..5e2f053 100644
--- a/jimfs/src/test/java/com/google/jimfs/FileFactoryTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/FileFactoryTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static org.truth0.Truth.ASSERT;
 
diff --git a/jimfs/src/test/java/com/google/jimfs/FileSystemStateTest.java b/jimfs/src/test/java/com/google/common/jimfs/FileSystemStateTest.java
index 312c16a..b2bb069 100644
--- a/jimfs/src/test/java/com/google/jimfs/FileSystemStateTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/FileSystemStateTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/jimfs/src/test/java/com/google/jimfs/FileTest.java b/jimfs/src/test/java/com/google/common/jimfs/FileTest.java
index 602d068..d62c054 100644
--- a/jimfs/src/test/java/com/google/jimfs/FileTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/FileTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
-import static com.google.jimfs.FileFactoryTest.fakePath;
-import static com.google.jimfs.TestUtils.regularFile;
+import static com.google.common.jimfs.FileFactoryTest.fakePath;
+import static com.google.common.jimfs.TestUtils.regularFile;
 import static org.truth0.Truth.ASSERT;
 
 import org.junit.Test;
diff --git a/jimfs/src/test/java/com/google/jimfs/FileTreeTest.java b/jimfs/src/test/java/com/google/common/jimfs/FileTreeTest.java
index 7e061b3..9b81fac 100644
--- a/jimfs/src/test/java/com/google/jimfs/FileTreeTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/FileTreeTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.jimfs.TestUtils.regularFile;
+import static com.google.common.jimfs.TestUtils.regularFile;
 import static java.nio.file.LinkOption.NOFOLLOW_LINKS;
 import static org.junit.Assert.fail;
 import static org.truth0.Truth.ASSERT;
diff --git a/jimfs/src/test/java/com/google/jimfs/HeapDiskTest.java b/jimfs/src/test/java/com/google/common/jimfs/HeapDiskTest.java
index 5198073..934e949 100644
--- a/jimfs/src/test/java/com/google/jimfs/HeapDiskTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/HeapDiskTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static org.junit.Assert.fail;
 import static org.truth0.Truth.ASSERT;
diff --git a/jimfs/src/test/java/com/google/jimfs/JimfsAsynchronousFileChannelTest.java b/jimfs/src/test/java/com/google/common/jimfs/JimfsAsynchronousFileChannelTest.java
index 6ee174a..17ed975 100644
--- a/jimfs/src/test/java/com/google/jimfs/JimfsAsynchronousFileChannelTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/JimfsAsynchronousFileChannelTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
-import static com.google.jimfs.TestUtils.buffer;
-import static com.google.jimfs.TestUtils.regularFile;
+import static com.google.common.jimfs.TestUtils.buffer;
+import static com.google.common.jimfs.TestUtils.regularFile;
 import static java.nio.file.StandardOpenOption.READ;
 import static java.nio.file.StandardOpenOption.WRITE;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
diff --git a/jimfs/src/test/java/com/google/jimfs/JimfsFileChannelTest.java b/jimfs/src/test/java/com/google/common/jimfs/JimfsFileChannelTest.java
index aa4443f..6112a70 100644
--- a/jimfs/src/test/java/com/google/jimfs/JimfsFileChannelTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/JimfsFileChannelTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
-import static com.google.jimfs.TestUtils.assertNotEquals;
-import static com.google.jimfs.TestUtils.buffer;
-import static com.google.jimfs.TestUtils.bytes;
-import static com.google.jimfs.TestUtils.regularFile;
+import static com.google.common.jimfs.TestUtils.assertNotEquals;
+import static com.google.common.jimfs.TestUtils.buffer;
+import static com.google.common.jimfs.TestUtils.bytes;
+import static com.google.common.jimfs.TestUtils.regularFile;
 import static java.nio.file.StandardOpenOption.APPEND;
 import static java.nio.file.StandardOpenOption.READ;
 import static java.nio.file.StandardOpenOption.WRITE;
diff --git a/jimfs/src/test/java/com/google/jimfs/JimfsFileSystemCloseTest.java b/jimfs/src/test/java/com/google/common/jimfs/JimfsFileSystemCloseTest.java
index 88ed9dc..bd6ed80 100644
--- a/jimfs/src/test/java/com/google/jimfs/JimfsFileSystemCloseTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/JimfsFileSystemCloseTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.StandardOpenOption.CREATE;
diff --git a/jimfs/src/test/java/com/google/jimfs/JimfsInputStreamTest.java b/jimfs/src/test/java/com/google/common/jimfs/JimfsInputStreamTest.java
index 15d958c..0320960 100644
--- a/jimfs/src/test/java/com/google/jimfs/JimfsInputStreamTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/JimfsInputStreamTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
-import static com.google.jimfs.TestUtils.bytes;
-import static com.google.jimfs.TestUtils.regularFile;
+import static com.google.common.jimfs.TestUtils.bytes;
+import static com.google.common.jimfs.TestUtils.regularFile;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.fail;
 import static org.truth0.Truth.ASSERT;
diff --git a/jimfs/src/test/java/com/google/jimfs/JimfsOutputStreamTest.java b/jimfs/src/test/java/com/google/common/jimfs/JimfsOutputStreamTest.java
index 26c6e9f..cf3363b 100644
--- a/jimfs/src/test/java/com/google/jimfs/JimfsOutputStreamTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/JimfsOutputStreamTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
-import static com.google.jimfs.TestUtils.bytes;
-import static com.google.jimfs.TestUtils.regularFile;
+import static com.google.common.jimfs.TestUtils.bytes;
+import static com.google.common.jimfs.TestUtils.regularFile;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.fail;
 
diff --git a/jimfs/src/test/java/com/google/jimfs/JimfsPathTest.java b/jimfs/src/test/java/com/google/common/jimfs/JimfsPathTest.java
index c105fb8..1253cb0 100644
--- a/jimfs/src/test/java/com/google/jimfs/JimfsPathTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/JimfsPathTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
diff --git a/jimfs/src/test/java/com/google/jimfs/JimfsUnixLikeFileSystemTest.java b/jimfs/src/test/java/com/google/common/jimfs/JimfsUnixLikeFileSystemTest.java
index d0367a7..a1fc428 100644
--- a/jimfs/src/test/java/com/google/jimfs/JimfsUnixLikeFileSystemTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/JimfsUnixLikeFileSystemTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.primitives.Bytes.concat;
-import static com.google.jimfs.TestUtils.bytes;
-import static com.google.jimfs.TestUtils.permutations;
-import static com.google.jimfs.TestUtils.preFilledBytes;
+import static com.google.common.jimfs.TestUtils.bytes;
+import static com.google.common.jimfs.TestUtils.permutations;
+import static com.google.common.jimfs.TestUtils.preFilledBytes;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.LinkOption.NOFOLLOW_LINKS;
 import static java.nio.file.StandardCopyOption.ATOMIC_MOVE;
diff --git a/jimfs/src/test/java/com/google/jimfs/JimfsWindowsLikeFileSystemTest.java b/jimfs/src/test/java/com/google/common/jimfs/JimfsWindowsLikeFileSystemTest.java
index 5f53833..7e7e2b5 100644
--- a/jimfs/src/test/java/com/google/jimfs/JimfsWindowsLikeFileSystemTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/JimfsWindowsLikeFileSystemTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 import static org.junit.Assert.fail;
diff --git a/jimfs/src/test/java/com/google/jimfs/NameTest.java b/jimfs/src/test/java/com/google/common/jimfs/NameTest.java
index 1401554..cc7b64e 100644
--- a/jimfs/src/test/java/com/google/jimfs/NameTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/NameTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static org.truth0.Truth.ASSERT;
 
diff --git a/jimfs/src/test/java/com/google/jimfs/OwnerAttributeProviderTest.java b/jimfs/src/test/java/com/google/common/jimfs/OwnerAttributeProviderTest.java
index 13a9e7c..bb7760e 100644
--- a/jimfs/src/test/java/com/google/jimfs/OwnerAttributeProviderTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/OwnerAttributeProviderTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
-import static com.google.jimfs.UserLookupService.createUserPrincipal;
+import static com.google.common.jimfs.UserLookupService.createUserPrincipal;
 import static org.truth0.Truth.ASSERT;
 
 import com.google.common.collect.ImmutableSet;
diff --git a/jimfs/src/test/java/com/google/jimfs/PathNormalizationTest.java b/jimfs/src/test/java/com/google/common/jimfs/PathNormalizationTest.java
index 0c813dc..8000e5c 100644
--- a/jimfs/src/test/java/com/google/jimfs/PathNormalizationTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/PathNormalizationTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
-import static com.google.jimfs.PathNormalization.CASE_FOLD_ASCII;
-import static com.google.jimfs.PathNormalization.CASE_FOLD_UNICODE;
-import static com.google.jimfs.PathNormalization.NFC;
-import static com.google.jimfs.PathNormalization.NFD;
-import static com.google.jimfs.TestUtils.assertNotEquals;
+import static com.google.common.jimfs.PathNormalization.CASE_FOLD_ASCII;
+import static com.google.common.jimfs.PathNormalization.CASE_FOLD_UNICODE;
+import static com.google.common.jimfs.PathNormalization.NFC;
+import static com.google.common.jimfs.PathNormalization.NFD;
+import static com.google.common.jimfs.TestUtils.assertNotEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
diff --git a/jimfs/src/test/java/com/google/jimfs/PathServiceTest.java b/jimfs/src/test/java/com/google/common/jimfs/PathServiceTest.java
index 193f248..5e389e4 100644
--- a/jimfs/src/test/java/com/google/jimfs/PathServiceTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/PathServiceTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
-import static com.google.jimfs.PathSubject.paths;
+import static com.google.common.jimfs.PathSubject.paths;
 import static org.truth0.Truth.ASSERT;
 
 import com.google.common.collect.ImmutableList;
diff --git a/jimfs/src/test/java/com/google/jimfs/PathSubject.java b/jimfs/src/test/java/com/google/common/jimfs/PathSubject.java
index 8d85542..055bbc6 100644
--- a/jimfs/src/test/java/com/google/jimfs/PathSubject.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/PathSubject.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static java.nio.charset.StandardCharsets.UTF_8;
diff --git a/jimfs/src/test/java/com/google/jimfs/PathTester.java b/jimfs/src/test/java/com/google/common/jimfs/PathTester.java
index 0c31e79..a77a7c1 100644
--- a/jimfs/src/test/java/com/google/jimfs/PathTester.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/PathTester.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Functions.toStringFunction;
 import static org.junit.Assert.assertEquals;
diff --git a/jimfs/src/test/java/com/google/jimfs/PathTypeTest.java b/jimfs/src/test/java/com/google/common/jimfs/PathTypeTest.java
index e4728b9..6bb6ab6 100644
--- a/jimfs/src/test/java/com/google/jimfs/PathTypeTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/PathTypeTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.jimfs.PathType.ParseResult;
+import static com.google.common.jimfs.PathType.ParseResult;
 import static org.truth0.Truth.ASSERT;
 
 import com.google.common.collect.ImmutableList;
diff --git a/jimfs/src/test/java/com/google/jimfs/PollingWatchServiceTest.java b/jimfs/src/test/java/com/google/common/jimfs/PollingWatchServiceTest.java
index 836dbec..ab58d11 100644
--- a/jimfs/src/test/java/com/google/jimfs/PollingWatchServiceTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/PollingWatchServiceTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE;
 import static java.nio.file.StandardWatchEventKinds.ENTRY_DELETE;
@@ -24,10 +24,10 @@ import static org.junit.Assert.fail;
 import static org.truth0.Truth.ASSERT;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.jimfs.AbstractWatchService.Event;
+import com.google.common.jimfs.AbstractWatchService.Key;
 import com.google.common.util.concurrent.Runnables;
 import com.google.common.util.concurrent.Uninterruptibles;
-import com.google.jimfs.AbstractWatchService.Event;
-import com.google.jimfs.AbstractWatchService.Key;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/jimfs/src/test/java/com/google/jimfs/PosixAttributeProviderTest.java b/jimfs/src/test/java/com/google/common/jimfs/PosixAttributeProviderTest.java
index f877e47..d15a65e 100644
--- a/jimfs/src/test/java/com/google/jimfs/PosixAttributeProviderTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/PosixAttributeProviderTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
-import static com.google.jimfs.UserLookupService.createGroupPrincipal;
-import static com.google.jimfs.UserLookupService.createUserPrincipal;
+import static com.google.common.jimfs.UserLookupService.createGroupPrincipal;
+import static com.google.common.jimfs.UserLookupService.createUserPrincipal;
 import static org.junit.Assert.assertNotNull;
 import static org.truth0.Truth.ASSERT;
 
diff --git a/jimfs/src/test/java/com/google/jimfs/RegexGlobMatcherTest.java b/jimfs/src/test/java/com/google/common/jimfs/RegexGlobMatcherTest.java
index 35b2cee..47290ee 100644
--- a/jimfs/src/test/java/com/google/jimfs/RegexGlobMatcherTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/RegexGlobMatcherTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/jimfs/src/test/java/com/google/jimfs/RegularFileBlocksTest.java b/jimfs/src/test/java/com/google/common/jimfs/RegularFileBlocksTest.java
index f6c1014..842718f 100644
--- a/jimfs/src/test/java/com/google/jimfs/RegularFileBlocksTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/RegularFileBlocksTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static org.truth0.Truth.ASSERT;
 
diff --git a/jimfs/src/test/java/com/google/jimfs/RegularFileTest.java b/jimfs/src/test/java/com/google/common/jimfs/RegularFileTest.java
index 0d23088..837d7a1 100644
--- a/jimfs/src/test/java/com/google/jimfs/RegularFileTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/RegularFileTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
+import static com.google.common.jimfs.TestUtils.buffer;
+import static com.google.common.jimfs.TestUtils.buffers;
+import static com.google.common.jimfs.TestUtils.bytes;
 import static com.google.common.primitives.Bytes.concat;
-import static com.google.jimfs.TestUtils.buffer;
-import static com.google.jimfs.TestUtils.buffers;
-import static com.google.jimfs.TestUtils.bytes;
 import static org.junit.Assert.assertArrayEquals;
 
 import com.google.common.base.Predicate;
diff --git a/jimfs/src/test/java/com/google/jimfs/TestAttributeProvider.java b/jimfs/src/test/java/com/google/common/jimfs/TestAttributeProvider.java
index 85c0d47..a912299 100644
--- a/jimfs/src/test/java/com/google/jimfs/TestAttributeProvider.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/TestAttributeProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/jimfs/src/test/java/com/google/jimfs/TestAttributeView.java b/jimfs/src/test/java/com/google/common/jimfs/TestAttributeView.java
index 4c4f5b6..b9753a6 100644
--- a/jimfs/src/test/java/com/google/jimfs/TestAttributeView.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/TestAttributeView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import java.io.IOException;
 import java.nio.file.attribute.BasicFileAttributeView;
diff --git a/jimfs/src/test/java/com/google/jimfs/TestAttributes.java b/jimfs/src/test/java/com/google/common/jimfs/TestAttributes.java
index 970b257..4eecde7 100644
--- a/jimfs/src/test/java/com/google/jimfs/TestAttributes.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/TestAttributes.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import java.nio.file.attribute.BasicFileAttributes;
 
diff --git a/jimfs/src/test/java/com/google/jimfs/TestUtils.java b/jimfs/src/test/java/com/google/common/jimfs/TestUtils.java
index cce4b59..41282ac 100644
--- a/jimfs/src/test/java/com/google/jimfs/TestUtils.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/TestUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static java.nio.file.LinkOption.NOFOLLOW_LINKS;
 import static org.junit.Assert.assertFalse;
diff --git a/jimfs/src/test/java/com/google/jimfs/UnixAttributeProviderTest.java b/jimfs/src/test/java/com/google/common/jimfs/UnixAttributeProviderTest.java
index 4a2bdfa..fbe8080 100644
--- a/jimfs/src/test/java/com/google/jimfs/UnixAttributeProviderTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/UnixAttributeProviderTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
-import static com.google.jimfs.UserLookupService.createGroupPrincipal;
-import static com.google.jimfs.UserLookupService.createUserPrincipal;
+import static com.google.common.jimfs.UserLookupService.createGroupPrincipal;
+import static com.google.common.jimfs.UserLookupService.createUserPrincipal;
 import static org.truth0.Truth.ASSERT;
 
 import com.google.common.collect.ImmutableSet;
diff --git a/jimfs/src/test/java/com/google/jimfs/UnixPathTypeTest.java b/jimfs/src/test/java/com/google/common/jimfs/UnixPathTypeTest.java
index 6c1274f..59d28d5 100644
--- a/jimfs/src/test/java/com/google/jimfs/UnixPathTypeTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/UnixPathTypeTest.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
-import static com.google.jimfs.PathTypeTest.assertParseResult;
-import static com.google.jimfs.PathTypeTest.assertUriRoundTripsCorrectly;
-import static com.google.jimfs.PathTypeTest.fileSystemUri;
+import static com.google.common.jimfs.PathTypeTest.assertParseResult;
+import static com.google.common.jimfs.PathTypeTest.assertUriRoundTripsCorrectly;
+import static com.google.common.jimfs.PathTypeTest.fileSystemUri;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 import static org.truth0.Truth.ASSERT;
diff --git a/jimfs/src/test/java/com/google/jimfs/UserDefinedAttributeProviderTest.java b/jimfs/src/test/java/com/google/common/jimfs/UserDefinedAttributeProviderTest.java
index d1d2c7d..c8103cf 100644
--- a/jimfs/src/test/java/com/google/jimfs/UserDefinedAttributeProviderTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/UserDefinedAttributeProviderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
diff --git a/jimfs/src/test/java/com/google/jimfs/UserLookupServiceTest.java b/jimfs/src/test/java/com/google/common/jimfs/UserLookupServiceTest.java
index 73e012f..cdd00ca 100644
--- a/jimfs/src/test/java/com/google/jimfs/UserLookupServiceTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/UserLookupServiceTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
 import static org.junit.Assert.fail;
 import static org.truth0.Truth.ASSERT;
diff --git a/jimfs/src/test/java/com/google/jimfs/WindowsPathTypeTest.java b/jimfs/src/test/java/com/google/common/jimfs/WindowsPathTypeTest.java
index b9f138f..0b13e2b 100644
--- a/jimfs/src/test/java/com/google/jimfs/WindowsPathTypeTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/WindowsPathTypeTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.google.jimfs;
+package com.google.common.jimfs;
 
-import static com.google.jimfs.PathType.windows;
-import static com.google.jimfs.PathTypeTest.assertParseResult;
-import static com.google.jimfs.PathTypeTest.assertUriRoundTripsCorrectly;
-import static com.google.jimfs.PathTypeTest.fileSystemUri;
+import static com.google.common.jimfs.PathType.windows;
+import static com.google.common.jimfs.PathTypeTest.assertParseResult;
+import static com.google.common.jimfs.PathTypeTest.assertUriRoundTripsCorrectly;
+import static com.google.common.jimfs.PathTypeTest.fileSystemUri;
 import static org.junit.Assert.fail;
 import static org.truth0.Truth.ASSERT;