diff --git a/extra/bootstrap/ui/authors.txt b/basis/bootstrap/ui/authors.txt
similarity index 100%
rename from extra/bootstrap/ui/authors.txt
rename to basis/bootstrap/ui/authors.txt
diff --git a/extra/bootstrap/ui/summary.txt b/basis/bootstrap/ui/summary.txt
similarity index 100%
rename from extra/bootstrap/ui/summary.txt
rename to basis/bootstrap/ui/summary.txt
diff --git a/extra/bootstrap/ui/tools/authors.txt b/basis/bootstrap/ui/tools/authors.txt
similarity index 100%
rename from extra/bootstrap/ui/tools/authors.txt
rename to basis/bootstrap/ui/tools/authors.txt
diff --git a/extra/bootstrap/ui/tools/summary.txt b/basis/bootstrap/ui/tools/summary.txt
similarity index 100%
rename from extra/bootstrap/ui/tools/summary.txt
rename to basis/bootstrap/ui/tools/summary.txt
diff --git a/extra/bootstrap/ui/tools/tools.factor b/basis/bootstrap/ui/tools/tools.factor
similarity index 100%
rename from extra/bootstrap/ui/tools/tools.factor
rename to basis/bootstrap/ui/tools/tools.factor
diff --git a/extra/bootstrap/ui/ui.factor b/basis/bootstrap/ui/ui.factor
similarity index 100%
rename from extra/bootstrap/ui/ui.factor
rename to basis/bootstrap/ui/ui.factor
diff --git a/extra/math/geometry/geometry.factor b/basis/math/geometry/geometry.factor
similarity index 100%
rename from extra/math/geometry/geometry.factor
rename to basis/math/geometry/geometry.factor
diff --git a/extra/math/geometry/rect/rect-docs.factor b/basis/math/geometry/rect/rect-docs.factor
similarity index 100%
rename from extra/math/geometry/rect/rect-docs.factor
rename to basis/math/geometry/rect/rect-docs.factor
diff --git a/extra/math/geometry/rect/rect-tests.factor b/basis/math/geometry/rect/rect-tests.factor
similarity index 100%
rename from extra/math/geometry/rect/rect-tests.factor
rename to basis/math/geometry/rect/rect-tests.factor
diff --git a/extra/math/geometry/rect/rect.factor b/basis/math/geometry/rect/rect.factor
similarity index 100%
rename from extra/math/geometry/rect/rect.factor
rename to basis/math/geometry/rect/rect.factor
diff --git a/extra/opengl/authors.txt b/basis/opengl/authors.txt
similarity index 100%
rename from extra/opengl/authors.txt
rename to basis/opengl/authors.txt
diff --git a/extra/opengl/camera/authors.txt b/basis/opengl/camera/authors.txt
similarity index 100%
rename from extra/opengl/camera/authors.txt
rename to basis/opengl/camera/authors.txt
diff --git a/extra/opengl/camera/camera.factor b/basis/opengl/camera/camera.factor
similarity index 100%
rename from extra/opengl/camera/camera.factor
rename to basis/opengl/camera/camera.factor
diff --git a/extra/opengl/capabilities/authors.txt b/basis/opengl/capabilities/authors.txt
similarity index 100%
rename from extra/opengl/capabilities/authors.txt
rename to basis/opengl/capabilities/authors.txt
diff --git a/extra/opengl/capabilities/capabilities-docs.factor b/basis/opengl/capabilities/capabilities-docs.factor
similarity index 100%
rename from extra/opengl/capabilities/capabilities-docs.factor
rename to basis/opengl/capabilities/capabilities-docs.factor
diff --git a/extra/opengl/capabilities/capabilities.factor b/basis/opengl/capabilities/capabilities.factor
similarity index 100%
rename from extra/opengl/capabilities/capabilities.factor
rename to basis/opengl/capabilities/capabilities.factor
diff --git a/extra/opengl/capabilities/summary.txt b/basis/opengl/capabilities/summary.txt
similarity index 100%
rename from extra/opengl/capabilities/summary.txt
rename to basis/opengl/capabilities/summary.txt
diff --git a/extra/opengl/capabilities/tags.txt b/basis/opengl/capabilities/tags.txt
similarity index 100%
rename from extra/opengl/capabilities/tags.txt
rename to basis/opengl/capabilities/tags.txt
diff --git a/extra/opengl/demo-support/authors.txt b/basis/opengl/demo-support/authors.txt
similarity index 100%
rename from extra/opengl/demo-support/authors.txt
rename to basis/opengl/demo-support/authors.txt
diff --git a/extra/opengl/demo-support/demo-support.factor b/basis/opengl/demo-support/demo-support.factor
similarity index 100%
rename from extra/opengl/demo-support/demo-support.factor
rename to basis/opengl/demo-support/demo-support.factor
diff --git a/extra/opengl/demo-support/summary.txt b/basis/opengl/demo-support/summary.txt
similarity index 100%
rename from extra/opengl/demo-support/summary.txt
rename to basis/opengl/demo-support/summary.txt
diff --git a/extra/opengl/demo-support/tags.txt b/basis/opengl/demo-support/tags.txt
similarity index 100%
rename from extra/opengl/demo-support/tags.txt
rename to basis/opengl/demo-support/tags.txt
diff --git a/extra/opengl/framebuffers/authors.txt b/basis/opengl/framebuffers/authors.txt
similarity index 100%
rename from extra/opengl/framebuffers/authors.txt
rename to basis/opengl/framebuffers/authors.txt
diff --git a/extra/opengl/framebuffers/framebuffers-docs.factor b/basis/opengl/framebuffers/framebuffers-docs.factor
similarity index 100%
rename from extra/opengl/framebuffers/framebuffers-docs.factor
rename to basis/opengl/framebuffers/framebuffers-docs.factor
diff --git a/extra/opengl/framebuffers/framebuffers.factor b/basis/opengl/framebuffers/framebuffers.factor
similarity index 100%
rename from extra/opengl/framebuffers/framebuffers.factor
rename to basis/opengl/framebuffers/framebuffers.factor
diff --git a/extra/opengl/framebuffers/summary.txt b/basis/opengl/framebuffers/summary.txt
similarity index 100%
rename from extra/opengl/framebuffers/summary.txt
rename to basis/opengl/framebuffers/summary.txt
diff --git a/extra/opengl/framebuffers/tags.txt b/basis/opengl/framebuffers/tags.txt
similarity index 100%
rename from extra/opengl/framebuffers/tags.txt
rename to basis/opengl/framebuffers/tags.txt
diff --git a/extra/opengl/gadgets/gadgets-tests.factor b/basis/opengl/gadgets/gadgets-tests.factor
similarity index 100%
rename from extra/opengl/gadgets/gadgets-tests.factor
rename to basis/opengl/gadgets/gadgets-tests.factor
diff --git a/extra/opengl/gadgets/gadgets.factor b/basis/opengl/gadgets/gadgets.factor
similarity index 100%
rename from extra/opengl/gadgets/gadgets.factor
rename to basis/opengl/gadgets/gadgets.factor
diff --git a/extra/opengl/gl/authors.txt b/basis/opengl/gl/authors.txt
similarity index 100%
rename from extra/opengl/gl/authors.txt
rename to basis/opengl/gl/authors.txt
diff --git a/extra/opengl/gl/extensions/extensions.factor b/basis/opengl/gl/extensions/extensions.factor
similarity index 100%
rename from extra/opengl/gl/extensions/extensions.factor
rename to basis/opengl/gl/extensions/extensions.factor
diff --git a/extra/opengl/gl/gl-docs.factor b/basis/opengl/gl/gl-docs.factor
similarity index 100%
rename from extra/opengl/gl/gl-docs.factor
rename to basis/opengl/gl/gl-docs.factor
diff --git a/extra/opengl/gl/gl.factor b/basis/opengl/gl/gl.factor
similarity index 100%
rename from extra/opengl/gl/gl.factor
rename to basis/opengl/gl/gl.factor
diff --git a/extra/opengl/gl/macosx/macosx.factor b/basis/opengl/gl/macosx/macosx.factor
similarity index 100%
rename from extra/opengl/gl/macosx/macosx.factor
rename to basis/opengl/gl/macosx/macosx.factor
diff --git a/extra/opengl/gl/macosx/tags.txt b/basis/opengl/gl/macosx/tags.txt
similarity index 100%
rename from extra/opengl/gl/macosx/tags.txt
rename to basis/opengl/gl/macosx/tags.txt
diff --git a/extra/opengl/gl/summary.txt b/basis/opengl/gl/summary.txt
similarity index 100%
rename from extra/opengl/gl/summary.txt
rename to basis/opengl/gl/summary.txt
diff --git a/extra/opengl/gl/tags.txt b/basis/opengl/gl/tags.txt
similarity index 100%
rename from extra/opengl/gl/tags.txt
rename to basis/opengl/gl/tags.txt
diff --git a/extra/opengl/gl/unix/authors.txt b/basis/opengl/gl/unix/authors.txt
similarity index 100%
rename from extra/opengl/gl/unix/authors.txt
rename to basis/opengl/gl/unix/authors.txt
diff --git a/extra/opengl/gl/unix/tags.txt b/basis/opengl/gl/unix/tags.txt
similarity index 100%
rename from extra/opengl/gl/unix/tags.txt
rename to basis/opengl/gl/unix/tags.txt
diff --git a/extra/opengl/gl/unix/unix.factor b/basis/opengl/gl/unix/unix.factor
similarity index 100%
rename from extra/opengl/gl/unix/unix.factor
rename to basis/opengl/gl/unix/unix.factor
diff --git a/extra/opengl/gl/windows/authors.txt b/basis/opengl/gl/windows/authors.txt
similarity index 100%
rename from extra/opengl/gl/windows/authors.txt
rename to basis/opengl/gl/windows/authors.txt
diff --git a/extra/opengl/gl/windows/tags.txt b/basis/opengl/gl/windows/tags.txt
similarity index 100%
rename from extra/opengl/gl/windows/tags.txt
rename to basis/opengl/gl/windows/tags.txt
diff --git a/extra/opengl/gl/windows/windows.factor b/basis/opengl/gl/windows/windows.factor
similarity index 100%
rename from extra/opengl/gl/windows/windows.factor
rename to basis/opengl/gl/windows/windows.factor
diff --git a/extra/opengl/glu/authors.txt b/basis/opengl/glu/authors.txt
similarity index 100%
rename from extra/opengl/glu/authors.txt
rename to basis/opengl/glu/authors.txt
diff --git a/extra/opengl/glu/glu.factor b/basis/opengl/glu/glu.factor
similarity index 100%
rename from extra/opengl/glu/glu.factor
rename to basis/opengl/glu/glu.factor
diff --git a/extra/opengl/glu/summary.txt b/basis/opengl/glu/summary.txt
similarity index 100%
rename from extra/opengl/glu/summary.txt
rename to basis/opengl/glu/summary.txt
diff --git a/extra/opengl/glu/tags.txt b/basis/opengl/glu/tags.txt
similarity index 100%
rename from extra/opengl/glu/tags.txt
rename to basis/opengl/glu/tags.txt
diff --git a/extra/opengl/opengl-docs.factor b/basis/opengl/opengl-docs.factor
similarity index 100%
rename from extra/opengl/opengl-docs.factor
rename to basis/opengl/opengl-docs.factor
diff --git a/extra/opengl/opengl.factor b/basis/opengl/opengl.factor
similarity index 100%
rename from extra/opengl/opengl.factor
rename to basis/opengl/opengl.factor
diff --git a/extra/opengl/shaders/authors.txt b/basis/opengl/shaders/authors.txt
similarity index 100%
rename from extra/opengl/shaders/authors.txt
rename to basis/opengl/shaders/authors.txt
diff --git a/extra/opengl/shaders/shaders-docs.factor b/basis/opengl/shaders/shaders-docs.factor
similarity index 100%
rename from extra/opengl/shaders/shaders-docs.factor
rename to basis/opengl/shaders/shaders-docs.factor
diff --git a/extra/opengl/shaders/shaders.factor b/basis/opengl/shaders/shaders.factor
similarity index 100%
rename from extra/opengl/shaders/shaders.factor
rename to basis/opengl/shaders/shaders.factor
diff --git a/extra/opengl/shaders/summary.txt b/basis/opengl/shaders/summary.txt
similarity index 100%
rename from extra/opengl/shaders/summary.txt
rename to basis/opengl/shaders/summary.txt
diff --git a/extra/opengl/shaders/tags.txt b/basis/opengl/shaders/tags.txt
similarity index 100%
rename from extra/opengl/shaders/tags.txt
rename to basis/opengl/shaders/tags.txt
diff --git a/extra/opengl/summary.txt b/basis/opengl/summary.txt
similarity index 100%
rename from extra/opengl/summary.txt
rename to basis/opengl/summary.txt
diff --git a/extra/opengl/tags.txt b/basis/opengl/tags.txt
similarity index 100%
rename from extra/opengl/tags.txt
rename to basis/opengl/tags.txt