diff --git a/extra/assocs/extras/extras-tests.factor b/basis/assocs/extras/extras-tests.factor
similarity index 100%
rename from extra/assocs/extras/extras-tests.factor
rename to basis/assocs/extras/extras-tests.factor
diff --git a/extra/assocs/extras/extras.factor b/basis/assocs/extras/extras.factor
similarity index 100%
rename from extra/assocs/extras/extras.factor
rename to basis/assocs/extras/extras.factor
diff --git a/extra/assocs/extras/tags.txt b/basis/assocs/extras/tags.txt
similarity index 100%
rename from extra/assocs/extras/tags.txt
rename to basis/assocs/extras/tags.txt
diff --git a/extra/base91/authors.txt b/basis/base91/authors.txt
similarity index 100%
rename from extra/base91/authors.txt
rename to basis/base91/authors.txt
diff --git a/extra/base91/base91-tests.factor b/basis/base91/base91-tests.factor
similarity index 100%
rename from extra/base91/base91-tests.factor
rename to basis/base91/base91-tests.factor
diff --git a/extra/base91/base91.factor b/basis/base91/base91.factor
similarity index 100%
rename from extra/base91/base91.factor
rename to basis/base91/base91.factor
diff --git a/extra/base91/summary.txt b/basis/base91/summary.txt
similarity index 100%
rename from extra/base91/summary.txt
rename to basis/base91/summary.txt
diff --git a/extra/constructors/authors.txt b/basis/constructors/authors.txt
similarity index 100%
rename from extra/constructors/authors.txt
rename to basis/constructors/authors.txt
diff --git a/extra/constructors/constructors-tests.factor b/basis/constructors/constructors-tests.factor
similarity index 100%
rename from extra/constructors/constructors-tests.factor
rename to basis/constructors/constructors-tests.factor
diff --git a/extra/constructors/constructors.factor b/basis/constructors/constructors.factor
similarity index 100%
rename from extra/constructors/constructors.factor
rename to basis/constructors/constructors.factor
diff --git a/extra/constructors/summary.txt b/basis/constructors/summary.txt
similarity index 100%
rename from extra/constructors/summary.txt
rename to basis/constructors/summary.txt
diff --git a/extra/constructors/tags.txt b/basis/constructors/tags.txt
similarity index 100%
rename from extra/constructors/tags.txt
rename to basis/constructors/tags.txt
diff --git a/extra/couchdb/authors.txt b/basis/couchdb/authors.txt
similarity index 100%
rename from extra/couchdb/authors.txt
rename to basis/couchdb/authors.txt
diff --git a/extra/couchdb/couchdb-tests.factor b/basis/couchdb/couchdb-tests.factor
similarity index 100%
rename from extra/couchdb/couchdb-tests.factor
rename to basis/couchdb/couchdb-tests.factor
diff --git a/extra/couchdb/couchdb.factor b/basis/couchdb/couchdb.factor
similarity index 100%
rename from extra/couchdb/couchdb.factor
rename to basis/couchdb/couchdb.factor
diff --git a/extra/couchdb/tags.txt b/basis/couchdb/tags.txt
similarity index 100%
rename from extra/couchdb/tags.txt
rename to basis/couchdb/tags.txt
diff --git a/extra/math/floating-point/authors.txt b/basis/math/floating-point/authors.txt
similarity index 100%
rename from extra/math/floating-point/authors.txt
rename to basis/math/floating-point/authors.txt
diff --git a/extra/math/floating-point/floating-point-tests.factor b/basis/math/floating-point/floating-point-tests.factor
similarity index 100%
rename from extra/math/floating-point/floating-point-tests.factor
rename to basis/math/floating-point/floating-point-tests.factor
diff --git a/extra/math/floating-point/floating-point.factor b/basis/math/floating-point/floating-point.factor
similarity index 100%
rename from extra/math/floating-point/floating-point.factor
rename to basis/math/floating-point/floating-point.factor
diff --git a/extra/math/floating-point/tags.txt b/basis/math/floating-point/tags.txt
similarity index 100%
rename from extra/math/floating-point/tags.txt
rename to basis/math/floating-point/tags.txt
diff --git a/extra/math/trig/tags.txt b/basis/math/trig/tags.txt
similarity index 100%
rename from extra/math/trig/tags.txt
rename to basis/math/trig/tags.txt
diff --git a/extra/math/trig/trig.factor b/basis/math/trig/trig.factor
similarity index 100%
rename from extra/math/trig/trig.factor
rename to basis/math/trig/trig.factor
diff --git a/extra/method-chains/authors.txt b/basis/method-chains/authors.txt
similarity index 100%
rename from extra/method-chains/authors.txt
rename to basis/method-chains/authors.txt
diff --git a/extra/method-chains/method-chains-docs.factor b/basis/method-chains/method-chains-docs.factor
similarity index 100%
rename from extra/method-chains/method-chains-docs.factor
rename to basis/method-chains/method-chains-docs.factor
diff --git a/extra/method-chains/method-chains-tests.factor b/basis/method-chains/method-chains-tests.factor
similarity index 100%
rename from extra/method-chains/method-chains-tests.factor
rename to basis/method-chains/method-chains-tests.factor
diff --git a/extra/method-chains/method-chains.factor b/basis/method-chains/method-chains.factor
similarity index 100%
rename from extra/method-chains/method-chains.factor
rename to basis/method-chains/method-chains.factor
diff --git a/extra/method-chains/summary.txt b/basis/method-chains/summary.txt
similarity index 100%
rename from extra/method-chains/summary.txt
rename to basis/method-chains/summary.txt
diff --git a/extra/modern/modern-tests.factor b/basis/modern/modern-tests.factor
similarity index 100%
rename from extra/modern/modern-tests.factor
rename to basis/modern/modern-tests.factor
diff --git a/extra/modern/modern.factor b/basis/modern/modern.factor
similarity index 100%
rename from extra/modern/modern.factor
rename to basis/modern/modern.factor
diff --git a/extra/modern/out/authors.txt b/basis/modern/out/authors.txt
similarity index 100%
rename from extra/modern/out/authors.txt
rename to basis/modern/out/authors.txt
diff --git a/extra/modern/out/out.factor b/basis/modern/out/out.factor
similarity index 100%
rename from extra/modern/out/out.factor
rename to basis/modern/out/out.factor
diff --git a/extra/modern/paths/authors.txt b/basis/modern/paths/authors.txt
similarity index 100%
rename from extra/modern/paths/authors.txt
rename to basis/modern/paths/authors.txt
diff --git a/extra/modern/paths/paths.factor b/basis/modern/paths/paths.factor
similarity index 100%
rename from extra/modern/paths/paths.factor
rename to basis/modern/paths/paths.factor
diff --git a/extra/modern/slices/slices.factor b/basis/modern/slices/slices.factor
similarity index 100%
rename from extra/modern/slices/slices.factor
rename to basis/modern/slices/slices.factor
diff --git a/extra/webapps/user-admin/edit-user.xml b/basis/webapps/user-admin/edit-user.xml
similarity index 100%
rename from extra/webapps/user-admin/edit-user.xml
rename to basis/webapps/user-admin/edit-user.xml
diff --git a/extra/webapps/user-admin/new-user.xml b/basis/webapps/user-admin/new-user.xml
similarity index 100%
rename from extra/webapps/user-admin/new-user.xml
rename to basis/webapps/user-admin/new-user.xml
diff --git a/extra/webapps/user-admin/tags.txt b/basis/webapps/user-admin/tags.txt
similarity index 100%
rename from extra/webapps/user-admin/tags.txt
rename to basis/webapps/user-admin/tags.txt
diff --git a/extra/webapps/user-admin/user-admin-docs.factor b/basis/webapps/user-admin/user-admin-docs.factor
similarity index 100%
rename from extra/webapps/user-admin/user-admin-docs.factor
rename to basis/webapps/user-admin/user-admin-docs.factor
diff --git a/extra/webapps/user-admin/user-admin.factor b/basis/webapps/user-admin/user-admin.factor
similarity index 100%
rename from extra/webapps/user-admin/user-admin.factor
rename to basis/webapps/user-admin/user-admin.factor
diff --git a/extra/webapps/user-admin/user-admin.xml b/basis/webapps/user-admin/user-admin.xml
similarity index 100%
rename from extra/webapps/user-admin/user-admin.xml
rename to basis/webapps/user-admin/user-admin.xml
diff --git a/extra/webapps/user-admin/user-list.xml b/basis/webapps/user-admin/user-list.xml
similarity index 100%
rename from extra/webapps/user-admin/user-list.xml
rename to basis/webapps/user-admin/user-list.xml