diff --git a/basis/help/cookbook/cookbook.factor b/basis/help/cookbook/cookbook.factor
index 65b40543af..fcde1ccedf 100644
--- a/basis/help/cookbook/cookbook.factor
+++ b/basis/help/cookbook/cookbook.factor
@@ -269,7 +269,7 @@ $nl
 { $heading "Example: ls" }
 "Here is an example implementing a simplified version of the Unix " { $snippet "ls" } " command in Factor:"
 { $code
-    <" USING: command-line namespaces io io.files io.files.listing
+    <" USING: command-line namespaces io io.files tools.files
 sequences kernel ;
 
 command-line get [
diff --git a/basis/io/files/listing/authors.txt b/basis/tools/files/authors.txt
similarity index 100%
rename from basis/io/files/listing/authors.txt
rename to basis/tools/files/authors.txt
diff --git a/basis/io/files/listing/listing-docs.factor b/basis/tools/files/files-docs.factor
similarity index 67%
rename from basis/io/files/listing/listing-docs.factor
rename to basis/tools/files/files-docs.factor
index 6b19e9bfa7..c5c5b44c1b 100644
--- a/basis/io/files/listing/listing-docs.factor
+++ b/basis/tools/files/files-docs.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: help.markup help.syntax io.streams.string strings ;
-IN: io.files.listing
+IN: tools.files
 
 HELP: directory.
 { $values
@@ -9,9 +9,9 @@ HELP: directory.
 }
 { $description "Prints information about all files in a directory to the output stream in a cross-platform way similar to the Unix " { $snippet "ls" } " command." } ;
 
-ARTICLE: "io.files.listing" "Listing files"
-"The " { $vocab-link "io.files.listing" } " vocabulary implements directory file listing in a cross-platform way." $nl
+ARTICLE: "tools.files" "Files tools"
+"The " { $vocab-link "tools.files" } " vocabulary implements directory files and file-systems listing in a cross-platform way." $nl
 "Listing a directory:"
 { $subsection directory. } ;
 
-ABOUT: "io.files.listing"
+ABOUT: "tools.files"
diff --git a/basis/io/files/listing/listing-tests.factor b/basis/tools/files/files-tests.factor
similarity index 65%
rename from basis/io/files/listing/listing-tests.factor
rename to basis/tools/files/files-tests.factor
index 8c2dc28559..6aa68d8127 100644
--- a/basis/io/files/listing/listing-tests.factor
+++ b/basis/tools/files/files-tests.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Your name.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: tools.test io.files.listing strings kernel ;
-IN: io.files.listing.tests
+USING: tools.test tools.files strings kernel ;
+IN: tools.files.tests
 
 \ directory. must-infer
 
diff --git a/basis/io/files/listing/listing.factor b/basis/tools/files/files.factor
similarity index 87%
rename from basis/io/files/listing/listing.factor
rename to basis/tools/files/files.factor
index f88fcec3a1..58c24ef6ca 100755
--- a/basis/io/files/listing/listing.factor
+++ b/basis/tools/files/files.factor
@@ -2,8 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays combinators io io.files kernel
 math.parser sequences system vocabs.loader calendar ;
-
-IN: io.files.listing
+IN: tools.files
 
 <PRIVATE
 
@@ -34,6 +33,6 @@ PRIVATE>
     [ (directory.) ] with-directory-files [ print ] each ;
 
 {
-    { [ os unix? ] [ "io.files.listing.unix" ] }
-    { [ os windows? ] [ "io.files.listing.windows" ] }
+    { [ os unix? ] [ "tools.files.unix" ] }
+    { [ os windows? ] [ "tools.files.windows" ] }
 } cond require
diff --git a/basis/io/files/listing/tags.txt b/basis/tools/files/tags.txt
similarity index 100%
rename from basis/io/files/listing/tags.txt
rename to basis/tools/files/tags.txt
diff --git a/basis/io/files/listing/unix/authors.txt b/basis/tools/files/unix/authors.txt
similarity index 100%
rename from basis/io/files/listing/unix/authors.txt
rename to basis/tools/files/unix/authors.txt
diff --git a/basis/io/files/listing/unix/tags.txt b/basis/tools/files/unix/tags.txt
similarity index 100%
rename from basis/io/files/listing/unix/tags.txt
rename to basis/tools/files/unix/tags.txt
diff --git a/basis/io/files/listing/unix/unix.factor b/basis/tools/files/unix/unix.factor
similarity index 93%
rename from basis/io/files/listing/unix/unix.factor
rename to basis/tools/files/unix/unix.factor
index bef8d3dc56..184f371b1c 100755
--- a/basis/io/files/listing/unix/unix.factor
+++ b/basis/tools/files/unix/unix.factor
@@ -1,10 +1,10 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors combinators kernel system unicode.case
-io.unix.files io.files.listing generalizations strings
+io.unix.files tools.files generalizations strings
 arrays sequences io.files math.parser unix.groups unix.users
-io.files.listing.private unix.stat math ;
-IN: io.files.listing.unix
+tools.files.private unix.stat math ;
+IN: tools.files.unix
 
 <PRIVATE
 
diff --git a/basis/io/files/listing/windows/authors.txt b/basis/tools/files/windows/authors.txt
similarity index 100%
rename from basis/io/files/listing/windows/authors.txt
rename to basis/tools/files/windows/authors.txt
diff --git a/basis/io/files/listing/windows/tags.txt b/basis/tools/files/windows/tags.txt
similarity index 100%
rename from basis/io/files/listing/windows/tags.txt
rename to basis/tools/files/windows/tags.txt
diff --git a/basis/io/files/listing/windows/windows.factor b/basis/tools/files/windows/windows.factor
similarity index 80%
rename from basis/io/files/listing/windows/windows.factor
rename to basis/tools/files/windows/windows.factor
index 33ab47a50a..76e6ea5590 100755
--- a/basis/io/files/listing/windows/windows.factor
+++ b/basis/tools/files/windows/windows.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors calendar.format combinators io.files
-kernel math.parser sequences splitting system io.files.listing
-generalizations io.files.listing.private ;
-IN: io.files.listing.windows
+kernel math.parser sequences splitting system tools.files
+generalizations tools.files.private ;
+IN: tools.files.windows
 
 <PRIVATE
 
diff --git a/extra/ftp/server/server.factor b/extra/ftp/server/server.factor
index 9095dedf35..342c6a3c95 100644
--- a/extra/ftp/server/server.factor
+++ b/extra/ftp/server/server.factor
@@ -7,7 +7,7 @@ namespaces make sequences ftp io.unix.launcher.parser
 unicode.case splitting assocs classes io.servers.connection
 destructors calendar io.timeouts io.streams.duplex threads
 continuations math concurrency.promises byte-arrays
-io.backend sequences.lib tools.hexdump io.files.listing
+io.backend sequences.lib tools.hexdump tools.files
 io.streams.string ;
 IN: ftp.server