diff --git a/extra/colors/cmyk/authors.txt b/basis/colors/cmyk/authors.txt
similarity index 100%
rename from extra/colors/cmyk/authors.txt
rename to basis/colors/cmyk/authors.txt
diff --git a/extra/colors/cmyk/cmyk-docs.factor b/basis/colors/cmyk/cmyk-docs.factor
similarity index 100%
rename from extra/colors/cmyk/cmyk-docs.factor
rename to basis/colors/cmyk/cmyk-docs.factor
diff --git a/extra/colors/cmyk/cmyk-tests.factor b/basis/colors/cmyk/cmyk-tests.factor
similarity index 100%
rename from extra/colors/cmyk/cmyk-tests.factor
rename to basis/colors/cmyk/cmyk-tests.factor
diff --git a/extra/colors/cmyk/cmyk.factor b/basis/colors/cmyk/cmyk.factor
similarity index 100%
rename from extra/colors/cmyk/cmyk.factor
rename to basis/colors/cmyk/cmyk.factor
diff --git a/extra/colors/cmyk/summary.txt b/basis/colors/cmyk/summary.txt
similarity index 100%
rename from extra/colors/cmyk/summary.txt
rename to basis/colors/cmyk/summary.txt
diff --git a/extra/colors/hsl/authors.txt b/basis/colors/hsl/authors.txt
similarity index 100%
rename from extra/colors/hsl/authors.txt
rename to basis/colors/hsl/authors.txt
diff --git a/extra/colors/hsl/hsl-docs.factor b/basis/colors/hsl/hsl-docs.factor
similarity index 100%
rename from extra/colors/hsl/hsl-docs.factor
rename to basis/colors/hsl/hsl-docs.factor
diff --git a/extra/colors/hsl/hsl-tests.factor b/basis/colors/hsl/hsl-tests.factor
similarity index 100%
rename from extra/colors/hsl/hsl-tests.factor
rename to basis/colors/hsl/hsl-tests.factor
diff --git a/extra/colors/hsl/hsl.factor b/basis/colors/hsl/hsl.factor
similarity index 100%
rename from extra/colors/hsl/hsl.factor
rename to basis/colors/hsl/hsl.factor
diff --git a/extra/colors/hsl/summary.txt b/basis/colors/hsl/summary.txt
similarity index 100%
rename from extra/colors/hsl/summary.txt
rename to basis/colors/hsl/summary.txt
diff --git a/extra/colors/lab/authors.txt b/basis/colors/lab/authors.txt
similarity index 100%
rename from extra/colors/lab/authors.txt
rename to basis/colors/lab/authors.txt
diff --git a/extra/colors/lab/lab-docs.factor b/basis/colors/lab/lab-docs.factor
similarity index 100%
rename from extra/colors/lab/lab-docs.factor
rename to basis/colors/lab/lab-docs.factor
diff --git a/extra/colors/lab/lab-tests.factor b/basis/colors/lab/lab-tests.factor
similarity index 100%
rename from extra/colors/lab/lab-tests.factor
rename to basis/colors/lab/lab-tests.factor
diff --git a/extra/colors/lab/lab.factor b/basis/colors/lab/lab.factor
similarity index 100%
rename from extra/colors/lab/lab.factor
rename to basis/colors/lab/lab.factor
diff --git a/extra/colors/lab/summary.txt b/basis/colors/lab/summary.txt
similarity index 100%
rename from extra/colors/lab/summary.txt
rename to basis/colors/lab/summary.txt
diff --git a/extra/colors/lch/authors.txt b/basis/colors/lch/authors.txt
similarity index 100%
rename from extra/colors/lch/authors.txt
rename to basis/colors/lch/authors.txt
diff --git a/extra/colors/lch/lch-tests.factor b/basis/colors/lch/lch-tests.factor
similarity index 100%
rename from extra/colors/lch/lch-tests.factor
rename to basis/colors/lch/lch-tests.factor
diff --git a/extra/colors/lch/lch.factor b/basis/colors/lch/lch.factor
similarity index 100%
rename from extra/colors/lch/lch.factor
rename to basis/colors/lch/lch.factor
diff --git a/extra/colors/lch/summary.txt b/basis/colors/lch/summary.txt
similarity index 100%
rename from extra/colors/lch/summary.txt
rename to basis/colors/lch/summary.txt
diff --git a/extra/colors/luv/authors.txt b/basis/colors/luv/authors.txt
similarity index 100%
rename from extra/colors/luv/authors.txt
rename to basis/colors/luv/authors.txt
diff --git a/extra/colors/luv/luv-docs.factor b/basis/colors/luv/luv-docs.factor
similarity index 100%
rename from extra/colors/luv/luv-docs.factor
rename to basis/colors/luv/luv-docs.factor
diff --git a/extra/colors/luv/luv-tests.factor b/basis/colors/luv/luv-tests.factor
similarity index 100%
rename from extra/colors/luv/luv-tests.factor
rename to basis/colors/luv/luv-tests.factor
diff --git a/extra/colors/luv/luv.factor b/basis/colors/luv/luv.factor
similarity index 100%
rename from extra/colors/luv/luv.factor
rename to basis/colors/luv/luv.factor
diff --git a/extra/colors/luv/summary.txt b/basis/colors/luv/summary.txt
similarity index 100%
rename from extra/colors/luv/summary.txt
rename to basis/colors/luv/summary.txt
diff --git a/extra/colors/ryb/authors.txt b/basis/colors/ryb/authors.txt
similarity index 100%
rename from extra/colors/ryb/authors.txt
rename to basis/colors/ryb/authors.txt
diff --git a/extra/colors/ryb/ryb-docs.factor b/basis/colors/ryb/ryb-docs.factor
similarity index 100%
rename from extra/colors/ryb/ryb-docs.factor
rename to basis/colors/ryb/ryb-docs.factor
diff --git a/extra/colors/ryb/ryb-tests.factor b/basis/colors/ryb/ryb-tests.factor
similarity index 100%
rename from extra/colors/ryb/ryb-tests.factor
rename to basis/colors/ryb/ryb-tests.factor
diff --git a/extra/colors/ryb/ryb.factor b/basis/colors/ryb/ryb.factor
similarity index 100%
rename from extra/colors/ryb/ryb.factor
rename to basis/colors/ryb/ryb.factor
diff --git a/extra/colors/ryb/summary.txt b/basis/colors/ryb/summary.txt
similarity index 100%
rename from extra/colors/ryb/summary.txt
rename to basis/colors/ryb/summary.txt
diff --git a/extra/colors/xyy/authors.txt b/basis/colors/xyy/authors.txt
similarity index 100%
rename from extra/colors/xyy/authors.txt
rename to basis/colors/xyy/authors.txt
diff --git a/extra/colors/xyy/summary.txt b/basis/colors/xyy/summary.txt
similarity index 100%
rename from extra/colors/xyy/summary.txt
rename to basis/colors/xyy/summary.txt
diff --git a/extra/colors/xyy/xyy-docs.factor b/basis/colors/xyy/xyy-docs.factor
similarity index 100%
rename from extra/colors/xyy/xyy-docs.factor
rename to basis/colors/xyy/xyy-docs.factor
diff --git a/extra/colors/xyy/xyy-tests.factor b/basis/colors/xyy/xyy-tests.factor
similarity index 100%
rename from extra/colors/xyy/xyy-tests.factor
rename to basis/colors/xyy/xyy-tests.factor
diff --git a/extra/colors/xyy/xyy.factor b/basis/colors/xyy/xyy.factor
similarity index 100%
rename from extra/colors/xyy/xyy.factor
rename to basis/colors/xyy/xyy.factor
diff --git a/extra/colors/xyz/authors.txt b/basis/colors/xyz/authors.txt
similarity index 100%
rename from extra/colors/xyz/authors.txt
rename to basis/colors/xyz/authors.txt
diff --git a/extra/colors/xyz/summary.txt b/basis/colors/xyz/summary.txt
similarity index 100%
rename from extra/colors/xyz/summary.txt
rename to basis/colors/xyz/summary.txt
diff --git a/extra/colors/xyz/xyz-docs.factor b/basis/colors/xyz/xyz-docs.factor
similarity index 100%
rename from extra/colors/xyz/xyz-docs.factor
rename to basis/colors/xyz/xyz-docs.factor
diff --git a/extra/colors/xyz/xyz-tests.factor b/basis/colors/xyz/xyz-tests.factor
similarity index 100%
rename from extra/colors/xyz/xyz-tests.factor
rename to basis/colors/xyz/xyz-tests.factor
diff --git a/extra/colors/xyz/xyz.factor b/basis/colors/xyz/xyz.factor
similarity index 100%
rename from extra/colors/xyz/xyz.factor
rename to basis/colors/xyz/xyz.factor
diff --git a/extra/colors/yiq/authors.txt b/basis/colors/yiq/authors.txt
similarity index 100%
rename from extra/colors/yiq/authors.txt
rename to basis/colors/yiq/authors.txt
diff --git a/extra/colors/yiq/summary.txt b/basis/colors/yiq/summary.txt
similarity index 100%
rename from extra/colors/yiq/summary.txt
rename to basis/colors/yiq/summary.txt
diff --git a/extra/colors/yiq/yiq-docs.factor b/basis/colors/yiq/yiq-docs.factor
similarity index 100%
rename from extra/colors/yiq/yiq-docs.factor
rename to basis/colors/yiq/yiq-docs.factor
diff --git a/extra/colors/yiq/yiq-tests.factor b/basis/colors/yiq/yiq-tests.factor
similarity index 100%
rename from extra/colors/yiq/yiq-tests.factor
rename to basis/colors/yiq/yiq-tests.factor
diff --git a/extra/colors/yiq/yiq.factor b/basis/colors/yiq/yiq.factor
similarity index 100%
rename from extra/colors/yiq/yiq.factor
rename to basis/colors/yiq/yiq.factor
diff --git a/extra/colors/yuv/authors.txt b/basis/colors/yuv/authors.txt
similarity index 100%
rename from extra/colors/yuv/authors.txt
rename to basis/colors/yuv/authors.txt
diff --git a/extra/colors/yuv/summary.txt b/basis/colors/yuv/summary.txt
similarity index 100%
rename from extra/colors/yuv/summary.txt
rename to basis/colors/yuv/summary.txt
diff --git a/extra/colors/yuv/yuv-docs.factor b/basis/colors/yuv/yuv-docs.factor
similarity index 100%
rename from extra/colors/yuv/yuv-docs.factor
rename to basis/colors/yuv/yuv-docs.factor
diff --git a/extra/colors/yuv/yuv-tests.factor b/basis/colors/yuv/yuv-tests.factor
similarity index 100%
rename from extra/colors/yuv/yuv-tests.factor
rename to basis/colors/yuv/yuv-tests.factor
diff --git a/extra/colors/yuv/yuv.factor b/basis/colors/yuv/yuv.factor
similarity index 100%
rename from extra/colors/yuv/yuv.factor
rename to basis/colors/yuv/yuv.factor