diff --git a/samples/hello_fs.go b/samples/hellofs/hello_fs.go
similarity index 99%
rename from samples/hello_fs.go
rename to samples/hellofs/hello_fs.go
index de2df3a..b7802d3 100644
--- a/samples/hello_fs.go
+++ b/samples/hellofs/hello_fs.go
@@ -1,7 +1,7 @@
 // Copyright 2015 Google Inc. All Rights Reserved.
 // Author: jacobsa@google.com (Aaron Jacobs)
 
-package samples
+package hellofs
 
 import (
 	"io"
diff --git a/samples/hello_fs_test.go b/samples/hellofs/hello_fs_test.go
similarity index 99%
rename from samples/hello_fs_test.go
rename to samples/hellofs/hello_fs_test.go
index 2694f56..16edc7a 100644
--- a/samples/hello_fs_test.go
+++ b/samples/hellofs/hello_fs_test.go
@@ -1,7 +1,7 @@
 // Copyright 2015 Google Inc. All Rights Reserved.
 // Author: jacobsa@google.com (Aaron Jacobs)
 
-package samples_test
+package hellofs_test
 
 import (
 	"io"
diff --git a/samples/mem_fs.go b/samples/memfs/mem_fs.go
similarity index 99%
rename from samples/mem_fs.go
rename to samples/memfs/mem_fs.go
index 7e0af09..22ed9db 100644
--- a/samples/mem_fs.go
+++ b/samples/memfs/mem_fs.go
@@ -1,7 +1,7 @@
 // Copyright 2015 Google Inc. All Rights Reserved.
 // Author: jacobsa@google.com (Aaron Jacobs)
 
-package samples
+package memfs
 
 import (
 	"sync"