diff --git a/extra/astar/authors.txt b/extra/path-finding/authors.txt
similarity index 100%
rename from extra/astar/authors.txt
rename to extra/path-finding/authors.txt
diff --git a/extra/astar/astar-docs.factor b/extra/path-finding/path-finding-docs.factor
similarity index 94%
rename from extra/astar/astar-docs.factor
rename to extra/path-finding/path-finding-docs.factor
index 7c474bdb57..dd66e4f76a 100644
--- a/extra/astar/astar-docs.factor
+++ b/extra/path-finding/path-finding-docs.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Samuel Tardieu.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: help.markup help.syntax ;
-IN: astar
+IN: path-finding
 
 HELP: astar
 { $description "This tuple must be subclassed and its method " { $link cost } ", "
@@ -75,7 +75,7 @@ HELP: considered
 } ;
 
 ARTICLE: "astar" "A* algorithm"
-"The " { $vocab-link "astar" } " vocabulary implements a graph search algorithm for finding the least-cost path from one node to another." $nl
+"The " { $vocab-link "path-finding" } " vocabulary implements a graph search algorithm for finding the least-cost path from one node to another." $nl
 "The " { $link astar } " tuple may be derived from and its " { $link cost } ", " { $link heuristic } ", and " { $link neighbours } " methods overwritten, or the " { $link <astar> } " word can be used to build such an object from quotations." $nl
 "Make an A* object:"
 { $subsections <astar> }
diff --git a/extra/astar/astar-tests.factor b/extra/path-finding/path-finding-tests.factor
similarity index 94%
rename from extra/astar/astar-tests.factor
rename to extra/path-finding/path-finding-tests.factor
index 6e2e2f4f1b..16614bb165 100644
--- a/extra/astar/astar-tests.factor
+++ b/extra/path-finding/path-finding-tests.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2010 Samuel Tardieu.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays assocs astar combinators hashtables kernel literals math math.functions
-math.vectors sequences sorting splitting strings tools.test ;
-IN: astar.tests
+USING: arrays assocs combinators hashtables kernel literals math math.functions
+math.vectors path-finding sequences sorting splitting strings tools.test ;
+IN: path-finding.tests
 
 ! Use a 10x9 maze (see below) to try to go from s to e, f or g.
 ! X means that a position is unreachable.
diff --git a/extra/astar/astar.factor b/extra/path-finding/path-finding.factor
similarity index 99%
rename from extra/astar/astar.factor
rename to extra/path-finding/path-finding.factor
index 85b3108217..74e12e1e38 100644
--- a/extra/astar/astar.factor
+++ b/extra/path-finding/path-finding.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Samuel Tardieu.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs hash-sets heaps kernel math sequences sets shuffle ;
-IN: astar
+IN: path-finding
 
 ! This implements the A* algorithm. See http://en.wikipedia.org/wiki/A*
 
diff --git a/extra/astar/summary.txt b/extra/path-finding/summary.txt
similarity index 100%
rename from extra/astar/summary.txt
rename to extra/path-finding/summary.txt