diff --git a/extra/persistent/assocs/assocs.factor b/basis/persistent/assocs/assocs.factor
similarity index 100%
rename from extra/persistent/assocs/assocs.factor
rename to basis/persistent/assocs/assocs.factor
diff --git a/extra/persistent/assocs/authors.txt b/basis/persistent/assocs/authors.txt
similarity index 100%
rename from extra/persistent/assocs/authors.txt
rename to basis/persistent/assocs/authors.txt
diff --git a/extra/persistent/assocs/summary.txt b/basis/persistent/assocs/summary.txt
similarity index 100%
rename from extra/persistent/assocs/summary.txt
rename to basis/persistent/assocs/summary.txt
diff --git a/extra/persistent/assocs/tags.txt b/basis/persistent/assocs/tags.txt
similarity index 100%
rename from extra/persistent/assocs/tags.txt
rename to basis/persistent/assocs/tags.txt
diff --git a/extra/persistent/hashtables/authors.txt b/basis/persistent/hashtables/authors.txt
similarity index 100%
rename from extra/persistent/hashtables/authors.txt
rename to basis/persistent/hashtables/authors.txt
diff --git a/extra/persistent/hashtables/config/config.factor b/basis/persistent/hashtables/config/config.factor
similarity index 100%
rename from extra/persistent/hashtables/config/config.factor
rename to basis/persistent/hashtables/config/config.factor
diff --git a/extra/persistent/hashtables/hashtables-tests.factor b/basis/persistent/hashtables/hashtables-tests.factor
similarity index 100%
rename from extra/persistent/hashtables/hashtables-tests.factor
rename to basis/persistent/hashtables/hashtables-tests.factor
diff --git a/extra/persistent/hashtables/hashtables.factor b/basis/persistent/hashtables/hashtables.factor
similarity index 100%
rename from extra/persistent/hashtables/hashtables.factor
rename to basis/persistent/hashtables/hashtables.factor
diff --git a/extra/persistent/hashtables/nodes/bitmap/bitmap.factor b/basis/persistent/hashtables/nodes/bitmap/bitmap.factor
similarity index 100%
rename from extra/persistent/hashtables/nodes/bitmap/bitmap.factor
rename to basis/persistent/hashtables/nodes/bitmap/bitmap.factor
diff --git a/extra/persistent/hashtables/nodes/collision/collision.factor b/basis/persistent/hashtables/nodes/collision/collision.factor
similarity index 100%
rename from extra/persistent/hashtables/nodes/collision/collision.factor
rename to basis/persistent/hashtables/nodes/collision/collision.factor
diff --git a/extra/persistent/hashtables/nodes/empty/empty.factor b/basis/persistent/hashtables/nodes/empty/empty.factor
similarity index 100%
rename from extra/persistent/hashtables/nodes/empty/empty.factor
rename to basis/persistent/hashtables/nodes/empty/empty.factor
diff --git a/extra/persistent/hashtables/nodes/full/full.factor b/basis/persistent/hashtables/nodes/full/full.factor
similarity index 100%
rename from extra/persistent/hashtables/nodes/full/full.factor
rename to basis/persistent/hashtables/nodes/full/full.factor
diff --git a/extra/persistent/hashtables/nodes/leaf/leaf.factor b/basis/persistent/hashtables/nodes/leaf/leaf.factor
similarity index 100%
rename from extra/persistent/hashtables/nodes/leaf/leaf.factor
rename to basis/persistent/hashtables/nodes/leaf/leaf.factor
diff --git a/extra/persistent/hashtables/nodes/nodes.factor b/basis/persistent/hashtables/nodes/nodes.factor
similarity index 100%
rename from extra/persistent/hashtables/nodes/nodes.factor
rename to basis/persistent/hashtables/nodes/nodes.factor
diff --git a/extra/persistent/hashtables/summary.txt b/basis/persistent/hashtables/summary.txt
similarity index 100%
rename from extra/persistent/hashtables/summary.txt
rename to basis/persistent/hashtables/summary.txt
diff --git a/extra/persistent/hashtables/tags.txt b/basis/persistent/hashtables/tags.txt
similarity index 100%
rename from extra/persistent/hashtables/tags.txt
rename to basis/persistent/hashtables/tags.txt
diff --git a/extra/persistent/heaps/authors.txt b/basis/persistent/heaps/authors.txt
similarity index 100%
rename from extra/persistent/heaps/authors.txt
rename to basis/persistent/heaps/authors.txt
diff --git a/extra/persistent/heaps/heaps-docs.factor b/basis/persistent/heaps/heaps-docs.factor
similarity index 100%
rename from extra/persistent/heaps/heaps-docs.factor
rename to basis/persistent/heaps/heaps-docs.factor
diff --git a/extra/persistent/heaps/heaps-tests.factor b/basis/persistent/heaps/heaps-tests.factor
similarity index 100%
rename from extra/persistent/heaps/heaps-tests.factor
rename to basis/persistent/heaps/heaps-tests.factor
diff --git a/extra/persistent/heaps/heaps.factor b/basis/persistent/heaps/heaps.factor
similarity index 100%
rename from extra/persistent/heaps/heaps.factor
rename to basis/persistent/heaps/heaps.factor
diff --git a/extra/persistent/heaps/summary.txt b/basis/persistent/heaps/summary.txt
similarity index 100%
rename from extra/persistent/heaps/summary.txt
rename to basis/persistent/heaps/summary.txt
diff --git a/extra/persistent/heaps/tags.txt b/basis/persistent/heaps/tags.txt
similarity index 100%
rename from extra/persistent/heaps/tags.txt
rename to basis/persistent/heaps/tags.txt
diff --git a/extra/persistent/sequences/authors.txt b/basis/persistent/sequences/authors.txt
similarity index 100%
rename from extra/persistent/sequences/authors.txt
rename to basis/persistent/sequences/authors.txt
diff --git a/extra/persistent/sequences/sequences-docs.factor b/basis/persistent/sequences/sequences-docs.factor
similarity index 100%
rename from extra/persistent/sequences/sequences-docs.factor
rename to basis/persistent/sequences/sequences-docs.factor
diff --git a/extra/persistent/sequences/sequences.factor b/basis/persistent/sequences/sequences.factor
similarity index 100%
rename from extra/persistent/sequences/sequences.factor
rename to basis/persistent/sequences/sequences.factor
diff --git a/extra/persistent/sequences/summary.txt b/basis/persistent/sequences/summary.txt
similarity index 100%
rename from extra/persistent/sequences/summary.txt
rename to basis/persistent/sequences/summary.txt
diff --git a/extra/persistent/sequences/tags.txt b/basis/persistent/sequences/tags.txt
similarity index 100%
rename from extra/persistent/sequences/tags.txt
rename to basis/persistent/sequences/tags.txt
diff --git a/extra/persistent/vectors/authors.txt b/basis/persistent/vectors/authors.txt
similarity index 100%
rename from extra/persistent/vectors/authors.txt
rename to basis/persistent/vectors/authors.txt
diff --git a/extra/persistent/vectors/summary.txt b/basis/persistent/vectors/summary.txt
similarity index 100%
rename from extra/persistent/vectors/summary.txt
rename to basis/persistent/vectors/summary.txt
diff --git a/extra/persistent/vectors/tags.txt b/basis/persistent/vectors/tags.txt
similarity index 100%
rename from extra/persistent/vectors/tags.txt
rename to basis/persistent/vectors/tags.txt
diff --git a/extra/persistent/vectors/vectors-docs.factor b/basis/persistent/vectors/vectors-docs.factor
similarity index 100%
rename from extra/persistent/vectors/vectors-docs.factor
rename to basis/persistent/vectors/vectors-docs.factor
diff --git a/extra/persistent/vectors/vectors-tests.factor b/basis/persistent/vectors/vectors-tests.factor
similarity index 100%
rename from extra/persistent/vectors/vectors-tests.factor
rename to basis/persistent/vectors/vectors-tests.factor
diff --git a/extra/persistent/vectors/vectors.factor b/basis/persistent/vectors/vectors.factor
similarity index 100%
rename from extra/persistent/vectors/vectors.factor
rename to basis/persistent/vectors/vectors.factor