diff --git a/extra/hash-sets/numbers/authors.txt b/basis/hash-sets/numbers/authors.txt
similarity index 100%
rename from extra/hash-sets/numbers/authors.txt
rename to basis/hash-sets/numbers/authors.txt
diff --git a/extra/hash-sets/numbers/numbers-tests.factor b/basis/hash-sets/numbers/numbers-tests.factor
similarity index 100%
rename from extra/hash-sets/numbers/numbers-tests.factor
rename to basis/hash-sets/numbers/numbers-tests.factor
diff --git a/extra/hash-sets/numbers/numbers.factor b/basis/hash-sets/numbers/numbers.factor
similarity index 100%
rename from extra/hash-sets/numbers/numbers.factor
rename to basis/hash-sets/numbers/numbers.factor
diff --git a/extra/hash-sets/numbers/prettyprint/prettyprint.factor b/basis/hash-sets/numbers/prettyprint/prettyprint.factor
similarity index 100%
rename from extra/hash-sets/numbers/prettyprint/prettyprint.factor
rename to basis/hash-sets/numbers/prettyprint/prettyprint.factor
diff --git a/extra/hash-sets/numbers/tags.txt b/basis/hash-sets/numbers/tags.txt
similarity index 100%
rename from extra/hash-sets/numbers/tags.txt
rename to basis/hash-sets/numbers/tags.txt
diff --git a/extra/hashtables/numbers/authors.txt b/basis/hashtables/numbers/authors.txt
similarity index 100%
rename from extra/hashtables/numbers/authors.txt
rename to basis/hashtables/numbers/authors.txt
diff --git a/extra/hashtables/numbers/numbers-tests.factor b/basis/hashtables/numbers/numbers-tests.factor
similarity index 100%
rename from extra/hashtables/numbers/numbers-tests.factor
rename to basis/hashtables/numbers/numbers-tests.factor
diff --git a/extra/hashtables/numbers/numbers.factor b/basis/hashtables/numbers/numbers.factor
similarity index 100%
rename from extra/hashtables/numbers/numbers.factor
rename to basis/hashtables/numbers/numbers.factor
diff --git a/extra/hashtables/numbers/prettyprint/prettyprint.factor b/basis/hashtables/numbers/prettyprint/prettyprint.factor
similarity index 100%
rename from extra/hashtables/numbers/prettyprint/prettyprint.factor
rename to basis/hashtables/numbers/prettyprint/prettyprint.factor
diff --git a/extra/hashtables/numbers/tags.txt b/basis/hashtables/numbers/tags.txt
similarity index 100%
rename from extra/hashtables/numbers/tags.txt
rename to basis/hashtables/numbers/tags.txt
diff --git a/extra/math/hashcodes/hashcodes-tests.factor b/basis/math/hashcodes/hashcodes-tests.factor
similarity index 100%
rename from extra/math/hashcodes/hashcodes-tests.factor
rename to basis/math/hashcodes/hashcodes-tests.factor
diff --git a/extra/math/hashcodes/hashcodes.factor b/basis/math/hashcodes/hashcodes.factor
similarity index 100%
rename from extra/math/hashcodes/hashcodes.factor
rename to basis/math/hashcodes/hashcodes.factor
diff --git a/extra/math/hashcodes/tags.txt b/basis/math/hashcodes/tags.txt
similarity index 100%
rename from extra/math/hashcodes/tags.txt
rename to basis/math/hashcodes/tags.txt