diff --git a/extra/assoc-heaps/assoc-heaps-docs.factor b/basis/assoc-heaps/assoc-heaps-docs.factor
similarity index 100%
rename from extra/assoc-heaps/assoc-heaps-docs.factor
rename to basis/assoc-heaps/assoc-heaps-docs.factor
diff --git a/extra/assoc-heaps/assoc-heaps-tests.factor b/basis/assoc-heaps/assoc-heaps-tests.factor
similarity index 100%
rename from extra/assoc-heaps/assoc-heaps-tests.factor
rename to basis/assoc-heaps/assoc-heaps-tests.factor
diff --git a/extra/assoc-heaps/assoc-heaps.factor b/basis/assoc-heaps/assoc-heaps.factor
similarity index 100%
rename from extra/assoc-heaps/assoc-heaps.factor
rename to basis/assoc-heaps/assoc-heaps.factor
diff --git a/extra/assoc-heaps/authors.txt b/basis/assoc-heaps/authors.txt
similarity index 100%
rename from extra/assoc-heaps/authors.txt
rename to basis/assoc-heaps/authors.txt
diff --git a/extra/cords/authors.txt b/basis/cords/authors.txt
similarity index 100%
rename from extra/cords/authors.txt
rename to basis/cords/authors.txt
diff --git a/extra/cords/cords-tests.factor b/basis/cords/cords-tests.factor
similarity index 100%
rename from extra/cords/cords-tests.factor
rename to basis/cords/cords-tests.factor
diff --git a/extra/cords/cords.factor b/basis/cords/cords.factor
similarity index 100%
rename from extra/cords/cords.factor
rename to basis/cords/cords.factor
diff --git a/extra/cords/summary.txt b/basis/cords/summary.txt
similarity index 100%
rename from extra/cords/summary.txt
rename to basis/cords/summary.txt
diff --git a/extra/cords/tags.txt b/basis/cords/tags.txt
similarity index 100%
rename from extra/cords/tags.txt
rename to basis/cords/tags.txt
diff --git a/extra/formatting/authors.txt b/basis/formatting/authors.txt
similarity index 100%
rename from extra/formatting/authors.txt
rename to basis/formatting/authors.txt
diff --git a/extra/formatting/formatting-docs.factor b/basis/formatting/formatting-docs.factor
similarity index 100%
rename from extra/formatting/formatting-docs.factor
rename to basis/formatting/formatting-docs.factor
diff --git a/extra/formatting/formatting-tests.factor b/basis/formatting/formatting-tests.factor
similarity index 100%
rename from extra/formatting/formatting-tests.factor
rename to basis/formatting/formatting-tests.factor
diff --git a/extra/formatting/formatting.factor b/basis/formatting/formatting.factor
similarity index 100%
rename from extra/formatting/formatting.factor
rename to basis/formatting/formatting.factor
diff --git a/extra/formatting/summary.txt b/basis/formatting/summary.txt
similarity index 100%
rename from extra/formatting/summary.txt
rename to basis/formatting/summary.txt
diff --git a/extra/pack/authors.txt b/basis/pack/authors.txt
similarity index 100%
rename from extra/pack/authors.txt
rename to basis/pack/authors.txt
diff --git a/extra/pack/pack-tests.factor b/basis/pack/pack-tests.factor
similarity index 100%
rename from extra/pack/pack-tests.factor
rename to basis/pack/pack-tests.factor
diff --git a/extra/pack/pack.factor b/basis/pack/pack.factor
similarity index 100%
rename from extra/pack/pack.factor
rename to basis/pack/pack.factor
diff --git a/extra/porter-stemmer/authors.txt b/basis/porter-stemmer/authors.txt
similarity index 100%
rename from extra/porter-stemmer/authors.txt
rename to basis/porter-stemmer/authors.txt
diff --git a/extra/porter-stemmer/porter-stemmer-docs.factor b/basis/porter-stemmer/porter-stemmer-docs.factor
similarity index 100%
rename from extra/porter-stemmer/porter-stemmer-docs.factor
rename to basis/porter-stemmer/porter-stemmer-docs.factor
diff --git a/extra/porter-stemmer/porter-stemmer-tests.factor b/basis/porter-stemmer/porter-stemmer-tests.factor
similarity index 100%
rename from extra/porter-stemmer/porter-stemmer-tests.factor
rename to basis/porter-stemmer/porter-stemmer-tests.factor
diff --git a/extra/porter-stemmer/porter-stemmer.factor b/basis/porter-stemmer/porter-stemmer.factor
similarity index 100%
rename from extra/porter-stemmer/porter-stemmer.factor
rename to basis/porter-stemmer/porter-stemmer.factor
diff --git a/extra/porter-stemmer/summary.txt b/basis/porter-stemmer/summary.txt
similarity index 100%
rename from extra/porter-stemmer/summary.txt
rename to basis/porter-stemmer/summary.txt
diff --git a/extra/porter-stemmer/test/output.txt b/basis/porter-stemmer/test/output.txt
similarity index 100%
rename from extra/porter-stemmer/test/output.txt
rename to basis/porter-stemmer/test/output.txt
diff --git a/extra/porter-stemmer/test/voc.txt b/basis/porter-stemmer/test/voc.txt
similarity index 100%
rename from extra/porter-stemmer/test/voc.txt
rename to basis/porter-stemmer/test/voc.txt
diff --git a/extra/roman/authors.txt b/basis/roman/authors.txt
similarity index 100%
rename from extra/roman/authors.txt
rename to basis/roman/authors.txt
diff --git a/extra/roman/roman-docs.factor b/basis/roman/roman-docs.factor
similarity index 100%
rename from extra/roman/roman-docs.factor
rename to basis/roman/roman-docs.factor
diff --git a/extra/roman/roman-tests.factor b/basis/roman/roman-tests.factor
similarity index 100%
rename from extra/roman/roman-tests.factor
rename to basis/roman/roman-tests.factor
diff --git a/extra/roman/roman.factor b/basis/roman/roman.factor
similarity index 100%
rename from extra/roman/roman.factor
rename to basis/roman/roman.factor
diff --git a/extra/roman/summary.txt b/basis/roman/summary.txt
similarity index 100%
rename from extra/roman/summary.txt
rename to basis/roman/summary.txt
diff --git a/extra/roman/tags.txt b/basis/roman/tags.txt
similarity index 100%
rename from extra/roman/tags.txt
rename to basis/roman/tags.txt
diff --git a/extra/soundex/author.txt b/basis/soundex/author.txt
similarity index 100%
rename from extra/soundex/author.txt
rename to basis/soundex/author.txt
diff --git a/extra/soundex/soundex-tests.factor b/basis/soundex/soundex-tests.factor
similarity index 100%
rename from extra/soundex/soundex-tests.factor
rename to basis/soundex/soundex-tests.factor
diff --git a/extra/soundex/soundex.factor b/basis/soundex/soundex.factor
similarity index 100%
rename from extra/soundex/soundex.factor
rename to basis/soundex/soundex.factor
diff --git a/extra/soundex/summary.txt b/basis/soundex/summary.txt
similarity index 100%
rename from extra/soundex/summary.txt
rename to basis/soundex/summary.txt