diff --git a/extra/cli/git/authors.txt b/basis/cli/git/authors.txt
similarity index 100%
rename from extra/cli/git/authors.txt
rename to basis/cli/git/authors.txt
diff --git a/extra/cli/git/git.factor b/basis/cli/git/git.factor
similarity index 100%
rename from extra/cli/git/git.factor
rename to basis/cli/git/git.factor
diff --git a/extra/combinators/extras/authors.txt b/basis/combinators/extras/authors.txt
similarity index 100%
rename from extra/combinators/extras/authors.txt
rename to basis/combinators/extras/authors.txt
diff --git a/extra/combinators/extras/extras-docs.factor b/basis/combinators/extras/extras-docs.factor
similarity index 100%
rename from extra/combinators/extras/extras-docs.factor
rename to basis/combinators/extras/extras-docs.factor
diff --git a/extra/combinators/extras/extras-tests.factor b/basis/combinators/extras/extras-tests.factor
similarity index 100%
rename from extra/combinators/extras/extras-tests.factor
rename to basis/combinators/extras/extras-tests.factor
diff --git a/extra/combinators/extras/extras.factor b/basis/combinators/extras/extras.factor
similarity index 100%
rename from extra/combinators/extras/extras.factor
rename to basis/combinators/extras/extras.factor
diff --git a/extra/grouping/extras/extras-docs.factor b/basis/grouping/extras/extras-docs.factor
similarity index 100%
rename from extra/grouping/extras/extras-docs.factor
rename to basis/grouping/extras/extras-docs.factor
diff --git a/extra/grouping/extras/extras-tests.factor b/basis/grouping/extras/extras-tests.factor
similarity index 100%
rename from extra/grouping/extras/extras-tests.factor
rename to basis/grouping/extras/extras-tests.factor
diff --git a/extra/grouping/extras/extras.factor b/basis/grouping/extras/extras.factor
similarity index 100%
rename from extra/grouping/extras/extras.factor
rename to basis/grouping/extras/extras.factor
diff --git a/extra/grouping/extras/tags.txt b/basis/grouping/extras/tags.txt
similarity index 100%
rename from extra/grouping/extras/tags.txt
rename to basis/grouping/extras/tags.txt
diff --git a/extra/sequences/extras/extras-docs.factor b/basis/sequences/extras/extras-docs.factor
similarity index 100%
rename from extra/sequences/extras/extras-docs.factor
rename to basis/sequences/extras/extras-docs.factor
diff --git a/extra/sequences/extras/extras-tests.factor b/basis/sequences/extras/extras-tests.factor
similarity index 100%
rename from extra/sequences/extras/extras-tests.factor
rename to basis/sequences/extras/extras-tests.factor
diff --git a/extra/sequences/extras/extras.factor b/basis/sequences/extras/extras.factor
similarity index 100%
rename from extra/sequences/extras/extras.factor
rename to basis/sequences/extras/extras.factor
diff --git a/extra/sequences/extras/summary.txt b/basis/sequences/extras/summary.txt
similarity index 100%
rename from extra/sequences/extras/summary.txt
rename to basis/sequences/extras/summary.txt
diff --git a/extra/sequences/extras/tags.txt b/basis/sequences/extras/tags.txt
similarity index 100%
rename from extra/sequences/extras/tags.txt
rename to basis/sequences/extras/tags.txt
diff --git a/extra/sets/extras/authors.txt b/basis/sets/extras/authors.txt
similarity index 100%
rename from extra/sets/extras/authors.txt
rename to basis/sets/extras/authors.txt
diff --git a/extra/sets/extras/extras-docs.factor b/basis/sets/extras/extras-docs.factor
similarity index 100%
rename from extra/sets/extras/extras-docs.factor
rename to basis/sets/extras/extras-docs.factor
diff --git a/extra/sets/extras/extras-tests.factor b/basis/sets/extras/extras-tests.factor
similarity index 100%
rename from extra/sets/extras/extras-tests.factor
rename to basis/sets/extras/extras-tests.factor
diff --git a/extra/sets/extras/extras.factor b/basis/sets/extras/extras.factor
similarity index 100%
rename from extra/sets/extras/extras.factor
rename to basis/sets/extras/extras.factor
diff --git a/extra/sets/extras/tags.txt b/basis/sets/extras/tags.txt
similarity index 100%
rename from extra/sets/extras/tags.txt
rename to basis/sets/extras/tags.txt
diff --git a/extra/tools/which/authors.txt b/basis/tools/which/authors.txt
similarity index 100%
rename from extra/tools/which/authors.txt
rename to basis/tools/which/authors.txt
diff --git a/extra/tools/which/which-docs.factor b/basis/tools/which/which-docs.factor
similarity index 100%
rename from extra/tools/which/which-docs.factor
rename to basis/tools/which/which-docs.factor
diff --git a/extra/tools/which/which.factor b/basis/tools/which/which.factor
similarity index 100%
rename from extra/tools/which/which.factor
rename to basis/tools/which/which.factor