diff --git a/extra/99-bottles/99-bottles-tests.factor b/apps/99-bottles/99-bottles-tests.factor
similarity index 100%
rename from extra/99-bottles/99-bottles-tests.factor
rename to apps/99-bottles/99-bottles-tests.factor
diff --git a/extra/99-bottles/99-bottles.factor b/apps/99-bottles/99-bottles.factor
similarity index 100%
rename from extra/99-bottles/99-bottles.factor
rename to apps/99-bottles/99-bottles.factor
diff --git a/basis/alien/endian/authors.txt b/apps/99-bottles/authors.txt
similarity index 100%
rename from basis/alien/endian/authors.txt
rename to apps/99-bottles/authors.txt
diff --git a/basis/core-foundation/launch-services/authors.txt b/apps/hacker-news/authors.txt
similarity index 100%
rename from basis/core-foundation/launch-services/authors.txt
rename to apps/hacker-news/authors.txt
diff --git a/extra/hacker-news/hacker-news.factor b/apps/hacker-news/hacker-news.factor
similarity index 100%
rename from extra/hacker-news/hacker-news.factor
rename to apps/hacker-news/hacker-news.factor
diff --git a/basis/db/authors.txt b/apps/key-logger/authors.txt
similarity index 100%
rename from basis/db/authors.txt
rename to apps/key-logger/authors.txt
diff --git a/extra/key-logger/deploy.factor b/apps/key-logger/deploy.factor
similarity index 100%
rename from extra/key-logger/deploy.factor
rename to apps/key-logger/deploy.factor
diff --git a/extra/key-logger/key-logger.factor b/apps/key-logger/key-logger.factor
similarity index 100%
rename from extra/key-logger/key-logger.factor
rename to apps/key-logger/key-logger.factor
diff --git a/basis/alien/arrays/authors.txt b/apps/log-viewer/authors.txt
similarity index 100%
rename from basis/alien/arrays/authors.txt
rename to apps/log-viewer/authors.txt
diff --git a/extra/log-viewer/log-viewer.factor b/apps/log-viewer/log-viewer.factor
similarity index 100%
rename from extra/log-viewer/log-viewer.factor
rename to apps/log-viewer/log-viewer.factor
diff --git a/extra/log-viewer/summary.txt b/apps/log-viewer/summary.txt
similarity index 100%
rename from extra/log-viewer/summary.txt
rename to apps/log-viewer/summary.txt
diff --git a/basis/cocoa/apple-script/authors.txt b/apps/reddit/authors.txt
similarity index 100%
rename from basis/cocoa/apple-script/authors.txt
rename to apps/reddit/authors.txt
diff --git a/extra/reddit/reddit.factor b/apps/reddit/reddit.factor
similarity index 100%
rename from extra/reddit/reddit.factor
rename to apps/reddit/reddit.factor
diff --git a/extra/reddit/summary.txt b/apps/reddit/summary.txt
similarity index 100%
rename from extra/reddit/summary.txt
rename to apps/reddit/summary.txt
diff --git a/basis/hash-sets/identity/authors.txt b/apps/webbrowser/authors.txt
similarity index 100%
rename from basis/hash-sets/identity/authors.txt
rename to apps/webbrowser/authors.txt
diff --git a/basis/webbrowser/linux/linux.factor b/apps/webbrowser/linux/linux.factor
similarity index 100%
rename from basis/webbrowser/linux/linux.factor
rename to apps/webbrowser/linux/linux.factor
diff --git a/basis/alien/libraries/finder/linux/platforms.txt b/apps/webbrowser/linux/platforms.txt
similarity index 100%
rename from basis/alien/libraries/finder/linux/platforms.txt
rename to apps/webbrowser/linux/platforms.txt
diff --git a/basis/webbrowser/macosx/macosx.factor b/apps/webbrowser/macosx/macosx.factor
similarity index 100%
rename from basis/webbrowser/macosx/macosx.factor
rename to apps/webbrowser/macosx/macosx.factor
diff --git a/basis/alien/libraries/finder/macosx/platforms.txt b/apps/webbrowser/macosx/platforms.txt
similarity index 100%
rename from basis/alien/libraries/finder/macosx/platforms.txt
rename to apps/webbrowser/macosx/platforms.txt
diff --git a/basis/webbrowser/summary.txt b/apps/webbrowser/summary.txt
similarity index 100%
rename from basis/webbrowser/summary.txt
rename to apps/webbrowser/summary.txt
diff --git a/basis/webbrowser/webbrowser-docs.factor b/apps/webbrowser/webbrowser-docs.factor
similarity index 100%
rename from basis/webbrowser/webbrowser-docs.factor
rename to apps/webbrowser/webbrowser-docs.factor
diff --git a/basis/webbrowser/webbrowser-tests.factor b/apps/webbrowser/webbrowser-tests.factor
similarity index 100%
rename from basis/webbrowser/webbrowser-tests.factor
rename to apps/webbrowser/webbrowser-tests.factor
diff --git a/basis/webbrowser/webbrowser.factor b/apps/webbrowser/webbrowser.factor
similarity index 100%
rename from basis/webbrowser/webbrowser.factor
rename to apps/webbrowser/webbrowser.factor
diff --git a/basis/alien/libraries/finder/windows/platforms.txt b/apps/webbrowser/windows/platforms.txt
similarity index 100%
rename from basis/alien/libraries/finder/windows/platforms.txt
rename to apps/webbrowser/windows/platforms.txt
diff --git a/basis/webbrowser/windows/windows.factor b/apps/webbrowser/windows/windows.factor
similarity index 100%
rename from basis/webbrowser/windows/windows.factor
rename to apps/webbrowser/windows/windows.factor
diff --git a/extra/benchmark/3d-matrix-scalar/3d-matrix-scalar.factor b/benchmarks/benchmark/3d-matrix-scalar/3d-matrix-scalar.factor
similarity index 100%
rename from extra/benchmark/3d-matrix-scalar/3d-matrix-scalar.factor
rename to benchmarks/benchmark/3d-matrix-scalar/3d-matrix-scalar.factor
diff --git a/extra/benchmark/3d-matrix-vector/3d-matrix-vector.factor b/benchmarks/benchmark/3d-matrix-vector/3d-matrix-vector.factor
similarity index 100%
rename from extra/benchmark/3d-matrix-vector/3d-matrix-vector.factor
rename to benchmarks/benchmark/3d-matrix-vector/3d-matrix-vector.factor
diff --git a/extra/benchmark/ant/ant.factor b/benchmarks/benchmark/ant/ant.factor
similarity index 100%
rename from extra/benchmark/ant/ant.factor
rename to benchmarks/benchmark/ant/ant.factor
diff --git a/basis/alien/data/authors.txt b/benchmarks/benchmark/authors.txt
similarity index 100%
rename from basis/alien/data/authors.txt
rename to benchmarks/benchmark/authors.txt
diff --git a/extra/benchmark/backtrack/backtrack.factor b/benchmarks/benchmark/backtrack/backtrack.factor
similarity index 100%
rename from extra/benchmark/backtrack/backtrack.factor
rename to benchmarks/benchmark/backtrack/backtrack.factor
diff --git a/extra/benchmark/base64/base64.factor b/benchmarks/benchmark/base64/base64.factor
similarity index 100%
rename from extra/benchmark/base64/base64.factor
rename to benchmarks/benchmark/base64/base64.factor
diff --git a/extra/benchmark/benchmark-tests.factor b/benchmarks/benchmark/benchmark-tests.factor
similarity index 100%
rename from extra/benchmark/benchmark-tests.factor
rename to benchmarks/benchmark/benchmark-tests.factor
diff --git a/extra/benchmark/benchmark.factor b/benchmarks/benchmark/benchmark.factor
similarity index 100%
rename from extra/benchmark/benchmark.factor
rename to benchmarks/benchmark/benchmark.factor
diff --git a/extra/benchmark/beust1/beust1.factor b/benchmarks/benchmark/beust1/beust1.factor
similarity index 100%
rename from extra/benchmark/beust1/beust1.factor
rename to benchmarks/benchmark/beust1/beust1.factor
diff --git a/extra/benchmark/beust2/beust2.factor b/benchmarks/benchmark/beust2/beust2.factor
similarity index 100%
rename from extra/benchmark/beust2/beust2.factor
rename to benchmarks/benchmark/beust2/beust2.factor
diff --git a/extra/benchmark/binary-search/binary-search.factor b/benchmarks/benchmark/binary-search/binary-search.factor
similarity index 100%
rename from extra/benchmark/binary-search/binary-search.factor
rename to benchmarks/benchmark/binary-search/binary-search.factor
diff --git a/extra/benchmark/binary-trees/binary-trees.factor b/benchmarks/benchmark/binary-trees/binary-trees.factor
similarity index 100%
rename from extra/benchmark/binary-trees/binary-trees.factor
rename to benchmarks/benchmark/binary-trees/binary-trees.factor
diff --git a/extra/benchmark/binary-trees/deploy.factor b/benchmarks/benchmark/binary-trees/deploy.factor
similarity index 100%
rename from extra/benchmark/binary-trees/deploy.factor
rename to benchmarks/benchmark/binary-trees/deploy.factor
diff --git a/extra/benchmark/bloom-filters/bloom-filters.factor b/benchmarks/benchmark/bloom-filters/bloom-filters.factor
similarity index 100%
rename from extra/benchmark/bloom-filters/bloom-filters.factor
rename to benchmarks/benchmark/bloom-filters/bloom-filters.factor
diff --git a/basis/alien/remote-control/authors.txt b/benchmarks/benchmark/bootstrap1/authors.txt
similarity index 100%
rename from basis/alien/remote-control/authors.txt
rename to benchmarks/benchmark/bootstrap1/authors.txt
diff --git a/extra/benchmark/bootstrap1/bootstrap1.factor b/benchmarks/benchmark/bootstrap1/bootstrap1.factor
similarity index 100%
rename from extra/benchmark/bootstrap1/bootstrap1.factor
rename to benchmarks/benchmark/bootstrap1/bootstrap1.factor
diff --git a/extra/benchmark/busy-loop/busy-loop.factor b/benchmarks/benchmark/busy-loop/busy-loop.factor
similarity index 100%
rename from extra/benchmark/busy-loop/busy-loop.factor
rename to benchmarks/benchmark/busy-loop/busy-loop.factor
diff --git a/basis/bitstreams/authors.txt b/benchmarks/benchmark/chameneos-redux/authors.txt
similarity index 100%
rename from basis/bitstreams/authors.txt
rename to benchmarks/benchmark/chameneos-redux/authors.txt
diff --git a/extra/benchmark/chameneos-redux/chameneos-redux.factor b/benchmarks/benchmark/chameneos-redux/chameneos-redux.factor
similarity index 100%
rename from extra/benchmark/chameneos-redux/chameneos-redux.factor
rename to benchmarks/benchmark/chameneos-redux/chameneos-redux.factor
diff --git a/extra/benchmark/combinatorics/combinatorics.factor b/benchmarks/benchmark/combinatorics/combinatorics.factor
similarity index 100%
rename from extra/benchmark/combinatorics/combinatorics.factor
rename to benchmarks/benchmark/combinatorics/combinatorics.factor
diff --git a/extra/benchmark/completion/completion.factor b/benchmarks/benchmark/completion/completion.factor
similarity index 100%
rename from extra/benchmark/completion/completion.factor
rename to benchmarks/benchmark/completion/completion.factor
diff --git a/basis/alien/syntax/authors.txt b/benchmarks/benchmark/continuations/authors.txt
similarity index 100%
rename from basis/alien/syntax/authors.txt
rename to benchmarks/benchmark/continuations/authors.txt
diff --git a/extra/benchmark/continuations/continuations.factor b/benchmarks/benchmark/continuations/continuations.factor
similarity index 100%
rename from extra/benchmark/continuations/continuations.factor
rename to benchmarks/benchmark/continuations/continuations.factor
diff --git a/extra/benchmark/crc32/crc32.factor b/benchmarks/benchmark/crc32/crc32.factor
similarity index 100%
rename from extra/benchmark/crc32/crc32.factor
rename to benchmarks/benchmark/crc32/crc32.factor
diff --git a/extra/benchmark/csv/csv.factor b/benchmarks/benchmark/csv/csv.factor
similarity index 100%
rename from extra/benchmark/csv/csv.factor
rename to benchmarks/benchmark/csv/csv.factor
diff --git a/extra/benchmark/dawes/dawes.factor b/benchmarks/benchmark/dawes/dawes.factor
similarity index 100%
rename from extra/benchmark/dawes/dawes.factor
rename to benchmarks/benchmark/dawes/dawes.factor
diff --git a/basis/biassocs/authors.txt b/benchmarks/benchmark/dispatch1/authors.txt
similarity index 100%
rename from basis/biassocs/authors.txt
rename to benchmarks/benchmark/dispatch1/authors.txt
diff --git a/extra/benchmark/dispatch1/dispatch1.factor b/benchmarks/benchmark/dispatch1/dispatch1.factor
similarity index 100%
rename from extra/benchmark/dispatch1/dispatch1.factor
rename to benchmarks/benchmark/dispatch1/dispatch1.factor
diff --git a/basis/bit-arrays/authors.txt b/benchmarks/benchmark/dispatch2/authors.txt
similarity index 100%
rename from basis/bit-arrays/authors.txt
rename to benchmarks/benchmark/dispatch2/authors.txt
diff --git a/extra/benchmark/dispatch2/dispatch2.factor b/benchmarks/benchmark/dispatch2/dispatch2.factor
similarity index 100%
rename from extra/benchmark/dispatch2/dispatch2.factor
rename to benchmarks/benchmark/dispatch2/dispatch2.factor
diff --git a/basis/bit-sets/authors.txt b/benchmarks/benchmark/dispatch3/authors.txt
similarity index 100%
rename from basis/bit-sets/authors.txt
rename to benchmarks/benchmark/dispatch3/authors.txt
diff --git a/extra/benchmark/dispatch3/dispatch3.factor b/benchmarks/benchmark/dispatch3/dispatch3.factor
similarity index 100%
rename from extra/benchmark/dispatch3/dispatch3.factor
rename to benchmarks/benchmark/dispatch3/dispatch3.factor
diff --git a/basis/cocoa/application/authors.txt b/benchmarks/benchmark/dispatch4/authors.txt
similarity index 100%
rename from basis/cocoa/application/authors.txt
rename to benchmarks/benchmark/dispatch4/authors.txt
diff --git a/extra/benchmark/dispatch4/dispatch4.factor b/benchmarks/benchmark/dispatch4/dispatch4.factor
similarity index 100%
rename from extra/benchmark/dispatch4/dispatch4.factor
rename to benchmarks/benchmark/dispatch4/dispatch4.factor
diff --git a/extra/benchmark/dispatch5/dispatch5.factor b/benchmarks/benchmark/dispatch5/dispatch5.factor
similarity index 100%
rename from extra/benchmark/dispatch5/dispatch5.factor
rename to benchmarks/benchmark/dispatch5/dispatch5.factor
diff --git a/extra/benchmark/dispatch6/dispatch6.factor b/benchmarks/benchmark/dispatch6/dispatch6.factor
similarity index 100%
rename from extra/benchmark/dispatch6/dispatch6.factor
rename to benchmarks/benchmark/dispatch6/dispatch6.factor
diff --git a/extra/benchmark/dlists/dlists.factor b/benchmarks/benchmark/dlists/dlists.factor
similarity index 100%
rename from extra/benchmark/dlists/dlists.factor
rename to benchmarks/benchmark/dlists/dlists.factor
diff --git a/basis/db/postgresql/errors/authors.txt b/benchmarks/benchmark/e-decimals/authors.txt
similarity index 100%
rename from basis/db/postgresql/errors/authors.txt
rename to benchmarks/benchmark/e-decimals/authors.txt
diff --git a/extra/benchmark/e-decimals/e-decimals.factor b/benchmarks/benchmark/e-decimals/e-decimals.factor
similarity index 100%
rename from extra/benchmark/e-decimals/e-decimals.factor
rename to benchmarks/benchmark/e-decimals/e-decimals.factor
diff --git a/basis/db/sqlite/errors/authors.txt b/benchmarks/benchmark/e-ratios/authors.txt
similarity index 100%
rename from basis/db/sqlite/errors/authors.txt
rename to benchmarks/benchmark/e-ratios/authors.txt
diff --git a/extra/benchmark/e-ratios/e-ratios.factor b/benchmarks/benchmark/e-ratios/e-ratios.factor
similarity index 100%
rename from extra/benchmark/e-ratios/e-ratios.factor
rename to benchmarks/benchmark/e-ratios/e-ratios.factor
diff --git a/extra/benchmark/empty-loop-0/empty-loop-0.factor b/benchmarks/benchmark/empty-loop-0/empty-loop-0.factor
similarity index 100%
rename from extra/benchmark/empty-loop-0/empty-loop-0.factor
rename to benchmarks/benchmark/empty-loop-0/empty-loop-0.factor
diff --git a/extra/benchmark/empty-loop-1/empty-loop-1.factor b/benchmarks/benchmark/empty-loop-1/empty-loop-1.factor
similarity index 100%
rename from extra/benchmark/empty-loop-1/empty-loop-1.factor
rename to benchmarks/benchmark/empty-loop-1/empty-loop-1.factor
diff --git a/extra/benchmark/empty-loop-2/empty-loop-2.factor b/benchmarks/benchmark/empty-loop-2/empty-loop-2.factor
similarity index 100%
rename from extra/benchmark/empty-loop-2/empty-loop-2.factor
rename to benchmarks/benchmark/empty-loop-2/empty-loop-2.factor
diff --git a/extra/benchmark/euler150/euler150.factor b/benchmarks/benchmark/euler150/euler150.factor
similarity index 100%
rename from extra/benchmark/euler150/euler150.factor
rename to benchmarks/benchmark/euler150/euler150.factor
diff --git a/extra/benchmark/fannkuch/fannkuch.factor b/benchmarks/benchmark/fannkuch/fannkuch.factor
similarity index 100%
rename from extra/benchmark/fannkuch/fannkuch.factor
rename to benchmarks/benchmark/fannkuch/fannkuch.factor
diff --git a/extra/benchmark/fasta/deploy.factor b/benchmarks/benchmark/fasta/deploy.factor
similarity index 100%
rename from extra/benchmark/fasta/deploy.factor
rename to benchmarks/benchmark/fasta/deploy.factor
diff --git a/extra/benchmark/fasta/fasta.factor b/benchmarks/benchmark/fasta/fasta.factor
similarity index 100%
rename from extra/benchmark/fasta/fasta.factor
rename to benchmarks/benchmark/fasta/fasta.factor
diff --git a/basis/cocoa/authors.txt b/benchmarks/benchmark/fib1/authors.txt
similarity index 100%
rename from basis/cocoa/authors.txt
rename to benchmarks/benchmark/fib1/authors.txt
diff --git a/extra/benchmark/fib1/fib1.factor b/benchmarks/benchmark/fib1/fib1.factor
similarity index 100%
rename from extra/benchmark/fib1/fib1.factor
rename to benchmarks/benchmark/fib1/fib1.factor
diff --git a/basis/cocoa/dialogs/authors.txt b/benchmarks/benchmark/fib2/authors.txt
similarity index 100%
rename from basis/cocoa/dialogs/authors.txt
rename to benchmarks/benchmark/fib2/authors.txt
diff --git a/extra/benchmark/fib2/fib2.factor b/benchmarks/benchmark/fib2/fib2.factor
similarity index 100%
rename from extra/benchmark/fib2/fib2.factor
rename to benchmarks/benchmark/fib2/fib2.factor
diff --git a/basis/cocoa/messages/authors.txt b/benchmarks/benchmark/fib3/authors.txt
similarity index 100%
rename from basis/cocoa/messages/authors.txt
rename to benchmarks/benchmark/fib3/authors.txt
diff --git a/extra/benchmark/fib3/fib3.factor b/benchmarks/benchmark/fib3/fib3.factor
similarity index 100%
rename from extra/benchmark/fib3/fib3.factor
rename to benchmarks/benchmark/fib3/fib3.factor
diff --git a/basis/cocoa/pasteboard/authors.txt b/benchmarks/benchmark/fib4/authors.txt
similarity index 100%
rename from basis/cocoa/pasteboard/authors.txt
rename to benchmarks/benchmark/fib4/authors.txt
diff --git a/extra/benchmark/fib4/fib4.factor b/benchmarks/benchmark/fib4/fib4.factor
similarity index 100%
rename from extra/benchmark/fib4/fib4.factor
rename to benchmarks/benchmark/fib4/fib4.factor
diff --git a/basis/cocoa/plists/authors.txt b/benchmarks/benchmark/fib5/authors.txt
similarity index 100%
rename from basis/cocoa/plists/authors.txt
rename to benchmarks/benchmark/fib5/authors.txt
diff --git a/extra/benchmark/fib5/fib5.factor b/benchmarks/benchmark/fib5/fib5.factor
similarity index 100%
rename from extra/benchmark/fib5/fib5.factor
rename to benchmarks/benchmark/fib5/fib5.factor
diff --git a/extra/benchmark/fib6/deploy.factor b/benchmarks/benchmark/fib6/deploy.factor
similarity index 100%
rename from extra/benchmark/fib6/deploy.factor
rename to benchmarks/benchmark/fib6/deploy.factor
diff --git a/extra/benchmark/fib6/fib6.factor b/benchmarks/benchmark/fib6/fib6.factor
similarity index 100%
rename from extra/benchmark/fib6/fib6.factor
rename to benchmarks/benchmark/fib6/fib6.factor
diff --git a/extra/benchmark/fib7/fib7.factor b/benchmarks/benchmark/fib7/fib7.factor
similarity index 100%
rename from extra/benchmark/fib7/fib7.factor
rename to benchmarks/benchmark/fib7/fib7.factor
diff --git a/extra/benchmark/fib8/fib8.factor b/benchmarks/benchmark/fib8/fib8.factor
similarity index 100%
rename from extra/benchmark/fib8/fib8.factor
rename to benchmarks/benchmark/fib8/fib8.factor
diff --git a/extra/benchmark/find-pi/find-pi.factor b/benchmarks/benchmark/find-pi/find-pi.factor
similarity index 100%
rename from extra/benchmark/find-pi/find-pi.factor
rename to benchmarks/benchmark/find-pi/find-pi.factor
diff --git a/extra/benchmark/flip/flip.factor b/benchmarks/benchmark/flip/flip.factor
similarity index 100%
rename from extra/benchmark/flip/flip.factor
rename to benchmarks/benchmark/flip/flip.factor
diff --git a/basis/alien/complex/authors.txt b/benchmarks/benchmark/gc0/authors.txt
similarity index 100%
rename from basis/alien/complex/authors.txt
rename to benchmarks/benchmark/gc0/authors.txt
diff --git a/extra/benchmark/gc0/gc0.factor b/benchmarks/benchmark/gc0/gc0.factor
similarity index 100%
rename from extra/benchmark/gc0/gc0.factor
rename to benchmarks/benchmark/gc0/gc0.factor
diff --git a/basis/alien/complex/functor/authors.txt b/benchmarks/benchmark/gc1/authors.txt
similarity index 100%
rename from basis/alien/complex/functor/authors.txt
rename to benchmarks/benchmark/gc1/authors.txt
diff --git a/extra/benchmark/gc1/gc1.factor b/benchmarks/benchmark/gc1/gc1.factor
similarity index 100%
rename from extra/benchmark/gc1/gc1.factor
rename to benchmarks/benchmark/gc1/gc1.factor
diff --git a/basis/alien/destructors/authors.txt b/benchmarks/benchmark/gc2/authors.txt
similarity index 100%
rename from basis/alien/destructors/authors.txt
rename to benchmarks/benchmark/gc2/authors.txt
diff --git a/extra/benchmark/gc2/gc2.factor b/benchmarks/benchmark/gc2/gc2.factor
similarity index 100%
rename from extra/benchmark/gc2/gc2.factor
rename to benchmarks/benchmark/gc2/gc2.factor
diff --git a/basis/cache/authors.txt b/benchmarks/benchmark/gc3/authors.txt
similarity index 100%
rename from basis/cache/authors.txt
rename to benchmarks/benchmark/gc3/authors.txt
diff --git a/extra/benchmark/gc3/gc3.factor b/benchmarks/benchmark/gc3/gc3.factor
similarity index 100%
rename from extra/benchmark/gc3/gc3.factor
rename to benchmarks/benchmark/gc3/gc3.factor
diff --git a/extra/benchmark/hash-sets/hash-sets.factor b/benchmarks/benchmark/hash-sets/hash-sets.factor
similarity index 100%
rename from extra/benchmark/hash-sets/hash-sets.factor
rename to benchmarks/benchmark/hash-sets/hash-sets.factor
diff --git a/basis/cocoa/runtime/authors.txt b/benchmarks/benchmark/hashtables/authors.txt
similarity index 100%
rename from basis/cocoa/runtime/authors.txt
rename to benchmarks/benchmark/hashtables/authors.txt
diff --git a/extra/benchmark/hashtables/hashtables.factor b/benchmarks/benchmark/hashtables/hashtables.factor
similarity index 100%
rename from extra/benchmark/hashtables/hashtables.factor
rename to benchmarks/benchmark/hashtables/hashtables.factor
diff --git a/extra/benchmark/heaps/heaps.factor b/benchmarks/benchmark/heaps/heaps.factor
similarity index 100%
rename from extra/benchmark/heaps/heaps.factor
rename to benchmarks/benchmark/heaps/heaps.factor
diff --git a/extra/benchmark/interval-sets/interval-sets.factor b/benchmarks/benchmark/interval-sets/interval-sets.factor
similarity index 100%
rename from extra/benchmark/interval-sets/interval-sets.factor
rename to benchmarks/benchmark/interval-sets/interval-sets.factor
diff --git a/basis/cocoa/subclassing/authors.txt b/benchmarks/benchmark/iteration/authors.txt
similarity index 100%
rename from basis/cocoa/subclassing/authors.txt
rename to benchmarks/benchmark/iteration/authors.txt
diff --git a/extra/benchmark/iteration/iteration.factor b/benchmarks/benchmark/iteration/iteration.factor
similarity index 100%
rename from extra/benchmark/iteration/iteration.factor
rename to benchmarks/benchmark/iteration/iteration.factor
diff --git a/basis/core-foundation/attributed-strings/authors.txt b/benchmarks/benchmark/javascript/authors.txt
similarity index 100%
rename from basis/core-foundation/attributed-strings/authors.txt
rename to benchmarks/benchmark/javascript/authors.txt
diff --git a/extra/benchmark/javascript/javascript.factor b/benchmarks/benchmark/javascript/javascript.factor
similarity index 100%
rename from extra/benchmark/javascript/javascript.factor
rename to benchmarks/benchmark/javascript/javascript.factor
diff --git a/extra/benchmark/javascript/jquery-1.3.2.min.js b/benchmarks/benchmark/javascript/jquery-1.3.2.min.js
similarity index 100%
rename from extra/benchmark/javascript/jquery-1.3.2.min.js
rename to benchmarks/benchmark/javascript/jquery-1.3.2.min.js
diff --git a/extra/benchmark/json/json.factor b/benchmarks/benchmark/json/json.factor
similarity index 100%
rename from extra/benchmark/json/json.factor
rename to benchmarks/benchmark/json/json.factor
diff --git a/basis/disjoint-sets/authors.txt b/benchmarks/benchmark/knucleotide/authors.txt
similarity index 100%
rename from basis/disjoint-sets/authors.txt
rename to benchmarks/benchmark/knucleotide/authors.txt
diff --git a/extra/benchmark/knucleotide/deploy.factor b/benchmarks/benchmark/knucleotide/deploy.factor
similarity index 100%
rename from extra/benchmark/knucleotide/deploy.factor
rename to benchmarks/benchmark/knucleotide/deploy.factor
diff --git a/extra/benchmark/knucleotide/knucleotide-input.txt b/benchmarks/benchmark/knucleotide/knucleotide-input.txt
similarity index 100%
rename from extra/benchmark/knucleotide/knucleotide-input.txt
rename to benchmarks/benchmark/knucleotide/knucleotide-input.txt
diff --git a/extra/benchmark/knucleotide/knucleotide.factor b/benchmarks/benchmark/knucleotide/knucleotide.factor
similarity index 100%
rename from extra/benchmark/knucleotide/knucleotide.factor
rename to benchmarks/benchmark/knucleotide/knucleotide.factor
diff --git a/extra/benchmark/knucleotide/summary.txt b/benchmarks/benchmark/knucleotide/summary.txt
similarity index 100%
rename from extra/benchmark/knucleotide/summary.txt
rename to benchmarks/benchmark/knucleotide/summary.txt
diff --git a/extra/benchmark/lcs/lcs.factor b/benchmarks/benchmark/lcs/lcs.factor
similarity index 100%
rename from extra/benchmark/lcs/lcs.factor
rename to benchmarks/benchmark/lcs/lcs.factor
diff --git a/extra/benchmark/lexer/lexer.factor b/benchmarks/benchmark/lexer/lexer.factor
similarity index 100%
rename from extra/benchmark/lexer/lexer.factor
rename to benchmarks/benchmark/lexer/lexer.factor
diff --git a/extra/benchmark/linked-assocs/linked-assocs.factor b/benchmarks/benchmark/linked-assocs/linked-assocs.factor
similarity index 100%
rename from extra/benchmark/linked-assocs/linked-assocs.factor
rename to benchmarks/benchmark/linked-assocs/linked-assocs.factor
diff --git a/extra/benchmark/make/make.factor b/benchmarks/benchmark/make/make.factor
similarity index 100%
rename from extra/benchmark/make/make.factor
rename to benchmarks/benchmark/make/make.factor
diff --git a/basis/cocoa/types/authors.txt b/benchmarks/benchmark/mandel/authors.txt
similarity index 100%
rename from basis/cocoa/types/authors.txt
rename to benchmarks/benchmark/mandel/authors.txt
diff --git a/extra/benchmark/mandel/colors/colors.factor b/benchmarks/benchmark/mandel/colors/colors.factor
similarity index 100%
rename from extra/benchmark/mandel/colors/colors.factor
rename to benchmarks/benchmark/mandel/colors/colors.factor
diff --git a/extra/benchmark/mandel/mandel.factor b/benchmarks/benchmark/mandel/mandel.factor
similarity index 100%
rename from extra/benchmark/mandel/mandel.factor
rename to benchmarks/benchmark/mandel/mandel.factor
diff --git a/extra/benchmark/mandel/params/params.factor b/benchmarks/benchmark/mandel/params/params.factor
similarity index 100%
rename from extra/benchmark/mandel/params/params.factor
rename to benchmarks/benchmark/mandel/params/params.factor
diff --git a/extra/benchmark/matrix-exponential-scalar/matrix-exponential-scalar.factor b/benchmarks/benchmark/matrix-exponential-scalar/matrix-exponential-scalar.factor
similarity index 100%
rename from extra/benchmark/matrix-exponential-scalar/matrix-exponential-scalar.factor
rename to benchmarks/benchmark/matrix-exponential-scalar/matrix-exponential-scalar.factor
diff --git a/extra/benchmark/matrix-exponential-simd/matrix-exponential-simd.factor b/benchmarks/benchmark/matrix-exponential-simd/matrix-exponential-simd.factor
similarity index 100%
rename from extra/benchmark/matrix-exponential-simd/matrix-exponential-simd.factor
rename to benchmarks/benchmark/matrix-exponential-simd/matrix-exponential-simd.factor
diff --git a/extra/benchmark/md5/md5.factor b/benchmarks/benchmark/md5/md5.factor
similarity index 100%
rename from extra/benchmark/md5/md5.factor
rename to benchmarks/benchmark/md5/md5.factor
diff --git a/extra/benchmark/memoize/memoize.factor b/benchmarks/benchmark/memoize/memoize.factor
similarity index 100%
rename from extra/benchmark/memoize/memoize.factor
rename to benchmarks/benchmark/memoize/memoize.factor
diff --git a/extra/benchmark/msgpack/msgpack.factor b/benchmarks/benchmark/msgpack/msgpack.factor
similarity index 100%
rename from extra/benchmark/msgpack/msgpack.factor
rename to benchmarks/benchmark/msgpack/msgpack.factor
diff --git a/basis/environment/authors.txt b/benchmarks/benchmark/mt/authors.txt
similarity index 100%
rename from basis/environment/authors.txt
rename to benchmarks/benchmark/mt/authors.txt
diff --git a/extra/benchmark/mt/mt.factor b/benchmarks/benchmark/mt/mt.factor
similarity index 100%
rename from extra/benchmark/mt/mt.factor
rename to benchmarks/benchmark/mt/mt.factor
diff --git a/extra/benchmark/namespaces/namespaces.factor b/benchmarks/benchmark/namespaces/namespaces.factor
similarity index 100%
rename from extra/benchmark/namespaces/namespaces.factor
rename to benchmarks/benchmark/namespaces/namespaces.factor
diff --git a/basis/core-foundation/dictionaries/authors.txt b/benchmarks/benchmark/nbody-simd/authors.txt
similarity index 100%
rename from basis/core-foundation/dictionaries/authors.txt
rename to benchmarks/benchmark/nbody-simd/authors.txt
diff --git a/extra/benchmark/nbody-simd/deploy.factor b/benchmarks/benchmark/nbody-simd/deploy.factor
similarity index 100%
rename from extra/benchmark/nbody-simd/deploy.factor
rename to benchmarks/benchmark/nbody-simd/deploy.factor
diff --git a/extra/benchmark/nbody-simd/nbody-simd.factor b/benchmarks/benchmark/nbody-simd/nbody-simd.factor
similarity index 100%
rename from extra/benchmark/nbody-simd/nbody-simd.factor
rename to benchmarks/benchmark/nbody-simd/nbody-simd.factor
diff --git a/extra/benchmark/nbody/nbody.factor b/benchmarks/benchmark/nbody/nbody.factor
similarity index 100%
rename from extra/benchmark/nbody/nbody.factor
rename to benchmarks/benchmark/nbody/nbody.factor
diff --git a/extra/benchmark/nested-empty-loop-1/nested-empty-loop-1.factor b/benchmarks/benchmark/nested-empty-loop-1/nested-empty-loop-1.factor
similarity index 100%
rename from extra/benchmark/nested-empty-loop-1/nested-empty-loop-1.factor
rename to benchmarks/benchmark/nested-empty-loop-1/nested-empty-loop-1.factor
diff --git a/extra/benchmark/nested-empty-loop-2/nested-empty-loop-2.factor b/benchmarks/benchmark/nested-empty-loop-2/nested-empty-loop-2.factor
similarity index 100%
rename from extra/benchmark/nested-empty-loop-2/nested-empty-loop-2.factor
rename to benchmarks/benchmark/nested-empty-loop-2/nested-empty-loop-2.factor
diff --git a/basis/cocoa/views/authors.txt b/benchmarks/benchmark/nsieve-bits/authors.txt
similarity index 100%
rename from basis/cocoa/views/authors.txt
rename to benchmarks/benchmark/nsieve-bits/authors.txt
diff --git a/extra/benchmark/nsieve-bits/nsieve-bits.factor b/benchmarks/benchmark/nsieve-bits/nsieve-bits.factor
similarity index 100%
rename from extra/benchmark/nsieve-bits/nsieve-bits.factor
rename to benchmarks/benchmark/nsieve-bits/nsieve-bits.factor
diff --git a/extra/benchmark/nsieve-bytes/nsieve-bytes.factor b/benchmarks/benchmark/nsieve-bytes/nsieve-bytes.factor
similarity index 100%
rename from extra/benchmark/nsieve-bytes/nsieve-bytes.factor
rename to benchmarks/benchmark/nsieve-bytes/nsieve-bytes.factor
diff --git a/basis/cocoa/windows/authors.txt b/benchmarks/benchmark/nsieve/authors.txt
similarity index 100%
rename from basis/cocoa/windows/authors.txt
rename to benchmarks/benchmark/nsieve/authors.txt
diff --git a/extra/benchmark/nsieve/nsieve.factor b/benchmarks/benchmark/nsieve/nsieve.factor
similarity index 100%
rename from extra/benchmark/nsieve/nsieve.factor
rename to benchmarks/benchmark/nsieve/nsieve.factor
diff --git a/extra/benchmark/parse-bignum/parse-bignum.factor b/benchmarks/benchmark/parse-bignum/parse-bignum.factor
similarity index 100%
rename from extra/benchmark/parse-bignum/parse-bignum.factor
rename to benchmarks/benchmark/parse-bignum/parse-bignum.factor
diff --git a/extra/benchmark/parse-fixnum/parse-fixnum.factor b/benchmarks/benchmark/parse-fixnum/parse-fixnum.factor
similarity index 100%
rename from extra/benchmark/parse-fixnum/parse-fixnum.factor
rename to benchmarks/benchmark/parse-fixnum/parse-fixnum.factor
diff --git a/extra/benchmark/parse-float/parse-float.factor b/benchmarks/benchmark/parse-float/parse-float.factor
similarity index 100%
rename from extra/benchmark/parse-float/parse-float.factor
rename to benchmarks/benchmark/parse-float/parse-float.factor
diff --git a/extra/benchmark/parse-ratio/parse-ratio.factor b/benchmarks/benchmark/parse-ratio/parse-ratio.factor
similarity index 100%
rename from extra/benchmark/parse-ratio/parse-ratio.factor
rename to benchmarks/benchmark/parse-ratio/parse-ratio.factor
diff --git a/basis/core-foundation/authors.txt b/benchmarks/benchmark/partial-sums/authors.txt
similarity index 100%
rename from basis/core-foundation/authors.txt
rename to benchmarks/benchmark/partial-sums/authors.txt
diff --git a/extra/benchmark/partial-sums/partial-sums.factor b/benchmarks/benchmark/partial-sums/partial-sums.factor
similarity index 100%
rename from extra/benchmark/partial-sums/partial-sums.factor
rename to benchmarks/benchmark/partial-sums/partial-sums.factor
diff --git a/extra/benchmark/pidigits/authors.txt b/benchmarks/benchmark/pidigits/authors.txt
similarity index 100%
rename from extra/benchmark/pidigits/authors.txt
rename to benchmarks/benchmark/pidigits/authors.txt
diff --git a/extra/benchmark/pidigits/pidigits.factor b/benchmarks/benchmark/pidigits/pidigits.factor
similarity index 100%
rename from extra/benchmark/pidigits/pidigits.factor
rename to benchmarks/benchmark/pidigits/pidigits.factor
diff --git a/extra/benchmark/random/random.factor b/benchmarks/benchmark/random/random.factor
similarity index 100%
rename from extra/benchmark/random/random.factor
rename to benchmarks/benchmark/random/random.factor
diff --git a/extra/benchmark/randomize/randomize.factor b/benchmarks/benchmark/randomize/randomize.factor
similarity index 100%
rename from extra/benchmark/randomize/randomize.factor
rename to benchmarks/benchmark/randomize/randomize.factor
diff --git a/basis/core-foundation/numbers/authors.txt b/benchmarks/benchmark/raytracer-simd/authors.txt
similarity index 100%
rename from basis/core-foundation/numbers/authors.txt
rename to benchmarks/benchmark/raytracer-simd/authors.txt
diff --git a/extra/benchmark/raytracer-simd/raytracer-simd.factor b/benchmarks/benchmark/raytracer-simd/raytracer-simd.factor
similarity index 100%
rename from extra/benchmark/raytracer-simd/raytracer-simd.factor
rename to benchmarks/benchmark/raytracer-simd/raytracer-simd.factor
diff --git a/basis/core-foundation/run-loop/authors.txt b/benchmarks/benchmark/raytracer/authors.txt
similarity index 100%
rename from basis/core-foundation/run-loop/authors.txt
rename to benchmarks/benchmark/raytracer/authors.txt
diff --git a/extra/benchmark/raytracer/raytracer.factor b/benchmarks/benchmark/raytracer/raytracer.factor
similarity index 100%
rename from extra/benchmark/raytracer/raytracer.factor
rename to benchmarks/benchmark/raytracer/raytracer.factor
diff --git a/basis/core-graphics/authors.txt b/benchmarks/benchmark/recursive/authors.txt
similarity index 100%
rename from basis/core-graphics/authors.txt
rename to benchmarks/benchmark/recursive/authors.txt
diff --git a/extra/benchmark/recursive/recursive.factor b/benchmarks/benchmark/recursive/recursive.factor
similarity index 100%
rename from extra/benchmark/recursive/recursive.factor
rename to benchmarks/benchmark/recursive/recursive.factor
diff --git a/extra/benchmark/regex-dna/deploy.factor b/benchmarks/benchmark/regex-dna/deploy.factor
similarity index 100%
rename from extra/benchmark/regex-dna/deploy.factor
rename to benchmarks/benchmark/regex-dna/deploy.factor
diff --git a/extra/benchmark/regex-dna/regex-dna-test-in.txt b/benchmarks/benchmark/regex-dna/regex-dna-test-in.txt
similarity index 100%
rename from extra/benchmark/regex-dna/regex-dna-test-in.txt
rename to benchmarks/benchmark/regex-dna/regex-dna-test-in.txt
diff --git a/extra/benchmark/regex-dna/regex-dna-test-out.txt b/benchmarks/benchmark/regex-dna/regex-dna-test-out.txt
similarity index 100%
rename from extra/benchmark/regex-dna/regex-dna-test-out.txt
rename to benchmarks/benchmark/regex-dna/regex-dna-test-out.txt
diff --git a/extra/benchmark/regex-dna/regex-dna-tests.factor b/benchmarks/benchmark/regex-dna/regex-dna-tests.factor
similarity index 100%
rename from extra/benchmark/regex-dna/regex-dna-tests.factor
rename to benchmarks/benchmark/regex-dna/regex-dna-tests.factor
diff --git a/extra/benchmark/regex-dna/regex-dna.factor b/benchmarks/benchmark/regex-dna/regex-dna.factor
similarity index 100%
rename from extra/benchmark/regex-dna/regex-dna.factor
rename to benchmarks/benchmark/regex-dna/regex-dna.factor
diff --git a/extra/benchmark/regexp/regexp.factor b/benchmarks/benchmark/regexp/regexp.factor
similarity index 100%
rename from extra/benchmark/regexp/regexp.factor
rename to benchmarks/benchmark/regexp/regexp.factor
diff --git a/basis/cpu/x86/32/authors.txt b/benchmarks/benchmark/reverse-complement/authors.txt
similarity index 100%
rename from basis/cpu/x86/32/authors.txt
rename to benchmarks/benchmark/reverse-complement/authors.txt
diff --git a/extra/benchmark/reverse-complement/deploy.factor b/benchmarks/benchmark/reverse-complement/deploy.factor
similarity index 100%
rename from extra/benchmark/reverse-complement/deploy.factor
rename to benchmarks/benchmark/reverse-complement/deploy.factor
diff --git a/extra/benchmark/reverse-complement/reverse-complement-test-in.txt b/benchmarks/benchmark/reverse-complement/reverse-complement-test-in.txt
similarity index 100%
rename from extra/benchmark/reverse-complement/reverse-complement-test-in.txt
rename to benchmarks/benchmark/reverse-complement/reverse-complement-test-in.txt
diff --git a/extra/benchmark/reverse-complement/reverse-complement-test-out.txt b/benchmarks/benchmark/reverse-complement/reverse-complement-test-out.txt
similarity index 100%
rename from extra/benchmark/reverse-complement/reverse-complement-test-out.txt
rename to benchmarks/benchmark/reverse-complement/reverse-complement-test-out.txt
diff --git a/extra/benchmark/reverse-complement/reverse-complement-tests.factor b/benchmarks/benchmark/reverse-complement/reverse-complement-tests.factor
similarity index 100%
rename from extra/benchmark/reverse-complement/reverse-complement-tests.factor
rename to benchmarks/benchmark/reverse-complement/reverse-complement-tests.factor
diff --git a/extra/benchmark/reverse-complement/reverse-complement.factor b/benchmarks/benchmark/reverse-complement/reverse-complement.factor
similarity index 100%
rename from extra/benchmark/reverse-complement/reverse-complement.factor
rename to benchmarks/benchmark/reverse-complement/reverse-complement.factor
diff --git a/basis/cpu/x86/64/authors.txt b/benchmarks/benchmark/ring/authors.txt
similarity index 100%
rename from basis/cpu/x86/64/authors.txt
rename to benchmarks/benchmark/ring/authors.txt
diff --git a/extra/benchmark/ring/ring.factor b/benchmarks/benchmark/ring/ring.factor
similarity index 100%
rename from extra/benchmark/ring/ring.factor
rename to benchmarks/benchmark/ring/ring.factor
diff --git a/basis/environment/unix/authors.txt b/benchmarks/benchmark/sfmt/authors.txt
similarity index 100%
rename from basis/environment/unix/authors.txt
rename to benchmarks/benchmark/sfmt/authors.txt
diff --git a/extra/benchmark/sfmt/sfmt.factor b/benchmarks/benchmark/sfmt/sfmt.factor
similarity index 100%
rename from extra/benchmark/sfmt/sfmt.factor
rename to benchmarks/benchmark/sfmt/sfmt.factor
diff --git a/basis/cpu/x86/authors.txt b/benchmarks/benchmark/sha1/authors.txt
similarity index 100%
rename from basis/cpu/x86/authors.txt
rename to benchmarks/benchmark/sha1/authors.txt
diff --git a/extra/benchmark/sha1/sha1.factor b/benchmarks/benchmark/sha1/sha1.factor
similarity index 100%
rename from extra/benchmark/sha1/sha1.factor
rename to benchmarks/benchmark/sha1/sha1.factor
diff --git a/extra/benchmark/sieve/sieve.factor b/benchmarks/benchmark/sieve/sieve.factor
similarity index 100%
rename from extra/benchmark/sieve/sieve.factor
rename to benchmarks/benchmark/sieve/sieve.factor
diff --git a/basis/core-foundation/utilities/authors.txt b/benchmarks/benchmark/simd-1/authors.txt
similarity index 100%
rename from basis/core-foundation/utilities/authors.txt
rename to benchmarks/benchmark/simd-1/authors.txt
diff --git a/extra/benchmark/simd-1/simd-1.factor b/benchmarks/benchmark/simd-1/simd-1.factor
similarity index 100%
rename from extra/benchmark/simd-1/simd-1.factor
rename to benchmarks/benchmark/simd-1/simd-1.factor
diff --git a/extra/benchmark/sockets/sockets.factor b/benchmarks/benchmark/sockets/sockets.factor
similarity index 100%
rename from extra/benchmark/sockets/sockets.factor
rename to benchmarks/benchmark/sockets/sockets.factor
diff --git a/basis/cpu/x86/x87/authors.txt b/benchmarks/benchmark/sort/authors.txt
similarity index 100%
rename from basis/cpu/x86/x87/authors.txt
rename to benchmarks/benchmark/sort/authors.txt
diff --git a/extra/benchmark/sort/sort.factor b/benchmarks/benchmark/sort/sort.factor
similarity index 100%
rename from extra/benchmark/sort/sort.factor
rename to benchmarks/benchmark/sort/sort.factor
diff --git a/extra/benchmark/spectral-norm-simd/authors.txt b/benchmarks/benchmark/spectral-norm-simd/authors.txt
similarity index 100%
rename from extra/benchmark/spectral-norm-simd/authors.txt
rename to benchmarks/benchmark/spectral-norm-simd/authors.txt
diff --git a/extra/benchmark/spectral-norm-simd/spectral-norm-simd.factor b/benchmarks/benchmark/spectral-norm-simd/spectral-norm-simd.factor
similarity index 100%
rename from extra/benchmark/spectral-norm-simd/spectral-norm-simd.factor
rename to benchmarks/benchmark/spectral-norm-simd/spectral-norm-simd.factor
diff --git a/basis/deques/authors.txt b/benchmarks/benchmark/spectral-norm/authors.txt
similarity index 100%
rename from basis/deques/authors.txt
rename to benchmarks/benchmark/spectral-norm/authors.txt
diff --git a/extra/benchmark/spectral-norm/deploy.factor b/benchmarks/benchmark/spectral-norm/deploy.factor
similarity index 100%
rename from extra/benchmark/spectral-norm/deploy.factor
rename to benchmarks/benchmark/spectral-norm/deploy.factor
diff --git a/extra/benchmark/spectral-norm/spectral-norm.factor b/benchmarks/benchmark/spectral-norm/spectral-norm.factor
similarity index 100%
rename from extra/benchmark/spectral-norm/spectral-norm.factor
rename to benchmarks/benchmark/spectral-norm/spectral-norm.factor
diff --git a/extra/benchmark/splay/splay.factor b/benchmarks/benchmark/splay/splay.factor
similarity index 100%
rename from extra/benchmark/splay/splay.factor
rename to benchmarks/benchmark/splay/splay.factor
diff --git a/extra/benchmark/splitting/splitting.factor b/benchmarks/benchmark/splitting/splitting.factor
similarity index 100%
rename from extra/benchmark/splitting/splitting.factor
rename to benchmarks/benchmark/splitting/splitting.factor
diff --git a/extra/benchmark/stack/stack.factor b/benchmarks/benchmark/stack/stack.factor
similarity index 100%
rename from extra/benchmark/stack/stack.factor
rename to benchmarks/benchmark/stack/stack.factor
diff --git a/extra/benchmark/struct-arrays/struct-arrays.factor b/benchmarks/benchmark/struct-arrays/struct-arrays.factor
similarity index 100%
rename from extra/benchmark/struct-arrays/struct-arrays.factor
rename to benchmarks/benchmark/struct-arrays/struct-arrays.factor
diff --git a/basis/documents/authors.txt b/benchmarks/benchmark/sum-file/authors.txt
similarity index 100%
rename from basis/documents/authors.txt
rename to benchmarks/benchmark/sum-file/authors.txt
diff --git a/extra/benchmark/sum-file/sum-file.factor b/benchmarks/benchmark/sum-file/sum-file.factor
similarity index 100%
rename from extra/benchmark/sum-file/sum-file.factor
rename to benchmarks/benchmark/sum-file/sum-file.factor
diff --git a/extra/benchmark/summary.txt b/benchmarks/benchmark/summary.txt
similarity index 100%
rename from extra/benchmark/summary.txt
rename to benchmarks/benchmark/summary.txt
diff --git a/basis/db/postgresql/authors.txt b/benchmarks/benchmark/tcp-echo0/authors.txt
similarity index 100%
rename from basis/db/postgresql/authors.txt
rename to benchmarks/benchmark/tcp-echo0/authors.txt
diff --git a/extra/benchmark/tcp-echo0/tcp-echo0.factor b/benchmarks/benchmark/tcp-echo0/tcp-echo0.factor
similarity index 100%
rename from extra/benchmark/tcp-echo0/tcp-echo0.factor
rename to benchmarks/benchmark/tcp-echo0/tcp-echo0.factor
diff --git a/basis/dlists/prettyprint/authors.txt b/benchmarks/benchmark/tcp-echo1/authors.txt
similarity index 100%
rename from basis/dlists/prettyprint/authors.txt
rename to benchmarks/benchmark/tcp-echo1/authors.txt
diff --git a/extra/benchmark/tcp-echo1/tcp-echo1.factor b/benchmarks/benchmark/tcp-echo1/tcp-echo1.factor
similarity index 100%
rename from extra/benchmark/tcp-echo1/tcp-echo1.factor
rename to benchmarks/benchmark/tcp-echo1/tcp-echo1.factor
diff --git a/basis/furnace/recaptcha/authors.txt b/benchmarks/benchmark/tcp-echo2/authors.txt
similarity index 100%
rename from basis/furnace/recaptcha/authors.txt
rename to benchmarks/benchmark/tcp-echo2/authors.txt
diff --git a/extra/benchmark/tcp-echo2/tcp-echo2.factor b/benchmarks/benchmark/tcp-echo2/tcp-echo2.factor
similarity index 100%
rename from extra/benchmark/tcp-echo2/tcp-echo2.factor
rename to benchmarks/benchmark/tcp-echo2/tcp-echo2.factor
diff --git a/extra/benchmark/terrain-generation/terrain-generation.factor b/benchmarks/benchmark/terrain-generation/terrain-generation.factor
similarity index 100%
rename from extra/benchmark/terrain-generation/terrain-generation.factor
rename to benchmarks/benchmark/terrain-generation/terrain-generation.factor
diff --git a/extra/benchmark/timers/timers.factor b/benchmarks/benchmark/timers/timers.factor
similarity index 100%
rename from extra/benchmark/timers/timers.factor
rename to benchmarks/benchmark/timers/timers.factor
diff --git a/basis/core-graphics/types/authors.txt b/benchmarks/benchmark/tuple-arrays/authors.txt
similarity index 100%
rename from basis/core-graphics/types/authors.txt
rename to benchmarks/benchmark/tuple-arrays/authors.txt
diff --git a/extra/benchmark/tuple-arrays/tuple-arrays.factor b/benchmarks/benchmark/tuple-arrays/tuple-arrays.factor
similarity index 100%
rename from extra/benchmark/tuple-arrays/tuple-arrays.factor
rename to benchmarks/benchmark/tuple-arrays/tuple-arrays.factor
diff --git a/basis/functors/authors.txt b/benchmarks/benchmark/typecheck1/authors.txt
similarity index 100%
rename from basis/functors/authors.txt
rename to benchmarks/benchmark/typecheck1/authors.txt
diff --git a/extra/benchmark/typecheck1/typecheck1.factor b/benchmarks/benchmark/typecheck1/typecheck1.factor
similarity index 100%
rename from extra/benchmark/typecheck1/typecheck1.factor
rename to benchmarks/benchmark/typecheck1/typecheck1.factor
diff --git a/basis/furnace/actions/authors.txt b/benchmarks/benchmark/typecheck2/authors.txt
similarity index 100%
rename from basis/furnace/actions/authors.txt
rename to benchmarks/benchmark/typecheck2/authors.txt
diff --git a/extra/benchmark/typecheck2/typecheck2.factor b/benchmarks/benchmark/typecheck2/typecheck2.factor
similarity index 100%
rename from extra/benchmark/typecheck2/typecheck2.factor
rename to benchmarks/benchmark/typecheck2/typecheck2.factor
diff --git a/basis/furnace/alloy/authors.txt b/benchmarks/benchmark/typecheck3/authors.txt
similarity index 100%
rename from basis/furnace/alloy/authors.txt
rename to benchmarks/benchmark/typecheck3/authors.txt
diff --git a/extra/benchmark/typecheck3/typecheck3.factor b/benchmarks/benchmark/typecheck3/typecheck3.factor
similarity index 100%
rename from extra/benchmark/typecheck3/typecheck3.factor
rename to benchmarks/benchmark/typecheck3/typecheck3.factor
diff --git a/extra/benchmark/udp-echo0/udp-echo0.factor b/benchmarks/benchmark/udp-echo0/udp-echo0.factor
similarity index 100%
rename from extra/benchmark/udp-echo0/udp-echo0.factor
rename to benchmarks/benchmark/udp-echo0/udp-echo0.factor
diff --git a/basis/splitting/monotonic/authors.txt b/benchmarks/benchmark/udp-echo1/authors.txt
similarity index 100%
rename from basis/splitting/monotonic/authors.txt
rename to benchmarks/benchmark/udp-echo1/authors.txt
diff --git a/extra/benchmark/udp-echo1/udp-echo1.factor b/benchmarks/benchmark/udp-echo1/udp-echo1.factor
similarity index 100%
rename from extra/benchmark/udp-echo1/udp-echo1.factor
rename to benchmarks/benchmark/udp-echo1/udp-echo1.factor
diff --git a/basis/system-info/authors.txt b/benchmarks/benchmark/udp-echo2/authors.txt
similarity index 100%
rename from basis/system-info/authors.txt
rename to benchmarks/benchmark/udp-echo2/authors.txt
diff --git a/extra/benchmark/udp-echo2/udp-echo2.factor b/benchmarks/benchmark/udp-echo2/udp-echo2.factor
similarity index 100%
rename from extra/benchmark/udp-echo2/udp-echo2.factor
rename to benchmarks/benchmark/udp-echo2/udp-echo2.factor
diff --git a/extra/benchmark/ui-panes/deploy.factor b/benchmarks/benchmark/ui-panes/deploy.factor
similarity index 100%
rename from extra/benchmark/ui-panes/deploy.factor
rename to benchmarks/benchmark/ui-panes/deploy.factor
diff --git a/extra/benchmark/ui-panes/ui-panes.factor b/benchmarks/benchmark/ui-panes/ui-panes.factor
similarity index 100%
rename from extra/benchmark/ui-panes/ui-panes.factor
rename to benchmarks/benchmark/ui-panes/ui-panes.factor
diff --git a/extra/benchmark/unicode/unicode.factor b/benchmarks/benchmark/unicode/unicode.factor
similarity index 100%
rename from extra/benchmark/unicode/unicode.factor
rename to benchmarks/benchmark/unicode/unicode.factor
diff --git a/extra/benchmark/wrap/wrap.factor b/benchmarks/benchmark/wrap/wrap.factor
similarity index 100%
rename from extra/benchmark/wrap/wrap.factor
rename to benchmarks/benchmark/wrap/wrap.factor
diff --git a/extra/benchmark/xml/xml.factor b/benchmarks/benchmark/xml/xml.factor
similarity index 100%
rename from extra/benchmark/xml/xml.factor
rename to benchmarks/benchmark/xml/xml.factor
diff --git a/extra/benchmark/yield/yield.factor b/benchmarks/benchmark/yield/yield.factor
similarity index 100%
rename from extra/benchmark/yield/yield.factor
rename to benchmarks/benchmark/yield/yield.factor
diff --git a/extra/benchmark/yuv-to-rgb/yuv-to-rgb.factor b/benchmarks/benchmark/yuv-to-rgb/yuv-to-rgb.factor
similarity index 100%
rename from extra/benchmark/yuv-to-rgb/yuv-to-rgb.factor
rename to benchmarks/benchmark/yuv-to-rgb/yuv-to-rgb.factor
diff --git a/basis/system-info/linux/authors.txt b/collections/arrays/shaped/authors.txt
similarity index 100%
rename from basis/system-info/linux/authors.txt
rename to collections/arrays/shaped/authors.txt
diff --git a/extra/arrays/shaped/shaped-tests.factor b/collections/arrays/shaped/shaped-tests.factor
similarity index 100%
rename from extra/arrays/shaped/shaped-tests.factor
rename to collections/arrays/shaped/shaped-tests.factor
diff --git a/extra/arrays/shaped/shaped.factor b/collections/arrays/shaped/shaped.factor
similarity index 100%
rename from extra/arrays/shaped/shaped.factor
rename to collections/arrays/shaped/shaped.factor
diff --git a/extra/assoc-heaps/assoc-heaps-docs.factor b/collections/assoc-heaps/assoc-heaps-docs.factor
similarity index 100%
rename from extra/assoc-heaps/assoc-heaps-docs.factor
rename to collections/assoc-heaps/assoc-heaps-docs.factor
diff --git a/extra/assoc-heaps/assoc-heaps-tests.factor b/collections/assoc-heaps/assoc-heaps-tests.factor
similarity index 100%
rename from extra/assoc-heaps/assoc-heaps-tests.factor
rename to collections/assoc-heaps/assoc-heaps-tests.factor
diff --git a/extra/assoc-heaps/assoc-heaps.factor b/collections/assoc-heaps/assoc-heaps.factor
similarity index 100%
rename from extra/assoc-heaps/assoc-heaps.factor
rename to collections/assoc-heaps/assoc-heaps.factor
diff --git a/basis/environment/unix/macosx/authors.txt b/collections/assoc-heaps/authors.txt
similarity index 100%
rename from basis/environment/unix/macosx/authors.txt
rename to collections/assoc-heaps/authors.txt
diff --git a/extra/assoc-heaps/summary.txt b/collections/assoc-heaps/summary.txt
similarity index 100%
rename from extra/assoc-heaps/summary.txt
rename to collections/assoc-heaps/summary.txt
diff --git a/extra/assocs/extras/extras-tests.factor b/collections/assocs/extras/extras-tests.factor
similarity index 100%
rename from extra/assocs/extras/extras-tests.factor
rename to collections/assocs/extras/extras-tests.factor
diff --git a/extra/assocs/extras/extras.factor b/collections/assocs/extras/extras.factor
similarity index 100%
rename from extra/assocs/extras/extras.factor
rename to collections/assocs/extras/extras.factor
diff --git a/basis/furnace/asides/authors.txt b/collections/biassocs/authors.txt
similarity index 100%
rename from basis/furnace/asides/authors.txt
rename to collections/biassocs/authors.txt
diff --git a/basis/biassocs/biassocs-docs.factor b/collections/biassocs/biassocs-docs.factor
similarity index 100%
rename from basis/biassocs/biassocs-docs.factor
rename to collections/biassocs/biassocs-docs.factor
diff --git a/basis/biassocs/biassocs-tests.factor b/collections/biassocs/biassocs-tests.factor
similarity index 100%
rename from basis/biassocs/biassocs-tests.factor
rename to collections/biassocs/biassocs-tests.factor
diff --git a/basis/biassocs/biassocs.factor b/collections/biassocs/biassocs.factor
similarity index 100%
rename from basis/biassocs/biassocs.factor
rename to collections/biassocs/biassocs.factor
diff --git a/basis/biassocs/summary.txt b/collections/biassocs/summary.txt
similarity index 100%
rename from basis/biassocs/summary.txt
rename to collections/biassocs/summary.txt
diff --git a/basis/biassocs/tags.txt b/collections/biassocs/tags.txt
similarity index 100%
rename from basis/biassocs/tags.txt
rename to collections/biassocs/tags.txt
diff --git a/basis/furnace/auth/authors.txt b/collections/bit-arrays/authors.txt
similarity index 100%
rename from basis/furnace/auth/authors.txt
rename to collections/bit-arrays/authors.txt
diff --git a/basis/bit-arrays/bit-arrays-docs.factor b/collections/bit-arrays/bit-arrays-docs.factor
similarity index 100%
rename from basis/bit-arrays/bit-arrays-docs.factor
rename to collections/bit-arrays/bit-arrays-docs.factor
diff --git a/basis/bit-arrays/bit-arrays-tests.factor b/collections/bit-arrays/bit-arrays-tests.factor
similarity index 100%
rename from basis/bit-arrays/bit-arrays-tests.factor
rename to collections/bit-arrays/bit-arrays-tests.factor
diff --git a/basis/bit-arrays/bit-arrays.factor b/collections/bit-arrays/bit-arrays.factor
similarity index 100%
rename from basis/bit-arrays/bit-arrays.factor
rename to collections/bit-arrays/bit-arrays.factor
diff --git a/basis/bit-arrays/summary.txt b/collections/bit-arrays/summary.txt
similarity index 100%
rename from basis/bit-arrays/summary.txt
rename to collections/bit-arrays/summary.txt
diff --git a/basis/bit-arrays/tags.txt b/collections/bit-arrays/tags.txt
similarity index 100%
rename from basis/bit-arrays/tags.txt
rename to collections/bit-arrays/tags.txt
diff --git a/basis/furnace/auth/features/deactivate-user/authors.txt b/collections/bit-sets/authors.txt
similarity index 100%
rename from basis/furnace/auth/features/deactivate-user/authors.txt
rename to collections/bit-sets/authors.txt
diff --git a/basis/bit-sets/bit-sets-docs.factor b/collections/bit-sets/bit-sets-docs.factor
similarity index 100%
rename from basis/bit-sets/bit-sets-docs.factor
rename to collections/bit-sets/bit-sets-docs.factor
diff --git a/basis/bit-sets/bit-sets-tests.factor b/collections/bit-sets/bit-sets-tests.factor
similarity index 100%
rename from basis/bit-sets/bit-sets-tests.factor
rename to collections/bit-sets/bit-sets-tests.factor
diff --git a/basis/bit-sets/bit-sets.factor b/collections/bit-sets/bit-sets.factor
similarity index 100%
rename from basis/bit-sets/bit-sets.factor
rename to collections/bit-sets/bit-sets.factor
diff --git a/basis/bit-sets/summary.txt b/collections/bit-sets/summary.txt
similarity index 100%
rename from basis/bit-sets/summary.txt
rename to collections/bit-sets/summary.txt
diff --git a/basis/bit-vectors/bit-vectors-docs.factor b/collections/bit-vectors/bit-vectors-docs.factor
similarity index 100%
rename from basis/bit-vectors/bit-vectors-docs.factor
rename to collections/bit-vectors/bit-vectors-docs.factor
diff --git a/basis/bit-vectors/bit-vectors-tests.factor b/collections/bit-vectors/bit-vectors-tests.factor
similarity index 100%
rename from basis/bit-vectors/bit-vectors-tests.factor
rename to collections/bit-vectors/bit-vectors-tests.factor
diff --git a/basis/bit-vectors/bit-vectors.factor b/collections/bit-vectors/bit-vectors.factor
similarity index 100%
rename from basis/bit-vectors/bit-vectors.factor
rename to collections/bit-vectors/bit-vectors.factor
diff --git a/basis/bit-vectors/summary.txt b/collections/bit-vectors/summary.txt
similarity index 100%
rename from basis/bit-vectors/summary.txt
rename to collections/bit-vectors/summary.txt
diff --git a/basis/bit-vectors/tags.txt b/collections/bit-vectors/tags.txt
similarity index 100%
rename from basis/bit-vectors/tags.txt
rename to collections/bit-vectors/tags.txt
diff --git a/basis/environment/windows/authors.txt b/collections/bitstreams/authors.txt
similarity index 100%
rename from basis/environment/windows/authors.txt
rename to collections/bitstreams/authors.txt
diff --git a/basis/bitstreams/bitstreams-docs.factor b/collections/bitstreams/bitstreams-docs.factor
similarity index 100%
rename from basis/bitstreams/bitstreams-docs.factor
rename to collections/bitstreams/bitstreams-docs.factor
diff --git a/basis/bitstreams/bitstreams-tests.factor b/collections/bitstreams/bitstreams-tests.factor
similarity index 100%
rename from basis/bitstreams/bitstreams-tests.factor
rename to collections/bitstreams/bitstreams-tests.factor
diff --git a/basis/bitstreams/bitstreams.factor b/collections/bitstreams/bitstreams.factor
similarity index 100%
rename from basis/bitstreams/bitstreams.factor
rename to collections/bitstreams/bitstreams.factor
diff --git a/basis/bitstreams/summary.txt b/collections/bitstreams/summary.txt
similarity index 100%
rename from basis/bitstreams/summary.txt
rename to collections/bitstreams/summary.txt
diff --git a/extra/bloom-filters/authors.txt b/collections/bloom-filters/authors.txt
similarity index 100%
rename from extra/bloom-filters/authors.txt
rename to collections/bloom-filters/authors.txt
diff --git a/extra/bloom-filters/bloom-filters-docs.factor b/collections/bloom-filters/bloom-filters-docs.factor
similarity index 100%
rename from extra/bloom-filters/bloom-filters-docs.factor
rename to collections/bloom-filters/bloom-filters-docs.factor
diff --git a/extra/bloom-filters/bloom-filters-tests.factor b/collections/bloom-filters/bloom-filters-tests.factor
similarity index 100%
rename from extra/bloom-filters/bloom-filters-tests.factor
rename to collections/bloom-filters/bloom-filters-tests.factor
diff --git a/extra/bloom-filters/bloom-filters.factor b/collections/bloom-filters/bloom-filters.factor
similarity index 100%
rename from extra/bloom-filters/bloom-filters.factor
rename to collections/bloom-filters/bloom-filters.factor
diff --git a/basis/byte-arrays/hex/authors.txt b/collections/byte-arrays/hex/authors.txt
similarity index 100%
rename from basis/byte-arrays/hex/authors.txt
rename to collections/byte-arrays/hex/authors.txt
diff --git a/basis/byte-arrays/hex/hex-docs.factor b/collections/byte-arrays/hex/hex-docs.factor
similarity index 100%
rename from basis/byte-arrays/hex/hex-docs.factor
rename to collections/byte-arrays/hex/hex-docs.factor
diff --git a/basis/byte-arrays/hex/hex-tests.factor b/collections/byte-arrays/hex/hex-tests.factor
similarity index 100%
rename from basis/byte-arrays/hex/hex-tests.factor
rename to collections/byte-arrays/hex/hex-tests.factor
diff --git a/basis/byte-arrays/hex/hex.factor b/collections/byte-arrays/hex/hex.factor
similarity index 100%
rename from basis/byte-arrays/hex/hex.factor
rename to collections/byte-arrays/hex/hex.factor
diff --git a/basis/core-text/authors.txt b/collections/cache/authors.txt
similarity index 100%
rename from basis/core-text/authors.txt
rename to collections/cache/authors.txt
diff --git a/basis/cache/cache-tests.factor b/collections/cache/cache-tests.factor
similarity index 100%
rename from basis/cache/cache-tests.factor
rename to collections/cache/cache-tests.factor
diff --git a/basis/cache/cache.factor b/collections/cache/cache.factor
similarity index 100%
rename from basis/cache/cache.factor
rename to collections/cache/cache.factor
diff --git a/basis/cache/summary.txt b/collections/cache/summary.txt
similarity index 100%
rename from basis/cache/summary.txt
rename to collections/cache/summary.txt
diff --git a/basis/cache/tags.txt b/collections/cache/tags.txt
similarity index 100%
rename from basis/cache/tags.txt
rename to collections/cache/tags.txt
diff --git a/basis/circular/authors.txt b/collections/circular/authors.txt
similarity index 100%
rename from basis/circular/authors.txt
rename to collections/circular/authors.txt
diff --git a/basis/circular/circular-docs.factor b/collections/circular/circular-docs.factor
similarity index 100%
rename from basis/circular/circular-docs.factor
rename to collections/circular/circular-docs.factor
diff --git a/basis/circular/circular-tests.factor b/collections/circular/circular-tests.factor
similarity index 100%
rename from basis/circular/circular-tests.factor
rename to collections/circular/circular-tests.factor
diff --git a/basis/circular/circular.factor b/collections/circular/circular.factor
similarity index 100%
rename from basis/circular/circular.factor
rename to collections/circular/circular.factor
diff --git a/basis/circular/summary.txt b/collections/circular/summary.txt
similarity index 100%
rename from basis/circular/summary.txt
rename to collections/circular/summary.txt
diff --git a/basis/circular/tags.txt b/collections/circular/tags.txt
similarity index 100%
rename from basis/circular/tags.txt
rename to collections/circular/tags.txt
diff --git a/basis/columns/authors.txt b/collections/columns/authors.txt
similarity index 100%
rename from basis/columns/authors.txt
rename to collections/columns/authors.txt
diff --git a/basis/columns/columns-docs.factor b/collections/columns/columns-docs.factor
similarity index 100%
rename from basis/columns/columns-docs.factor
rename to collections/columns/columns-docs.factor
diff --git a/basis/columns/columns-tests.factor b/collections/columns/columns-tests.factor
similarity index 100%
rename from basis/columns/columns-tests.factor
rename to collections/columns/columns-tests.factor
diff --git a/basis/columns/columns.factor b/collections/columns/columns.factor
similarity index 100%
rename from basis/columns/columns.factor
rename to collections/columns/columns.factor
diff --git a/basis/columns/summary.txt b/collections/columns/summary.txt
similarity index 100%
rename from basis/columns/summary.txt
rename to collections/columns/summary.txt
diff --git a/basis/columns/tags.txt b/collections/columns/tags.txt
similarity index 100%
rename from basis/columns/tags.txt
rename to collections/columns/tags.txt
diff --git a/basis/alien/debugger/authors.txt b/collections/cursors/authors.txt
similarity index 100%
rename from basis/alien/debugger/authors.txt
rename to collections/cursors/authors.txt
diff --git a/extra/cursors/cursors-tests.factor b/collections/cursors/cursors-tests.factor
similarity index 100%
rename from extra/cursors/cursors-tests.factor
rename to collections/cursors/cursors-tests.factor
diff --git a/extra/cursors/cursors.factor b/collections/cursors/cursors.factor
similarity index 100%
rename from extra/cursors/cursors.factor
rename to collections/cursors/cursors.factor
diff --git a/basis/furnace/auth/features/edit-profile/authors.txt b/collections/deques/authors.txt
similarity index 100%
rename from basis/furnace/auth/features/edit-profile/authors.txt
rename to collections/deques/authors.txt
diff --git a/basis/deques/deques-docs.factor b/collections/deques/deques-docs.factor
similarity index 100%
rename from basis/deques/deques-docs.factor
rename to collections/deques/deques-docs.factor
diff --git a/basis/deques/deques.factor b/collections/deques/deques.factor
similarity index 100%
rename from basis/deques/deques.factor
rename to collections/deques/deques.factor
diff --git a/basis/deques/summary.txt b/collections/deques/summary.txt
similarity index 100%
rename from basis/deques/summary.txt
rename to collections/deques/summary.txt
diff --git a/basis/deques/tags.txt b/collections/deques/tags.txt
similarity index 100%
rename from basis/deques/tags.txt
rename to collections/deques/tags.txt
diff --git a/basis/opengl/gl/authors.txt b/collections/digraphs/authors.txt
similarity index 100%
rename from basis/opengl/gl/authors.txt
rename to collections/digraphs/authors.txt
diff --git a/extra/digraphs/digraphs-tests.factor b/collections/digraphs/digraphs-tests.factor
similarity index 100%
rename from extra/digraphs/digraphs-tests.factor
rename to collections/digraphs/digraphs-tests.factor
diff --git a/extra/digraphs/digraphs.factor b/collections/digraphs/digraphs.factor
similarity index 100%
rename from extra/digraphs/digraphs.factor
rename to collections/digraphs/digraphs.factor
diff --git a/extra/digraphs/summary.txt b/collections/digraphs/summary.txt
similarity index 100%
rename from extra/digraphs/summary.txt
rename to collections/digraphs/summary.txt
diff --git a/basis/disjoint-sets/tags.txt b/collections/digraphs/tags.txt
similarity index 100%
rename from basis/disjoint-sets/tags.txt
rename to collections/digraphs/tags.txt
diff --git a/extra/benchmark/knucleotide/authors.txt b/collections/disjoint-sets/authors.txt
similarity index 100%
rename from extra/benchmark/knucleotide/authors.txt
rename to collections/disjoint-sets/authors.txt
diff --git a/basis/disjoint-sets/disjoint-sets-docs.factor b/collections/disjoint-sets/disjoint-sets-docs.factor
similarity index 100%
rename from basis/disjoint-sets/disjoint-sets-docs.factor
rename to collections/disjoint-sets/disjoint-sets-docs.factor
diff --git a/basis/disjoint-sets/disjoint-sets-tests.factor b/collections/disjoint-sets/disjoint-sets-tests.factor
similarity index 100%
rename from basis/disjoint-sets/disjoint-sets-tests.factor
rename to collections/disjoint-sets/disjoint-sets-tests.factor
diff --git a/basis/disjoint-sets/disjoint-sets.factor b/collections/disjoint-sets/disjoint-sets.factor
similarity index 100%
rename from basis/disjoint-sets/disjoint-sets.factor
rename to collections/disjoint-sets/disjoint-sets.factor
diff --git a/basis/disjoint-sets/summary.txt b/collections/disjoint-sets/summary.txt
similarity index 100%
rename from basis/disjoint-sets/summary.txt
rename to collections/disjoint-sets/summary.txt
diff --git a/basis/dlists/tags.txt b/collections/disjoint-sets/tags.txt
similarity index 100%
rename from basis/dlists/tags.txt
rename to collections/disjoint-sets/tags.txt
diff --git a/basis/dlists/authors.txt b/collections/dlists/authors.txt
similarity index 100%
rename from basis/dlists/authors.txt
rename to collections/dlists/authors.txt
diff --git a/basis/dlists/dlists-docs.factor b/collections/dlists/dlists-docs.factor
similarity index 100%
rename from basis/dlists/dlists-docs.factor
rename to collections/dlists/dlists-docs.factor
diff --git a/basis/dlists/dlists-tests.factor b/collections/dlists/dlists-tests.factor
similarity index 100%
rename from basis/dlists/dlists-tests.factor
rename to collections/dlists/dlists-tests.factor
diff --git a/basis/dlists/dlists.factor b/collections/dlists/dlists.factor
similarity index 100%
rename from basis/dlists/dlists.factor
rename to collections/dlists/dlists.factor
diff --git a/basis/system-info/windows/authors.txt b/collections/dlists/prettyprint/authors.txt
similarity index 100%
rename from basis/system-info/windows/authors.txt
rename to collections/dlists/prettyprint/authors.txt
diff --git a/basis/dlists/prettyprint/prettyprint.factor b/collections/dlists/prettyprint/prettyprint.factor
similarity index 100%
rename from basis/dlists/prettyprint/prettyprint.factor
rename to collections/dlists/prettyprint/prettyprint.factor
diff --git a/basis/dlists/summary.txt b/collections/dlists/summary.txt
similarity index 100%
rename from basis/dlists/summary.txt
rename to collections/dlists/summary.txt
diff --git a/basis/heaps/tags.txt b/collections/dlists/tags.txt
similarity index 100%
rename from basis/heaps/tags.txt
rename to collections/dlists/tags.txt
diff --git a/basis/furnace/auth/features/recover-password/authors.txt b/collections/documents/authors.txt
similarity index 100%
rename from basis/furnace/auth/features/recover-password/authors.txt
rename to collections/documents/authors.txt
diff --git a/basis/documents/documents-docs.factor b/collections/documents/documents-docs.factor
similarity index 100%
rename from basis/documents/documents-docs.factor
rename to collections/documents/documents-docs.factor
diff --git a/basis/documents/documents-tests.factor b/collections/documents/documents-tests.factor
similarity index 100%
rename from basis/documents/documents-tests.factor
rename to collections/documents/documents-tests.factor
diff --git a/basis/documents/documents.factor b/collections/documents/documents.factor
similarity index 100%
rename from basis/documents/documents.factor
rename to collections/documents/documents.factor
diff --git a/basis/core-text/fonts/authors.txt b/collections/documents/elements/authors.txt
similarity index 100%
rename from basis/core-text/fonts/authors.txt
rename to collections/documents/elements/authors.txt
diff --git a/basis/documents/elements/elements-docs.factor b/collections/documents/elements/elements-docs.factor
similarity index 100%
rename from basis/documents/elements/elements-docs.factor
rename to collections/documents/elements/elements-docs.factor
diff --git a/basis/documents/elements/elements-tests.factor b/collections/documents/elements/elements-tests.factor
similarity index 100%
rename from basis/documents/elements/elements-tests.factor
rename to collections/documents/elements/elements-tests.factor
diff --git a/basis/documents/elements/elements.factor b/collections/documents/elements/elements.factor
similarity index 100%
rename from basis/documents/elements/elements.factor
rename to collections/documents/elements/elements.factor
diff --git a/basis/documents/summary.txt b/collections/documents/summary.txt
similarity index 100%
rename from basis/documents/summary.txt
rename to collections/documents/summary.txt
diff --git a/basis/game/input/authors.txt b/collections/env/authors.txt
similarity index 100%
rename from basis/game/input/authors.txt
rename to collections/env/authors.txt
diff --git a/extra/env/env-docs.factor b/collections/env/env-docs.factor
similarity index 100%
rename from extra/env/env-docs.factor
rename to collections/env/env-docs.factor
diff --git a/extra/env/env.factor b/collections/env/env.factor
similarity index 100%
rename from extra/env/env.factor
rename to collections/env/env.factor
diff --git a/extra/env/summary.txt b/collections/env/summary.txt
similarity index 100%
rename from extra/env/summary.txt
rename to collections/env/summary.txt
diff --git a/extra/grouping/extras/extras-docs.factor b/collections/grouping/extras/extras-docs.factor
similarity index 100%
rename from extra/grouping/extras/extras-docs.factor
rename to collections/grouping/extras/extras-docs.factor
diff --git a/extra/grouping/extras/extras-tests.factor b/collections/grouping/extras/extras-tests.factor
similarity index 100%
rename from extra/grouping/extras/extras-tests.factor
rename to collections/grouping/extras/extras-tests.factor
diff --git a/extra/grouping/extras/extras.factor b/collections/grouping/extras/extras.factor
similarity index 100%
rename from extra/grouping/extras/extras.factor
rename to collections/grouping/extras/extras.factor
diff --git a/basis/hash-sets/sequences/authors.txt b/collections/hash-sets/identity/authors.txt
similarity index 100%
rename from basis/hash-sets/sequences/authors.txt
rename to collections/hash-sets/identity/authors.txt
diff --git a/basis/hash-sets/identity/identity-tests.factor b/collections/hash-sets/identity/identity-tests.factor
similarity index 100%
rename from basis/hash-sets/identity/identity-tests.factor
rename to collections/hash-sets/identity/identity-tests.factor
diff --git a/basis/hash-sets/identity/identity.factor b/collections/hash-sets/identity/identity.factor
similarity index 100%
rename from basis/hash-sets/identity/identity.factor
rename to collections/hash-sets/identity/identity.factor
diff --git a/basis/hash-sets/identity/prettyprint/prettyprint.factor b/collections/hash-sets/identity/prettyprint/prettyprint.factor
similarity index 100%
rename from basis/hash-sets/identity/prettyprint/prettyprint.factor
rename to collections/hash-sets/identity/prettyprint/prettyprint.factor
diff --git a/basis/hash-sets/wrapped/authors.txt b/collections/hash-sets/sequences/authors.txt
similarity index 100%
rename from basis/hash-sets/wrapped/authors.txt
rename to collections/hash-sets/sequences/authors.txt
diff --git a/basis/hash-sets/sequences/prettyprint/prettyprint.factor b/collections/hash-sets/sequences/prettyprint/prettyprint.factor
similarity index 100%
rename from basis/hash-sets/sequences/prettyprint/prettyprint.factor
rename to collections/hash-sets/sequences/prettyprint/prettyprint.factor
diff --git a/basis/hash-sets/sequences/sequences-tests.factor b/collections/hash-sets/sequences/sequences-tests.factor
similarity index 100%
rename from basis/hash-sets/sequences/sequences-tests.factor
rename to collections/hash-sets/sequences/sequences-tests.factor
diff --git a/basis/hash-sets/sequences/sequences.factor b/collections/hash-sets/sequences/sequences.factor
similarity index 100%
rename from basis/hash-sets/sequences/sequences.factor
rename to collections/hash-sets/sequences/sequences.factor
diff --git a/basis/hashtables/sequences/authors.txt b/collections/hash-sets/wrapped/authors.txt
similarity index 100%
rename from basis/hashtables/sequences/authors.txt
rename to collections/hash-sets/wrapped/authors.txt
diff --git a/basis/hash-sets/wrapped/prettyprint/prettyprint.factor b/collections/hash-sets/wrapped/prettyprint/prettyprint.factor
similarity index 100%
rename from basis/hash-sets/wrapped/prettyprint/prettyprint.factor
rename to collections/hash-sets/wrapped/prettyprint/prettyprint.factor
diff --git a/basis/hash-sets/wrapped/wrapped.factor b/collections/hash-sets/wrapped/wrapped.factor
similarity index 100%
rename from basis/hash-sets/wrapped/wrapped.factor
rename to collections/hash-sets/wrapped/wrapped.factor
diff --git a/basis/hashtables/identity/mirrors/mirrors.factor b/collections/hashtables/identity/mirrors/mirrors.factor
similarity index 100%
rename from basis/hashtables/identity/mirrors/mirrors.factor
rename to collections/hashtables/identity/mirrors/mirrors.factor
diff --git a/basis/hashtables/identity/prettyprint/prettyprint.factor b/collections/hashtables/identity/prettyprint/prettyprint.factor
similarity index 100%
rename from basis/hashtables/identity/prettyprint/prettyprint.factor
rename to collections/hashtables/identity/prettyprint/prettyprint.factor
diff --git a/basis/help/search/authors.txt b/collections/hashtables/sequences/authors.txt
similarity index 100%
rename from basis/help/search/authors.txt
rename to collections/hashtables/sequences/authors.txt
diff --git a/basis/hashtables/sequences/prettyprint/prettyprint.factor b/collections/hashtables/sequences/prettyprint/prettyprint.factor
similarity index 100%
rename from basis/hashtables/sequences/prettyprint/prettyprint.factor
rename to collections/hashtables/sequences/prettyprint/prettyprint.factor
diff --git a/basis/hashtables/sequences/sequences-tests.factor b/collections/hashtables/sequences/sequences-tests.factor
similarity index 100%
rename from basis/hashtables/sequences/sequences-tests.factor
rename to collections/hashtables/sequences/sequences-tests.factor
diff --git a/basis/hashtables/sequences/sequences.factor b/collections/hashtables/sequences/sequences.factor
similarity index 100%
rename from basis/hashtables/sequences/sequences.factor
rename to collections/hashtables/sequences/sequences.factor
diff --git a/basis/hashtables/wrapped/prettyprint/prettyprint.factor b/collections/hashtables/wrapped/prettyprint/prettyprint.factor
similarity index 100%
rename from basis/hashtables/wrapped/prettyprint/prettyprint.factor
rename to collections/hashtables/wrapped/prettyprint/prettyprint.factor
diff --git a/basis/heaps/authors.txt b/collections/heaps/authors.txt
similarity index 100%
rename from basis/heaps/authors.txt
rename to collections/heaps/authors.txt
diff --git a/basis/heaps/heaps-docs.factor b/collections/heaps/heaps-docs.factor
similarity index 100%
rename from basis/heaps/heaps-docs.factor
rename to collections/heaps/heaps-docs.factor
diff --git a/basis/heaps/heaps-tests.factor b/collections/heaps/heaps-tests.factor
similarity index 100%
rename from basis/heaps/heaps-tests.factor
rename to collections/heaps/heaps-tests.factor
diff --git a/basis/heaps/heaps.factor b/collections/heaps/heaps.factor
similarity index 100%
rename from basis/heaps/heaps.factor
rename to collections/heaps/heaps.factor
diff --git a/basis/heaps/summary.txt b/collections/heaps/summary.txt
similarity index 100%
rename from basis/heaps/summary.txt
rename to collections/heaps/summary.txt
diff --git a/basis/lists/tags.txt b/collections/heaps/tags.txt
similarity index 100%
rename from basis/lists/tags.txt
rename to collections/heaps/tags.txt
diff --git a/basis/interval-maps/authors.txt b/collections/interval-maps/authors.txt
similarity index 100%
rename from basis/interval-maps/authors.txt
rename to collections/interval-maps/authors.txt
diff --git a/basis/interval-maps/interval-maps-docs.factor b/collections/interval-maps/interval-maps-docs.factor
similarity index 100%
rename from basis/interval-maps/interval-maps-docs.factor
rename to collections/interval-maps/interval-maps-docs.factor
diff --git a/basis/interval-maps/interval-maps-tests.factor b/collections/interval-maps/interval-maps-tests.factor
similarity index 100%
rename from basis/interval-maps/interval-maps-tests.factor
rename to collections/interval-maps/interval-maps-tests.factor
diff --git a/basis/interval-maps/interval-maps.factor b/collections/interval-maps/interval-maps.factor
similarity index 100%
rename from basis/interval-maps/interval-maps.factor
rename to collections/interval-maps/interval-maps.factor
diff --git a/basis/interval-maps/summary.txt b/collections/interval-maps/summary.txt
similarity index 100%
rename from basis/interval-maps/summary.txt
rename to collections/interval-maps/summary.txt
diff --git a/basis/interval-maps/tags.txt b/collections/interval-maps/tags.txt
similarity index 100%
rename from basis/interval-maps/tags.txt
rename to collections/interval-maps/tags.txt
diff --git a/basis/interval-sets/interval-sets-docs.factor b/collections/interval-sets/interval-sets-docs.factor
similarity index 100%
rename from basis/interval-sets/interval-sets-docs.factor
rename to collections/interval-sets/interval-sets-docs.factor
diff --git a/basis/interval-sets/interval-sets-tests.factor b/collections/interval-sets/interval-sets-tests.factor
similarity index 100%
rename from basis/interval-sets/interval-sets-tests.factor
rename to collections/interval-sets/interval-sets-tests.factor
diff --git a/basis/interval-sets/interval-sets.factor b/collections/interval-sets/interval-sets.factor
similarity index 100%
rename from basis/interval-sets/interval-sets.factor
rename to collections/interval-sets/interval-sets.factor
diff --git a/basis/linked-assocs/authors.txt b/collections/linked-assocs/authors.txt
similarity index 100%
rename from basis/linked-assocs/authors.txt
rename to collections/linked-assocs/authors.txt
diff --git a/basis/linked-assocs/linked-assocs-docs.factor b/collections/linked-assocs/linked-assocs-docs.factor
similarity index 100%
rename from basis/linked-assocs/linked-assocs-docs.factor
rename to collections/linked-assocs/linked-assocs-docs.factor
diff --git a/basis/linked-assocs/linked-assocs-tests.factor b/collections/linked-assocs/linked-assocs-tests.factor
similarity index 100%
rename from basis/linked-assocs/linked-assocs-tests.factor
rename to collections/linked-assocs/linked-assocs-tests.factor
diff --git a/basis/linked-assocs/linked-assocs.factor b/collections/linked-assocs/linked-assocs.factor
similarity index 100%
rename from basis/linked-assocs/linked-assocs.factor
rename to collections/linked-assocs/linked-assocs.factor
diff --git a/basis/linked-assocs/prettyprint/prettyprint.factor b/collections/linked-assocs/prettyprint/prettyprint.factor
similarity index 100%
rename from basis/linked-assocs/prettyprint/prettyprint.factor
rename to collections/linked-assocs/prettyprint/prettyprint.factor
diff --git a/basis/linked-assocs/summary.txt b/collections/linked-assocs/summary.txt
similarity index 100%
rename from basis/linked-assocs/summary.txt
rename to collections/linked-assocs/summary.txt
diff --git a/basis/linked-assocs/tags.txt b/collections/linked-assocs/tags.txt
similarity index 100%
rename from basis/linked-assocs/tags.txt
rename to collections/linked-assocs/tags.txt
diff --git a/basis/linked-sets/authors.txt b/collections/linked-sets/authors.txt
similarity index 100%
rename from basis/linked-sets/authors.txt
rename to collections/linked-sets/authors.txt
diff --git a/basis/linked-sets/linked-sets-tests.factor b/collections/linked-sets/linked-sets-tests.factor
similarity index 100%
rename from basis/linked-sets/linked-sets-tests.factor
rename to collections/linked-sets/linked-sets-tests.factor
diff --git a/basis/linked-sets/linked-sets.factor b/collections/linked-sets/linked-sets.factor
similarity index 100%
rename from basis/linked-sets/linked-sets.factor
rename to collections/linked-sets/linked-sets.factor
diff --git a/basis/linked-sets/summary.txt b/collections/linked-sets/summary.txt
similarity index 100%
rename from basis/linked-sets/summary.txt
rename to collections/linked-sets/summary.txt
diff --git a/basis/lists/authors.txt b/collections/lists/authors.txt
similarity index 100%
rename from basis/lists/authors.txt
rename to collections/lists/authors.txt
diff --git a/basis/lists/lazy/authors.txt b/collections/lists/lazy/authors.txt
similarity index 100%
rename from basis/lists/lazy/authors.txt
rename to collections/lists/lazy/authors.txt
diff --git a/basis/lists/lazy/examples/authors.txt b/collections/lists/lazy/examples/authors.txt
similarity index 100%
rename from basis/lists/lazy/examples/authors.txt
rename to collections/lists/lazy/examples/authors.txt
diff --git a/basis/lists/lazy/examples/examples-tests.factor b/collections/lists/lazy/examples/examples-tests.factor
similarity index 100%
rename from basis/lists/lazy/examples/examples-tests.factor
rename to collections/lists/lazy/examples/examples-tests.factor
diff --git a/basis/lists/lazy/examples/examples.factor b/collections/lists/lazy/examples/examples.factor
similarity index 100%
rename from basis/lists/lazy/examples/examples.factor
rename to collections/lists/lazy/examples/examples.factor
diff --git a/basis/lists/lazy/lazy-docs.factor b/collections/lists/lazy/lazy-docs.factor
similarity index 100%
rename from basis/lists/lazy/lazy-docs.factor
rename to collections/lists/lazy/lazy-docs.factor
diff --git a/basis/lists/lazy/lazy-tests.factor b/collections/lists/lazy/lazy-tests.factor
similarity index 100%
rename from basis/lists/lazy/lazy-tests.factor
rename to collections/lists/lazy/lazy-tests.factor
diff --git a/basis/lists/lazy/lazy.factor b/collections/lists/lazy/lazy.factor
similarity index 100%
rename from basis/lists/lazy/lazy.factor
rename to collections/lists/lazy/lazy.factor
diff --git a/basis/lists/lazy/old-doc.html b/collections/lists/lazy/old-doc.html
similarity index 100%
rename from basis/lists/lazy/old-doc.html
rename to collections/lists/lazy/old-doc.html
diff --git a/basis/lists/lazy/summary.txt b/collections/lists/lazy/summary.txt
similarity index 100%
rename from basis/lists/lazy/summary.txt
rename to collections/lists/lazy/summary.txt
diff --git a/basis/lists/lazy/tags.txt b/collections/lists/lazy/tags.txt
similarity index 100%
rename from basis/lists/lazy/tags.txt
rename to collections/lists/lazy/tags.txt
diff --git a/basis/lists/lists-docs.factor b/collections/lists/lists-docs.factor
similarity index 100%
rename from basis/lists/lists-docs.factor
rename to collections/lists/lists-docs.factor
diff --git a/basis/lists/lists-tests.factor b/collections/lists/lists-tests.factor
similarity index 100%
rename from basis/lists/lists-tests.factor
rename to collections/lists/lists-tests.factor
diff --git a/basis/lists/lists.factor b/collections/lists/lists.factor
similarity index 100%
rename from basis/lists/lists.factor
rename to collections/lists/lists.factor
diff --git a/basis/lists/summary.txt b/collections/lists/summary.txt
similarity index 100%
rename from basis/lists/summary.txt
rename to collections/lists/summary.txt
diff --git a/basis/persistent/assocs/tags.txt b/collections/lists/tags.txt
similarity index 100%
rename from basis/persistent/assocs/tags.txt
rename to collections/lists/tags.txt
diff --git a/basis/nibble-arrays/nibble-arrays-tests.factor b/collections/nibble-arrays/nibble-arrays-tests.factor
similarity index 100%
rename from basis/nibble-arrays/nibble-arrays-tests.factor
rename to collections/nibble-arrays/nibble-arrays-tests.factor
diff --git a/basis/nibble-arrays/nibble-arrays.factor b/collections/nibble-arrays/nibble-arrays.factor
similarity index 100%
rename from basis/nibble-arrays/nibble-arrays.factor
rename to collections/nibble-arrays/nibble-arrays.factor
diff --git a/basis/nibble-arrays/summary.txt b/collections/nibble-arrays/summary.txt
similarity index 100%
rename from basis/nibble-arrays/summary.txt
rename to collections/nibble-arrays/summary.txt
diff --git a/basis/cpu/x86/features/authors.txt b/collections/pairs/authors.txt
similarity index 100%
rename from basis/cpu/x86/features/authors.txt
rename to collections/pairs/authors.txt
diff --git a/extra/pairs/pairs-tests.factor b/collections/pairs/pairs-tests.factor
similarity index 100%
rename from extra/pairs/pairs-tests.factor
rename to collections/pairs/pairs-tests.factor
diff --git a/extra/pairs/pairs.factor b/collections/pairs/pairs.factor
similarity index 100%
rename from extra/pairs/pairs.factor
rename to collections/pairs/pairs.factor
diff --git a/extra/pairs/summary.txt b/collections/pairs/summary.txt
similarity index 100%
rename from extra/pairs/summary.txt
rename to collections/pairs/summary.txt
diff --git a/basis/persistent/assocs/assocs.factor b/collections/persistent/assocs/assocs.factor
similarity index 100%
rename from basis/persistent/assocs/assocs.factor
rename to collections/persistent/assocs/assocs.factor
diff --git a/basis/furnace/auth/features/registration/authors.txt b/collections/persistent/assocs/authors.txt
similarity index 100%
rename from basis/furnace/auth/features/registration/authors.txt
rename to collections/persistent/assocs/authors.txt
diff --git a/basis/persistent/assocs/summary.txt b/collections/persistent/assocs/summary.txt
similarity index 100%
rename from basis/persistent/assocs/summary.txt
rename to collections/persistent/assocs/summary.txt
diff --git a/basis/persistent/deques/tags.txt b/collections/persistent/assocs/tags.txt
similarity index 100%
rename from basis/persistent/deques/tags.txt
rename to collections/persistent/assocs/tags.txt
diff --git a/basis/persistent/deques/authors.txt b/collections/persistent/deques/authors.txt
similarity index 100%
rename from basis/persistent/deques/authors.txt
rename to collections/persistent/deques/authors.txt
diff --git a/basis/persistent/deques/deques-docs.factor b/collections/persistent/deques/deques-docs.factor
similarity index 100%
rename from basis/persistent/deques/deques-docs.factor
rename to collections/persistent/deques/deques-docs.factor
diff --git a/basis/persistent/deques/deques-tests.factor b/collections/persistent/deques/deques-tests.factor
similarity index 100%
rename from basis/persistent/deques/deques-tests.factor
rename to collections/persistent/deques/deques-tests.factor
diff --git a/basis/persistent/deques/deques.factor b/collections/persistent/deques/deques.factor
similarity index 100%
rename from basis/persistent/deques/deques.factor
rename to collections/persistent/deques/deques.factor
diff --git a/basis/persistent/deques/summary.txt b/collections/persistent/deques/summary.txt
similarity index 100%
rename from basis/persistent/deques/summary.txt
rename to collections/persistent/deques/summary.txt
diff --git a/basis/persistent/hashtables/tags.txt b/collections/persistent/deques/tags.txt
similarity index 100%
rename from basis/persistent/hashtables/tags.txt
rename to collections/persistent/deques/tags.txt
diff --git a/basis/furnace/auth/login/authors.txt b/collections/persistent/hashtables/authors.txt
similarity index 100%
rename from basis/furnace/auth/login/authors.txt
rename to collections/persistent/hashtables/authors.txt
diff --git a/basis/persistent/hashtables/config/config.factor b/collections/persistent/hashtables/config/config.factor
similarity index 100%
rename from basis/persistent/hashtables/config/config.factor
rename to collections/persistent/hashtables/config/config.factor
diff --git a/basis/persistent/hashtables/hashtables-tests.factor b/collections/persistent/hashtables/hashtables-tests.factor
similarity index 100%
rename from basis/persistent/hashtables/hashtables-tests.factor
rename to collections/persistent/hashtables/hashtables-tests.factor
diff --git a/basis/persistent/hashtables/hashtables.factor b/collections/persistent/hashtables/hashtables.factor
similarity index 100%
rename from basis/persistent/hashtables/hashtables.factor
rename to collections/persistent/hashtables/hashtables.factor
diff --git a/basis/persistent/hashtables/nodes/bitmap/bitmap.factor b/collections/persistent/hashtables/nodes/bitmap/bitmap.factor
similarity index 100%
rename from basis/persistent/hashtables/nodes/bitmap/bitmap.factor
rename to collections/persistent/hashtables/nodes/bitmap/bitmap.factor
diff --git a/basis/persistent/hashtables/nodes/collision/collision.factor b/collections/persistent/hashtables/nodes/collision/collision.factor
similarity index 100%
rename from basis/persistent/hashtables/nodes/collision/collision.factor
rename to collections/persistent/hashtables/nodes/collision/collision.factor
diff --git a/basis/persistent/hashtables/nodes/empty/empty.factor b/collections/persistent/hashtables/nodes/empty/empty.factor
similarity index 100%
rename from basis/persistent/hashtables/nodes/empty/empty.factor
rename to collections/persistent/hashtables/nodes/empty/empty.factor
diff --git a/basis/persistent/hashtables/nodes/full/full.factor b/collections/persistent/hashtables/nodes/full/full.factor
similarity index 100%
rename from basis/persistent/hashtables/nodes/full/full.factor
rename to collections/persistent/hashtables/nodes/full/full.factor
diff --git a/basis/persistent/hashtables/nodes/leaf/leaf.factor b/collections/persistent/hashtables/nodes/leaf/leaf.factor
similarity index 100%
rename from basis/persistent/hashtables/nodes/leaf/leaf.factor
rename to collections/persistent/hashtables/nodes/leaf/leaf.factor
diff --git a/basis/persistent/hashtables/nodes/nodes.factor b/collections/persistent/hashtables/nodes/nodes.factor
similarity index 100%
rename from basis/persistent/hashtables/nodes/nodes.factor
rename to collections/persistent/hashtables/nodes/nodes.factor
diff --git a/basis/persistent/hashtables/summary.txt b/collections/persistent/hashtables/summary.txt
similarity index 100%
rename from basis/persistent/hashtables/summary.txt
rename to collections/persistent/hashtables/summary.txt
diff --git a/basis/persistent/heaps/tags.txt b/collections/persistent/hashtables/tags.txt
similarity index 100%
rename from basis/persistent/heaps/tags.txt
rename to collections/persistent/hashtables/tags.txt
diff --git a/basis/persistent/heaps/authors.txt b/collections/persistent/heaps/authors.txt
similarity index 100%
rename from basis/persistent/heaps/authors.txt
rename to collections/persistent/heaps/authors.txt
diff --git a/basis/persistent/heaps/heaps-docs.factor b/collections/persistent/heaps/heaps-docs.factor
similarity index 100%
rename from basis/persistent/heaps/heaps-docs.factor
rename to collections/persistent/heaps/heaps-docs.factor
diff --git a/basis/persistent/heaps/heaps-tests.factor b/collections/persistent/heaps/heaps-tests.factor
similarity index 100%
rename from basis/persistent/heaps/heaps-tests.factor
rename to collections/persistent/heaps/heaps-tests.factor
diff --git a/basis/persistent/heaps/heaps.factor b/collections/persistent/heaps/heaps.factor
similarity index 100%
rename from basis/persistent/heaps/heaps.factor
rename to collections/persistent/heaps/heaps.factor
diff --git a/basis/persistent/heaps/summary.txt b/collections/persistent/heaps/summary.txt
similarity index 100%
rename from basis/persistent/heaps/summary.txt
rename to collections/persistent/heaps/summary.txt
diff --git a/basis/persistent/sequences/tags.txt b/collections/persistent/heaps/tags.txt
similarity index 100%
rename from basis/persistent/sequences/tags.txt
rename to collections/persistent/heaps/tags.txt
diff --git a/basis/furnace/auth/login/permits/authors.txt b/collections/persistent/sequences/authors.txt
similarity index 100%
rename from basis/furnace/auth/login/permits/authors.txt
rename to collections/persistent/sequences/authors.txt
diff --git a/basis/persistent/sequences/sequences-docs.factor b/collections/persistent/sequences/sequences-docs.factor
similarity index 100%
rename from basis/persistent/sequences/sequences-docs.factor
rename to collections/persistent/sequences/sequences-docs.factor
diff --git a/basis/persistent/sequences/sequences.factor b/collections/persistent/sequences/sequences.factor
similarity index 100%
rename from basis/persistent/sequences/sequences.factor
rename to collections/persistent/sequences/sequences.factor
diff --git a/basis/persistent/sequences/summary.txt b/collections/persistent/sequences/summary.txt
similarity index 100%
rename from basis/persistent/sequences/summary.txt
rename to collections/persistent/sequences/summary.txt
diff --git a/basis/persistent/vectors/tags.txt b/collections/persistent/sequences/tags.txt
similarity index 100%
rename from basis/persistent/vectors/tags.txt
rename to collections/persistent/sequences/tags.txt
diff --git a/basis/furnace/auth/providers/authors.txt b/collections/persistent/vectors/authors.txt
similarity index 100%
rename from basis/furnace/auth/providers/authors.txt
rename to collections/persistent/vectors/authors.txt
diff --git a/basis/persistent/vectors/summary.txt b/collections/persistent/vectors/summary.txt
similarity index 100%
rename from basis/persistent/vectors/summary.txt
rename to collections/persistent/vectors/summary.txt
diff --git a/basis/search-deques/tags.txt b/collections/persistent/vectors/tags.txt
similarity index 100%
rename from basis/search-deques/tags.txt
rename to collections/persistent/vectors/tags.txt
diff --git a/basis/persistent/vectors/vectors-docs.factor b/collections/persistent/vectors/vectors-docs.factor
similarity index 100%
rename from basis/persistent/vectors/vectors-docs.factor
rename to collections/persistent/vectors/vectors-docs.factor
diff --git a/basis/persistent/vectors/vectors-tests.factor b/collections/persistent/vectors/vectors-tests.factor
similarity index 100%
rename from basis/persistent/vectors/vectors-tests.factor
rename to collections/persistent/vectors/vectors-tests.factor
diff --git a/basis/persistent/vectors/vectors.factor b/collections/persistent/vectors/vectors.factor
similarity index 100%
rename from basis/persistent/vectors/vectors.factor
rename to collections/persistent/vectors/vectors.factor
diff --git a/basis/game/input/dinput/authors.txt b/collections/quadtrees/authors.txt
similarity index 100%
rename from basis/game/input/dinput/authors.txt
rename to collections/quadtrees/authors.txt
diff --git a/extra/quadtrees/quadtrees-docs.factor b/collections/quadtrees/quadtrees-docs.factor
similarity index 100%
rename from extra/quadtrees/quadtrees-docs.factor
rename to collections/quadtrees/quadtrees-docs.factor
diff --git a/extra/quadtrees/quadtrees-tests.factor b/collections/quadtrees/quadtrees-tests.factor
similarity index 100%
rename from extra/quadtrees/quadtrees-tests.factor
rename to collections/quadtrees/quadtrees-tests.factor
diff --git a/extra/quadtrees/quadtrees.factor b/collections/quadtrees/quadtrees.factor
similarity index 100%
rename from extra/quadtrees/quadtrees.factor
rename to collections/quadtrees/quadtrees.factor
diff --git a/extra/quadtrees/summary.txt b/collections/quadtrees/summary.txt
similarity index 100%
rename from extra/quadtrees/summary.txt
rename to collections/quadtrees/summary.txt
diff --git a/extra/quadtrees/tags.txt b/collections/quadtrees/tags.txt
similarity index 100%
rename from extra/quadtrees/tags.txt
rename to collections/quadtrees/tags.txt
diff --git a/basis/furnace/auth/providers/db/authors.txt b/collections/search-deques/authors.txt
similarity index 100%
rename from basis/furnace/auth/providers/db/authors.txt
rename to collections/search-deques/authors.txt
diff --git a/basis/search-deques/search-deques-docs.factor b/collections/search-deques/search-deques-docs.factor
similarity index 100%
rename from basis/search-deques/search-deques-docs.factor
rename to collections/search-deques/search-deques-docs.factor
diff --git a/basis/search-deques/search-deques-tests.factor b/collections/search-deques/search-deques-tests.factor
similarity index 100%
rename from basis/search-deques/search-deques-tests.factor
rename to collections/search-deques/search-deques-tests.factor
diff --git a/basis/search-deques/search-deques.factor b/collections/search-deques/search-deques.factor
similarity index 100%
rename from basis/search-deques/search-deques.factor
rename to collections/search-deques/search-deques.factor
diff --git a/basis/search-deques/summary.txt b/collections/search-deques/summary.txt
similarity index 100%
rename from basis/search-deques/summary.txt
rename to collections/search-deques/summary.txt
diff --git a/basis/sequences/cords/tags.txt b/collections/search-deques/tags.txt
similarity index 100%
rename from basis/sequences/cords/tags.txt
rename to collections/search-deques/tags.txt
diff --git a/extra/sequences/abbrev/abbrev-docs.factor b/collections/sequences/abbrev/abbrev-docs.factor
similarity index 100%
rename from extra/sequences/abbrev/abbrev-docs.factor
rename to collections/sequences/abbrev/abbrev-docs.factor
diff --git a/extra/sequences/abbrev/abbrev-tests.factor b/collections/sequences/abbrev/abbrev-tests.factor
similarity index 100%
rename from extra/sequences/abbrev/abbrev-tests.factor
rename to collections/sequences/abbrev/abbrev-tests.factor
diff --git a/extra/sequences/abbrev/abbrev.factor b/collections/sequences/abbrev/abbrev.factor
similarity index 100%
rename from extra/sequences/abbrev/abbrev.factor
rename to collections/sequences/abbrev/abbrev.factor
diff --git a/extra/sequences/abbrev/authors.txt b/collections/sequences/abbrev/authors.txt
similarity index 100%
rename from extra/sequences/abbrev/authors.txt
rename to collections/sequences/abbrev/authors.txt
diff --git a/basis/game/input/iokit/authors.txt b/collections/sequences/complex-components/authors.txt
similarity index 100%
rename from basis/game/input/iokit/authors.txt
rename to collections/sequences/complex-components/authors.txt
diff --git a/basis/sequences/complex-components/complex-components-docs.factor b/collections/sequences/complex-components/complex-components-docs.factor
similarity index 100%
rename from basis/sequences/complex-components/complex-components-docs.factor
rename to collections/sequences/complex-components/complex-components-docs.factor
diff --git a/basis/sequences/complex-components/complex-components-tests.factor b/collections/sequences/complex-components/complex-components-tests.factor
similarity index 100%
rename from basis/sequences/complex-components/complex-components-tests.factor
rename to collections/sequences/complex-components/complex-components-tests.factor
diff --git a/basis/sequences/complex-components/complex-components.factor b/collections/sequences/complex-components/complex-components.factor
similarity index 100%
rename from basis/sequences/complex-components/complex-components.factor
rename to collections/sequences/complex-components/complex-components.factor
diff --git a/basis/sequences/complex-components/summary.txt b/collections/sequences/complex-components/summary.txt
similarity index 100%
rename from basis/sequences/complex-components/summary.txt
rename to collections/sequences/complex-components/summary.txt
diff --git a/basis/sequences/complex-components/tags.txt b/collections/sequences/complex-components/tags.txt
similarity index 100%
rename from basis/sequences/complex-components/tags.txt
rename to collections/sequences/complex-components/tags.txt
diff --git a/basis/game/input/scancodes/authors.txt b/collections/sequences/complex/authors.txt
similarity index 100%
rename from basis/game/input/scancodes/authors.txt
rename to collections/sequences/complex/authors.txt
diff --git a/basis/sequences/complex/complex-docs.factor b/collections/sequences/complex/complex-docs.factor
similarity index 100%
rename from basis/sequences/complex/complex-docs.factor
rename to collections/sequences/complex/complex-docs.factor
diff --git a/basis/sequences/complex/complex-tests.factor b/collections/sequences/complex/complex-tests.factor
similarity index 100%
rename from basis/sequences/complex/complex-tests.factor
rename to collections/sequences/complex/complex-tests.factor
diff --git a/basis/sequences/complex/complex.factor b/collections/sequences/complex/complex.factor
similarity index 100%
rename from basis/sequences/complex/complex.factor
rename to collections/sequences/complex/complex.factor
diff --git a/basis/sequences/complex/summary.txt b/collections/sequences/complex/summary.txt
similarity index 100%
rename from basis/sequences/complex/summary.txt
rename to collections/sequences/complex/summary.txt
diff --git a/basis/sequences/complex/tags.txt b/collections/sequences/complex/tags.txt
similarity index 100%
rename from basis/sequences/complex/tags.txt
rename to collections/sequences/complex/tags.txt
diff --git a/basis/furnace/authors.txt b/collections/sequences/cords/authors.txt
similarity index 100%
rename from basis/furnace/authors.txt
rename to collections/sequences/cords/authors.txt
diff --git a/basis/sequences/cords/cords-tests.factor b/collections/sequences/cords/cords-tests.factor
similarity index 100%
rename from basis/sequences/cords/cords-tests.factor
rename to collections/sequences/cords/cords-tests.factor
diff --git a/basis/sequences/cords/cords.factor b/collections/sequences/cords/cords.factor
similarity index 100%
rename from basis/sequences/cords/cords.factor
rename to collections/sequences/cords/cords.factor
diff --git a/basis/sequences/cords/summary.txt b/collections/sequences/cords/summary.txt
similarity index 100%
rename from basis/sequences/cords/summary.txt
rename to collections/sequences/cords/summary.txt
diff --git a/basis/sequences/deep/tags.txt b/collections/sequences/cords/tags.txt
similarity index 100%
rename from basis/sequences/deep/tags.txt
rename to collections/sequences/cords/tags.txt
diff --git a/basis/sequences/deep/authors.txt b/collections/sequences/deep/authors.txt
similarity index 100%
rename from basis/sequences/deep/authors.txt
rename to collections/sequences/deep/authors.txt
diff --git a/basis/sequences/deep/deep-docs.factor b/collections/sequences/deep/deep-docs.factor
similarity index 100%
rename from basis/sequences/deep/deep-docs.factor
rename to collections/sequences/deep/deep-docs.factor
diff --git a/basis/sequences/deep/deep-tests.factor b/collections/sequences/deep/deep-tests.factor
similarity index 100%
rename from basis/sequences/deep/deep-tests.factor
rename to collections/sequences/deep/deep-tests.factor
diff --git a/basis/sequences/deep/deep.factor b/collections/sequences/deep/deep.factor
similarity index 100%
rename from basis/sequences/deep/deep.factor
rename to collections/sequences/deep/deep.factor
diff --git a/basis/sequences/deep/summary.txt b/collections/sequences/deep/summary.txt
similarity index 100%
rename from basis/sequences/deep/summary.txt
rename to collections/sequences/deep/summary.txt
diff --git a/basis/sequences/merged/tags.txt b/collections/sequences/deep/tags.txt
similarity index 100%
rename from basis/sequences/merged/tags.txt
rename to collections/sequences/deep/tags.txt
diff --git a/extra/sequences/extras/extras-docs.factor b/collections/sequences/extras/extras-docs.factor
similarity index 100%
rename from extra/sequences/extras/extras-docs.factor
rename to collections/sequences/extras/extras-docs.factor
diff --git a/extra/sequences/extras/extras-tests.factor b/collections/sequences/extras/extras-tests.factor
similarity index 100%
rename from extra/sequences/extras/extras-tests.factor
rename to collections/sequences/extras/extras-tests.factor
diff --git a/extra/sequences/extras/extras.factor b/collections/sequences/extras/extras.factor
similarity index 100%
rename from extra/sequences/extras/extras.factor
rename to collections/sequences/extras/extras.factor
diff --git a/extra/sequences/extras/summary.txt b/collections/sequences/extras/summary.txt
similarity index 100%
rename from extra/sequences/extras/summary.txt
rename to collections/sequences/extras/summary.txt
diff --git a/extra/sequences/extras/tags.txt b/collections/sequences/extras/tags.txt
similarity index 100%
rename from extra/sequences/extras/tags.txt
rename to collections/sequences/extras/tags.txt
diff --git a/basis/webbrowser/authors.txt b/collections/sequences/frozen/authors.txt
similarity index 100%
rename from basis/webbrowser/authors.txt
rename to collections/sequences/frozen/authors.txt
diff --git a/extra/sequences/frozen/frozen-tests.factor b/collections/sequences/frozen/frozen-tests.factor
similarity index 100%
rename from extra/sequences/frozen/frozen-tests.factor
rename to collections/sequences/frozen/frozen-tests.factor
diff --git a/extra/sequences/frozen/frozen.factor b/collections/sequences/frozen/frozen.factor
similarity index 100%
rename from extra/sequences/frozen/frozen.factor
rename to collections/sequences/frozen/frozen.factor
diff --git a/extra/sequences/frozen/summary.txt b/collections/sequences/frozen/summary.txt
similarity index 100%
rename from extra/sequences/frozen/summary.txt
rename to collections/sequences/frozen/summary.txt
diff --git a/basis/opengl/debug/authors.txt b/collections/sequences/inserters/authors.txt
similarity index 100%
rename from basis/opengl/debug/authors.txt
rename to collections/sequences/inserters/authors.txt
diff --git a/extra/sequences/inserters/inserters-tests.factor b/collections/sequences/inserters/inserters-tests.factor
similarity index 100%
rename from extra/sequences/inserters/inserters-tests.factor
rename to collections/sequences/inserters/inserters-tests.factor
diff --git a/extra/sequences/inserters/inserters.factor b/collections/sequences/inserters/inserters.factor
similarity index 100%
rename from extra/sequences/inserters/inserters.factor
rename to collections/sequences/inserters/inserters.factor
diff --git a/extra/sequences/inserters/summary.txt b/collections/sequences/inserters/summary.txt
similarity index 100%
rename from extra/sequences/inserters/summary.txt
rename to collections/sequences/inserters/summary.txt
diff --git a/basis/sequences/merged/authors.txt b/collections/sequences/merged/authors.txt
similarity index 100%
rename from basis/sequences/merged/authors.txt
rename to collections/sequences/merged/authors.txt
diff --git a/basis/sequences/merged/merged-docs.factor b/collections/sequences/merged/merged-docs.factor
similarity index 100%
rename from basis/sequences/merged/merged-docs.factor
rename to collections/sequences/merged/merged-docs.factor
diff --git a/basis/sequences/merged/merged-tests.factor b/collections/sequences/merged/merged-tests.factor
similarity index 100%
rename from basis/sequences/merged/merged-tests.factor
rename to collections/sequences/merged/merged-tests.factor
diff --git a/basis/sequences/merged/merged.factor b/collections/sequences/merged/merged.factor
similarity index 100%
rename from basis/sequences/merged/merged.factor
rename to collections/sequences/merged/merged.factor
diff --git a/basis/sequences/merged/summary.txt b/collections/sequences/merged/summary.txt
similarity index 100%
rename from basis/sequences/merged/summary.txt
rename to collections/sequences/merged/summary.txt
diff --git a/basis/specialized-arrays/tags.txt b/collections/sequences/merged/tags.txt
similarity index 100%
rename from basis/specialized-arrays/tags.txt
rename to collections/sequences/merged/tags.txt
diff --git a/extra/sequences/modified/modified-tests.factor b/collections/sequences/modified/modified-tests.factor
similarity index 100%
rename from extra/sequences/modified/modified-tests.factor
rename to collections/sequences/modified/modified-tests.factor
diff --git a/extra/sequences/modified/modified.factor b/collections/sequences/modified/modified.factor
similarity index 100%
rename from extra/sequences/modified/modified.factor
rename to collections/sequences/modified/modified.factor
diff --git a/basis/specialized-vectors/tags.txt b/collections/sequences/modified/tags.txt
similarity index 100%
rename from basis/specialized-vectors/tags.txt
rename to collections/sequences/modified/tags.txt
diff --git a/basis/opengl/gl/windows/authors.txt b/collections/sequences/n-based/authors.txt
similarity index 100%
rename from basis/opengl/gl/windows/authors.txt
rename to collections/sequences/n-based/authors.txt
diff --git a/extra/sequences/n-based/n-based-docs.factor b/collections/sequences/n-based/n-based-docs.factor
similarity index 100%
rename from extra/sequences/n-based/n-based-docs.factor
rename to collections/sequences/n-based/n-based-docs.factor
diff --git a/extra/sequences/n-based/n-based-tests.factor b/collections/sequences/n-based/n-based-tests.factor
similarity index 100%
rename from extra/sequences/n-based/n-based-tests.factor
rename to collections/sequences/n-based/n-based-tests.factor
diff --git a/extra/sequences/n-based/n-based.factor b/collections/sequences/n-based/n-based.factor
similarity index 100%
rename from extra/sequences/n-based/n-based.factor
rename to collections/sequences/n-based/n-based.factor
diff --git a/extra/sequences/n-based/summary.txt b/collections/sequences/n-based/summary.txt
similarity index 100%
rename from extra/sequences/n-based/summary.txt
rename to collections/sequences/n-based/summary.txt
diff --git a/extra/sequences/n-based/tags.txt b/collections/sequences/n-based/tags.txt
similarity index 100%
rename from extra/sequences/n-based/tags.txt
rename to collections/sequences/n-based/tags.txt
diff --git a/basis/sequences/parser/authors.txt b/collections/sequences/parser/authors.txt
similarity index 100%
rename from basis/sequences/parser/authors.txt
rename to collections/sequences/parser/authors.txt
diff --git a/basis/sequences/parser/parser-tests.factor b/collections/sequences/parser/parser-tests.factor
similarity index 100%
rename from basis/sequences/parser/parser-tests.factor
rename to collections/sequences/parser/parser-tests.factor
diff --git a/basis/sequences/parser/parser.factor b/collections/sequences/parser/parser.factor
similarity index 100%
rename from basis/sequences/parser/parser.factor
rename to collections/sequences/parser/parser.factor
diff --git a/basis/opengl/gl/x11/authors.txt b/collections/sequences/product/authors.txt
similarity index 100%
rename from basis/opengl/gl/x11/authors.txt
rename to collections/sequences/product/authors.txt
diff --git a/basis/sequences/product/product-docs.factor b/collections/sequences/product/product-docs.factor
similarity index 100%
rename from basis/sequences/product/product-docs.factor
rename to collections/sequences/product/product-docs.factor
diff --git a/basis/sequences/product/product-tests.factor b/collections/sequences/product/product-tests.factor
similarity index 100%
rename from basis/sequences/product/product-tests.factor
rename to collections/sequences/product/product-tests.factor
diff --git a/basis/sequences/product/product.factor b/collections/sequences/product/product.factor
similarity index 100%
rename from basis/sequences/product/product.factor
rename to collections/sequences/product/product.factor
diff --git a/basis/sequences/product/summary.txt b/collections/sequences/product/summary.txt
similarity index 100%
rename from basis/sequences/product/summary.txt
rename to collections/sequences/product/summary.txt
diff --git a/extra/digraphs/authors.txt b/collections/sequences/repeating/authors.txt
similarity index 100%
rename from extra/digraphs/authors.txt
rename to collections/sequences/repeating/authors.txt
diff --git a/extra/sequences/repeating/repeating-tests.factor b/collections/sequences/repeating/repeating-tests.factor
similarity index 100%
rename from extra/sequences/repeating/repeating-tests.factor
rename to collections/sequences/repeating/repeating-tests.factor
diff --git a/extra/sequences/repeating/repeating.factor b/collections/sequences/repeating/repeating.factor
similarity index 100%
rename from extra/sequences/repeating/repeating.factor
rename to collections/sequences/repeating/repeating.factor
diff --git a/basis/suffix-arrays/tags.txt b/collections/sequences/repeating/tags.txt
similarity index 100%
rename from basis/suffix-arrays/tags.txt
rename to collections/sequences/repeating/tags.txt
diff --git a/extra/backticks/authors.txt b/collections/sequences/rotated/authors.txt
similarity index 100%
rename from extra/backticks/authors.txt
rename to collections/sequences/rotated/authors.txt
diff --git a/extra/sequences/rotated/rotated-tests.factor b/collections/sequences/rotated/rotated-tests.factor
similarity index 100%
rename from extra/sequences/rotated/rotated-tests.factor
rename to collections/sequences/rotated/rotated-tests.factor
diff --git a/extra/sequences/rotated/rotated.factor b/collections/sequences/rotated/rotated.factor
similarity index 100%
rename from extra/sequences/rotated/rotated.factor
rename to collections/sequences/rotated/rotated.factor
diff --git a/extra/sequences/rotated/summary.txt b/collections/sequences/rotated/summary.txt
similarity index 100%
rename from extra/sequences/rotated/summary.txt
rename to collections/sequences/rotated/summary.txt
diff --git a/extra/curl/authors.txt b/collections/sequences/shifted/authors.txt
similarity index 100%
rename from extra/curl/authors.txt
rename to collections/sequences/shifted/authors.txt
diff --git a/extra/sequences/shifted/shifted-tests.factor b/collections/sequences/shifted/shifted-tests.factor
similarity index 100%
rename from extra/sequences/shifted/shifted-tests.factor
rename to collections/sequences/shifted/shifted-tests.factor
diff --git a/extra/sequences/shifted/shifted.factor b/collections/sequences/shifted/shifted.factor
similarity index 100%
rename from extra/sequences/shifted/shifted.factor
rename to collections/sequences/shifted/shifted.factor
diff --git a/extra/sequences/shifted/summary.txt b/collections/sequences/shifted/summary.txt
similarity index 100%
rename from extra/sequences/shifted/summary.txt
rename to collections/sequences/shifted/summary.txt
diff --git a/extra/echo-server/authors.txt b/collections/sequences/snipped/authors.txt
similarity index 100%
rename from extra/echo-server/authors.txt
rename to collections/sequences/snipped/authors.txt
diff --git a/extra/sequences/snipped/snipped-tests.factor b/collections/sequences/snipped/snipped-tests.factor
similarity index 100%
rename from extra/sequences/snipped/snipped-tests.factor
rename to collections/sequences/snipped/snipped-tests.factor
diff --git a/extra/sequences/snipped/snipped.factor b/collections/sequences/snipped/snipped.factor
similarity index 100%
rename from extra/sequences/snipped/snipped.factor
rename to collections/sequences/snipped/snipped.factor
diff --git a/extra/sequences/snipped/summary.txt b/collections/sequences/snipped/summary.txt
similarity index 100%
rename from extra/sequences/snipped/summary.txt
rename to collections/sequences/snipped/summary.txt
diff --git a/basis/cpu/x86/assembler/authors.txt b/collections/sequences/squish/authors.txt
similarity index 100%
rename from basis/cpu/x86/assembler/authors.txt
rename to collections/sequences/squish/authors.txt
diff --git a/extra/sequences/squish/squish-tests.factor b/collections/sequences/squish/squish-tests.factor
similarity index 100%
rename from extra/sequences/squish/squish-tests.factor
rename to collections/sequences/squish/squish-tests.factor
diff --git a/extra/sequences/squish/squish.factor b/collections/sequences/squish/squish.factor
similarity index 100%
rename from extra/sequences/squish/squish.factor
rename to collections/sequences/squish/squish.factor
diff --git a/extra/sequences/squish/summary.txt b/collections/sequences/squish/summary.txt
similarity index 100%
rename from extra/sequences/squish/summary.txt
rename to collections/sequences/squish/summary.txt
diff --git a/extra/sequences/squish/tags.txt b/collections/sequences/squish/tags.txt
similarity index 100%
rename from extra/sequences/squish/tags.txt
rename to collections/sequences/squish/tags.txt
diff --git a/basis/opengl/gl3/authors.txt b/collections/sequences/unrolled/authors.txt
similarity index 100%
rename from basis/opengl/gl3/authors.txt
rename to collections/sequences/unrolled/authors.txt
diff --git a/basis/sequences/unrolled/summary.txt b/collections/sequences/unrolled/summary.txt
similarity index 100%
rename from basis/sequences/unrolled/summary.txt
rename to collections/sequences/unrolled/summary.txt
diff --git a/basis/sequences/unrolled/unrolled-docs.factor b/collections/sequences/unrolled/unrolled-docs.factor
similarity index 100%
rename from basis/sequences/unrolled/unrolled-docs.factor
rename to collections/sequences/unrolled/unrolled-docs.factor
diff --git a/basis/sequences/unrolled/unrolled-tests.factor b/collections/sequences/unrolled/unrolled-tests.factor
similarity index 100%
rename from basis/sequences/unrolled/unrolled-tests.factor
rename to collections/sequences/unrolled/unrolled-tests.factor
diff --git a/basis/sequences/unrolled/unrolled.factor b/collections/sequences/unrolled/unrolled.factor
similarity index 100%
rename from basis/sequences/unrolled/unrolled.factor
rename to collections/sequences/unrolled/unrolled.factor
diff --git a/basis/sequences/windowed/windowed-docs.factor b/collections/sequences/windowed/windowed-docs.factor
similarity index 100%
rename from basis/sequences/windowed/windowed-docs.factor
rename to collections/sequences/windowed/windowed-docs.factor
diff --git a/basis/sequences/windowed/windowed-tests.factor b/collections/sequences/windowed/windowed-tests.factor
similarity index 100%
rename from basis/sequences/windowed/windowed-tests.factor
rename to collections/sequences/windowed/windowed-tests.factor
diff --git a/basis/sequences/windowed/windowed.factor b/collections/sequences/windowed/windowed.factor
similarity index 100%
rename from basis/sequences/windowed/windowed.factor
rename to collections/sequences/windowed/windowed.factor
diff --git a/extra/fftw/authors.txt b/collections/sequences/zipped/authors.txt
similarity index 100%
rename from extra/fftw/authors.txt
rename to collections/sequences/zipped/authors.txt
diff --git a/extra/sequences/zipped/summary.txt b/collections/sequences/zipped/summary.txt
similarity index 100%
rename from extra/sequences/zipped/summary.txt
rename to collections/sequences/zipped/summary.txt
diff --git a/extra/sequences/zipped/zipped-tests.factor b/collections/sequences/zipped/zipped-tests.factor
similarity index 100%
rename from extra/sequences/zipped/zipped-tests.factor
rename to collections/sequences/zipped/zipped-tests.factor
diff --git a/extra/sequences/zipped/zipped.factor b/collections/sequences/zipped/zipped.factor
similarity index 100%
rename from extra/sequences/zipped/zipped.factor
rename to collections/sequences/zipped/zipped.factor
diff --git a/basis/furnace/boilerplate/authors.txt b/collections/specialized-arrays/authors.txt
similarity index 100%
rename from basis/furnace/boilerplate/authors.txt
rename to collections/specialized-arrays/authors.txt
diff --git a/basis/specialized-arrays/mirrors/mirrors.factor b/collections/specialized-arrays/mirrors/mirrors.factor
similarity index 100%
rename from basis/specialized-arrays/mirrors/mirrors.factor
rename to collections/specialized-arrays/mirrors/mirrors.factor
diff --git a/basis/specialized-arrays/prettyprint/prettyprint.factor b/collections/specialized-arrays/prettyprint/prettyprint.factor
similarity index 100%
rename from basis/specialized-arrays/prettyprint/prettyprint.factor
rename to collections/specialized-arrays/prettyprint/prettyprint.factor
diff --git a/basis/specialized-arrays/specialized-arrays-docs.factor b/collections/specialized-arrays/specialized-arrays-docs.factor
similarity index 100%
rename from basis/specialized-arrays/specialized-arrays-docs.factor
rename to collections/specialized-arrays/specialized-arrays-docs.factor
diff --git a/basis/specialized-arrays/specialized-arrays-tests.factor b/collections/specialized-arrays/specialized-arrays-tests.factor
similarity index 100%
rename from basis/specialized-arrays/specialized-arrays-tests.factor
rename to collections/specialized-arrays/specialized-arrays-tests.factor
diff --git a/basis/specialized-arrays/specialized-arrays.factor b/collections/specialized-arrays/specialized-arrays.factor
similarity index 100%
rename from basis/specialized-arrays/specialized-arrays.factor
rename to collections/specialized-arrays/specialized-arrays.factor
diff --git a/basis/specialized-arrays/summary.txt b/collections/specialized-arrays/summary.txt
similarity index 100%
rename from basis/specialized-arrays/summary.txt
rename to collections/specialized-arrays/summary.txt
diff --git a/extra/digraphs/tags.txt b/collections/specialized-arrays/tags.txt
similarity index 100%
rename from extra/digraphs/tags.txt
rename to collections/specialized-arrays/tags.txt
diff --git a/basis/furnace/cache/authors.txt b/collections/specialized-vectors/authors.txt
similarity index 100%
rename from basis/furnace/cache/authors.txt
rename to collections/specialized-vectors/authors.txt
diff --git a/basis/furnace/chloe-tags/authors.txt b/collections/specialized-vectors/mirrors/authors.txt
similarity index 100%
rename from basis/furnace/chloe-tags/authors.txt
rename to collections/specialized-vectors/mirrors/authors.txt
diff --git a/basis/specialized-vectors/mirrors/mirrors.factor b/collections/specialized-vectors/mirrors/mirrors.factor
similarity index 100%
rename from basis/specialized-vectors/mirrors/mirrors.factor
rename to collections/specialized-vectors/mirrors/mirrors.factor
diff --git a/basis/specialized-vectors/specialized-vectors-docs.factor b/collections/specialized-vectors/specialized-vectors-docs.factor
similarity index 100%
rename from basis/specialized-vectors/specialized-vectors-docs.factor
rename to collections/specialized-vectors/specialized-vectors-docs.factor
diff --git a/basis/specialized-vectors/specialized-vectors-tests.factor b/collections/specialized-vectors/specialized-vectors-tests.factor
similarity index 100%
rename from basis/specialized-vectors/specialized-vectors-tests.factor
rename to collections/specialized-vectors/specialized-vectors-tests.factor
diff --git a/basis/specialized-vectors/specialized-vectors.factor b/collections/specialized-vectors/specialized-vectors.factor
similarity index 100%
rename from basis/specialized-vectors/specialized-vectors.factor
rename to collections/specialized-vectors/specialized-vectors.factor
diff --git a/basis/specialized-vectors/summary.txt b/collections/specialized-vectors/summary.txt
similarity index 100%
rename from basis/specialized-vectors/summary.txt
rename to collections/specialized-vectors/summary.txt
diff --git a/extra/sequences/modified/tags.txt b/collections/specialized-vectors/tags.txt
similarity index 100%
rename from extra/sequences/modified/tags.txt
rename to collections/specialized-vectors/tags.txt
diff --git a/basis/ui/backend/windows/authors.txt b/collections/splitting/monotonic/authors.txt
similarity index 100%
rename from basis/ui/backend/windows/authors.txt
rename to collections/splitting/monotonic/authors.txt
diff --git a/basis/splitting/monotonic/monotonic-docs.factor b/collections/splitting/monotonic/monotonic-docs.factor
similarity index 100%
rename from basis/splitting/monotonic/monotonic-docs.factor
rename to collections/splitting/monotonic/monotonic-docs.factor
diff --git a/basis/splitting/monotonic/monotonic-tests.factor b/collections/splitting/monotonic/monotonic-tests.factor
similarity index 100%
rename from basis/splitting/monotonic/monotonic-tests.factor
rename to collections/splitting/monotonic/monotonic-tests.factor
diff --git a/basis/splitting/monotonic/monotonic.factor b/collections/splitting/monotonic/monotonic.factor
similarity index 100%
rename from basis/splitting/monotonic/monotonic.factor
rename to collections/splitting/monotonic/monotonic.factor
diff --git a/basis/splitting/monotonic/summary.txt b/collections/splitting/monotonic/summary.txt
similarity index 100%
rename from basis/splitting/monotonic/summary.txt
rename to collections/splitting/monotonic/summary.txt
diff --git a/basis/splitting/monotonic/tags.txt b/collections/splitting/monotonic/tags.txt
similarity index 100%
rename from basis/splitting/monotonic/tags.txt
rename to collections/splitting/monotonic/tags.txt
diff --git a/basis/documents/elements/authors.txt b/collections/strings/tables/authors.txt
similarity index 100%
rename from basis/documents/elements/authors.txt
rename to collections/strings/tables/authors.txt
diff --git a/basis/strings/tables/tables-tests.factor b/collections/strings/tables/tables-tests.factor
similarity index 100%
rename from basis/strings/tables/tables-tests.factor
rename to collections/strings/tables/tables-tests.factor
diff --git a/basis/strings/tables/tables.factor b/collections/strings/tables/tables.factor
similarity index 100%
rename from basis/strings/tables/tables.factor
rename to collections/strings/tables/tables.factor
diff --git a/basis/suffix-arrays/authors.txt b/collections/suffix-arrays/authors.txt
similarity index 100%
rename from basis/suffix-arrays/authors.txt
rename to collections/suffix-arrays/authors.txt
diff --git a/basis/suffix-arrays/suffix-arrays-docs.factor b/collections/suffix-arrays/suffix-arrays-docs.factor
similarity index 100%
rename from basis/suffix-arrays/suffix-arrays-docs.factor
rename to collections/suffix-arrays/suffix-arrays-docs.factor
diff --git a/basis/suffix-arrays/suffix-arrays-tests.factor b/collections/suffix-arrays/suffix-arrays-tests.factor
similarity index 100%
rename from basis/suffix-arrays/suffix-arrays-tests.factor
rename to collections/suffix-arrays/suffix-arrays-tests.factor
diff --git a/basis/suffix-arrays/suffix-arrays.factor b/collections/suffix-arrays/suffix-arrays.factor
similarity index 100%
rename from basis/suffix-arrays/suffix-arrays.factor
rename to collections/suffix-arrays/suffix-arrays.factor
diff --git a/basis/suffix-arrays/summary.txt b/collections/suffix-arrays/summary.txt
similarity index 100%
rename from basis/suffix-arrays/summary.txt
rename to collections/suffix-arrays/summary.txt
diff --git a/extra/sequences/repeating/tags.txt b/collections/suffix-arrays/tags.txt
similarity index 100%
rename from extra/sequences/repeating/tags.txt
rename to collections/suffix-arrays/tags.txt
diff --git a/extra/trees/authors.txt b/collections/trees/authors.txt
similarity index 100%
rename from extra/trees/authors.txt
rename to collections/trees/authors.txt
diff --git a/extra/trees/avl/authors.txt b/collections/trees/avl/authors.txt
similarity index 100%
rename from extra/trees/avl/authors.txt
rename to collections/trees/avl/authors.txt
diff --git a/extra/trees/avl/avl-docs.factor b/collections/trees/avl/avl-docs.factor
similarity index 100%
rename from extra/trees/avl/avl-docs.factor
rename to collections/trees/avl/avl-docs.factor
diff --git a/extra/trees/avl/avl-tests.factor b/collections/trees/avl/avl-tests.factor
similarity index 100%
rename from extra/trees/avl/avl-tests.factor
rename to collections/trees/avl/avl-tests.factor
diff --git a/extra/trees/avl/avl.factor b/collections/trees/avl/avl.factor
similarity index 100%
rename from extra/trees/avl/avl.factor
rename to collections/trees/avl/avl.factor
diff --git a/extra/trees/avl/summary.txt b/collections/trees/avl/summary.txt
similarity index 100%
rename from extra/trees/avl/summary.txt
rename to collections/trees/avl/summary.txt
diff --git a/extra/trees/avl/tags.txt b/collections/trees/avl/tags.txt
similarity index 100%
rename from extra/trees/avl/tags.txt
rename to collections/trees/avl/tags.txt
diff --git a/extra/trees/splay/authors.txt b/collections/trees/splay/authors.txt
similarity index 100%
rename from extra/trees/splay/authors.txt
rename to collections/trees/splay/authors.txt
diff --git a/extra/trees/splay/splay-docs.factor b/collections/trees/splay/splay-docs.factor
similarity index 100%
rename from extra/trees/splay/splay-docs.factor
rename to collections/trees/splay/splay-docs.factor
diff --git a/extra/trees/splay/splay-tests.factor b/collections/trees/splay/splay-tests.factor
similarity index 100%
rename from extra/trees/splay/splay-tests.factor
rename to collections/trees/splay/splay-tests.factor
diff --git a/extra/trees/splay/splay.factor b/collections/trees/splay/splay.factor
similarity index 100%
rename from extra/trees/splay/splay.factor
rename to collections/trees/splay/splay.factor
diff --git a/extra/trees/splay/summary.txt b/collections/trees/splay/summary.txt
similarity index 100%
rename from extra/trees/splay/summary.txt
rename to collections/trees/splay/summary.txt
diff --git a/extra/trees/splay/tags.txt b/collections/trees/splay/tags.txt
similarity index 100%
rename from extra/trees/splay/tags.txt
rename to collections/trees/splay/tags.txt
diff --git a/extra/trees/summary.txt b/collections/trees/summary.txt
similarity index 100%
rename from extra/trees/summary.txt
rename to collections/trees/summary.txt
diff --git a/extra/trees/tags.txt b/collections/trees/tags.txt
similarity index 100%
rename from extra/trees/tags.txt
rename to collections/trees/tags.txt
diff --git a/extra/trees/trees-docs.factor b/collections/trees/trees-docs.factor
similarity index 100%
rename from extra/trees/trees-docs.factor
rename to collections/trees/trees-docs.factor
diff --git a/extra/trees/trees-tests.factor b/collections/trees/trees-tests.factor
similarity index 100%
rename from extra/trees/trees-tests.factor
rename to collections/trees/trees-tests.factor
diff --git a/extra/trees/trees.factor b/collections/trees/trees.factor
similarity index 100%
rename from extra/trees/trees.factor
rename to collections/trees/trees.factor
diff --git a/basis/unrolled-lists/summary.txt b/collections/unrolled-lists/summary.txt
similarity index 100%
rename from basis/unrolled-lists/summary.txt
rename to collections/unrolled-lists/summary.txt
diff --git a/basis/unrolled-lists/unrolled-lists-docs.factor b/collections/unrolled-lists/unrolled-lists-docs.factor
similarity index 100%
rename from basis/unrolled-lists/unrolled-lists-docs.factor
rename to collections/unrolled-lists/unrolled-lists-docs.factor
diff --git a/basis/unrolled-lists/unrolled-lists-tests.factor b/collections/unrolled-lists/unrolled-lists-tests.factor
similarity index 100%
rename from basis/unrolled-lists/unrolled-lists-tests.factor
rename to collections/unrolled-lists/unrolled-lists-tests.factor
diff --git a/basis/unrolled-lists/unrolled-lists.factor b/collections/unrolled-lists/unrolled-lists.factor
similarity index 100%
rename from basis/unrolled-lists/unrolled-lists.factor
rename to collections/unrolled-lists/unrolled-lists.factor
diff --git a/basis/vectors/functor/functor.factor b/collections/vectors/functor/functor.factor
similarity index 100%
rename from basis/vectors/functor/functor.factor
rename to collections/vectors/functor/functor.factor
diff --git a/basis/vlists/summary.txt b/collections/vlists/summary.txt
similarity index 100%
rename from basis/vlists/summary.txt
rename to collections/vlists/summary.txt
diff --git a/basis/vlists/vlists-tests.factor b/collections/vlists/vlists-tests.factor
similarity index 100%
rename from basis/vlists/vlists-tests.factor
rename to collections/vlists/vlists-tests.factor
diff --git a/basis/vlists/vlists.factor b/collections/vlists/vlists.factor
similarity index 100%
rename from basis/vlists/vlists.factor
rename to collections/vlists/vlists.factor
diff --git a/extra/boids/authors.txt b/demos/boids/authors.txt
similarity index 100%
rename from extra/boids/authors.txt
rename to demos/boids/authors.txt
diff --git a/extra/boids/boids.factor b/demos/boids/boids.factor
similarity index 100%
rename from extra/boids/boids.factor
rename to demos/boids/boids.factor
diff --git a/extra/boids/simulation/authors.txt b/demos/boids/simulation/authors.txt
similarity index 100%
rename from extra/boids/simulation/authors.txt
rename to demos/boids/simulation/authors.txt
diff --git a/extra/boids/simulation/simulation.factor b/demos/boids/simulation/simulation.factor
similarity index 100%
rename from extra/boids/simulation/simulation.factor
rename to demos/boids/simulation/simulation.factor
diff --git a/extra/boids/summary.txt b/demos/boids/summary.txt
similarity index 100%
rename from extra/boids/summary.txt
rename to demos/boids/summary.txt
diff --git a/extra/boids/tags.txt b/demos/boids/tags.txt
similarity index 100%
rename from extra/boids/tags.txt
rename to demos/boids/tags.txt
diff --git a/basis/cpu/x86/assembler/operands/authors.txt b/demos/bunny/authors.txt
similarity index 100%
rename from basis/cpu/x86/assembler/operands/authors.txt
rename to demos/bunny/authors.txt
diff --git a/extra/bunny/bun_zipper.ply b/demos/bunny/bun_zipper.ply
similarity index 100%
rename from extra/bunny/bun_zipper.ply
rename to demos/bunny/bun_zipper.ply
diff --git a/extra/bunny/bunny.factor b/demos/bunny/bunny.factor
similarity index 100%
rename from extra/bunny/bunny.factor
rename to demos/bunny/bunny.factor
diff --git a/extra/bunny/cel-shaded/cel-shaded.factor b/demos/bunny/cel-shaded/cel-shaded.factor
similarity index 100%
rename from extra/bunny/cel-shaded/cel-shaded.factor
rename to demos/bunny/cel-shaded/cel-shaded.factor
diff --git a/extra/bunny/deploy.factor b/demos/bunny/deploy.factor
similarity index 100%
rename from extra/bunny/deploy.factor
rename to demos/bunny/deploy.factor
diff --git a/extra/bunny/fixed-pipeline/fixed-pipeline.factor b/demos/bunny/fixed-pipeline/fixed-pipeline.factor
similarity index 100%
rename from extra/bunny/fixed-pipeline/fixed-pipeline.factor
rename to demos/bunny/fixed-pipeline/fixed-pipeline.factor
diff --git a/extra/bunny/model/model.factor b/demos/bunny/model/model.factor
similarity index 100%
rename from extra/bunny/model/model.factor
rename to demos/bunny/model/model.factor
diff --git a/extra/bunny/outlined/outlined.factor b/demos/bunny/outlined/outlined.factor
similarity index 100%
rename from extra/bunny/outlined/outlined.factor
rename to demos/bunny/outlined/outlined.factor
diff --git a/extra/bunny/summary.txt b/demos/bunny/summary.txt
similarity index 100%
rename from extra/bunny/summary.txt
rename to demos/bunny/summary.txt
diff --git a/extra/bunny/tags.txt b/demos/bunny/tags.txt
similarity index 100%
rename from extra/bunny/tags.txt
rename to demos/bunny/tags.txt
diff --git a/basis/help/home/authors.txt b/demos/color-table/authors.txt
similarity index 100%
rename from basis/help/home/authors.txt
rename to demos/color-table/authors.txt
diff --git a/extra/color-table/color-table-tests.factor b/demos/color-table/color-table-tests.factor
similarity index 100%
rename from extra/color-table/color-table-tests.factor
rename to demos/color-table/color-table-tests.factor
diff --git a/extra/color-table/color-table.factor b/demos/color-table/color-table.factor
similarity index 100%
rename from extra/color-table/color-table.factor
rename to demos/color-table/color-table.factor
diff --git a/extra/color-picker/tags.txt b/demos/color-table/tags.txt
similarity index 100%
rename from extra/color-picker/tags.txt
rename to demos/color-table/tags.txt
diff --git a/basis/furnace/conversations/authors.txt b/demos/hello-ui/authors.txt
similarity index 100%
rename from basis/furnace/conversations/authors.txt
rename to demos/hello-ui/authors.txt
diff --git a/extra/hello-ui/deploy.factor b/demos/hello-ui/deploy.factor
similarity index 100%
rename from extra/hello-ui/deploy.factor
rename to demos/hello-ui/deploy.factor
diff --git a/extra/hello-ui/hello-ui.factor b/demos/hello-ui/hello-ui.factor
similarity index 100%
rename from extra/hello-ui/hello-ui.factor
rename to demos/hello-ui/hello-ui.factor
diff --git a/extra/hello-ui/summary.txt b/demos/hello-ui/summary.txt
similarity index 100%
rename from extra/hello-ui/summary.txt
rename to demos/hello-ui/summary.txt
diff --git a/extra/color-table/tags.txt b/demos/hello-ui/tags.txt
similarity index 100%
rename from extra/color-table/tags.txt
rename to demos/hello-ui/tags.txt
diff --git a/extra/hello-unicode/authors.txt b/demos/hello-unicode/authors.txt
similarity index 100%
rename from extra/hello-unicode/authors.txt
rename to demos/hello-unicode/authors.txt
diff --git a/extra/hello-unicode/deploy.factor b/demos/hello-unicode/deploy.factor
similarity index 100%
rename from extra/hello-unicode/deploy.factor
rename to demos/hello-unicode/deploy.factor
diff --git a/extra/hello-unicode/hello-unicode-tests.factor b/demos/hello-unicode/hello-unicode-tests.factor
similarity index 100%
rename from extra/hello-unicode/hello-unicode-tests.factor
rename to demos/hello-unicode/hello-unicode-tests.factor
diff --git a/extra/hello-unicode/hello-unicode.factor b/demos/hello-unicode/hello-unicode.factor
similarity index 100%
rename from extra/hello-unicode/hello-unicode.factor
rename to demos/hello-unicode/hello-unicode.factor
diff --git a/extra/hello-unicode/summary.txt b/demos/hello-unicode/summary.txt
similarity index 100%
rename from extra/hello-unicode/summary.txt
rename to demos/hello-unicode/summary.txt
diff --git a/extra/gpu/demos/bunny/tags.txt b/demos/hello-unicode/tags.txt
similarity index 100%
rename from extra/gpu/demos/bunny/tags.txt
rename to demos/hello-unicode/tags.txt
diff --git a/basis/furnace/db/authors.txt b/demos/hello-world/authors.txt
similarity index 100%
rename from basis/furnace/db/authors.txt
rename to demos/hello-world/authors.txt
diff --git a/extra/hello-world/deploy.factor b/demos/hello-world/deploy.factor
similarity index 100%
rename from extra/hello-world/deploy.factor
rename to demos/hello-world/deploy.factor
diff --git a/extra/hello-world/hello-world.factor b/demos/hello-world/hello-world.factor
similarity index 100%
rename from extra/hello-world/hello-world.factor
rename to demos/hello-world/hello-world.factor
diff --git a/extra/hello-world/summary.txt b/demos/hello-world/summary.txt
similarity index 100%
rename from extra/hello-world/summary.txt
rename to demos/hello-world/summary.txt
diff --git a/extra/gpu/demos/raytrace/tags.txt b/demos/hello-world/tags.txt
similarity index 100%
rename from extra/gpu/demos/raytrace/tags.txt
rename to demos/hello-world/tags.txt
diff --git a/extra/icfp/2006/2006.factor b/demos/icfp/2006/2006.factor
similarity index 100%
rename from extra/icfp/2006/2006.factor
rename to demos/icfp/2006/2006.factor
diff --git a/extra/icfp/2006/authors.txt b/demos/icfp/2006/authors.txt
similarity index 100%
rename from extra/icfp/2006/authors.txt
rename to demos/icfp/2006/authors.txt
diff --git a/extra/icfp/2006/sandmark.umz b/demos/icfp/2006/sandmark.umz
similarity index 100%
rename from extra/icfp/2006/sandmark.umz
rename to demos/icfp/2006/sandmark.umz
diff --git a/extra/icfp/2006/summary.txt b/demos/icfp/2006/summary.txt
similarity index 100%
rename from extra/icfp/2006/summary.txt
rename to demos/icfp/2006/summary.txt
diff --git a/extra/icfp/2006/tags.txt b/demos/icfp/2006/tags.txt
similarity index 100%
rename from extra/icfp/2006/tags.txt
rename to demos/icfp/2006/tags.txt
diff --git a/basis/furnace/redirection/authors.txt b/demos/lcd/authors.txt
similarity index 100%
rename from basis/furnace/redirection/authors.txt
rename to demos/lcd/authors.txt
diff --git a/extra/lcd/lcd.factor b/demos/lcd/lcd.factor
similarity index 100%
rename from extra/lcd/lcd.factor
rename to demos/lcd/lcd.factor
diff --git a/extra/lcd/summary.txt b/demos/lcd/summary.txt
similarity index 100%
rename from extra/lcd/summary.txt
rename to demos/lcd/summary.txt
diff --git a/extra/hello-ui/tags.txt b/demos/lcd/tags.txt
similarity index 100%
rename from extra/hello-ui/tags.txt
rename to demos/lcd/tags.txt
diff --git a/basis/furnace/referrer/authors.txt b/demos/maze/authors.txt
similarity index 100%
rename from basis/furnace/referrer/authors.txt
rename to demos/maze/authors.txt
diff --git a/extra/maze/deploy.factor b/demos/maze/deploy.factor
similarity index 100%
rename from extra/maze/deploy.factor
rename to demos/maze/deploy.factor
diff --git a/extra/maze/maze.factor b/demos/maze/maze.factor
similarity index 100%
rename from extra/maze/maze.factor
rename to demos/maze/maze.factor
diff --git a/extra/maze/summary.txt b/demos/maze/summary.txt
similarity index 100%
rename from extra/maze/summary.txt
rename to demos/maze/summary.txt
diff --git a/extra/hello-unicode/tags.txt b/demos/maze/tags.txt
similarity index 100%
rename from extra/hello-unicode/tags.txt
rename to demos/maze/tags.txt
diff --git a/extra/morse/authors.txt b/demos/morse/authors.txt
similarity index 100%
rename from extra/morse/authors.txt
rename to demos/morse/authors.txt
diff --git a/extra/morse/morse-docs.factor b/demos/morse/morse-docs.factor
similarity index 100%
rename from extra/morse/morse-docs.factor
rename to demos/morse/morse-docs.factor
diff --git a/extra/morse/morse-tests.factor b/demos/morse/morse-tests.factor
similarity index 100%
rename from extra/morse/morse-tests.factor
rename to demos/morse/morse-tests.factor
diff --git a/extra/morse/morse.factor b/demos/morse/morse.factor
similarity index 100%
rename from extra/morse/morse.factor
rename to demos/morse/morse.factor
diff --git a/extra/morse/summary.txt b/demos/morse/summary.txt
similarity index 100%
rename from extra/morse/summary.txt
rename to demos/morse/summary.txt
diff --git a/extra/morse/tags.txt b/demos/morse/tags.txt
similarity index 100%
rename from extra/morse/tags.txt
rename to demos/morse/tags.txt
diff --git a/extra/nehe/2/2.factor b/demos/nehe/2/2.factor
similarity index 100%
rename from extra/nehe/2/2.factor
rename to demos/nehe/2/2.factor
diff --git a/extra/balloon-bomber/authors.txt b/demos/nehe/2/authors.txt
similarity index 100%
rename from extra/balloon-bomber/authors.txt
rename to demos/nehe/2/authors.txt
diff --git a/extra/nehe/3/3.factor b/demos/nehe/3/3.factor
similarity index 100%
rename from extra/nehe/3/3.factor
rename to demos/nehe/3/3.factor
diff --git a/extra/lunar-rescue/authors.txt b/demos/nehe/3/authors.txt
similarity index 100%
rename from extra/lunar-rescue/authors.txt
rename to demos/nehe/3/authors.txt
diff --git a/extra/nehe/4/4.factor b/demos/nehe/4/4.factor
similarity index 100%
rename from extra/nehe/4/4.factor
rename to demos/nehe/4/4.factor
diff --git a/extra/nehe/2/authors.txt b/demos/nehe/4/authors.txt
similarity index 100%
rename from extra/nehe/2/authors.txt
rename to demos/nehe/4/authors.txt
diff --git a/extra/nehe/5/5.factor b/demos/nehe/5/5.factor
similarity index 100%
rename from extra/nehe/5/5.factor
rename to demos/nehe/5/5.factor
diff --git a/extra/nehe/3/authors.txt b/demos/nehe/5/authors.txt
similarity index 100%
rename from extra/nehe/3/authors.txt
rename to demos/nehe/5/authors.txt
diff --git a/extra/nehe/4/authors.txt b/demos/nehe/authors.txt
similarity index 100%
rename from extra/nehe/4/authors.txt
rename to demos/nehe/authors.txt
diff --git a/extra/nehe/deploy.factor b/demos/nehe/deploy.factor
similarity index 100%
rename from extra/nehe/deploy.factor
rename to demos/nehe/deploy.factor
diff --git a/extra/nehe/nehe.factor b/demos/nehe/nehe.factor
similarity index 100%
rename from extra/nehe/nehe.factor
rename to demos/nehe/nehe.factor
diff --git a/extra/nehe/summary.txt b/demos/nehe/summary.txt
similarity index 100%
rename from extra/nehe/summary.txt
rename to demos/nehe/summary.txt
diff --git a/extra/hello-world/tags.txt b/demos/nehe/tags.txt
similarity index 100%
rename from extra/hello-world/tags.txt
rename to demos/nehe/tags.txt
diff --git a/extra/project-euler/001/001-tests.factor b/demos/project-euler/001/001-tests.factor
similarity index 100%
rename from extra/project-euler/001/001-tests.factor
rename to demos/project-euler/001/001-tests.factor
diff --git a/extra/project-euler/001/001.factor b/demos/project-euler/001/001.factor
similarity index 100%
rename from extra/project-euler/001/001.factor
rename to demos/project-euler/001/001.factor
diff --git a/extra/project-euler/002/002-tests.factor b/demos/project-euler/002/002-tests.factor
similarity index 100%
rename from extra/project-euler/002/002-tests.factor
rename to demos/project-euler/002/002-tests.factor
diff --git a/extra/project-euler/002/002.factor b/demos/project-euler/002/002.factor
similarity index 100%
rename from extra/project-euler/002/002.factor
rename to demos/project-euler/002/002.factor
diff --git a/extra/project-euler/003/003-tests.factor b/demos/project-euler/003/003-tests.factor
similarity index 100%
rename from extra/project-euler/003/003-tests.factor
rename to demos/project-euler/003/003-tests.factor
diff --git a/extra/project-euler/003/003.factor b/demos/project-euler/003/003.factor
similarity index 100%
rename from extra/project-euler/003/003.factor
rename to demos/project-euler/003/003.factor
diff --git a/extra/project-euler/004/004-tests.factor b/demos/project-euler/004/004-tests.factor
similarity index 100%
rename from extra/project-euler/004/004-tests.factor
rename to demos/project-euler/004/004-tests.factor
diff --git a/extra/project-euler/004/004.factor b/demos/project-euler/004/004.factor
similarity index 100%
rename from extra/project-euler/004/004.factor
rename to demos/project-euler/004/004.factor
diff --git a/extra/project-euler/005/005-tests.factor b/demos/project-euler/005/005-tests.factor
similarity index 100%
rename from extra/project-euler/005/005-tests.factor
rename to demos/project-euler/005/005-tests.factor
diff --git a/extra/project-euler/005/005.factor b/demos/project-euler/005/005.factor
similarity index 100%
rename from extra/project-euler/005/005.factor
rename to demos/project-euler/005/005.factor
diff --git a/extra/project-euler/006/006-tests.factor b/demos/project-euler/006/006-tests.factor
similarity index 100%
rename from extra/project-euler/006/006-tests.factor
rename to demos/project-euler/006/006-tests.factor
diff --git a/extra/project-euler/006/006.factor b/demos/project-euler/006/006.factor
similarity index 100%
rename from extra/project-euler/006/006.factor
rename to demos/project-euler/006/006.factor
diff --git a/extra/project-euler/007/007-tests.factor b/demos/project-euler/007/007-tests.factor
similarity index 100%
rename from extra/project-euler/007/007-tests.factor
rename to demos/project-euler/007/007-tests.factor
diff --git a/extra/project-euler/007/007.factor b/demos/project-euler/007/007.factor
similarity index 100%
rename from extra/project-euler/007/007.factor
rename to demos/project-euler/007/007.factor
diff --git a/extra/project-euler/008/008-tests.factor b/demos/project-euler/008/008-tests.factor
similarity index 100%
rename from extra/project-euler/008/008-tests.factor
rename to demos/project-euler/008/008-tests.factor
diff --git a/extra/project-euler/008/008.factor b/demos/project-euler/008/008.factor
similarity index 100%
rename from extra/project-euler/008/008.factor
rename to demos/project-euler/008/008.factor
diff --git a/extra/project-euler/009/009-tests.factor b/demos/project-euler/009/009-tests.factor
similarity index 100%
rename from extra/project-euler/009/009-tests.factor
rename to demos/project-euler/009/009-tests.factor
diff --git a/extra/project-euler/009/009.factor b/demos/project-euler/009/009.factor
similarity index 100%
rename from extra/project-euler/009/009.factor
rename to demos/project-euler/009/009.factor
diff --git a/extra/project-euler/010/010-tests.factor b/demos/project-euler/010/010-tests.factor
similarity index 100%
rename from extra/project-euler/010/010-tests.factor
rename to demos/project-euler/010/010-tests.factor
diff --git a/extra/project-euler/010/010.factor b/demos/project-euler/010/010.factor
similarity index 100%
rename from extra/project-euler/010/010.factor
rename to demos/project-euler/010/010.factor
diff --git a/extra/project-euler/011/011-tests.factor b/demos/project-euler/011/011-tests.factor
similarity index 100%
rename from extra/project-euler/011/011-tests.factor
rename to demos/project-euler/011/011-tests.factor
diff --git a/extra/project-euler/011/011.factor b/demos/project-euler/011/011.factor
similarity index 100%
rename from extra/project-euler/011/011.factor
rename to demos/project-euler/011/011.factor
diff --git a/extra/project-euler/012/012-tests.factor b/demos/project-euler/012/012-tests.factor
similarity index 100%
rename from extra/project-euler/012/012-tests.factor
rename to demos/project-euler/012/012-tests.factor
diff --git a/extra/project-euler/012/012.factor b/demos/project-euler/012/012.factor
similarity index 100%
rename from extra/project-euler/012/012.factor
rename to demos/project-euler/012/012.factor
diff --git a/extra/project-euler/013/013-tests.factor b/demos/project-euler/013/013-tests.factor
similarity index 100%
rename from extra/project-euler/013/013-tests.factor
rename to demos/project-euler/013/013-tests.factor
diff --git a/extra/project-euler/013/013.factor b/demos/project-euler/013/013.factor
similarity index 100%
rename from extra/project-euler/013/013.factor
rename to demos/project-euler/013/013.factor
diff --git a/extra/project-euler/014/014-tests.factor b/demos/project-euler/014/014-tests.factor
similarity index 100%
rename from extra/project-euler/014/014-tests.factor
rename to demos/project-euler/014/014-tests.factor
diff --git a/extra/project-euler/014/014.factor b/demos/project-euler/014/014.factor
similarity index 100%
rename from extra/project-euler/014/014.factor
rename to demos/project-euler/014/014.factor
diff --git a/extra/project-euler/015/015-tests.factor b/demos/project-euler/015/015-tests.factor
similarity index 100%
rename from extra/project-euler/015/015-tests.factor
rename to demos/project-euler/015/015-tests.factor
diff --git a/extra/project-euler/015/015.factor b/demos/project-euler/015/015.factor
similarity index 100%
rename from extra/project-euler/015/015.factor
rename to demos/project-euler/015/015.factor
diff --git a/extra/project-euler/016/016-tests.factor b/demos/project-euler/016/016-tests.factor
similarity index 100%
rename from extra/project-euler/016/016-tests.factor
rename to demos/project-euler/016/016-tests.factor
diff --git a/extra/project-euler/016/016.factor b/demos/project-euler/016/016.factor
similarity index 100%
rename from extra/project-euler/016/016.factor
rename to demos/project-euler/016/016.factor
diff --git a/extra/project-euler/017/017-tests.factor b/demos/project-euler/017/017-tests.factor
similarity index 100%
rename from extra/project-euler/017/017-tests.factor
rename to demos/project-euler/017/017-tests.factor
diff --git a/extra/project-euler/017/017.factor b/demos/project-euler/017/017.factor
similarity index 100%
rename from extra/project-euler/017/017.factor
rename to demos/project-euler/017/017.factor
diff --git a/extra/project-euler/018/018-tests.factor b/demos/project-euler/018/018-tests.factor
similarity index 100%
rename from extra/project-euler/018/018-tests.factor
rename to demos/project-euler/018/018-tests.factor
diff --git a/extra/project-euler/018/018.factor b/demos/project-euler/018/018.factor
similarity index 100%
rename from extra/project-euler/018/018.factor
rename to demos/project-euler/018/018.factor
diff --git a/extra/project-euler/019/019-tests.factor b/demos/project-euler/019/019-tests.factor
similarity index 100%
rename from extra/project-euler/019/019-tests.factor
rename to demos/project-euler/019/019-tests.factor
diff --git a/extra/project-euler/019/019.factor b/demos/project-euler/019/019.factor
similarity index 100%
rename from extra/project-euler/019/019.factor
rename to demos/project-euler/019/019.factor
diff --git a/extra/project-euler/020/020-tests.factor b/demos/project-euler/020/020-tests.factor
similarity index 100%
rename from extra/project-euler/020/020-tests.factor
rename to demos/project-euler/020/020-tests.factor
diff --git a/extra/project-euler/020/020.factor b/demos/project-euler/020/020.factor
similarity index 100%
rename from extra/project-euler/020/020.factor
rename to demos/project-euler/020/020.factor
diff --git a/extra/project-euler/021/021-tests.factor b/demos/project-euler/021/021-tests.factor
similarity index 100%
rename from extra/project-euler/021/021-tests.factor
rename to demos/project-euler/021/021-tests.factor
diff --git a/extra/project-euler/021/021.factor b/demos/project-euler/021/021.factor
similarity index 100%
rename from extra/project-euler/021/021.factor
rename to demos/project-euler/021/021.factor
diff --git a/extra/project-euler/022/022-tests.factor b/demos/project-euler/022/022-tests.factor
similarity index 100%
rename from extra/project-euler/022/022-tests.factor
rename to demos/project-euler/022/022-tests.factor
diff --git a/extra/project-euler/022/022.factor b/demos/project-euler/022/022.factor
similarity index 100%
rename from extra/project-euler/022/022.factor
rename to demos/project-euler/022/022.factor
diff --git a/extra/project-euler/022/names.txt b/demos/project-euler/022/names.txt
similarity index 100%
rename from extra/project-euler/022/names.txt
rename to demos/project-euler/022/names.txt
diff --git a/extra/project-euler/023/023-tests.factor b/demos/project-euler/023/023-tests.factor
similarity index 100%
rename from extra/project-euler/023/023-tests.factor
rename to demos/project-euler/023/023-tests.factor
diff --git a/extra/project-euler/023/023.factor b/demos/project-euler/023/023.factor
similarity index 100%
rename from extra/project-euler/023/023.factor
rename to demos/project-euler/023/023.factor
diff --git a/extra/project-euler/024/024-tests.factor b/demos/project-euler/024/024-tests.factor
similarity index 100%
rename from extra/project-euler/024/024-tests.factor
rename to demos/project-euler/024/024-tests.factor
diff --git a/extra/project-euler/024/024.factor b/demos/project-euler/024/024.factor
similarity index 100%
rename from extra/project-euler/024/024.factor
rename to demos/project-euler/024/024.factor
diff --git a/extra/project-euler/025/025-tests.factor b/demos/project-euler/025/025-tests.factor
similarity index 100%
rename from extra/project-euler/025/025-tests.factor
rename to demos/project-euler/025/025-tests.factor
diff --git a/extra/project-euler/025/025.factor b/demos/project-euler/025/025.factor
similarity index 100%
rename from extra/project-euler/025/025.factor
rename to demos/project-euler/025/025.factor
diff --git a/extra/project-euler/026/026-tests.factor b/demos/project-euler/026/026-tests.factor
similarity index 100%
rename from extra/project-euler/026/026-tests.factor
rename to demos/project-euler/026/026-tests.factor
diff --git a/extra/project-euler/026/026.factor b/demos/project-euler/026/026.factor
similarity index 100%
rename from extra/project-euler/026/026.factor
rename to demos/project-euler/026/026.factor
diff --git a/extra/project-euler/027/027-tests.factor b/demos/project-euler/027/027-tests.factor
similarity index 100%
rename from extra/project-euler/027/027-tests.factor
rename to demos/project-euler/027/027-tests.factor
diff --git a/extra/project-euler/027/027.factor b/demos/project-euler/027/027.factor
similarity index 100%
rename from extra/project-euler/027/027.factor
rename to demos/project-euler/027/027.factor
diff --git a/extra/project-euler/028/028-tests.factor b/demos/project-euler/028/028-tests.factor
similarity index 100%
rename from extra/project-euler/028/028-tests.factor
rename to demos/project-euler/028/028-tests.factor
diff --git a/extra/project-euler/028/028.factor b/demos/project-euler/028/028.factor
similarity index 100%
rename from extra/project-euler/028/028.factor
rename to demos/project-euler/028/028.factor
diff --git a/extra/project-euler/029/029-tests.factor b/demos/project-euler/029/029-tests.factor
similarity index 100%
rename from extra/project-euler/029/029-tests.factor
rename to demos/project-euler/029/029-tests.factor
diff --git a/extra/project-euler/029/029.factor b/demos/project-euler/029/029.factor
similarity index 100%
rename from extra/project-euler/029/029.factor
rename to demos/project-euler/029/029.factor
diff --git a/extra/project-euler/030/030-tests.factor b/demos/project-euler/030/030-tests.factor
similarity index 100%
rename from extra/project-euler/030/030-tests.factor
rename to demos/project-euler/030/030-tests.factor
diff --git a/extra/project-euler/030/030.factor b/demos/project-euler/030/030.factor
similarity index 100%
rename from extra/project-euler/030/030.factor
rename to demos/project-euler/030/030.factor
diff --git a/extra/project-euler/031/031-tests.factor b/demos/project-euler/031/031-tests.factor
similarity index 100%
rename from extra/project-euler/031/031-tests.factor
rename to demos/project-euler/031/031-tests.factor
diff --git a/extra/project-euler/031/031.factor b/demos/project-euler/031/031.factor
similarity index 100%
rename from extra/project-euler/031/031.factor
rename to demos/project-euler/031/031.factor
diff --git a/extra/project-euler/032/032-tests.factor b/demos/project-euler/032/032-tests.factor
similarity index 100%
rename from extra/project-euler/032/032-tests.factor
rename to demos/project-euler/032/032-tests.factor
diff --git a/extra/project-euler/032/032.factor b/demos/project-euler/032/032.factor
similarity index 100%
rename from extra/project-euler/032/032.factor
rename to demos/project-euler/032/032.factor
diff --git a/extra/project-euler/033/033-tests.factor b/demos/project-euler/033/033-tests.factor
similarity index 100%
rename from extra/project-euler/033/033-tests.factor
rename to demos/project-euler/033/033-tests.factor
diff --git a/extra/project-euler/033/033.factor b/demos/project-euler/033/033.factor
similarity index 100%
rename from extra/project-euler/033/033.factor
rename to demos/project-euler/033/033.factor
diff --git a/extra/project-euler/034/034-tests.factor b/demos/project-euler/034/034-tests.factor
similarity index 100%
rename from extra/project-euler/034/034-tests.factor
rename to demos/project-euler/034/034-tests.factor
diff --git a/extra/project-euler/034/034.factor b/demos/project-euler/034/034.factor
similarity index 100%
rename from extra/project-euler/034/034.factor
rename to demos/project-euler/034/034.factor
diff --git a/extra/project-euler/035/035-tests.factor b/demos/project-euler/035/035-tests.factor
similarity index 100%
rename from extra/project-euler/035/035-tests.factor
rename to demos/project-euler/035/035-tests.factor
diff --git a/extra/project-euler/035/035.factor b/demos/project-euler/035/035.factor
similarity index 100%
rename from extra/project-euler/035/035.factor
rename to demos/project-euler/035/035.factor
diff --git a/extra/project-euler/036/036-tests.factor b/demos/project-euler/036/036-tests.factor
similarity index 100%
rename from extra/project-euler/036/036-tests.factor
rename to demos/project-euler/036/036-tests.factor
diff --git a/extra/project-euler/036/036.factor b/demos/project-euler/036/036.factor
similarity index 100%
rename from extra/project-euler/036/036.factor
rename to demos/project-euler/036/036.factor
diff --git a/extra/project-euler/037/037-tests.factor b/demos/project-euler/037/037-tests.factor
similarity index 100%
rename from extra/project-euler/037/037-tests.factor
rename to demos/project-euler/037/037-tests.factor
diff --git a/extra/project-euler/037/037.factor b/demos/project-euler/037/037.factor
similarity index 100%
rename from extra/project-euler/037/037.factor
rename to demos/project-euler/037/037.factor
diff --git a/extra/project-euler/038/038-tests.factor b/demos/project-euler/038/038-tests.factor
similarity index 100%
rename from extra/project-euler/038/038-tests.factor
rename to demos/project-euler/038/038-tests.factor
diff --git a/extra/project-euler/038/038.factor b/demos/project-euler/038/038.factor
similarity index 100%
rename from extra/project-euler/038/038.factor
rename to demos/project-euler/038/038.factor
diff --git a/extra/project-euler/039/039-tests.factor b/demos/project-euler/039/039-tests.factor
similarity index 100%
rename from extra/project-euler/039/039-tests.factor
rename to demos/project-euler/039/039-tests.factor
diff --git a/extra/project-euler/039/039.factor b/demos/project-euler/039/039.factor
similarity index 100%
rename from extra/project-euler/039/039.factor
rename to demos/project-euler/039/039.factor
diff --git a/extra/project-euler/040/040-tests.factor b/demos/project-euler/040/040-tests.factor
similarity index 100%
rename from extra/project-euler/040/040-tests.factor
rename to demos/project-euler/040/040-tests.factor
diff --git a/extra/project-euler/040/040.factor b/demos/project-euler/040/040.factor
similarity index 100%
rename from extra/project-euler/040/040.factor
rename to demos/project-euler/040/040.factor
diff --git a/extra/project-euler/041/041-tests.factor b/demos/project-euler/041/041-tests.factor
similarity index 100%
rename from extra/project-euler/041/041-tests.factor
rename to demos/project-euler/041/041-tests.factor
diff --git a/extra/project-euler/041/041.factor b/demos/project-euler/041/041.factor
similarity index 100%
rename from extra/project-euler/041/041.factor
rename to demos/project-euler/041/041.factor
diff --git a/extra/project-euler/042/042-tests.factor b/demos/project-euler/042/042-tests.factor
similarity index 100%
rename from extra/project-euler/042/042-tests.factor
rename to demos/project-euler/042/042-tests.factor
diff --git a/extra/project-euler/042/042.factor b/demos/project-euler/042/042.factor
similarity index 100%
rename from extra/project-euler/042/042.factor
rename to demos/project-euler/042/042.factor
diff --git a/extra/project-euler/042/words.txt b/demos/project-euler/042/words.txt
similarity index 100%
rename from extra/project-euler/042/words.txt
rename to demos/project-euler/042/words.txt
diff --git a/extra/project-euler/043/043-tests.factor b/demos/project-euler/043/043-tests.factor
similarity index 100%
rename from extra/project-euler/043/043-tests.factor
rename to demos/project-euler/043/043-tests.factor
diff --git a/extra/project-euler/043/043.factor b/demos/project-euler/043/043.factor
similarity index 100%
rename from extra/project-euler/043/043.factor
rename to demos/project-euler/043/043.factor
diff --git a/extra/project-euler/044/044-tests.factor b/demos/project-euler/044/044-tests.factor
similarity index 100%
rename from extra/project-euler/044/044-tests.factor
rename to demos/project-euler/044/044-tests.factor
diff --git a/extra/project-euler/044/044.factor b/demos/project-euler/044/044.factor
similarity index 100%
rename from extra/project-euler/044/044.factor
rename to demos/project-euler/044/044.factor
diff --git a/extra/project-euler/045/045-tests.factor b/demos/project-euler/045/045-tests.factor
similarity index 100%
rename from extra/project-euler/045/045-tests.factor
rename to demos/project-euler/045/045-tests.factor
diff --git a/extra/project-euler/045/045.factor b/demos/project-euler/045/045.factor
similarity index 100%
rename from extra/project-euler/045/045.factor
rename to demos/project-euler/045/045.factor
diff --git a/extra/project-euler/046/046-tests.factor b/demos/project-euler/046/046-tests.factor
similarity index 100%
rename from extra/project-euler/046/046-tests.factor
rename to demos/project-euler/046/046-tests.factor
diff --git a/extra/project-euler/046/046.factor b/demos/project-euler/046/046.factor
similarity index 100%
rename from extra/project-euler/046/046.factor
rename to demos/project-euler/046/046.factor
diff --git a/extra/project-euler/047/047-tests.factor b/demos/project-euler/047/047-tests.factor
similarity index 100%
rename from extra/project-euler/047/047-tests.factor
rename to demos/project-euler/047/047-tests.factor
diff --git a/extra/project-euler/047/047.factor b/demos/project-euler/047/047.factor
similarity index 100%
rename from extra/project-euler/047/047.factor
rename to demos/project-euler/047/047.factor
diff --git a/extra/project-euler/048/048-tests.factor b/demos/project-euler/048/048-tests.factor
similarity index 100%
rename from extra/project-euler/048/048-tests.factor
rename to demos/project-euler/048/048-tests.factor
diff --git a/extra/project-euler/048/048.factor b/demos/project-euler/048/048.factor
similarity index 100%
rename from extra/project-euler/048/048.factor
rename to demos/project-euler/048/048.factor
diff --git a/extra/project-euler/049/049-tests.factor b/demos/project-euler/049/049-tests.factor
similarity index 100%
rename from extra/project-euler/049/049-tests.factor
rename to demos/project-euler/049/049-tests.factor
diff --git a/extra/project-euler/049/049.factor b/demos/project-euler/049/049.factor
similarity index 100%
rename from extra/project-euler/049/049.factor
rename to demos/project-euler/049/049.factor
diff --git a/extra/project-euler/050/050-tests.factor b/demos/project-euler/050/050-tests.factor
similarity index 100%
rename from extra/project-euler/050/050-tests.factor
rename to demos/project-euler/050/050-tests.factor
diff --git a/extra/project-euler/050/050.factor b/demos/project-euler/050/050.factor
similarity index 100%
rename from extra/project-euler/050/050.factor
rename to demos/project-euler/050/050.factor
diff --git a/extra/project-euler/051/051-tests.factor b/demos/project-euler/051/051-tests.factor
similarity index 100%
rename from extra/project-euler/051/051-tests.factor
rename to demos/project-euler/051/051-tests.factor
diff --git a/extra/project-euler/051/051.factor b/demos/project-euler/051/051.factor
similarity index 100%
rename from extra/project-euler/051/051.factor
rename to demos/project-euler/051/051.factor
diff --git a/extra/project-euler/051/authors.txt b/demos/project-euler/051/authors.txt
similarity index 100%
rename from extra/project-euler/051/authors.txt
rename to demos/project-euler/051/authors.txt
diff --git a/extra/project-euler/052/052-tests.factor b/demos/project-euler/052/052-tests.factor
similarity index 100%
rename from extra/project-euler/052/052-tests.factor
rename to demos/project-euler/052/052-tests.factor
diff --git a/extra/project-euler/052/052.factor b/demos/project-euler/052/052.factor
similarity index 100%
rename from extra/project-euler/052/052.factor
rename to demos/project-euler/052/052.factor
diff --git a/extra/project-euler/053/053-tests.factor b/demos/project-euler/053/053-tests.factor
similarity index 100%
rename from extra/project-euler/053/053-tests.factor
rename to demos/project-euler/053/053-tests.factor
diff --git a/extra/project-euler/053/053.factor b/demos/project-euler/053/053.factor
similarity index 100%
rename from extra/project-euler/053/053.factor
rename to demos/project-euler/053/053.factor
diff --git a/extra/project-euler/054/054-tests.factor b/demos/project-euler/054/054-tests.factor
similarity index 100%
rename from extra/project-euler/054/054-tests.factor
rename to demos/project-euler/054/054-tests.factor
diff --git a/extra/project-euler/054/054.factor b/demos/project-euler/054/054.factor
similarity index 100%
rename from extra/project-euler/054/054.factor
rename to demos/project-euler/054/054.factor
diff --git a/extra/project-euler/054/poker.txt b/demos/project-euler/054/poker.txt
similarity index 100%
rename from extra/project-euler/054/poker.txt
rename to demos/project-euler/054/poker.txt
diff --git a/extra/project-euler/055/055-tests.factor b/demos/project-euler/055/055-tests.factor
similarity index 100%
rename from extra/project-euler/055/055-tests.factor
rename to demos/project-euler/055/055-tests.factor
diff --git a/extra/project-euler/055/055.factor b/demos/project-euler/055/055.factor
similarity index 100%
rename from extra/project-euler/055/055.factor
rename to demos/project-euler/055/055.factor
diff --git a/extra/project-euler/056/056-tests.factor b/demos/project-euler/056/056-tests.factor
similarity index 100%
rename from extra/project-euler/056/056-tests.factor
rename to demos/project-euler/056/056-tests.factor
diff --git a/extra/project-euler/056/056.factor b/demos/project-euler/056/056.factor
similarity index 100%
rename from extra/project-euler/056/056.factor
rename to demos/project-euler/056/056.factor
diff --git a/extra/project-euler/057/057-tests.factor b/demos/project-euler/057/057-tests.factor
similarity index 100%
rename from extra/project-euler/057/057-tests.factor
rename to demos/project-euler/057/057-tests.factor
diff --git a/extra/project-euler/057/057.factor b/demos/project-euler/057/057.factor
similarity index 100%
rename from extra/project-euler/057/057.factor
rename to demos/project-euler/057/057.factor
diff --git a/extra/project-euler/058/058-tests.factor b/demos/project-euler/058/058-tests.factor
similarity index 100%
rename from extra/project-euler/058/058-tests.factor
rename to demos/project-euler/058/058-tests.factor
diff --git a/extra/project-euler/058/058.factor b/demos/project-euler/058/058.factor
similarity index 100%
rename from extra/project-euler/058/058.factor
rename to demos/project-euler/058/058.factor
diff --git a/extra/project-euler/059/059-tests.factor b/demos/project-euler/059/059-tests.factor
similarity index 100%
rename from extra/project-euler/059/059-tests.factor
rename to demos/project-euler/059/059-tests.factor
diff --git a/extra/project-euler/059/059.factor b/demos/project-euler/059/059.factor
similarity index 100%
rename from extra/project-euler/059/059.factor
rename to demos/project-euler/059/059.factor
diff --git a/extra/project-euler/059/cipher1.txt b/demos/project-euler/059/cipher1.txt
similarity index 100%
rename from extra/project-euler/059/cipher1.txt
rename to demos/project-euler/059/cipher1.txt
diff --git a/extra/project-euler/062/062-tests.factor b/demos/project-euler/062/062-tests.factor
similarity index 100%
rename from extra/project-euler/062/062-tests.factor
rename to demos/project-euler/062/062-tests.factor
diff --git a/extra/project-euler/062/062.factor b/demos/project-euler/062/062.factor
similarity index 100%
rename from extra/project-euler/062/062.factor
rename to demos/project-euler/062/062.factor
diff --git a/extra/project-euler/062/authors.txt b/demos/project-euler/062/authors.txt
similarity index 100%
rename from extra/project-euler/062/authors.txt
rename to demos/project-euler/062/authors.txt
diff --git a/extra/project-euler/063/063-tests.factor b/demos/project-euler/063/063-tests.factor
similarity index 100%
rename from extra/project-euler/063/063-tests.factor
rename to demos/project-euler/063/063-tests.factor
diff --git a/extra/project-euler/063/063.factor b/demos/project-euler/063/063.factor
similarity index 100%
rename from extra/project-euler/063/063.factor
rename to demos/project-euler/063/063.factor
diff --git a/extra/project-euler/065/065-tests.factor b/demos/project-euler/065/065-tests.factor
similarity index 100%
rename from extra/project-euler/065/065-tests.factor
rename to demos/project-euler/065/065-tests.factor
diff --git a/extra/project-euler/065/065.factor b/demos/project-euler/065/065.factor
similarity index 100%
rename from extra/project-euler/065/065.factor
rename to demos/project-euler/065/065.factor
diff --git a/extra/project-euler/065/authors.txt b/demos/project-euler/065/authors.txt
similarity index 100%
rename from extra/project-euler/065/authors.txt
rename to demos/project-euler/065/authors.txt
diff --git a/extra/project-euler/067/067-tests.factor b/demos/project-euler/067/067-tests.factor
similarity index 100%
rename from extra/project-euler/067/067-tests.factor
rename to demos/project-euler/067/067-tests.factor
diff --git a/extra/project-euler/067/067.factor b/demos/project-euler/067/067.factor
similarity index 100%
rename from extra/project-euler/067/067.factor
rename to demos/project-euler/067/067.factor
diff --git a/extra/project-euler/067/triangle.txt b/demos/project-euler/067/triangle.txt
similarity index 100%
rename from extra/project-euler/067/triangle.txt
rename to demos/project-euler/067/triangle.txt
diff --git a/extra/project-euler/069/069-tests.factor b/demos/project-euler/069/069-tests.factor
similarity index 100%
rename from extra/project-euler/069/069-tests.factor
rename to demos/project-euler/069/069-tests.factor
diff --git a/extra/project-euler/069/069.factor b/demos/project-euler/069/069.factor
similarity index 100%
rename from extra/project-euler/069/069.factor
rename to demos/project-euler/069/069.factor
diff --git a/extra/project-euler/070/070-tests.factor b/demos/project-euler/070/070-tests.factor
similarity index 100%
rename from extra/project-euler/070/070-tests.factor
rename to demos/project-euler/070/070-tests.factor
diff --git a/extra/project-euler/070/070.factor b/demos/project-euler/070/070.factor
similarity index 100%
rename from extra/project-euler/070/070.factor
rename to demos/project-euler/070/070.factor
diff --git a/extra/project-euler/071/071-tests.factor b/demos/project-euler/071/071-tests.factor
similarity index 100%
rename from extra/project-euler/071/071-tests.factor
rename to demos/project-euler/071/071-tests.factor
diff --git a/extra/project-euler/071/071.factor b/demos/project-euler/071/071.factor
similarity index 100%
rename from extra/project-euler/071/071.factor
rename to demos/project-euler/071/071.factor
diff --git a/extra/project-euler/072/072-tests.factor b/demos/project-euler/072/072-tests.factor
similarity index 100%
rename from extra/project-euler/072/072-tests.factor
rename to demos/project-euler/072/072-tests.factor
diff --git a/extra/project-euler/072/072.factor b/demos/project-euler/072/072.factor
similarity index 100%
rename from extra/project-euler/072/072.factor
rename to demos/project-euler/072/072.factor
diff --git a/extra/project-euler/072/authors.txt b/demos/project-euler/072/authors.txt
similarity index 100%
rename from extra/project-euler/072/authors.txt
rename to demos/project-euler/072/authors.txt
diff --git a/extra/project-euler/073/073-tests.factor b/demos/project-euler/073/073-tests.factor
similarity index 100%
rename from extra/project-euler/073/073-tests.factor
rename to demos/project-euler/073/073-tests.factor
diff --git a/extra/project-euler/073/073.factor b/demos/project-euler/073/073.factor
similarity index 100%
rename from extra/project-euler/073/073.factor
rename to demos/project-euler/073/073.factor
diff --git a/extra/project-euler/074/074-tests.factor b/demos/project-euler/074/074-tests.factor
similarity index 100%
rename from extra/project-euler/074/074-tests.factor
rename to demos/project-euler/074/074-tests.factor
diff --git a/extra/project-euler/074/074.factor b/demos/project-euler/074/074.factor
similarity index 100%
rename from extra/project-euler/074/074.factor
rename to demos/project-euler/074/074.factor
diff --git a/extra/project-euler/074/authors.txt b/demos/project-euler/074/authors.txt
similarity index 100%
rename from extra/project-euler/074/authors.txt
rename to demos/project-euler/074/authors.txt
diff --git a/extra/project-euler/075/075-tests.factor b/demos/project-euler/075/075-tests.factor
similarity index 100%
rename from extra/project-euler/075/075-tests.factor
rename to demos/project-euler/075/075-tests.factor
diff --git a/extra/project-euler/075/075.factor b/demos/project-euler/075/075.factor
similarity index 100%
rename from extra/project-euler/075/075.factor
rename to demos/project-euler/075/075.factor
diff --git a/extra/project-euler/076/076-tests.factor b/demos/project-euler/076/076-tests.factor
similarity index 100%
rename from extra/project-euler/076/076-tests.factor
rename to demos/project-euler/076/076-tests.factor
diff --git a/extra/project-euler/076/076.factor b/demos/project-euler/076/076.factor
similarity index 100%
rename from extra/project-euler/076/076.factor
rename to demos/project-euler/076/076.factor
diff --git a/extra/project-euler/079/079-tests.factor b/demos/project-euler/079/079-tests.factor
similarity index 100%
rename from extra/project-euler/079/079-tests.factor
rename to demos/project-euler/079/079-tests.factor
diff --git a/extra/project-euler/079/079.factor b/demos/project-euler/079/079.factor
similarity index 100%
rename from extra/project-euler/079/079.factor
rename to demos/project-euler/079/079.factor
diff --git a/extra/project-euler/079/keylog.txt b/demos/project-euler/079/keylog.txt
similarity index 100%
rename from extra/project-euler/079/keylog.txt
rename to demos/project-euler/079/keylog.txt
diff --git a/extra/project-euler/081/081-tests.factor b/demos/project-euler/081/081-tests.factor
similarity index 100%
rename from extra/project-euler/081/081-tests.factor
rename to demos/project-euler/081/081-tests.factor
diff --git a/extra/project-euler/081/081.factor b/demos/project-euler/081/081.factor
similarity index 100%
rename from extra/project-euler/081/081.factor
rename to demos/project-euler/081/081.factor
diff --git a/extra/project-euler/081/authors.txt b/demos/project-euler/081/authors.txt
similarity index 100%
rename from extra/project-euler/081/authors.txt
rename to demos/project-euler/081/authors.txt
diff --git a/extra/project-euler/081/matrix.txt b/demos/project-euler/081/matrix.txt
similarity index 100%
rename from extra/project-euler/081/matrix.txt
rename to demos/project-euler/081/matrix.txt
diff --git a/extra/project-euler/085/085-tests.factor b/demos/project-euler/085/085-tests.factor
similarity index 100%
rename from extra/project-euler/085/085-tests.factor
rename to demos/project-euler/085/085-tests.factor
diff --git a/extra/project-euler/085/085.factor b/demos/project-euler/085/085.factor
similarity index 100%
rename from extra/project-euler/085/085.factor
rename to demos/project-euler/085/085.factor
diff --git a/extra/project-euler/085/authors.txt b/demos/project-euler/085/authors.txt
similarity index 100%
rename from extra/project-euler/085/authors.txt
rename to demos/project-euler/085/authors.txt
diff --git a/extra/project-euler/089/089-tests.factor b/demos/project-euler/089/089-tests.factor
similarity index 100%
rename from extra/project-euler/089/089-tests.factor
rename to demos/project-euler/089/089-tests.factor
diff --git a/extra/project-euler/089/089.factor b/demos/project-euler/089/089.factor
similarity index 100%
rename from extra/project-euler/089/089.factor
rename to demos/project-euler/089/089.factor
diff --git a/basis/unix/getfsstat/macosx/authors.txt b/demos/project-euler/089/authors.txt
similarity index 100%
rename from basis/unix/getfsstat/macosx/authors.txt
rename to demos/project-euler/089/authors.txt
diff --git a/extra/project-euler/089/roman.txt b/demos/project-euler/089/roman.txt
similarity index 100%
rename from extra/project-euler/089/roman.txt
rename to demos/project-euler/089/roman.txt
diff --git a/extra/project-euler/092/092-tests.factor b/demos/project-euler/092/092-tests.factor
similarity index 100%
rename from extra/project-euler/092/092-tests.factor
rename to demos/project-euler/092/092-tests.factor
diff --git a/extra/project-euler/092/092.factor b/demos/project-euler/092/092.factor
similarity index 100%
rename from extra/project-euler/092/092.factor
rename to demos/project-euler/092/092.factor
diff --git a/extra/project-euler/097/097-tests.factor b/demos/project-euler/097/097-tests.factor
similarity index 100%
rename from extra/project-euler/097/097-tests.factor
rename to demos/project-euler/097/097-tests.factor
diff --git a/extra/project-euler/097/097.factor b/demos/project-euler/097/097.factor
similarity index 100%
rename from extra/project-euler/097/097.factor
rename to demos/project-euler/097/097.factor
diff --git a/extra/project-euler/099/099-tests.factor b/demos/project-euler/099/099-tests.factor
similarity index 100%
rename from extra/project-euler/099/099-tests.factor
rename to demos/project-euler/099/099-tests.factor
diff --git a/extra/project-euler/099/099.factor b/demos/project-euler/099/099.factor
similarity index 100%
rename from extra/project-euler/099/099.factor
rename to demos/project-euler/099/099.factor
diff --git a/extra/project-euler/099/base_exp.txt b/demos/project-euler/099/base_exp.txt
similarity index 100%
rename from extra/project-euler/099/base_exp.txt
rename to demos/project-euler/099/base_exp.txt
diff --git a/extra/project-euler/100/100-tests.factor b/demos/project-euler/100/100-tests.factor
similarity index 100%
rename from extra/project-euler/100/100-tests.factor
rename to demos/project-euler/100/100-tests.factor
diff --git a/extra/project-euler/100/100.factor b/demos/project-euler/100/100.factor
similarity index 100%
rename from extra/project-euler/100/100.factor
rename to demos/project-euler/100/100.factor
diff --git a/extra/project-euler/102/102-tests.factor b/demos/project-euler/102/102-tests.factor
similarity index 100%
rename from extra/project-euler/102/102-tests.factor
rename to demos/project-euler/102/102-tests.factor
diff --git a/extra/project-euler/102/102.factor b/demos/project-euler/102/102.factor
similarity index 100%
rename from extra/project-euler/102/102.factor
rename to demos/project-euler/102/102.factor
diff --git a/extra/project-euler/102/authors.txt b/demos/project-euler/102/authors.txt
similarity index 100%
rename from extra/project-euler/102/authors.txt
rename to demos/project-euler/102/authors.txt
diff --git a/extra/project-euler/102/triangles.txt b/demos/project-euler/102/triangles.txt
similarity index 100%
rename from extra/project-euler/102/triangles.txt
rename to demos/project-euler/102/triangles.txt
diff --git a/extra/project-euler/112/112-tests.factor b/demos/project-euler/112/112-tests.factor
similarity index 100%
rename from extra/project-euler/112/112-tests.factor
rename to demos/project-euler/112/112-tests.factor
diff --git a/extra/project-euler/112/112.factor b/demos/project-euler/112/112.factor
similarity index 100%
rename from extra/project-euler/112/112.factor
rename to demos/project-euler/112/112.factor
diff --git a/extra/project-euler/112/authors.txt b/demos/project-euler/112/authors.txt
similarity index 100%
rename from extra/project-euler/112/authors.txt
rename to demos/project-euler/112/authors.txt
diff --git a/extra/project-euler/116/116-tests.factor b/demos/project-euler/116/116-tests.factor
similarity index 100%
rename from extra/project-euler/116/116-tests.factor
rename to demos/project-euler/116/116-tests.factor
diff --git a/extra/project-euler/116/116.factor b/demos/project-euler/116/116.factor
similarity index 100%
rename from extra/project-euler/116/116.factor
rename to demos/project-euler/116/116.factor
diff --git a/extra/project-euler/117/117-tests.factor b/demos/project-euler/117/117-tests.factor
similarity index 100%
rename from extra/project-euler/117/117-tests.factor
rename to demos/project-euler/117/117-tests.factor
diff --git a/extra/project-euler/117/117.factor b/demos/project-euler/117/117.factor
similarity index 100%
rename from extra/project-euler/117/117.factor
rename to demos/project-euler/117/117.factor
diff --git a/extra/project-euler/124/124-tests.factor b/demos/project-euler/124/124-tests.factor
similarity index 100%
rename from extra/project-euler/124/124-tests.factor
rename to demos/project-euler/124/124-tests.factor
diff --git a/extra/project-euler/124/124.factor b/demos/project-euler/124/124.factor
similarity index 100%
rename from extra/project-euler/124/124.factor
rename to demos/project-euler/124/124.factor
diff --git a/extra/project-euler/124/authors.txt b/demos/project-euler/124/authors.txt
similarity index 100%
rename from extra/project-euler/124/authors.txt
rename to demos/project-euler/124/authors.txt
diff --git a/extra/project-euler/134/134-tests.factor b/demos/project-euler/134/134-tests.factor
similarity index 100%
rename from extra/project-euler/134/134-tests.factor
rename to demos/project-euler/134/134-tests.factor
diff --git a/extra/project-euler/134/134.factor b/demos/project-euler/134/134.factor
similarity index 100%
rename from extra/project-euler/134/134.factor
rename to demos/project-euler/134/134.factor
diff --git a/extra/project-euler/148/148-tests.factor b/demos/project-euler/148/148-tests.factor
similarity index 100%
rename from extra/project-euler/148/148-tests.factor
rename to demos/project-euler/148/148-tests.factor
diff --git a/extra/project-euler/148/148.factor b/demos/project-euler/148/148.factor
similarity index 100%
rename from extra/project-euler/148/148.factor
rename to demos/project-euler/148/148.factor
diff --git a/extra/project-euler/150/150-tests.factor b/demos/project-euler/150/150-tests.factor
similarity index 100%
rename from extra/project-euler/150/150-tests.factor
rename to demos/project-euler/150/150-tests.factor
diff --git a/extra/project-euler/150/150.factor b/demos/project-euler/150/150.factor
similarity index 100%
rename from extra/project-euler/150/150.factor
rename to demos/project-euler/150/150.factor
diff --git a/extra/project-euler/151/151-tests.factor b/demos/project-euler/151/151-tests.factor
similarity index 100%
rename from extra/project-euler/151/151-tests.factor
rename to demos/project-euler/151/151-tests.factor
diff --git a/extra/project-euler/151/151.factor b/demos/project-euler/151/151.factor
similarity index 100%
rename from extra/project-euler/151/151.factor
rename to demos/project-euler/151/151.factor
diff --git a/extra/project-euler/164/164-tests.factor b/demos/project-euler/164/164-tests.factor
similarity index 100%
rename from extra/project-euler/164/164-tests.factor
rename to demos/project-euler/164/164-tests.factor
diff --git a/extra/project-euler/164/164.factor b/demos/project-euler/164/164.factor
similarity index 100%
rename from extra/project-euler/164/164.factor
rename to demos/project-euler/164/164.factor
diff --git a/extra/project-euler/169/169-tests.factor b/demos/project-euler/169/169-tests.factor
similarity index 100%
rename from extra/project-euler/169/169-tests.factor
rename to demos/project-euler/169/169-tests.factor
diff --git a/extra/project-euler/169/169.factor b/demos/project-euler/169/169.factor
similarity index 100%
rename from extra/project-euler/169/169.factor
rename to demos/project-euler/169/169.factor
diff --git a/extra/project-euler/173/173-tests.factor b/demos/project-euler/173/173-tests.factor
similarity index 100%
rename from extra/project-euler/173/173-tests.factor
rename to demos/project-euler/173/173-tests.factor
diff --git a/extra/project-euler/173/173.factor b/demos/project-euler/173/173.factor
similarity index 100%
rename from extra/project-euler/173/173.factor
rename to demos/project-euler/173/173.factor
diff --git a/extra/project-euler/175/175-tests.factor b/demos/project-euler/175/175-tests.factor
similarity index 100%
rename from extra/project-euler/175/175-tests.factor
rename to demos/project-euler/175/175-tests.factor
diff --git a/extra/project-euler/175/175.factor b/demos/project-euler/175/175.factor
similarity index 100%
rename from extra/project-euler/175/175.factor
rename to demos/project-euler/175/175.factor
diff --git a/extra/project-euler/186/186-tests.factor b/demos/project-euler/186/186-tests.factor
similarity index 100%
rename from extra/project-euler/186/186-tests.factor
rename to demos/project-euler/186/186-tests.factor
diff --git a/extra/project-euler/186/186.factor b/demos/project-euler/186/186.factor
similarity index 100%
rename from extra/project-euler/186/186.factor
rename to demos/project-euler/186/186.factor
diff --git a/extra/project-euler/188/188-tests.factor b/demos/project-euler/188/188-tests.factor
similarity index 100%
rename from extra/project-euler/188/188-tests.factor
rename to demos/project-euler/188/188-tests.factor
diff --git a/extra/project-euler/188/188.factor b/demos/project-euler/188/188.factor
similarity index 100%
rename from extra/project-euler/188/188.factor
rename to demos/project-euler/188/188.factor
diff --git a/extra/project-euler/188/authors.txt b/demos/project-euler/188/authors.txt
similarity index 100%
rename from extra/project-euler/188/authors.txt
rename to demos/project-euler/188/authors.txt
diff --git a/extra/project-euler/190/190-tests.factor b/demos/project-euler/190/190-tests.factor
similarity index 100%
rename from extra/project-euler/190/190-tests.factor
rename to demos/project-euler/190/190-tests.factor
diff --git a/extra/project-euler/190/190.factor b/demos/project-euler/190/190.factor
similarity index 100%
rename from extra/project-euler/190/190.factor
rename to demos/project-euler/190/190.factor
diff --git a/extra/project-euler/203/203-tests.factor b/demos/project-euler/203/203-tests.factor
similarity index 100%
rename from extra/project-euler/203/203-tests.factor
rename to demos/project-euler/203/203-tests.factor
diff --git a/extra/project-euler/203/203.factor b/demos/project-euler/203/203.factor
similarity index 100%
rename from extra/project-euler/203/203.factor
rename to demos/project-euler/203/203.factor
diff --git a/extra/project-euler/206/206-tests.factor b/demos/project-euler/206/206-tests.factor
similarity index 100%
rename from extra/project-euler/206/206-tests.factor
rename to demos/project-euler/206/206-tests.factor
diff --git a/extra/project-euler/206/206.factor b/demos/project-euler/206/206.factor
similarity index 100%
rename from extra/project-euler/206/206.factor
rename to demos/project-euler/206/206.factor
diff --git a/extra/project-euler/215/215-tests.factor b/demos/project-euler/215/215-tests.factor
similarity index 100%
rename from extra/project-euler/215/215-tests.factor
rename to demos/project-euler/215/215-tests.factor
diff --git a/extra/project-euler/215/215.factor b/demos/project-euler/215/215.factor
similarity index 100%
rename from extra/project-euler/215/215.factor
rename to demos/project-euler/215/215.factor
diff --git a/extra/project-euler/255/255-tests.factor b/demos/project-euler/255/255-tests.factor
similarity index 100%
rename from extra/project-euler/255/255-tests.factor
rename to demos/project-euler/255/255-tests.factor
diff --git a/extra/project-euler/255/255.factor b/demos/project-euler/255/255.factor
similarity index 100%
rename from extra/project-euler/255/255.factor
rename to demos/project-euler/255/255.factor
diff --git a/extra/project-euler/255/authors.txt b/demos/project-euler/255/authors.txt
similarity index 100%
rename from extra/project-euler/255/authors.txt
rename to demos/project-euler/255/authors.txt
diff --git a/extra/project-euler/265/265-tests.factor b/demos/project-euler/265/265-tests.factor
similarity index 100%
rename from extra/project-euler/265/265-tests.factor
rename to demos/project-euler/265/265-tests.factor
diff --git a/extra/project-euler/265/265.factor b/demos/project-euler/265/265.factor
similarity index 100%
rename from extra/project-euler/265/265.factor
rename to demos/project-euler/265/265.factor
diff --git a/extra/project-euler/authors.txt b/demos/project-euler/authors.txt
similarity index 100%
rename from extra/project-euler/authors.txt
rename to demos/project-euler/authors.txt
diff --git a/extra/project-euler/ave-time/authors.txt b/demos/project-euler/ave-time/authors.txt
similarity index 100%
rename from extra/project-euler/ave-time/authors.txt
rename to demos/project-euler/ave-time/authors.txt
diff --git a/extra/project-euler/ave-time/ave-time-docs.factor b/demos/project-euler/ave-time/ave-time-docs.factor
similarity index 100%
rename from extra/project-euler/ave-time/ave-time-docs.factor
rename to demos/project-euler/ave-time/ave-time-docs.factor
diff --git a/extra/project-euler/ave-time/ave-time-tests.factor b/demos/project-euler/ave-time/ave-time-tests.factor
similarity index 100%
rename from extra/project-euler/ave-time/ave-time-tests.factor
rename to demos/project-euler/ave-time/ave-time-tests.factor
diff --git a/extra/project-euler/ave-time/ave-time.factor b/demos/project-euler/ave-time/ave-time.factor
similarity index 100%
rename from extra/project-euler/ave-time/ave-time.factor
rename to demos/project-euler/ave-time/ave-time.factor
diff --git a/extra/project-euler/ave-time/summary.txt b/demos/project-euler/ave-time/summary.txt
similarity index 100%
rename from extra/project-euler/ave-time/summary.txt
rename to demos/project-euler/ave-time/summary.txt
diff --git a/basis/help/lint/tags.txt b/demos/project-euler/ave-time/tags.txt
similarity index 100%
rename from basis/help/lint/tags.txt
rename to demos/project-euler/ave-time/tags.txt
diff --git a/extra/project-euler/common/common-tests.factor b/demos/project-euler/common/common-tests.factor
similarity index 100%
rename from extra/project-euler/common/common-tests.factor
rename to demos/project-euler/common/common-tests.factor
diff --git a/extra/project-euler/common/common.factor b/demos/project-euler/common/common.factor
similarity index 100%
rename from extra/project-euler/common/common.factor
rename to demos/project-euler/common/common.factor
diff --git a/extra/project-euler/project-euler.factor b/demos/project-euler/project-euler.factor
similarity index 100%
rename from extra/project-euler/project-euler.factor
rename to demos/project-euler/project-euler.factor
diff --git a/extra/project-euler/summary.txt b/demos/project-euler/summary.txt
similarity index 100%
rename from extra/project-euler/summary.txt
rename to demos/project-euler/summary.txt
diff --git a/extra/project-euler/tags.txt b/demos/project-euler/tags.txt
similarity index 100%
rename from extra/project-euler/tags.txt
rename to demos/project-euler/tags.txt
diff --git a/extra/rosetta-code/100-doors/100-doors.factor b/demos/rosetta-code/100-doors/100-doors.factor
similarity index 100%
rename from extra/rosetta-code/100-doors/100-doors.factor
rename to demos/rosetta-code/100-doors/100-doors.factor
diff --git a/extra/rosetta-code/ackermann/ackermann.factor b/demos/rosetta-code/ackermann/ackermann.factor
similarity index 100%
rename from extra/rosetta-code/ackermann/ackermann.factor
rename to demos/rosetta-code/ackermann/ackermann.factor
diff --git a/extra/rosetta-code/active-object/active-object.factor b/demos/rosetta-code/active-object/active-object.factor
similarity index 100%
rename from extra/rosetta-code/active-object/active-object.factor
rename to demos/rosetta-code/active-object/active-object.factor
diff --git a/extra/rosetta-code/align-columns/align-columns.factor b/demos/rosetta-code/align-columns/align-columns.factor
similarity index 100%
rename from extra/rosetta-code/align-columns/align-columns.factor
rename to demos/rosetta-code/align-columns/align-columns.factor
diff --git a/extra/rosetta-code/amb/amb.factor b/demos/rosetta-code/amb/amb.factor
similarity index 100%
rename from extra/rosetta-code/amb/amb.factor
rename to demos/rosetta-code/amb/amb.factor
diff --git a/extra/rosetta-code/anagrams-deranged/anagrams-deranged.factor b/demos/rosetta-code/anagrams-deranged/anagrams-deranged.factor
similarity index 100%
rename from extra/rosetta-code/anagrams-deranged/anagrams-deranged.factor
rename to demos/rosetta-code/anagrams-deranged/anagrams-deranged.factor
diff --git a/extra/rosetta-code/animate-pendulum/animate-pendulum.factor b/demos/rosetta-code/animate-pendulum/animate-pendulum.factor
similarity index 100%
rename from extra/rosetta-code/animate-pendulum/animate-pendulum.factor
rename to demos/rosetta-code/animate-pendulum/animate-pendulum.factor
diff --git a/extra/rosetta-code/animation/animation.factor b/demos/rosetta-code/animation/animation.factor
similarity index 100%
rename from extra/rosetta-code/animation/animation.factor
rename to demos/rosetta-code/animation/animation.factor
diff --git a/extra/rosetta-code/arithmetic-evaluation/arithmetic-evaluation.factor b/demos/rosetta-code/arithmetic-evaluation/arithmetic-evaluation.factor
similarity index 100%
rename from extra/rosetta-code/arithmetic-evaluation/arithmetic-evaluation.factor
rename to demos/rosetta-code/arithmetic-evaluation/arithmetic-evaluation.factor
diff --git a/extra/rosetta-code/balanced-brackets/balanced-brackets-tests.factor b/demos/rosetta-code/balanced-brackets/balanced-brackets-tests.factor
similarity index 100%
rename from extra/rosetta-code/balanced-brackets/balanced-brackets-tests.factor
rename to demos/rosetta-code/balanced-brackets/balanced-brackets-tests.factor
diff --git a/extra/rosetta-code/balanced-brackets/balanced-brackets.factor b/demos/rosetta-code/balanced-brackets/balanced-brackets.factor
similarity index 100%
rename from extra/rosetta-code/balanced-brackets/balanced-brackets.factor
rename to demos/rosetta-code/balanced-brackets/balanced-brackets.factor
diff --git a/extra/rosetta-code/bitmap-bezier/bitmap-bezier.factor b/demos/rosetta-code/bitmap-bezier/bitmap-bezier.factor
similarity index 100%
rename from extra/rosetta-code/bitmap-bezier/bitmap-bezier.factor
rename to demos/rosetta-code/bitmap-bezier/bitmap-bezier.factor
diff --git a/extra/rosetta-code/bitmap-line/bitmap-line.factor b/demos/rosetta-code/bitmap-line/bitmap-line.factor
similarity index 100%
rename from extra/rosetta-code/bitmap-line/bitmap-line.factor
rename to demos/rosetta-code/bitmap-line/bitmap-line.factor
diff --git a/extra/rosetta-code/bitmap/bitmap.factor b/demos/rosetta-code/bitmap/bitmap.factor
similarity index 100%
rename from extra/rosetta-code/bitmap/bitmap.factor
rename to demos/rosetta-code/bitmap/bitmap.factor
diff --git a/extra/rosetta-code/bulls-and-cows/bulls-and-cows.factor b/demos/rosetta-code/bulls-and-cows/bulls-and-cows.factor
similarity index 100%
rename from extra/rosetta-code/bulls-and-cows/bulls-and-cows.factor
rename to demos/rosetta-code/bulls-and-cows/bulls-and-cows.factor
diff --git a/extra/rosetta-code/catalan-numbers/catalan-numbers.factor b/demos/rosetta-code/catalan-numbers/catalan-numbers.factor
similarity index 100%
rename from extra/rosetta-code/catalan-numbers/catalan-numbers.factor
rename to demos/rosetta-code/catalan-numbers/catalan-numbers.factor
diff --git a/extra/rosetta-code/conjugate-transpose/conjugate-transpose-tests.factor b/demos/rosetta-code/conjugate-transpose/conjugate-transpose-tests.factor
similarity index 100%
rename from extra/rosetta-code/conjugate-transpose/conjugate-transpose-tests.factor
rename to demos/rosetta-code/conjugate-transpose/conjugate-transpose-tests.factor
diff --git a/extra/rosetta-code/conjugate-transpose/conjugate-transpose.factor b/demos/rosetta-code/conjugate-transpose/conjugate-transpose.factor
similarity index 100%
rename from extra/rosetta-code/conjugate-transpose/conjugate-transpose.factor
rename to demos/rosetta-code/conjugate-transpose/conjugate-transpose.factor
diff --git a/extra/rosetta-code/continued-fraction/continued-fraction.factor b/demos/rosetta-code/continued-fraction/continued-fraction.factor
similarity index 100%
rename from extra/rosetta-code/continued-fraction/continued-fraction.factor
rename to demos/rosetta-code/continued-fraction/continued-fraction.factor
diff --git a/extra/rosetta-code/count-the-coins/count-the-coins-tests.factor b/demos/rosetta-code/count-the-coins/count-the-coins-tests.factor
similarity index 100%
rename from extra/rosetta-code/count-the-coins/count-the-coins-tests.factor
rename to demos/rosetta-code/count-the-coins/count-the-coins-tests.factor
diff --git a/extra/rosetta-code/count-the-coins/count-the-coins.factor b/demos/rosetta-code/count-the-coins/count-the-coins.factor
similarity index 100%
rename from extra/rosetta-code/count-the-coins/count-the-coins.factor
rename to demos/rosetta-code/count-the-coins/count-the-coins.factor
diff --git a/extra/rosetta-code/dice7/dice7.factor b/demos/rosetta-code/dice7/dice7.factor
similarity index 100%
rename from extra/rosetta-code/dice7/dice7.factor
rename to demos/rosetta-code/dice7/dice7.factor
diff --git a/extra/rosetta-code/equilibrium-index/equilibrium-index-tests.factor b/demos/rosetta-code/equilibrium-index/equilibrium-index-tests.factor
similarity index 100%
rename from extra/rosetta-code/equilibrium-index/equilibrium-index-tests.factor
rename to demos/rosetta-code/equilibrium-index/equilibrium-index-tests.factor
diff --git a/extra/rosetta-code/equilibrium-index/equilibrium-index.factor b/demos/rosetta-code/equilibrium-index/equilibrium-index.factor
similarity index 100%
rename from extra/rosetta-code/equilibrium-index/equilibrium-index.factor
rename to demos/rosetta-code/equilibrium-index/equilibrium-index.factor
diff --git a/extra/rosetta-code/fizzbuzz/fizzbuzz.factor b/demos/rosetta-code/fizzbuzz/fizzbuzz.factor
similarity index 100%
rename from extra/rosetta-code/fizzbuzz/fizzbuzz.factor
rename to demos/rosetta-code/fizzbuzz/fizzbuzz.factor
diff --git a/extra/rosetta-code/gray-code/gray-code.factor b/demos/rosetta-code/gray-code/gray-code.factor
similarity index 100%
rename from extra/rosetta-code/gray-code/gray-code.factor
rename to demos/rosetta-code/gray-code/gray-code.factor
diff --git a/extra/rosetta-code/hailstone-sequence/hailstone-sequence.factor b/demos/rosetta-code/hailstone-sequence/hailstone-sequence.factor
similarity index 100%
rename from extra/rosetta-code/hailstone-sequence/hailstone-sequence.factor
rename to demos/rosetta-code/hailstone-sequence/hailstone-sequence.factor
diff --git a/extra/rosetta-code/hamming-lazy/hamming-lazy.factor b/demos/rosetta-code/hamming-lazy/hamming-lazy.factor
similarity index 100%
rename from extra/rosetta-code/hamming-lazy/hamming-lazy.factor
rename to demos/rosetta-code/hamming-lazy/hamming-lazy.factor
diff --git a/extra/rosetta-code/hamming/hamming.factor b/demos/rosetta-code/hamming/hamming.factor
similarity index 100%
rename from extra/rosetta-code/hamming/hamming.factor
rename to demos/rosetta-code/hamming/hamming.factor
diff --git a/extra/rosetta-code/happy-numbers/happy-numbers-tests.factor b/demos/rosetta-code/happy-numbers/happy-numbers-tests.factor
similarity index 100%
rename from extra/rosetta-code/happy-numbers/happy-numbers-tests.factor
rename to demos/rosetta-code/happy-numbers/happy-numbers-tests.factor
diff --git a/extra/rosetta-code/happy-numbers/happy-numbers.factor b/demos/rosetta-code/happy-numbers/happy-numbers.factor
similarity index 100%
rename from extra/rosetta-code/happy-numbers/happy-numbers.factor
rename to demos/rosetta-code/happy-numbers/happy-numbers.factor
diff --git a/extra/rosetta-code/haversine-formula/haversine-formula.factor b/demos/rosetta-code/haversine-formula/haversine-formula.factor
similarity index 100%
rename from extra/rosetta-code/haversine-formula/haversine-formula.factor
rename to demos/rosetta-code/haversine-formula/haversine-formula.factor
diff --git a/extra/rosetta-code/hofstadter-ffs/hofstadter-ffs.factor b/demos/rosetta-code/hofstadter-ffs/hofstadter-ffs.factor
similarity index 100%
rename from extra/rosetta-code/hofstadter-ffs/hofstadter-ffs.factor
rename to demos/rosetta-code/hofstadter-ffs/hofstadter-ffs.factor
diff --git a/extra/rosetta-code/hofstadter-q/hofstadter-q.factor b/demos/rosetta-code/hofstadter-q/hofstadter-q.factor
similarity index 100%
rename from extra/rosetta-code/hofstadter-q/hofstadter-q.factor
rename to demos/rosetta-code/hofstadter-q/hofstadter-q.factor
diff --git a/extra/rosetta-code/image-noise/image-noise.factor b/demos/rosetta-code/image-noise/image-noise.factor
similarity index 100%
rename from extra/rosetta-code/image-noise/image-noise.factor
rename to demos/rosetta-code/image-noise/image-noise.factor
diff --git a/extra/rosetta-code/inverted-index/inverted-index.factor b/demos/rosetta-code/inverted-index/inverted-index.factor
similarity index 100%
rename from extra/rosetta-code/inverted-index/inverted-index.factor
rename to demos/rosetta-code/inverted-index/inverted-index.factor
diff --git a/extra/rosetta-code/josephus-problem/josephus-problem.factor b/demos/rosetta-code/josephus-problem/josephus-problem.factor
similarity index 100%
rename from extra/rosetta-code/josephus-problem/josephus-problem.factor
rename to demos/rosetta-code/josephus-problem/josephus-problem.factor
diff --git a/extra/rosetta-code/knapsack-unbounded/knapsack-unbounded.factor b/demos/rosetta-code/knapsack-unbounded/knapsack-unbounded.factor
similarity index 100%
rename from extra/rosetta-code/knapsack-unbounded/knapsack-unbounded.factor
rename to demos/rosetta-code/knapsack-unbounded/knapsack-unbounded.factor
diff --git a/extra/rosetta-code/knapsack/knapsack.factor b/demos/rosetta-code/knapsack/knapsack.factor
similarity index 100%
rename from extra/rosetta-code/knapsack/knapsack.factor
rename to demos/rosetta-code/knapsack/knapsack.factor
diff --git a/extra/rosetta-code/long-multiplication/long-multiplication.factor b/demos/rosetta-code/long-multiplication/long-multiplication.factor
similarity index 100%
rename from extra/rosetta-code/long-multiplication/long-multiplication.factor
rename to demos/rosetta-code/long-multiplication/long-multiplication.factor
diff --git a/extra/rosetta-code/look-and-say/look-and-say.factor b/demos/rosetta-code/look-and-say/look-and-say.factor
similarity index 100%
rename from extra/rosetta-code/look-and-say/look-and-say.factor
rename to demos/rosetta-code/look-and-say/look-and-say.factor
diff --git a/extra/rosetta-code/luhn-test/luhn-test.factor b/demos/rosetta-code/luhn-test/luhn-test.factor
similarity index 100%
rename from extra/rosetta-code/luhn-test/luhn-test.factor
rename to demos/rosetta-code/luhn-test/luhn-test.factor
diff --git a/extra/rosetta-code/menu/menu.factor b/demos/rosetta-code/menu/menu.factor
similarity index 100%
rename from extra/rosetta-code/menu/menu.factor
rename to demos/rosetta-code/menu/menu.factor
diff --git a/extra/rosetta-code/metronome/metronome.factor b/demos/rosetta-code/metronome/metronome.factor
similarity index 100%
rename from extra/rosetta-code/metronome/metronome.factor
rename to demos/rosetta-code/metronome/metronome.factor
diff --git a/extra/rosetta-code/multiplication-tables/multiplication-tables.factor b/demos/rosetta-code/multiplication-tables/multiplication-tables.factor
similarity index 100%
rename from extra/rosetta-code/multiplication-tables/multiplication-tables.factor
rename to demos/rosetta-code/multiplication-tables/multiplication-tables.factor
diff --git a/extra/rosetta-code/n-queens/n-queens.factor b/demos/rosetta-code/n-queens/n-queens.factor
similarity index 100%
rename from extra/rosetta-code/n-queens/n-queens.factor
rename to demos/rosetta-code/n-queens/n-queens.factor
diff --git a/extra/rosetta-code/number-reversal/number-reversal.factor b/demos/rosetta-code/number-reversal/number-reversal.factor
similarity index 100%
rename from extra/rosetta-code/number-reversal/number-reversal.factor
rename to demos/rosetta-code/number-reversal/number-reversal.factor
diff --git a/extra/rosetta-code/odd-word/odd-word.factor b/demos/rosetta-code/odd-word/odd-word.factor
similarity index 100%
rename from extra/rosetta-code/odd-word/odd-word.factor
rename to demos/rosetta-code/odd-word/odd-word.factor
diff --git a/extra/rosetta-code/one-d-cellular/one-d-cellular.factor b/demos/rosetta-code/one-d-cellular/one-d-cellular.factor
similarity index 100%
rename from extra/rosetta-code/one-d-cellular/one-d-cellular.factor
rename to demos/rosetta-code/one-d-cellular/one-d-cellular.factor
diff --git a/extra/rosetta-code/opengl/opengl.factor b/demos/rosetta-code/opengl/opengl.factor
similarity index 100%
rename from extra/rosetta-code/opengl/opengl.factor
rename to demos/rosetta-code/opengl/opengl.factor
diff --git a/extra/rosetta-code/ordered-words/ordered-words.factor b/demos/rosetta-code/ordered-words/ordered-words.factor
similarity index 100%
rename from extra/rosetta-code/ordered-words/ordered-words.factor
rename to demos/rosetta-code/ordered-words/ordered-words.factor
diff --git a/extra/rosetta-code/pascals-triangle/pascals-triangle.factor b/demos/rosetta-code/pascals-triangle/pascals-triangle.factor
similarity index 100%
rename from extra/rosetta-code/pascals-triangle/pascals-triangle.factor
rename to demos/rosetta-code/pascals-triangle/pascals-triangle.factor
diff --git a/extra/rosetta-code/probabilistic-choice/probabilistic-choice.factor b/demos/rosetta-code/probabilistic-choice/probabilistic-choice.factor
similarity index 100%
rename from extra/rosetta-code/probabilistic-choice/probabilistic-choice.factor
rename to demos/rosetta-code/probabilistic-choice/probabilistic-choice.factor
diff --git a/extra/rosetta-code/pythagorean-triples/pythagorean-triples.factor b/demos/rosetta-code/pythagorean-triples/pythagorean-triples.factor
similarity index 100%
rename from extra/rosetta-code/pythagorean-triples/pythagorean-triples.factor
rename to demos/rosetta-code/pythagorean-triples/pythagorean-triples.factor
diff --git a/extra/rosetta-code/raycasting/raycasting-tests.factor b/demos/rosetta-code/raycasting/raycasting-tests.factor
similarity index 100%
rename from extra/rosetta-code/raycasting/raycasting-tests.factor
rename to demos/rosetta-code/raycasting/raycasting-tests.factor
diff --git a/extra/rosetta-code/raycasting/raycasting.factor b/demos/rosetta-code/raycasting/raycasting.factor
similarity index 100%
rename from extra/rosetta-code/raycasting/raycasting.factor
rename to demos/rosetta-code/raycasting/raycasting.factor
diff --git a/extra/rosetta-code/sierpinski-triangle/sierpinski-triangle.factor b/demos/rosetta-code/sierpinski-triangle/sierpinski-triangle.factor
similarity index 100%
rename from extra/rosetta-code/sierpinski-triangle/sierpinski-triangle.factor
rename to demos/rosetta-code/sierpinski-triangle/sierpinski-triangle.factor
diff --git a/extra/rosetta-code/standard-deviation/standard-deviation.factor b/demos/rosetta-code/standard-deviation/standard-deviation.factor
similarity index 100%
rename from extra/rosetta-code/standard-deviation/standard-deviation.factor
rename to demos/rosetta-code/standard-deviation/standard-deviation.factor
diff --git a/extra/rosetta-code/ternary-logic/ternary-logic.factor b/demos/rosetta-code/ternary-logic/ternary-logic.factor
similarity index 100%
rename from extra/rosetta-code/ternary-logic/ternary-logic.factor
rename to demos/rosetta-code/ternary-logic/ternary-logic.factor
diff --git a/extra/rosetta-code/text-processing/max-licenses/max-licenses.factor b/demos/rosetta-code/text-processing/max-licenses/max-licenses.factor
similarity index 100%
rename from extra/rosetta-code/text-processing/max-licenses/max-licenses.factor
rename to demos/rosetta-code/text-processing/max-licenses/max-licenses.factor
diff --git a/extra/rosetta-code/top-rank/top-rank.factor b/demos/rosetta-code/top-rank/top-rank.factor
similarity index 100%
rename from extra/rosetta-code/top-rank/top-rank.factor
rename to demos/rosetta-code/top-rank/top-rank.factor
diff --git a/extra/rosetta-code/towers-of-hanoi/towers-of-hanoi.factor b/demos/rosetta-code/towers-of-hanoi/towers-of-hanoi.factor
similarity index 100%
rename from extra/rosetta-code/towers-of-hanoi/towers-of-hanoi.factor
rename to demos/rosetta-code/towers-of-hanoi/towers-of-hanoi.factor
diff --git a/extra/rosetta-code/tree-traversal/tree-traversal.factor b/demos/rosetta-code/tree-traversal/tree-traversal.factor
similarity index 100%
rename from extra/rosetta-code/tree-traversal/tree-traversal.factor
rename to demos/rosetta-code/tree-traversal/tree-traversal.factor
diff --git a/extra/rosetta-code/web-scraping/web-scraping.factor b/demos/rosetta-code/web-scraping/web-scraping.factor
similarity index 100%
rename from extra/rosetta-code/web-scraping/web-scraping.factor
rename to demos/rosetta-code/web-scraping/web-scraping.factor
diff --git a/extra/rosetta-code/y-combinator/y-combinator-tests.factor b/demos/rosetta-code/y-combinator/y-combinator-tests.factor
similarity index 100%
rename from extra/rosetta-code/y-combinator/y-combinator-tests.factor
rename to demos/rosetta-code/y-combinator/y-combinator-tests.factor
diff --git a/extra/rosetta-code/y-combinator/y-combinator.factor b/demos/rosetta-code/y-combinator/y-combinator.factor
similarity index 100%
rename from extra/rosetta-code/y-combinator/y-combinator.factor
rename to demos/rosetta-code/y-combinator/y-combinator.factor
diff --git a/extra/smalltalk/ast/ast.factor b/demos/smalltalk/ast/ast.factor
similarity index 100%
rename from extra/smalltalk/ast/ast.factor
rename to demos/smalltalk/ast/ast.factor
diff --git a/basis/help/lint/checks/authors.txt b/demos/smalltalk/ast/authors.txt
similarity index 100%
rename from basis/help/lint/checks/authors.txt
rename to demos/smalltalk/ast/authors.txt
diff --git a/basis/help/tips/authors.txt b/demos/smalltalk/authors.txt
similarity index 100%
rename from basis/help/tips/authors.txt
rename to demos/smalltalk/authors.txt
diff --git a/basis/opengl/textures/authors.txt b/demos/smalltalk/classes/authors.txt
similarity index 100%
rename from basis/opengl/textures/authors.txt
rename to demos/smalltalk/classes/authors.txt
diff --git a/extra/smalltalk/classes/classes.factor b/demos/smalltalk/classes/classes.factor
similarity index 100%
rename from extra/smalltalk/classes/classes.factor
rename to demos/smalltalk/classes/classes.factor
diff --git a/extra/smalltalk/compiler/assignment/assignment.factor b/demos/smalltalk/compiler/assignment/assignment.factor
similarity index 100%
rename from extra/smalltalk/compiler/assignment/assignment.factor
rename to demos/smalltalk/compiler/assignment/assignment.factor
diff --git a/basis/strings/tables/authors.txt b/demos/smalltalk/compiler/assignment/authors.txt
similarity index 100%
rename from basis/strings/tables/authors.txt
rename to demos/smalltalk/compiler/assignment/authors.txt
diff --git a/basis/ui/baseline-alignment/authors.txt b/demos/smalltalk/compiler/authors.txt
similarity index 100%
rename from basis/ui/baseline-alignment/authors.txt
rename to demos/smalltalk/compiler/authors.txt
diff --git a/extra/smalltalk/compiler/compiler-tests.factor b/demos/smalltalk/compiler/compiler-tests.factor
similarity index 100%
rename from extra/smalltalk/compiler/compiler-tests.factor
rename to demos/smalltalk/compiler/compiler-tests.factor
diff --git a/extra/smalltalk/compiler/compiler.factor b/demos/smalltalk/compiler/compiler.factor
similarity index 100%
rename from extra/smalltalk/compiler/compiler.factor
rename to demos/smalltalk/compiler/compiler.factor
diff --git a/basis/ui/gadgets/debug/authors.txt b/demos/smalltalk/compiler/lexenv/authors.txt
similarity index 100%
rename from basis/ui/gadgets/debug/authors.txt
rename to demos/smalltalk/compiler/lexenv/authors.txt
diff --git a/extra/smalltalk/compiler/lexenv/lexenv-tests.factor b/demos/smalltalk/compiler/lexenv/lexenv-tests.factor
similarity index 100%
rename from extra/smalltalk/compiler/lexenv/lexenv-tests.factor
rename to demos/smalltalk/compiler/lexenv/lexenv-tests.factor
diff --git a/extra/smalltalk/compiler/lexenv/lexenv.factor b/demos/smalltalk/compiler/lexenv/lexenv.factor
similarity index 100%
rename from extra/smalltalk/compiler/lexenv/lexenv.factor
rename to demos/smalltalk/compiler/lexenv/lexenv.factor
diff --git a/basis/ui/gadgets/icons/authors.txt b/demos/smalltalk/compiler/return/authors.txt
similarity index 100%
rename from basis/ui/gadgets/icons/authors.txt
rename to demos/smalltalk/compiler/return/authors.txt
diff --git a/extra/smalltalk/compiler/return/return-tests.factor b/demos/smalltalk/compiler/return/return-tests.factor
similarity index 100%
rename from extra/smalltalk/compiler/return/return-tests.factor
rename to demos/smalltalk/compiler/return/return-tests.factor
diff --git a/extra/smalltalk/compiler/return/return.factor b/demos/smalltalk/compiler/return/return.factor
similarity index 100%
rename from extra/smalltalk/compiler/return/return.factor
rename to demos/smalltalk/compiler/return/return.factor
diff --git a/basis/ui/gadgets/line-support/authors.txt b/demos/smalltalk/eval/authors.txt
similarity index 100%
rename from basis/ui/gadgets/line-support/authors.txt
rename to demos/smalltalk/eval/authors.txt
diff --git a/extra/smalltalk/eval/eval-tests.factor b/demos/smalltalk/eval/eval-tests.factor
similarity index 100%
rename from extra/smalltalk/eval/eval-tests.factor
rename to demos/smalltalk/eval/eval-tests.factor
diff --git a/extra/smalltalk/eval/eval.factor b/demos/smalltalk/eval/eval.factor
similarity index 100%
rename from extra/smalltalk/eval/eval.factor
rename to demos/smalltalk/eval/eval.factor
diff --git a/extra/smalltalk/eval/fib.st b/demos/smalltalk/eval/fib.st
similarity index 100%
rename from extra/smalltalk/eval/fib.st
rename to demos/smalltalk/eval/fib.st
diff --git a/basis/ui/gadgets/prettyprint/authors.txt b/demos/smalltalk/library/authors.txt
similarity index 100%
rename from basis/ui/gadgets/prettyprint/authors.txt
rename to demos/smalltalk/library/authors.txt
diff --git a/extra/smalltalk/library/library.factor b/demos/smalltalk/library/library.factor
similarity index 100%
rename from extra/smalltalk/library/library.factor
rename to demos/smalltalk/library/library.factor
diff --git a/basis/ui/images/authors.txt b/demos/smalltalk/listener/authors.txt
similarity index 100%
rename from basis/ui/images/authors.txt
rename to demos/smalltalk/listener/authors.txt
diff --git a/extra/smalltalk/listener/listener.factor b/demos/smalltalk/listener/listener.factor
similarity index 100%
rename from extra/smalltalk/listener/listener.factor
rename to demos/smalltalk/listener/listener.factor
diff --git a/basis/ui/pens/authors.txt b/demos/smalltalk/parser/authors.txt
similarity index 100%
rename from basis/ui/pens/authors.txt
rename to demos/smalltalk/parser/authors.txt
diff --git a/extra/smalltalk/parser/parser-tests.factor b/demos/smalltalk/parser/parser-tests.factor
similarity index 100%
rename from extra/smalltalk/parser/parser-tests.factor
rename to demos/smalltalk/parser/parser-tests.factor
diff --git a/extra/smalltalk/parser/parser.factor b/demos/smalltalk/parser/parser.factor
similarity index 100%
rename from extra/smalltalk/parser/parser.factor
rename to demos/smalltalk/parser/parser.factor
diff --git a/extra/smalltalk/parser/test.st b/demos/smalltalk/parser/test.st
similarity index 100%
rename from extra/smalltalk/parser/test.st
rename to demos/smalltalk/parser/test.st
diff --git a/basis/ui/pens/caching/authors.txt b/demos/smalltalk/printer/authors.txt
similarity index 100%
rename from basis/ui/pens/caching/authors.txt
rename to demos/smalltalk/printer/authors.txt
diff --git a/extra/smalltalk/printer/printer-tests.factor b/demos/smalltalk/printer/printer-tests.factor
similarity index 100%
rename from extra/smalltalk/printer/printer-tests.factor
rename to demos/smalltalk/printer/printer-tests.factor
diff --git a/extra/smalltalk/printer/printer.factor b/demos/smalltalk/printer/printer.factor
similarity index 100%
rename from extra/smalltalk/printer/printer.factor
rename to demos/smalltalk/printer/printer.factor
diff --git a/basis/ui/pens/gradient/authors.txt b/demos/smalltalk/selectors/authors.txt
similarity index 100%
rename from basis/ui/pens/gradient/authors.txt
rename to demos/smalltalk/selectors/authors.txt
diff --git a/extra/smalltalk/selectors/selectors.factor b/demos/smalltalk/selectors/selectors.factor
similarity index 100%
rename from extra/smalltalk/selectors/selectors.factor
rename to demos/smalltalk/selectors/selectors.factor
diff --git a/basis/sequences/complex-components/authors.txt b/demos/spheres/authors.txt
similarity index 100%
rename from basis/sequences/complex-components/authors.txt
rename to demos/spheres/authors.txt
diff --git a/extra/spheres/deploy.factor b/demos/spheres/deploy.factor
similarity index 100%
rename from extra/spheres/deploy.factor
rename to demos/spheres/deploy.factor
diff --git a/extra/spheres/spheres.factor b/demos/spheres/spheres.factor
similarity index 100%
rename from extra/spheres/spheres.factor
rename to demos/spheres/spheres.factor
diff --git a/extra/spheres/summary.txt b/demos/spheres/summary.txt
similarity index 100%
rename from extra/spheres/summary.txt
rename to demos/spheres/summary.txt
diff --git a/extra/spheres/tags.txt b/demos/spheres/tags.txt
similarity index 100%
rename from extra/spheres/tags.txt
rename to demos/spheres/tags.txt
diff --git a/basis/ui/pens/image/authors.txt b/demos/talks/chicago-talk/authors.txt
similarity index 100%
rename from basis/ui/pens/image/authors.txt
rename to demos/talks/chicago-talk/authors.txt
diff --git a/extra/talks/chicago-talk/chicago-talk.factor b/demos/talks/chicago-talk/chicago-talk.factor
similarity index 100%
rename from extra/talks/chicago-talk/chicago-talk.factor
rename to demos/talks/chicago-talk/chicago-talk.factor
diff --git a/extra/talks/chicago-talk/deploy.factor b/demos/talks/chicago-talk/deploy.factor
similarity index 100%
rename from extra/talks/chicago-talk/deploy.factor
rename to demos/talks/chicago-talk/deploy.factor
diff --git a/extra/talks/chicago-talk/summary.txt b/demos/talks/chicago-talk/summary.txt
similarity index 100%
rename from extra/talks/chicago-talk/summary.txt
rename to demos/talks/chicago-talk/summary.txt
diff --git a/extra/lcd/tags.txt b/demos/talks/chicago-talk/tags.txt
similarity index 100%
rename from extra/lcd/tags.txt
rename to demos/talks/chicago-talk/tags.txt
diff --git a/basis/furnace/scopes/authors.txt b/demos/talks/galois-talk/authors.txt
similarity index 100%
rename from basis/furnace/scopes/authors.txt
rename to demos/talks/galois-talk/authors.txt
diff --git a/extra/talks/galois-talk/galois-talk.factor b/demos/talks/galois-talk/galois-talk.factor
similarity index 100%
rename from extra/talks/galois-talk/galois-talk.factor
rename to demos/talks/galois-talk/galois-talk.factor
diff --git a/extra/talks/galois-talk/summary.txt b/demos/talks/galois-talk/summary.txt
similarity index 100%
rename from extra/talks/galois-talk/summary.txt
rename to demos/talks/galois-talk/summary.txt
diff --git a/extra/maze/tags.txt b/demos/talks/galois-talk/tags.txt
similarity index 100%
rename from extra/maze/tags.txt
rename to demos/talks/galois-talk/tags.txt
diff --git a/basis/furnace/syndication/authors.txt b/demos/talks/google-tech-talk/authors.txt
similarity index 100%
rename from basis/furnace/syndication/authors.txt
rename to demos/talks/google-tech-talk/authors.txt
diff --git a/extra/talks/google-tech-talk/google-tech-talk.factor b/demos/talks/google-tech-talk/google-tech-talk.factor
similarity index 100%
rename from extra/talks/google-tech-talk/google-tech-talk.factor
rename to demos/talks/google-tech-talk/google-tech-talk.factor
diff --git a/extra/talks/google-tech-talk/summary.txt b/demos/talks/google-tech-talk/summary.txt
similarity index 100%
rename from extra/talks/google-tech-talk/summary.txt
rename to demos/talks/google-tech-talk/summary.txt
diff --git a/extra/nehe/tags.txt b/demos/talks/google-tech-talk/tags.txt
similarity index 100%
rename from extra/nehe/tags.txt
rename to demos/talks/google-tech-talk/tags.txt
diff --git a/basis/ui/pens/polygon/authors.txt b/demos/talks/jvm-summit-talk/authors.txt
similarity index 100%
rename from basis/ui/pens/polygon/authors.txt
rename to demos/talks/jvm-summit-talk/authors.txt
diff --git a/extra/talks/jvm-summit-talk/jvm-summit-talk.factor b/demos/talks/jvm-summit-talk/jvm-summit-talk.factor
similarity index 100%
rename from extra/talks/jvm-summit-talk/jvm-summit-talk.factor
rename to demos/talks/jvm-summit-talk/jvm-summit-talk.factor
diff --git a/extra/talks/jvm-summit-talk/summary.txt b/demos/talks/jvm-summit-talk/summary.txt
similarity index 100%
rename from extra/talks/jvm-summit-talk/summary.txt
rename to demos/talks/jvm-summit-talk/summary.txt
diff --git a/basis/furnace/utilities/authors.txt b/demos/talks/minneapolis-talk/authors.txt
similarity index 100%
rename from basis/furnace/utilities/authors.txt
rename to demos/talks/minneapolis-talk/authors.txt
diff --git a/extra/talks/minneapolis-talk/deploy.factor b/demos/talks/minneapolis-talk/deploy.factor
similarity index 100%
rename from extra/talks/minneapolis-talk/deploy.factor
rename to demos/talks/minneapolis-talk/deploy.factor
diff --git a/extra/talks/minneapolis-talk/minneapolis-talk.factor b/demos/talks/minneapolis-talk/minneapolis-talk.factor
similarity index 100%
rename from extra/talks/minneapolis-talk/minneapolis-talk.factor
rename to demos/talks/minneapolis-talk/minneapolis-talk.factor
diff --git a/extra/talks/minneapolis-talk/summary.txt b/demos/talks/minneapolis-talk/summary.txt
similarity index 100%
rename from extra/talks/minneapolis-talk/summary.txt
rename to demos/talks/minneapolis-talk/summary.txt
diff --git a/extra/numbers-game/tags.txt b/demos/talks/minneapolis-talk/tags.txt
similarity index 100%
rename from extra/numbers-game/tags.txt
rename to demos/talks/minneapolis-talk/tags.txt
diff --git a/extra/talks/otug-talk/2bi.tiff b/demos/talks/otug-talk/2bi.tiff
similarity index 100%
rename from extra/talks/otug-talk/2bi.tiff
rename to demos/talks/otug-talk/2bi.tiff
diff --git a/extra/talks/otug-talk/2bi_at.tiff b/demos/talks/otug-talk/2bi_at.tiff
similarity index 100%
rename from extra/talks/otug-talk/2bi_at.tiff
rename to demos/talks/otug-talk/2bi_at.tiff
diff --git a/extra/talks/otug-talk/2bi_star.tiff b/demos/talks/otug-talk/2bi_star.tiff
similarity index 100%
rename from extra/talks/otug-talk/2bi_star.tiff
rename to demos/talks/otug-talk/2bi_star.tiff
diff --git a/basis/help/authors.txt b/demos/talks/otug-talk/authors.txt
similarity index 100%
rename from basis/help/authors.txt
rename to demos/talks/otug-talk/authors.txt
diff --git a/extra/talks/otug-talk/bi.tiff b/demos/talks/otug-talk/bi.tiff
similarity index 100%
rename from extra/talks/otug-talk/bi.tiff
rename to demos/talks/otug-talk/bi.tiff
diff --git a/extra/talks/otug-talk/bi_at.tiff b/demos/talks/otug-talk/bi_at.tiff
similarity index 100%
rename from extra/talks/otug-talk/bi_at.tiff
rename to demos/talks/otug-talk/bi_at.tiff
diff --git a/extra/talks/otug-talk/bi_star.tiff b/demos/talks/otug-talk/bi_star.tiff
similarity index 100%
rename from extra/talks/otug-talk/bi_star.tiff
rename to demos/talks/otug-talk/bi_star.tiff
diff --git a/extra/talks/otug-talk/otug-talk.factor b/demos/talks/otug-talk/otug-talk.factor
similarity index 100%
rename from extra/talks/otug-talk/otug-talk.factor
rename to demos/talks/otug-talk/otug-talk.factor
diff --git a/extra/talks/otug-talk/summary.txt b/demos/talks/otug-talk/summary.txt
similarity index 100%
rename from extra/talks/otug-talk/summary.txt
rename to demos/talks/otug-talk/summary.txt
diff --git a/extra/sudoku/tags.txt b/demos/talks/otug-talk/tags.txt
similarity index 100%
rename from extra/sudoku/tags.txt
rename to demos/talks/otug-talk/tags.txt
diff --git a/basis/furnace/recaptcha/example/authors.txt b/demos/talks/tc-lisp-talk/authors.txt
similarity index 100%
rename from basis/furnace/recaptcha/example/authors.txt
rename to demos/talks/tc-lisp-talk/authors.txt
diff --git a/extra/talks/tc-lisp-talk/tc-lisp-talk.factor b/demos/talks/tc-lisp-talk/tc-lisp-talk.factor
similarity index 100%
rename from extra/talks/tc-lisp-talk/tc-lisp-talk.factor
rename to demos/talks/tc-lisp-talk/tc-lisp-talk.factor
diff --git a/basis/help/cookbook/authors.txt b/demos/talks/vpri-talk/authors.txt
similarity index 100%
rename from basis/help/cookbook/authors.txt
rename to demos/talks/vpri-talk/authors.txt
diff --git a/extra/talks/vpri-talk/summary.txt b/demos/talks/vpri-talk/summary.txt
similarity index 100%
rename from extra/talks/vpri-talk/summary.txt
rename to demos/talks/vpri-talk/summary.txt
diff --git a/extra/talks/chicago-talk/tags.txt b/demos/talks/vpri-talk/tags.txt
similarity index 100%
rename from extra/talks/chicago-talk/tags.txt
rename to demos/talks/vpri-talk/tags.txt
diff --git a/extra/talks/vpri-talk/vpri-talk.factor b/demos/talks/vpri-talk/vpri-talk.factor
similarity index 100%
rename from extra/talks/vpri-talk/vpri-talk.factor
rename to demos/talks/vpri-talk/vpri-talk.factor
diff --git a/extra/trails/trails.factor b/demos/trails/trails.factor
similarity index 100%
rename from extra/trails/trails.factor
rename to demos/trails/trails.factor
diff --git a/basis/help/crossref/authors.txt b/demos/turing/authors.txt
similarity index 100%
rename from basis/help/crossref/authors.txt
rename to demos/turing/authors.txt
diff --git a/extra/turing/summary.txt b/demos/turing/summary.txt
similarity index 100%
rename from extra/turing/summary.txt
rename to demos/turing/summary.txt
diff --git a/extra/turing/turing.factor b/demos/turing/turing.factor
similarity index 100%
rename from extra/turing/turing.factor
rename to demos/turing/turing.factor
diff --git a/basis/help/definitions/authors.txt b/demos/webkit-demo/authors.txt
similarity index 100%
rename from basis/help/definitions/authors.txt
rename to demos/webkit-demo/authors.txt
diff --git a/extra/webkit-demo/deploy.factor b/demos/webkit-demo/deploy.factor
similarity index 100%
rename from extra/webkit-demo/deploy.factor
rename to demos/webkit-demo/deploy.factor
diff --git a/basis/cocoa/apple-script/platforms.txt b/demos/webkit-demo/platforms.txt
similarity index 100%
rename from basis/cocoa/apple-script/platforms.txt
rename to demos/webkit-demo/platforms.txt
diff --git a/extra/webkit-demo/summary.txt b/demos/webkit-demo/summary.txt
similarity index 100%
rename from extra/webkit-demo/summary.txt
rename to demos/webkit-demo/summary.txt
diff --git a/extra/webkit-demo/webkit-demo.factor b/demos/webkit-demo/webkit-demo.factor
similarity index 100%
rename from extra/webkit-demo/webkit-demo.factor
rename to demos/webkit-demo/webkit-demo.factor
diff --git a/basis/sequences/complex/authors.txt b/demos/window-controls-demo/authors.txt
similarity index 100%
rename from basis/sequences/complex/authors.txt
rename to demos/window-controls-demo/authors.txt
diff --git a/extra/window-controls-demo/summary.txt b/demos/window-controls-demo/summary.txt
similarity index 100%
rename from extra/window-controls-demo/summary.txt
rename to demos/window-controls-demo/summary.txt
diff --git a/extra/window-controls-demo/window-controls-demo.factor b/demos/window-controls-demo/window-controls-demo.factor
similarity index 100%
rename from extra/window-controls-demo/window-controls-demo.factor
rename to demos/window-controls-demo/window-controls-demo.factor
diff --git a/basis/atk/Atk-1.0.gir b/ffi/atk/Atk-1.0.gir
similarity index 100%
rename from basis/atk/Atk-1.0.gir
rename to ffi/atk/Atk-1.0.gir
diff --git a/basis/atk/atk.factor b/ffi/atk/atk.factor
similarity index 100%
rename from basis/atk/atk.factor
rename to ffi/atk/atk.factor
diff --git a/basis/atk/authors.txt b/ffi/atk/authors.txt
similarity index 100%
rename from basis/atk/authors.txt
rename to ffi/atk/authors.txt
diff --git a/basis/atk/ffi/ffi.factor b/ffi/atk/ffi/ffi.factor
similarity index 100%
rename from basis/atk/ffi/ffi.factor
rename to ffi/atk/ffi/ffi.factor
diff --git a/basis/atk/summary.txt b/ffi/atk/summary.txt
similarity index 100%
rename from basis/atk/summary.txt
rename to ffi/atk/summary.txt
diff --git a/basis/atk/tags.txt b/ffi/atk/tags.txt
similarity index 100%
rename from basis/atk/tags.txt
rename to ffi/atk/tags.txt
diff --git a/extra/cairo-demo/authors.txt b/ffi/cairo-demo/authors.txt
similarity index 100%
rename from extra/cairo-demo/authors.txt
rename to ffi/cairo-demo/authors.txt
diff --git a/extra/cairo-demo/cairo-demo.factor b/ffi/cairo-demo/cairo-demo.factor
similarity index 100%
rename from extra/cairo-demo/cairo-demo.factor
rename to ffi/cairo-demo/cairo-demo.factor
diff --git a/extra/cairo-gadgets/cairo-gadgets.factor b/ffi/cairo-gadgets/cairo-gadgets.factor
similarity index 100%
rename from extra/cairo-gadgets/cairo-gadgets.factor
rename to ffi/cairo-gadgets/cairo-gadgets.factor
diff --git a/extra/cairo-gadgets/summary.txt b/ffi/cairo-gadgets/summary.txt
similarity index 100%
rename from extra/cairo-gadgets/summary.txt
rename to ffi/cairo-gadgets/summary.txt
diff --git a/extra/cairo-samples/cairo-samples.factor b/ffi/cairo-samples/cairo-samples.factor
similarity index 100%
rename from extra/cairo-samples/cairo-samples.factor
rename to ffi/cairo-samples/cairo-samples.factor
diff --git a/basis/cairo/authors.txt b/ffi/cairo/authors.txt
similarity index 100%
rename from basis/cairo/authors.txt
rename to ffi/cairo/authors.txt
diff --git a/basis/cairo/cairo-tests.factor b/ffi/cairo/cairo-tests.factor
similarity index 100%
rename from basis/cairo/cairo-tests.factor
rename to ffi/cairo/cairo-tests.factor
diff --git a/basis/cairo/cairo.factor b/ffi/cairo/cairo.factor
similarity index 100%
rename from basis/cairo/cairo.factor
rename to ffi/cairo/cairo.factor
diff --git a/basis/cairo/ffi/ffi.factor b/ffi/cairo/ffi/ffi.factor
similarity index 100%
rename from basis/cairo/ffi/ffi.factor
rename to ffi/cairo/ffi/ffi.factor
diff --git a/basis/cairo/ffi/summary.txt b/ffi/cairo/ffi/summary.txt
similarity index 100%
rename from basis/cairo/ffi/summary.txt
rename to ffi/cairo/ffi/summary.txt
diff --git a/basis/cairo/summary.txt b/ffi/cairo/summary.txt
similarity index 100%
rename from basis/cairo/summary.txt
rename to ffi/cairo/summary.txt
diff --git a/basis/cairo/tags.txt b/ffi/cairo/tags.txt
similarity index 100%
rename from basis/cairo/tags.txt
rename to ffi/cairo/tags.txt
diff --git a/extra/clutter/Clutter-1.0.gir b/ffi/clutter/Clutter-1.0.gir
similarity index 100%
rename from extra/clutter/Clutter-1.0.gir
rename to ffi/clutter/Clutter-1.0.gir
diff --git a/basis/gdk/authors.txt b/ffi/clutter/authors.txt
similarity index 100%
rename from basis/gdk/authors.txt
rename to ffi/clutter/authors.txt
diff --git a/extra/clutter/cally/Cally-1.0.gir b/ffi/clutter/cally/Cally-1.0.gir
similarity index 100%
rename from extra/clutter/cally/Cally-1.0.gir
rename to ffi/clutter/cally/Cally-1.0.gir
diff --git a/extra/clutter/cally/cally.factor b/ffi/clutter/cally/cally.factor
similarity index 100%
rename from extra/clutter/cally/cally.factor
rename to ffi/clutter/cally/cally.factor
diff --git a/extra/clutter/cally/ffi/ffi.factor b/ffi/clutter/cally/ffi/ffi.factor
similarity index 100%
rename from extra/clutter/cally/ffi/ffi.factor
rename to ffi/clutter/cally/ffi/ffi.factor
diff --git a/extra/clutter/clutter.factor b/ffi/clutter/clutter.factor
similarity index 100%
rename from extra/clutter/clutter.factor
rename to ffi/clutter/clutter.factor
diff --git a/extra/clutter/cogl/Cogl-1.0.gir b/ffi/clutter/cogl/Cogl-1.0.gir
similarity index 100%
rename from extra/clutter/cogl/Cogl-1.0.gir
rename to ffi/clutter/cogl/Cogl-1.0.gir
diff --git a/extra/clutter/cogl/cogl.factor b/ffi/clutter/cogl/cogl.factor
similarity index 100%
rename from extra/clutter/cogl/cogl.factor
rename to ffi/clutter/cogl/cogl.factor
diff --git a/extra/clutter/cogl/ffi/ffi.factor b/ffi/clutter/cogl/ffi/ffi.factor
similarity index 100%
rename from extra/clutter/cogl/ffi/ffi.factor
rename to ffi/clutter/cogl/ffi/ffi.factor
diff --git a/extra/clutter/ffi/ffi.factor b/ffi/clutter/ffi/ffi.factor
similarity index 100%
rename from extra/clutter/ffi/ffi.factor
rename to ffi/clutter/ffi/ffi.factor
diff --git a/extra/clutter/gtk/GtkClutter-1.0.gir b/ffi/clutter/gtk/GtkClutter-1.0.gir
similarity index 100%
rename from extra/clutter/gtk/GtkClutter-1.0.gir
rename to ffi/clutter/gtk/GtkClutter-1.0.gir
diff --git a/extra/clutter/gtk/ffi/ffi.factor b/ffi/clutter/gtk/ffi/ffi.factor
similarity index 100%
rename from extra/clutter/gtk/ffi/ffi.factor
rename to ffi/clutter/gtk/ffi/ffi.factor
diff --git a/extra/clutter/gtk/gtk.factor b/ffi/clutter/gtk/gtk.factor
similarity index 100%
rename from extra/clutter/gtk/gtk.factor
rename to ffi/clutter/gtk/gtk.factor
diff --git a/extra/clutter/json/Json-1.0.gir b/ffi/clutter/json/Json-1.0.gir
similarity index 100%
rename from extra/clutter/json/Json-1.0.gir
rename to ffi/clutter/json/Json-1.0.gir
diff --git a/extra/clutter/json/ffi/ffi.factor b/ffi/clutter/json/ffi/ffi.factor
similarity index 100%
rename from extra/clutter/json/ffi/ffi.factor
rename to ffi/clutter/json/ffi/ffi.factor
diff --git a/extra/clutter/json/json.factor b/ffi/clutter/json/json.factor
similarity index 100%
rename from extra/clutter/json/json.factor
rename to ffi/clutter/json/json.factor
diff --git a/extra/clutter/summary.txt b/ffi/clutter/summary.txt
similarity index 100%
rename from extra/clutter/summary.txt
rename to ffi/clutter/summary.txt
diff --git a/basis/core-foundation/arrays/tags.txt b/ffi/clutter/tags.txt
similarity index 100%
rename from basis/core-foundation/arrays/tags.txt
rename to ffi/clutter/tags.txt
diff --git a/basis/cocoa/apple-script/apple-script-docs.factor b/ffi/cocoa/apple-script/apple-script-docs.factor
similarity index 100%
rename from basis/cocoa/apple-script/apple-script-docs.factor
rename to ffi/cocoa/apple-script/apple-script-docs.factor
diff --git a/basis/cocoa/apple-script/apple-script.factor b/ffi/cocoa/apple-script/apple-script.factor
similarity index 100%
rename from basis/cocoa/apple-script/apple-script.factor
rename to ffi/cocoa/apple-script/apple-script.factor
diff --git a/extra/file-monitor/authors.txt b/ffi/cocoa/apple-script/authors.txt
similarity index 100%
rename from extra/file-monitor/authors.txt
rename to ffi/cocoa/apple-script/authors.txt
diff --git a/basis/cocoa/application/platforms.txt b/ffi/cocoa/apple-script/platforms.txt
similarity index 100%
rename from basis/cocoa/application/platforms.txt
rename to ffi/cocoa/apple-script/platforms.txt
diff --git a/basis/cocoa/application/application-docs.factor b/ffi/cocoa/application/application-docs.factor
similarity index 100%
rename from basis/cocoa/application/application-docs.factor
rename to ffi/cocoa/application/application-docs.factor
diff --git a/basis/cocoa/application/application.factor b/ffi/cocoa/application/application.factor
similarity index 100%
rename from basis/cocoa/application/application.factor
rename to ffi/cocoa/application/application.factor
diff --git a/basis/help/handbook/authors.txt b/ffi/cocoa/application/authors.txt
similarity index 100%
rename from basis/help/handbook/authors.txt
rename to ffi/cocoa/application/authors.txt
diff --git a/basis/cocoa/dialogs/platforms.txt b/ffi/cocoa/application/platforms.txt
similarity index 100%
rename from basis/cocoa/dialogs/platforms.txt
rename to ffi/cocoa/application/platforms.txt
diff --git a/basis/cocoa/application/summary.txt b/ffi/cocoa/application/summary.txt
similarity index 100%
rename from basis/cocoa/application/summary.txt
rename to ffi/cocoa/application/summary.txt
diff --git a/basis/help/lint/authors.txt b/ffi/cocoa/authors.txt
similarity index 100%
rename from basis/help/lint/authors.txt
rename to ffi/cocoa/authors.txt
diff --git a/basis/cocoa/cocoa-docs.factor b/ffi/cocoa/cocoa-docs.factor
similarity index 100%
rename from basis/cocoa/cocoa-docs.factor
rename to ffi/cocoa/cocoa-docs.factor
diff --git a/basis/cocoa/cocoa-tests.factor b/ffi/cocoa/cocoa-tests.factor
similarity index 100%
rename from basis/cocoa/cocoa-tests.factor
rename to ffi/cocoa/cocoa-tests.factor
diff --git a/basis/cocoa/cocoa.factor b/ffi/cocoa/cocoa.factor
similarity index 100%
rename from basis/cocoa/cocoa.factor
rename to ffi/cocoa/cocoa.factor
diff --git a/basis/help/markup/authors.txt b/ffi/cocoa/dialogs/authors.txt
similarity index 100%
rename from basis/help/markup/authors.txt
rename to ffi/cocoa/dialogs/authors.txt
diff --git a/basis/cocoa/dialogs/dialogs-docs.factor b/ffi/cocoa/dialogs/dialogs-docs.factor
similarity index 100%
rename from basis/cocoa/dialogs/dialogs-docs.factor
rename to ffi/cocoa/dialogs/dialogs-docs.factor
diff --git a/basis/cocoa/dialogs/dialogs.factor b/ffi/cocoa/dialogs/dialogs.factor
similarity index 100%
rename from basis/cocoa/dialogs/dialogs.factor
rename to ffi/cocoa/dialogs/dialogs.factor
diff --git a/basis/cocoa/enumeration/platforms.txt b/ffi/cocoa/dialogs/platforms.txt
similarity index 100%
rename from basis/cocoa/enumeration/platforms.txt
rename to ffi/cocoa/dialogs/platforms.txt
diff --git a/basis/cocoa/dialogs/summary.txt b/ffi/cocoa/dialogs/summary.txt
similarity index 100%
rename from basis/cocoa/dialogs/summary.txt
rename to ffi/cocoa/dialogs/summary.txt
diff --git a/basis/cocoa/enumeration/enumeration.factor b/ffi/cocoa/enumeration/enumeration.factor
similarity index 100%
rename from basis/cocoa/enumeration/enumeration.factor
rename to ffi/cocoa/enumeration/enumeration.factor
diff --git a/basis/cocoa/messages/platforms.txt b/ffi/cocoa/enumeration/platforms.txt
similarity index 100%
rename from basis/cocoa/messages/platforms.txt
rename to ffi/cocoa/enumeration/platforms.txt
diff --git a/basis/cocoa/enumeration/summary.txt b/ffi/cocoa/enumeration/summary.txt
similarity index 100%
rename from basis/cocoa/enumeration/summary.txt
rename to ffi/cocoa/enumeration/summary.txt
diff --git a/basis/help/stylesheet/authors.txt b/ffi/cocoa/messages/authors.txt
similarity index 100%
rename from basis/help/stylesheet/authors.txt
rename to ffi/cocoa/messages/authors.txt
diff --git a/basis/cocoa/messages/messages-docs.factor b/ffi/cocoa/messages/messages-docs.factor
similarity index 100%
rename from basis/cocoa/messages/messages-docs.factor
rename to ffi/cocoa/messages/messages-docs.factor
diff --git a/basis/cocoa/messages/messages-tests.factor b/ffi/cocoa/messages/messages-tests.factor
similarity index 100%
rename from basis/cocoa/messages/messages-tests.factor
rename to ffi/cocoa/messages/messages-tests.factor
diff --git a/basis/cocoa/messages/messages.factor b/ffi/cocoa/messages/messages.factor
similarity index 100%
rename from basis/cocoa/messages/messages.factor
rename to ffi/cocoa/messages/messages.factor
diff --git a/basis/cocoa/nibs/platforms.txt b/ffi/cocoa/messages/platforms.txt
similarity index 100%
rename from basis/cocoa/nibs/platforms.txt
rename to ffi/cocoa/messages/platforms.txt
diff --git a/basis/cocoa/messages/summary.txt b/ffi/cocoa/messages/summary.txt
similarity index 100%
rename from basis/cocoa/messages/summary.txt
rename to ffi/cocoa/messages/summary.txt
diff --git a/basis/cocoa/nibs/authors.txt b/ffi/cocoa/nibs/authors.txt
similarity index 100%
rename from basis/cocoa/nibs/authors.txt
rename to ffi/cocoa/nibs/authors.txt
diff --git a/basis/cocoa/nibs/nibs-docs.factor b/ffi/cocoa/nibs/nibs-docs.factor
similarity index 100%
rename from basis/cocoa/nibs/nibs-docs.factor
rename to ffi/cocoa/nibs/nibs-docs.factor
diff --git a/basis/cocoa/nibs/nibs.factor b/ffi/cocoa/nibs/nibs.factor
similarity index 100%
rename from basis/cocoa/nibs/nibs.factor
rename to ffi/cocoa/nibs/nibs.factor
diff --git a/basis/cocoa/pasteboard/platforms.txt b/ffi/cocoa/nibs/platforms.txt
similarity index 100%
rename from basis/cocoa/pasteboard/platforms.txt
rename to ffi/cocoa/nibs/platforms.txt
diff --git a/basis/cocoa/nibs/summary.txt b/ffi/cocoa/nibs/summary.txt
similarity index 100%
rename from basis/cocoa/nibs/summary.txt
rename to ffi/cocoa/nibs/summary.txt
diff --git a/basis/help/syntax/authors.txt b/ffi/cocoa/pasteboard/authors.txt
similarity index 100%
rename from basis/help/syntax/authors.txt
rename to ffi/cocoa/pasteboard/authors.txt
diff --git a/basis/cocoa/pasteboard/pasteboard-docs.factor b/ffi/cocoa/pasteboard/pasteboard-docs.factor
similarity index 100%
rename from basis/cocoa/pasteboard/pasteboard-docs.factor
rename to ffi/cocoa/pasteboard/pasteboard-docs.factor
diff --git a/basis/cocoa/pasteboard/pasteboard.factor b/ffi/cocoa/pasteboard/pasteboard.factor
similarity index 100%
rename from basis/cocoa/pasteboard/pasteboard.factor
rename to ffi/cocoa/pasteboard/pasteboard.factor
diff --git a/basis/cocoa/platforms.txt b/ffi/cocoa/pasteboard/platforms.txt
similarity index 100%
rename from basis/cocoa/platforms.txt
rename to ffi/cocoa/pasteboard/platforms.txt
diff --git a/basis/cocoa/pasteboard/summary.txt b/ffi/cocoa/pasteboard/summary.txt
similarity index 100%
rename from basis/cocoa/pasteboard/summary.txt
rename to ffi/cocoa/pasteboard/summary.txt
diff --git a/basis/cocoa/plists/platforms.txt b/ffi/cocoa/platforms.txt
similarity index 100%
rename from basis/cocoa/plists/platforms.txt
rename to ffi/cocoa/platforms.txt
diff --git a/basis/help/topics/authors.txt b/ffi/cocoa/plists/authors.txt
similarity index 100%
rename from basis/help/topics/authors.txt
rename to ffi/cocoa/plists/authors.txt
diff --git a/basis/cocoa/runtime/platforms.txt b/ffi/cocoa/plists/platforms.txt
similarity index 100%
rename from basis/cocoa/runtime/platforms.txt
rename to ffi/cocoa/plists/platforms.txt
diff --git a/basis/cocoa/plists/plists-tests.factor b/ffi/cocoa/plists/plists-tests.factor
similarity index 100%
rename from basis/cocoa/plists/plists-tests.factor
rename to ffi/cocoa/plists/plists-tests.factor
diff --git a/basis/cocoa/plists/plists.factor b/ffi/cocoa/plists/plists.factor
similarity index 100%
rename from basis/cocoa/plists/plists.factor
rename to ffi/cocoa/plists/plists.factor
diff --git a/basis/cocoa/plists/summary.txt b/ffi/cocoa/plists/summary.txt
similarity index 100%
rename from basis/cocoa/plists/summary.txt
rename to ffi/cocoa/plists/summary.txt
diff --git a/basis/help/tutorial/authors.txt b/ffi/cocoa/runtime/authors.txt
similarity index 100%
rename from basis/help/tutorial/authors.txt
rename to ffi/cocoa/runtime/authors.txt
diff --git a/basis/cocoa/subclassing/platforms.txt b/ffi/cocoa/runtime/platforms.txt
similarity index 100%
rename from basis/cocoa/subclassing/platforms.txt
rename to ffi/cocoa/runtime/platforms.txt
diff --git a/basis/cocoa/runtime/runtime.factor b/ffi/cocoa/runtime/runtime.factor
similarity index 100%
rename from basis/cocoa/runtime/runtime.factor
rename to ffi/cocoa/runtime/runtime.factor
diff --git a/basis/cocoa/runtime/summary.txt b/ffi/cocoa/runtime/summary.txt
similarity index 100%
rename from basis/cocoa/runtime/summary.txt
rename to ffi/cocoa/runtime/summary.txt
diff --git a/basis/inspector/authors.txt b/ffi/cocoa/subclassing/authors.txt
similarity index 100%
rename from basis/inspector/authors.txt
rename to ffi/cocoa/subclassing/authors.txt
diff --git a/basis/cocoa/types/platforms.txt b/ffi/cocoa/subclassing/platforms.txt
similarity index 100%
rename from basis/cocoa/types/platforms.txt
rename to ffi/cocoa/subclassing/platforms.txt
diff --git a/basis/cocoa/subclassing/subclassing-docs.factor b/ffi/cocoa/subclassing/subclassing-docs.factor
similarity index 100%
rename from basis/cocoa/subclassing/subclassing-docs.factor
rename to ffi/cocoa/subclassing/subclassing-docs.factor
diff --git a/basis/cocoa/subclassing/subclassing.factor b/ffi/cocoa/subclassing/subclassing.factor
similarity index 100%
rename from basis/cocoa/subclassing/subclassing.factor
rename to ffi/cocoa/subclassing/subclassing.factor
diff --git a/basis/cocoa/subclassing/summary.txt b/ffi/cocoa/subclassing/summary.txt
similarity index 100%
rename from basis/cocoa/subclassing/summary.txt
rename to ffi/cocoa/subclassing/summary.txt
diff --git a/basis/cocoa/summary.txt b/ffi/cocoa/summary.txt
similarity index 100%
rename from basis/cocoa/summary.txt
rename to ffi/cocoa/summary.txt
diff --git a/basis/cocoa/tags.txt b/ffi/cocoa/tags.txt
similarity index 100%
rename from basis/cocoa/tags.txt
rename to ffi/cocoa/tags.txt
diff --git a/basis/listener/authors.txt b/ffi/cocoa/types/authors.txt
similarity index 100%
rename from basis/listener/authors.txt
rename to ffi/cocoa/types/authors.txt
diff --git a/basis/cocoa/views/platforms.txt b/ffi/cocoa/types/platforms.txt
similarity index 100%
rename from basis/cocoa/views/platforms.txt
rename to ffi/cocoa/types/platforms.txt
diff --git a/basis/cocoa/types/summary.txt b/ffi/cocoa/types/summary.txt
similarity index 100%
rename from basis/cocoa/types/summary.txt
rename to ffi/cocoa/types/summary.txt
diff --git a/basis/cocoa/types/types.factor b/ffi/cocoa/types/types.factor
similarity index 100%
rename from basis/cocoa/types/types.factor
rename to ffi/cocoa/types/types.factor
diff --git a/basis/none/authors.txt b/ffi/cocoa/views/authors.txt
similarity index 100%
rename from basis/none/authors.txt
rename to ffi/cocoa/views/authors.txt
diff --git a/basis/cocoa/windows/platforms.txt b/ffi/cocoa/views/platforms.txt
similarity index 100%
rename from basis/cocoa/windows/platforms.txt
rename to ffi/cocoa/views/platforms.txt
diff --git a/basis/cocoa/views/summary.txt b/ffi/cocoa/views/summary.txt
similarity index 100%
rename from basis/cocoa/views/summary.txt
rename to ffi/cocoa/views/summary.txt
diff --git a/basis/cocoa/views/views-docs.factor b/ffi/cocoa/views/views-docs.factor
similarity index 100%
rename from basis/cocoa/views/views-docs.factor
rename to ffi/cocoa/views/views-docs.factor
diff --git a/basis/cocoa/views/views.factor b/ffi/cocoa/views/views.factor
similarity index 100%
rename from basis/cocoa/views/views.factor
rename to ffi/cocoa/views/views.factor
diff --git a/basis/persistent/assocs/authors.txt b/ffi/cocoa/windows/authors.txt
similarity index 100%
rename from basis/persistent/assocs/authors.txt
rename to ffi/cocoa/windows/authors.txt
diff --git a/basis/core-foundation/arrays/platforms.txt b/ffi/cocoa/windows/platforms.txt
similarity index 100%
rename from basis/core-foundation/arrays/platforms.txt
rename to ffi/cocoa/windows/platforms.txt
diff --git a/basis/cocoa/windows/summary.txt b/ffi/cocoa/windows/summary.txt
similarity index 100%
rename from basis/cocoa/windows/summary.txt
rename to ffi/cocoa/windows/summary.txt
diff --git a/basis/cocoa/windows/windows-docs.factor b/ffi/cocoa/windows/windows-docs.factor
similarity index 100%
rename from basis/cocoa/windows/windows-docs.factor
rename to ffi/cocoa/windows/windows-docs.factor
diff --git a/basis/cocoa/windows/windows.factor b/ffi/cocoa/windows/windows.factor
similarity index 100%
rename from basis/cocoa/windows/windows.factor
rename to ffi/cocoa/windows/windows.factor
diff --git a/basis/core-foundation/arrays/arrays-docs.factor b/ffi/core-foundation/arrays/arrays-docs.factor
similarity index 100%
rename from basis/core-foundation/arrays/arrays-docs.factor
rename to ffi/core-foundation/arrays/arrays-docs.factor
diff --git a/basis/core-foundation/arrays/arrays-tests.factor b/ffi/core-foundation/arrays/arrays-tests.factor
similarity index 100%
rename from basis/core-foundation/arrays/arrays-tests.factor
rename to ffi/core-foundation/arrays/arrays-tests.factor
diff --git a/basis/core-foundation/arrays/arrays.factor b/ffi/core-foundation/arrays/arrays.factor
similarity index 100%
rename from basis/core-foundation/arrays/arrays.factor
rename to ffi/core-foundation/arrays/arrays.factor
diff --git a/basis/core-foundation/attributed-strings/platforms.txt b/ffi/core-foundation/arrays/platforms.txt
similarity index 100%
rename from basis/core-foundation/attributed-strings/platforms.txt
rename to ffi/core-foundation/arrays/platforms.txt
diff --git a/basis/core-foundation/arrays/summary.txt b/ffi/core-foundation/arrays/summary.txt
similarity index 100%
rename from basis/core-foundation/arrays/summary.txt
rename to ffi/core-foundation/arrays/summary.txt
diff --git a/basis/core-foundation/attributed-strings/tags.txt b/ffi/core-foundation/arrays/tags.txt
similarity index 100%
rename from basis/core-foundation/attributed-strings/tags.txt
rename to ffi/core-foundation/arrays/tags.txt
diff --git a/basis/core-foundation/attributed-strings/attributed-strings-tests.factor b/ffi/core-foundation/attributed-strings/attributed-strings-tests.factor
similarity index 100%
rename from basis/core-foundation/attributed-strings/attributed-strings-tests.factor
rename to ffi/core-foundation/attributed-strings/attributed-strings-tests.factor
diff --git a/basis/core-foundation/attributed-strings/attributed-strings.factor b/ffi/core-foundation/attributed-strings/attributed-strings.factor
similarity index 100%
rename from basis/core-foundation/attributed-strings/attributed-strings.factor
rename to ffi/core-foundation/attributed-strings/attributed-strings.factor
diff --git a/basis/ui/pens/solid/authors.txt b/ffi/core-foundation/attributed-strings/authors.txt
similarity index 100%
rename from basis/ui/pens/solid/authors.txt
rename to ffi/core-foundation/attributed-strings/authors.txt
diff --git a/basis/core-foundation/bundles/platforms.txt b/ffi/core-foundation/attributed-strings/platforms.txt
similarity index 100%
rename from basis/core-foundation/bundles/platforms.txt
rename to ffi/core-foundation/attributed-strings/platforms.txt
diff --git a/basis/core-foundation/bundles/tags.txt b/ffi/core-foundation/attributed-strings/tags.txt
similarity index 100%
rename from basis/core-foundation/bundles/tags.txt
rename to ffi/core-foundation/attributed-strings/tags.txt
diff --git a/basis/persistent/hashtables/authors.txt b/ffi/core-foundation/authors.txt
similarity index 100%
rename from basis/persistent/hashtables/authors.txt
rename to ffi/core-foundation/authors.txt
diff --git a/basis/core-foundation/bundles/bundles-docs.factor b/ffi/core-foundation/bundles/bundles-docs.factor
similarity index 100%
rename from basis/core-foundation/bundles/bundles-docs.factor
rename to ffi/core-foundation/bundles/bundles-docs.factor
diff --git a/basis/core-foundation/bundles/bundles.factor b/ffi/core-foundation/bundles/bundles.factor
similarity index 100%
rename from basis/core-foundation/bundles/bundles.factor
rename to ffi/core-foundation/bundles/bundles.factor
diff --git a/basis/core-foundation/data/platforms.txt b/ffi/core-foundation/bundles/platforms.txt
similarity index 100%
rename from basis/core-foundation/data/platforms.txt
rename to ffi/core-foundation/bundles/platforms.txt
diff --git a/basis/core-foundation/bundles/summary.txt b/ffi/core-foundation/bundles/summary.txt
similarity index 100%
rename from basis/core-foundation/bundles/summary.txt
rename to ffi/core-foundation/bundles/summary.txt
diff --git a/basis/core-foundation/data/tags.txt b/ffi/core-foundation/bundles/tags.txt
similarity index 100%
rename from basis/core-foundation/data/tags.txt
rename to ffi/core-foundation/bundles/tags.txt
diff --git a/basis/core-foundation/core-foundation-docs.factor b/ffi/core-foundation/core-foundation-docs.factor
similarity index 100%
rename from basis/core-foundation/core-foundation-docs.factor
rename to ffi/core-foundation/core-foundation-docs.factor
diff --git a/basis/core-foundation/core-foundation.factor b/ffi/core-foundation/core-foundation.factor
similarity index 100%
rename from basis/core-foundation/core-foundation.factor
rename to ffi/core-foundation/core-foundation.factor
diff --git a/basis/core-foundation/data/data.factor b/ffi/core-foundation/data/data.factor
similarity index 100%
rename from basis/core-foundation/data/data.factor
rename to ffi/core-foundation/data/data.factor
diff --git a/basis/core-foundation/dictionaries/platforms.txt b/ffi/core-foundation/data/platforms.txt
similarity index 100%
rename from basis/core-foundation/dictionaries/platforms.txt
rename to ffi/core-foundation/data/platforms.txt
diff --git a/basis/core-foundation/data/summary.txt b/ffi/core-foundation/data/summary.txt
similarity index 100%
rename from basis/core-foundation/data/summary.txt
rename to ffi/core-foundation/data/summary.txt
diff --git a/basis/core-foundation/dictionaries/tags.txt b/ffi/core-foundation/data/tags.txt
similarity index 100%
rename from basis/core-foundation/dictionaries/tags.txt
rename to ffi/core-foundation/data/tags.txt
diff --git a/basis/ui/pens/tile/authors.txt b/ffi/core-foundation/dictionaries/authors.txt
similarity index 100%
rename from basis/ui/pens/tile/authors.txt
rename to ffi/core-foundation/dictionaries/authors.txt
diff --git a/basis/core-foundation/dictionaries/dictionaries-tests.factor b/ffi/core-foundation/dictionaries/dictionaries-tests.factor
similarity index 100%
rename from basis/core-foundation/dictionaries/dictionaries-tests.factor
rename to ffi/core-foundation/dictionaries/dictionaries-tests.factor
diff --git a/basis/core-foundation/dictionaries/dictionaries.factor b/ffi/core-foundation/dictionaries/dictionaries.factor
similarity index 100%
rename from basis/core-foundation/dictionaries/dictionaries.factor
rename to ffi/core-foundation/dictionaries/dictionaries.factor
diff --git a/basis/core-foundation/file-descriptors/platforms.txt b/ffi/core-foundation/dictionaries/platforms.txt
similarity index 100%
rename from basis/core-foundation/file-descriptors/platforms.txt
rename to ffi/core-foundation/dictionaries/platforms.txt
diff --git a/basis/core-foundation/file-descriptors/tags.txt b/ffi/core-foundation/dictionaries/tags.txt
similarity index 100%
rename from basis/core-foundation/file-descriptors/tags.txt
rename to ffi/core-foundation/dictionaries/tags.txt
diff --git a/basis/core-foundation/file-descriptors/file-descriptors.factor b/ffi/core-foundation/file-descriptors/file-descriptors.factor
similarity index 100%
rename from basis/core-foundation/file-descriptors/file-descriptors.factor
rename to ffi/core-foundation/file-descriptors/file-descriptors.factor
diff --git a/basis/core-foundation/fsevents/platforms.txt b/ffi/core-foundation/file-descriptors/platforms.txt
similarity index 100%
rename from basis/core-foundation/fsevents/platforms.txt
rename to ffi/core-foundation/file-descriptors/platforms.txt
diff --git a/basis/core-foundation/file-descriptors/summary.txt b/ffi/core-foundation/file-descriptors/summary.txt
similarity index 100%
rename from basis/core-foundation/file-descriptors/summary.txt
rename to ffi/core-foundation/file-descriptors/summary.txt
diff --git a/basis/core-foundation/strings/tags.txt b/ffi/core-foundation/file-descriptors/tags.txt
similarity index 100%
rename from basis/core-foundation/strings/tags.txt
rename to ffi/core-foundation/file-descriptors/tags.txt
diff --git a/basis/core-foundation/fsevents/fsevents.factor b/ffi/core-foundation/fsevents/fsevents.factor
similarity index 100%
rename from basis/core-foundation/fsevents/fsevents.factor
rename to ffi/core-foundation/fsevents/fsevents.factor
diff --git a/basis/core-foundation/launch-services/platforms.txt b/ffi/core-foundation/fsevents/platforms.txt
similarity index 100%
rename from basis/core-foundation/launch-services/platforms.txt
rename to ffi/core-foundation/fsevents/platforms.txt
diff --git a/basis/core-foundation/fsevents/summary.txt b/ffi/core-foundation/fsevents/summary.txt
similarity index 100%
rename from basis/core-foundation/fsevents/summary.txt
rename to ffi/core-foundation/fsevents/summary.txt
diff --git a/basis/unix/groups/authors.txt b/ffi/core-foundation/launch-services/authors.txt
similarity index 100%
rename from basis/unix/groups/authors.txt
rename to ffi/core-foundation/launch-services/authors.txt
diff --git a/basis/core-foundation/launch-services/launch-services.factor b/ffi/core-foundation/launch-services/launch-services.factor
similarity index 100%
rename from basis/core-foundation/launch-services/launch-services.factor
rename to ffi/core-foundation/launch-services/launch-services.factor
diff --git a/basis/core-foundation/numbers/platforms.txt b/ffi/core-foundation/launch-services/platforms.txt
similarity index 100%
rename from basis/core-foundation/numbers/platforms.txt
rename to ffi/core-foundation/launch-services/platforms.txt
diff --git a/basis/ui/text/authors.txt b/ffi/core-foundation/numbers/authors.txt
similarity index 100%
rename from basis/ui/text/authors.txt
rename to ffi/core-foundation/numbers/authors.txt
diff --git a/basis/core-foundation/numbers/numbers.factor b/ffi/core-foundation/numbers/numbers.factor
similarity index 100%
rename from basis/core-foundation/numbers/numbers.factor
rename to ffi/core-foundation/numbers/numbers.factor
diff --git a/basis/core-foundation/platforms.txt b/ffi/core-foundation/numbers/platforms.txt
similarity index 100%
rename from basis/core-foundation/platforms.txt
rename to ffi/core-foundation/numbers/platforms.txt
diff --git a/basis/core-foundation/run-loop/platforms.txt b/ffi/core-foundation/platforms.txt
similarity index 100%
rename from basis/core-foundation/run-loop/platforms.txt
rename to ffi/core-foundation/platforms.txt
diff --git a/basis/persistent/sequences/authors.txt b/ffi/core-foundation/run-loop/authors.txt
similarity index 100%
rename from basis/persistent/sequences/authors.txt
rename to ffi/core-foundation/run-loop/authors.txt
diff --git a/basis/core-foundation/strings/platforms.txt b/ffi/core-foundation/run-loop/platforms.txt
similarity index 100%
rename from basis/core-foundation/strings/platforms.txt
rename to ffi/core-foundation/run-loop/platforms.txt
diff --git a/basis/core-foundation/run-loop/run-loop.factor b/ffi/core-foundation/run-loop/run-loop.factor
similarity index 100%
rename from basis/core-foundation/run-loop/run-loop.factor
rename to ffi/core-foundation/run-loop/run-loop.factor
diff --git a/basis/core-foundation/run-loop/summary.txt b/ffi/core-foundation/run-loop/summary.txt
similarity index 100%
rename from basis/core-foundation/run-loop/summary.txt
rename to ffi/core-foundation/run-loop/summary.txt
diff --git a/basis/core-foundation/timers/platforms.txt b/ffi/core-foundation/strings/platforms.txt
similarity index 100%
rename from basis/core-foundation/timers/platforms.txt
rename to ffi/core-foundation/strings/platforms.txt
diff --git a/basis/core-foundation/strings/strings-docs.factor b/ffi/core-foundation/strings/strings-docs.factor
similarity index 100%
rename from basis/core-foundation/strings/strings-docs.factor
rename to ffi/core-foundation/strings/strings-docs.factor
diff --git a/basis/core-foundation/strings/strings-tests.factor b/ffi/core-foundation/strings/strings-tests.factor
similarity index 100%
rename from basis/core-foundation/strings/strings-tests.factor
rename to ffi/core-foundation/strings/strings-tests.factor
diff --git a/basis/core-foundation/strings/strings.factor b/ffi/core-foundation/strings/strings.factor
similarity index 100%
rename from basis/core-foundation/strings/strings.factor
rename to ffi/core-foundation/strings/strings.factor
diff --git a/basis/core-foundation/strings/summary.txt b/ffi/core-foundation/strings/summary.txt
similarity index 100%
rename from basis/core-foundation/strings/summary.txt
rename to ffi/core-foundation/strings/summary.txt
diff --git a/basis/core-foundation/tags.txt b/ffi/core-foundation/strings/tags.txt
similarity index 100%
rename from basis/core-foundation/tags.txt
rename to ffi/core-foundation/strings/tags.txt
diff --git a/basis/core-foundation/summary.txt b/ffi/core-foundation/summary.txt
similarity index 100%
rename from basis/core-foundation/summary.txt
rename to ffi/core-foundation/summary.txt
diff --git a/basis/core-foundation/timers/tags.txt b/ffi/core-foundation/tags.txt
similarity index 100%
rename from basis/core-foundation/timers/tags.txt
rename to ffi/core-foundation/tags.txt
diff --git a/basis/core-foundation/time/summary.txt b/ffi/core-foundation/time/summary.txt
similarity index 100%
rename from basis/core-foundation/time/summary.txt
rename to ffi/core-foundation/time/summary.txt
diff --git a/basis/core-foundation/time/time.factor b/ffi/core-foundation/time/time.factor
similarity index 100%
rename from basis/core-foundation/time/time.factor
rename to ffi/core-foundation/time/time.factor
diff --git a/basis/core-foundation/urls/platforms.txt b/ffi/core-foundation/timers/platforms.txt
similarity index 100%
rename from basis/core-foundation/urls/platforms.txt
rename to ffi/core-foundation/timers/platforms.txt
diff --git a/basis/core-foundation/timers/summary.txt b/ffi/core-foundation/timers/summary.txt
similarity index 100%
rename from basis/core-foundation/timers/summary.txt
rename to ffi/core-foundation/timers/summary.txt
diff --git a/basis/core-foundation/urls/tags.txt b/ffi/core-foundation/timers/tags.txt
similarity index 100%
rename from basis/core-foundation/urls/tags.txt
rename to ffi/core-foundation/timers/tags.txt
diff --git a/basis/core-foundation/timers/timers.factor b/ffi/core-foundation/timers/timers.factor
similarity index 100%
rename from basis/core-foundation/timers/timers.factor
rename to ffi/core-foundation/timers/timers.factor
diff --git a/basis/core-foundation/utilities/platforms.txt b/ffi/core-foundation/urls/platforms.txt
similarity index 100%
rename from basis/core-foundation/utilities/platforms.txt
rename to ffi/core-foundation/urls/platforms.txt
diff --git a/basis/core-foundation/urls/summary.txt b/ffi/core-foundation/urls/summary.txt
similarity index 100%
rename from basis/core-foundation/urls/summary.txt
rename to ffi/core-foundation/urls/summary.txt
diff --git a/basis/core-graphics/tags.txt b/ffi/core-foundation/urls/tags.txt
similarity index 100%
rename from basis/core-graphics/tags.txt
rename to ffi/core-foundation/urls/tags.txt
diff --git a/basis/core-foundation/urls/urls-docs.factor b/ffi/core-foundation/urls/urls-docs.factor
similarity index 100%
rename from basis/core-foundation/urls/urls-docs.factor
rename to ffi/core-foundation/urls/urls-docs.factor
diff --git a/basis/core-foundation/urls/urls.factor b/ffi/core-foundation/urls/urls.factor
similarity index 100%
rename from basis/core-foundation/urls/urls.factor
rename to ffi/core-foundation/urls/urls.factor
diff --git a/basis/ui/text/core-text/authors.txt b/ffi/core-foundation/utilities/authors.txt
similarity index 100%
rename from basis/ui/text/core-text/authors.txt
rename to ffi/core-foundation/utilities/authors.txt
diff --git a/basis/core-graphics/platforms.txt b/ffi/core-foundation/utilities/platforms.txt
similarity index 100%
rename from basis/core-graphics/platforms.txt
rename to ffi/core-foundation/utilities/platforms.txt
diff --git a/basis/core-foundation/utilities/utilities.factor b/ffi/core-foundation/utilities/utilities.factor
similarity index 100%
rename from basis/core-foundation/utilities/utilities.factor
rename to ffi/core-foundation/utilities/utilities.factor
diff --git a/basis/persistent/vectors/authors.txt b/ffi/core-graphics/authors.txt
similarity index 100%
rename from basis/persistent/vectors/authors.txt
rename to ffi/core-graphics/authors.txt
diff --git a/basis/core-graphics/core-graphics-tests.factor b/ffi/core-graphics/core-graphics-tests.factor
similarity index 100%
rename from basis/core-graphics/core-graphics-tests.factor
rename to ffi/core-graphics/core-graphics-tests.factor
diff --git a/basis/core-graphics/core-graphics.factor b/ffi/core-graphics/core-graphics.factor
similarity index 100%
rename from basis/core-graphics/core-graphics.factor
rename to ffi/core-graphics/core-graphics.factor
diff --git a/basis/core-text/fonts/platforms.txt b/ffi/core-graphics/platforms.txt
similarity index 100%
rename from basis/core-text/fonts/platforms.txt
rename to ffi/core-graphics/platforms.txt
diff --git a/basis/core-graphics/summary.txt b/ffi/core-graphics/summary.txt
similarity index 100%
rename from basis/core-graphics/summary.txt
rename to ffi/core-graphics/summary.txt
diff --git a/basis/core-text/fonts/tags.txt b/ffi/core-graphics/tags.txt
similarity index 100%
rename from basis/core-text/fonts/tags.txt
rename to ffi/core-graphics/tags.txt
diff --git a/basis/ui/text/pango/authors.txt b/ffi/core-graphics/types/authors.txt
similarity index 100%
rename from basis/ui/text/pango/authors.txt
rename to ffi/core-graphics/types/authors.txt
diff --git a/basis/core-graphics/types/types-docs.factor b/ffi/core-graphics/types/types-docs.factor
similarity index 100%
rename from basis/core-graphics/types/types-docs.factor
rename to ffi/core-graphics/types/types-docs.factor
diff --git a/basis/core-graphics/types/types.factor b/ffi/core-graphics/types/types.factor
similarity index 100%
rename from basis/core-graphics/types/types.factor
rename to ffi/core-graphics/types/types.factor
diff --git a/basis/ui/tools/browser/history/authors.txt b/ffi/core-text/authors.txt
similarity index 100%
rename from basis/ui/tools/browser/history/authors.txt
rename to ffi/core-text/authors.txt
diff --git a/basis/core-text/core-text-tests.factor b/ffi/core-text/core-text-tests.factor
similarity index 100%
rename from basis/core-text/core-text-tests.factor
rename to ffi/core-text/core-text-tests.factor
diff --git a/basis/core-text/core-text.factor b/ffi/core-text/core-text.factor
similarity index 100%
rename from basis/core-text/core-text.factor
rename to ffi/core-text/core-text.factor
diff --git a/basis/ui/tools/browser/popups/authors.txt b/ffi/core-text/fonts/authors.txt
similarity index 100%
rename from basis/ui/tools/browser/popups/authors.txt
rename to ffi/core-text/fonts/authors.txt
diff --git a/basis/core-text/fonts/fonts.factor b/ffi/core-text/fonts/fonts.factor
similarity index 100%
rename from basis/core-text/fonts/fonts.factor
rename to ffi/core-text/fonts/fonts.factor
diff --git a/basis/core-text/platforms.txt b/ffi/core-text/fonts/platforms.txt
similarity index 100%
rename from basis/core-text/platforms.txt
rename to ffi/core-text/fonts/platforms.txt
diff --git a/basis/core-text/tags.txt b/ffi/core-text/fonts/tags.txt
similarity index 100%
rename from basis/core-text/tags.txt
rename to ffi/core-text/fonts/tags.txt
diff --git a/basis/environment/unix/macosx/platforms.txt b/ffi/core-text/platforms.txt
similarity index 100%
rename from basis/environment/unix/macosx/platforms.txt
rename to ffi/core-text/platforms.txt
diff --git a/basis/core-text/summary.txt b/ffi/core-text/summary.txt
similarity index 100%
rename from basis/core-text/summary.txt
rename to ffi/core-text/summary.txt
diff --git a/basis/gdk/gl/tags.txt b/ffi/core-text/tags.txt
similarity index 100%
rename from basis/gdk/gl/tags.txt
rename to ffi/core-text/tags.txt
diff --git a/basis/unix/linux/proc/authors.txt b/ffi/cuda/authors.txt
similarity index 100%
rename from basis/unix/linux/proc/authors.txt
rename to ffi/cuda/authors.txt
diff --git a/extra/cuda/contexts/contexts.factor b/ffi/cuda/contexts/contexts.factor
similarity index 100%
rename from extra/cuda/contexts/contexts.factor
rename to ffi/cuda/contexts/contexts.factor
diff --git a/extra/cuda/cuda-tests.factor b/ffi/cuda/cuda-tests.factor
similarity index 100%
rename from extra/cuda/cuda-tests.factor
rename to ffi/cuda/cuda-tests.factor
diff --git a/extra/cuda/cuda.factor b/ffi/cuda/cuda.factor
similarity index 100%
rename from extra/cuda/cuda.factor
rename to ffi/cuda/cuda.factor
diff --git a/basis/unix/statvfs/authors.txt b/ffi/cuda/demos/hello-world/authors.txt
similarity index 100%
rename from basis/unix/statvfs/authors.txt
rename to ffi/cuda/demos/hello-world/authors.txt
diff --git a/extra/cuda/demos/hello-world/hello-world.factor b/ffi/cuda/demos/hello-world/hello-world.factor
similarity index 100%
rename from extra/cuda/demos/hello-world/hello-world.factor
rename to ffi/cuda/demos/hello-world/hello-world.factor
diff --git a/extra/cuda/demos/hello-world/hello.cu b/ffi/cuda/demos/hello-world/hello.cu
similarity index 100%
rename from extra/cuda/demos/hello-world/hello.cu
rename to ffi/cuda/demos/hello-world/hello.cu
diff --git a/extra/cuda/demos/hello-world/hello.ptx b/ffi/cuda/demos/hello-world/hello.ptx
similarity index 100%
rename from extra/cuda/demos/hello-world/hello.ptx
rename to ffi/cuda/demos/hello-world/hello.ptx
diff --git a/extra/cuda/demos/prefix-sum/authors.txt b/ffi/cuda/demos/prefix-sum/authors.txt
similarity index 100%
rename from extra/cuda/demos/prefix-sum/authors.txt
rename to ffi/cuda/demos/prefix-sum/authors.txt
diff --git a/extra/cuda/demos/prefix-sum/prefix-sum.cu b/ffi/cuda/demos/prefix-sum/prefix-sum.cu
similarity index 100%
rename from extra/cuda/demos/prefix-sum/prefix-sum.cu
rename to ffi/cuda/demos/prefix-sum/prefix-sum.cu
diff --git a/extra/cuda/demos/prefix-sum/prefix-sum.factor b/ffi/cuda/demos/prefix-sum/prefix-sum.factor
similarity index 100%
rename from extra/cuda/demos/prefix-sum/prefix-sum.factor
rename to ffi/cuda/demos/prefix-sum/prefix-sum.factor
diff --git a/extra/cuda/demos/prefix-sum/prefix-sum.ptx b/ffi/cuda/demos/prefix-sum/prefix-sum.ptx
similarity index 100%
rename from extra/cuda/demos/prefix-sum/prefix-sum.ptx
rename to ffi/cuda/demos/prefix-sum/prefix-sum.ptx
diff --git a/basis/unix/statvfs/linux/authors.txt b/ffi/cuda/devices/authors.txt
similarity index 100%
rename from basis/unix/statvfs/linux/authors.txt
rename to ffi/cuda/devices/authors.txt
diff --git a/extra/cuda/devices/devices-tests.factor b/ffi/cuda/devices/devices-tests.factor
similarity index 100%
rename from extra/cuda/devices/devices-tests.factor
rename to ffi/cuda/devices/devices-tests.factor
diff --git a/extra/cuda/devices/devices.factor b/ffi/cuda/devices/devices.factor
similarity index 100%
rename from extra/cuda/devices/devices.factor
rename to ffi/cuda/devices/devices.factor
diff --git a/extra/cuda/ffi/ffi.factor b/ffi/cuda/ffi/ffi.factor
similarity index 100%
rename from extra/cuda/ffi/ffi.factor
rename to ffi/cuda/ffi/ffi.factor
diff --git a/extra/cuda/ffi/tags.txt b/ffi/cuda/ffi/tags.txt
similarity index 100%
rename from extra/cuda/ffi/tags.txt
rename to ffi/cuda/ffi/tags.txt
diff --git a/extra/cuda/gl/ffi/ffi.factor b/ffi/cuda/gl/ffi/ffi.factor
similarity index 100%
rename from extra/cuda/gl/ffi/ffi.factor
rename to ffi/cuda/gl/ffi/ffi.factor
diff --git a/extra/cuda/gl/gl.factor b/ffi/cuda/gl/gl.factor
similarity index 100%
rename from extra/cuda/gl/gl.factor
rename to ffi/cuda/gl/gl.factor
diff --git a/basis/unix/statvfs/macosx/authors.txt b/ffi/cuda/libraries/authors.txt
similarity index 100%
rename from basis/unix/statvfs/macosx/authors.txt
rename to ffi/cuda/libraries/authors.txt
diff --git a/extra/cuda/libraries/libraries.factor b/ffi/cuda/libraries/libraries.factor
similarity index 100%
rename from extra/cuda/libraries/libraries.factor
rename to ffi/cuda/libraries/libraries.factor
diff --git a/basis/unix/users/authors.txt b/ffi/cuda/memory/authors.txt
similarity index 100%
rename from basis/unix/users/authors.txt
rename to ffi/cuda/memory/authors.txt
diff --git a/extra/cuda/memory/memory.factor b/ffi/cuda/memory/memory.factor
similarity index 100%
rename from extra/cuda/memory/memory.factor
rename to ffi/cuda/memory/memory.factor
diff --git a/basis/unix/users/macosx/authors.txt b/ffi/cuda/nvcc/authors.txt
similarity index 100%
rename from basis/unix/users/macosx/authors.txt
rename to ffi/cuda/nvcc/authors.txt
diff --git a/extra/cuda/nvcc/nvcc.factor b/ffi/cuda/nvcc/nvcc.factor
similarity index 100%
rename from extra/cuda/nvcc/nvcc.factor
rename to ffi/cuda/nvcc/nvcc.factor
diff --git a/extra/cuda/prettyprint/prettyprint.factor b/ffi/cuda/prettyprint/prettyprint.factor
similarity index 100%
rename from extra/cuda/prettyprint/prettyprint.factor
rename to ffi/cuda/prettyprint/prettyprint.factor
diff --git a/extra/cuda/ptx/ptx-tests.factor b/ffi/cuda/ptx/ptx-tests.factor
similarity index 100%
rename from extra/cuda/ptx/ptx-tests.factor
rename to ffi/cuda/ptx/ptx-tests.factor
diff --git a/extra/cuda/ptx/ptx.factor b/ffi/cuda/ptx/ptx.factor
similarity index 100%
rename from extra/cuda/ptx/ptx.factor
rename to ffi/cuda/ptx/ptx.factor
diff --git a/basis/unix/utmpx/authors.txt b/ffi/cuda/syntax/authors.txt
similarity index 100%
rename from basis/unix/utmpx/authors.txt
rename to ffi/cuda/syntax/authors.txt
diff --git a/extra/cuda/syntax/syntax.factor b/ffi/cuda/syntax/syntax.factor
similarity index 100%
rename from extra/cuda/syntax/syntax.factor
rename to ffi/cuda/syntax/syntax.factor
diff --git a/extra/cuda/tags.txt b/ffi/cuda/tags.txt
similarity index 100%
rename from extra/cuda/tags.txt
rename to ffi/cuda/tags.txt
diff --git a/extra/cuda/types/types.factor b/ffi/cuda/types/types.factor
similarity index 100%
rename from extra/cuda/types/types.factor
rename to ffi/cuda/types/types.factor
diff --git a/basis/unix/utmpx/linux/authors.txt b/ffi/cuda/utils/authors.txt
similarity index 100%
rename from basis/unix/utmpx/linux/authors.txt
rename to ffi/cuda/utils/authors.txt
diff --git a/extra/file-server/authors.txt b/ffi/curl/authors.txt
similarity index 100%
rename from extra/file-server/authors.txt
rename to ffi/curl/authors.txt
diff --git a/extra/curl/curl.factor b/ffi/curl/curl.factor
similarity index 100%
rename from extra/curl/curl.factor
rename to ffi/curl/curl.factor
diff --git a/extra/curl/ffi/ffi.factor b/ffi/curl/ffi/ffi.factor
similarity index 100%
rename from extra/curl/ffi/ffi.factor
rename to ffi/curl/ffi/ffi.factor
diff --git a/basis/alien/libraries/unix/platforms.txt b/ffi/curl/ffi/platforms.txt
similarity index 100%
rename from basis/alien/libraries/unix/platforms.txt
rename to ffi/curl/ffi/platforms.txt
diff --git a/basis/environment/unix/platforms.txt b/ffi/curl/platforms.txt
similarity index 100%
rename from basis/environment/unix/platforms.txt
rename to ffi/curl/platforms.txt
diff --git a/extra/curl/summary.txt b/ffi/curl/summary.txt
similarity index 100%
rename from extra/curl/summary.txt
rename to ffi/curl/summary.txt
diff --git a/basis/unix/utmpx/macosx/authors.txt b/ffi/curses/authors.txt
similarity index 100%
rename from basis/unix/utmpx/macosx/authors.txt
rename to ffi/curses/authors.txt
diff --git a/extra/curses/curses-tests.factor b/ffi/curses/curses-tests.factor
similarity index 100%
rename from extra/curses/curses-tests.factor
rename to ffi/curses/curses-tests.factor
diff --git a/extra/curses/curses.factor b/ffi/curses/curses.factor
similarity index 100%
rename from extra/curses/curses.factor
rename to ffi/curses/curses.factor
diff --git a/extra/curses/ffi/ffi.factor b/ffi/curses/ffi/ffi.factor
similarity index 100%
rename from extra/curses/ffi/ffi.factor
rename to ffi/curses/ffi/ffi.factor
diff --git a/basis/opengl/gl/x11/platforms.txt b/ffi/curses/ffi/platforms.txt
similarity index 100%
rename from basis/opengl/gl/x11/platforms.txt
rename to ffi/curses/ffi/platforms.txt
diff --git a/extra/curses/listener/authors.txt b/ffi/curses/listener/authors.txt
similarity index 100%
rename from extra/curses/listener/authors.txt
rename to ffi/curses/listener/authors.txt
diff --git a/extra/curses/listener/listener.factor b/ffi/curses/listener/listener.factor
similarity index 100%
rename from extra/curses/listener/listener.factor
rename to ffi/curses/listener/listener.factor
diff --git a/basis/ui/backend/gtk/io/unix/platforms.txt b/ffi/curses/listener/platforms.txt
similarity index 100%
rename from basis/ui/backend/gtk/io/unix/platforms.txt
rename to ffi/curses/listener/platforms.txt
diff --git a/extra/curses/listener/summary.txt b/ffi/curses/listener/summary.txt
similarity index 100%
rename from extra/curses/listener/summary.txt
rename to ffi/curses/listener/summary.txt
diff --git a/basis/ui/backend/gtk/platforms.txt b/ffi/curses/platforms.txt
similarity index 100%
rename from basis/ui/backend/gtk/platforms.txt
rename to ffi/curses/platforms.txt
diff --git a/extra/curses/summary.txt b/ffi/curses/summary.txt
similarity index 100%
rename from extra/curses/summary.txt
rename to ffi/curses/summary.txt
diff --git a/basis/cpu/ppc/authors.txt b/ffi/dwarf/authors.txt
similarity index 100%
rename from basis/cpu/ppc/authors.txt
rename to ffi/dwarf/authors.txt
diff --git a/extra/dwarf/dwarf.factor b/ffi/dwarf/dwarf.factor
similarity index 100%
rename from extra/dwarf/dwarf.factor
rename to ffi/dwarf/dwarf.factor
diff --git a/extra/ecdsa/authors.txt b/ffi/ecdsa/authors.txt
similarity index 100%
rename from extra/ecdsa/authors.txt
rename to ffi/ecdsa/authors.txt
diff --git a/extra/ecdsa/ecdsa-tests.factor b/ffi/ecdsa/ecdsa-tests.factor
similarity index 100%
rename from extra/ecdsa/ecdsa-tests.factor
rename to ffi/ecdsa/ecdsa-tests.factor
diff --git a/extra/ecdsa/ecdsa.factor b/ffi/ecdsa/ecdsa.factor
similarity index 100%
rename from extra/ecdsa/ecdsa.factor
rename to ffi/ecdsa/ecdsa.factor
diff --git a/extra/ecdsa/summary.txt b/ffi/ecdsa/summary.txt
similarity index 100%
rename from extra/ecdsa/summary.txt
rename to ffi/ecdsa/summary.txt
diff --git a/extra/ecdsa/tags.txt b/ffi/ecdsa/tags.txt
similarity index 100%
rename from extra/ecdsa/tags.txt
rename to ffi/ecdsa/tags.txt
diff --git a/extra/gopher-ui/authors.txt b/ffi/fftw/authors.txt
similarity index 100%
rename from extra/gopher-ui/authors.txt
rename to ffi/fftw/authors.txt
diff --git a/extra/fftw/ffi/ffi.factor b/ffi/fftw/ffi/ffi.factor
similarity index 100%
rename from extra/fftw/ffi/ffi.factor
rename to ffi/fftw/ffi/ffi.factor
diff --git a/extra/fftw/fftw-tests.factor b/ffi/fftw/fftw-tests.factor
similarity index 100%
rename from extra/fftw/fftw-tests.factor
rename to ffi/fftw/fftw-tests.factor
diff --git a/extra/fftw/fftw.factor b/ffi/fftw/fftw.factor
similarity index 100%
rename from extra/fftw/fftw.factor
rename to ffi/fftw/fftw.factor
diff --git a/extra/fftw/summary.txt b/ffi/fftw/summary.txt
similarity index 100%
rename from extra/fftw/summary.txt
rename to ffi/fftw/summary.txt
diff --git a/basis/windows/advapi32/authors.txt b/ffi/forestdb/ffi/authors.txt
similarity index 100%
rename from basis/windows/advapi32/authors.txt
rename to ffi/forestdb/ffi/authors.txt
diff --git a/extra/forestdb/ffi/ffi.factor b/ffi/forestdb/ffi/ffi.factor
similarity index 100%
rename from extra/forestdb/ffi/ffi.factor
rename to ffi/forestdb/ffi/ffi.factor
diff --git a/basis/windows/crypt32/authors.txt b/ffi/forestdb/lib/authors.txt
similarity index 100%
rename from basis/windows/crypt32/authors.txt
rename to ffi/forestdb/lib/authors.txt
diff --git a/extra/forestdb/lib/lib-tests.factor b/ffi/forestdb/lib/lib-tests.factor
similarity index 100%
rename from extra/forestdb/lib/lib-tests.factor
rename to ffi/forestdb/lib/lib-tests.factor
diff --git a/extra/forestdb/lib/lib.factor b/ffi/forestdb/lib/lib.factor
similarity index 100%
rename from extra/forestdb/lib/lib.factor
rename to ffi/forestdb/lib/lib.factor
diff --git a/basis/windows/errors/authors.txt b/ffi/forestdb/paths/authors.txt
similarity index 100%
rename from basis/windows/errors/authors.txt
rename to ffi/forestdb/paths/authors.txt
diff --git a/extra/forestdb/paths/paths-tests.factor b/ffi/forestdb/paths/paths-tests.factor
similarity index 100%
rename from extra/forestdb/paths/paths-tests.factor
rename to ffi/forestdb/paths/paths-tests.factor
diff --git a/extra/forestdb/paths/paths.factor b/ffi/forestdb/paths/paths.factor
similarity index 100%
rename from extra/forestdb/paths/paths.factor
rename to ffi/forestdb/paths/paths.factor
diff --git a/basis/windows/gdi32/authors.txt b/ffi/forestdb/utils/authors.txt
similarity index 100%
rename from basis/windows/gdi32/authors.txt
rename to ffi/forestdb/utils/authors.txt
diff --git a/extra/forestdb/utils/utils.factor b/ffi/forestdb/utils/utils.factor
similarity index 100%
rename from extra/forestdb/utils/utils.factor
rename to ffi/forestdb/utils/utils.factor
diff --git a/basis/search-deques/authors.txt b/ffi/freetype/authors.txt
similarity index 100%
rename from basis/search-deques/authors.txt
rename to ffi/freetype/authors.txt
diff --git a/extra/freetype/freetype.factor b/ffi/freetype/freetype.factor
similarity index 100%
rename from extra/freetype/freetype.factor
rename to ffi/freetype/freetype.factor
diff --git a/extra/freetype/platforms.txt b/ffi/freetype/platforms.txt
similarity index 100%
rename from extra/freetype/platforms.txt
rename to ffi/freetype/platforms.txt
diff --git a/extra/freetype/summary.txt b/ffi/freetype/summary.txt
similarity index 100%
rename from extra/freetype/summary.txt
rename to ffi/freetype/summary.txt
diff --git a/basis/gdk/pixbuf/tags.txt b/ffi/freetype/tags.txt
similarity index 100%
rename from basis/gdk/pixbuf/tags.txt
rename to ffi/freetype/tags.txt
diff --git a/basis/gdk/Gdk-3.0.gir b/ffi/gdk/Gdk-3.0.gir
similarity index 100%
rename from basis/gdk/Gdk-3.0.gir
rename to ffi/gdk/Gdk-3.0.gir
diff --git a/basis/gdk/gl/authors.txt b/ffi/gdk/authors.txt
similarity index 100%
rename from basis/gdk/gl/authors.txt
rename to ffi/gdk/authors.txt
diff --git a/basis/gdk/ffi/ffi.factor b/ffi/gdk/ffi/ffi.factor
similarity index 100%
rename from basis/gdk/ffi/ffi.factor
rename to ffi/gdk/ffi/ffi.factor
diff --git a/basis/gdk/gdk.factor b/ffi/gdk/gdk.factor
similarity index 100%
rename from basis/gdk/gdk.factor
rename to ffi/gdk/gdk.factor
diff --git a/basis/gdk/gl/GdkGLExt-1.0.gir b/ffi/gdk/gl/GdkGLExt-1.0.gir
similarity index 100%
rename from basis/gdk/gl/GdkGLExt-1.0.gir
rename to ffi/gdk/gl/GdkGLExt-1.0.gir
diff --git a/basis/gdk/pixbuf/authors.txt b/ffi/gdk/gl/authors.txt
similarity index 100%
rename from basis/gdk/pixbuf/authors.txt
rename to ffi/gdk/gl/authors.txt
diff --git a/basis/gdk/gl/ffi/ffi.factor b/ffi/gdk/gl/ffi/ffi.factor
similarity index 100%
rename from basis/gdk/gl/ffi/ffi.factor
rename to ffi/gdk/gl/ffi/ffi.factor
diff --git a/basis/gdk/gl/gl.factor b/ffi/gdk/gl/gl.factor
similarity index 100%
rename from basis/gdk/gl/gl.factor
rename to ffi/gdk/gl/gl.factor
diff --git a/basis/gdk/gl/summary.txt b/ffi/gdk/gl/summary.txt
similarity index 100%
rename from basis/gdk/gl/summary.txt
rename to ffi/gdk/gl/summary.txt
diff --git a/basis/gdk/tags.txt b/ffi/gdk/gl/tags.txt
similarity index 100%
rename from basis/gdk/tags.txt
rename to ffi/gdk/gl/tags.txt
diff --git a/basis/gdk/pixbuf/GdkPixbuf-2.0.gir b/ffi/gdk/pixbuf/GdkPixbuf-2.0.gir
similarity index 100%
rename from basis/gdk/pixbuf/GdkPixbuf-2.0.gir
rename to ffi/gdk/pixbuf/GdkPixbuf-2.0.gir
diff --git a/basis/gio/authors.txt b/ffi/gdk/pixbuf/authors.txt
similarity index 100%
rename from basis/gio/authors.txt
rename to ffi/gdk/pixbuf/authors.txt
diff --git a/basis/gdk/pixbuf/ffi/ffi.factor b/ffi/gdk/pixbuf/ffi/ffi.factor
similarity index 100%
rename from basis/gdk/pixbuf/ffi/ffi.factor
rename to ffi/gdk/pixbuf/ffi/ffi.factor
diff --git a/basis/gdk/pixbuf/pixbuf.factor b/ffi/gdk/pixbuf/pixbuf.factor
similarity index 100%
rename from basis/gdk/pixbuf/pixbuf.factor
rename to ffi/gdk/pixbuf/pixbuf.factor
diff --git a/basis/gdk/pixbuf/summary.txt b/ffi/gdk/pixbuf/summary.txt
similarity index 100%
rename from basis/gdk/pixbuf/summary.txt
rename to ffi/gdk/pixbuf/summary.txt
diff --git a/basis/gio/tags.txt b/ffi/gdk/pixbuf/tags.txt
similarity index 100%
rename from basis/gio/tags.txt
rename to ffi/gdk/pixbuf/tags.txt
diff --git a/basis/gdk/summary.txt b/ffi/gdk/summary.txt
similarity index 100%
rename from basis/gdk/summary.txt
rename to ffi/gdk/summary.txt
diff --git a/basis/glib/tags.txt b/ffi/gdk/tags.txt
similarity index 100%
rename from basis/glib/tags.txt
rename to ffi/gdk/tags.txt
diff --git a/basis/gio/Gio-2.0.gir b/ffi/gio/Gio-2.0.gir
similarity index 100%
rename from basis/gio/Gio-2.0.gir
rename to ffi/gio/Gio-2.0.gir
diff --git a/basis/glib/authors.txt b/ffi/gio/authors.txt
similarity index 100%
rename from basis/glib/authors.txt
rename to ffi/gio/authors.txt
diff --git a/basis/gio/ffi/ffi.factor b/ffi/gio/ffi/ffi.factor
similarity index 100%
rename from basis/gio/ffi/ffi.factor
rename to ffi/gio/ffi/ffi.factor
diff --git a/basis/gio/gio.factor b/ffi/gio/gio.factor
similarity index 100%
rename from basis/gio/gio.factor
rename to ffi/gio/gio.factor
diff --git a/basis/gio/summary.txt b/ffi/gio/summary.txt
similarity index 100%
rename from basis/gio/summary.txt
rename to ffi/gio/summary.txt
diff --git a/basis/gmodule/tags.txt b/ffi/gio/tags.txt
similarity index 100%
rename from basis/gmodule/tags.txt
rename to ffi/gio/tags.txt
diff --git a/basis/glib/GLib-2.0.gir b/ffi/glib/GLib-2.0.gir
similarity index 100%
rename from basis/glib/GLib-2.0.gir
rename to ffi/glib/GLib-2.0.gir
diff --git a/basis/gmodule/authors.txt b/ffi/glib/authors.txt
similarity index 100%
rename from basis/gmodule/authors.txt
rename to ffi/glib/authors.txt
diff --git a/basis/glib/ffi/ffi.factor b/ffi/glib/ffi/ffi.factor
similarity index 100%
rename from basis/glib/ffi/ffi.factor
rename to ffi/glib/ffi/ffi.factor
diff --git a/basis/glib/glib.factor b/ffi/glib/glib.factor
similarity index 100%
rename from basis/glib/glib.factor
rename to ffi/glib/glib.factor
diff --git a/basis/glib/summary.txt b/ffi/glib/summary.txt
similarity index 100%
rename from basis/glib/summary.txt
rename to ffi/glib/summary.txt
diff --git a/basis/gobject/tags.txt b/ffi/glib/tags.txt
similarity index 100%
rename from basis/gobject/tags.txt
rename to ffi/glib/tags.txt
diff --git a/basis/gmodule/GModule-2.0.gir b/ffi/gmodule/GModule-2.0.gir
similarity index 100%
rename from basis/gmodule/GModule-2.0.gir
rename to ffi/gmodule/GModule-2.0.gir
diff --git a/basis/gobject-introspection/authors.txt b/ffi/gmodule/authors.txt
similarity index 100%
rename from basis/gobject-introspection/authors.txt
rename to ffi/gmodule/authors.txt
diff --git a/basis/gmodule/ffi/ffi.factor b/ffi/gmodule/ffi/ffi.factor
similarity index 100%
rename from basis/gmodule/ffi/ffi.factor
rename to ffi/gmodule/ffi/ffi.factor
diff --git a/basis/gmodule/gmodule.factor b/ffi/gmodule/gmodule.factor
similarity index 100%
rename from basis/gmodule/gmodule.factor
rename to ffi/gmodule/gmodule.factor
diff --git a/basis/gmodule/summary.txt b/ffi/gmodule/summary.txt
similarity index 100%
rename from basis/gmodule/summary.txt
rename to ffi/gmodule/summary.txt
diff --git a/basis/gtk/gl/tags.txt b/ffi/gmodule/tags.txt
similarity index 100%
rename from basis/gtk/gl/tags.txt
rename to ffi/gmodule/tags.txt
diff --git a/basis/gobject/authors.txt b/ffi/gobject-introspection/authors.txt
similarity index 100%
rename from basis/gobject/authors.txt
rename to ffi/gobject-introspection/authors.txt
diff --git a/basis/gobject-introspection/common/common.factor b/ffi/gobject-introspection/common/common.factor
similarity index 100%
rename from basis/gobject-introspection/common/common.factor
rename to ffi/gobject-introspection/common/common.factor
diff --git a/basis/gobject-introspection/ffi/ffi.factor b/ffi/gobject-introspection/ffi/ffi.factor
similarity index 100%
rename from basis/gobject-introspection/ffi/ffi.factor
rename to ffi/gobject-introspection/ffi/ffi.factor
diff --git a/basis/gobject-introspection/gobject-introspection.factor b/ffi/gobject-introspection/gobject-introspection.factor
similarity index 100%
rename from basis/gobject-introspection/gobject-introspection.factor
rename to ffi/gobject-introspection/gobject-introspection.factor
diff --git a/basis/gobject-introspection/loader/loader.factor b/ffi/gobject-introspection/loader/loader.factor
similarity index 100%
rename from basis/gobject-introspection/loader/loader.factor
rename to ffi/gobject-introspection/loader/loader.factor
diff --git a/basis/gobject-introspection/repository/repository.factor b/ffi/gobject-introspection/repository/repository.factor
similarity index 100%
rename from basis/gobject-introspection/repository/repository.factor
rename to ffi/gobject-introspection/repository/repository.factor
diff --git a/basis/gobject-introspection/standard-types/standard-types.factor b/ffi/gobject-introspection/standard-types/standard-types.factor
similarity index 100%
rename from basis/gobject-introspection/standard-types/standard-types.factor
rename to ffi/gobject-introspection/standard-types/standard-types.factor
diff --git a/basis/gobject-introspection/summary.txt b/ffi/gobject-introspection/summary.txt
similarity index 100%
rename from basis/gobject-introspection/summary.txt
rename to ffi/gobject-introspection/summary.txt
diff --git a/basis/gobject-introspection/types/types.factor b/ffi/gobject-introspection/types/types.factor
similarity index 100%
rename from basis/gobject-introspection/types/types.factor
rename to ffi/gobject-introspection/types/types.factor
diff --git a/basis/gobject/GObject-2.0.gir b/ffi/gobject/GObject-2.0.gir
similarity index 100%
rename from basis/gobject/GObject-2.0.gir
rename to ffi/gobject/GObject-2.0.gir
diff --git a/basis/gtk/authors.txt b/ffi/gobject/authors.txt
similarity index 100%
rename from basis/gtk/authors.txt
rename to ffi/gobject/authors.txt
diff --git a/basis/gobject/ffi/ffi.factor b/ffi/gobject/ffi/ffi.factor
similarity index 100%
rename from basis/gobject/ffi/ffi.factor
rename to ffi/gobject/ffi/ffi.factor
diff --git a/basis/gobject/gobject.factor b/ffi/gobject/gobject.factor
similarity index 100%
rename from basis/gobject/gobject.factor
rename to ffi/gobject/gobject.factor
diff --git a/basis/gobject/summary.txt b/ffi/gobject/summary.txt
similarity index 100%
rename from basis/gobject/summary.txt
rename to ffi/gobject/summary.txt
diff --git a/basis/gtk/tags.txt b/ffi/gobject/tags.txt
similarity index 100%
rename from basis/gtk/tags.txt
rename to ffi/gobject/tags.txt
diff --git a/basis/gtk/Gtk-3.0.gir b/ffi/gtk/Gtk-3.0.gir
similarity index 100%
rename from basis/gtk/Gtk-3.0.gir
rename to ffi/gtk/Gtk-3.0.gir
diff --git a/basis/gtk/gl/authors.txt b/ffi/gtk/authors.txt
similarity index 100%
rename from basis/gtk/gl/authors.txt
rename to ffi/gtk/authors.txt
diff --git a/basis/gtk/ffi/ffi.factor b/ffi/gtk/ffi/ffi.factor
similarity index 100%
rename from basis/gtk/ffi/ffi.factor
rename to ffi/gtk/ffi/ffi.factor
diff --git a/basis/gtk/gl/GtkGLExt-1.0.gir b/ffi/gtk/gl/GtkGLExt-1.0.gir
similarity index 100%
rename from basis/gtk/gl/GtkGLExt-1.0.gir
rename to ffi/gtk/gl/GtkGLExt-1.0.gir
diff --git a/basis/pango/authors.txt b/ffi/gtk/gl/authors.txt
similarity index 100%
rename from basis/pango/authors.txt
rename to ffi/gtk/gl/authors.txt
diff --git a/basis/gtk/gl/ffi/ffi.factor b/ffi/gtk/gl/ffi/ffi.factor
similarity index 100%
rename from basis/gtk/gl/ffi/ffi.factor
rename to ffi/gtk/gl/ffi/ffi.factor
diff --git a/basis/gtk/gl/gl.factor b/ffi/gtk/gl/gl.factor
similarity index 100%
rename from basis/gtk/gl/gl.factor
rename to ffi/gtk/gl/gl.factor
diff --git a/basis/gtk/gl/summary.txt b/ffi/gtk/gl/summary.txt
similarity index 100%
rename from basis/gtk/gl/summary.txt
rename to ffi/gtk/gl/summary.txt
diff --git a/basis/opengl/gl/tags.txt b/ffi/gtk/gl/tags.txt
similarity index 100%
rename from basis/opengl/gl/tags.txt
rename to ffi/gtk/gl/tags.txt
diff --git a/basis/gtk/gtk.factor b/ffi/gtk/gtk.factor
similarity index 100%
rename from basis/gtk/gtk.factor
rename to ffi/gtk/gtk.factor
diff --git a/basis/gtk/summary.txt b/ffi/gtk/summary.txt
similarity index 100%
rename from basis/gtk/summary.txt
rename to ffi/gtk/summary.txt
diff --git a/basis/opengl/tags.txt b/ffi/gtk/tags.txt
similarity index 100%
rename from basis/opengl/tags.txt
rename to ffi/gtk/tags.txt
diff --git a/basis/game/input/xinput/authors.txt b/ffi/lua/authors.txt
similarity index 100%
rename from basis/game/input/xinput/authors.txt
rename to ffi/lua/authors.txt
diff --git a/extra/lua/lua.factor b/ffi/lua/lua.factor
similarity index 100%
rename from extra/lua/lua.factor
rename to ffi/lua/lua.factor
diff --git a/extra/lua/summary.txt b/ffi/lua/summary.txt
similarity index 100%
rename from extra/lua/summary.txt
rename to ffi/lua/summary.txt
diff --git a/basis/opengl/annotations/annotations-docs.factor b/ffi/opengl/annotations/annotations-docs.factor
similarity index 100%
rename from basis/opengl/annotations/annotations-docs.factor
rename to ffi/opengl/annotations/annotations-docs.factor
diff --git a/basis/opengl/annotations/annotations.factor b/ffi/opengl/annotations/annotations.factor
similarity index 100%
rename from basis/opengl/annotations/annotations.factor
rename to ffi/opengl/annotations/annotations.factor
diff --git a/basis/opengl/authors.txt b/ffi/opengl/authors.txt
similarity index 100%
rename from basis/opengl/authors.txt
rename to ffi/opengl/authors.txt
diff --git a/basis/opengl/capabilities/authors.txt b/ffi/opengl/capabilities/authors.txt
similarity index 100%
rename from basis/opengl/capabilities/authors.txt
rename to ffi/opengl/capabilities/authors.txt
diff --git a/basis/opengl/capabilities/capabilities-docs.factor b/ffi/opengl/capabilities/capabilities-docs.factor
similarity index 100%
rename from basis/opengl/capabilities/capabilities-docs.factor
rename to ffi/opengl/capabilities/capabilities-docs.factor
diff --git a/basis/opengl/capabilities/capabilities-tests.factor b/ffi/opengl/capabilities/capabilities-tests.factor
similarity index 100%
rename from basis/opengl/capabilities/capabilities-tests.factor
rename to ffi/opengl/capabilities/capabilities-tests.factor
diff --git a/basis/opengl/capabilities/capabilities.factor b/ffi/opengl/capabilities/capabilities.factor
similarity index 100%
rename from basis/opengl/capabilities/capabilities.factor
rename to ffi/opengl/capabilities/capabilities.factor
diff --git a/basis/opengl/capabilities/summary.txt b/ffi/opengl/capabilities/summary.txt
similarity index 100%
rename from basis/opengl/capabilities/summary.txt
rename to ffi/opengl/capabilities/summary.txt
diff --git a/basis/opengl/capabilities/tags.txt b/ffi/opengl/capabilities/tags.txt
similarity index 100%
rename from basis/opengl/capabilities/tags.txt
rename to ffi/opengl/capabilities/tags.txt
diff --git a/basis/sequences/product/authors.txt b/ffi/opengl/debug/authors.txt
similarity index 100%
rename from basis/sequences/product/authors.txt
rename to ffi/opengl/debug/authors.txt
diff --git a/basis/opengl/debug/debug-docs.factor b/ffi/opengl/debug/debug-docs.factor
similarity index 100%
rename from basis/opengl/debug/debug-docs.factor
rename to ffi/opengl/debug/debug-docs.factor
diff --git a/basis/opengl/debug/debug.factor b/ffi/opengl/debug/debug.factor
similarity index 100%
rename from basis/opengl/debug/debug.factor
rename to ffi/opengl/debug/debug.factor
diff --git a/basis/opengl/debug/summary.txt b/ffi/opengl/debug/summary.txt
similarity index 100%
rename from basis/opengl/debug/summary.txt
rename to ffi/opengl/debug/summary.txt
diff --git a/basis/opengl/framebuffers/authors.txt b/ffi/opengl/demo-support/authors.txt
similarity index 100%
rename from basis/opengl/framebuffers/authors.txt
rename to ffi/opengl/demo-support/authors.txt
diff --git a/extra/opengl/demo-support/demo-support.factor b/ffi/opengl/demo-support/demo-support.factor
similarity index 100%
rename from extra/opengl/demo-support/demo-support.factor
rename to ffi/opengl/demo-support/demo-support.factor
diff --git a/extra/opengl/demo-support/summary.txt b/ffi/opengl/demo-support/summary.txt
similarity index 100%
rename from extra/opengl/demo-support/summary.txt
rename to ffi/opengl/demo-support/summary.txt
diff --git a/extra/opengl/demo-support/tags.txt b/ffi/opengl/demo-support/tags.txt
similarity index 100%
rename from extra/opengl/demo-support/tags.txt
rename to ffi/opengl/demo-support/tags.txt
diff --git a/basis/opengl/shaders/authors.txt b/ffi/opengl/framebuffers/authors.txt
similarity index 100%
rename from basis/opengl/shaders/authors.txt
rename to ffi/opengl/framebuffers/authors.txt
diff --git a/basis/opengl/framebuffers/framebuffers-docs.factor b/ffi/opengl/framebuffers/framebuffers-docs.factor
similarity index 100%
rename from basis/opengl/framebuffers/framebuffers-docs.factor
rename to ffi/opengl/framebuffers/framebuffers-docs.factor
diff --git a/basis/opengl/framebuffers/framebuffers.factor b/ffi/opengl/framebuffers/framebuffers.factor
similarity index 100%
rename from basis/opengl/framebuffers/framebuffers.factor
rename to ffi/opengl/framebuffers/framebuffers.factor
diff --git a/basis/opengl/framebuffers/summary.txt b/ffi/opengl/framebuffers/summary.txt
similarity index 100%
rename from basis/opengl/framebuffers/summary.txt
rename to ffi/opengl/framebuffers/summary.txt
diff --git a/basis/opengl/framebuffers/tags.txt b/ffi/opengl/framebuffers/tags.txt
similarity index 100%
rename from basis/opengl/framebuffers/tags.txt
rename to ffi/opengl/framebuffers/tags.txt
diff --git a/extra/jamshred/authors.txt b/ffi/opengl/gl/authors.txt
similarity index 100%
rename from extra/jamshred/authors.txt
rename to ffi/opengl/gl/authors.txt
diff --git a/basis/opengl/gl/extensions/extensions.factor b/ffi/opengl/gl/extensions/extensions.factor
similarity index 100%
rename from basis/opengl/gl/extensions/extensions.factor
rename to ffi/opengl/gl/extensions/extensions.factor
diff --git a/basis/opengl/gl/gl-docs.factor b/ffi/opengl/gl/gl-docs.factor
similarity index 100%
rename from basis/opengl/gl/gl-docs.factor
rename to ffi/opengl/gl/gl-docs.factor
diff --git a/basis/opengl/gl/gl.factor b/ffi/opengl/gl/gl.factor
similarity index 100%
rename from basis/opengl/gl/gl.factor
rename to ffi/opengl/gl/gl.factor
diff --git a/basis/opengl/gl/gtk/authors.txt b/ffi/opengl/gl/gtk/authors.txt
similarity index 100%
rename from basis/opengl/gl/gtk/authors.txt
rename to ffi/opengl/gl/gtk/authors.txt
diff --git a/basis/opengl/gl/gtk/gtk.factor b/ffi/opengl/gl/gtk/gtk.factor
similarity index 100%
rename from basis/opengl/gl/gtk/gtk.factor
rename to ffi/opengl/gl/gtk/gtk.factor
diff --git a/basis/opengl/gl/macosx/macosx.factor b/ffi/opengl/gl/macosx/macosx.factor
similarity index 100%
rename from basis/opengl/gl/macosx/macosx.factor
rename to ffi/opengl/gl/macosx/macosx.factor
diff --git a/basis/game/input/iokit/platforms.txt b/ffi/opengl/gl/macosx/platforms.txt
similarity index 100%
rename from basis/game/input/iokit/platforms.txt
rename to ffi/opengl/gl/macosx/platforms.txt
diff --git a/basis/opengl/gl/summary.txt b/ffi/opengl/gl/summary.txt
similarity index 100%
rename from basis/opengl/gl/summary.txt
rename to ffi/opengl/gl/summary.txt
diff --git a/basis/pango/cairo/tags.txt b/ffi/opengl/gl/tags.txt
similarity index 100%
rename from basis/pango/cairo/tags.txt
rename to ffi/opengl/gl/tags.txt
diff --git a/basis/sequences/unrolled/authors.txt b/ffi/opengl/gl/windows/authors.txt
similarity index 100%
rename from basis/sequences/unrolled/authors.txt
rename to ffi/opengl/gl/windows/authors.txt
diff --git a/basis/alien/libraries/windows/platforms.txt b/ffi/opengl/gl/windows/platforms.txt
similarity index 100%
rename from basis/alien/libraries/windows/platforms.txt
rename to ffi/opengl/gl/windows/platforms.txt
diff --git a/basis/opengl/gl/windows/windows.factor b/ffi/opengl/gl/windows/windows.factor
similarity index 100%
rename from basis/opengl/gl/windows/windows.factor
rename to ffi/opengl/gl/windows/windows.factor
diff --git a/basis/ui/pixel-formats/authors.txt b/ffi/opengl/gl/x11/authors.txt
similarity index 100%
rename from basis/ui/pixel-formats/authors.txt
rename to ffi/opengl/gl/x11/authors.txt
diff --git a/basis/unix/debugger/platforms.txt b/ffi/opengl/gl/x11/platforms.txt
similarity index 100%
rename from basis/unix/debugger/platforms.txt
rename to ffi/opengl/gl/x11/platforms.txt
diff --git a/basis/opengl/gl/x11/x11.factor b/ffi/opengl/gl/x11/x11.factor
similarity index 100%
rename from basis/opengl/gl/x11/x11.factor
rename to ffi/opengl/gl/x11/x11.factor
diff --git a/basis/unix/signals/authors.txt b/ffi/opengl/gl3/authors.txt
similarity index 100%
rename from basis/unix/signals/authors.txt
rename to ffi/opengl/gl3/authors.txt
diff --git a/basis/opengl/gl3/gl3.factor b/ffi/opengl/gl3/gl3.factor
similarity index 100%
rename from basis/opengl/gl3/gl3.factor
rename to ffi/opengl/gl3/gl3.factor
diff --git a/basis/opengl/gl3/summary.txt b/ffi/opengl/gl3/summary.txt
similarity index 100%
rename from basis/opengl/gl3/summary.txt
rename to ffi/opengl/gl3/summary.txt
diff --git a/extra/jamshred/game/authors.txt b/ffi/opengl/glu/authors.txt
similarity index 100%
rename from extra/jamshred/game/authors.txt
rename to ffi/opengl/glu/authors.txt
diff --git a/extra/opengl/glu/glu.factor b/ffi/opengl/glu/glu.factor
similarity index 100%
rename from extra/opengl/glu/glu.factor
rename to ffi/opengl/glu/glu.factor
diff --git a/extra/opengl/glu/summary.txt b/ffi/opengl/glu/summary.txt
similarity index 100%
rename from extra/opengl/glu/summary.txt
rename to ffi/opengl/glu/summary.txt
diff --git a/basis/pango/tags.txt b/ffi/opengl/glu/tags.txt
similarity index 100%
rename from basis/pango/tags.txt
rename to ffi/opengl/glu/tags.txt
diff --git a/basis/opengl/opengl-docs.factor b/ffi/opengl/opengl-docs.factor
similarity index 100%
rename from basis/opengl/opengl-docs.factor
rename to ffi/opengl/opengl-docs.factor
diff --git a/basis/opengl/opengl-tests.factor b/ffi/opengl/opengl-tests.factor
similarity index 100%
rename from basis/opengl/opengl-tests.factor
rename to ffi/opengl/opengl-tests.factor
diff --git a/basis/opengl/opengl.factor b/ffi/opengl/opengl.factor
similarity index 100%
rename from basis/opengl/opengl.factor
rename to ffi/opengl/opengl.factor
diff --git a/extra/opengl/demo-support/authors.txt b/ffi/opengl/shaders/authors.txt
similarity index 100%
rename from extra/opengl/demo-support/authors.txt
rename to ffi/opengl/shaders/authors.txt
diff --git a/basis/opengl/shaders/shaders-docs.factor b/ffi/opengl/shaders/shaders-docs.factor
similarity index 100%
rename from basis/opengl/shaders/shaders-docs.factor
rename to ffi/opengl/shaders/shaders-docs.factor
diff --git a/basis/opengl/shaders/shaders.factor b/ffi/opengl/shaders/shaders.factor
similarity index 100%
rename from basis/opengl/shaders/shaders.factor
rename to ffi/opengl/shaders/shaders.factor
diff --git a/basis/opengl/shaders/summary.txt b/ffi/opengl/shaders/summary.txt
similarity index 100%
rename from basis/opengl/shaders/summary.txt
rename to ffi/opengl/shaders/summary.txt
diff --git a/basis/opengl/shaders/tags.txt b/ffi/opengl/shaders/tags.txt
similarity index 100%
rename from basis/opengl/shaders/tags.txt
rename to ffi/opengl/shaders/tags.txt
diff --git a/basis/opengl/summary.txt b/ffi/opengl/summary.txt
similarity index 100%
rename from basis/opengl/summary.txt
rename to ffi/opengl/summary.txt
diff --git a/basis/unix/tags.txt b/ffi/opengl/tags.txt
similarity index 100%
rename from basis/unix/tags.txt
rename to ffi/opengl/tags.txt
diff --git a/basis/ui/tools/error-list/authors.txt b/ffi/opengl/textures/authors.txt
similarity index 100%
rename from basis/ui/tools/error-list/authors.txt
rename to ffi/opengl/textures/authors.txt
diff --git a/basis/opengl/textures/textures-docs.factor b/ffi/opengl/textures/textures-docs.factor
similarity index 100%
rename from basis/opengl/textures/textures-docs.factor
rename to ffi/opengl/textures/textures-docs.factor
diff --git a/basis/opengl/textures/textures-tests.factor b/ffi/opengl/textures/textures-tests.factor
similarity index 100%
rename from basis/opengl/textures/textures-tests.factor
rename to ffi/opengl/textures/textures-tests.factor
diff --git a/basis/opengl/textures/textures.factor b/ffi/opengl/textures/textures.factor
similarity index 100%
rename from basis/opengl/textures/textures.factor
rename to ffi/opengl/textures/textures.factor
diff --git a/basis/openssl/authors.txt b/ffi/openssl/authors.txt
similarity index 100%
rename from basis/openssl/authors.txt
rename to ffi/openssl/authors.txt
diff --git a/basis/openssl/libcrypto/libcrypto-tests.factor b/ffi/openssl/libcrypto/libcrypto-tests.factor
similarity index 100%
rename from basis/openssl/libcrypto/libcrypto-tests.factor
rename to ffi/openssl/libcrypto/libcrypto-tests.factor
diff --git a/basis/openssl/libcrypto/libcrypto.factor b/ffi/openssl/libcrypto/libcrypto.factor
similarity index 100%
rename from basis/openssl/libcrypto/libcrypto.factor
rename to ffi/openssl/libcrypto/libcrypto.factor
diff --git a/basis/openssl/libcrypto/summary.txt b/ffi/openssl/libcrypto/summary.txt
similarity index 100%
rename from basis/openssl/libcrypto/summary.txt
rename to ffi/openssl/libcrypto/summary.txt
diff --git a/basis/openssl/libssl/libssl-tests.factor b/ffi/openssl/libssl/libssl-tests.factor
similarity index 100%
rename from basis/openssl/libssl/libssl-tests.factor
rename to ffi/openssl/libssl/libssl-tests.factor
diff --git a/basis/openssl/libssl/libssl.factor b/ffi/openssl/libssl/libssl.factor
similarity index 100%
rename from basis/openssl/libssl/libssl.factor
rename to ffi/openssl/libssl/libssl.factor
diff --git a/basis/openssl/libssl/summary.txt b/ffi/openssl/libssl/summary.txt
similarity index 100%
rename from basis/openssl/libssl/summary.txt
rename to ffi/openssl/libssl/summary.txt
diff --git a/basis/openssl/openssl-tests.factor b/ffi/openssl/openssl-tests.factor
similarity index 100%
rename from basis/openssl/openssl-tests.factor
rename to ffi/openssl/openssl-tests.factor
diff --git a/basis/openssl/openssl.factor b/ffi/openssl/openssl.factor
similarity index 100%
rename from basis/openssl/openssl.factor
rename to ffi/openssl/openssl.factor
diff --git a/basis/openssl/summary.txt b/ffi/openssl/summary.txt
similarity index 100%
rename from basis/openssl/summary.txt
rename to ffi/openssl/summary.txt
diff --git a/basis/openssl/tags.txt b/ffi/openssl/tags.txt
similarity index 100%
rename from basis/openssl/tags.txt
rename to ffi/openssl/tags.txt
diff --git a/basis/openssl/test/dh1024.pem b/ffi/openssl/test/dh1024.pem
similarity index 100%
rename from basis/openssl/test/dh1024.pem
rename to ffi/openssl/test/dh1024.pem
diff --git a/basis/openssl/test/root.pem b/ffi/openssl/test/root.pem
similarity index 100%
rename from basis/openssl/test/root.pem
rename to ffi/openssl/test/root.pem
diff --git a/basis/openssl/test/server.pem b/ffi/openssl/test/server.pem
similarity index 100%
rename from basis/openssl/test/server.pem
rename to ffi/openssl/test/server.pem
diff --git a/basis/pango/Pango-1.0.gir b/ffi/pango/Pango-1.0.gir
similarity index 100%
rename from basis/pango/Pango-1.0.gir
rename to ffi/pango/Pango-1.0.gir
diff --git a/basis/pango/cairo/authors.txt b/ffi/pango/authors.txt
similarity index 100%
rename from basis/pango/cairo/authors.txt
rename to ffi/pango/authors.txt
diff --git a/basis/pango/cairo/PangoCairo-1.0.gir b/ffi/pango/cairo/PangoCairo-1.0.gir
similarity index 100%
rename from basis/pango/cairo/PangoCairo-1.0.gir
rename to ffi/pango/cairo/PangoCairo-1.0.gir
diff --git a/extra/clutter/authors.txt b/ffi/pango/cairo/authors.txt
similarity index 100%
rename from extra/clutter/authors.txt
rename to ffi/pango/cairo/authors.txt
diff --git a/basis/pango/cairo/cairo.factor b/ffi/pango/cairo/cairo.factor
similarity index 100%
rename from basis/pango/cairo/cairo.factor
rename to ffi/pango/cairo/cairo.factor
diff --git a/basis/pango/cairo/ffi/ffi.factor b/ffi/pango/cairo/ffi/ffi.factor
similarity index 100%
rename from basis/pango/cairo/ffi/ffi.factor
rename to ffi/pango/cairo/ffi/ffi.factor
diff --git a/basis/pango/cairo/summary.txt b/ffi/pango/cairo/summary.txt
similarity index 100%
rename from basis/pango/cairo/summary.txt
rename to ffi/pango/cairo/summary.txt
diff --git a/basis/windows/com/syntax/tags.txt b/ffi/pango/cairo/tags.txt
similarity index 100%
rename from basis/windows/com/syntax/tags.txt
rename to ffi/pango/cairo/tags.txt
diff --git a/basis/pango/ffi/ffi.factor b/ffi/pango/ffi/ffi.factor
similarity index 100%
rename from basis/pango/ffi/ffi.factor
rename to ffi/pango/ffi/ffi.factor
diff --git a/basis/pango/pango.factor b/ffi/pango/pango.factor
similarity index 100%
rename from basis/pango/pango.factor
rename to ffi/pango/pango.factor
diff --git a/basis/pango/summary.txt b/ffi/pango/summary.txt
similarity index 100%
rename from basis/pango/summary.txt
rename to ffi/pango/summary.txt
diff --git a/basis/windows/com/wrapper/tags.txt b/ffi/pango/tags.txt
similarity index 100%
rename from basis/windows/com/wrapper/tags.txt
rename to ffi/pango/tags.txt
diff --git a/extra/pcre/authors.txt b/ffi/pcre/authors.txt
similarity index 100%
rename from extra/pcre/authors.txt
rename to ffi/pcre/authors.txt
diff --git a/extra/pcre/ffi/ffi-tests.factor b/ffi/pcre/ffi/ffi-tests.factor
similarity index 100%
rename from extra/pcre/ffi/ffi-tests.factor
rename to ffi/pcre/ffi/ffi-tests.factor
diff --git a/extra/pcre/ffi/ffi.factor b/ffi/pcre/ffi/ffi.factor
similarity index 100%
rename from extra/pcre/ffi/ffi.factor
rename to ffi/pcre/ffi/ffi.factor
diff --git a/extra/pcre/pcre-docs.factor b/ffi/pcre/pcre-docs.factor
similarity index 100%
rename from extra/pcre/pcre-docs.factor
rename to ffi/pcre/pcre-docs.factor
diff --git a/extra/pcre/pcre-tests.factor b/ffi/pcre/pcre-tests.factor
similarity index 100%
rename from extra/pcre/pcre-tests.factor
rename to ffi/pcre/pcre-tests.factor
diff --git a/extra/pcre/pcre.factor b/ffi/pcre/pcre.factor
similarity index 100%
rename from extra/pcre/pcre.factor
rename to ffi/pcre/pcre.factor
diff --git a/extra/pcre/summary.txt b/ffi/pcre/summary.txt
similarity index 100%
rename from extra/pcre/summary.txt
rename to ffi/pcre/summary.txt
diff --git a/extra/python/authors.txt b/ffi/python/authors.txt
similarity index 100%
rename from extra/python/authors.txt
rename to ffi/python/authors.txt
diff --git a/extra/python/errors/errors-docs.factor b/ffi/python/errors/errors-docs.factor
similarity index 100%
rename from extra/python/errors/errors-docs.factor
rename to ffi/python/errors/errors-docs.factor
diff --git a/extra/python/errors/errors.factor b/ffi/python/errors/errors.factor
similarity index 100%
rename from extra/python/errors/errors.factor
rename to ffi/python/errors/errors.factor
diff --git a/extra/python/errors/summary.txt b/ffi/python/errors/summary.txt
similarity index 100%
rename from extra/python/errors/summary.txt
rename to ffi/python/errors/summary.txt
diff --git a/extra/python/ffi/ffi.factor b/ffi/python/ffi/ffi.factor
similarity index 100%
rename from extra/python/ffi/ffi.factor
rename to ffi/python/ffi/ffi.factor
diff --git a/extra/python/modules/__builtin__/__builtin__.factor b/ffi/python/modules/__builtin__/__builtin__.factor
similarity index 100%
rename from extra/python/modules/__builtin__/__builtin__.factor
rename to ffi/python/modules/__builtin__/__builtin__.factor
diff --git a/extra/python/modules/argparse/argparse.factor b/ffi/python/modules/argparse/argparse.factor
similarity index 100%
rename from extra/python/modules/argparse/argparse.factor
rename to ffi/python/modules/argparse/argparse.factor
diff --git a/extra/python/modules/datetime/datetime.factor b/ffi/python/modules/datetime/datetime.factor
similarity index 100%
rename from extra/python/modules/datetime/datetime.factor
rename to ffi/python/modules/datetime/datetime.factor
diff --git a/extra/python/modules/os/os.factor b/ffi/python/modules/os/os.factor
similarity index 100%
rename from extra/python/modules/os/os.factor
rename to ffi/python/modules/os/os.factor
diff --git a/extra/python/modules/os/path/path.factor b/ffi/python/modules/os/path/path.factor
similarity index 100%
rename from extra/python/modules/os/path/path.factor
rename to ffi/python/modules/os/path/path.factor
diff --git a/extra/python/modules/sys/sys.factor b/ffi/python/modules/sys/sys.factor
similarity index 100%
rename from extra/python/modules/sys/sys.factor
rename to ffi/python/modules/sys/sys.factor
diff --git a/extra/python/modules/time/time.factor b/ffi/python/modules/time/time.factor
similarity index 100%
rename from extra/python/modules/time/time.factor
rename to ffi/python/modules/time/time.factor
diff --git a/extra/python/objects/objects.factor b/ffi/python/objects/objects.factor
similarity index 100%
rename from extra/python/objects/objects.factor
rename to ffi/python/objects/objects.factor
diff --git a/extra/python/python-docs.factor b/ffi/python/python-docs.factor
similarity index 100%
rename from extra/python/python-docs.factor
rename to ffi/python/python-docs.factor
diff --git a/extra/python/python-tests.factor b/ffi/python/python-tests.factor
similarity index 100%
rename from extra/python/python-tests.factor
rename to ffi/python/python-tests.factor
diff --git a/extra/python/python.factor b/ffi/python/python.factor
similarity index 100%
rename from extra/python/python.factor
rename to ffi/python/python.factor
diff --git a/extra/python/summary.txt b/ffi/python/summary.txt
similarity index 100%
rename from extra/python/summary.txt
rename to ffi/python/summary.txt
diff --git a/extra/python/syntax/authors.txt b/ffi/python/syntax/authors.txt
similarity index 100%
rename from extra/python/syntax/authors.txt
rename to ffi/python/syntax/authors.txt
diff --git a/extra/python/syntax/summary.txt b/ffi/python/syntax/summary.txt
similarity index 100%
rename from extra/python/syntax/summary.txt
rename to ffi/python/syntax/summary.txt
diff --git a/extra/python/syntax/syntax-docs.factor b/ffi/python/syntax/syntax-docs.factor
similarity index 100%
rename from extra/python/syntax/syntax-docs.factor
rename to ffi/python/syntax/syntax-docs.factor
diff --git a/extra/python/syntax/syntax-tests.factor b/ffi/python/syntax/syntax-tests.factor
similarity index 100%
rename from extra/python/syntax/syntax-tests.factor
rename to ffi/python/syntax/syntax-tests.factor
diff --git a/extra/python/syntax/syntax.factor b/ffi/python/syntax/syntax.factor
similarity index 100%
rename from extra/python/syntax/syntax.factor
rename to ffi/python/syntax/syntax.factor
diff --git a/extra/python/throwing/throwing.factor b/ffi/python/throwing/throwing.factor
similarity index 100%
rename from extra/python/throwing/throwing.factor
rename to ffi/python/throwing/throwing.factor
diff --git a/basis/windows/com/wrapper/authors.txt b/ffi/qtkit/authors.txt
similarity index 100%
rename from basis/windows/com/wrapper/authors.txt
rename to ffi/qtkit/authors.txt
diff --git a/basis/opengl/gl/macosx/platforms.txt b/ffi/qtkit/platforms.txt
similarity index 100%
rename from basis/opengl/gl/macosx/platforms.txt
rename to ffi/qtkit/platforms.txt
diff --git a/extra/qtkit/qtkit.factor b/ffi/qtkit/qtkit.factor
similarity index 100%
rename from extra/qtkit/qtkit.factor
rename to ffi/qtkit/qtkit.factor
diff --git a/basis/windows/ddk/winusb/authors.txt b/ffi/readline/authors.txt
similarity index 100%
rename from basis/windows/ddk/winusb/authors.txt
rename to ffi/readline/authors.txt
diff --git a/extra/readline/ffi/ffi.factor b/ffi/readline/ffi/ffi.factor
similarity index 100%
rename from extra/readline/ffi/ffi.factor
rename to ffi/readline/ffi/ffi.factor
diff --git a/extra/readline-listener/platforms.txt b/ffi/readline/ffi/platforms.txt
similarity index 100%
rename from extra/readline-listener/platforms.txt
rename to ffi/readline/ffi/platforms.txt
diff --git a/extra/readline/ffi/platforms.txt b/ffi/readline/platforms.txt
similarity index 100%
rename from extra/readline/ffi/platforms.txt
rename to ffi/readline/platforms.txt
diff --git a/extra/readline/readline-docs.factor b/ffi/readline/readline-docs.factor
similarity index 100%
rename from extra/readline/readline-docs.factor
rename to ffi/readline/readline-docs.factor
diff --git a/extra/readline/readline.factor b/ffi/readline/readline.factor
similarity index 100%
rename from extra/readline/readline.factor
rename to ffi/readline/readline.factor
diff --git a/extra/readline/summary.txt b/ffi/readline/summary.txt
similarity index 100%
rename from extra/readline/summary.txt
rename to ffi/readline/summary.txt
diff --git a/basis/windows/ddk/winusb/tags.txt b/ffi/readline/tags.txt
similarity index 100%
rename from basis/windows/ddk/winusb/tags.txt
rename to ffi/readline/tags.txt
diff --git a/basis/windows/handles/authors.txt b/ffi/system-info/authors.txt
similarity index 100%
rename from basis/windows/handles/authors.txt
rename to ffi/system-info/authors.txt
diff --git a/basis/windows/iphlpapi/authors.txt b/ffi/system-info/linux/authors.txt
similarity index 100%
rename from basis/windows/iphlpapi/authors.txt
rename to ffi/system-info/linux/authors.txt
diff --git a/basis/system-info/linux/linux-tests.factor b/ffi/system-info/linux/linux-tests.factor
similarity index 100%
rename from basis/system-info/linux/linux-tests.factor
rename to ffi/system-info/linux/linux-tests.factor
diff --git a/basis/system-info/linux/linux.factor b/ffi/system-info/linux/linux.factor
similarity index 100%
rename from basis/system-info/linux/linux.factor
rename to ffi/system-info/linux/linux.factor
diff --git a/basis/game/input/gtk/platforms.txt b/ffi/system-info/linux/platforms.txt
similarity index 100%
rename from basis/game/input/gtk/platforms.txt
rename to ffi/system-info/linux/platforms.txt
diff --git a/basis/system-info/macosx/authors.txt b/ffi/system-info/macosx/authors.txt
similarity index 100%
rename from basis/system-info/macosx/authors.txt
rename to ffi/system-info/macosx/authors.txt
diff --git a/basis/system-info/macosx/macosx.factor b/ffi/system-info/macosx/macosx.factor
similarity index 100%
rename from basis/system-info/macosx/macosx.factor
rename to ffi/system-info/macosx/macosx.factor
diff --git a/basis/system-info/macosx/platforms.txt b/ffi/system-info/macosx/platforms.txt
similarity index 100%
rename from basis/system-info/macosx/platforms.txt
rename to ffi/system-info/macosx/platforms.txt
diff --git a/basis/system-info/summary.txt b/ffi/system-info/summary.txt
similarity index 100%
rename from basis/system-info/summary.txt
rename to ffi/system-info/summary.txt
diff --git a/basis/system-info/system-info.factor b/ffi/system-info/system-info.factor
similarity index 100%
rename from basis/system-info/system-info.factor
rename to ffi/system-info/system-info.factor
diff --git a/basis/windows/kernel32/authors.txt b/ffi/system-info/windows/authors.txt
similarity index 100%
rename from basis/windows/kernel32/authors.txt
rename to ffi/system-info/windows/authors.txt
diff --git a/basis/environment/windows/platforms.txt b/ffi/system-info/windows/platforms.txt
similarity index 100%
rename from basis/environment/windows/platforms.txt
rename to ffi/system-info/windows/platforms.txt
diff --git a/basis/system-info/windows/windows-tests.factor b/ffi/system-info/windows/windows-tests.factor
similarity index 100%
rename from basis/system-info/windows/windows-tests.factor
rename to ffi/system-info/windows/windows-tests.factor
diff --git a/basis/system-info/windows/windows.factor b/ffi/system-info/windows/windows.factor
similarity index 100%
rename from basis/system-info/windows/windows.factor
rename to ffi/system-info/windows/windows.factor
diff --git a/basis/help/vocabs/authors.txt b/ffi/unix/authors.txt
similarity index 100%
rename from basis/help/vocabs/authors.txt
rename to ffi/unix/authors.txt
diff --git a/basis/unix/debugger/debugger.factor b/ffi/unix/debugger/debugger.factor
similarity index 100%
rename from basis/unix/debugger/debugger.factor
rename to ffi/unix/debugger/debugger.factor
diff --git a/basis/unix/ffi/platforms.txt b/ffi/unix/debugger/platforms.txt
similarity index 100%
rename from basis/unix/ffi/platforms.txt
rename to ffi/unix/debugger/platforms.txt
diff --git a/basis/unix/ffi/authors.txt b/ffi/unix/ffi/authors.txt
similarity index 100%
rename from basis/unix/ffi/authors.txt
rename to ffi/unix/ffi/authors.txt
diff --git a/basis/unix/ffi/ffi-tests.factor b/ffi/unix/ffi/ffi-tests.factor
similarity index 100%
rename from basis/unix/ffi/ffi-tests.factor
rename to ffi/unix/ffi/ffi-tests.factor
diff --git a/basis/unix/ffi/ffi.factor b/ffi/unix/ffi/ffi.factor
similarity index 100%
rename from basis/unix/ffi/ffi.factor
rename to ffi/unix/ffi/ffi.factor
diff --git a/basis/unix/ffi/linux/authors.txt b/ffi/unix/ffi/linux/authors.txt
similarity index 100%
rename from basis/unix/ffi/linux/authors.txt
rename to ffi/unix/ffi/linux/authors.txt
diff --git a/basis/unix/ffi/linux/linux.factor b/ffi/unix/ffi/linux/linux.factor
similarity index 100%
rename from basis/unix/ffi/linux/linux.factor
rename to ffi/unix/ffi/linux/linux.factor
diff --git a/basis/game/input/x11/platforms.txt b/ffi/unix/ffi/linux/platforms.txt
similarity index 100%
rename from basis/game/input/x11/platforms.txt
rename to ffi/unix/ffi/linux/platforms.txt
diff --git a/basis/unix/ffi/macosx/macosx.factor b/ffi/unix/ffi/macosx/macosx.factor
similarity index 100%
rename from basis/unix/ffi/macosx/macosx.factor
rename to ffi/unix/ffi/macosx/macosx.factor
diff --git a/basis/ui/backend/cocoa/platforms.txt b/ffi/unix/ffi/macosx/platforms.txt
similarity index 100%
rename from basis/ui/backend/cocoa/platforms.txt
rename to ffi/unix/ffi/macosx/platforms.txt
diff --git a/basis/unix/groups/platforms.txt b/ffi/unix/ffi/platforms.txt
similarity index 100%
rename from basis/unix/groups/platforms.txt
rename to ffi/unix/ffi/platforms.txt
diff --git a/basis/windows/messages/authors.txt b/ffi/unix/getfsstat/macosx/authors.txt
similarity index 100%
rename from basis/windows/messages/authors.txt
rename to ffi/unix/getfsstat/macosx/authors.txt
diff --git a/basis/unix/getfsstat/macosx/macosx.factor b/ffi/unix/getfsstat/macosx/macosx.factor
similarity index 100%
rename from basis/unix/getfsstat/macosx/macosx.factor
rename to ffi/unix/getfsstat/macosx/macosx.factor
diff --git a/basis/ui/backend/cocoa/tools/platforms.txt b/ffi/unix/getfsstat/macosx/platforms.txt
similarity index 100%
rename from basis/ui/backend/cocoa/tools/platforms.txt
rename to ffi/unix/getfsstat/macosx/platforms.txt
diff --git a/basis/windows/ntdll/authors.txt b/ffi/unix/groups/authors.txt
similarity index 100%
rename from basis/windows/ntdll/authors.txt
rename to ffi/unix/groups/authors.txt
diff --git a/basis/unix/groups/groups-docs.factor b/ffi/unix/groups/groups-docs.factor
similarity index 100%
rename from basis/unix/groups/groups-docs.factor
rename to ffi/unix/groups/groups-docs.factor
diff --git a/basis/unix/groups/groups-tests.factor b/ffi/unix/groups/groups-tests.factor
similarity index 100%
rename from basis/unix/groups/groups-tests.factor
rename to ffi/unix/groups/groups-tests.factor
diff --git a/basis/unix/groups/groups.factor b/ffi/unix/groups/groups.factor
similarity index 100%
rename from basis/unix/groups/groups.factor
rename to ffi/unix/groups/groups.factor
diff --git a/basis/unix/platforms.txt b/ffi/unix/groups/platforms.txt
similarity index 100%
rename from basis/unix/platforms.txt
rename to ffi/unix/groups/platforms.txt
diff --git a/basis/unix/groups/summary.txt b/ffi/unix/groups/summary.txt
similarity index 100%
rename from basis/unix/groups/summary.txt
rename to ffi/unix/groups/summary.txt
diff --git a/basis/sequences/cords/authors.txt b/ffi/unix/kqueue/authors.txt
similarity index 100%
rename from basis/sequences/cords/authors.txt
rename to ffi/unix/kqueue/authors.txt
diff --git a/basis/unix/kqueue/kqueue.factor b/ffi/unix/kqueue/kqueue.factor
similarity index 100%
rename from basis/unix/kqueue/kqueue.factor
rename to ffi/unix/kqueue/kqueue.factor
diff --git a/basis/unix/kqueue/macosx/macosx.factor b/ffi/unix/kqueue/macosx/macosx.factor
similarity index 100%
rename from basis/unix/kqueue/macosx/macosx.factor
rename to ffi/unix/kqueue/macosx/macosx.factor
diff --git a/basis/ui/backend/cocoa/views/platforms.txt b/ffi/unix/kqueue/macosx/platforms.txt
similarity index 100%
rename from basis/ui/backend/cocoa/views/platforms.txt
rename to ffi/unix/kqueue/macosx/platforms.txt
diff --git a/basis/ui/text/core-text/platforms.txt b/ffi/unix/kqueue/platforms.txt
similarity index 100%
rename from basis/ui/text/core-text/platforms.txt
rename to ffi/unix/kqueue/platforms.txt
diff --git a/basis/specialized-arrays/authors.txt b/ffi/unix/linux/authors.txt
similarity index 100%
rename from basis/specialized-arrays/authors.txt
rename to ffi/unix/linux/authors.txt
diff --git a/basis/specialized-vectors/authors.txt b/ffi/unix/linux/epoll/authors.txt
similarity index 100%
rename from basis/specialized-vectors/authors.txt
rename to ffi/unix/linux/epoll/authors.txt
diff --git a/basis/unix/linux/epoll/epoll.factor b/ffi/unix/linux/epoll/epoll.factor
similarity index 100%
rename from basis/unix/linux/epoll/epoll.factor
rename to ffi/unix/linux/epoll/epoll.factor
diff --git a/basis/system-info/linux/platforms.txt b/ffi/unix/linux/epoll/platforms.txt
similarity index 100%
rename from basis/system-info/linux/platforms.txt
rename to ffi/unix/linux/epoll/platforms.txt
diff --git a/basis/unix/linux/inotify/inotify.factor b/ffi/unix/linux/inotify/inotify.factor
similarity index 100%
rename from basis/unix/linux/inotify/inotify.factor
rename to ffi/unix/linux/inotify/inotify.factor
diff --git a/basis/ui/text/pango/platforms.txt b/ffi/unix/linux/inotify/platforms.txt
similarity index 100%
rename from basis/ui/text/pango/platforms.txt
rename to ffi/unix/linux/inotify/platforms.txt
diff --git a/basis/unix/linux/linux.factor b/ffi/unix/linux/linux.factor
similarity index 100%
rename from basis/unix/linux/linux.factor
rename to ffi/unix/linux/linux.factor
diff --git a/basis/unix/ffi/linux/platforms.txt b/ffi/unix/linux/platforms.txt
similarity index 100%
rename from basis/unix/ffi/linux/platforms.txt
rename to ffi/unix/linux/platforms.txt
diff --git a/basis/windows/opengl32/authors.txt b/ffi/unix/linux/proc/authors.txt
similarity index 100%
rename from basis/windows/opengl32/authors.txt
rename to ffi/unix/linux/proc/authors.txt
diff --git a/basis/unix/linux/epoll/platforms.txt b/ffi/unix/linux/proc/platforms.txt
similarity index 100%
rename from basis/unix/linux/epoll/platforms.txt
rename to ffi/unix/linux/proc/platforms.txt
diff --git a/basis/unix/linux/proc/proc-tests.factor b/ffi/unix/linux/proc/proc-tests.factor
similarity index 100%
rename from basis/unix/linux/proc/proc-tests.factor
rename to ffi/unix/linux/proc/proc-tests.factor
diff --git a/basis/unix/linux/proc/proc.factor b/ffi/unix/linux/proc/proc.factor
similarity index 100%
rename from basis/unix/linux/proc/proc.factor
rename to ffi/unix/linux/proc/proc.factor
diff --git a/basis/unix/process/platforms.txt b/ffi/unix/platforms.txt
similarity index 100%
rename from basis/unix/process/platforms.txt
rename to ffi/unix/platforms.txt
diff --git a/basis/unix/process/authors.txt b/ffi/unix/process/authors.txt
similarity index 100%
rename from basis/unix/process/authors.txt
rename to ffi/unix/process/authors.txt
diff --git a/basis/unix/signals/platforms.txt b/ffi/unix/process/platforms.txt
similarity index 100%
rename from basis/unix/signals/platforms.txt
rename to ffi/unix/process/platforms.txt
diff --git a/basis/unix/process/process.factor b/ffi/unix/process/process.factor
similarity index 100%
rename from basis/unix/process/process.factor
rename to ffi/unix/process/process.factor
diff --git a/basis/windows/directx/dinput/authors.txt b/ffi/unix/signals/authors.txt
similarity index 100%
rename from basis/windows/directx/dinput/authors.txt
rename to ffi/unix/signals/authors.txt
diff --git a/basis/unix/stat/platforms.txt b/ffi/unix/signals/platforms.txt
similarity index 100%
rename from basis/unix/stat/platforms.txt
rename to ffi/unix/signals/platforms.txt
diff --git a/basis/unix/signals/signals-docs.factor b/ffi/unix/signals/signals-docs.factor
similarity index 100%
rename from basis/unix/signals/signals-docs.factor
rename to ffi/unix/signals/signals-docs.factor
diff --git a/basis/unix/signals/signals-tests.factor b/ffi/unix/signals/signals-tests.factor
similarity index 100%
rename from basis/unix/signals/signals-tests.factor
rename to ffi/unix/signals/signals-tests.factor
diff --git a/basis/unix/signals/signals.factor b/ffi/unix/signals/signals.factor
similarity index 100%
rename from basis/unix/signals/signals.factor
rename to ffi/unix/signals/signals.factor
diff --git a/basis/unix/signals/summary.txt b/ffi/unix/signals/summary.txt
similarity index 100%
rename from basis/unix/signals/summary.txt
rename to ffi/unix/signals/summary.txt
diff --git a/basis/unix/stat/linux/32/32.factor b/ffi/unix/stat/linux/32/32.factor
similarity index 100%
rename from basis/unix/stat/linux/32/32.factor
rename to ffi/unix/stat/linux/32/32.factor
diff --git a/basis/cpu/x86/64/unix/tags.txt b/ffi/unix/stat/linux/32/tags.txt
similarity index 100%
rename from basis/cpu/x86/64/unix/tags.txt
rename to ffi/unix/stat/linux/32/tags.txt
diff --git a/basis/unix/stat/linux/64/64.factor b/ffi/unix/stat/linux/64/64.factor
similarity index 100%
rename from basis/unix/stat/linux/64/64.factor
rename to ffi/unix/stat/linux/64/64.factor
diff --git a/basis/cpu/x86/64/windows/tags.txt b/ffi/unix/stat/linux/64/tags.txt
similarity index 100%
rename from basis/cpu/x86/64/windows/tags.txt
rename to ffi/unix/stat/linux/64/tags.txt
diff --git a/basis/unix/stat/linux/linux.factor b/ffi/unix/stat/linux/linux.factor
similarity index 100%
rename from basis/unix/stat/linux/linux.factor
rename to ffi/unix/stat/linux/linux.factor
diff --git a/basis/unix/linux/inotify/platforms.txt b/ffi/unix/stat/linux/platforms.txt
similarity index 100%
rename from basis/unix/linux/inotify/platforms.txt
rename to ffi/unix/stat/linux/platforms.txt
diff --git a/basis/unix/stat/macosx/macosx.factor b/ffi/unix/stat/macosx/macosx.factor
similarity index 100%
rename from basis/unix/stat/macosx/macosx.factor
rename to ffi/unix/stat/macosx/macosx.factor
diff --git a/basis/unix/ffi/macosx/platforms.txt b/ffi/unix/stat/macosx/platforms.txt
similarity index 100%
rename from basis/unix/ffi/macosx/platforms.txt
rename to ffi/unix/stat/macosx/platforms.txt
diff --git a/basis/unix/statvfs/platforms.txt b/ffi/unix/stat/platforms.txt
similarity index 100%
rename from basis/unix/statvfs/platforms.txt
rename to ffi/unix/stat/platforms.txt
diff --git a/basis/unix/stat/stat.factor b/ffi/unix/stat/stat.factor
similarity index 100%
rename from basis/unix/stat/stat.factor
rename to ffi/unix/stat/stat.factor
diff --git a/basis/unix/statfs/linux/authors.txt b/ffi/unix/statfs/linux/authors.txt
similarity index 100%
rename from basis/unix/statfs/linux/authors.txt
rename to ffi/unix/statfs/linux/authors.txt
diff --git a/basis/unix/statfs/linux/linux.factor b/ffi/unix/statfs/linux/linux.factor
similarity index 100%
rename from basis/unix/statfs/linux/linux.factor
rename to ffi/unix/statfs/linux/linux.factor
diff --git a/basis/unix/linux/platforms.txt b/ffi/unix/statfs/linux/platforms.txt
similarity index 100%
rename from basis/unix/linux/platforms.txt
rename to ffi/unix/statfs/linux/platforms.txt
diff --git a/basis/unix/statfs/macosx/authors.txt b/ffi/unix/statfs/macosx/authors.txt
similarity index 100%
rename from basis/unix/statfs/macosx/authors.txt
rename to ffi/unix/statfs/macosx/authors.txt
diff --git a/basis/unix/statfs/macosx/macosx.factor b/ffi/unix/statfs/macosx/macosx.factor
similarity index 100%
rename from basis/unix/statfs/macosx/macosx.factor
rename to ffi/unix/statfs/macosx/macosx.factor
diff --git a/basis/unix/getfsstat/macosx/platforms.txt b/ffi/unix/statfs/macosx/platforms.txt
similarity index 100%
rename from basis/unix/getfsstat/macosx/platforms.txt
rename to ffi/unix/statfs/macosx/platforms.txt
diff --git a/basis/windows/privileges/authors.txt b/ffi/unix/statvfs/authors.txt
similarity index 100%
rename from basis/windows/privileges/authors.txt
rename to ffi/unix/statvfs/authors.txt
diff --git a/basis/windows/registry/authors.txt b/ffi/unix/statvfs/linux/authors.txt
similarity index 100%
rename from basis/windows/registry/authors.txt
rename to ffi/unix/statvfs/linux/authors.txt
diff --git a/basis/unix/statvfs/linux/linux.factor b/ffi/unix/statvfs/linux/linux.factor
similarity index 100%
rename from basis/unix/statvfs/linux/linux.factor
rename to ffi/unix/statvfs/linux/linux.factor
diff --git a/basis/unix/linux/proc/platforms.txt b/ffi/unix/statvfs/linux/platforms.txt
similarity index 100%
rename from basis/unix/linux/proc/platforms.txt
rename to ffi/unix/statvfs/linux/platforms.txt
diff --git a/basis/windows/shell32/authors.txt b/ffi/unix/statvfs/macosx/authors.txt
similarity index 100%
rename from basis/windows/shell32/authors.txt
rename to ffi/unix/statvfs/macosx/authors.txt
diff --git a/basis/unix/statvfs/macosx/macosx.factor b/ffi/unix/statvfs/macosx/macosx.factor
similarity index 100%
rename from basis/unix/statvfs/macosx/macosx.factor
rename to ffi/unix/statvfs/macosx/macosx.factor
diff --git a/basis/unix/kqueue/macosx/platforms.txt b/ffi/unix/statvfs/macosx/platforms.txt
similarity index 100%
rename from basis/unix/kqueue/macosx/platforms.txt
rename to ffi/unix/statvfs/macosx/platforms.txt
diff --git a/basis/unix/time/platforms.txt b/ffi/unix/statvfs/platforms.txt
similarity index 100%
rename from basis/unix/time/platforms.txt
rename to ffi/unix/statvfs/platforms.txt
diff --git a/basis/unix/statvfs/statvfs.factor b/ffi/unix/statvfs/statvfs.factor
similarity index 100%
rename from basis/unix/statvfs/statvfs.factor
rename to ffi/unix/statvfs/statvfs.factor
diff --git a/basis/unix/summary.txt b/ffi/unix/summary.txt
similarity index 100%
rename from basis/unix/summary.txt
rename to ffi/unix/summary.txt
diff --git a/basis/windows/directx/audiodefs/tags.txt b/ffi/unix/tags.txt
similarity index 100%
rename from basis/windows/directx/audiodefs/tags.txt
rename to ffi/unix/tags.txt
diff --git a/basis/unix/types/platforms.txt b/ffi/unix/time/platforms.txt
similarity index 100%
rename from basis/unix/types/platforms.txt
rename to ffi/unix/time/platforms.txt
diff --git a/basis/unix/time/time-tests.factor b/ffi/unix/time/time-tests.factor
similarity index 100%
rename from basis/unix/time/time-tests.factor
rename to ffi/unix/time/time-tests.factor
diff --git a/basis/unix/time/time.factor b/ffi/unix/time/time.factor
similarity index 100%
rename from basis/unix/time/time.factor
rename to ffi/unix/time/time.factor
diff --git a/basis/unix/types/linux/linux.factor b/ffi/unix/types/linux/linux.factor
similarity index 100%
rename from basis/unix/types/linux/linux.factor
rename to ffi/unix/types/linux/linux.factor
diff --git a/basis/unix/stat/linux/platforms.txt b/ffi/unix/types/linux/platforms.txt
similarity index 100%
rename from basis/unix/stat/linux/platforms.txt
rename to ffi/unix/types/linux/platforms.txt
diff --git a/basis/unix/types/macosx/macosx.factor b/ffi/unix/types/macosx/macosx.factor
similarity index 100%
rename from basis/unix/types/macosx/macosx.factor
rename to ffi/unix/types/macosx/macosx.factor
diff --git a/basis/unix/kqueue/platforms.txt b/ffi/unix/types/macosx/platforms.txt
similarity index 100%
rename from basis/unix/kqueue/platforms.txt
rename to ffi/unix/types/macosx/platforms.txt
diff --git a/basis/unix/users/platforms.txt b/ffi/unix/types/platforms.txt
similarity index 100%
rename from basis/unix/users/platforms.txt
rename to ffi/unix/types/platforms.txt
diff --git a/basis/unix/types/types.factor b/ffi/unix/types/types.factor
similarity index 100%
rename from basis/unix/types/types.factor
rename to ffi/unix/types/types.factor
diff --git a/basis/unix/unix.factor b/ffi/unix/unix.factor
similarity index 100%
rename from basis/unix/unix.factor
rename to ffi/unix/unix.factor
diff --git a/basis/windows/time/authors.txt b/ffi/unix/users/authors.txt
similarity index 100%
rename from basis/windows/time/authors.txt
rename to ffi/unix/users/authors.txt
diff --git a/basis/windows/types/authors.txt b/ffi/unix/users/macosx/authors.txt
similarity index 100%
rename from basis/windows/types/authors.txt
rename to ffi/unix/users/macosx/authors.txt
diff --git a/basis/unix/users/macosx/macosx.factor b/ffi/unix/users/macosx/macosx.factor
similarity index 100%
rename from basis/unix/users/macosx/macosx.factor
rename to ffi/unix/users/macosx/macosx.factor
diff --git a/basis/unix/stat/macosx/platforms.txt b/ffi/unix/users/macosx/platforms.txt
similarity index 100%
rename from basis/unix/stat/macosx/platforms.txt
rename to ffi/unix/users/macosx/platforms.txt
diff --git a/basis/unix/utmpx/platforms.txt b/ffi/unix/users/platforms.txt
similarity index 100%
rename from basis/unix/utmpx/platforms.txt
rename to ffi/unix/users/platforms.txt
diff --git a/basis/unix/users/summary.txt b/ffi/unix/users/summary.txt
similarity index 100%
rename from basis/unix/users/summary.txt
rename to ffi/unix/users/summary.txt
diff --git a/basis/unix/users/users-docs.factor b/ffi/unix/users/users-docs.factor
similarity index 100%
rename from basis/unix/users/users-docs.factor
rename to ffi/unix/users/users-docs.factor
diff --git a/basis/unix/users/users-tests.factor b/ffi/unix/users/users-tests.factor
similarity index 100%
rename from basis/unix/users/users-tests.factor
rename to ffi/unix/users/users-tests.factor
diff --git a/basis/unix/users/users.factor b/ffi/unix/users/users.factor
similarity index 100%
rename from basis/unix/users/users.factor
rename to ffi/unix/users/users.factor
diff --git a/basis/unix/utilities/authors.txt b/ffi/unix/utilities/authors.txt
similarity index 100%
rename from basis/unix/utilities/authors.txt
rename to ffi/unix/utilities/authors.txt
diff --git a/basis/unix/utilities/utilities.factor b/ffi/unix/utilities/utilities.factor
similarity index 100%
rename from basis/unix/utilities/utilities.factor
rename to ffi/unix/utilities/utilities.factor
diff --git a/basis/windows/user32/authors.txt b/ffi/unix/utmpx/authors.txt
similarity index 100%
rename from basis/windows/user32/authors.txt
rename to ffi/unix/utmpx/authors.txt
diff --git a/basis/windows/usp10/authors.txt b/ffi/unix/utmpx/linux/authors.txt
similarity index 100%
rename from basis/windows/usp10/authors.txt
rename to ffi/unix/utmpx/linux/authors.txt
diff --git a/basis/unix/utmpx/linux/linux.factor b/ffi/unix/utmpx/linux/linux.factor
similarity index 100%
rename from basis/unix/utmpx/linux/linux.factor
rename to ffi/unix/utmpx/linux/linux.factor
diff --git a/basis/unix/statfs/linux/platforms.txt b/ffi/unix/utmpx/linux/platforms.txt
similarity index 100%
rename from basis/unix/statfs/linux/platforms.txt
rename to ffi/unix/utmpx/linux/platforms.txt
diff --git a/basis/windows/winmm/authors.txt b/ffi/unix/utmpx/macosx/authors.txt
similarity index 100%
rename from basis/windows/winmm/authors.txt
rename to ffi/unix/utmpx/macosx/authors.txt
diff --git a/basis/unix/utmpx/macosx/macosx.factor b/ffi/unix/utmpx/macosx/macosx.factor
similarity index 100%
rename from basis/unix/utmpx/macosx/macosx.factor
rename to ffi/unix/utmpx/macosx/macosx.factor
diff --git a/basis/unix/statfs/macosx/platforms.txt b/ffi/unix/utmpx/macosx/platforms.txt
similarity index 100%
rename from basis/unix/statfs/macosx/platforms.txt
rename to ffi/unix/utmpx/macosx/platforms.txt
diff --git a/basis/x11/io/unix/platforms.txt b/ffi/unix/utmpx/platforms.txt
similarity index 100%
rename from basis/x11/io/unix/platforms.txt
rename to ffi/unix/utmpx/platforms.txt
diff --git a/basis/unix/utmpx/utmpx-tests.factor b/ffi/unix/utmpx/utmpx-tests.factor
similarity index 100%
rename from basis/unix/utmpx/utmpx-tests.factor
rename to ffi/unix/utmpx/utmpx-tests.factor
diff --git a/basis/unix/utmpx/utmpx.factor b/ffi/unix/utmpx/utmpx.factor
similarity index 100%
rename from basis/unix/utmpx/utmpx.factor
rename to ffi/unix/utmpx/utmpx.factor
diff --git a/basis/windows/advapi32/advapi32.factor b/ffi/windows/advapi32/advapi32.factor
similarity index 100%
rename from basis/windows/advapi32/advapi32.factor
rename to ffi/windows/advapi32/advapi32.factor
diff --git a/basis/windows/winsock/authors.txt b/ffi/windows/advapi32/authors.txt
similarity index 100%
rename from basis/windows/winsock/authors.txt
rename to ffi/windows/advapi32/authors.txt
diff --git a/basis/game/input/dinput/platforms.txt b/ffi/windows/advapi32/platforms.txt
similarity index 100%
rename from basis/game/input/dinput/platforms.txt
rename to ffi/windows/advapi32/platforms.txt
diff --git a/basis/windows/authors.txt b/ffi/windows/authors.txt
similarity index 100%
rename from basis/windows/authors.txt
rename to ffi/windows/authors.txt
diff --git a/basis/windows/com/authors.txt b/ffi/windows/com/authors.txt
similarity index 100%
rename from basis/windows/com/authors.txt
rename to ffi/windows/com/authors.txt
diff --git a/basis/windows/com/com-docs.factor b/ffi/windows/com/com-docs.factor
similarity index 100%
rename from basis/windows/com/com-docs.factor
rename to ffi/windows/com/com-docs.factor
diff --git a/basis/windows/com/com-tests.factor b/ffi/windows/com/com-tests.factor
similarity index 100%
rename from basis/windows/com/com-tests.factor
rename to ffi/windows/com/com-tests.factor
diff --git a/basis/windows/com/com.factor b/ffi/windows/com/com.factor
similarity index 100%
rename from basis/windows/com/com.factor
rename to ffi/windows/com/com.factor
diff --git a/basis/game/input/xinput/platforms.txt b/ffi/windows/com/platforms.txt
similarity index 100%
rename from basis/game/input/xinput/platforms.txt
rename to ffi/windows/com/platforms.txt
diff --git a/basis/opengl/gl/windows/platforms.txt b/ffi/windows/com/prettyprint/platforms.txt
similarity index 100%
rename from basis/opengl/gl/windows/platforms.txt
rename to ffi/windows/com/prettyprint/platforms.txt
diff --git a/basis/windows/com/prettyprint/prettyprint.factor b/ffi/windows/com/prettyprint/prettyprint.factor
similarity index 100%
rename from basis/windows/com/prettyprint/prettyprint.factor
rename to ffi/windows/com/prettyprint/prettyprint.factor
diff --git a/basis/windows/com/summary.txt b/ffi/windows/com/summary.txt
similarity index 100%
rename from basis/windows/com/summary.txt
rename to ffi/windows/com/summary.txt
diff --git a/basis/windows/com/syntax/authors.txt b/ffi/windows/com/syntax/authors.txt
similarity index 100%
rename from basis/windows/com/syntax/authors.txt
rename to ffi/windows/com/syntax/authors.txt
diff --git a/basis/system-info/windows/platforms.txt b/ffi/windows/com/syntax/platforms.txt
similarity index 100%
rename from basis/system-info/windows/platforms.txt
rename to ffi/windows/com/syntax/platforms.txt
diff --git a/basis/windows/com/syntax/summary.txt b/ffi/windows/com/syntax/summary.txt
similarity index 100%
rename from basis/windows/com/syntax/summary.txt
rename to ffi/windows/com/syntax/summary.txt
diff --git a/basis/windows/com/syntax/syntax-docs.factor b/ffi/windows/com/syntax/syntax-docs.factor
similarity index 100%
rename from basis/windows/com/syntax/syntax-docs.factor
rename to ffi/windows/com/syntax/syntax-docs.factor
diff --git a/basis/windows/com/syntax/syntax.factor b/ffi/windows/com/syntax/syntax.factor
similarity index 100%
rename from basis/windows/com/syntax/syntax.factor
rename to ffi/windows/com/syntax/syntax.factor
diff --git a/basis/windows/directx/d2d1/tags.txt b/ffi/windows/com/syntax/tags.txt
similarity index 100%
rename from basis/windows/directx/d2d1/tags.txt
rename to ffi/windows/com/syntax/tags.txt
diff --git a/basis/windows/com/tags.txt b/ffi/windows/com/tags.txt
similarity index 100%
rename from basis/windows/com/tags.txt
rename to ffi/windows/com/tags.txt
diff --git a/basis/windows/dwmapi/authors.txt b/ffi/windows/com/wrapper/authors.txt
similarity index 100%
rename from basis/windows/dwmapi/authors.txt
rename to ffi/windows/com/wrapper/authors.txt
diff --git a/basis/ui/backend/windows/platforms.txt b/ffi/windows/com/wrapper/platforms.txt
similarity index 100%
rename from basis/ui/backend/windows/platforms.txt
rename to ffi/windows/com/wrapper/platforms.txt
diff --git a/basis/windows/com/wrapper/summary.txt b/ffi/windows/com/wrapper/summary.txt
similarity index 100%
rename from basis/windows/com/wrapper/summary.txt
rename to ffi/windows/com/wrapper/summary.txt
diff --git a/basis/windows/directx/d2dbasetypes/tags.txt b/ffi/windows/com/wrapper/tags.txt
similarity index 100%
rename from basis/windows/directx/d2dbasetypes/tags.txt
rename to ffi/windows/com/wrapper/tags.txt
diff --git a/basis/windows/com/wrapper/wrapper-docs.factor b/ffi/windows/com/wrapper/wrapper-docs.factor
similarity index 100%
rename from basis/windows/com/wrapper/wrapper-docs.factor
rename to ffi/windows/com/wrapper/wrapper-docs.factor
diff --git a/basis/windows/com/wrapper/wrapper.factor b/ffi/windows/com/wrapper/wrapper.factor
similarity index 100%
rename from basis/windows/com/wrapper/wrapper.factor
rename to ffi/windows/com/wrapper/wrapper.factor
diff --git a/extra/99-bottles/authors.txt b/ffi/windows/crypt32/authors.txt
similarity index 100%
rename from extra/99-bottles/authors.txt
rename to ffi/windows/crypt32/authors.txt
diff --git a/basis/windows/crypt32/crypt32.factor b/ffi/windows/crypt32/crypt32.factor
similarity index 100%
rename from basis/windows/crypt32/crypt32.factor
rename to ffi/windows/crypt32/crypt32.factor
diff --git a/basis/ui/text/uniscribe/platforms.txt b/ffi/windows/crypt32/platforms.txt
similarity index 100%
rename from basis/ui/text/uniscribe/platforms.txt
rename to ffi/windows/crypt32/platforms.txt
diff --git a/basis/windows/ddk/hid/authors.txt b/ffi/windows/ddk/hid/authors.txt
similarity index 100%
rename from basis/windows/ddk/hid/authors.txt
rename to ffi/windows/ddk/hid/authors.txt
diff --git a/basis/windows/ddk/hid/hid.factor b/ffi/windows/ddk/hid/hid.factor
similarity index 100%
rename from basis/windows/ddk/hid/hid.factor
rename to ffi/windows/ddk/hid/hid.factor
diff --git a/basis/webbrowser/windows/platforms.txt b/ffi/windows/ddk/hid/platforms.txt
similarity index 100%
rename from basis/webbrowser/windows/platforms.txt
rename to ffi/windows/ddk/hid/platforms.txt
diff --git a/basis/windows/ddk/hid/summary.txt b/ffi/windows/ddk/hid/summary.txt
similarity index 100%
rename from basis/windows/ddk/hid/summary.txt
rename to ffi/windows/ddk/hid/summary.txt
diff --git a/basis/windows/ddk/hid/tags.txt b/ffi/windows/ddk/hid/tags.txt
similarity index 100%
rename from basis/windows/ddk/hid/tags.txt
rename to ffi/windows/ddk/hid/tags.txt
diff --git a/basis/windows/ddk/setupapi/authors.txt b/ffi/windows/ddk/setupapi/authors.txt
similarity index 100%
rename from basis/windows/ddk/setupapi/authors.txt
rename to ffi/windows/ddk/setupapi/authors.txt
diff --git a/basis/windows/ddk/setupapi/platforms.txt b/ffi/windows/ddk/setupapi/platforms.txt
similarity index 100%
rename from basis/windows/ddk/setupapi/platforms.txt
rename to ffi/windows/ddk/setupapi/platforms.txt
diff --git a/basis/windows/ddk/setupapi/setupapi.factor b/ffi/windows/ddk/setupapi/setupapi.factor
similarity index 100%
rename from basis/windows/ddk/setupapi/setupapi.factor
rename to ffi/windows/ddk/setupapi/setupapi.factor
diff --git a/basis/windows/ddk/setupapi/summary.txt b/ffi/windows/ddk/setupapi/summary.txt
similarity index 100%
rename from basis/windows/ddk/setupapi/summary.txt
rename to ffi/windows/ddk/setupapi/summary.txt
diff --git a/basis/windows/ddk/setupapi/tags.txt b/ffi/windows/ddk/setupapi/tags.txt
similarity index 100%
rename from basis/windows/ddk/setupapi/tags.txt
rename to ffi/windows/ddk/setupapi/tags.txt
diff --git a/basis/windows/directx/audiodefs/authors.txt b/ffi/windows/ddk/winusb/authors.txt
similarity index 100%
rename from basis/windows/directx/audiodefs/authors.txt
rename to ffi/windows/ddk/winusb/authors.txt
diff --git a/basis/windows/advapi32/platforms.txt b/ffi/windows/ddk/winusb/platforms.txt
similarity index 100%
rename from basis/windows/advapi32/platforms.txt
rename to ffi/windows/ddk/winusb/platforms.txt
diff --git a/basis/windows/ddk/winusb/summary.txt b/ffi/windows/ddk/winusb/summary.txt
similarity index 100%
rename from basis/windows/ddk/winusb/summary.txt
rename to ffi/windows/ddk/winusb/summary.txt
diff --git a/basis/windows/directx/d2derr/tags.txt b/ffi/windows/ddk/winusb/tags.txt
similarity index 100%
rename from basis/windows/directx/d2derr/tags.txt
rename to ffi/windows/ddk/winusb/tags.txt
diff --git a/basis/windows/ddk/winusb/winusb.factor b/ffi/windows/ddk/winusb/winusb.factor
similarity index 100%
rename from basis/windows/ddk/winusb/winusb.factor
rename to ffi/windows/ddk/winusb/winusb.factor
diff --git a/basis/windows/directx/audiodefs/audiodefs.factor b/ffi/windows/directx/audiodefs/audiodefs.factor
similarity index 100%
rename from basis/windows/directx/audiodefs/audiodefs.factor
rename to ffi/windows/directx/audiodefs/audiodefs.factor
diff --git a/basis/windows/directx/d2d1/authors.txt b/ffi/windows/directx/audiodefs/authors.txt
similarity index 100%
rename from basis/windows/directx/d2d1/authors.txt
rename to ffi/windows/directx/audiodefs/authors.txt
diff --git a/basis/windows/com/platforms.txt b/ffi/windows/directx/audiodefs/platforms.txt
similarity index 100%
rename from basis/windows/com/platforms.txt
rename to ffi/windows/directx/audiodefs/platforms.txt
diff --git a/basis/windows/directx/audiodefs/summary.txt b/ffi/windows/directx/audiodefs/summary.txt
similarity index 100%
rename from basis/windows/directx/audiodefs/summary.txt
rename to ffi/windows/directx/audiodefs/summary.txt
diff --git a/basis/windows/directx/d3d10/tags.txt b/ffi/windows/directx/audiodefs/tags.txt
similarity index 100%
rename from basis/windows/directx/d3d10/tags.txt
rename to ffi/windows/directx/audiodefs/tags.txt
diff --git a/basis/windows/directx/d2dbasetypes/authors.txt b/ffi/windows/directx/d2d1/authors.txt
similarity index 100%
rename from basis/windows/directx/d2dbasetypes/authors.txt
rename to ffi/windows/directx/d2d1/authors.txt
diff --git a/basis/windows/directx/d2d1/d2d1.factor b/ffi/windows/directx/d2d1/d2d1.factor
similarity index 100%
rename from basis/windows/directx/d2d1/d2d1.factor
rename to ffi/windows/directx/d2d1/d2d1.factor
diff --git a/basis/windows/com/prettyprint/platforms.txt b/ffi/windows/directx/d2d1/platforms.txt
similarity index 100%
rename from basis/windows/com/prettyprint/platforms.txt
rename to ffi/windows/directx/d2d1/platforms.txt
diff --git a/basis/windows/directx/d2d1/summary.txt b/ffi/windows/directx/d2d1/summary.txt
similarity index 100%
rename from basis/windows/directx/d2d1/summary.txt
rename to ffi/windows/directx/d2d1/summary.txt
diff --git a/basis/windows/directx/d3d10_1/tags.txt b/ffi/windows/directx/d2d1/tags.txt
similarity index 100%
rename from basis/windows/directx/d3d10_1/tags.txt
rename to ffi/windows/directx/d2d1/tags.txt
diff --git a/basis/windows/directx/d2derr/authors.txt b/ffi/windows/directx/d2dbasetypes/authors.txt
similarity index 100%
rename from basis/windows/directx/d2derr/authors.txt
rename to ffi/windows/directx/d2dbasetypes/authors.txt
diff --git a/basis/windows/directx/d2dbasetypes/d2dbasetypes.factor b/ffi/windows/directx/d2dbasetypes/d2dbasetypes.factor
similarity index 100%
rename from basis/windows/directx/d2dbasetypes/d2dbasetypes.factor
rename to ffi/windows/directx/d2dbasetypes/d2dbasetypes.factor
diff --git a/basis/windows/com/syntax/platforms.txt b/ffi/windows/directx/d2dbasetypes/platforms.txt
similarity index 100%
rename from basis/windows/com/syntax/platforms.txt
rename to ffi/windows/directx/d2dbasetypes/platforms.txt
diff --git a/basis/windows/directx/d2dbasetypes/summary.txt b/ffi/windows/directx/d2dbasetypes/summary.txt
similarity index 100%
rename from basis/windows/directx/d2dbasetypes/summary.txt
rename to ffi/windows/directx/d2dbasetypes/summary.txt
diff --git a/basis/windows/directx/d3d10_1shader/tags.txt b/ffi/windows/directx/d2dbasetypes/tags.txt
similarity index 100%
rename from basis/windows/directx/d3d10_1shader/tags.txt
rename to ffi/windows/directx/d2dbasetypes/tags.txt
diff --git a/basis/windows/directx/d3d10/authors.txt b/ffi/windows/directx/d2derr/authors.txt
similarity index 100%
rename from basis/windows/directx/d3d10/authors.txt
rename to ffi/windows/directx/d2derr/authors.txt
diff --git a/basis/windows/directx/d2derr/d2derr.factor b/ffi/windows/directx/d2derr/d2derr.factor
similarity index 100%
rename from basis/windows/directx/d2derr/d2derr.factor
rename to ffi/windows/directx/d2derr/d2derr.factor
diff --git a/basis/windows/com/wrapper/platforms.txt b/ffi/windows/directx/d2derr/platforms.txt
similarity index 100%
rename from basis/windows/com/wrapper/platforms.txt
rename to ffi/windows/directx/d2derr/platforms.txt
diff --git a/basis/windows/directx/d2derr/summary.txt b/ffi/windows/directx/d2derr/summary.txt
similarity index 100%
rename from basis/windows/directx/d2derr/summary.txt
rename to ffi/windows/directx/d2derr/summary.txt
diff --git a/basis/windows/directx/d3d10effect/tags.txt b/ffi/windows/directx/d2derr/tags.txt
similarity index 100%
rename from basis/windows/directx/d3d10effect/tags.txt
rename to ffi/windows/directx/d2derr/tags.txt
diff --git a/basis/windows/directx/d3d10_1/authors.txt b/ffi/windows/directx/d3d10/authors.txt
similarity index 100%
rename from basis/windows/directx/d3d10_1/authors.txt
rename to ffi/windows/directx/d3d10/authors.txt
diff --git a/basis/windows/directx/d3d10/d3d10.factor b/ffi/windows/directx/d3d10/d3d10.factor
similarity index 100%
rename from basis/windows/directx/d3d10/d3d10.factor
rename to ffi/windows/directx/d3d10/d3d10.factor
diff --git a/basis/windows/crypt32/platforms.txt b/ffi/windows/directx/d3d10/platforms.txt
similarity index 100%
rename from basis/windows/crypt32/platforms.txt
rename to ffi/windows/directx/d3d10/platforms.txt
diff --git a/basis/windows/directx/d3d10/summary.txt b/ffi/windows/directx/d3d10/summary.txt
similarity index 100%
rename from basis/windows/directx/d3d10/summary.txt
rename to ffi/windows/directx/d3d10/summary.txt
diff --git a/basis/windows/directx/d3d10misc/tags.txt b/ffi/windows/directx/d3d10/tags.txt
similarity index 100%
rename from basis/windows/directx/d3d10misc/tags.txt
rename to ffi/windows/directx/d3d10/tags.txt
diff --git a/basis/windows/directx/d3d10_1shader/authors.txt b/ffi/windows/directx/d3d10_1/authors.txt
similarity index 100%
rename from basis/windows/directx/d3d10_1shader/authors.txt
rename to ffi/windows/directx/d3d10_1/authors.txt
diff --git a/basis/windows/directx/d3d10_1/d3d10_1.factor b/ffi/windows/directx/d3d10_1/d3d10_1.factor
similarity index 100%
rename from basis/windows/directx/d3d10_1/d3d10_1.factor
rename to ffi/windows/directx/d3d10_1/d3d10_1.factor
diff --git a/basis/windows/ddk/hid/platforms.txt b/ffi/windows/directx/d3d10_1/platforms.txt
similarity index 100%
rename from basis/windows/ddk/hid/platforms.txt
rename to ffi/windows/directx/d3d10_1/platforms.txt
diff --git a/basis/windows/directx/d3d10_1/summary.txt b/ffi/windows/directx/d3d10_1/summary.txt
similarity index 100%
rename from basis/windows/directx/d3d10_1/summary.txt
rename to ffi/windows/directx/d3d10_1/summary.txt
diff --git a/basis/windows/directx/d3d10shader/tags.txt b/ffi/windows/directx/d3d10_1/tags.txt
similarity index 100%
rename from basis/windows/directx/d3d10shader/tags.txt
rename to ffi/windows/directx/d3d10_1/tags.txt
diff --git a/basis/windows/directx/d3d10effect/authors.txt b/ffi/windows/directx/d3d10_1shader/authors.txt
similarity index 100%
rename from basis/windows/directx/d3d10effect/authors.txt
rename to ffi/windows/directx/d3d10_1shader/authors.txt
diff --git a/basis/windows/directx/d3d10_1shader/d3d10_1shader.factor b/ffi/windows/directx/d3d10_1shader/d3d10_1shader.factor
similarity index 100%
rename from basis/windows/directx/d3d10_1shader/d3d10_1shader.factor
rename to ffi/windows/directx/d3d10_1shader/d3d10_1shader.factor
diff --git a/basis/windows/ddk/winusb/platforms.txt b/ffi/windows/directx/d3d10_1shader/platforms.txt
similarity index 100%
rename from basis/windows/ddk/winusb/platforms.txt
rename to ffi/windows/directx/d3d10_1shader/platforms.txt
diff --git a/basis/windows/directx/d3d10_1shader/summary.txt b/ffi/windows/directx/d3d10_1shader/summary.txt
similarity index 100%
rename from basis/windows/directx/d3d10_1shader/summary.txt
rename to ffi/windows/directx/d3d10_1shader/summary.txt
diff --git a/basis/windows/directx/d3d11/tags.txt b/ffi/windows/directx/d3d10_1shader/tags.txt
similarity index 100%
rename from basis/windows/directx/d3d11/tags.txt
rename to ffi/windows/directx/d3d10_1shader/tags.txt
diff --git a/basis/windows/directx/d3d10misc/authors.txt b/ffi/windows/directx/d3d10effect/authors.txt
similarity index 100%
rename from basis/windows/directx/d3d10misc/authors.txt
rename to ffi/windows/directx/d3d10effect/authors.txt
diff --git a/basis/windows/directx/d3d10effect/d3d10effect.factor b/ffi/windows/directx/d3d10effect/d3d10effect.factor
similarity index 100%
rename from basis/windows/directx/d3d10effect/d3d10effect.factor
rename to ffi/windows/directx/d3d10effect/d3d10effect.factor
diff --git a/basis/windows/directx/audiodefs/platforms.txt b/ffi/windows/directx/d3d10effect/platforms.txt
similarity index 100%
rename from basis/windows/directx/audiodefs/platforms.txt
rename to ffi/windows/directx/d3d10effect/platforms.txt
diff --git a/basis/windows/directx/d3d10effect/summary.txt b/ffi/windows/directx/d3d10effect/summary.txt
similarity index 100%
rename from basis/windows/directx/d3d10effect/summary.txt
rename to ffi/windows/directx/d3d10effect/summary.txt
diff --git a/basis/windows/directx/d3d11shader/tags.txt b/ffi/windows/directx/d3d10effect/tags.txt
similarity index 100%
rename from basis/windows/directx/d3d11shader/tags.txt
rename to ffi/windows/directx/d3d10effect/tags.txt
diff --git a/basis/windows/directx/d3d10shader/authors.txt b/ffi/windows/directx/d3d10misc/authors.txt
similarity index 100%
rename from basis/windows/directx/d3d10shader/authors.txt
rename to ffi/windows/directx/d3d10misc/authors.txt
diff --git a/basis/windows/directx/d3d10misc/d3d10misc.factor b/ffi/windows/directx/d3d10misc/d3d10misc.factor
similarity index 100%
rename from basis/windows/directx/d3d10misc/d3d10misc.factor
rename to ffi/windows/directx/d3d10misc/d3d10misc.factor
diff --git a/basis/windows/directx/d2d1/platforms.txt b/ffi/windows/directx/d3d10misc/platforms.txt
similarity index 100%
rename from basis/windows/directx/d2d1/platforms.txt
rename to ffi/windows/directx/d3d10misc/platforms.txt
diff --git a/basis/windows/directx/d3d10misc/summary.txt b/ffi/windows/directx/d3d10misc/summary.txt
similarity index 100%
rename from basis/windows/directx/d3d10misc/summary.txt
rename to ffi/windows/directx/d3d10misc/summary.txt
diff --git a/basis/windows/directx/d3d9/tags.txt b/ffi/windows/directx/d3d10misc/tags.txt
similarity index 100%
rename from basis/windows/directx/d3d9/tags.txt
rename to ffi/windows/directx/d3d10misc/tags.txt
diff --git a/basis/windows/directx/d3d11/authors.txt b/ffi/windows/directx/d3d10shader/authors.txt
similarity index 100%
rename from basis/windows/directx/d3d11/authors.txt
rename to ffi/windows/directx/d3d10shader/authors.txt
diff --git a/basis/windows/directx/d3d10shader/d3d10shader.factor b/ffi/windows/directx/d3d10shader/d3d10shader.factor
similarity index 100%
rename from basis/windows/directx/d3d10shader/d3d10shader.factor
rename to ffi/windows/directx/d3d10shader/d3d10shader.factor
diff --git a/basis/windows/directx/d2dbasetypes/platforms.txt b/ffi/windows/directx/d3d10shader/platforms.txt
similarity index 100%
rename from basis/windows/directx/d2dbasetypes/platforms.txt
rename to ffi/windows/directx/d3d10shader/platforms.txt
diff --git a/basis/windows/directx/d3d10shader/summary.txt b/ffi/windows/directx/d3d10shader/summary.txt
similarity index 100%
rename from basis/windows/directx/d3d10shader/summary.txt
rename to ffi/windows/directx/d3d10shader/summary.txt
diff --git a/basis/windows/directx/d3d9caps/tags.txt b/ffi/windows/directx/d3d10shader/tags.txt
similarity index 100%
rename from basis/windows/directx/d3d9caps/tags.txt
rename to ffi/windows/directx/d3d10shader/tags.txt
diff --git a/basis/windows/directx/d3d11shader/authors.txt b/ffi/windows/directx/d3d11/authors.txt
similarity index 100%
rename from basis/windows/directx/d3d11shader/authors.txt
rename to ffi/windows/directx/d3d11/authors.txt
diff --git a/basis/windows/directx/d3d11/d3d11.factor b/ffi/windows/directx/d3d11/d3d11.factor
similarity index 100%
rename from basis/windows/directx/d3d11/d3d11.factor
rename to ffi/windows/directx/d3d11/d3d11.factor
diff --git a/basis/windows/directx/d2derr/platforms.txt b/ffi/windows/directx/d3d11/platforms.txt
similarity index 100%
rename from basis/windows/directx/d2derr/platforms.txt
rename to ffi/windows/directx/d3d11/platforms.txt
diff --git a/basis/windows/directx/d3d11/summary.txt b/ffi/windows/directx/d3d11/summary.txt
similarity index 100%
rename from basis/windows/directx/d3d11/summary.txt
rename to ffi/windows/directx/d3d11/summary.txt
diff --git a/basis/windows/directx/d3d9types/tags.txt b/ffi/windows/directx/d3d11/tags.txt
similarity index 100%
rename from basis/windows/directx/d3d9types/tags.txt
rename to ffi/windows/directx/d3d11/tags.txt
diff --git a/basis/windows/directx/d3d9/authors.txt b/ffi/windows/directx/d3d11shader/authors.txt
similarity index 100%
rename from basis/windows/directx/d3d9/authors.txt
rename to ffi/windows/directx/d3d11shader/authors.txt
diff --git a/basis/windows/directx/d3d11shader/d3d11shader.factor b/ffi/windows/directx/d3d11shader/d3d11shader.factor
similarity index 100%
rename from basis/windows/directx/d3d11shader/d3d11shader.factor
rename to ffi/windows/directx/d3d11shader/d3d11shader.factor
diff --git a/basis/windows/directx/d3d10/platforms.txt b/ffi/windows/directx/d3d11shader/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3d10/platforms.txt
rename to ffi/windows/directx/d3d11shader/platforms.txt
diff --git a/basis/windows/directx/d3d11shader/summary.txt b/ffi/windows/directx/d3d11shader/summary.txt
similarity index 100%
rename from basis/windows/directx/d3d11shader/summary.txt
rename to ffi/windows/directx/d3d11shader/summary.txt
diff --git a/basis/windows/directx/d3dcommon/tags.txt b/ffi/windows/directx/d3d11shader/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dcommon/tags.txt
rename to ffi/windows/directx/d3d11shader/tags.txt
diff --git a/basis/windows/directx/d3d9caps/authors.txt b/ffi/windows/directx/d3d9/authors.txt
similarity index 100%
rename from basis/windows/directx/d3d9caps/authors.txt
rename to ffi/windows/directx/d3d9/authors.txt
diff --git a/basis/windows/directx/d3d9/d3d9.factor b/ffi/windows/directx/d3d9/d3d9.factor
similarity index 100%
rename from basis/windows/directx/d3d9/d3d9.factor
rename to ffi/windows/directx/d3d9/d3d9.factor
diff --git a/basis/windows/directx/d3d10_1/platforms.txt b/ffi/windows/directx/d3d9/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3d10_1/platforms.txt
rename to ffi/windows/directx/d3d9/platforms.txt
diff --git a/basis/windows/directx/d3d9/summary.txt b/ffi/windows/directx/d3d9/summary.txt
similarity index 100%
rename from basis/windows/directx/d3d9/summary.txt
rename to ffi/windows/directx/d3d9/summary.txt
diff --git a/basis/windows/directx/d3dcompiler/tags.txt b/ffi/windows/directx/d3d9/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dcompiler/tags.txt
rename to ffi/windows/directx/d3d9/tags.txt
diff --git a/basis/windows/directx/d3d9types/authors.txt b/ffi/windows/directx/d3d9caps/authors.txt
similarity index 100%
rename from basis/windows/directx/d3d9types/authors.txt
rename to ffi/windows/directx/d3d9caps/authors.txt
diff --git a/basis/windows/directx/d3d9caps/d3d9caps.factor b/ffi/windows/directx/d3d9caps/d3d9caps.factor
similarity index 100%
rename from basis/windows/directx/d3d9caps/d3d9caps.factor
rename to ffi/windows/directx/d3d9caps/d3d9caps.factor
diff --git a/basis/windows/directx/d3d10_1shader/platforms.txt b/ffi/windows/directx/d3d9caps/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3d10_1shader/platforms.txt
rename to ffi/windows/directx/d3d9caps/platforms.txt
diff --git a/basis/windows/directx/d3d9caps/summary.txt b/ffi/windows/directx/d3d9caps/summary.txt
similarity index 100%
rename from basis/windows/directx/d3d9caps/summary.txt
rename to ffi/windows/directx/d3d9caps/summary.txt
diff --git a/basis/windows/directx/d3dcsx/tags.txt b/ffi/windows/directx/d3d9caps/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dcsx/tags.txt
rename to ffi/windows/directx/d3d9caps/tags.txt
diff --git a/basis/windows/directx/d3dcommon/authors.txt b/ffi/windows/directx/d3d9types/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dcommon/authors.txt
rename to ffi/windows/directx/d3d9types/authors.txt
diff --git a/basis/windows/directx/d3d9types/d3d9types.factor b/ffi/windows/directx/d3d9types/d3d9types.factor
similarity index 100%
rename from basis/windows/directx/d3d9types/d3d9types.factor
rename to ffi/windows/directx/d3d9types/d3d9types.factor
diff --git a/basis/windows/directx/d3d10effect/platforms.txt b/ffi/windows/directx/d3d9types/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3d10effect/platforms.txt
rename to ffi/windows/directx/d3d9types/platforms.txt
diff --git a/basis/windows/directx/d3d9types/summary.txt b/ffi/windows/directx/d3d9types/summary.txt
similarity index 100%
rename from basis/windows/directx/d3d9types/summary.txt
rename to ffi/windows/directx/d3d9types/summary.txt
diff --git a/basis/windows/directx/d3dx10/tags.txt b/ffi/windows/directx/d3d9types/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dx10/tags.txt
rename to ffi/windows/directx/d3d9types/tags.txt
diff --git a/basis/windows/directx/d3dcompiler/authors.txt b/ffi/windows/directx/d3dcommon/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dcompiler/authors.txt
rename to ffi/windows/directx/d3dcommon/authors.txt
diff --git a/basis/windows/directx/d3dcommon/d3dcommon.factor b/ffi/windows/directx/d3dcommon/d3dcommon.factor
similarity index 100%
rename from basis/windows/directx/d3dcommon/d3dcommon.factor
rename to ffi/windows/directx/d3dcommon/d3dcommon.factor
diff --git a/basis/windows/directx/d3d10misc/platforms.txt b/ffi/windows/directx/d3dcommon/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3d10misc/platforms.txt
rename to ffi/windows/directx/d3dcommon/platforms.txt
diff --git a/basis/windows/directx/d3dcommon/summary.txt b/ffi/windows/directx/d3dcommon/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dcommon/summary.txt
rename to ffi/windows/directx/d3dcommon/summary.txt
diff --git a/basis/windows/directx/d3dx10async/tags.txt b/ffi/windows/directx/d3dcommon/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dx10async/tags.txt
rename to ffi/windows/directx/d3dcommon/tags.txt
diff --git a/basis/windows/directx/d3dcsx/authors.txt b/ffi/windows/directx/d3dcompiler/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dcsx/authors.txt
rename to ffi/windows/directx/d3dcompiler/authors.txt
diff --git a/basis/windows/directx/d3dcompiler/d3dcompiler.factor b/ffi/windows/directx/d3dcompiler/d3dcompiler.factor
similarity index 100%
rename from basis/windows/directx/d3dcompiler/d3dcompiler.factor
rename to ffi/windows/directx/d3dcompiler/d3dcompiler.factor
diff --git a/basis/windows/directx/d3d10shader/platforms.txt b/ffi/windows/directx/d3dcompiler/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3d10shader/platforms.txt
rename to ffi/windows/directx/d3dcompiler/platforms.txt
diff --git a/basis/windows/directx/d3dcompiler/summary.txt b/ffi/windows/directx/d3dcompiler/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dcompiler/summary.txt
rename to ffi/windows/directx/d3dcompiler/summary.txt
diff --git a/basis/windows/directx/d3dx10core/tags.txt b/ffi/windows/directx/d3dcompiler/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dx10core/tags.txt
rename to ffi/windows/directx/d3dcompiler/tags.txt
diff --git a/basis/windows/directx/d3dx10/authors.txt b/ffi/windows/directx/d3dcsx/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dx10/authors.txt
rename to ffi/windows/directx/d3dcsx/authors.txt
diff --git a/basis/windows/directx/d3dcsx/d3dcsx.factor b/ffi/windows/directx/d3dcsx/d3dcsx.factor
similarity index 100%
rename from basis/windows/directx/d3dcsx/d3dcsx.factor
rename to ffi/windows/directx/d3dcsx/d3dcsx.factor
diff --git a/basis/windows/directx/d3d11/platforms.txt b/ffi/windows/directx/d3dcsx/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3d11/platforms.txt
rename to ffi/windows/directx/d3dcsx/platforms.txt
diff --git a/basis/windows/directx/d3dcsx/summary.txt b/ffi/windows/directx/d3dcsx/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dcsx/summary.txt
rename to ffi/windows/directx/d3dcsx/summary.txt
diff --git a/basis/windows/directx/d3dx10math/tags.txt b/ffi/windows/directx/d3dcsx/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dx10math/tags.txt
rename to ffi/windows/directx/d3dcsx/tags.txt
diff --git a/basis/windows/directx/d3dx10async/authors.txt b/ffi/windows/directx/d3dx10/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dx10async/authors.txt
rename to ffi/windows/directx/d3dx10/authors.txt
diff --git a/basis/windows/directx/d3dx10/d3dx10.factor b/ffi/windows/directx/d3dx10/d3dx10.factor
similarity index 100%
rename from basis/windows/directx/d3dx10/d3dx10.factor
rename to ffi/windows/directx/d3dx10/d3dx10.factor
diff --git a/basis/windows/directx/d3d11shader/platforms.txt b/ffi/windows/directx/d3dx10/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3d11shader/platforms.txt
rename to ffi/windows/directx/d3dx10/platforms.txt
diff --git a/basis/windows/directx/d3dx10/summary.txt b/ffi/windows/directx/d3dx10/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dx10/summary.txt
rename to ffi/windows/directx/d3dx10/summary.txt
diff --git a/basis/windows/directx/d3dx10mesh/tags.txt b/ffi/windows/directx/d3dx10/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dx10mesh/tags.txt
rename to ffi/windows/directx/d3dx10/tags.txt
diff --git a/basis/windows/directx/d3dx10core/authors.txt b/ffi/windows/directx/d3dx10async/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dx10core/authors.txt
rename to ffi/windows/directx/d3dx10async/authors.txt
diff --git a/basis/windows/directx/d3dx10async/d3dx10async.factor b/ffi/windows/directx/d3dx10async/d3dx10async.factor
similarity index 100%
rename from basis/windows/directx/d3dx10async/d3dx10async.factor
rename to ffi/windows/directx/d3dx10async/d3dx10async.factor
diff --git a/basis/windows/directx/d3d9/platforms.txt b/ffi/windows/directx/d3dx10async/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3d9/platforms.txt
rename to ffi/windows/directx/d3dx10async/platforms.txt
diff --git a/basis/windows/directx/d3dx10async/summary.txt b/ffi/windows/directx/d3dx10async/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dx10async/summary.txt
rename to ffi/windows/directx/d3dx10async/summary.txt
diff --git a/basis/windows/directx/d3dx10tex/tags.txt b/ffi/windows/directx/d3dx10async/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dx10tex/tags.txt
rename to ffi/windows/directx/d3dx10async/tags.txt
diff --git a/basis/windows/directx/d3dx10math/authors.txt b/ffi/windows/directx/d3dx10core/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dx10math/authors.txt
rename to ffi/windows/directx/d3dx10core/authors.txt
diff --git a/basis/windows/directx/d3dx10core/d3dx10core.factor b/ffi/windows/directx/d3dx10core/d3dx10core.factor
similarity index 100%
rename from basis/windows/directx/d3dx10core/d3dx10core.factor
rename to ffi/windows/directx/d3dx10core/d3dx10core.factor
diff --git a/basis/windows/directx/d3d9caps/platforms.txt b/ffi/windows/directx/d3dx10core/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3d9caps/platforms.txt
rename to ffi/windows/directx/d3dx10core/platforms.txt
diff --git a/basis/windows/directx/d3dx10core/summary.txt b/ffi/windows/directx/d3dx10core/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dx10core/summary.txt
rename to ffi/windows/directx/d3dx10core/summary.txt
diff --git a/basis/windows/directx/d3dx11/tags.txt b/ffi/windows/directx/d3dx10core/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dx11/tags.txt
rename to ffi/windows/directx/d3dx10core/tags.txt
diff --git a/basis/windows/directx/d3dx10mesh/authors.txt b/ffi/windows/directx/d3dx10math/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dx10mesh/authors.txt
rename to ffi/windows/directx/d3dx10math/authors.txt
diff --git a/basis/windows/directx/d3dx10math/d3dx10math.factor b/ffi/windows/directx/d3dx10math/d3dx10math.factor
similarity index 100%
rename from basis/windows/directx/d3dx10math/d3dx10math.factor
rename to ffi/windows/directx/d3dx10math/d3dx10math.factor
diff --git a/basis/windows/directx/d3d9types/platforms.txt b/ffi/windows/directx/d3dx10math/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3d9types/platforms.txt
rename to ffi/windows/directx/d3dx10math/platforms.txt
diff --git a/basis/windows/directx/d3dx10math/summary.txt b/ffi/windows/directx/d3dx10math/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dx10math/summary.txt
rename to ffi/windows/directx/d3dx10math/summary.txt
diff --git a/basis/windows/directx/d3dx11async/tags.txt b/ffi/windows/directx/d3dx10math/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dx11async/tags.txt
rename to ffi/windows/directx/d3dx10math/tags.txt
diff --git a/basis/windows/directx/d3dx10tex/authors.txt b/ffi/windows/directx/d3dx10mesh/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dx10tex/authors.txt
rename to ffi/windows/directx/d3dx10mesh/authors.txt
diff --git a/basis/windows/directx/d3dx10mesh/d3dx10mesh.factor b/ffi/windows/directx/d3dx10mesh/d3dx10mesh.factor
similarity index 100%
rename from basis/windows/directx/d3dx10mesh/d3dx10mesh.factor
rename to ffi/windows/directx/d3dx10mesh/d3dx10mesh.factor
diff --git a/basis/windows/directx/d3dcommon/platforms.txt b/ffi/windows/directx/d3dx10mesh/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dcommon/platforms.txt
rename to ffi/windows/directx/d3dx10mesh/platforms.txt
diff --git a/basis/windows/directx/d3dx10mesh/summary.txt b/ffi/windows/directx/d3dx10mesh/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dx10mesh/summary.txt
rename to ffi/windows/directx/d3dx10mesh/summary.txt
diff --git a/basis/windows/directx/d3dx11core/tags.txt b/ffi/windows/directx/d3dx10mesh/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dx11core/tags.txt
rename to ffi/windows/directx/d3dx10mesh/tags.txt
diff --git a/basis/windows/directx/d3dx11/authors.txt b/ffi/windows/directx/d3dx10tex/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dx11/authors.txt
rename to ffi/windows/directx/d3dx10tex/authors.txt
diff --git a/basis/windows/directx/d3dx10tex/d3dx10tex.factor b/ffi/windows/directx/d3dx10tex/d3dx10tex.factor
similarity index 100%
rename from basis/windows/directx/d3dx10tex/d3dx10tex.factor
rename to ffi/windows/directx/d3dx10tex/d3dx10tex.factor
diff --git a/basis/windows/directx/d3dcompiler/platforms.txt b/ffi/windows/directx/d3dx10tex/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dcompiler/platforms.txt
rename to ffi/windows/directx/d3dx10tex/platforms.txt
diff --git a/basis/windows/directx/d3dx10tex/summary.txt b/ffi/windows/directx/d3dx10tex/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dx10tex/summary.txt
rename to ffi/windows/directx/d3dx10tex/summary.txt
diff --git a/basis/windows/directx/d3dx11tex/tags.txt b/ffi/windows/directx/d3dx10tex/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dx11tex/tags.txt
rename to ffi/windows/directx/d3dx10tex/tags.txt
diff --git a/basis/windows/directx/d3dx11async/authors.txt b/ffi/windows/directx/d3dx11/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dx11async/authors.txt
rename to ffi/windows/directx/d3dx11/authors.txt
diff --git a/basis/windows/directx/d3dx11/d3dx11.factor b/ffi/windows/directx/d3dx11/d3dx11.factor
similarity index 100%
rename from basis/windows/directx/d3dx11/d3dx11.factor
rename to ffi/windows/directx/d3dx11/d3dx11.factor
diff --git a/basis/windows/directx/d3dcsx/platforms.txt b/ffi/windows/directx/d3dx11/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dcsx/platforms.txt
rename to ffi/windows/directx/d3dx11/platforms.txt
diff --git a/basis/windows/directx/d3dx11/summary.txt b/ffi/windows/directx/d3dx11/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dx11/summary.txt
rename to ffi/windows/directx/d3dx11/summary.txt
diff --git a/basis/windows/directx/d3dx9/tags.txt b/ffi/windows/directx/d3dx11/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dx9/tags.txt
rename to ffi/windows/directx/d3dx11/tags.txt
diff --git a/basis/windows/directx/d3dx11core/authors.txt b/ffi/windows/directx/d3dx11async/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dx11core/authors.txt
rename to ffi/windows/directx/d3dx11async/authors.txt
diff --git a/basis/windows/directx/d3dx11async/d3dx11async.factor b/ffi/windows/directx/d3dx11async/d3dx11async.factor
similarity index 100%
rename from basis/windows/directx/d3dx11async/d3dx11async.factor
rename to ffi/windows/directx/d3dx11async/d3dx11async.factor
diff --git a/basis/windows/directx/d3dx10/platforms.txt b/ffi/windows/directx/d3dx11async/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dx10/platforms.txt
rename to ffi/windows/directx/d3dx11async/platforms.txt
diff --git a/basis/windows/directx/d3dx11async/summary.txt b/ffi/windows/directx/d3dx11async/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dx11async/summary.txt
rename to ffi/windows/directx/d3dx11async/summary.txt
diff --git a/basis/windows/directx/d3dx9anim/tags.txt b/ffi/windows/directx/d3dx11async/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dx9anim/tags.txt
rename to ffi/windows/directx/d3dx11async/tags.txt
diff --git a/basis/windows/directx/d3dx11tex/authors.txt b/ffi/windows/directx/d3dx11core/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dx11tex/authors.txt
rename to ffi/windows/directx/d3dx11core/authors.txt
diff --git a/basis/windows/directx/d3dx11core/d3dx11core.factor b/ffi/windows/directx/d3dx11core/d3dx11core.factor
similarity index 100%
rename from basis/windows/directx/d3dx11core/d3dx11core.factor
rename to ffi/windows/directx/d3dx11core/d3dx11core.factor
diff --git a/basis/windows/directx/d3dx10async/platforms.txt b/ffi/windows/directx/d3dx11core/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dx10async/platforms.txt
rename to ffi/windows/directx/d3dx11core/platforms.txt
diff --git a/basis/windows/directx/d3dx11core/summary.txt b/ffi/windows/directx/d3dx11core/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dx11core/summary.txt
rename to ffi/windows/directx/d3dx11core/summary.txt
diff --git a/basis/windows/directx/d3dx9core/tags.txt b/ffi/windows/directx/d3dx11core/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dx9core/tags.txt
rename to ffi/windows/directx/d3dx11core/tags.txt
diff --git a/basis/windows/directx/d3dx9/authors.txt b/ffi/windows/directx/d3dx11tex/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dx9/authors.txt
rename to ffi/windows/directx/d3dx11tex/authors.txt
diff --git a/basis/windows/directx/d3dx11tex/d3dx11tex.factor b/ffi/windows/directx/d3dx11tex/d3dx11tex.factor
similarity index 100%
rename from basis/windows/directx/d3dx11tex/d3dx11tex.factor
rename to ffi/windows/directx/d3dx11tex/d3dx11tex.factor
diff --git a/basis/windows/directx/d3dx10core/platforms.txt b/ffi/windows/directx/d3dx11tex/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dx10core/platforms.txt
rename to ffi/windows/directx/d3dx11tex/platforms.txt
diff --git a/basis/windows/directx/d3dx11tex/summary.txt b/ffi/windows/directx/d3dx11tex/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dx11tex/summary.txt
rename to ffi/windows/directx/d3dx11tex/summary.txt
diff --git a/basis/windows/directx/d3dx9effect/tags.txt b/ffi/windows/directx/d3dx11tex/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dx9effect/tags.txt
rename to ffi/windows/directx/d3dx11tex/tags.txt
diff --git a/basis/windows/directx/d3dx9anim/authors.txt b/ffi/windows/directx/d3dx9/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dx9anim/authors.txt
rename to ffi/windows/directx/d3dx9/authors.txt
diff --git a/basis/windows/directx/d3dx9/d3dx9.factor b/ffi/windows/directx/d3dx9/d3dx9.factor
similarity index 100%
rename from basis/windows/directx/d3dx9/d3dx9.factor
rename to ffi/windows/directx/d3dx9/d3dx9.factor
diff --git a/basis/windows/directx/d3dx10math/platforms.txt b/ffi/windows/directx/d3dx9/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dx10math/platforms.txt
rename to ffi/windows/directx/d3dx9/platforms.txt
diff --git a/basis/windows/directx/d3dx9/summary.txt b/ffi/windows/directx/d3dx9/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dx9/summary.txt
rename to ffi/windows/directx/d3dx9/summary.txt
diff --git a/basis/windows/directx/d3dx9math/tags.txt b/ffi/windows/directx/d3dx9/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dx9math/tags.txt
rename to ffi/windows/directx/d3dx9/tags.txt
diff --git a/basis/windows/directx/d3dx9core/authors.txt b/ffi/windows/directx/d3dx9anim/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dx9core/authors.txt
rename to ffi/windows/directx/d3dx9anim/authors.txt
diff --git a/basis/windows/directx/d3dx9anim/d3dx9anim.factor b/ffi/windows/directx/d3dx9anim/d3dx9anim.factor
similarity index 100%
rename from basis/windows/directx/d3dx9anim/d3dx9anim.factor
rename to ffi/windows/directx/d3dx9anim/d3dx9anim.factor
diff --git a/basis/windows/directx/d3dx10mesh/platforms.txt b/ffi/windows/directx/d3dx9anim/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dx10mesh/platforms.txt
rename to ffi/windows/directx/d3dx9anim/platforms.txt
diff --git a/basis/windows/directx/d3dx9anim/summary.txt b/ffi/windows/directx/d3dx9anim/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dx9anim/summary.txt
rename to ffi/windows/directx/d3dx9anim/summary.txt
diff --git a/basis/windows/directx/d3dx9mesh/tags.txt b/ffi/windows/directx/d3dx9anim/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dx9mesh/tags.txt
rename to ffi/windows/directx/d3dx9anim/tags.txt
diff --git a/basis/windows/directx/d3dx9effect/authors.txt b/ffi/windows/directx/d3dx9core/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dx9effect/authors.txt
rename to ffi/windows/directx/d3dx9core/authors.txt
diff --git a/basis/windows/directx/d3dx9core/d3dx9core.factor b/ffi/windows/directx/d3dx9core/d3dx9core.factor
similarity index 100%
rename from basis/windows/directx/d3dx9core/d3dx9core.factor
rename to ffi/windows/directx/d3dx9core/d3dx9core.factor
diff --git a/basis/windows/directx/d3dx10tex/platforms.txt b/ffi/windows/directx/d3dx9core/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dx10tex/platforms.txt
rename to ffi/windows/directx/d3dx9core/platforms.txt
diff --git a/basis/windows/directx/d3dx9core/summary.txt b/ffi/windows/directx/d3dx9core/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dx9core/summary.txt
rename to ffi/windows/directx/d3dx9core/summary.txt
diff --git a/basis/windows/directx/d3dx9shader/tags.txt b/ffi/windows/directx/d3dx9core/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dx9shader/tags.txt
rename to ffi/windows/directx/d3dx9core/tags.txt
diff --git a/basis/windows/directx/d3dx9math/authors.txt b/ffi/windows/directx/d3dx9effect/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dx9math/authors.txt
rename to ffi/windows/directx/d3dx9effect/authors.txt
diff --git a/basis/windows/directx/d3dx9effect/d3dx9effect.factor b/ffi/windows/directx/d3dx9effect/d3dx9effect.factor
similarity index 100%
rename from basis/windows/directx/d3dx9effect/d3dx9effect.factor
rename to ffi/windows/directx/d3dx9effect/d3dx9effect.factor
diff --git a/basis/windows/directx/d3dx11/platforms.txt b/ffi/windows/directx/d3dx9effect/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dx11/platforms.txt
rename to ffi/windows/directx/d3dx9effect/platforms.txt
diff --git a/basis/windows/directx/d3dx9effect/summary.txt b/ffi/windows/directx/d3dx9effect/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dx9effect/summary.txt
rename to ffi/windows/directx/d3dx9effect/summary.txt
diff --git a/basis/windows/directx/d3dx9shape/tags.txt b/ffi/windows/directx/d3dx9effect/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dx9shape/tags.txt
rename to ffi/windows/directx/d3dx9effect/tags.txt
diff --git a/basis/windows/directx/d3dx9mesh/authors.txt b/ffi/windows/directx/d3dx9math/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dx9mesh/authors.txt
rename to ffi/windows/directx/d3dx9math/authors.txt
diff --git a/basis/windows/directx/d3dx9math/d3dx9math.factor b/ffi/windows/directx/d3dx9math/d3dx9math.factor
similarity index 100%
rename from basis/windows/directx/d3dx9math/d3dx9math.factor
rename to ffi/windows/directx/d3dx9math/d3dx9math.factor
diff --git a/basis/windows/directx/d3dx11async/platforms.txt b/ffi/windows/directx/d3dx9math/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dx11async/platforms.txt
rename to ffi/windows/directx/d3dx9math/platforms.txt
diff --git a/basis/windows/directx/d3dx9math/summary.txt b/ffi/windows/directx/d3dx9math/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dx9math/summary.txt
rename to ffi/windows/directx/d3dx9math/summary.txt
diff --git a/basis/windows/directx/d3dx9tex/tags.txt b/ffi/windows/directx/d3dx9math/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dx9tex/tags.txt
rename to ffi/windows/directx/d3dx9math/tags.txt
diff --git a/basis/windows/directx/d3dx9shader/authors.txt b/ffi/windows/directx/d3dx9mesh/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dx9shader/authors.txt
rename to ffi/windows/directx/d3dx9mesh/authors.txt
diff --git a/basis/windows/directx/d3dx9mesh/d3dx9mesh.factor b/ffi/windows/directx/d3dx9mesh/d3dx9mesh.factor
similarity index 100%
rename from basis/windows/directx/d3dx9mesh/d3dx9mesh.factor
rename to ffi/windows/directx/d3dx9mesh/d3dx9mesh.factor
diff --git a/basis/windows/directx/d3dx11core/platforms.txt b/ffi/windows/directx/d3dx9mesh/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dx11core/platforms.txt
rename to ffi/windows/directx/d3dx9mesh/platforms.txt
diff --git a/basis/windows/directx/d3dx9mesh/summary.txt b/ffi/windows/directx/d3dx9mesh/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dx9mesh/summary.txt
rename to ffi/windows/directx/d3dx9mesh/summary.txt
diff --git a/basis/windows/directx/d3dx9xof/tags.txt b/ffi/windows/directx/d3dx9mesh/tags.txt
similarity index 100%
rename from basis/windows/directx/d3dx9xof/tags.txt
rename to ffi/windows/directx/d3dx9mesh/tags.txt
diff --git a/basis/windows/directx/d3dx9shape/authors.txt b/ffi/windows/directx/d3dx9shader/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dx9shape/authors.txt
rename to ffi/windows/directx/d3dx9shader/authors.txt
diff --git a/basis/windows/directx/d3dx9shader/d3dx9shader.factor b/ffi/windows/directx/d3dx9shader/d3dx9shader.factor
similarity index 100%
rename from basis/windows/directx/d3dx9shader/d3dx9shader.factor
rename to ffi/windows/directx/d3dx9shader/d3dx9shader.factor
diff --git a/basis/windows/directx/d3dx11tex/platforms.txt b/ffi/windows/directx/d3dx9shader/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dx11tex/platforms.txt
rename to ffi/windows/directx/d3dx9shader/platforms.txt
diff --git a/basis/windows/directx/d3dx9shader/summary.txt b/ffi/windows/directx/d3dx9shader/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dx9shader/summary.txt
rename to ffi/windows/directx/d3dx9shader/summary.txt
diff --git a/basis/windows/directx/dcommon/tags.txt b/ffi/windows/directx/d3dx9shader/tags.txt
similarity index 100%
rename from basis/windows/directx/dcommon/tags.txt
rename to ffi/windows/directx/d3dx9shader/tags.txt
diff --git a/basis/windows/directx/d3dx9tex/authors.txt b/ffi/windows/directx/d3dx9shape/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dx9tex/authors.txt
rename to ffi/windows/directx/d3dx9shape/authors.txt
diff --git a/basis/windows/directx/d3dx9shape/d3dx9shape.factor b/ffi/windows/directx/d3dx9shape/d3dx9shape.factor
similarity index 100%
rename from basis/windows/directx/d3dx9shape/d3dx9shape.factor
rename to ffi/windows/directx/d3dx9shape/d3dx9shape.factor
diff --git a/basis/windows/directx/d3dx9/platforms.txt b/ffi/windows/directx/d3dx9shape/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dx9/platforms.txt
rename to ffi/windows/directx/d3dx9shape/platforms.txt
diff --git a/basis/windows/directx/d3dx9shape/summary.txt b/ffi/windows/directx/d3dx9shape/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dx9shape/summary.txt
rename to ffi/windows/directx/d3dx9shape/summary.txt
diff --git a/basis/windows/directx/dinput/tags.txt b/ffi/windows/directx/d3dx9shape/tags.txt
similarity index 100%
rename from basis/windows/directx/dinput/tags.txt
rename to ffi/windows/directx/d3dx9shape/tags.txt
diff --git a/basis/windows/directx/d3dx9xof/authors.txt b/ffi/windows/directx/d3dx9tex/authors.txt
similarity index 100%
rename from basis/windows/directx/d3dx9xof/authors.txt
rename to ffi/windows/directx/d3dx9tex/authors.txt
diff --git a/basis/windows/directx/d3dx9tex/d3dx9tex.factor b/ffi/windows/directx/d3dx9tex/d3dx9tex.factor
similarity index 100%
rename from basis/windows/directx/d3dx9tex/d3dx9tex.factor
rename to ffi/windows/directx/d3dx9tex/d3dx9tex.factor
diff --git a/basis/windows/directx/d3dx9anim/platforms.txt b/ffi/windows/directx/d3dx9tex/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dx9anim/platforms.txt
rename to ffi/windows/directx/d3dx9tex/platforms.txt
diff --git a/basis/windows/directx/d3dx9tex/summary.txt b/ffi/windows/directx/d3dx9tex/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dx9tex/summary.txt
rename to ffi/windows/directx/d3dx9tex/summary.txt
diff --git a/basis/windows/directx/dwrite/tags.txt b/ffi/windows/directx/d3dx9tex/tags.txt
similarity index 100%
rename from basis/windows/directx/dwrite/tags.txt
rename to ffi/windows/directx/d3dx9tex/tags.txt
diff --git a/basis/windows/directx/dcommon/authors.txt b/ffi/windows/directx/d3dx9xof/authors.txt
similarity index 100%
rename from basis/windows/directx/dcommon/authors.txt
rename to ffi/windows/directx/d3dx9xof/authors.txt
diff --git a/basis/windows/directx/d3dx9xof/d3dx9xof.factor b/ffi/windows/directx/d3dx9xof/d3dx9xof.factor
similarity index 100%
rename from basis/windows/directx/d3dx9xof/d3dx9xof.factor
rename to ffi/windows/directx/d3dx9xof/d3dx9xof.factor
diff --git a/basis/windows/directx/d3dx9core/platforms.txt b/ffi/windows/directx/d3dx9xof/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dx9core/platforms.txt
rename to ffi/windows/directx/d3dx9xof/platforms.txt
diff --git a/basis/windows/directx/d3dx9xof/summary.txt b/ffi/windows/directx/d3dx9xof/summary.txt
similarity index 100%
rename from basis/windows/directx/d3dx9xof/summary.txt
rename to ffi/windows/directx/d3dx9xof/summary.txt
diff --git a/basis/windows/directx/dxfile/tags.txt b/ffi/windows/directx/d3dx9xof/tags.txt
similarity index 100%
rename from basis/windows/directx/dxfile/tags.txt
rename to ffi/windows/directx/d3dx9xof/tags.txt
diff --git a/basis/windows/directx/dwrite/authors.txt b/ffi/windows/directx/dcommon/authors.txt
similarity index 100%
rename from basis/windows/directx/dwrite/authors.txt
rename to ffi/windows/directx/dcommon/authors.txt
diff --git a/basis/windows/directx/dcommon/dcommon.factor b/ffi/windows/directx/dcommon/dcommon.factor
similarity index 100%
rename from basis/windows/directx/dcommon/dcommon.factor
rename to ffi/windows/directx/dcommon/dcommon.factor
diff --git a/basis/windows/directx/d3dx9effect/platforms.txt b/ffi/windows/directx/dcommon/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dx9effect/platforms.txt
rename to ffi/windows/directx/dcommon/platforms.txt
diff --git a/basis/windows/directx/dcommon/summary.txt b/ffi/windows/directx/dcommon/summary.txt
similarity index 100%
rename from basis/windows/directx/dcommon/summary.txt
rename to ffi/windows/directx/dcommon/summary.txt
diff --git a/basis/windows/directx/dxgi/tags.txt b/ffi/windows/directx/dcommon/tags.txt
similarity index 100%
rename from basis/windows/directx/dxgi/tags.txt
rename to ffi/windows/directx/dcommon/tags.txt
diff --git a/extra/alien/data/map/authors.txt b/ffi/windows/directx/dinput/authors.txt
similarity index 100%
rename from extra/alien/data/map/authors.txt
rename to ffi/windows/directx/dinput/authors.txt
diff --git a/basis/windows/directx/dinput/constants/constants-tests.factor b/ffi/windows/directx/dinput/constants/constants-tests.factor
similarity index 100%
rename from basis/windows/directx/dinput/constants/constants-tests.factor
rename to ffi/windows/directx/dinput/constants/constants-tests.factor
diff --git a/basis/windows/directx/dinput/constants/constants.factor b/ffi/windows/directx/dinput/constants/constants.factor
similarity index 100%
rename from basis/windows/directx/dinput/constants/constants.factor
rename to ffi/windows/directx/dinput/constants/constants.factor
diff --git a/basis/windows/directx/d3dx9math/platforms.txt b/ffi/windows/directx/dinput/constants/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dx9math/platforms.txt
rename to ffi/windows/directx/dinput/constants/platforms.txt
diff --git a/basis/windows/directx/dinput/dinput.factor b/ffi/windows/directx/dinput/dinput.factor
similarity index 100%
rename from basis/windows/directx/dinput/dinput.factor
rename to ffi/windows/directx/dinput/dinput.factor
diff --git a/basis/windows/directx/d3dx9mesh/platforms.txt b/ffi/windows/directx/dinput/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dx9mesh/platforms.txt
rename to ffi/windows/directx/dinput/platforms.txt
diff --git a/basis/windows/directx/dinput/summary.txt b/ffi/windows/directx/dinput/summary.txt
similarity index 100%
rename from basis/windows/directx/dinput/summary.txt
rename to ffi/windows/directx/dinput/summary.txt
diff --git a/basis/windows/directx/dxgiformat/tags.txt b/ffi/windows/directx/dinput/tags.txt
similarity index 100%
rename from basis/windows/directx/dxgiformat/tags.txt
rename to ffi/windows/directx/dinput/tags.txt
diff --git a/basis/windows/directx/directx.factor b/ffi/windows/directx/directx.factor
similarity index 100%
rename from basis/windows/directx/directx.factor
rename to ffi/windows/directx/directx.factor
diff --git a/basis/windows/directx/dxfile/authors.txt b/ffi/windows/directx/dwrite/authors.txt
similarity index 100%
rename from basis/windows/directx/dxfile/authors.txt
rename to ffi/windows/directx/dwrite/authors.txt
diff --git a/basis/windows/directx/dwrite/dwrite.factor b/ffi/windows/directx/dwrite/dwrite.factor
similarity index 100%
rename from basis/windows/directx/dwrite/dwrite.factor
rename to ffi/windows/directx/dwrite/dwrite.factor
diff --git a/basis/windows/directx/d3dx9shader/platforms.txt b/ffi/windows/directx/dwrite/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dx9shader/platforms.txt
rename to ffi/windows/directx/dwrite/platforms.txt
diff --git a/basis/windows/directx/dwrite/summary.txt b/ffi/windows/directx/dwrite/summary.txt
similarity index 100%
rename from basis/windows/directx/dwrite/summary.txt
rename to ffi/windows/directx/dwrite/summary.txt
diff --git a/basis/windows/directx/dxgitype/tags.txt b/ffi/windows/directx/dwrite/tags.txt
similarity index 100%
rename from basis/windows/directx/dxgitype/tags.txt
rename to ffi/windows/directx/dwrite/tags.txt
diff --git a/basis/windows/directx/dxgi/authors.txt b/ffi/windows/directx/dxfile/authors.txt
similarity index 100%
rename from basis/windows/directx/dxgi/authors.txt
rename to ffi/windows/directx/dxfile/authors.txt
diff --git a/basis/windows/directx/dxfile/dxfile.factor b/ffi/windows/directx/dxfile/dxfile.factor
similarity index 100%
rename from basis/windows/directx/dxfile/dxfile.factor
rename to ffi/windows/directx/dxfile/dxfile.factor
diff --git a/basis/windows/directx/d3dx9shape/platforms.txt b/ffi/windows/directx/dxfile/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dx9shape/platforms.txt
rename to ffi/windows/directx/dxfile/platforms.txt
diff --git a/basis/windows/directx/dxfile/summary.txt b/ffi/windows/directx/dxfile/summary.txt
similarity index 100%
rename from basis/windows/directx/dxfile/summary.txt
rename to ffi/windows/directx/dxfile/summary.txt
diff --git a/basis/windows/directx/x3daudio/tags.txt b/ffi/windows/directx/dxfile/tags.txt
similarity index 100%
rename from basis/windows/directx/x3daudio/tags.txt
rename to ffi/windows/directx/dxfile/tags.txt
diff --git a/basis/windows/directx/dxgiformat/authors.txt b/ffi/windows/directx/dxgi/authors.txt
similarity index 100%
rename from basis/windows/directx/dxgiformat/authors.txt
rename to ffi/windows/directx/dxgi/authors.txt
diff --git a/basis/windows/directx/dxgi/dxgi.factor b/ffi/windows/directx/dxgi/dxgi.factor
similarity index 100%
rename from basis/windows/directx/dxgi/dxgi.factor
rename to ffi/windows/directx/dxgi/dxgi.factor
diff --git a/basis/windows/directx/d3dx9tex/platforms.txt b/ffi/windows/directx/dxgi/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dx9tex/platforms.txt
rename to ffi/windows/directx/dxgi/platforms.txt
diff --git a/basis/windows/directx/dxgi/summary.txt b/ffi/windows/directx/dxgi/summary.txt
similarity index 100%
rename from basis/windows/directx/dxgi/summary.txt
rename to ffi/windows/directx/dxgi/summary.txt
diff --git a/basis/windows/directx/xact3/tags.txt b/ffi/windows/directx/dxgi/tags.txt
similarity index 100%
rename from basis/windows/directx/xact3/tags.txt
rename to ffi/windows/directx/dxgi/tags.txt
diff --git a/basis/windows/directx/dxgitype/authors.txt b/ffi/windows/directx/dxgiformat/authors.txt
similarity index 100%
rename from basis/windows/directx/dxgitype/authors.txt
rename to ffi/windows/directx/dxgiformat/authors.txt
diff --git a/basis/windows/directx/dxgiformat/dxgiformat.factor b/ffi/windows/directx/dxgiformat/dxgiformat.factor
similarity index 100%
rename from basis/windows/directx/dxgiformat/dxgiformat.factor
rename to ffi/windows/directx/dxgiformat/dxgiformat.factor
diff --git a/basis/windows/directx/d3dx9xof/platforms.txt b/ffi/windows/directx/dxgiformat/platforms.txt
similarity index 100%
rename from basis/windows/directx/d3dx9xof/platforms.txt
rename to ffi/windows/directx/dxgiformat/platforms.txt
diff --git a/basis/windows/directx/dxgiformat/summary.txt b/ffi/windows/directx/dxgiformat/summary.txt
similarity index 100%
rename from basis/windows/directx/dxgiformat/summary.txt
rename to ffi/windows/directx/dxgiformat/summary.txt
diff --git a/basis/windows/directx/xapo/tags.txt b/ffi/windows/directx/dxgiformat/tags.txt
similarity index 100%
rename from basis/windows/directx/xapo/tags.txt
rename to ffi/windows/directx/dxgiformat/tags.txt
diff --git a/basis/windows/directx/x3daudio/authors.txt b/ffi/windows/directx/dxgitype/authors.txt
similarity index 100%
rename from basis/windows/directx/x3daudio/authors.txt
rename to ffi/windows/directx/dxgitype/authors.txt
diff --git a/basis/windows/directx/dxgitype/dxgitype.factor b/ffi/windows/directx/dxgitype/dxgitype.factor
similarity index 100%
rename from basis/windows/directx/dxgitype/dxgitype.factor
rename to ffi/windows/directx/dxgitype/dxgitype.factor
diff --git a/basis/windows/directx/dcommon/platforms.txt b/ffi/windows/directx/dxgitype/platforms.txt
similarity index 100%
rename from basis/windows/directx/dcommon/platforms.txt
rename to ffi/windows/directx/dxgitype/platforms.txt
diff --git a/basis/windows/directx/dxgitype/summary.txt b/ffi/windows/directx/dxgitype/summary.txt
similarity index 100%
rename from basis/windows/directx/dxgitype/summary.txt
rename to ffi/windows/directx/dxgitype/summary.txt
diff --git a/basis/windows/directx/xapofx/tags.txt b/ffi/windows/directx/dxgitype/tags.txt
similarity index 100%
rename from basis/windows/directx/xapofx/tags.txt
rename to ffi/windows/directx/dxgitype/tags.txt
diff --git a/basis/windows/directx/dinput/constants/platforms.txt b/ffi/windows/directx/platforms.txt
similarity index 100%
rename from basis/windows/directx/dinput/constants/platforms.txt
rename to ffi/windows/directx/platforms.txt
diff --git a/basis/windows/directx/xact3/authors.txt b/ffi/windows/directx/x3daudio/authors.txt
similarity index 100%
rename from basis/windows/directx/xact3/authors.txt
rename to ffi/windows/directx/x3daudio/authors.txt
diff --git a/basis/windows/directx/dinput/platforms.txt b/ffi/windows/directx/x3daudio/platforms.txt
similarity index 100%
rename from basis/windows/directx/dinput/platforms.txt
rename to ffi/windows/directx/x3daudio/platforms.txt
diff --git a/basis/windows/directx/x3daudio/summary.txt b/ffi/windows/directx/x3daudio/summary.txt
similarity index 100%
rename from basis/windows/directx/x3daudio/summary.txt
rename to ffi/windows/directx/x3daudio/summary.txt
diff --git a/basis/windows/directx/xaudio2/tags.txt b/ffi/windows/directx/x3daudio/tags.txt
similarity index 100%
rename from basis/windows/directx/xaudio2/tags.txt
rename to ffi/windows/directx/x3daudio/tags.txt
diff --git a/basis/windows/directx/x3daudio/x3daudio.factor b/ffi/windows/directx/x3daudio/x3daudio.factor
similarity index 100%
rename from basis/windows/directx/x3daudio/x3daudio.factor
rename to ffi/windows/directx/x3daudio/x3daudio.factor
diff --git a/basis/windows/directx/xapo/authors.txt b/ffi/windows/directx/xact3/authors.txt
similarity index 100%
rename from basis/windows/directx/xapo/authors.txt
rename to ffi/windows/directx/xact3/authors.txt
diff --git a/basis/windows/directx/dwrite/platforms.txt b/ffi/windows/directx/xact3/platforms.txt
similarity index 100%
rename from basis/windows/directx/dwrite/platforms.txt
rename to ffi/windows/directx/xact3/platforms.txt
diff --git a/basis/windows/directx/xact3/summary.txt b/ffi/windows/directx/xact3/summary.txt
similarity index 100%
rename from basis/windows/directx/xact3/summary.txt
rename to ffi/windows/directx/xact3/summary.txt
diff --git a/basis/windows/directx/xaudio2fx/tags.txt b/ffi/windows/directx/xact3/tags.txt
similarity index 100%
rename from basis/windows/directx/xaudio2fx/tags.txt
rename to ffi/windows/directx/xact3/tags.txt
diff --git a/basis/windows/directx/xact3/xact3.factor b/ffi/windows/directx/xact3/xact3.factor
similarity index 100%
rename from basis/windows/directx/xact3/xact3.factor
rename to ffi/windows/directx/xact3/xact3.factor
diff --git a/basis/windows/directx/xapofx/authors.txt b/ffi/windows/directx/xapo/authors.txt
similarity index 100%
rename from basis/windows/directx/xapofx/authors.txt
rename to ffi/windows/directx/xapo/authors.txt
diff --git a/basis/windows/directx/dxfile/platforms.txt b/ffi/windows/directx/xapo/platforms.txt
similarity index 100%
rename from basis/windows/directx/dxfile/platforms.txt
rename to ffi/windows/directx/xapo/platforms.txt
diff --git a/basis/windows/directx/xapo/summary.txt b/ffi/windows/directx/xapo/summary.txt
similarity index 100%
rename from basis/windows/directx/xapo/summary.txt
rename to ffi/windows/directx/xapo/summary.txt
diff --git a/basis/windows/directx/xinput/tags.txt b/ffi/windows/directx/xapo/tags.txt
similarity index 100%
rename from basis/windows/directx/xinput/tags.txt
rename to ffi/windows/directx/xapo/tags.txt
diff --git a/basis/windows/directx/xapo/xapo.factor b/ffi/windows/directx/xapo/xapo.factor
similarity index 100%
rename from basis/windows/directx/xapo/xapo.factor
rename to ffi/windows/directx/xapo/xapo.factor
diff --git a/basis/windows/directx/xaudio2/authors.txt b/ffi/windows/directx/xapofx/authors.txt
similarity index 100%
rename from basis/windows/directx/xaudio2/authors.txt
rename to ffi/windows/directx/xapofx/authors.txt
diff --git a/basis/windows/directx/dxgi/platforms.txt b/ffi/windows/directx/xapofx/platforms.txt
similarity index 100%
rename from basis/windows/directx/dxgi/platforms.txt
rename to ffi/windows/directx/xapofx/platforms.txt
diff --git a/basis/windows/directx/xapofx/summary.txt b/ffi/windows/directx/xapofx/summary.txt
similarity index 100%
rename from basis/windows/directx/xapofx/summary.txt
rename to ffi/windows/directx/xapofx/summary.txt
diff --git a/basis/windows/gdi32/tags.txt b/ffi/windows/directx/xapofx/tags.txt
similarity index 100%
rename from basis/windows/gdi32/tags.txt
rename to ffi/windows/directx/xapofx/tags.txt
diff --git a/basis/windows/directx/xapofx/xapofx.factor b/ffi/windows/directx/xapofx/xapofx.factor
similarity index 100%
rename from basis/windows/directx/xapofx/xapofx.factor
rename to ffi/windows/directx/xapofx/xapofx.factor
diff --git a/basis/windows/directx/xaudio2fx/authors.txt b/ffi/windows/directx/xaudio2/authors.txt
similarity index 100%
rename from basis/windows/directx/xaudio2fx/authors.txt
rename to ffi/windows/directx/xaudio2/authors.txt
diff --git a/basis/windows/directx/dxgiformat/platforms.txt b/ffi/windows/directx/xaudio2/platforms.txt
similarity index 100%
rename from basis/windows/directx/dxgiformat/platforms.txt
rename to ffi/windows/directx/xaudio2/platforms.txt
diff --git a/basis/windows/directx/xaudio2/summary.txt b/ffi/windows/directx/xaudio2/summary.txt
similarity index 100%
rename from basis/windows/directx/xaudio2/summary.txt
rename to ffi/windows/directx/xaudio2/summary.txt
diff --git a/basis/windows/psapi/tags.txt b/ffi/windows/directx/xaudio2/tags.txt
similarity index 100%
rename from basis/windows/psapi/tags.txt
rename to ffi/windows/directx/xaudio2/tags.txt
diff --git a/basis/windows/directx/xaudio2/xaudio2.factor b/ffi/windows/directx/xaudio2/xaudio2.factor
similarity index 100%
rename from basis/windows/directx/xaudio2/xaudio2.factor
rename to ffi/windows/directx/xaudio2/xaudio2.factor
diff --git a/basis/windows/directx/xinput/authors.txt b/ffi/windows/directx/xaudio2fx/authors.txt
similarity index 100%
rename from basis/windows/directx/xinput/authors.txt
rename to ffi/windows/directx/xaudio2fx/authors.txt
diff --git a/basis/windows/directx/dxgitype/platforms.txt b/ffi/windows/directx/xaudio2fx/platforms.txt
similarity index 100%
rename from basis/windows/directx/dxgitype/platforms.txt
rename to ffi/windows/directx/xaudio2fx/platforms.txt
diff --git a/basis/windows/directx/xaudio2fx/summary.txt b/ffi/windows/directx/xaudio2fx/summary.txt
similarity index 100%
rename from basis/windows/directx/xaudio2fx/summary.txt
rename to ffi/windows/directx/xaudio2fx/summary.txt
diff --git a/basis/windows/tags.txt b/ffi/windows/directx/xaudio2fx/tags.txt
similarity index 100%
rename from basis/windows/tags.txt
rename to ffi/windows/directx/xaudio2fx/tags.txt
diff --git a/basis/windows/directx/xaudio2fx/xaudio2fx.factor b/ffi/windows/directx/xaudio2fx/xaudio2fx.factor
similarity index 100%
rename from basis/windows/directx/xaudio2fx/xaudio2fx.factor
rename to ffi/windows/directx/xaudio2fx/xaudio2fx.factor
diff --git a/extra/dwarf/authors.txt b/ffi/windows/directx/xinput/authors.txt
similarity index 100%
rename from extra/dwarf/authors.txt
rename to ffi/windows/directx/xinput/authors.txt
diff --git a/basis/windows/directx/platforms.txt b/ffi/windows/directx/xinput/platforms.txt
similarity index 100%
rename from basis/windows/directx/platforms.txt
rename to ffi/windows/directx/xinput/platforms.txt
diff --git a/basis/windows/directx/xinput/summary.txt b/ffi/windows/directx/xinput/summary.txt
similarity index 100%
rename from basis/windows/directx/xinput/summary.txt
rename to ffi/windows/directx/xinput/summary.txt
diff --git a/basis/windows/usp10/tags.txt b/ffi/windows/directx/xinput/tags.txt
similarity index 100%
rename from basis/windows/usp10/tags.txt
rename to ffi/windows/directx/xinput/tags.txt
diff --git a/basis/windows/directx/xinput/xinput.factor b/ffi/windows/directx/xinput/xinput.factor
similarity index 100%
rename from basis/windows/directx/xinput/xinput.factor
rename to ffi/windows/directx/xinput/xinput.factor
diff --git a/extra/alien/fortran/authors.txt b/ffi/windows/dwmapi/authors.txt
similarity index 100%
rename from extra/alien/fortran/authors.txt
rename to ffi/windows/dwmapi/authors.txt
diff --git a/basis/windows/dwmapi/dwmapi.factor b/ffi/windows/dwmapi/dwmapi.factor
similarity index 100%
rename from basis/windows/dwmapi/dwmapi.factor
rename to ffi/windows/dwmapi/dwmapi.factor
diff --git a/basis/windows/directx/x3daudio/platforms.txt b/ffi/windows/dwmapi/platforms.txt
similarity index 100%
rename from basis/windows/directx/x3daudio/platforms.txt
rename to ffi/windows/dwmapi/platforms.txt
diff --git a/basis/windows/dwmapi/summary.txt b/ffi/windows/dwmapi/summary.txt
similarity index 100%
rename from basis/windows/dwmapi/summary.txt
rename to ffi/windows/dwmapi/summary.txt
diff --git a/basis/windows/dwmapi/tags.txt b/ffi/windows/dwmapi/tags.txt
similarity index 100%
rename from basis/windows/dwmapi/tags.txt
rename to ffi/windows/dwmapi/tags.txt
diff --git a/extra/arrays/shaped/authors.txt b/ffi/windows/errors/authors.txt
similarity index 100%
rename from extra/arrays/shaped/authors.txt
rename to ffi/windows/errors/authors.txt
diff --git a/basis/windows/errors/errors-tests.factor b/ffi/windows/errors/errors-tests.factor
similarity index 100%
rename from basis/windows/errors/errors-tests.factor
rename to ffi/windows/errors/errors-tests.factor
diff --git a/basis/windows/errors/errors.factor b/ffi/windows/errors/errors.factor
similarity index 100%
rename from basis/windows/errors/errors.factor
rename to ffi/windows/errors/errors.factor
diff --git a/basis/windows/directx/xact3/platforms.txt b/ffi/windows/errors/platforms.txt
similarity index 100%
rename from basis/windows/directx/xact3/platforms.txt
rename to ffi/windows/errors/platforms.txt
diff --git a/basis/windows/fonts/fonts.factor b/ffi/windows/fonts/fonts.factor
similarity index 100%
rename from basis/windows/fonts/fonts.factor
rename to ffi/windows/fonts/fonts.factor
diff --git a/basis/windows/directx/xapo/platforms.txt b/ffi/windows/fonts/platforms.txt
similarity index 100%
rename from basis/windows/directx/xapo/platforms.txt
rename to ffi/windows/fonts/platforms.txt
diff --git a/extra/benchmark/tcp-echo0/authors.txt b/ffi/windows/gdi32/authors.txt
similarity index 100%
rename from extra/benchmark/tcp-echo0/authors.txt
rename to ffi/windows/gdi32/authors.txt
diff --git a/basis/windows/gdi32/gdi32.factor b/ffi/windows/gdi32/gdi32.factor
similarity index 100%
rename from basis/windows/gdi32/gdi32.factor
rename to ffi/windows/gdi32/gdi32.factor
diff --git a/basis/windows/directx/xapofx/platforms.txt b/ffi/windows/gdi32/platforms.txt
similarity index 100%
rename from basis/windows/directx/xapofx/platforms.txt
rename to ffi/windows/gdi32/platforms.txt
diff --git a/basis/x11/glx/tags.txt b/ffi/windows/gdi32/tags.txt
similarity index 100%
rename from basis/x11/glx/tags.txt
rename to ffi/windows/gdi32/tags.txt
diff --git a/basis/windows/gdiplus/gdiplus.factor b/ffi/windows/gdiplus/gdiplus.factor
similarity index 100%
rename from basis/windows/gdiplus/gdiplus.factor
rename to ffi/windows/gdiplus/gdiplus.factor
diff --git a/basis/windows/directx/xaudio2/platforms.txt b/ffi/windows/gdiplus/platforms.txt
similarity index 100%
rename from basis/windows/directx/xaudio2/platforms.txt
rename to ffi/windows/gdiplus/platforms.txt
diff --git a/extra/benchmark/tcp-echo1/authors.txt b/ffi/windows/handles/authors.txt
similarity index 100%
rename from extra/benchmark/tcp-echo1/authors.txt
rename to ffi/windows/handles/authors.txt
diff --git a/basis/windows/handles/handles.factor b/ffi/windows/handles/handles.factor
similarity index 100%
rename from basis/windows/handles/handles.factor
rename to ffi/windows/handles/handles.factor
diff --git a/basis/windows/handles/platforms.txt b/ffi/windows/handles/platforms.txt
similarity index 100%
rename from basis/windows/handles/platforms.txt
rename to ffi/windows/handles/platforms.txt
diff --git a/extra/benchmark/tcp-echo2/authors.txt b/ffi/windows/iphlpapi/authors.txt
similarity index 100%
rename from extra/benchmark/tcp-echo2/authors.txt
rename to ffi/windows/iphlpapi/authors.txt
diff --git a/basis/windows/iphlpapi/iphlpapi.factor b/ffi/windows/iphlpapi/iphlpapi.factor
similarity index 100%
rename from basis/windows/iphlpapi/iphlpapi.factor
rename to ffi/windows/iphlpapi/iphlpapi.factor
diff --git a/basis/windows/directx/xaudio2fx/platforms.txt b/ffi/windows/iphlpapi/platforms.txt
similarity index 100%
rename from basis/windows/directx/xaudio2fx/platforms.txt
rename to ffi/windows/iphlpapi/platforms.txt
diff --git a/extra/benchmark/udp-echo1/authors.txt b/ffi/windows/kernel32/authors.txt
similarity index 100%
rename from extra/benchmark/udp-echo1/authors.txt
rename to ffi/windows/kernel32/authors.txt
diff --git a/basis/windows/kernel32/kernel32.factor b/ffi/windows/kernel32/kernel32.factor
similarity index 100%
rename from basis/windows/kernel32/kernel32.factor
rename to ffi/windows/kernel32/kernel32.factor
diff --git a/basis/windows/directx/xinput/platforms.txt b/ffi/windows/kernel32/platforms.txt
similarity index 100%
rename from basis/windows/directx/xinput/platforms.txt
rename to ffi/windows/kernel32/platforms.txt
diff --git a/extra/benchmark/udp-echo2/authors.txt b/ffi/windows/messages/authors.txt
similarity index 100%
rename from extra/benchmark/udp-echo2/authors.txt
rename to ffi/windows/messages/authors.txt
diff --git a/basis/windows/messages/messages.factor b/ffi/windows/messages/messages.factor
similarity index 100%
rename from basis/windows/messages/messages.factor
rename to ffi/windows/messages/messages.factor
diff --git a/basis/windows/dwmapi/platforms.txt b/ffi/windows/messages/platforms.txt
similarity index 100%
rename from basis/windows/dwmapi/platforms.txt
rename to ffi/windows/messages/platforms.txt
diff --git a/extra/build-support/authors.txt b/ffi/windows/ntdll/authors.txt
similarity index 100%
rename from extra/build-support/authors.txt
rename to ffi/windows/ntdll/authors.txt
diff --git a/basis/windows/ntdll/ntdll.factor b/ffi/windows/ntdll/ntdll.factor
similarity index 100%
rename from basis/windows/ntdll/ntdll.factor
rename to ffi/windows/ntdll/ntdll.factor
diff --git a/basis/windows/errors/platforms.txt b/ffi/windows/ntdll/platforms.txt
similarity index 100%
rename from basis/windows/errors/platforms.txt
rename to ffi/windows/ntdll/platforms.txt
diff --git a/basis/ui/tools/listener/completion/authors.txt b/ffi/windows/offscreen/authors.txt
similarity index 100%
rename from basis/ui/tools/listener/completion/authors.txt
rename to ffi/windows/offscreen/authors.txt
diff --git a/basis/windows/offscreen/offscreen-tests.factor b/ffi/windows/offscreen/offscreen-tests.factor
similarity index 100%
rename from basis/windows/offscreen/offscreen-tests.factor
rename to ffi/windows/offscreen/offscreen-tests.factor
diff --git a/basis/windows/offscreen/offscreen.factor b/ffi/windows/offscreen/offscreen.factor
similarity index 100%
rename from basis/windows/offscreen/offscreen.factor
rename to ffi/windows/offscreen/offscreen.factor
diff --git a/basis/windows/fonts/platforms.txt b/ffi/windows/offscreen/platforms.txt
similarity index 100%
rename from basis/windows/fonts/platforms.txt
rename to ffi/windows/offscreen/platforms.txt
diff --git a/basis/windows/offscreen/summary.txt b/ffi/windows/offscreen/summary.txt
similarity index 100%
rename from basis/windows/offscreen/summary.txt
rename to ffi/windows/offscreen/summary.txt
diff --git a/basis/windows/ole32/authors.txt b/ffi/windows/ole32/authors.txt
similarity index 100%
rename from basis/windows/ole32/authors.txt
rename to ffi/windows/ole32/authors.txt
diff --git a/basis/windows/ole32/ole32-tests.factor b/ffi/windows/ole32/ole32-tests.factor
similarity index 100%
rename from basis/windows/ole32/ole32-tests.factor
rename to ffi/windows/ole32/ole32-tests.factor
diff --git a/basis/windows/ole32/ole32.factor b/ffi/windows/ole32/ole32.factor
similarity index 100%
rename from basis/windows/ole32/ole32.factor
rename to ffi/windows/ole32/ole32.factor
diff --git a/basis/windows/gdi32/platforms.txt b/ffi/windows/ole32/platforms.txt
similarity index 100%
rename from basis/windows/gdi32/platforms.txt
rename to ffi/windows/ole32/platforms.txt
diff --git a/extra/cuda/authors.txt b/ffi/windows/opengl32/authors.txt
similarity index 100%
rename from extra/cuda/authors.txt
rename to ffi/windows/opengl32/authors.txt
diff --git a/basis/windows/opengl32/opengl32.factor b/ffi/windows/opengl32/opengl32.factor
similarity index 100%
rename from basis/windows/opengl32/opengl32.factor
rename to ffi/windows/opengl32/opengl32.factor
diff --git a/basis/windows/gdiplus/platforms.txt b/ffi/windows/opengl32/platforms.txt
similarity index 100%
rename from basis/windows/gdiplus/platforms.txt
rename to ffi/windows/opengl32/platforms.txt
diff --git a/basis/windows/iphlpapi/platforms.txt b/ffi/windows/platforms.txt
similarity index 100%
rename from basis/windows/iphlpapi/platforms.txt
rename to ffi/windows/platforms.txt
diff --git a/extra/cuda/demos/hello-world/authors.txt b/ffi/windows/privileges/authors.txt
similarity index 100%
rename from extra/cuda/demos/hello-world/authors.txt
rename to ffi/windows/privileges/authors.txt
diff --git a/basis/windows/kernel32/platforms.txt b/ffi/windows/privileges/platforms.txt
similarity index 100%
rename from basis/windows/kernel32/platforms.txt
rename to ffi/windows/privileges/platforms.txt
diff --git a/basis/windows/privileges/privileges-tests.factor b/ffi/windows/privileges/privileges-tests.factor
similarity index 100%
rename from basis/windows/privileges/privileges-tests.factor
rename to ffi/windows/privileges/privileges-tests.factor
diff --git a/basis/windows/privileges/privileges.factor b/ffi/windows/privileges/privileges.factor
similarity index 100%
rename from basis/windows/privileges/privileges.factor
rename to ffi/windows/privileges/privileges.factor
diff --git a/basis/windows/psapi/authors.txt b/ffi/windows/psapi/authors.txt
similarity index 100%
rename from basis/windows/psapi/authors.txt
rename to ffi/windows/psapi/authors.txt
diff --git a/basis/windows/messages/platforms.txt b/ffi/windows/psapi/platforms.txt
similarity index 100%
rename from basis/windows/messages/platforms.txt
rename to ffi/windows/psapi/platforms.txt
diff --git a/basis/windows/psapi/psapi.factor b/ffi/windows/psapi/psapi.factor
similarity index 100%
rename from basis/windows/psapi/psapi.factor
rename to ffi/windows/psapi/psapi.factor
diff --git a/basis/x11/tags.txt b/ffi/windows/psapi/tags.txt
similarity index 100%
rename from basis/x11/tags.txt
rename to ffi/windows/psapi/tags.txt
diff --git a/extra/cuda/devices/authors.txt b/ffi/windows/registry/authors.txt
similarity index 100%
rename from extra/cuda/devices/authors.txt
rename to ffi/windows/registry/authors.txt
diff --git a/basis/windows/ntdll/platforms.txt b/ffi/windows/registry/platforms.txt
similarity index 100%
rename from basis/windows/ntdll/platforms.txt
rename to ffi/windows/registry/platforms.txt
diff --git a/basis/windows/registry/registry-tests.factor b/ffi/windows/registry/registry-tests.factor
similarity index 100%
rename from basis/windows/registry/registry-tests.factor
rename to ffi/windows/registry/registry-tests.factor
diff --git a/basis/windows/registry/registry.factor b/ffi/windows/registry/registry.factor
similarity index 100%
rename from basis/windows/registry/registry.factor
rename to ffi/windows/registry/registry.factor
diff --git a/extra/cuda/libraries/authors.txt b/ffi/windows/shell32/authors.txt
similarity index 100%
rename from extra/cuda/libraries/authors.txt
rename to ffi/windows/shell32/authors.txt
diff --git a/basis/windows/offscreen/platforms.txt b/ffi/windows/shell32/platforms.txt
similarity index 100%
rename from basis/windows/offscreen/platforms.txt
rename to ffi/windows/shell32/platforms.txt
diff --git a/basis/windows/shell32/shell32.factor b/ffi/windows/shell32/shell32.factor
similarity index 100%
rename from basis/windows/shell32/shell32.factor
rename to ffi/windows/shell32/shell32.factor
diff --git a/basis/windows/streams/platforms.txt b/ffi/windows/streams/platforms.txt
similarity index 100%
rename from basis/windows/streams/platforms.txt
rename to ffi/windows/streams/platforms.txt
diff --git a/basis/windows/streams/streams.factor b/ffi/windows/streams/streams.factor
similarity index 100%
rename from basis/windows/streams/streams.factor
rename to ffi/windows/streams/streams.factor
diff --git a/basis/windows/streams/summary.txt b/ffi/windows/streams/summary.txt
similarity index 100%
rename from basis/windows/streams/summary.txt
rename to ffi/windows/streams/summary.txt
diff --git a/basis/windows/summary.txt b/ffi/windows/summary.txt
similarity index 100%
rename from basis/windows/summary.txt
rename to ffi/windows/summary.txt
diff --git a/basis/x11/xim/tags.txt b/ffi/windows/tags.txt
similarity index 100%
rename from basis/x11/xim/tags.txt
rename to ffi/windows/tags.txt
diff --git a/extra/cuda/memory/authors.txt b/ffi/windows/time/authors.txt
similarity index 100%
rename from extra/cuda/memory/authors.txt
rename to ffi/windows/time/authors.txt
diff --git a/basis/windows/ole32/platforms.txt b/ffi/windows/time/platforms.txt
similarity index 100%
rename from basis/windows/ole32/platforms.txt
rename to ffi/windows/time/platforms.txt
diff --git a/basis/windows/time/time-tests.factor b/ffi/windows/time/time-tests.factor
similarity index 100%
rename from basis/windows/time/time-tests.factor
rename to ffi/windows/time/time-tests.factor
diff --git a/basis/windows/time/time.factor b/ffi/windows/time/time.factor
similarity index 100%
rename from basis/windows/time/time.factor
rename to ffi/windows/time/time.factor
diff --git a/extra/cuda/nvcc/authors.txt b/ffi/windows/types/authors.txt
similarity index 100%
rename from extra/cuda/nvcc/authors.txt
rename to ffi/windows/types/authors.txt
diff --git a/basis/windows/opengl32/platforms.txt b/ffi/windows/types/platforms.txt
similarity index 100%
rename from basis/windows/opengl32/platforms.txt
rename to ffi/windows/types/platforms.txt
diff --git a/basis/windows/types/types-tests.factor b/ffi/windows/types/types-tests.factor
similarity index 100%
rename from basis/windows/types/types-tests.factor
rename to ffi/windows/types/types-tests.factor
diff --git a/basis/windows/types/types.factor b/ffi/windows/types/types.factor
similarity index 100%
rename from basis/windows/types/types.factor
rename to ffi/windows/types/types.factor
diff --git a/basis/ui/tools/listener/history/authors.txt b/ffi/windows/uniscribe/authors.txt
similarity index 100%
rename from basis/ui/tools/listener/history/authors.txt
rename to ffi/windows/uniscribe/authors.txt
diff --git a/basis/windows/platforms.txt b/ffi/windows/uniscribe/platforms.txt
similarity index 100%
rename from basis/windows/platforms.txt
rename to ffi/windows/uniscribe/platforms.txt
diff --git a/basis/windows/uniscribe/summary.txt b/ffi/windows/uniscribe/summary.txt
similarity index 100%
rename from basis/windows/uniscribe/summary.txt
rename to ffi/windows/uniscribe/summary.txt
diff --git a/basis/windows/uniscribe/uniscribe.factor b/ffi/windows/uniscribe/uniscribe.factor
similarity index 100%
rename from basis/windows/uniscribe/uniscribe.factor
rename to ffi/windows/uniscribe/uniscribe.factor
diff --git a/extra/cuda/syntax/authors.txt b/ffi/windows/user32/authors.txt
similarity index 100%
rename from extra/cuda/syntax/authors.txt
rename to ffi/windows/user32/authors.txt
diff --git a/basis/windows/privileges/platforms.txt b/ffi/windows/user32/platforms.txt
similarity index 100%
rename from basis/windows/privileges/platforms.txt
rename to ffi/windows/user32/platforms.txt
diff --git a/basis/windows/user32/user32.factor b/ffi/windows/user32/user32.factor
similarity index 100%
rename from basis/windows/user32/user32.factor
rename to ffi/windows/user32/user32.factor
diff --git a/extra/cuda/utils/authors.txt b/ffi/windows/usp10/authors.txt
similarity index 100%
rename from extra/cuda/utils/authors.txt
rename to ffi/windows/usp10/authors.txt
diff --git a/basis/windows/psapi/platforms.txt b/ffi/windows/usp10/platforms.txt
similarity index 100%
rename from basis/windows/psapi/platforms.txt
rename to ffi/windows/usp10/platforms.txt
diff --git a/basis/x11/xlib/tags.txt b/ffi/windows/usp10/tags.txt
similarity index 100%
rename from basis/x11/xlib/tags.txt
rename to ffi/windows/usp10/tags.txt
diff --git a/basis/windows/usp10/usp10.factor b/ffi/windows/usp10/usp10.factor
similarity index 100%
rename from basis/windows/usp10/usp10.factor
rename to ffi/windows/usp10/usp10.factor
diff --git a/basis/windows/windows.factor b/ffi/windows/windows.factor
similarity index 100%
rename from basis/windows/windows.factor
rename to ffi/windows/windows.factor
diff --git a/extra/curses/authors.txt b/ffi/windows/winmm/authors.txt
similarity index 100%
rename from extra/curses/authors.txt
rename to ffi/windows/winmm/authors.txt
diff --git a/basis/windows/registry/platforms.txt b/ffi/windows/winmm/platforms.txt
similarity index 100%
rename from basis/windows/registry/platforms.txt
rename to ffi/windows/winmm/platforms.txt
diff --git a/basis/windows/winmm/winmm.factor b/ffi/windows/winmm/winmm.factor
similarity index 100%
rename from basis/windows/winmm/winmm.factor
rename to ffi/windows/winmm/winmm.factor
diff --git a/basis/windows/winsock/32/32.factor b/ffi/windows/winsock/32/32.factor
similarity index 100%
rename from basis/windows/winsock/32/32.factor
rename to ffi/windows/winsock/32/32.factor
diff --git a/basis/windows/winsock/64/64.factor b/ffi/windows/winsock/64/64.factor
similarity index 100%
rename from basis/windows/winsock/64/64.factor
rename to ffi/windows/winsock/64/64.factor
diff --git a/extra/dns/authors.txt b/ffi/windows/winsock/authors.txt
similarity index 100%
rename from extra/dns/authors.txt
rename to ffi/windows/winsock/authors.txt
diff --git a/basis/windows/shell32/platforms.txt b/ffi/windows/winsock/platforms.txt
similarity index 100%
rename from basis/windows/shell32/platforms.txt
rename to ffi/windows/winsock/platforms.txt
diff --git a/basis/windows/winsock/winsock-tests.factor b/ffi/windows/winsock/winsock-tests.factor
similarity index 100%
rename from basis/windows/winsock/winsock-tests.factor
rename to ffi/windows/winsock/winsock-tests.factor
diff --git a/basis/windows/winsock/winsock.factor b/ffi/windows/winsock/winsock.factor
similarity index 100%
rename from basis/windows/winsock/winsock.factor
rename to ffi/windows/winsock/winsock.factor
diff --git a/basis/x11/authors.txt b/ffi/x11/authors.txt
similarity index 100%
rename from basis/x11/authors.txt
rename to ffi/x11/authors.txt
diff --git a/basis/x11/clipboard/authors.txt b/ffi/x11/clipboard/authors.txt
similarity index 100%
rename from basis/x11/clipboard/authors.txt
rename to ffi/x11/clipboard/authors.txt
diff --git a/basis/x11/clipboard/clipboard.factor b/ffi/x11/clipboard/clipboard.factor
similarity index 100%
rename from basis/x11/clipboard/clipboard.factor
rename to ffi/x11/clipboard/clipboard.factor
diff --git a/basis/x11/clipboard/summary.txt b/ffi/x11/clipboard/summary.txt
similarity index 100%
rename from basis/x11/clipboard/summary.txt
rename to ffi/x11/clipboard/summary.txt
diff --git a/basis/x11/constants/authors.txt b/ffi/x11/constants/authors.txt
similarity index 100%
rename from basis/x11/constants/authors.txt
rename to ffi/x11/constants/authors.txt
diff --git a/basis/x11/constants/constants.factor b/ffi/x11/constants/constants.factor
similarity index 100%
rename from basis/x11/constants/constants.factor
rename to ffi/x11/constants/constants.factor
diff --git a/basis/x11/constants/summary.txt b/ffi/x11/constants/summary.txt
similarity index 100%
rename from basis/x11/constants/summary.txt
rename to ffi/x11/constants/summary.txt
diff --git a/basis/x11/events/authors.txt b/ffi/x11/events/authors.txt
similarity index 100%
rename from basis/x11/events/authors.txt
rename to ffi/x11/events/authors.txt
diff --git a/basis/x11/events/events.factor b/ffi/x11/events/events.factor
similarity index 100%
rename from basis/x11/events/events.factor
rename to ffi/x11/events/events.factor
diff --git a/basis/x11/events/summary.txt b/ffi/x11/events/summary.txt
similarity index 100%
rename from basis/x11/events/summary.txt
rename to ffi/x11/events/summary.txt
diff --git a/basis/x11/glx/authors.txt b/ffi/x11/glx/authors.txt
similarity index 100%
rename from basis/x11/glx/authors.txt
rename to ffi/x11/glx/authors.txt
diff --git a/basis/x11/glx/glx.factor b/ffi/x11/glx/glx.factor
similarity index 100%
rename from basis/x11/glx/glx.factor
rename to ffi/x11/glx/glx.factor
diff --git a/basis/x11/glx/summary.txt b/ffi/x11/glx/summary.txt
similarity index 100%
rename from basis/x11/glx/summary.txt
rename to ffi/x11/glx/summary.txt
diff --git a/extra/clutter/tags.txt b/ffi/x11/glx/tags.txt
similarity index 100%
rename from extra/clutter/tags.txt
rename to ffi/x11/glx/tags.txt
diff --git a/basis/ui/tools/listener/popups/authors.txt b/ffi/x11/io/authors.txt
similarity index 100%
rename from basis/ui/tools/listener/popups/authors.txt
rename to ffi/x11/io/authors.txt
diff --git a/basis/x11/io/io.factor b/ffi/x11/io/io.factor
similarity index 100%
rename from basis/x11/io/io.factor
rename to ffi/x11/io/io.factor
diff --git a/basis/windows/offscreen/authors.txt b/ffi/x11/io/unix/authors.txt
similarity index 100%
rename from basis/windows/offscreen/authors.txt
rename to ffi/x11/io/unix/authors.txt
diff --git a/extra/build-support/platforms.txt b/ffi/x11/io/unix/platforms.txt
similarity index 100%
rename from extra/build-support/platforms.txt
rename to ffi/x11/io/unix/platforms.txt
diff --git a/basis/x11/io/unix/unix.factor b/ffi/x11/io/unix/unix.factor
similarity index 100%
rename from basis/x11/io/unix/unix.factor
rename to ffi/x11/io/unix/unix.factor
diff --git a/basis/x11/summary.txt b/ffi/x11/summary.txt
similarity index 100%
rename from basis/x11/summary.txt
rename to ffi/x11/summary.txt
diff --git a/basis/windows/uniscribe/authors.txt b/ffi/x11/syntax/authors.txt
similarity index 100%
rename from basis/windows/uniscribe/authors.txt
rename to ffi/x11/syntax/authors.txt
diff --git a/basis/x11/syntax/syntax.factor b/ffi/x11/syntax/syntax.factor
similarity index 100%
rename from basis/x11/syntax/syntax.factor
rename to ffi/x11/syntax/syntax.factor
diff --git a/extra/freetype/tags.txt b/ffi/x11/tags.txt
similarity index 100%
rename from extra/freetype/tags.txt
rename to ffi/x11/tags.txt
diff --git a/basis/x11/windows/authors.txt b/ffi/x11/windows/authors.txt
similarity index 100%
rename from basis/x11/windows/authors.txt
rename to ffi/x11/windows/authors.txt
diff --git a/basis/x11/windows/summary.txt b/ffi/x11/windows/summary.txt
similarity index 100%
rename from basis/x11/windows/summary.txt
rename to ffi/x11/windows/summary.txt
diff --git a/basis/x11/windows/windows.factor b/ffi/x11/windows/windows.factor
similarity index 100%
rename from basis/x11/windows/windows.factor
rename to ffi/x11/windows/windows.factor
diff --git a/basis/x11/x11.factor b/ffi/x11/x11.factor
similarity index 100%
rename from basis/x11/x11.factor
rename to ffi/x11/x11.factor
diff --git a/basis/specialized-vectors/mirrors/authors.txt b/ffi/x11/xim/authors.txt
similarity index 100%
rename from basis/specialized-vectors/mirrors/authors.txt
rename to ffi/x11/xim/authors.txt
diff --git a/basis/x11/xim/summary.txt b/ffi/x11/xim/summary.txt
similarity index 100%
rename from basis/x11/xim/summary.txt
rename to ffi/x11/xim/summary.txt
diff --git a/extra/opengl/glu/tags.txt b/ffi/x11/xim/tags.txt
similarity index 100%
rename from extra/opengl/glu/tags.txt
rename to ffi/x11/xim/tags.txt
diff --git a/basis/x11/xim/xim.factor b/ffi/x11/xim/xim.factor
similarity index 100%
rename from basis/x11/xim/xim.factor
rename to ffi/x11/xim/xim.factor
diff --git a/basis/x11/xinput2/authors.txt b/ffi/x11/xinput2/authors.txt
similarity index 100%
rename from basis/x11/xinput2/authors.txt
rename to ffi/x11/xinput2/authors.txt
diff --git a/basis/x11/xinput2/constants/authors.txt b/ffi/x11/xinput2/constants/authors.txt
similarity index 100%
rename from basis/x11/xinput2/constants/authors.txt
rename to ffi/x11/xinput2/constants/authors.txt
diff --git a/basis/x11/xinput2/constants/constants.factor b/ffi/x11/xinput2/constants/constants.factor
similarity index 100%
rename from basis/x11/xinput2/constants/constants.factor
rename to ffi/x11/xinput2/constants/constants.factor
diff --git a/basis/x11/xinput2/ffi/authors.txt b/ffi/x11/xinput2/ffi/authors.txt
similarity index 100%
rename from basis/x11/xinput2/ffi/authors.txt
rename to ffi/x11/xinput2/ffi/authors.txt
diff --git a/basis/x11/xinput2/ffi/ffi.factor b/ffi/x11/xinput2/ffi/ffi.factor
similarity index 100%
rename from basis/x11/xinput2/ffi/ffi.factor
rename to ffi/x11/xinput2/ffi/ffi.factor
diff --git a/basis/x11/xinput2/xinput2.factor b/ffi/x11/xinput2/xinput2.factor
similarity index 100%
rename from basis/x11/xinput2/xinput2.factor
rename to ffi/x11/xinput2/xinput2.factor
diff --git a/basis/x11/xlib/authors.txt b/ffi/x11/xlib/authors.txt
similarity index 100%
rename from basis/x11/xlib/authors.txt
rename to ffi/x11/xlib/authors.txt
diff --git a/basis/x11/xlib/summary.txt b/ffi/x11/xlib/summary.txt
similarity index 100%
rename from basis/x11/xlib/summary.txt
rename to ffi/x11/xlib/summary.txt
diff --git a/extra/readline/tags.txt b/ffi/x11/xlib/tags.txt
similarity index 100%
rename from extra/readline/tags.txt
rename to ffi/x11/xlib/tags.txt
diff --git a/basis/x11/xlib/xlib.factor b/ffi/x11/xlib/xlib.factor
similarity index 100%
rename from basis/x11/xlib/xlib.factor
rename to ffi/x11/xlib/xlib.factor
diff --git a/extra/dns/unix/authors.txt b/frameworks/db/authors.txt
similarity index 100%
rename from extra/dns/unix/authors.txt
rename to frameworks/db/authors.txt
diff --git a/basis/db/db-docs.factor b/frameworks/db/db-docs.factor
similarity index 100%
rename from basis/db/db-docs.factor
rename to frameworks/db/db-docs.factor
diff --git a/basis/db/db-tests.factor b/frameworks/db/db-tests.factor
similarity index 100%
rename from basis/db/db-tests.factor
rename to frameworks/db/db-tests.factor
diff --git a/basis/db/db.factor b/frameworks/db/db.factor
similarity index 100%
rename from basis/db/db.factor
rename to frameworks/db/db.factor
diff --git a/basis/db/errors/errors.factor b/frameworks/db/errors/errors.factor
similarity index 100%
rename from basis/db/errors/errors.factor
rename to frameworks/db/errors/errors.factor
diff --git a/basis/db/errors/summary.txt b/frameworks/db/errors/summary.txt
similarity index 100%
rename from basis/db/errors/summary.txt
rename to frameworks/db/errors/summary.txt
diff --git a/basis/db/pools/pools-tests.factor b/frameworks/db/pools/pools-tests.factor
similarity index 100%
rename from basis/db/pools/pools-tests.factor
rename to frameworks/db/pools/pools-tests.factor
diff --git a/basis/db/pools/pools.factor b/frameworks/db/pools/pools.factor
similarity index 100%
rename from basis/db/pools/pools.factor
rename to frameworks/db/pools/pools.factor
diff --git a/basis/db/pools/summary.txt b/frameworks/db/pools/summary.txt
similarity index 100%
rename from basis/db/pools/summary.txt
rename to frameworks/db/pools/summary.txt
diff --git a/extra/dns/windows/authors.txt b/frameworks/db/postgresql/authors.txt
similarity index 100%
rename from extra/dns/windows/authors.txt
rename to frameworks/db/postgresql/authors.txt
diff --git a/extra/assoc-heaps/authors.txt b/frameworks/db/postgresql/errors/authors.txt
similarity index 100%
rename from extra/assoc-heaps/authors.txt
rename to frameworks/db/postgresql/errors/authors.txt
diff --git a/basis/db/postgresql/errors/errors-tests.factor b/frameworks/db/postgresql/errors/errors-tests.factor
similarity index 100%
rename from basis/db/postgresql/errors/errors-tests.factor
rename to frameworks/db/postgresql/errors/errors-tests.factor
diff --git a/basis/db/postgresql/errors/errors.factor b/frameworks/db/postgresql/errors/errors.factor
similarity index 100%
rename from basis/db/postgresql/errors/errors.factor
rename to frameworks/db/postgresql/errors/errors.factor
diff --git a/basis/db/postgresql/ffi/ffi.factor b/frameworks/db/postgresql/ffi/ffi.factor
similarity index 100%
rename from basis/db/postgresql/ffi/ffi.factor
rename to frameworks/db/postgresql/ffi/ffi.factor
diff --git a/basis/db/postgresql/lib/lib.factor b/frameworks/db/postgresql/lib/lib.factor
similarity index 100%
rename from basis/db/postgresql/lib/lib.factor
rename to frameworks/db/postgresql/lib/lib.factor
diff --git a/basis/db/postgresql/postgresql-tests.factor b/frameworks/db/postgresql/postgresql-tests.factor
similarity index 100%
rename from basis/db/postgresql/postgresql-tests.factor
rename to frameworks/db/postgresql/postgresql-tests.factor
diff --git a/basis/db/postgresql/postgresql.factor b/frameworks/db/postgresql/postgresql.factor
similarity index 100%
rename from basis/db/postgresql/postgresql.factor
rename to frameworks/db/postgresql/postgresql.factor
diff --git a/basis/db/postgresql/summary.txt b/frameworks/db/postgresql/summary.txt
similarity index 100%
rename from basis/db/postgresql/summary.txt
rename to frameworks/db/postgresql/summary.txt
diff --git a/basis/db/queries/queries.factor b/frameworks/db/queries/queries.factor
similarity index 100%
rename from basis/db/queries/queries.factor
rename to frameworks/db/queries/queries.factor
diff --git a/basis/db/queries/summary.txt b/frameworks/db/queries/summary.txt
similarity index 100%
rename from basis/db/queries/summary.txt
rename to frameworks/db/queries/summary.txt
diff --git a/basis/db/sqlite/authors.txt b/frameworks/db/sqlite/authors.txt
similarity index 100%
rename from basis/db/sqlite/authors.txt
rename to frameworks/db/sqlite/authors.txt
diff --git a/extra/benchmark/chameneos-redux/authors.txt b/frameworks/db/sqlite/errors/authors.txt
similarity index 100%
rename from extra/benchmark/chameneos-redux/authors.txt
rename to frameworks/db/sqlite/errors/authors.txt
diff --git a/basis/db/sqlite/errors/errors-tests.factor b/frameworks/db/sqlite/errors/errors-tests.factor
similarity index 100%
rename from basis/db/sqlite/errors/errors-tests.factor
rename to frameworks/db/sqlite/errors/errors-tests.factor
diff --git a/basis/db/sqlite/errors/errors.factor b/frameworks/db/sqlite/errors/errors.factor
similarity index 100%
rename from basis/db/sqlite/errors/errors.factor
rename to frameworks/db/sqlite/errors/errors.factor
diff --git a/basis/db/sqlite/ffi/ffi.factor b/frameworks/db/sqlite/ffi/ffi.factor
similarity index 100%
rename from basis/db/sqlite/ffi/ffi.factor
rename to frameworks/db/sqlite/ffi/ffi.factor
diff --git a/basis/db/sqlite/lib/lib.factor b/frameworks/db/sqlite/lib/lib.factor
similarity index 100%
rename from basis/db/sqlite/lib/lib.factor
rename to frameworks/db/sqlite/lib/lib.factor
diff --git a/basis/db/sqlite/sqlite-tests.factor b/frameworks/db/sqlite/sqlite-tests.factor
similarity index 100%
rename from basis/db/sqlite/sqlite-tests.factor
rename to frameworks/db/sqlite/sqlite-tests.factor
diff --git a/basis/db/sqlite/sqlite.factor b/frameworks/db/sqlite/sqlite.factor
similarity index 100%
rename from basis/db/sqlite/sqlite.factor
rename to frameworks/db/sqlite/sqlite.factor
diff --git a/basis/db/sqlite/summary.txt b/frameworks/db/sqlite/summary.txt
similarity index 100%
rename from basis/db/sqlite/summary.txt
rename to frameworks/db/sqlite/summary.txt
diff --git a/basis/db/sqlite/test.txt b/frameworks/db/sqlite/test.txt
similarity index 100%
rename from basis/db/sqlite/test.txt
rename to frameworks/db/sqlite/test.txt
diff --git a/basis/db/summary.txt b/frameworks/db/summary.txt
similarity index 100%
rename from basis/db/summary.txt
rename to frameworks/db/summary.txt
diff --git a/basis/db/tags.txt b/frameworks/db/tags.txt
similarity index 100%
rename from basis/db/tags.txt
rename to frameworks/db/tags.txt
diff --git a/basis/db/tester/authors.txt b/frameworks/db/tester/authors.txt
similarity index 100%
rename from basis/db/tester/authors.txt
rename to frameworks/db/tester/authors.txt
diff --git a/basis/db/tester/tester-tests.factor b/frameworks/db/tester/tester-tests.factor
similarity index 100%
rename from basis/db/tester/tester-tests.factor
rename to frameworks/db/tester/tester-tests.factor
diff --git a/basis/db/tester/tester.factor b/frameworks/db/tester/tester.factor
similarity index 100%
rename from basis/db/tester/tester.factor
rename to frameworks/db/tester/tester.factor
diff --git a/basis/db/tuples/summary.txt b/frameworks/db/tuples/summary.txt
similarity index 100%
rename from basis/db/tuples/summary.txt
rename to frameworks/db/tuples/summary.txt
diff --git a/basis/db/tuples/tuples-docs.factor b/frameworks/db/tuples/tuples-docs.factor
similarity index 100%
rename from basis/db/tuples/tuples-docs.factor
rename to frameworks/db/tuples/tuples-docs.factor
diff --git a/basis/db/tuples/tuples-tests.factor b/frameworks/db/tuples/tuples-tests.factor
similarity index 100%
rename from basis/db/tuples/tuples-tests.factor
rename to frameworks/db/tuples/tuples-tests.factor
diff --git a/basis/db/tuples/tuples.factor b/frameworks/db/tuples/tuples.factor
similarity index 100%
rename from basis/db/tuples/tuples.factor
rename to frameworks/db/tuples/tuples.factor
diff --git a/basis/db/types/summary.txt b/frameworks/db/types/summary.txt
similarity index 100%
rename from basis/db/types/summary.txt
rename to frameworks/db/types/summary.txt
diff --git a/basis/db/types/types-docs.factor b/frameworks/db/types/types-docs.factor
similarity index 100%
rename from basis/db/types/types-docs.factor
rename to frameworks/db/types/types-docs.factor
diff --git a/basis/db/types/types.factor b/frameworks/db/types/types.factor
similarity index 100%
rename from basis/db/types/types.factor
rename to frameworks/db/types/types.factor
diff --git a/basis/furnace/actions/actions-docs.factor b/frameworks/furnace/actions/actions-docs.factor
similarity index 100%
rename from basis/furnace/actions/actions-docs.factor
rename to frameworks/furnace/actions/actions-docs.factor
diff --git a/basis/furnace/actions/actions-tests.factor b/frameworks/furnace/actions/actions-tests.factor
similarity index 100%
rename from basis/furnace/actions/actions-tests.factor
rename to frameworks/furnace/actions/actions-tests.factor
diff --git a/basis/furnace/actions/actions.factor b/frameworks/furnace/actions/actions.factor
similarity index 100%
rename from basis/furnace/actions/actions.factor
rename to frameworks/furnace/actions/actions.factor
diff --git a/basis/ui/authors.txt b/frameworks/furnace/actions/authors.txt
similarity index 100%
rename from basis/ui/authors.txt
rename to frameworks/furnace/actions/authors.txt
diff --git a/basis/furnace/actions/summary.txt b/frameworks/furnace/actions/summary.txt
similarity index 100%
rename from basis/furnace/actions/summary.txt
rename to frameworks/furnace/actions/summary.txt
diff --git a/basis/furnace/actions/tags.txt b/frameworks/furnace/actions/tags.txt
similarity index 100%
rename from basis/furnace/actions/tags.txt
rename to frameworks/furnace/actions/tags.txt
diff --git a/basis/furnace/alloy/alloy-docs.factor b/frameworks/furnace/alloy/alloy-docs.factor
similarity index 100%
rename from basis/furnace/alloy/alloy-docs.factor
rename to frameworks/furnace/alloy/alloy-docs.factor
diff --git a/basis/furnace/alloy/alloy.factor b/frameworks/furnace/alloy/alloy.factor
similarity index 100%
rename from basis/furnace/alloy/alloy.factor
rename to frameworks/furnace/alloy/alloy.factor
diff --git a/basis/ui/backend/authors.txt b/frameworks/furnace/alloy/authors.txt
similarity index 100%
rename from basis/ui/backend/authors.txt
rename to frameworks/furnace/alloy/authors.txt
diff --git a/basis/furnace/alloy/summary.txt b/frameworks/furnace/alloy/summary.txt
similarity index 100%
rename from basis/furnace/alloy/summary.txt
rename to frameworks/furnace/alloy/summary.txt
diff --git a/basis/furnace/alloy/tags.txt b/frameworks/furnace/alloy/tags.txt
similarity index 100%
rename from basis/furnace/alloy/tags.txt
rename to frameworks/furnace/alloy/tags.txt
diff --git a/basis/furnace/asides/asides-docs.factor b/frameworks/furnace/asides/asides-docs.factor
similarity index 100%
rename from basis/furnace/asides/asides-docs.factor
rename to frameworks/furnace/asides/asides-docs.factor
diff --git a/basis/furnace/asides/asides.factor b/frameworks/furnace/asides/asides.factor
similarity index 100%
rename from basis/furnace/asides/asides.factor
rename to frameworks/furnace/asides/asides.factor
diff --git a/basis/ui/backend/cocoa/authors.txt b/frameworks/furnace/asides/authors.txt
similarity index 100%
rename from basis/ui/backend/cocoa/authors.txt
rename to frameworks/furnace/asides/authors.txt
diff --git a/basis/furnace/asides/summary.txt b/frameworks/furnace/asides/summary.txt
similarity index 100%
rename from basis/furnace/asides/summary.txt
rename to frameworks/furnace/asides/summary.txt
diff --git a/basis/furnace/asides/tags.txt b/frameworks/furnace/asides/tags.txt
similarity index 100%
rename from basis/furnace/asides/tags.txt
rename to frameworks/furnace/asides/tags.txt
diff --git a/basis/furnace/auth/auth-docs.factor b/frameworks/furnace/auth/auth-docs.factor
similarity index 100%
rename from basis/furnace/auth/auth-docs.factor
rename to frameworks/furnace/auth/auth-docs.factor
diff --git a/basis/furnace/auth/auth.factor b/frameworks/furnace/auth/auth.factor
similarity index 100%
rename from basis/furnace/auth/auth.factor
rename to frameworks/furnace/auth/auth.factor
diff --git a/basis/ui/backend/cocoa/tools/authors.txt b/frameworks/furnace/auth/authors.txt
similarity index 100%
rename from basis/ui/backend/cocoa/tools/authors.txt
rename to frameworks/furnace/auth/authors.txt
diff --git a/basis/furnace/auth/basic/basic-docs.factor b/frameworks/furnace/auth/basic/basic-docs.factor
similarity index 100%
rename from basis/furnace/auth/basic/basic-docs.factor
rename to frameworks/furnace/auth/basic/basic-docs.factor
diff --git a/basis/furnace/auth/basic/basic-tests.factor b/frameworks/furnace/auth/basic/basic-tests.factor
similarity index 100%
rename from basis/furnace/auth/basic/basic-tests.factor
rename to frameworks/furnace/auth/basic/basic-tests.factor
diff --git a/basis/furnace/auth/basic/basic.factor b/frameworks/furnace/auth/basic/basic.factor
similarity index 100%
rename from basis/furnace/auth/basic/basic.factor
rename to frameworks/furnace/auth/basic/basic.factor
diff --git a/basis/furnace/auth/basic/summary.txt b/frameworks/furnace/auth/basic/summary.txt
similarity index 100%
rename from basis/furnace/auth/basic/summary.txt
rename to frameworks/furnace/auth/basic/summary.txt
diff --git a/basis/furnace/auth/boilerplate.xml b/frameworks/furnace/auth/boilerplate.xml
similarity index 100%
rename from basis/furnace/auth/boilerplate.xml
rename to frameworks/furnace/auth/boilerplate.xml
diff --git a/basis/ui/backend/cocoa/views/authors.txt b/frameworks/furnace/auth/features/deactivate-user/authors.txt
similarity index 100%
rename from basis/ui/backend/cocoa/views/authors.txt
rename to frameworks/furnace/auth/features/deactivate-user/authors.txt
diff --git a/basis/furnace/auth/features/deactivate-user/deactivate-user-docs.factor b/frameworks/furnace/auth/features/deactivate-user/deactivate-user-docs.factor
similarity index 100%
rename from basis/furnace/auth/features/deactivate-user/deactivate-user-docs.factor
rename to frameworks/furnace/auth/features/deactivate-user/deactivate-user-docs.factor
diff --git a/basis/furnace/auth/features/deactivate-user/deactivate-user.factor b/frameworks/furnace/auth/features/deactivate-user/deactivate-user.factor
similarity index 100%
rename from basis/furnace/auth/features/deactivate-user/deactivate-user.factor
rename to frameworks/furnace/auth/features/deactivate-user/deactivate-user.factor
diff --git a/basis/furnace/auth/features/deactivate-user/summary.txt b/frameworks/furnace/auth/features/deactivate-user/summary.txt
similarity index 100%
rename from basis/furnace/auth/features/deactivate-user/summary.txt
rename to frameworks/furnace/auth/features/deactivate-user/summary.txt
diff --git a/basis/furnace/auth/features/deactivate-user/tags.txt b/frameworks/furnace/auth/features/deactivate-user/tags.txt
similarity index 100%
rename from basis/furnace/auth/features/deactivate-user/tags.txt
rename to frameworks/furnace/auth/features/deactivate-user/tags.txt
diff --git a/basis/ui/backend/x11/authors.txt b/frameworks/furnace/auth/features/edit-profile/authors.txt
similarity index 100%
rename from basis/ui/backend/x11/authors.txt
rename to frameworks/furnace/auth/features/edit-profile/authors.txt
diff --git a/basis/furnace/auth/features/edit-profile/edit-profile-docs.factor b/frameworks/furnace/auth/features/edit-profile/edit-profile-docs.factor
similarity index 100%
rename from basis/furnace/auth/features/edit-profile/edit-profile-docs.factor
rename to frameworks/furnace/auth/features/edit-profile/edit-profile-docs.factor
diff --git a/basis/furnace/auth/features/edit-profile/edit-profile.factor b/frameworks/furnace/auth/features/edit-profile/edit-profile.factor
similarity index 100%
rename from basis/furnace/auth/features/edit-profile/edit-profile.factor
rename to frameworks/furnace/auth/features/edit-profile/edit-profile.factor
diff --git a/basis/furnace/auth/features/edit-profile/edit-profile.xml b/frameworks/furnace/auth/features/edit-profile/edit-profile.xml
similarity index 100%
rename from basis/furnace/auth/features/edit-profile/edit-profile.xml
rename to frameworks/furnace/auth/features/edit-profile/edit-profile.xml
diff --git a/basis/furnace/auth/features/edit-profile/summary.txt b/frameworks/furnace/auth/features/edit-profile/summary.txt
similarity index 100%
rename from basis/furnace/auth/features/edit-profile/summary.txt
rename to frameworks/furnace/auth/features/edit-profile/summary.txt
diff --git a/basis/furnace/auth/features/edit-profile/tags.txt b/frameworks/furnace/auth/features/edit-profile/tags.txt
similarity index 100%
rename from basis/furnace/auth/features/edit-profile/tags.txt
rename to frameworks/furnace/auth/features/edit-profile/tags.txt
diff --git a/basis/ui/clipboards/authors.txt b/frameworks/furnace/auth/features/recover-password/authors.txt
similarity index 100%
rename from basis/ui/clipboards/authors.txt
rename to frameworks/furnace/auth/features/recover-password/authors.txt
diff --git a/basis/furnace/auth/features/recover-password/recover-1.xml b/frameworks/furnace/auth/features/recover-password/recover-1.xml
similarity index 100%
rename from basis/furnace/auth/features/recover-password/recover-1.xml
rename to frameworks/furnace/auth/features/recover-password/recover-1.xml
diff --git a/basis/furnace/auth/features/recover-password/recover-2.xml b/frameworks/furnace/auth/features/recover-password/recover-2.xml
similarity index 100%
rename from basis/furnace/auth/features/recover-password/recover-2.xml
rename to frameworks/furnace/auth/features/recover-password/recover-2.xml
diff --git a/basis/furnace/auth/features/recover-password/recover-3.xml b/frameworks/furnace/auth/features/recover-password/recover-3.xml
similarity index 100%
rename from basis/furnace/auth/features/recover-password/recover-3.xml
rename to frameworks/furnace/auth/features/recover-password/recover-3.xml
diff --git a/basis/furnace/auth/features/recover-password/recover-4.xml b/frameworks/furnace/auth/features/recover-password/recover-4.xml
similarity index 100%
rename from basis/furnace/auth/features/recover-password/recover-4.xml
rename to frameworks/furnace/auth/features/recover-password/recover-4.xml
diff --git a/basis/furnace/auth/features/recover-password/recover-password-docs.factor b/frameworks/furnace/auth/features/recover-password/recover-password-docs.factor
similarity index 100%
rename from basis/furnace/auth/features/recover-password/recover-password-docs.factor
rename to frameworks/furnace/auth/features/recover-password/recover-password-docs.factor
diff --git a/basis/furnace/auth/features/recover-password/recover-password.factor b/frameworks/furnace/auth/features/recover-password/recover-password.factor
similarity index 100%
rename from basis/furnace/auth/features/recover-password/recover-password.factor
rename to frameworks/furnace/auth/features/recover-password/recover-password.factor
diff --git a/basis/furnace/auth/features/recover-password/summary.txt b/frameworks/furnace/auth/features/recover-password/summary.txt
similarity index 100%
rename from basis/furnace/auth/features/recover-password/summary.txt
rename to frameworks/furnace/auth/features/recover-password/summary.txt
diff --git a/basis/furnace/auth/features/recover-password/tags.txt b/frameworks/furnace/auth/features/recover-password/tags.txt
similarity index 100%
rename from basis/furnace/auth/features/recover-password/tags.txt
rename to frameworks/furnace/auth/features/recover-password/tags.txt
diff --git a/basis/ui/commands/authors.txt b/frameworks/furnace/auth/features/registration/authors.txt
similarity index 100%
rename from basis/ui/commands/authors.txt
rename to frameworks/furnace/auth/features/registration/authors.txt
diff --git a/basis/furnace/auth/features/registration/register.xml b/frameworks/furnace/auth/features/registration/register.xml
similarity index 100%
rename from basis/furnace/auth/features/registration/register.xml
rename to frameworks/furnace/auth/features/registration/register.xml
diff --git a/basis/furnace/auth/features/registration/registration-docs.factor b/frameworks/furnace/auth/features/registration/registration-docs.factor
similarity index 100%
rename from basis/furnace/auth/features/registration/registration-docs.factor
rename to frameworks/furnace/auth/features/registration/registration-docs.factor
diff --git a/basis/furnace/auth/features/registration/registration.factor b/frameworks/furnace/auth/features/registration/registration.factor
similarity index 100%
rename from basis/furnace/auth/features/registration/registration.factor
rename to frameworks/furnace/auth/features/registration/registration.factor
diff --git a/basis/furnace/auth/features/registration/summary.txt b/frameworks/furnace/auth/features/registration/summary.txt
similarity index 100%
rename from basis/furnace/auth/features/registration/summary.txt
rename to frameworks/furnace/auth/features/registration/summary.txt
diff --git a/basis/furnace/auth/features/registration/tags.txt b/frameworks/furnace/auth/features/registration/tags.txt
similarity index 100%
rename from basis/furnace/auth/features/registration/tags.txt
rename to frameworks/furnace/auth/features/registration/tags.txt
diff --git a/basis/ui/gadgets/authors.txt b/frameworks/furnace/auth/login/authors.txt
similarity index 100%
rename from basis/ui/gadgets/authors.txt
rename to frameworks/furnace/auth/login/authors.txt
diff --git a/basis/furnace/auth/login/login-docs.factor b/frameworks/furnace/auth/login/login-docs.factor
similarity index 100%
rename from basis/furnace/auth/login/login-docs.factor
rename to frameworks/furnace/auth/login/login-docs.factor
diff --git a/basis/furnace/auth/login/login-tests.factor b/frameworks/furnace/auth/login/login-tests.factor
similarity index 100%
rename from basis/furnace/auth/login/login-tests.factor
rename to frameworks/furnace/auth/login/login-tests.factor
diff --git a/basis/furnace/auth/login/login.factor b/frameworks/furnace/auth/login/login.factor
similarity index 100%
rename from basis/furnace/auth/login/login.factor
rename to frameworks/furnace/auth/login/login.factor
diff --git a/basis/furnace/auth/login/login.xml b/frameworks/furnace/auth/login/login.xml
similarity index 100%
rename from basis/furnace/auth/login/login.xml
rename to frameworks/furnace/auth/login/login.xml
diff --git a/basis/ui/gadgets/books/authors.txt b/frameworks/furnace/auth/login/permits/authors.txt
similarity index 100%
rename from basis/ui/gadgets/books/authors.txt
rename to frameworks/furnace/auth/login/permits/authors.txt
diff --git a/basis/furnace/auth/login/permits/permits.factor b/frameworks/furnace/auth/login/permits/permits.factor
similarity index 100%
rename from basis/furnace/auth/login/permits/permits.factor
rename to frameworks/furnace/auth/login/permits/permits.factor
diff --git a/basis/furnace/auth/login/permits/tags.txt b/frameworks/furnace/auth/login/permits/tags.txt
similarity index 100%
rename from basis/furnace/auth/login/permits/tags.txt
rename to frameworks/furnace/auth/login/permits/tags.txt
diff --git a/basis/furnace/auth/login/summary.txt b/frameworks/furnace/auth/login/summary.txt
similarity index 100%
rename from basis/furnace/auth/login/summary.txt
rename to frameworks/furnace/auth/login/summary.txt
diff --git a/basis/furnace/auth/login/tags.txt b/frameworks/furnace/auth/login/tags.txt
similarity index 100%
rename from basis/furnace/auth/login/tags.txt
rename to frameworks/furnace/auth/login/tags.txt
diff --git a/basis/furnace/auth/providers/assoc/assoc-docs.factor b/frameworks/furnace/auth/providers/assoc/assoc-docs.factor
similarity index 100%
rename from basis/furnace/auth/providers/assoc/assoc-docs.factor
rename to frameworks/furnace/auth/providers/assoc/assoc-docs.factor
diff --git a/basis/furnace/auth/providers/assoc/assoc-tests.factor b/frameworks/furnace/auth/providers/assoc/assoc-tests.factor
similarity index 100%
rename from basis/furnace/auth/providers/assoc/assoc-tests.factor
rename to frameworks/furnace/auth/providers/assoc/assoc-tests.factor
diff --git a/basis/furnace/auth/providers/assoc/assoc.factor b/frameworks/furnace/auth/providers/assoc/assoc.factor
similarity index 100%
rename from basis/furnace/auth/providers/assoc/assoc.factor
rename to frameworks/furnace/auth/providers/assoc/assoc.factor
diff --git a/basis/furnace/auth/providers/assoc/summary.txt b/frameworks/furnace/auth/providers/assoc/summary.txt
similarity index 100%
rename from basis/furnace/auth/providers/assoc/summary.txt
rename to frameworks/furnace/auth/providers/assoc/summary.txt
diff --git a/basis/ui/gadgets/borders/authors.txt b/frameworks/furnace/auth/providers/authors.txt
similarity index 100%
rename from basis/ui/gadgets/borders/authors.txt
rename to frameworks/furnace/auth/providers/authors.txt
diff --git a/basis/furnace/auth/providers/couchdb/couchdb-docs.factor b/frameworks/furnace/auth/providers/couchdb/couchdb-docs.factor
similarity index 100%
rename from basis/furnace/auth/providers/couchdb/couchdb-docs.factor
rename to frameworks/furnace/auth/providers/couchdb/couchdb-docs.factor
diff --git a/basis/furnace/auth/providers/couchdb/couchdb.factor b/frameworks/furnace/auth/providers/couchdb/couchdb.factor
similarity index 100%
rename from basis/furnace/auth/providers/couchdb/couchdb.factor
rename to frameworks/furnace/auth/providers/couchdb/couchdb.factor
diff --git a/basis/ui/gadgets/buttons/authors.txt b/frameworks/furnace/auth/providers/db/authors.txt
similarity index 100%
rename from basis/ui/gadgets/buttons/authors.txt
rename to frameworks/furnace/auth/providers/db/authors.txt
diff --git a/basis/furnace/auth/providers/db/db-docs.factor b/frameworks/furnace/auth/providers/db/db-docs.factor
similarity index 100%
rename from basis/furnace/auth/providers/db/db-docs.factor
rename to frameworks/furnace/auth/providers/db/db-docs.factor
diff --git a/basis/furnace/auth/providers/db/db-tests.factor b/frameworks/furnace/auth/providers/db/db-tests.factor
similarity index 100%
rename from basis/furnace/auth/providers/db/db-tests.factor
rename to frameworks/furnace/auth/providers/db/db-tests.factor
diff --git a/basis/furnace/auth/providers/db/db.factor b/frameworks/furnace/auth/providers/db/db.factor
similarity index 100%
rename from basis/furnace/auth/providers/db/db.factor
rename to frameworks/furnace/auth/providers/db/db.factor
diff --git a/basis/furnace/auth/providers/db/summary.txt b/frameworks/furnace/auth/providers/db/summary.txt
similarity index 100%
rename from basis/furnace/auth/providers/db/summary.txt
rename to frameworks/furnace/auth/providers/db/summary.txt
diff --git a/basis/furnace/auth/providers/db/tags.txt b/frameworks/furnace/auth/providers/db/tags.txt
similarity index 100%
rename from basis/furnace/auth/providers/db/tags.txt
rename to frameworks/furnace/auth/providers/db/tags.txt
diff --git a/basis/furnace/auth/providers/null/null-docs.factor b/frameworks/furnace/auth/providers/null/null-docs.factor
similarity index 100%
rename from basis/furnace/auth/providers/null/null-docs.factor
rename to frameworks/furnace/auth/providers/null/null-docs.factor
diff --git a/basis/furnace/auth/providers/null/null.factor b/frameworks/furnace/auth/providers/null/null.factor
similarity index 100%
rename from basis/furnace/auth/providers/null/null.factor
rename to frameworks/furnace/auth/providers/null/null.factor
diff --git a/basis/furnace/auth/providers/null/summary.txt b/frameworks/furnace/auth/providers/null/summary.txt
similarity index 100%
rename from basis/furnace/auth/providers/null/summary.txt
rename to frameworks/furnace/auth/providers/null/summary.txt
diff --git a/basis/furnace/auth/providers/providers-docs.factor b/frameworks/furnace/auth/providers/providers-docs.factor
similarity index 100%
rename from basis/furnace/auth/providers/providers-docs.factor
rename to frameworks/furnace/auth/providers/providers-docs.factor
diff --git a/basis/furnace/auth/providers/providers.factor b/frameworks/furnace/auth/providers/providers.factor
similarity index 100%
rename from basis/furnace/auth/providers/providers.factor
rename to frameworks/furnace/auth/providers/providers.factor
diff --git a/basis/furnace/auth/providers/summary.txt b/frameworks/furnace/auth/providers/summary.txt
similarity index 100%
rename from basis/furnace/auth/providers/summary.txt
rename to frameworks/furnace/auth/providers/summary.txt
diff --git a/basis/furnace/auth/providers/tags.txt b/frameworks/furnace/auth/providers/tags.txt
similarity index 100%
rename from basis/furnace/auth/providers/tags.txt
rename to frameworks/furnace/auth/providers/tags.txt
diff --git a/basis/furnace/auth/summary.txt b/frameworks/furnace/auth/summary.txt
similarity index 100%
rename from basis/furnace/auth/summary.txt
rename to frameworks/furnace/auth/summary.txt
diff --git a/basis/furnace/auth/tags.txt b/frameworks/furnace/auth/tags.txt
similarity index 100%
rename from basis/furnace/auth/tags.txt
rename to frameworks/furnace/auth/tags.txt
diff --git a/basis/ui/gadgets/canvas/authors.txt b/frameworks/furnace/authors.txt
similarity index 100%
rename from basis/ui/gadgets/canvas/authors.txt
rename to frameworks/furnace/authors.txt
diff --git a/basis/ui/gadgets/editors/authors.txt b/frameworks/furnace/boilerplate/authors.txt
similarity index 100%
rename from basis/ui/gadgets/editors/authors.txt
rename to frameworks/furnace/boilerplate/authors.txt
diff --git a/basis/furnace/boilerplate/boilerplate-docs.factor b/frameworks/furnace/boilerplate/boilerplate-docs.factor
similarity index 100%
rename from basis/furnace/boilerplate/boilerplate-docs.factor
rename to frameworks/furnace/boilerplate/boilerplate-docs.factor
diff --git a/basis/furnace/boilerplate/boilerplate.factor b/frameworks/furnace/boilerplate/boilerplate.factor
similarity index 100%
rename from basis/furnace/boilerplate/boilerplate.factor
rename to frameworks/furnace/boilerplate/boilerplate.factor
diff --git a/basis/furnace/boilerplate/summary.txt b/frameworks/furnace/boilerplate/summary.txt
similarity index 100%
rename from basis/furnace/boilerplate/summary.txt
rename to frameworks/furnace/boilerplate/summary.txt
diff --git a/basis/furnace/boilerplate/tags.txt b/frameworks/furnace/boilerplate/tags.txt
similarity index 100%
rename from basis/furnace/boilerplate/tags.txt
rename to frameworks/furnace/boilerplate/tags.txt
diff --git a/basis/ui/gadgets/frames/authors.txt b/frameworks/furnace/cache/authors.txt
similarity index 100%
rename from basis/ui/gadgets/frames/authors.txt
rename to frameworks/furnace/cache/authors.txt
diff --git a/basis/furnace/cache/cache.factor b/frameworks/furnace/cache/cache.factor
similarity index 100%
rename from basis/furnace/cache/cache.factor
rename to frameworks/furnace/cache/cache.factor
diff --git a/basis/furnace/cache/summary.txt b/frameworks/furnace/cache/summary.txt
similarity index 100%
rename from basis/furnace/cache/summary.txt
rename to frameworks/furnace/cache/summary.txt
diff --git a/basis/furnace/cache/tags.txt b/frameworks/furnace/cache/tags.txt
similarity index 100%
rename from basis/furnace/cache/tags.txt
rename to frameworks/furnace/cache/tags.txt
diff --git a/basis/ui/gadgets/grid-lines/authors.txt b/frameworks/furnace/chloe-tags/authors.txt
similarity index 100%
rename from basis/ui/gadgets/grid-lines/authors.txt
rename to frameworks/furnace/chloe-tags/authors.txt
diff --git a/basis/furnace/chloe-tags/chloe-tags-tests.factor b/frameworks/furnace/chloe-tags/chloe-tags-tests.factor
similarity index 100%
rename from basis/furnace/chloe-tags/chloe-tags-tests.factor
rename to frameworks/furnace/chloe-tags/chloe-tags-tests.factor
diff --git a/basis/furnace/chloe-tags/chloe-tags.factor b/frameworks/furnace/chloe-tags/chloe-tags.factor
similarity index 100%
rename from basis/furnace/chloe-tags/chloe-tags.factor
rename to frameworks/furnace/chloe-tags/chloe-tags.factor
diff --git a/basis/furnace/chloe-tags/summary.txt b/frameworks/furnace/chloe-tags/summary.txt
similarity index 100%
rename from basis/furnace/chloe-tags/summary.txt
rename to frameworks/furnace/chloe-tags/summary.txt
diff --git a/basis/furnace/chloe-tags/tags.txt b/frameworks/furnace/chloe-tags/tags.txt
similarity index 100%
rename from basis/furnace/chloe-tags/tags.txt
rename to frameworks/furnace/chloe-tags/tags.txt
diff --git a/basis/ui/gadgets/grids/authors.txt b/frameworks/furnace/conversations/authors.txt
similarity index 100%
rename from basis/ui/gadgets/grids/authors.txt
rename to frameworks/furnace/conversations/authors.txt
diff --git a/basis/furnace/conversations/conversations-docs.factor b/frameworks/furnace/conversations/conversations-docs.factor
similarity index 100%
rename from basis/furnace/conversations/conversations-docs.factor
rename to frameworks/furnace/conversations/conversations-docs.factor
diff --git a/basis/furnace/conversations/conversations.factor b/frameworks/furnace/conversations/conversations.factor
similarity index 100%
rename from basis/furnace/conversations/conversations.factor
rename to frameworks/furnace/conversations/conversations.factor
diff --git a/basis/furnace/conversations/summary.txt b/frameworks/furnace/conversations/summary.txt
similarity index 100%
rename from basis/furnace/conversations/summary.txt
rename to frameworks/furnace/conversations/summary.txt
diff --git a/basis/furnace/conversations/tags.txt b/frameworks/furnace/conversations/tags.txt
similarity index 100%
rename from basis/furnace/conversations/tags.txt
rename to frameworks/furnace/conversations/tags.txt
diff --git a/basis/ui/gadgets/incremental/authors.txt b/frameworks/furnace/db/authors.txt
similarity index 100%
rename from basis/ui/gadgets/incremental/authors.txt
rename to frameworks/furnace/db/authors.txt
diff --git a/basis/furnace/db/db-docs.factor b/frameworks/furnace/db/db-docs.factor
similarity index 100%
rename from basis/furnace/db/db-docs.factor
rename to frameworks/furnace/db/db-docs.factor
diff --git a/basis/furnace/db/db.factor b/frameworks/furnace/db/db.factor
similarity index 100%
rename from basis/furnace/db/db.factor
rename to frameworks/furnace/db/db.factor
diff --git a/basis/furnace/db/summary.txt b/frameworks/furnace/db/summary.txt
similarity index 100%
rename from basis/furnace/db/summary.txt
rename to frameworks/furnace/db/summary.txt
diff --git a/basis/furnace/db/tags.txt b/frameworks/furnace/db/tags.txt
similarity index 100%
rename from basis/furnace/db/tags.txt
rename to frameworks/furnace/db/tags.txt
diff --git a/basis/furnace/furnace-docs.factor b/frameworks/furnace/furnace-docs.factor
similarity index 100%
rename from basis/furnace/furnace-docs.factor
rename to frameworks/furnace/furnace-docs.factor
diff --git a/basis/furnace/furnace-tests.factor b/frameworks/furnace/furnace-tests.factor
similarity index 100%
rename from basis/furnace/furnace-tests.factor
rename to frameworks/furnace/furnace-tests.factor
diff --git a/basis/furnace/furnace.factor b/frameworks/furnace/furnace.factor
similarity index 100%
rename from basis/furnace/furnace.factor
rename to frameworks/furnace/furnace.factor
diff --git a/basis/furnace/json/json-docs.factor b/frameworks/furnace/json/json-docs.factor
similarity index 100%
rename from basis/furnace/json/json-docs.factor
rename to frameworks/furnace/json/json-docs.factor
diff --git a/basis/furnace/json/json.factor b/frameworks/furnace/json/json.factor
similarity index 100%
rename from basis/furnace/json/json.factor
rename to frameworks/furnace/json/json.factor
diff --git a/basis/furnace/json/summary.txt b/frameworks/furnace/json/summary.txt
similarity index 100%
rename from basis/furnace/json/summary.txt
rename to frameworks/furnace/json/summary.txt
diff --git a/extra/forestdb/ffi/authors.txt b/frameworks/furnace/recaptcha/authors.txt
similarity index 100%
rename from extra/forestdb/ffi/authors.txt
rename to frameworks/furnace/recaptcha/authors.txt
diff --git a/extra/benchmark/e-decimals/authors.txt b/frameworks/furnace/recaptcha/example/authors.txt
similarity index 100%
rename from extra/benchmark/e-decimals/authors.txt
rename to frameworks/furnace/recaptcha/example/authors.txt
diff --git a/basis/furnace/recaptcha/example/example.factor b/frameworks/furnace/recaptcha/example/example.factor
similarity index 100%
rename from basis/furnace/recaptcha/example/example.factor
rename to frameworks/furnace/recaptcha/example/example.factor
diff --git a/basis/furnace/recaptcha/example/example.xml b/frameworks/furnace/recaptcha/example/example.xml
similarity index 100%
rename from basis/furnace/recaptcha/example/example.xml
rename to frameworks/furnace/recaptcha/example/example.xml
diff --git a/basis/furnace/recaptcha/recaptcha-docs.factor b/frameworks/furnace/recaptcha/recaptcha-docs.factor
similarity index 100%
rename from basis/furnace/recaptcha/recaptcha-docs.factor
rename to frameworks/furnace/recaptcha/recaptcha-docs.factor
diff --git a/basis/furnace/recaptcha/recaptcha-tests.factor b/frameworks/furnace/recaptcha/recaptcha-tests.factor
similarity index 100%
rename from basis/furnace/recaptcha/recaptcha-tests.factor
rename to frameworks/furnace/recaptcha/recaptcha-tests.factor
diff --git a/basis/furnace/recaptcha/recaptcha.factor b/frameworks/furnace/recaptcha/recaptcha.factor
similarity index 100%
rename from basis/furnace/recaptcha/recaptcha.factor
rename to frameworks/furnace/recaptcha/recaptcha.factor
diff --git a/basis/furnace/recaptcha/recaptcha.xml b/frameworks/furnace/recaptcha/recaptcha.xml
similarity index 100%
rename from basis/furnace/recaptcha/recaptcha.xml
rename to frameworks/furnace/recaptcha/recaptcha.xml
diff --git a/basis/furnace/recaptcha/summary.txt b/frameworks/furnace/recaptcha/summary.txt
similarity index 100%
rename from basis/furnace/recaptcha/summary.txt
rename to frameworks/furnace/recaptcha/summary.txt
diff --git a/basis/furnace/recaptcha/tags.txt b/frameworks/furnace/recaptcha/tags.txt
similarity index 100%
rename from basis/furnace/recaptcha/tags.txt
rename to frameworks/furnace/recaptcha/tags.txt
diff --git a/basis/ui/gadgets/labeled/authors.txt b/frameworks/furnace/redirection/authors.txt
similarity index 100%
rename from basis/ui/gadgets/labeled/authors.txt
rename to frameworks/furnace/redirection/authors.txt
diff --git a/basis/furnace/redirection/redirection-docs.factor b/frameworks/furnace/redirection/redirection-docs.factor
similarity index 100%
rename from basis/furnace/redirection/redirection-docs.factor
rename to frameworks/furnace/redirection/redirection-docs.factor
diff --git a/basis/furnace/redirection/redirection.factor b/frameworks/furnace/redirection/redirection.factor
similarity index 100%
rename from basis/furnace/redirection/redirection.factor
rename to frameworks/furnace/redirection/redirection.factor
diff --git a/basis/furnace/redirection/summary.txt b/frameworks/furnace/redirection/summary.txt
similarity index 100%
rename from basis/furnace/redirection/summary.txt
rename to frameworks/furnace/redirection/summary.txt
diff --git a/basis/furnace/redirection/tags.txt b/frameworks/furnace/redirection/tags.txt
similarity index 100%
rename from basis/furnace/redirection/tags.txt
rename to frameworks/furnace/redirection/tags.txt
diff --git a/basis/ui/gadgets/labels/authors.txt b/frameworks/furnace/referrer/authors.txt
similarity index 100%
rename from basis/ui/gadgets/labels/authors.txt
rename to frameworks/furnace/referrer/authors.txt
diff --git a/basis/furnace/referrer/referrer-docs.factor b/frameworks/furnace/referrer/referrer-docs.factor
similarity index 100%
rename from basis/furnace/referrer/referrer-docs.factor
rename to frameworks/furnace/referrer/referrer-docs.factor
diff --git a/basis/furnace/referrer/referrer.factor b/frameworks/furnace/referrer/referrer.factor
similarity index 100%
rename from basis/furnace/referrer/referrer.factor
rename to frameworks/furnace/referrer/referrer.factor
diff --git a/basis/furnace/referrer/summary.txt b/frameworks/furnace/referrer/summary.txt
similarity index 100%
rename from basis/furnace/referrer/summary.txt
rename to frameworks/furnace/referrer/summary.txt
diff --git a/basis/furnace/referrer/tags.txt b/frameworks/furnace/referrer/tags.txt
similarity index 100%
rename from basis/furnace/referrer/tags.txt
rename to frameworks/furnace/referrer/tags.txt
diff --git a/basis/ui/gadgets/menus/authors.txt b/frameworks/furnace/scopes/authors.txt
similarity index 100%
rename from basis/ui/gadgets/menus/authors.txt
rename to frameworks/furnace/scopes/authors.txt
diff --git a/basis/furnace/scopes/scopes.factor b/frameworks/furnace/scopes/scopes.factor
similarity index 100%
rename from basis/furnace/scopes/scopes.factor
rename to frameworks/furnace/scopes/scopes.factor
diff --git a/basis/furnace/scopes/summary.txt b/frameworks/furnace/scopes/summary.txt
similarity index 100%
rename from basis/furnace/scopes/summary.txt
rename to frameworks/furnace/scopes/summary.txt
diff --git a/basis/furnace/scopes/tags.txt b/frameworks/furnace/scopes/tags.txt
similarity index 100%
rename from basis/furnace/scopes/tags.txt
rename to frameworks/furnace/scopes/tags.txt
diff --git a/basis/furnace/sessions/authors.txt b/frameworks/furnace/sessions/authors.txt
similarity index 100%
rename from basis/furnace/sessions/authors.txt
rename to frameworks/furnace/sessions/authors.txt
diff --git a/basis/furnace/sessions/sessions-docs.factor b/frameworks/furnace/sessions/sessions-docs.factor
similarity index 100%
rename from basis/furnace/sessions/sessions-docs.factor
rename to frameworks/furnace/sessions/sessions-docs.factor
diff --git a/basis/furnace/sessions/sessions-tests.factor b/frameworks/furnace/sessions/sessions-tests.factor
similarity index 100%
rename from basis/furnace/sessions/sessions-tests.factor
rename to frameworks/furnace/sessions/sessions-tests.factor
diff --git a/basis/furnace/sessions/sessions.factor b/frameworks/furnace/sessions/sessions.factor
similarity index 100%
rename from basis/furnace/sessions/sessions.factor
rename to frameworks/furnace/sessions/sessions.factor
diff --git a/basis/furnace/sessions/summary.txt b/frameworks/furnace/sessions/summary.txt
similarity index 100%
rename from basis/furnace/sessions/summary.txt
rename to frameworks/furnace/sessions/summary.txt
diff --git a/basis/furnace/sessions/tags.txt b/frameworks/furnace/sessions/tags.txt
similarity index 100%
rename from basis/furnace/sessions/tags.txt
rename to frameworks/furnace/sessions/tags.txt
diff --git a/basis/furnace/summary.txt b/frameworks/furnace/summary.txt
similarity index 100%
rename from basis/furnace/summary.txt
rename to frameworks/furnace/summary.txt
diff --git a/basis/ui/gadgets/packs/authors.txt b/frameworks/furnace/syndication/authors.txt
similarity index 100%
rename from basis/ui/gadgets/packs/authors.txt
rename to frameworks/furnace/syndication/authors.txt
diff --git a/basis/furnace/syndication/summary.txt b/frameworks/furnace/syndication/summary.txt
similarity index 100%
rename from basis/furnace/syndication/summary.txt
rename to frameworks/furnace/syndication/summary.txt
diff --git a/basis/furnace/syndication/syndication-docs.factor b/frameworks/furnace/syndication/syndication-docs.factor
similarity index 100%
rename from basis/furnace/syndication/syndication-docs.factor
rename to frameworks/furnace/syndication/syndication-docs.factor
diff --git a/basis/furnace/syndication/syndication.factor b/frameworks/furnace/syndication/syndication.factor
similarity index 100%
rename from basis/furnace/syndication/syndication.factor
rename to frameworks/furnace/syndication/syndication.factor
diff --git a/basis/furnace/syndication/tags.txt b/frameworks/furnace/syndication/tags.txt
similarity index 100%
rename from basis/furnace/syndication/tags.txt
rename to frameworks/furnace/syndication/tags.txt
diff --git a/basis/furnace/tags.txt b/frameworks/furnace/tags.txt
similarity index 100%
rename from basis/furnace/tags.txt
rename to frameworks/furnace/tags.txt
diff --git a/basis/ui/gadgets/panes/authors.txt b/frameworks/furnace/utilities/authors.txt
similarity index 100%
rename from basis/ui/gadgets/panes/authors.txt
rename to frameworks/furnace/utilities/authors.txt
diff --git a/basis/furnace/utilities/summary.txt b/frameworks/furnace/utilities/summary.txt
similarity index 100%
rename from basis/furnace/utilities/summary.txt
rename to frameworks/furnace/utilities/summary.txt
diff --git a/basis/furnace/utilities/tags.txt b/frameworks/furnace/utilities/tags.txt
similarity index 100%
rename from basis/furnace/utilities/tags.txt
rename to frameworks/furnace/utilities/tags.txt
diff --git a/basis/furnace/utilities/utilities-docs.factor b/frameworks/furnace/utilities/utilities-docs.factor
similarity index 100%
rename from basis/furnace/utilities/utilities-docs.factor
rename to frameworks/furnace/utilities/utilities-docs.factor
diff --git a/basis/furnace/utilities/utilities-tests.factor b/frameworks/furnace/utilities/utilities-tests.factor
similarity index 100%
rename from basis/furnace/utilities/utilities-tests.factor
rename to frameworks/furnace/utilities/utilities-tests.factor
diff --git a/basis/furnace/utilities/utilities.factor b/frameworks/furnace/utilities/utilities.factor
similarity index 100%
rename from basis/furnace/utilities/utilities.factor
rename to frameworks/furnace/utilities/utilities.factor
diff --git a/extra/alien/handles/authors.txt b/frameworks/game/input/authors.txt
similarity index 100%
rename from extra/alien/handles/authors.txt
rename to frameworks/game/input/authors.txt
diff --git a/extra/cursors/authors.txt b/frameworks/game/input/dinput/authors.txt
similarity index 100%
rename from extra/cursors/authors.txt
rename to frameworks/game/input/dinput/authors.txt
diff --git a/basis/game/input/dinput/dinput.factor b/frameworks/game/input/dinput/dinput.factor
similarity index 100%
rename from basis/game/input/dinput/dinput.factor
rename to frameworks/game/input/dinput/dinput.factor
diff --git a/basis/game/input/dinput/keys-array/keys-array.factor b/frameworks/game/input/dinput/keys-array/keys-array.factor
similarity index 100%
rename from basis/game/input/dinput/keys-array/keys-array.factor
rename to frameworks/game/input/dinput/keys-array/keys-array.factor
diff --git a/basis/windows/time/platforms.txt b/frameworks/game/input/dinput/platforms.txt
similarity index 100%
rename from basis/windows/time/platforms.txt
rename to frameworks/game/input/dinput/platforms.txt
diff --git a/basis/game/input/dinput/summary.txt b/frameworks/game/input/dinput/summary.txt
similarity index 100%
rename from basis/game/input/dinput/summary.txt
rename to frameworks/game/input/dinput/summary.txt
diff --git a/basis/game/input/dinput/tags.txt b/frameworks/game/input/dinput/tags.txt
similarity index 100%
rename from basis/game/input/dinput/tags.txt
rename to frameworks/game/input/dinput/tags.txt
diff --git a/basis/game/input/gtk/authors.txt b/frameworks/game/input/gtk/authors.txt
similarity index 100%
rename from basis/game/input/gtk/authors.txt
rename to frameworks/game/input/gtk/authors.txt
diff --git a/basis/game/input/gtk/gtk.factor b/frameworks/game/input/gtk/gtk.factor
similarity index 100%
rename from basis/game/input/gtk/gtk.factor
rename to frameworks/game/input/gtk/gtk.factor
diff --git a/basis/unix/statvfs/linux/platforms.txt b/frameworks/game/input/gtk/platforms.txt
similarity index 100%
rename from basis/unix/statvfs/linux/platforms.txt
rename to frameworks/game/input/gtk/platforms.txt
diff --git a/basis/game/input/gtk/summary.txt b/frameworks/game/input/gtk/summary.txt
similarity index 100%
rename from basis/game/input/gtk/summary.txt
rename to frameworks/game/input/gtk/summary.txt
diff --git a/basis/game/input/gtk/tags.txt b/frameworks/game/input/gtk/tags.txt
similarity index 100%
rename from basis/game/input/gtk/tags.txt
rename to frameworks/game/input/gtk/tags.txt
diff --git a/basis/game/input/input-docs.factor b/frameworks/game/input/input-docs.factor
similarity index 100%
rename from basis/game/input/input-docs.factor
rename to frameworks/game/input/input-docs.factor
diff --git a/basis/game/input/input-tests.factor b/frameworks/game/input/input-tests.factor
similarity index 100%
rename from basis/game/input/input-tests.factor
rename to frameworks/game/input/input-tests.factor
diff --git a/basis/game/input/input.factor b/frameworks/game/input/input.factor
similarity index 100%
rename from basis/game/input/input.factor
rename to frameworks/game/input/input.factor
diff --git a/extra/env/authors.txt b/frameworks/game/input/iokit/authors.txt
similarity index 100%
rename from extra/env/authors.txt
rename to frameworks/game/input/iokit/authors.txt
diff --git a/basis/game/input/iokit/iokit.factor b/frameworks/game/input/iokit/iokit.factor
similarity index 100%
rename from basis/game/input/iokit/iokit.factor
rename to frameworks/game/input/iokit/iokit.factor
diff --git a/basis/unix/statvfs/macosx/platforms.txt b/frameworks/game/input/iokit/platforms.txt
similarity index 100%
rename from basis/unix/statvfs/macosx/platforms.txt
rename to frameworks/game/input/iokit/platforms.txt
diff --git a/basis/game/input/iokit/summary.txt b/frameworks/game/input/iokit/summary.txt
similarity index 100%
rename from basis/game/input/iokit/summary.txt
rename to frameworks/game/input/iokit/summary.txt
diff --git a/basis/game/input/iokit/tags.txt b/frameworks/game/input/iokit/tags.txt
similarity index 100%
rename from basis/game/input/iokit/tags.txt
rename to frameworks/game/input/iokit/tags.txt
diff --git a/extra/gpu/authors.txt b/frameworks/game/input/scancodes/authors.txt
similarity index 100%
rename from extra/gpu/authors.txt
rename to frameworks/game/input/scancodes/authors.txt
diff --git a/basis/game/input/scancodes/scancodes.factor b/frameworks/game/input/scancodes/scancodes.factor
similarity index 100%
rename from basis/game/input/scancodes/scancodes.factor
rename to frameworks/game/input/scancodes/scancodes.factor
diff --git a/basis/game/input/scancodes/summary.txt b/frameworks/game/input/scancodes/summary.txt
similarity index 100%
rename from basis/game/input/scancodes/summary.txt
rename to frameworks/game/input/scancodes/summary.txt
diff --git a/basis/game/input/scancodes/tags.txt b/frameworks/game/input/scancodes/tags.txt
similarity index 100%
rename from basis/game/input/scancodes/tags.txt
rename to frameworks/game/input/scancodes/tags.txt
diff --git a/basis/game/input/summary.txt b/frameworks/game/input/summary.txt
similarity index 100%
rename from basis/game/input/summary.txt
rename to frameworks/game/input/summary.txt
diff --git a/basis/game/input/tags.txt b/frameworks/game/input/tags.txt
similarity index 100%
rename from basis/game/input/tags.txt
rename to frameworks/game/input/tags.txt
diff --git a/basis/game/input/x11/authors.txt b/frameworks/game/input/x11/authors.txt
similarity index 100%
rename from basis/game/input/x11/authors.txt
rename to frameworks/game/input/x11/authors.txt
diff --git a/basis/unix/types/linux/platforms.txt b/frameworks/game/input/x11/platforms.txt
similarity index 100%
rename from basis/unix/types/linux/platforms.txt
rename to frameworks/game/input/x11/platforms.txt
diff --git a/basis/game/input/x11/summary.txt b/frameworks/game/input/x11/summary.txt
similarity index 100%
rename from basis/game/input/x11/summary.txt
rename to frameworks/game/input/x11/summary.txt
diff --git a/basis/game/input/x11/tags.txt b/frameworks/game/input/x11/tags.txt
similarity index 100%
rename from basis/game/input/x11/tags.txt
rename to frameworks/game/input/x11/tags.txt
diff --git a/basis/game/input/x11/x11.factor b/frameworks/game/input/x11/x11.factor
similarity index 100%
rename from basis/game/input/x11/x11.factor
rename to frameworks/game/input/x11/x11.factor
diff --git a/extra/fluids/authors.txt b/frameworks/game/input/xinput/authors.txt
similarity index 100%
rename from extra/fluids/authors.txt
rename to frameworks/game/input/xinput/authors.txt
diff --git a/basis/windows/types/platforms.txt b/frameworks/game/input/xinput/platforms.txt
similarity index 100%
rename from basis/windows/types/platforms.txt
rename to frameworks/game/input/xinput/platforms.txt
diff --git a/basis/game/input/xinput/summary.txt b/frameworks/game/input/xinput/summary.txt
similarity index 100%
rename from basis/game/input/xinput/summary.txt
rename to frameworks/game/input/xinput/summary.txt
diff --git a/basis/game/input/xinput/tags.txt b/frameworks/game/input/xinput/tags.txt
similarity index 100%
rename from basis/game/input/xinput/tags.txt
rename to frameworks/game/input/xinput/tags.txt
diff --git a/basis/game/input/xinput/xinput.factor b/frameworks/game/input/xinput/xinput.factor
similarity index 100%
rename from basis/game/input/xinput/xinput.factor
rename to frameworks/game/input/xinput/xinput.factor
diff --git a/extra/gpu/buffers/authors.txt b/frameworks/gpu/authors.txt
similarity index 100%
rename from extra/gpu/buffers/authors.txt
rename to frameworks/gpu/authors.txt
diff --git a/extra/gpu/demos/authors.txt b/frameworks/gpu/buffers/authors.txt
similarity index 100%
rename from extra/gpu/demos/authors.txt
rename to frameworks/gpu/buffers/authors.txt
diff --git a/extra/gpu/buffers/buffers-docs.factor b/frameworks/gpu/buffers/buffers-docs.factor
similarity index 100%
rename from extra/gpu/buffers/buffers-docs.factor
rename to frameworks/gpu/buffers/buffers-docs.factor
diff --git a/extra/gpu/buffers/buffers.factor b/frameworks/gpu/buffers/buffers.factor
similarity index 100%
rename from extra/gpu/buffers/buffers.factor
rename to frameworks/gpu/buffers/buffers.factor
diff --git a/extra/gpu/buffers/summary.txt b/frameworks/gpu/buffers/summary.txt
similarity index 100%
rename from extra/gpu/buffers/summary.txt
rename to frameworks/gpu/buffers/summary.txt
diff --git a/extra/gpu/demos/raytrace/authors.txt b/frameworks/gpu/demos/authors.txt
similarity index 100%
rename from extra/gpu/demos/raytrace/authors.txt
rename to frameworks/gpu/demos/authors.txt
diff --git a/extra/gpu/demos/bunny/authors.txt b/frameworks/gpu/demos/bunny/authors.txt
similarity index 100%
rename from extra/gpu/demos/bunny/authors.txt
rename to frameworks/gpu/demos/bunny/authors.txt
diff --git a/extra/gpu/demos/bunny/bunny.f.glsl b/frameworks/gpu/demos/bunny/bunny.f.glsl
similarity index 100%
rename from extra/gpu/demos/bunny/bunny.f.glsl
rename to frameworks/gpu/demos/bunny/bunny.f.glsl
diff --git a/extra/gpu/demos/bunny/bunny.factor b/frameworks/gpu/demos/bunny/bunny.factor
similarity index 100%
rename from extra/gpu/demos/bunny/bunny.factor
rename to frameworks/gpu/demos/bunny/bunny.factor
diff --git a/extra/gpu/demos/bunny/bunny.v.glsl b/frameworks/gpu/demos/bunny/bunny.v.glsl
similarity index 100%
rename from extra/gpu/demos/bunny/bunny.v.glsl
rename to frameworks/gpu/demos/bunny/bunny.v.glsl
diff --git a/extra/gpu/demos/bunny/deploy.factor b/frameworks/gpu/demos/bunny/deploy.factor
similarity index 100%
rename from extra/gpu/demos/bunny/deploy.factor
rename to frameworks/gpu/demos/bunny/deploy.factor
diff --git a/extra/gpu/demos/bunny/icon.icns b/frameworks/gpu/demos/bunny/icon.icns
similarity index 100%
rename from extra/gpu/demos/bunny/icon.icns
rename to frameworks/gpu/demos/bunny/icon.icns
diff --git a/extra/gpu/demos/bunny/icon.ico b/frameworks/gpu/demos/bunny/icon.ico
similarity index 100%
rename from extra/gpu/demos/bunny/icon.ico
rename to frameworks/gpu/demos/bunny/icon.ico
diff --git a/extra/gpu/demos/bunny/loading.f.glsl b/frameworks/gpu/demos/bunny/loading.f.glsl
similarity index 100%
rename from extra/gpu/demos/bunny/loading.f.glsl
rename to frameworks/gpu/demos/bunny/loading.f.glsl
diff --git a/extra/gpu/demos/bunny/loading.tiff b/frameworks/gpu/demos/bunny/loading.tiff
similarity index 100%
rename from extra/gpu/demos/bunny/loading.tiff
rename to frameworks/gpu/demos/bunny/loading.tiff
diff --git a/extra/gpu/demos/bunny/resources.txt b/frameworks/gpu/demos/bunny/resources.txt
similarity index 100%
rename from extra/gpu/demos/bunny/resources.txt
rename to frameworks/gpu/demos/bunny/resources.txt
diff --git a/extra/gpu/demos/bunny/sobel.f.glsl b/frameworks/gpu/demos/bunny/sobel.f.glsl
similarity index 100%
rename from extra/gpu/demos/bunny/sobel.f.glsl
rename to frameworks/gpu/demos/bunny/sobel.f.glsl
diff --git a/extra/gpu/demos/bunny/summary.txt b/frameworks/gpu/demos/bunny/summary.txt
similarity index 100%
rename from extra/gpu/demos/bunny/summary.txt
rename to frameworks/gpu/demos/bunny/summary.txt
diff --git a/extra/talks/galois-talk/tags.txt b/frameworks/gpu/demos/bunny/tags.txt
similarity index 100%
rename from extra/talks/galois-talk/tags.txt
rename to frameworks/gpu/demos/bunny/tags.txt
diff --git a/extra/gpu/demos/bunny/window.v.glsl b/frameworks/gpu/demos/bunny/window.v.glsl
similarity index 100%
rename from extra/gpu/demos/bunny/window.v.glsl
rename to frameworks/gpu/demos/bunny/window.v.glsl
diff --git a/extra/gpu/framebuffers/authors.txt b/frameworks/gpu/demos/raytrace/authors.txt
similarity index 100%
rename from extra/gpu/framebuffers/authors.txt
rename to frameworks/gpu/demos/raytrace/authors.txt
diff --git a/extra/gpu/demos/raytrace/deploy.factor b/frameworks/gpu/demos/raytrace/deploy.factor
similarity index 100%
rename from extra/gpu/demos/raytrace/deploy.factor
rename to frameworks/gpu/demos/raytrace/deploy.factor
diff --git a/extra/gpu/demos/raytrace/green-ball.aiff b/frameworks/gpu/demos/raytrace/green-ball.aiff
similarity index 100%
rename from extra/gpu/demos/raytrace/green-ball.aiff
rename to frameworks/gpu/demos/raytrace/green-ball.aiff
diff --git a/extra/gpu/demos/raytrace/icon.icns b/frameworks/gpu/demos/raytrace/icon.icns
similarity index 100%
rename from extra/gpu/demos/raytrace/icon.icns
rename to frameworks/gpu/demos/raytrace/icon.icns
diff --git a/extra/gpu/demos/raytrace/icon.ico b/frameworks/gpu/demos/raytrace/icon.ico
similarity index 100%
rename from extra/gpu/demos/raytrace/icon.ico
rename to frameworks/gpu/demos/raytrace/icon.ico
diff --git a/extra/gpu/demos/raytrace/mirror-ball.aiff b/frameworks/gpu/demos/raytrace/mirror-ball.aiff
similarity index 100%
rename from extra/gpu/demos/raytrace/mirror-ball.aiff
rename to frameworks/gpu/demos/raytrace/mirror-ball.aiff
diff --git a/extra/gpu/demos/raytrace/raytrace.f.glsl b/frameworks/gpu/demos/raytrace/raytrace.f.glsl
similarity index 100%
rename from extra/gpu/demos/raytrace/raytrace.f.glsl
rename to frameworks/gpu/demos/raytrace/raytrace.f.glsl
diff --git a/extra/gpu/demos/raytrace/raytrace.factor b/frameworks/gpu/demos/raytrace/raytrace.factor
similarity index 100%
rename from extra/gpu/demos/raytrace/raytrace.factor
rename to frameworks/gpu/demos/raytrace/raytrace.factor
diff --git a/extra/gpu/demos/raytrace/raytrace.v.glsl b/frameworks/gpu/demos/raytrace/raytrace.v.glsl
similarity index 100%
rename from extra/gpu/demos/raytrace/raytrace.v.glsl
rename to frameworks/gpu/demos/raytrace/raytrace.v.glsl
diff --git a/extra/gpu/demos/raytrace/red-ball.aiff b/frameworks/gpu/demos/raytrace/red-ball.aiff
similarity index 100%
rename from extra/gpu/demos/raytrace/red-ball.aiff
rename to frameworks/gpu/demos/raytrace/red-ball.aiff
diff --git a/extra/gpu/demos/raytrace/resources.txt b/frameworks/gpu/demos/raytrace/resources.txt
similarity index 100%
rename from extra/gpu/demos/raytrace/resources.txt
rename to frameworks/gpu/demos/raytrace/resources.txt
diff --git a/extra/gpu/demos/raytrace/summary.txt b/frameworks/gpu/demos/raytrace/summary.txt
similarity index 100%
rename from extra/gpu/demos/raytrace/summary.txt
rename to frameworks/gpu/demos/raytrace/summary.txt
diff --git a/extra/talks/google-tech-talk/tags.txt b/frameworks/gpu/demos/raytrace/tags.txt
similarity index 100%
rename from extra/talks/google-tech-talk/tags.txt
rename to frameworks/gpu/demos/raytrace/tags.txt
diff --git a/extra/gpu/demos/raytrace/yellow-ball.aiff b/frameworks/gpu/demos/raytrace/yellow-ball.aiff
similarity index 100%
rename from extra/gpu/demos/raytrace/yellow-ball.aiff
rename to frameworks/gpu/demos/raytrace/yellow-ball.aiff
diff --git a/extra/gpu/demos/summary.txt b/frameworks/gpu/demos/summary.txt
similarity index 100%
rename from extra/gpu/demos/summary.txt
rename to frameworks/gpu/demos/summary.txt
diff --git a/extra/gpu/effects/blur/authors.txt b/frameworks/gpu/effects/blur/authors.txt
similarity index 100%
rename from extra/gpu/effects/blur/authors.txt
rename to frameworks/gpu/effects/blur/authors.txt
diff --git a/extra/gpu/effects/blur/blur.factor b/frameworks/gpu/effects/blur/blur.factor
similarity index 100%
rename from extra/gpu/effects/blur/blur.factor
rename to frameworks/gpu/effects/blur/blur.factor
diff --git a/extra/gpu/effects/blur/summary.txt b/frameworks/gpu/effects/blur/summary.txt
similarity index 100%
rename from extra/gpu/effects/blur/summary.txt
rename to frameworks/gpu/effects/blur/summary.txt
diff --git a/extra/gpu/effects/step/authors.txt b/frameworks/gpu/effects/step/authors.txt
similarity index 100%
rename from extra/gpu/effects/step/authors.txt
rename to frameworks/gpu/effects/step/authors.txt
diff --git a/extra/gpu/effects/step/step.factor b/frameworks/gpu/effects/step/step.factor
similarity index 100%
rename from extra/gpu/effects/step/step.factor
rename to frameworks/gpu/effects/step/step.factor
diff --git a/extra/gpu/effects/step/summary.txt b/frameworks/gpu/effects/step/summary.txt
similarity index 100%
rename from extra/gpu/effects/step/summary.txt
rename to frameworks/gpu/effects/step/summary.txt
diff --git a/extra/gpu/render/authors.txt b/frameworks/gpu/framebuffers/authors.txt
similarity index 100%
rename from extra/gpu/render/authors.txt
rename to frameworks/gpu/framebuffers/authors.txt
diff --git a/extra/gpu/framebuffers/framebuffers-docs.factor b/frameworks/gpu/framebuffers/framebuffers-docs.factor
similarity index 100%
rename from extra/gpu/framebuffers/framebuffers-docs.factor
rename to frameworks/gpu/framebuffers/framebuffers-docs.factor
diff --git a/extra/gpu/framebuffers/framebuffers.factor b/frameworks/gpu/framebuffers/framebuffers.factor
similarity index 100%
rename from extra/gpu/framebuffers/framebuffers.factor
rename to frameworks/gpu/framebuffers/framebuffers.factor
diff --git a/extra/gpu/framebuffers/summary.txt b/frameworks/gpu/framebuffers/summary.txt
similarity index 100%
rename from extra/gpu/framebuffers/summary.txt
rename to frameworks/gpu/framebuffers/summary.txt
diff --git a/extra/gpu/gpu-docs.factor b/frameworks/gpu/gpu-docs.factor
similarity index 100%
rename from extra/gpu/gpu-docs.factor
rename to frameworks/gpu/gpu-docs.factor
diff --git a/extra/gpu/gpu.factor b/frameworks/gpu/gpu.factor
similarity index 100%
rename from extra/gpu/gpu.factor
rename to frameworks/gpu/gpu.factor
diff --git a/extra/gpu/shaders/authors.txt b/frameworks/gpu/render/authors.txt
similarity index 100%
rename from extra/gpu/shaders/authors.txt
rename to frameworks/gpu/render/authors.txt
diff --git a/extra/gpu/render/render-docs.factor b/frameworks/gpu/render/render-docs.factor
similarity index 100%
rename from extra/gpu/render/render-docs.factor
rename to frameworks/gpu/render/render-docs.factor
diff --git a/extra/gpu/render/render-tests.factor b/frameworks/gpu/render/render-tests.factor
similarity index 100%
rename from extra/gpu/render/render-tests.factor
rename to frameworks/gpu/render/render-tests.factor
diff --git a/extra/gpu/render/render.factor b/frameworks/gpu/render/render.factor
similarity index 100%
rename from extra/gpu/render/render.factor
rename to frameworks/gpu/render/render.factor
diff --git a/extra/gpu/render/summary.txt b/frameworks/gpu/render/summary.txt
similarity index 100%
rename from extra/gpu/render/summary.txt
rename to frameworks/gpu/render/summary.txt
diff --git a/extra/gpu/shaders/prettyprint/authors.txt b/frameworks/gpu/shaders/authors.txt
similarity index 100%
rename from extra/gpu/shaders/prettyprint/authors.txt
rename to frameworks/gpu/shaders/authors.txt
diff --git a/extra/gpu/state/authors.txt b/frameworks/gpu/shaders/prettyprint/authors.txt
similarity index 100%
rename from extra/gpu/state/authors.txt
rename to frameworks/gpu/shaders/prettyprint/authors.txt
diff --git a/extra/gpu/shaders/prettyprint/prettyprint.factor b/frameworks/gpu/shaders/prettyprint/prettyprint.factor
similarity index 100%
rename from extra/gpu/shaders/prettyprint/prettyprint.factor
rename to frameworks/gpu/shaders/prettyprint/prettyprint.factor
diff --git a/extra/gpu/shaders/shaders-docs.factor b/frameworks/gpu/shaders/shaders-docs.factor
similarity index 100%
rename from extra/gpu/shaders/shaders-docs.factor
rename to frameworks/gpu/shaders/shaders-docs.factor
diff --git a/extra/gpu/shaders/shaders-tests.factor b/frameworks/gpu/shaders/shaders-tests.factor
similarity index 100%
rename from extra/gpu/shaders/shaders-tests.factor
rename to frameworks/gpu/shaders/shaders-tests.factor
diff --git a/extra/gpu/shaders/shaders.factor b/frameworks/gpu/shaders/shaders.factor
similarity index 100%
rename from extra/gpu/shaders/shaders.factor
rename to frameworks/gpu/shaders/shaders.factor
diff --git a/extra/gpu/shaders/summary.txt b/frameworks/gpu/shaders/summary.txt
similarity index 100%
rename from extra/gpu/shaders/summary.txt
rename to frameworks/gpu/shaders/summary.txt
diff --git a/extra/gpu/textures/authors.txt b/frameworks/gpu/state/authors.txt
similarity index 100%
rename from extra/gpu/textures/authors.txt
rename to frameworks/gpu/state/authors.txt
diff --git a/extra/gpu/state/state-docs.factor b/frameworks/gpu/state/state-docs.factor
similarity index 100%
rename from extra/gpu/state/state-docs.factor
rename to frameworks/gpu/state/state-docs.factor
diff --git a/extra/gpu/state/state.factor b/frameworks/gpu/state/state.factor
similarity index 100%
rename from extra/gpu/state/state.factor
rename to frameworks/gpu/state/state.factor
diff --git a/extra/gpu/state/summary.txt b/frameworks/gpu/state/summary.txt
similarity index 100%
rename from extra/gpu/state/summary.txt
rename to frameworks/gpu/state/summary.txt
diff --git a/extra/gpu/summary.txt b/frameworks/gpu/summary.txt
similarity index 100%
rename from extra/gpu/summary.txt
rename to frameworks/gpu/summary.txt
diff --git a/extra/gpu/util/authors.txt b/frameworks/gpu/textures/authors.txt
similarity index 100%
rename from extra/gpu/util/authors.txt
rename to frameworks/gpu/textures/authors.txt
diff --git a/extra/gpu/textures/summary.txt b/frameworks/gpu/textures/summary.txt
similarity index 100%
rename from extra/gpu/textures/summary.txt
rename to frameworks/gpu/textures/summary.txt
diff --git a/extra/gpu/textures/textures-docs.factor b/frameworks/gpu/textures/textures-docs.factor
similarity index 100%
rename from extra/gpu/textures/textures-docs.factor
rename to frameworks/gpu/textures/textures-docs.factor
diff --git a/extra/gpu/textures/textures.factor b/frameworks/gpu/textures/textures.factor
similarity index 100%
rename from extra/gpu/textures/textures.factor
rename to frameworks/gpu/textures/textures.factor
diff --git a/extra/gpu/util/wasd/authors.txt b/frameworks/gpu/util/authors.txt
similarity index 100%
rename from extra/gpu/util/wasd/authors.txt
rename to frameworks/gpu/util/authors.txt
diff --git a/extra/gpu/util/summary.txt b/frameworks/gpu/util/summary.txt
similarity index 100%
rename from extra/gpu/util/summary.txt
rename to frameworks/gpu/util/summary.txt
diff --git a/extra/gpu/util/util.factor b/frameworks/gpu/util/util.factor
similarity index 100%
rename from extra/gpu/util/util.factor
rename to frameworks/gpu/util/util.factor
diff --git a/extra/qtkit/authors.txt b/frameworks/gpu/util/wasd/authors.txt
similarity index 100%
rename from extra/qtkit/authors.txt
rename to frameworks/gpu/util/wasd/authors.txt
diff --git a/extra/gpu/util/wasd/summary.txt b/frameworks/gpu/util/wasd/summary.txt
similarity index 100%
rename from extra/gpu/util/wasd/summary.txt
rename to frameworks/gpu/util/wasd/summary.txt
diff --git a/extra/gpu/util/wasd/wasd.factor b/frameworks/gpu/util/wasd/wasd.factor
similarity index 100%
rename from extra/gpu/util/wasd/wasd.factor
rename to frameworks/gpu/util/wasd/wasd.factor
diff --git a/basis/ui/gadgets/paragraphs/authors.txt b/frameworks/ui/authors.txt
similarity index 100%
rename from basis/ui/gadgets/paragraphs/authors.txt
rename to frameworks/ui/authors.txt
diff --git a/basis/ui/gadgets/presentations/authors.txt b/frameworks/ui/backend/authors.txt
similarity index 100%
rename from basis/ui/gadgets/presentations/authors.txt
rename to frameworks/ui/backend/authors.txt
diff --git a/basis/ui/backend/backend.factor b/frameworks/ui/backend/backend.factor
similarity index 100%
rename from basis/ui/backend/backend.factor
rename to frameworks/ui/backend/backend.factor
diff --git a/basis/ui/gadgets/scrollers/authors.txt b/frameworks/ui/backend/cocoa/authors.txt
similarity index 100%
rename from basis/ui/gadgets/scrollers/authors.txt
rename to frameworks/ui/backend/cocoa/authors.txt
diff --git a/basis/ui/backend/cocoa/cocoa.factor b/frameworks/ui/backend/cocoa/cocoa.factor
similarity index 100%
rename from basis/ui/backend/cocoa/cocoa.factor
rename to frameworks/ui/backend/cocoa/cocoa.factor
diff --git a/basis/unix/types/macosx/platforms.txt b/frameworks/ui/backend/cocoa/platforms.txt
similarity index 100%
rename from basis/unix/types/macosx/platforms.txt
rename to frameworks/ui/backend/cocoa/platforms.txt
diff --git a/basis/ui/backend/cocoa/summary.txt b/frameworks/ui/backend/cocoa/summary.txt
similarity index 100%
rename from basis/ui/backend/cocoa/summary.txt
rename to frameworks/ui/backend/cocoa/summary.txt
diff --git a/basis/ui/gadgets/sliders/authors.txt b/frameworks/ui/backend/cocoa/tools/authors.txt
similarity index 100%
rename from basis/ui/gadgets/sliders/authors.txt
rename to frameworks/ui/backend/cocoa/tools/authors.txt
diff --git a/basis/unix/users/macosx/platforms.txt b/frameworks/ui/backend/cocoa/tools/platforms.txt
similarity index 100%
rename from basis/unix/users/macosx/platforms.txt
rename to frameworks/ui/backend/cocoa/tools/platforms.txt
diff --git a/basis/ui/backend/cocoa/tools/summary.txt b/frameworks/ui/backend/cocoa/tools/summary.txt
similarity index 100%
rename from basis/ui/backend/cocoa/tools/summary.txt
rename to frameworks/ui/backend/cocoa/tools/summary.txt
diff --git a/basis/ui/backend/cocoa/tools/tools.factor b/frameworks/ui/backend/cocoa/tools/tools.factor
similarity index 100%
rename from basis/ui/backend/cocoa/tools/tools.factor
rename to frameworks/ui/backend/cocoa/tools/tools.factor
diff --git a/basis/ui/gadgets/slots/authors.txt b/frameworks/ui/backend/cocoa/views/authors.txt
similarity index 100%
rename from basis/ui/gadgets/slots/authors.txt
rename to frameworks/ui/backend/cocoa/views/authors.txt
diff --git a/basis/unix/utmpx/macosx/platforms.txt b/frameworks/ui/backend/cocoa/views/platforms.txt
similarity index 100%
rename from basis/unix/utmpx/macosx/platforms.txt
rename to frameworks/ui/backend/cocoa/views/platforms.txt
diff --git a/basis/ui/backend/cocoa/views/summary.txt b/frameworks/ui/backend/cocoa/views/summary.txt
similarity index 100%
rename from basis/ui/backend/cocoa/views/summary.txt
rename to frameworks/ui/backend/cocoa/views/summary.txt
diff --git a/basis/ui/backend/cocoa/views/views-tests.factor b/frameworks/ui/backend/cocoa/views/views-tests.factor
similarity index 100%
rename from basis/ui/backend/cocoa/views/views-tests.factor
rename to frameworks/ui/backend/cocoa/views/views-tests.factor
diff --git a/basis/ui/backend/cocoa/views/views.factor b/frameworks/ui/backend/cocoa/views/views.factor
similarity index 100%
rename from basis/ui/backend/cocoa/views/views.factor
rename to frameworks/ui/backend/cocoa/views/views.factor
diff --git a/basis/ui/backend/gtk/authors.txt b/frameworks/ui/backend/gtk/authors.txt
similarity index 100%
rename from basis/ui/backend/gtk/authors.txt
rename to frameworks/ui/backend/gtk/authors.txt
diff --git a/basis/ui/backend/gtk/gtk-docs.factor b/frameworks/ui/backend/gtk/gtk-docs.factor
similarity index 100%
rename from basis/ui/backend/gtk/gtk-docs.factor
rename to frameworks/ui/backend/gtk/gtk-docs.factor
diff --git a/basis/ui/backend/gtk/gtk-tests.factor b/frameworks/ui/backend/gtk/gtk-tests.factor
similarity index 100%
rename from basis/ui/backend/gtk/gtk-tests.factor
rename to frameworks/ui/backend/gtk/gtk-tests.factor
diff --git a/basis/ui/backend/gtk/gtk.factor b/frameworks/ui/backend/gtk/gtk.factor
similarity index 100%
rename from basis/ui/backend/gtk/gtk.factor
rename to frameworks/ui/backend/gtk/gtk.factor
diff --git a/basis/ui/backend/gtk/input-methods/authors.txt b/frameworks/ui/backend/gtk/input-methods/authors.txt
similarity index 100%
rename from basis/ui/backend/gtk/input-methods/authors.txt
rename to frameworks/ui/backend/gtk/input-methods/authors.txt
diff --git a/basis/ui/backend/gtk/input-methods/editors/authors.txt b/frameworks/ui/backend/gtk/input-methods/editors/authors.txt
similarity index 100%
rename from basis/ui/backend/gtk/input-methods/editors/authors.txt
rename to frameworks/ui/backend/gtk/input-methods/editors/authors.txt
diff --git a/basis/ui/backend/gtk/input-methods/editors/editors.factor b/frameworks/ui/backend/gtk/input-methods/editors/editors.factor
similarity index 100%
rename from basis/ui/backend/gtk/input-methods/editors/editors.factor
rename to frameworks/ui/backend/gtk/input-methods/editors/editors.factor
diff --git a/basis/ui/backend/gtk/input-methods/input-methods.factor b/frameworks/ui/backend/gtk/input-methods/input-methods.factor
similarity index 100%
rename from basis/ui/backend/gtk/input-methods/input-methods.factor
rename to frameworks/ui/backend/gtk/input-methods/input-methods.factor
diff --git a/basis/ui/backend/gtk/io/authors.txt b/frameworks/ui/backend/gtk/io/authors.txt
similarity index 100%
rename from basis/ui/backend/gtk/io/authors.txt
rename to frameworks/ui/backend/gtk/io/authors.txt
diff --git a/basis/ui/backend/gtk/io/io.factor b/frameworks/ui/backend/gtk/io/io.factor
similarity index 100%
rename from basis/ui/backend/gtk/io/io.factor
rename to frameworks/ui/backend/gtk/io/io.factor
diff --git a/basis/ui/backend/gtk/io/unix/authors.txt b/frameworks/ui/backend/gtk/io/unix/authors.txt
similarity index 100%
rename from basis/ui/backend/gtk/io/unix/authors.txt
rename to frameworks/ui/backend/gtk/io/unix/authors.txt
diff --git a/extra/curl/ffi/platforms.txt b/frameworks/ui/backend/gtk/io/unix/platforms.txt
similarity index 100%
rename from extra/curl/ffi/platforms.txt
rename to frameworks/ui/backend/gtk/io/unix/platforms.txt
diff --git a/basis/ui/backend/gtk/io/unix/unix.factor b/frameworks/ui/backend/gtk/io/unix/unix.factor
similarity index 100%
rename from basis/ui/backend/gtk/io/unix/unix.factor
rename to frameworks/ui/backend/gtk/io/unix/unix.factor
diff --git a/extra/curl/platforms.txt b/frameworks/ui/backend/gtk/platforms.txt
similarity index 100%
rename from extra/curl/platforms.txt
rename to frameworks/ui/backend/gtk/platforms.txt
diff --git a/basis/ui/backend/gtk/summary.txt b/frameworks/ui/backend/gtk/summary.txt
similarity index 100%
rename from basis/ui/backend/gtk/summary.txt
rename to frameworks/ui/backend/gtk/summary.txt
diff --git a/basis/ui/backend/summary.txt b/frameworks/ui/backend/summary.txt
similarity index 100%
rename from basis/ui/backend/summary.txt
rename to frameworks/ui/backend/summary.txt
diff --git a/extra/forestdb/lib/authors.txt b/frameworks/ui/backend/windows/authors.txt
similarity index 100%
rename from extra/forestdb/lib/authors.txt
rename to frameworks/ui/backend/windows/authors.txt
diff --git a/basis/windows/uniscribe/platforms.txt b/frameworks/ui/backend/windows/platforms.txt
similarity index 100%
rename from basis/windows/uniscribe/platforms.txt
rename to frameworks/ui/backend/windows/platforms.txt
diff --git a/basis/ui/backend/windows/windows.factor b/frameworks/ui/backend/windows/windows.factor
similarity index 100%
rename from basis/ui/backend/windows/windows.factor
rename to frameworks/ui/backend/windows/windows.factor
diff --git a/basis/ui/gadgets/status-bar/authors.txt b/frameworks/ui/backend/x11/authors.txt
similarity index 100%
rename from basis/ui/gadgets/status-bar/authors.txt
rename to frameworks/ui/backend/x11/authors.txt
diff --git a/basis/cpu/x86/features/tags.txt b/frameworks/ui/backend/x11/tags.txt
similarity index 100%
rename from basis/cpu/x86/features/tags.txt
rename to frameworks/ui/backend/x11/tags.txt
diff --git a/basis/ui/backend/x11/x11.factor b/frameworks/ui/backend/x11/x11.factor
similarity index 100%
rename from basis/ui/backend/x11/x11.factor
rename to frameworks/ui/backend/x11/x11.factor
diff --git a/basis/x11/io/authors.txt b/frameworks/ui/baseline-alignment/authors.txt
similarity index 100%
rename from basis/x11/io/authors.txt
rename to frameworks/ui/baseline-alignment/authors.txt
diff --git a/basis/ui/baseline-alignment/baseline-alignment-docs.factor b/frameworks/ui/baseline-alignment/baseline-alignment-docs.factor
similarity index 100%
rename from basis/ui/baseline-alignment/baseline-alignment-docs.factor
rename to frameworks/ui/baseline-alignment/baseline-alignment-docs.factor
diff --git a/basis/ui/baseline-alignment/baseline-alignment-tests.factor b/frameworks/ui/baseline-alignment/baseline-alignment-tests.factor
similarity index 100%
rename from basis/ui/baseline-alignment/baseline-alignment-tests.factor
rename to frameworks/ui/baseline-alignment/baseline-alignment-tests.factor
diff --git a/basis/ui/baseline-alignment/baseline-alignment.factor b/frameworks/ui/baseline-alignment/baseline-alignment.factor
similarity index 100%
rename from basis/ui/baseline-alignment/baseline-alignment.factor
rename to frameworks/ui/baseline-alignment/baseline-alignment.factor
diff --git a/basis/ui/gadgets/tracks/authors.txt b/frameworks/ui/clipboards/authors.txt
similarity index 100%
rename from basis/ui/gadgets/tracks/authors.txt
rename to frameworks/ui/clipboards/authors.txt
diff --git a/basis/ui/clipboards/clipboards-docs.factor b/frameworks/ui/clipboards/clipboards-docs.factor
similarity index 100%
rename from basis/ui/clipboards/clipboards-docs.factor
rename to frameworks/ui/clipboards/clipboards-docs.factor
diff --git a/basis/ui/clipboards/clipboards.factor b/frameworks/ui/clipboards/clipboards.factor
similarity index 100%
rename from basis/ui/clipboards/clipboards.factor
rename to frameworks/ui/clipboards/clipboards.factor
diff --git a/basis/ui/clipboards/summary.txt b/frameworks/ui/clipboards/summary.txt
similarity index 100%
rename from basis/ui/clipboards/summary.txt
rename to frameworks/ui/clipboards/summary.txt
diff --git a/basis/ui/gadgets/viewports/authors.txt b/frameworks/ui/commands/authors.txt
similarity index 100%
rename from basis/ui/gadgets/viewports/authors.txt
rename to frameworks/ui/commands/authors.txt
diff --git a/basis/ui/commands/commands-docs.factor b/frameworks/ui/commands/commands-docs.factor
similarity index 100%
rename from basis/ui/commands/commands-docs.factor
rename to frameworks/ui/commands/commands-docs.factor
diff --git a/basis/ui/commands/commands-tests.factor b/frameworks/ui/commands/commands-tests.factor
similarity index 100%
rename from basis/ui/commands/commands-tests.factor
rename to frameworks/ui/commands/commands-tests.factor
diff --git a/basis/ui/commands/commands.factor b/frameworks/ui/commands/commands.factor
similarity index 100%
rename from basis/ui/commands/commands.factor
rename to frameworks/ui/commands/commands.factor
diff --git a/basis/ui/commands/summary.txt b/frameworks/ui/commands/summary.txt
similarity index 100%
rename from basis/ui/commands/summary.txt
rename to frameworks/ui/commands/summary.txt
diff --git a/basis/ui/debugger/debugger.factor b/frameworks/ui/debugger/debugger.factor
similarity index 100%
rename from basis/ui/debugger/debugger.factor
rename to frameworks/ui/debugger/debugger.factor
diff --git a/basis/ui/event-loop/event-loop.factor b/frameworks/ui/event-loop/event-loop.factor
similarity index 100%
rename from basis/ui/event-loop/event-loop.factor
rename to frameworks/ui/event-loop/event-loop.factor
diff --git a/basis/ui/gadgets/worlds/authors.txt b/frameworks/ui/gadgets/authors.txt
similarity index 100%
rename from basis/ui/gadgets/worlds/authors.txt
rename to frameworks/ui/gadgets/authors.txt
diff --git a/extra/ui/gadgets/book-extras/authors.txt b/frameworks/ui/gadgets/book-extras/authors.txt
similarity index 100%
rename from extra/ui/gadgets/book-extras/authors.txt
rename to frameworks/ui/gadgets/book-extras/authors.txt
diff --git a/extra/ui/gadgets/book-extras/book-extras.factor b/frameworks/ui/gadgets/book-extras/book-extras.factor
similarity index 100%
rename from extra/ui/gadgets/book-extras/book-extras.factor
rename to frameworks/ui/gadgets/book-extras/book-extras.factor
diff --git a/extra/ui/gadgets/book-extras/summary.txt b/frameworks/ui/gadgets/book-extras/summary.txt
similarity index 100%
rename from extra/ui/gadgets/book-extras/summary.txt
rename to frameworks/ui/gadgets/book-extras/summary.txt
diff --git a/basis/ui/gestures/authors.txt b/frameworks/ui/gadgets/books/authors.txt
similarity index 100%
rename from basis/ui/gestures/authors.txt
rename to frameworks/ui/gadgets/books/authors.txt
diff --git a/basis/ui/gadgets/books/books-docs.factor b/frameworks/ui/gadgets/books/books-docs.factor
similarity index 100%
rename from basis/ui/gadgets/books/books-docs.factor
rename to frameworks/ui/gadgets/books/books-docs.factor
diff --git a/basis/ui/gadgets/books/books.factor b/frameworks/ui/gadgets/books/books.factor
similarity index 100%
rename from basis/ui/gadgets/books/books.factor
rename to frameworks/ui/gadgets/books/books.factor
diff --git a/basis/ui/gadgets/books/summary.txt b/frameworks/ui/gadgets/books/summary.txt
similarity index 100%
rename from basis/ui/gadgets/books/summary.txt
rename to frameworks/ui/gadgets/books/summary.txt
diff --git a/basis/ui/operations/authors.txt b/frameworks/ui/gadgets/borders/authors.txt
similarity index 100%
rename from basis/ui/operations/authors.txt
rename to frameworks/ui/gadgets/borders/authors.txt
diff --git a/basis/ui/gadgets/borders/borders-docs.factor b/frameworks/ui/gadgets/borders/borders-docs.factor
similarity index 100%
rename from basis/ui/gadgets/borders/borders-docs.factor
rename to frameworks/ui/gadgets/borders/borders-docs.factor
diff --git a/basis/ui/gadgets/borders/borders-tests.factor b/frameworks/ui/gadgets/borders/borders-tests.factor
similarity index 100%
rename from basis/ui/gadgets/borders/borders-tests.factor
rename to frameworks/ui/gadgets/borders/borders-tests.factor
diff --git a/basis/ui/gadgets/borders/borders.factor b/frameworks/ui/gadgets/borders/borders.factor
similarity index 100%
rename from basis/ui/gadgets/borders/borders.factor
rename to frameworks/ui/gadgets/borders/borders.factor
diff --git a/basis/ui/gadgets/borders/summary.txt b/frameworks/ui/gadgets/borders/summary.txt
similarity index 100%
rename from basis/ui/gadgets/borders/summary.txt
rename to frameworks/ui/gadgets/borders/summary.txt
diff --git a/basis/ui/render/authors.txt b/frameworks/ui/gadgets/buttons/authors.txt
similarity index 100%
rename from basis/ui/render/authors.txt
rename to frameworks/ui/gadgets/buttons/authors.txt
diff --git a/basis/ui/gadgets/buttons/buttons-docs.factor b/frameworks/ui/gadgets/buttons/buttons-docs.factor
similarity index 100%
rename from basis/ui/gadgets/buttons/buttons-docs.factor
rename to frameworks/ui/gadgets/buttons/buttons-docs.factor
diff --git a/basis/ui/gadgets/buttons/buttons-tests.factor b/frameworks/ui/gadgets/buttons/buttons-tests.factor
similarity index 100%
rename from basis/ui/gadgets/buttons/buttons-tests.factor
rename to frameworks/ui/gadgets/buttons/buttons-tests.factor
diff --git a/basis/ui/gadgets/buttons/buttons.factor b/frameworks/ui/gadgets/buttons/buttons.factor
similarity index 100%
rename from basis/ui/gadgets/buttons/buttons.factor
rename to frameworks/ui/gadgets/buttons/buttons.factor
diff --git a/basis/ui/gadgets/buttons/summary.txt b/frameworks/ui/gadgets/buttons/summary.txt
similarity index 100%
rename from basis/ui/gadgets/buttons/summary.txt
rename to frameworks/ui/gadgets/buttons/summary.txt
diff --git a/basis/ui/tools/authors.txt b/frameworks/ui/gadgets/canvas/authors.txt
similarity index 100%
rename from basis/ui/tools/authors.txt
rename to frameworks/ui/gadgets/canvas/authors.txt
diff --git a/basis/ui/gadgets/canvas/canvas-tests.factor b/frameworks/ui/gadgets/canvas/canvas-tests.factor
similarity index 100%
rename from basis/ui/gadgets/canvas/canvas-tests.factor
rename to frameworks/ui/gadgets/canvas/canvas-tests.factor
diff --git a/basis/ui/gadgets/canvas/canvas.factor b/frameworks/ui/gadgets/canvas/canvas.factor
similarity index 100%
rename from basis/ui/gadgets/canvas/canvas.factor
rename to frameworks/ui/gadgets/canvas/canvas.factor
diff --git a/basis/ui/gadgets/canvas/summary.txt b/frameworks/ui/gadgets/canvas/summary.txt
similarity index 100%
rename from basis/ui/gadgets/canvas/summary.txt
rename to frameworks/ui/gadgets/canvas/summary.txt
diff --git a/basis/x11/io/unix/authors.txt b/frameworks/ui/gadgets/debug/authors.txt
similarity index 100%
rename from basis/x11/io/unix/authors.txt
rename to frameworks/ui/gadgets/debug/authors.txt
diff --git a/basis/ui/gadgets/debug/debug-tests.factor b/frameworks/ui/gadgets/debug/debug-tests.factor
similarity index 100%
rename from basis/ui/gadgets/debug/debug-tests.factor
rename to frameworks/ui/gadgets/debug/debug-tests.factor
diff --git a/basis/ui/gadgets/debug/debug.factor b/frameworks/ui/gadgets/debug/debug.factor
similarity index 100%
rename from basis/ui/gadgets/debug/debug.factor
rename to frameworks/ui/gadgets/debug/debug.factor
diff --git a/basis/ui/tools/browser/authors.txt b/frameworks/ui/gadgets/editors/authors.txt
similarity index 100%
rename from basis/ui/tools/browser/authors.txt
rename to frameworks/ui/gadgets/editors/authors.txt
diff --git a/basis/ui/gadgets/editors/editors-docs.factor b/frameworks/ui/gadgets/editors/editors-docs.factor
similarity index 100%
rename from basis/ui/gadgets/editors/editors-docs.factor
rename to frameworks/ui/gadgets/editors/editors-docs.factor
diff --git a/basis/ui/gadgets/editors/editors-tests.factor b/frameworks/ui/gadgets/editors/editors-tests.factor
similarity index 100%
rename from basis/ui/gadgets/editors/editors-tests.factor
rename to frameworks/ui/gadgets/editors/editors-tests.factor
diff --git a/basis/ui/gadgets/editors/editors.factor b/frameworks/ui/gadgets/editors/editors.factor
similarity index 100%
rename from basis/ui/gadgets/editors/editors.factor
rename to frameworks/ui/gadgets/editors/editors.factor
diff --git a/basis/ui/gadgets/editors/summary.txt b/frameworks/ui/gadgets/editors/summary.txt
similarity index 100%
rename from basis/ui/gadgets/editors/summary.txt
rename to frameworks/ui/gadgets/editors/summary.txt
diff --git a/basis/ui/tools/debugger/authors.txt b/frameworks/ui/gadgets/frames/authors.txt
similarity index 100%
rename from basis/ui/tools/debugger/authors.txt
rename to frameworks/ui/gadgets/frames/authors.txt
diff --git a/basis/ui/gadgets/frames/frames-docs.factor b/frameworks/ui/gadgets/frames/frames-docs.factor
similarity index 100%
rename from basis/ui/gadgets/frames/frames-docs.factor
rename to frameworks/ui/gadgets/frames/frames-docs.factor
diff --git a/basis/ui/gadgets/frames/frames-tests.factor b/frameworks/ui/gadgets/frames/frames-tests.factor
similarity index 100%
rename from basis/ui/gadgets/frames/frames-tests.factor
rename to frameworks/ui/gadgets/frames/frames-tests.factor
diff --git a/basis/ui/gadgets/frames/frames.factor b/frameworks/ui/gadgets/frames/frames.factor
similarity index 100%
rename from basis/ui/gadgets/frames/frames.factor
rename to frameworks/ui/gadgets/frames/frames.factor
diff --git a/basis/ui/gadgets/frames/summary.txt b/frameworks/ui/gadgets/frames/summary.txt
similarity index 100%
rename from basis/ui/gadgets/frames/summary.txt
rename to frameworks/ui/gadgets/frames/summary.txt
diff --git a/basis/ui/gadgets/gadgets-docs.factor b/frameworks/ui/gadgets/gadgets-docs.factor
similarity index 100%
rename from basis/ui/gadgets/gadgets-docs.factor
rename to frameworks/ui/gadgets/gadgets-docs.factor
diff --git a/basis/ui/gadgets/gadgets-tests.factor b/frameworks/ui/gadgets/gadgets-tests.factor
similarity index 100%
rename from basis/ui/gadgets/gadgets-tests.factor
rename to frameworks/ui/gadgets/gadgets-tests.factor
diff --git a/basis/ui/gadgets/gadgets.factor b/frameworks/ui/gadgets/gadgets.factor
similarity index 100%
rename from basis/ui/gadgets/gadgets.factor
rename to frameworks/ui/gadgets/gadgets.factor
diff --git a/basis/ui/gadgets/glass/glass-docs.factor b/frameworks/ui/gadgets/glass/glass-docs.factor
similarity index 100%
rename from basis/ui/gadgets/glass/glass-docs.factor
rename to frameworks/ui/gadgets/glass/glass-docs.factor
diff --git a/basis/ui/gadgets/glass/glass-tests.factor b/frameworks/ui/gadgets/glass/glass-tests.factor
similarity index 100%
rename from basis/ui/gadgets/glass/glass-tests.factor
rename to frameworks/ui/gadgets/glass/glass-tests.factor
diff --git a/basis/ui/gadgets/glass/glass.factor b/frameworks/ui/gadgets/glass/glass.factor
similarity index 100%
rename from basis/ui/gadgets/glass/glass.factor
rename to frameworks/ui/gadgets/glass/glass.factor
diff --git a/basis/ui/tools/deploy/authors.txt b/frameworks/ui/gadgets/grid-lines/authors.txt
similarity index 100%
rename from basis/ui/tools/deploy/authors.txt
rename to frameworks/ui/gadgets/grid-lines/authors.txt
diff --git a/basis/ui/gadgets/grid-lines/grid-lines-docs.factor b/frameworks/ui/gadgets/grid-lines/grid-lines-docs.factor
similarity index 100%
rename from basis/ui/gadgets/grid-lines/grid-lines-docs.factor
rename to frameworks/ui/gadgets/grid-lines/grid-lines-docs.factor
diff --git a/basis/ui/gadgets/grid-lines/grid-lines-tests.factor b/frameworks/ui/gadgets/grid-lines/grid-lines-tests.factor
similarity index 100%
rename from basis/ui/gadgets/grid-lines/grid-lines-tests.factor
rename to frameworks/ui/gadgets/grid-lines/grid-lines-tests.factor
diff --git a/basis/ui/gadgets/grid-lines/grid-lines.factor b/frameworks/ui/gadgets/grid-lines/grid-lines.factor
similarity index 100%
rename from basis/ui/gadgets/grid-lines/grid-lines.factor
rename to frameworks/ui/gadgets/grid-lines/grid-lines.factor
diff --git a/basis/ui/gadgets/grid-lines/summary.txt b/frameworks/ui/gadgets/grid-lines/summary.txt
similarity index 100%
rename from basis/ui/gadgets/grid-lines/summary.txt
rename to frameworks/ui/gadgets/grid-lines/summary.txt
diff --git a/basis/ui/tools/inspector/authors.txt b/frameworks/ui/gadgets/grids/authors.txt
similarity index 100%
rename from basis/ui/tools/inspector/authors.txt
rename to frameworks/ui/gadgets/grids/authors.txt
diff --git a/basis/ui/gadgets/grids/grids-docs.factor b/frameworks/ui/gadgets/grids/grids-docs.factor
similarity index 100%
rename from basis/ui/gadgets/grids/grids-docs.factor
rename to frameworks/ui/gadgets/grids/grids-docs.factor
diff --git a/basis/ui/gadgets/grids/grids-tests.factor b/frameworks/ui/gadgets/grids/grids-tests.factor
similarity index 100%
rename from basis/ui/gadgets/grids/grids-tests.factor
rename to frameworks/ui/gadgets/grids/grids-tests.factor
diff --git a/basis/ui/gadgets/grids/grids.factor b/frameworks/ui/gadgets/grids/grids.factor
similarity index 100%
rename from basis/ui/gadgets/grids/grids.factor
rename to frameworks/ui/gadgets/grids/grids.factor
diff --git a/basis/ui/gadgets/grids/summary.txt b/frameworks/ui/gadgets/grids/summary.txt
similarity index 100%
rename from basis/ui/gadgets/grids/summary.txt
rename to frameworks/ui/gadgets/grids/summary.txt
diff --git a/basis/x11/syntax/authors.txt b/frameworks/ui/gadgets/icons/authors.txt
similarity index 100%
rename from basis/x11/syntax/authors.txt
rename to frameworks/ui/gadgets/icons/authors.txt
diff --git a/basis/ui/gadgets/icons/icons.factor b/frameworks/ui/gadgets/icons/icons.factor
similarity index 100%
rename from basis/ui/gadgets/icons/icons.factor
rename to frameworks/ui/gadgets/icons/icons.factor
diff --git a/basis/ui/tools/listener/authors.txt b/frameworks/ui/gadgets/incremental/authors.txt
similarity index 100%
rename from basis/ui/tools/listener/authors.txt
rename to frameworks/ui/gadgets/incremental/authors.txt
diff --git a/basis/ui/gadgets/incremental/incremental-docs.factor b/frameworks/ui/gadgets/incremental/incremental-docs.factor
similarity index 100%
rename from basis/ui/gadgets/incremental/incremental-docs.factor
rename to frameworks/ui/gadgets/incremental/incremental-docs.factor
diff --git a/basis/ui/gadgets/incremental/incremental.factor b/frameworks/ui/gadgets/incremental/incremental.factor
similarity index 100%
rename from basis/ui/gadgets/incremental/incremental.factor
rename to frameworks/ui/gadgets/incremental/incremental.factor
diff --git a/basis/ui/gadgets/incremental/summary.txt b/frameworks/ui/gadgets/incremental/summary.txt
similarity index 100%
rename from basis/ui/gadgets/incremental/summary.txt
rename to frameworks/ui/gadgets/incremental/summary.txt
diff --git a/basis/ui/tools/operations/authors.txt b/frameworks/ui/gadgets/labeled/authors.txt
similarity index 100%
rename from basis/ui/tools/operations/authors.txt
rename to frameworks/ui/gadgets/labeled/authors.txt
diff --git a/basis/ui/gadgets/labeled/labeled-docs.factor b/frameworks/ui/gadgets/labeled/labeled-docs.factor
similarity index 100%
rename from basis/ui/gadgets/labeled/labeled-docs.factor
rename to frameworks/ui/gadgets/labeled/labeled-docs.factor
diff --git a/basis/ui/gadgets/labeled/labeled-tests.factor b/frameworks/ui/gadgets/labeled/labeled-tests.factor
similarity index 100%
rename from basis/ui/gadgets/labeled/labeled-tests.factor
rename to frameworks/ui/gadgets/labeled/labeled-tests.factor
diff --git a/basis/ui/gadgets/labeled/labeled.factor b/frameworks/ui/gadgets/labeled/labeled.factor
similarity index 100%
rename from basis/ui/gadgets/labeled/labeled.factor
rename to frameworks/ui/gadgets/labeled/labeled.factor
diff --git a/basis/ui/gadgets/labeled/summary.txt b/frameworks/ui/gadgets/labeled/summary.txt
similarity index 100%
rename from basis/ui/gadgets/labeled/summary.txt
rename to frameworks/ui/gadgets/labeled/summary.txt
diff --git a/basis/ui/tools/traceback/authors.txt b/frameworks/ui/gadgets/labels/authors.txt
similarity index 100%
rename from basis/ui/tools/traceback/authors.txt
rename to frameworks/ui/gadgets/labels/authors.txt
diff --git a/basis/ui/gadgets/labels/labels-docs.factor b/frameworks/ui/gadgets/labels/labels-docs.factor
similarity index 100%
rename from basis/ui/gadgets/labels/labels-docs.factor
rename to frameworks/ui/gadgets/labels/labels-docs.factor
diff --git a/basis/ui/gadgets/labels/labels-tests.factor b/frameworks/ui/gadgets/labels/labels-tests.factor
similarity index 100%
rename from basis/ui/gadgets/labels/labels-tests.factor
rename to frameworks/ui/gadgets/labels/labels-tests.factor
diff --git a/basis/ui/gadgets/labels/labels.factor b/frameworks/ui/gadgets/labels/labels.factor
similarity index 100%
rename from basis/ui/gadgets/labels/labels.factor
rename to frameworks/ui/gadgets/labels/labels.factor
diff --git a/basis/ui/gadgets/labels/summary.txt b/frameworks/ui/gadgets/labels/summary.txt
similarity index 100%
rename from basis/ui/gadgets/labels/summary.txt
rename to frameworks/ui/gadgets/labels/summary.txt
diff --git a/extra/benchmark/gc0/authors.txt b/frameworks/ui/gadgets/line-support/authors.txt
similarity index 100%
rename from extra/benchmark/gc0/authors.txt
rename to frameworks/ui/gadgets/line-support/authors.txt
diff --git a/basis/ui/gadgets/line-support/line-support-docs.factor b/frameworks/ui/gadgets/line-support/line-support-docs.factor
similarity index 100%
rename from basis/ui/gadgets/line-support/line-support-docs.factor
rename to frameworks/ui/gadgets/line-support/line-support-docs.factor
diff --git a/basis/ui/gadgets/line-support/line-support-tests.factor b/frameworks/ui/gadgets/line-support/line-support-tests.factor
similarity index 100%
rename from basis/ui/gadgets/line-support/line-support-tests.factor
rename to frameworks/ui/gadgets/line-support/line-support-tests.factor
diff --git a/basis/ui/gadgets/line-support/line-support.factor b/frameworks/ui/gadgets/line-support/line-support.factor
similarity index 100%
rename from basis/ui/gadgets/line-support/line-support.factor
rename to frameworks/ui/gadgets/line-support/line-support.factor
diff --git a/basis/ui/gadgets/line-support/summary.txt b/frameworks/ui/gadgets/line-support/summary.txt
similarity index 100%
rename from basis/ui/gadgets/line-support/summary.txt
rename to frameworks/ui/gadgets/line-support/summary.txt
diff --git a/basis/ui/tools/walker/authors.txt b/frameworks/ui/gadgets/lists/authors.txt
similarity index 100%
rename from basis/ui/tools/walker/authors.txt
rename to frameworks/ui/gadgets/lists/authors.txt
diff --git a/extra/ui/gadgets/lists/lists-docs.factor b/frameworks/ui/gadgets/lists/lists-docs.factor
similarity index 100%
rename from extra/ui/gadgets/lists/lists-docs.factor
rename to frameworks/ui/gadgets/lists/lists-docs.factor
diff --git a/extra/ui/gadgets/lists/lists-tests.factor b/frameworks/ui/gadgets/lists/lists-tests.factor
similarity index 100%
rename from extra/ui/gadgets/lists/lists-tests.factor
rename to frameworks/ui/gadgets/lists/lists-tests.factor
diff --git a/extra/ui/gadgets/lists/lists.factor b/frameworks/ui/gadgets/lists/lists.factor
similarity index 100%
rename from extra/ui/gadgets/lists/lists.factor
rename to frameworks/ui/gadgets/lists/lists.factor
diff --git a/extra/ui/gadgets/lists/summary.txt b/frameworks/ui/gadgets/lists/summary.txt
similarity index 100%
rename from extra/ui/gadgets/lists/summary.txt
rename to frameworks/ui/gadgets/lists/summary.txt
diff --git a/basis/ui/traverse/authors.txt b/frameworks/ui/gadgets/menus/authors.txt
similarity index 100%
rename from basis/ui/traverse/authors.txt
rename to frameworks/ui/gadgets/menus/authors.txt
diff --git a/basis/ui/gadgets/menus/menus-docs.factor b/frameworks/ui/gadgets/menus/menus-docs.factor
similarity index 100%
rename from basis/ui/gadgets/menus/menus-docs.factor
rename to frameworks/ui/gadgets/menus/menus-docs.factor
diff --git a/basis/ui/gadgets/menus/menus.factor b/frameworks/ui/gadgets/menus/menus.factor
similarity index 100%
rename from basis/ui/gadgets/menus/menus.factor
rename to frameworks/ui/gadgets/menus/menus.factor
diff --git a/basis/ui/gadgets/menus/summary.txt b/frameworks/ui/gadgets/menus/summary.txt
similarity index 100%
rename from basis/ui/gadgets/menus/summary.txt
rename to frameworks/ui/gadgets/menus/summary.txt
diff --git a/basis/unix/kqueue/authors.txt b/frameworks/ui/gadgets/packs/authors.txt
similarity index 100%
rename from basis/unix/kqueue/authors.txt
rename to frameworks/ui/gadgets/packs/authors.txt
diff --git a/basis/ui/gadgets/packs/packs-docs.factor b/frameworks/ui/gadgets/packs/packs-docs.factor
similarity index 100%
rename from basis/ui/gadgets/packs/packs-docs.factor
rename to frameworks/ui/gadgets/packs/packs-docs.factor
diff --git a/basis/ui/gadgets/packs/packs-tests.factor b/frameworks/ui/gadgets/packs/packs-tests.factor
similarity index 100%
rename from basis/ui/gadgets/packs/packs-tests.factor
rename to frameworks/ui/gadgets/packs/packs-tests.factor
diff --git a/basis/ui/gadgets/packs/packs.factor b/frameworks/ui/gadgets/packs/packs.factor
similarity index 100%
rename from basis/ui/gadgets/packs/packs.factor
rename to frameworks/ui/gadgets/packs/packs.factor
diff --git a/basis/ui/gadgets/packs/summary.txt b/frameworks/ui/gadgets/packs/summary.txt
similarity index 100%
rename from basis/ui/gadgets/packs/summary.txt
rename to frameworks/ui/gadgets/packs/summary.txt
diff --git a/basis/unix/linux/authors.txt b/frameworks/ui/gadgets/panes/authors.txt
similarity index 100%
rename from basis/unix/linux/authors.txt
rename to frameworks/ui/gadgets/panes/authors.txt
diff --git a/basis/ui/gadgets/panes/panes-docs.factor b/frameworks/ui/gadgets/panes/panes-docs.factor
similarity index 100%
rename from basis/ui/gadgets/panes/panes-docs.factor
rename to frameworks/ui/gadgets/panes/panes-docs.factor
diff --git a/basis/ui/gadgets/panes/panes-tests.factor b/frameworks/ui/gadgets/panes/panes-tests.factor
similarity index 100%
rename from basis/ui/gadgets/panes/panes-tests.factor
rename to frameworks/ui/gadgets/panes/panes-tests.factor
diff --git a/basis/ui/gadgets/panes/panes.factor b/frameworks/ui/gadgets/panes/panes.factor
similarity index 100%
rename from basis/ui/gadgets/panes/panes.factor
rename to frameworks/ui/gadgets/panes/panes.factor
diff --git a/basis/ui/gadgets/panes/summary.txt b/frameworks/ui/gadgets/panes/summary.txt
similarity index 100%
rename from basis/ui/gadgets/panes/summary.txt
rename to frameworks/ui/gadgets/panes/summary.txt
diff --git a/basis/unix/linux/epoll/authors.txt b/frameworks/ui/gadgets/paragraphs/authors.txt
similarity index 100%
rename from basis/unix/linux/epoll/authors.txt
rename to frameworks/ui/gadgets/paragraphs/authors.txt
diff --git a/basis/ui/gadgets/paragraphs/paragraphs-tests.factor b/frameworks/ui/gadgets/paragraphs/paragraphs-tests.factor
similarity index 100%
rename from basis/ui/gadgets/paragraphs/paragraphs-tests.factor
rename to frameworks/ui/gadgets/paragraphs/paragraphs-tests.factor
diff --git a/basis/ui/gadgets/paragraphs/paragraphs.factor b/frameworks/ui/gadgets/paragraphs/paragraphs.factor
similarity index 100%
rename from basis/ui/gadgets/paragraphs/paragraphs.factor
rename to frameworks/ui/gadgets/paragraphs/paragraphs.factor
diff --git a/basis/ui/gadgets/paragraphs/summary.txt b/frameworks/ui/gadgets/paragraphs/summary.txt
similarity index 100%
rename from basis/ui/gadgets/paragraphs/summary.txt
rename to frameworks/ui/gadgets/paragraphs/summary.txt
diff --git a/basis/x11/xim/authors.txt b/frameworks/ui/gadgets/presentations/authors.txt
similarity index 100%
rename from basis/x11/xim/authors.txt
rename to frameworks/ui/gadgets/presentations/authors.txt
diff --git a/basis/ui/gadgets/presentations/presentations-docs.factor b/frameworks/ui/gadgets/presentations/presentations-docs.factor
similarity index 100%
rename from basis/ui/gadgets/presentations/presentations-docs.factor
rename to frameworks/ui/gadgets/presentations/presentations-docs.factor
diff --git a/basis/ui/gadgets/presentations/presentations-tests.factor b/frameworks/ui/gadgets/presentations/presentations-tests.factor
similarity index 100%
rename from basis/ui/gadgets/presentations/presentations-tests.factor
rename to frameworks/ui/gadgets/presentations/presentations-tests.factor
diff --git a/basis/ui/gadgets/presentations/presentations.factor b/frameworks/ui/gadgets/presentations/presentations.factor
similarity index 100%
rename from basis/ui/gadgets/presentations/presentations.factor
rename to frameworks/ui/gadgets/presentations/presentations.factor
diff --git a/basis/ui/gadgets/presentations/summary.txt b/frameworks/ui/gadgets/presentations/summary.txt
similarity index 100%
rename from basis/ui/gadgets/presentations/summary.txt
rename to frameworks/ui/gadgets/presentations/summary.txt
diff --git a/extra/benchmark/gc1/authors.txt b/frameworks/ui/gadgets/prettyprint/authors.txt
similarity index 100%
rename from extra/benchmark/gc1/authors.txt
rename to frameworks/ui/gadgets/prettyprint/authors.txt
diff --git a/basis/ui/gadgets/prettyprint/prettyprint.factor b/frameworks/ui/gadgets/prettyprint/prettyprint.factor
similarity index 100%
rename from basis/ui/gadgets/prettyprint/prettyprint.factor
rename to frameworks/ui/gadgets/prettyprint/prettyprint.factor
diff --git a/extra/benchmark/authors.txt b/frameworks/ui/gadgets/scrollers/authors.txt
similarity index 100%
rename from extra/benchmark/authors.txt
rename to frameworks/ui/gadgets/scrollers/authors.txt
diff --git a/basis/ui/gadgets/scrollers/scrollers-docs.factor b/frameworks/ui/gadgets/scrollers/scrollers-docs.factor
similarity index 100%
rename from basis/ui/gadgets/scrollers/scrollers-docs.factor
rename to frameworks/ui/gadgets/scrollers/scrollers-docs.factor
diff --git a/basis/ui/gadgets/scrollers/scrollers-tests.factor b/frameworks/ui/gadgets/scrollers/scrollers-tests.factor
similarity index 100%
rename from basis/ui/gadgets/scrollers/scrollers-tests.factor
rename to frameworks/ui/gadgets/scrollers/scrollers-tests.factor
diff --git a/basis/ui/gadgets/scrollers/scrollers.factor b/frameworks/ui/gadgets/scrollers/scrollers.factor
similarity index 100%
rename from basis/ui/gadgets/scrollers/scrollers.factor
rename to frameworks/ui/gadgets/scrollers/scrollers.factor
diff --git a/basis/ui/gadgets/scrollers/summary.txt b/frameworks/ui/gadgets/scrollers/summary.txt
similarity index 100%
rename from basis/ui/gadgets/scrollers/summary.txt
rename to frameworks/ui/gadgets/scrollers/summary.txt
diff --git a/basis/ui/gadgets/search-tables/search-tables-tests.factor b/frameworks/ui/gadgets/search-tables/search-tables-tests.factor
similarity index 100%
rename from basis/ui/gadgets/search-tables/search-tables-tests.factor
rename to frameworks/ui/gadgets/search-tables/search-tables-tests.factor
diff --git a/basis/ui/gadgets/search-tables/search-tables.factor b/frameworks/ui/gadgets/search-tables/search-tables.factor
similarity index 100%
rename from basis/ui/gadgets/search-tables/search-tables.factor
rename to frameworks/ui/gadgets/search-tables/search-tables.factor
diff --git a/extra/benchmark/bootstrap1/authors.txt b/frameworks/ui/gadgets/sliders/authors.txt
similarity index 100%
rename from extra/benchmark/bootstrap1/authors.txt
rename to frameworks/ui/gadgets/sliders/authors.txt
diff --git a/basis/ui/gadgets/sliders/sliders-docs.factor b/frameworks/ui/gadgets/sliders/sliders-docs.factor
similarity index 100%
rename from basis/ui/gadgets/sliders/sliders-docs.factor
rename to frameworks/ui/gadgets/sliders/sliders-docs.factor
diff --git a/basis/ui/gadgets/sliders/sliders.factor b/frameworks/ui/gadgets/sliders/sliders.factor
similarity index 100%
rename from basis/ui/gadgets/sliders/sliders.factor
rename to frameworks/ui/gadgets/sliders/sliders.factor
diff --git a/basis/ui/gadgets/sliders/summary.txt b/frameworks/ui/gadgets/sliders/summary.txt
similarity index 100%
rename from basis/ui/gadgets/sliders/summary.txt
rename to frameworks/ui/gadgets/sliders/summary.txt
diff --git a/extra/benchmark/continuations/authors.txt b/frameworks/ui/gadgets/slots/authors.txt
similarity index 100%
rename from extra/benchmark/continuations/authors.txt
rename to frameworks/ui/gadgets/slots/authors.txt
diff --git a/basis/ui/gadgets/slots/slots-tests.factor b/frameworks/ui/gadgets/slots/slots-tests.factor
similarity index 100%
rename from basis/ui/gadgets/slots/slots-tests.factor
rename to frameworks/ui/gadgets/slots/slots-tests.factor
diff --git a/basis/ui/gadgets/slots/slots.factor b/frameworks/ui/gadgets/slots/slots.factor
similarity index 100%
rename from basis/ui/gadgets/slots/slots.factor
rename to frameworks/ui/gadgets/slots/slots.factor
diff --git a/basis/ui/gadgets/slots/summary.txt b/frameworks/ui/gadgets/slots/summary.txt
similarity index 100%
rename from basis/ui/gadgets/slots/summary.txt
rename to frameworks/ui/gadgets/slots/summary.txt
diff --git a/extra/benchmark/dispatch1/authors.txt b/frameworks/ui/gadgets/status-bar/authors.txt
similarity index 100%
rename from extra/benchmark/dispatch1/authors.txt
rename to frameworks/ui/gadgets/status-bar/authors.txt
diff --git a/basis/ui/gadgets/status-bar/status-bar-docs.factor b/frameworks/ui/gadgets/status-bar/status-bar-docs.factor
similarity index 100%
rename from basis/ui/gadgets/status-bar/status-bar-docs.factor
rename to frameworks/ui/gadgets/status-bar/status-bar-docs.factor
diff --git a/basis/ui/gadgets/status-bar/status-bar.factor b/frameworks/ui/gadgets/status-bar/status-bar.factor
similarity index 100%
rename from basis/ui/gadgets/status-bar/status-bar.factor
rename to frameworks/ui/gadgets/status-bar/status-bar.factor
diff --git a/basis/ui/gadgets/status-bar/summary.txt b/frameworks/ui/gadgets/status-bar/summary.txt
similarity index 100%
rename from basis/ui/gadgets/status-bar/summary.txt
rename to frameworks/ui/gadgets/status-bar/summary.txt
diff --git a/basis/ui/gadgets/summary.txt b/frameworks/ui/gadgets/summary.txt
similarity index 100%
rename from basis/ui/gadgets/summary.txt
rename to frameworks/ui/gadgets/summary.txt
diff --git a/basis/ui/gadgets/tabbed/tabbed.factor b/frameworks/ui/gadgets/tabbed/tabbed.factor
similarity index 100%
rename from basis/ui/gadgets/tabbed/tabbed.factor
rename to frameworks/ui/gadgets/tabbed/tabbed.factor
diff --git a/basis/ui/gadgets/tables/tables-docs.factor b/frameworks/ui/gadgets/tables/tables-docs.factor
similarity index 100%
rename from basis/ui/gadgets/tables/tables-docs.factor
rename to frameworks/ui/gadgets/tables/tables-docs.factor
diff --git a/basis/ui/gadgets/tables/tables-tests.factor b/frameworks/ui/gadgets/tables/tables-tests.factor
similarity index 100%
rename from basis/ui/gadgets/tables/tables-tests.factor
rename to frameworks/ui/gadgets/tables/tables-tests.factor
diff --git a/basis/ui/gadgets/tables/tables.factor b/frameworks/ui/gadgets/tables/tables.factor
similarity index 100%
rename from basis/ui/gadgets/tables/tables.factor
rename to frameworks/ui/gadgets/tables/tables.factor
diff --git a/frameworks/ui/gadgets/theme/active-tab-left.tiff b/frameworks/ui/gadgets/theme/active-tab-left.tiff
new file mode 100644
index 0000000000..8a6c05f99d
Binary files /dev/null and b/frameworks/ui/gadgets/theme/active-tab-left.tiff differ
diff --git a/frameworks/ui/gadgets/theme/active-tab-lip.tiff b/frameworks/ui/gadgets/theme/active-tab-lip.tiff
new file mode 100644
index 0000000000..8ff803f03a
Binary files /dev/null and b/frameworks/ui/gadgets/theme/active-tab-lip.tiff differ
diff --git a/frameworks/ui/gadgets/theme/active-tab-middle.tiff b/frameworks/ui/gadgets/theme/active-tab-middle.tiff
new file mode 100644
index 0000000000..0f40e93a75
Binary files /dev/null and b/frameworks/ui/gadgets/theme/active-tab-middle.tiff differ
diff --git a/frameworks/ui/gadgets/theme/active-tab-right.tiff b/frameworks/ui/gadgets/theme/active-tab-right.tiff
new file mode 100644
index 0000000000..b56dc0172c
Binary files /dev/null and b/frameworks/ui/gadgets/theme/active-tab-right.tiff differ
diff --git a/basis/cpu/x86/sse/authors.txt b/frameworks/ui/gadgets/theme/authors.txt
similarity index 100%
rename from basis/cpu/x86/sse/authors.txt
rename to frameworks/ui/gadgets/theme/authors.txt
diff --git a/frameworks/ui/gadgets/theme/button-clicked-left.tiff b/frameworks/ui/gadgets/theme/button-clicked-left.tiff
new file mode 100644
index 0000000000..ad85bf15a8
Binary files /dev/null and b/frameworks/ui/gadgets/theme/button-clicked-left.tiff differ
diff --git a/frameworks/ui/gadgets/theme/button-clicked-middle.tiff b/frameworks/ui/gadgets/theme/button-clicked-middle.tiff
new file mode 100644
index 0000000000..4573006a6d
Binary files /dev/null and b/frameworks/ui/gadgets/theme/button-clicked-middle.tiff differ
diff --git a/frameworks/ui/gadgets/theme/button-clicked-right.tiff b/frameworks/ui/gadgets/theme/button-clicked-right.tiff
new file mode 100644
index 0000000000..ee70645420
Binary files /dev/null and b/frameworks/ui/gadgets/theme/button-clicked-right.tiff differ
diff --git a/frameworks/ui/gadgets/theme/button-left.tiff b/frameworks/ui/gadgets/theme/button-left.tiff
new file mode 100644
index 0000000000..dba2fc4ec7
Binary files /dev/null and b/frameworks/ui/gadgets/theme/button-left.tiff differ
diff --git a/frameworks/ui/gadgets/theme/button-middle.tiff b/frameworks/ui/gadgets/theme/button-middle.tiff
new file mode 100644
index 0000000000..0c6c353331
Binary files /dev/null and b/frameworks/ui/gadgets/theme/button-middle.tiff differ
diff --git a/frameworks/ui/gadgets/theme/button-right.tiff b/frameworks/ui/gadgets/theme/button-right.tiff
new file mode 100644
index 0000000000..aaff61e0bb
Binary files /dev/null and b/frameworks/ui/gadgets/theme/button-right.tiff differ
diff --git a/frameworks/ui/gadgets/theme/checkbox-clicked.tiff b/frameworks/ui/gadgets/theme/checkbox-clicked.tiff
new file mode 100644
index 0000000000..57026d4e20
Binary files /dev/null and b/frameworks/ui/gadgets/theme/checkbox-clicked.tiff differ
diff --git a/frameworks/ui/gadgets/theme/checkbox-set-clicked.tiff b/frameworks/ui/gadgets/theme/checkbox-set-clicked.tiff
new file mode 100644
index 0000000000..b8d5ce5340
Binary files /dev/null and b/frameworks/ui/gadgets/theme/checkbox-set-clicked.tiff differ
diff --git a/frameworks/ui/gadgets/theme/checkbox-set.tiff b/frameworks/ui/gadgets/theme/checkbox-set.tiff
new file mode 100644
index 0000000000..6f737a77d2
Binary files /dev/null and b/frameworks/ui/gadgets/theme/checkbox-set.tiff differ
diff --git a/frameworks/ui/gadgets/theme/checkbox.tiff b/frameworks/ui/gadgets/theme/checkbox.tiff
new file mode 100644
index 0000000000..570d9e4db3
Binary files /dev/null and b/frameworks/ui/gadgets/theme/checkbox.tiff differ
diff --git a/frameworks/ui/gadgets/theme/clear-button-clicked.tiff b/frameworks/ui/gadgets/theme/clear-button-clicked.tiff
new file mode 100644
index 0000000000..52e0e4ad2c
Binary files /dev/null and b/frameworks/ui/gadgets/theme/clear-button-clicked.tiff differ
diff --git a/frameworks/ui/gadgets/theme/clear-button.tiff b/frameworks/ui/gadgets/theme/clear-button.tiff
new file mode 100644
index 0000000000..5e66e3914e
Binary files /dev/null and b/frameworks/ui/gadgets/theme/clear-button.tiff differ
diff --git a/frameworks/ui/gadgets/theme/horizontal-scroller-handle-grip.tiff b/frameworks/ui/gadgets/theme/horizontal-scroller-handle-grip.tiff
new file mode 100644
index 0000000000..3d7bd5ec1d
Binary files /dev/null and b/frameworks/ui/gadgets/theme/horizontal-scroller-handle-grip.tiff differ
diff --git a/frameworks/ui/gadgets/theme/horizontal-scroller-handle-left.tiff b/frameworks/ui/gadgets/theme/horizontal-scroller-handle-left.tiff
new file mode 100644
index 0000000000..1870426429
Binary files /dev/null and b/frameworks/ui/gadgets/theme/horizontal-scroller-handle-left.tiff differ
diff --git a/frameworks/ui/gadgets/theme/horizontal-scroller-handle-middle.tiff b/frameworks/ui/gadgets/theme/horizontal-scroller-handle-middle.tiff
new file mode 100644
index 0000000000..1b28ba4de8
Binary files /dev/null and b/frameworks/ui/gadgets/theme/horizontal-scroller-handle-middle.tiff differ
diff --git a/frameworks/ui/gadgets/theme/horizontal-scroller-handle-right.tiff b/frameworks/ui/gadgets/theme/horizontal-scroller-handle-right.tiff
new file mode 100644
index 0000000000..2590b00f8a
Binary files /dev/null and b/frameworks/ui/gadgets/theme/horizontal-scroller-handle-right.tiff differ
diff --git a/frameworks/ui/gadgets/theme/horizontal-scroller-left.tiff b/frameworks/ui/gadgets/theme/horizontal-scroller-left.tiff
new file mode 100644
index 0000000000..0a03caae93
Binary files /dev/null and b/frameworks/ui/gadgets/theme/horizontal-scroller-left.tiff differ
diff --git a/frameworks/ui/gadgets/theme/horizontal-scroller-leftarrow-clicked.tiff b/frameworks/ui/gadgets/theme/horizontal-scroller-leftarrow-clicked.tiff
new file mode 100644
index 0000000000..311be256ca
Binary files /dev/null and b/frameworks/ui/gadgets/theme/horizontal-scroller-leftarrow-clicked.tiff differ
diff --git a/frameworks/ui/gadgets/theme/horizontal-scroller-middle.tiff b/frameworks/ui/gadgets/theme/horizontal-scroller-middle.tiff
new file mode 100644
index 0000000000..22bb1be222
Binary files /dev/null and b/frameworks/ui/gadgets/theme/horizontal-scroller-middle.tiff differ
diff --git a/frameworks/ui/gadgets/theme/horizontal-scroller-right-disabled.tiff b/frameworks/ui/gadgets/theme/horizontal-scroller-right-disabled.tiff
new file mode 100644
index 0000000000..ccf31bf523
Binary files /dev/null and b/frameworks/ui/gadgets/theme/horizontal-scroller-right-disabled.tiff differ
diff --git a/frameworks/ui/gadgets/theme/horizontal-scroller-right.tiff b/frameworks/ui/gadgets/theme/horizontal-scroller-right.tiff
new file mode 100644
index 0000000000..4aebabada4
Binary files /dev/null and b/frameworks/ui/gadgets/theme/horizontal-scroller-right.tiff differ
diff --git a/frameworks/ui/gadgets/theme/horizontal-scroller-rightarrow-clicked.tiff b/frameworks/ui/gadgets/theme/horizontal-scroller-rightarrow-clicked.tiff
new file mode 100644
index 0000000000..0efc9aebf1
Binary files /dev/null and b/frameworks/ui/gadgets/theme/horizontal-scroller-rightarrow-clicked.tiff differ
diff --git a/frameworks/ui/gadgets/theme/inactive-tab-left.tiff b/frameworks/ui/gadgets/theme/inactive-tab-left.tiff
new file mode 100644
index 0000000000..164c008aea
Binary files /dev/null and b/frameworks/ui/gadgets/theme/inactive-tab-left.tiff differ
diff --git a/frameworks/ui/gadgets/theme/inactive-tab-middle.tiff b/frameworks/ui/gadgets/theme/inactive-tab-middle.tiff
new file mode 100644
index 0000000000..3bdff5c30a
Binary files /dev/null and b/frameworks/ui/gadgets/theme/inactive-tab-middle.tiff differ
diff --git a/frameworks/ui/gadgets/theme/inactive-tab-right.tiff b/frameworks/ui/gadgets/theme/inactive-tab-right.tiff
new file mode 100644
index 0000000000..c0ddac6b0d
Binary files /dev/null and b/frameworks/ui/gadgets/theme/inactive-tab-right.tiff differ
diff --git a/frameworks/ui/gadgets/theme/radio-clicked.tiff b/frameworks/ui/gadgets/theme/radio-clicked.tiff
new file mode 100644
index 0000000000..3092f8bb8d
Binary files /dev/null and b/frameworks/ui/gadgets/theme/radio-clicked.tiff differ
diff --git a/frameworks/ui/gadgets/theme/radio-set-clicked.tiff b/frameworks/ui/gadgets/theme/radio-set-clicked.tiff
new file mode 100644
index 0000000000..21b2813a41
Binary files /dev/null and b/frameworks/ui/gadgets/theme/radio-set-clicked.tiff differ
diff --git a/frameworks/ui/gadgets/theme/radio-set.tiff b/frameworks/ui/gadgets/theme/radio-set.tiff
new file mode 100644
index 0000000000..291b464e5a
Binary files /dev/null and b/frameworks/ui/gadgets/theme/radio-set.tiff differ
diff --git a/frameworks/ui/gadgets/theme/radio.tiff b/frameworks/ui/gadgets/theme/radio.tiff
new file mode 100644
index 0000000000..34944437b2
Binary files /dev/null and b/frameworks/ui/gadgets/theme/radio.tiff differ
diff --git a/frameworks/ui/gadgets/theme/resources.txt b/frameworks/ui/gadgets/theme/resources.txt
new file mode 100644
index 0000000000..72238b4d93
--- /dev/null
+++ b/frameworks/ui/gadgets/theme/resources.txt
@@ -0,0 +1 @@
+*.tiff
diff --git a/frameworks/ui/gadgets/theme/summary.txt b/frameworks/ui/gadgets/theme/summary.txt
new file mode 100644
index 0000000000..327f0d2ac8
--- /dev/null
+++ b/frameworks/ui/gadgets/theme/summary.txt
@@ -0,0 +1 @@
+Common colors and gradients used by the UI
diff --git a/frameworks/ui/gadgets/theme/theme.factor b/frameworks/ui/gadgets/theme/theme.factor
new file mode 100644
index 0000000000..b250531b55
--- /dev/null
+++ b/frameworks/ui/gadgets/theme/theme.factor
@@ -0,0 +1,12 @@
+! Copyright (C) 2009, 2010 Slava Pestov, Joe Groff.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors io.pathnames sequences ui.images ui.theme ;
+IN: ui.gadgets.theme
+
+SLOT: font ! Temporarily necessary to fix Windows bootstrap.
+
+: theme-image ( name -- image-name )
+    "vocab:ui/gadgets/theme/" prepend-path ".tiff" append <image-name> ;
+
+: theme-font-colors ( gadget -- gadget )
+    [ content-background >>background text-color >>foreground ] change-font ;
diff --git a/frameworks/ui/gadgets/theme/vertical-scroller-bottom-disabled.tiff b/frameworks/ui/gadgets/theme/vertical-scroller-bottom-disabled.tiff
new file mode 100644
index 0000000000..ea7e118d86
Binary files /dev/null and b/frameworks/ui/gadgets/theme/vertical-scroller-bottom-disabled.tiff differ
diff --git a/frameworks/ui/gadgets/theme/vertical-scroller-bottom.tiff b/frameworks/ui/gadgets/theme/vertical-scroller-bottom.tiff
new file mode 100644
index 0000000000..17eb84c5ec
Binary files /dev/null and b/frameworks/ui/gadgets/theme/vertical-scroller-bottom.tiff differ
diff --git a/frameworks/ui/gadgets/theme/vertical-scroller-downarrow-clicked.tiff b/frameworks/ui/gadgets/theme/vertical-scroller-downarrow-clicked.tiff
new file mode 100644
index 0000000000..8a06d05967
Binary files /dev/null and b/frameworks/ui/gadgets/theme/vertical-scroller-downarrow-clicked.tiff differ
diff --git a/frameworks/ui/gadgets/theme/vertical-scroller-handle-bottom.tiff b/frameworks/ui/gadgets/theme/vertical-scroller-handle-bottom.tiff
new file mode 100644
index 0000000000..1151cfc873
Binary files /dev/null and b/frameworks/ui/gadgets/theme/vertical-scroller-handle-bottom.tiff differ
diff --git a/frameworks/ui/gadgets/theme/vertical-scroller-handle-grip.tiff b/frameworks/ui/gadgets/theme/vertical-scroller-handle-grip.tiff
new file mode 100644
index 0000000000..6bb514c2e8
Binary files /dev/null and b/frameworks/ui/gadgets/theme/vertical-scroller-handle-grip.tiff differ
diff --git a/frameworks/ui/gadgets/theme/vertical-scroller-handle-middle.tiff b/frameworks/ui/gadgets/theme/vertical-scroller-handle-middle.tiff
new file mode 100644
index 0000000000..cac14e0fb6
Binary files /dev/null and b/frameworks/ui/gadgets/theme/vertical-scroller-handle-middle.tiff differ
diff --git a/frameworks/ui/gadgets/theme/vertical-scroller-handle-top.tiff b/frameworks/ui/gadgets/theme/vertical-scroller-handle-top.tiff
new file mode 100644
index 0000000000..4f982a8d5a
Binary files /dev/null and b/frameworks/ui/gadgets/theme/vertical-scroller-handle-top.tiff differ
diff --git a/frameworks/ui/gadgets/theme/vertical-scroller-middle.tiff b/frameworks/ui/gadgets/theme/vertical-scroller-middle.tiff
new file mode 100644
index 0000000000..5d759a18d7
Binary files /dev/null and b/frameworks/ui/gadgets/theme/vertical-scroller-middle.tiff differ
diff --git a/frameworks/ui/gadgets/theme/vertical-scroller-top.tiff b/frameworks/ui/gadgets/theme/vertical-scroller-top.tiff
new file mode 100644
index 0000000000..f271136a05
Binary files /dev/null and b/frameworks/ui/gadgets/theme/vertical-scroller-top.tiff differ
diff --git a/frameworks/ui/gadgets/theme/vertical-scroller-uparrow-clicked.tiff b/frameworks/ui/gadgets/theme/vertical-scroller-uparrow-clicked.tiff
new file mode 100644
index 0000000000..4ee2ef4b12
Binary files /dev/null and b/frameworks/ui/gadgets/theme/vertical-scroller-uparrow-clicked.tiff differ
diff --git a/basis/ui/gadgets/toolbar/authors.txt b/frameworks/ui/gadgets/toolbar/authors.txt
similarity index 100%
rename from basis/ui/gadgets/toolbar/authors.txt
rename to frameworks/ui/gadgets/toolbar/authors.txt
diff --git a/basis/ui/gadgets/toolbar/summary.txt b/frameworks/ui/gadgets/toolbar/summary.txt
similarity index 100%
rename from basis/ui/gadgets/toolbar/summary.txt
rename to frameworks/ui/gadgets/toolbar/summary.txt
diff --git a/basis/ui/gadgets/toolbar/toolbar-docs.factor b/frameworks/ui/gadgets/toolbar/toolbar-docs.factor
similarity index 100%
rename from basis/ui/gadgets/toolbar/toolbar-docs.factor
rename to frameworks/ui/gadgets/toolbar/toolbar-docs.factor
diff --git a/basis/ui/gadgets/toolbar/toolbar-tests.factor b/frameworks/ui/gadgets/toolbar/toolbar-tests.factor
similarity index 100%
rename from basis/ui/gadgets/toolbar/toolbar-tests.factor
rename to frameworks/ui/gadgets/toolbar/toolbar-tests.factor
diff --git a/basis/ui/gadgets/toolbar/toolbar.factor b/frameworks/ui/gadgets/toolbar/toolbar.factor
similarity index 100%
rename from basis/ui/gadgets/toolbar/toolbar.factor
rename to frameworks/ui/gadgets/toolbar/toolbar.factor
diff --git a/extra/benchmark/dispatch2/authors.txt b/frameworks/ui/gadgets/tracks/authors.txt
similarity index 100%
rename from extra/benchmark/dispatch2/authors.txt
rename to frameworks/ui/gadgets/tracks/authors.txt
diff --git a/basis/ui/gadgets/tracks/summary.txt b/frameworks/ui/gadgets/tracks/summary.txt
similarity index 100%
rename from basis/ui/gadgets/tracks/summary.txt
rename to frameworks/ui/gadgets/tracks/summary.txt
diff --git a/basis/ui/gadgets/tracks/tracks-docs.factor b/frameworks/ui/gadgets/tracks/tracks-docs.factor
similarity index 100%
rename from basis/ui/gadgets/tracks/tracks-docs.factor
rename to frameworks/ui/gadgets/tracks/tracks-docs.factor
diff --git a/basis/ui/gadgets/tracks/tracks-tests.factor b/frameworks/ui/gadgets/tracks/tracks-tests.factor
similarity index 100%
rename from basis/ui/gadgets/tracks/tracks-tests.factor
rename to frameworks/ui/gadgets/tracks/tracks-tests.factor
diff --git a/basis/ui/gadgets/tracks/tracks.factor b/frameworks/ui/gadgets/tracks/tracks.factor
similarity index 100%
rename from basis/ui/gadgets/tracks/tracks.factor
rename to frameworks/ui/gadgets/tracks/tracks.factor
diff --git a/extra/benchmark/dispatch3/authors.txt b/frameworks/ui/gadgets/viewports/authors.txt
similarity index 100%
rename from extra/benchmark/dispatch3/authors.txt
rename to frameworks/ui/gadgets/viewports/authors.txt
diff --git a/basis/ui/gadgets/viewports/summary.txt b/frameworks/ui/gadgets/viewports/summary.txt
similarity index 100%
rename from basis/ui/gadgets/viewports/summary.txt
rename to frameworks/ui/gadgets/viewports/summary.txt
diff --git a/basis/ui/gadgets/viewports/viewports-docs.factor b/frameworks/ui/gadgets/viewports/viewports-docs.factor
similarity index 100%
rename from basis/ui/gadgets/viewports/viewports-docs.factor
rename to frameworks/ui/gadgets/viewports/viewports-docs.factor
diff --git a/basis/ui/gadgets/viewports/viewports.factor b/frameworks/ui/gadgets/viewports/viewports.factor
similarity index 100%
rename from basis/ui/gadgets/viewports/viewports.factor
rename to frameworks/ui/gadgets/viewports/viewports.factor
diff --git a/extra/benchmark/dispatch4/authors.txt b/frameworks/ui/gadgets/worlds/authors.txt
similarity index 100%
rename from extra/benchmark/dispatch4/authors.txt
rename to frameworks/ui/gadgets/worlds/authors.txt
diff --git a/extra/ui/gadgets/worlds/null/null.factor b/frameworks/ui/gadgets/worlds/null/null.factor
similarity index 100%
rename from extra/ui/gadgets/worlds/null/null.factor
rename to frameworks/ui/gadgets/worlds/null/null.factor
diff --git a/basis/ui/gadgets/worlds/summary.txt b/frameworks/ui/gadgets/worlds/summary.txt
similarity index 100%
rename from basis/ui/gadgets/worlds/summary.txt
rename to frameworks/ui/gadgets/worlds/summary.txt
diff --git a/basis/ui/gadgets/worlds/worlds-docs.factor b/frameworks/ui/gadgets/worlds/worlds-docs.factor
similarity index 100%
rename from basis/ui/gadgets/worlds/worlds-docs.factor
rename to frameworks/ui/gadgets/worlds/worlds-docs.factor
diff --git a/basis/ui/gadgets/worlds/worlds-tests.factor b/frameworks/ui/gadgets/worlds/worlds-tests.factor
similarity index 100%
rename from basis/ui/gadgets/worlds/worlds-tests.factor
rename to frameworks/ui/gadgets/worlds/worlds-tests.factor
diff --git a/basis/ui/gadgets/worlds/worlds.factor b/frameworks/ui/gadgets/worlds/worlds.factor
similarity index 100%
rename from basis/ui/gadgets/worlds/worlds.factor
rename to frameworks/ui/gadgets/worlds/worlds.factor
diff --git a/basis/ui/gadgets/wrappers/wrappers.factor b/frameworks/ui/gadgets/wrappers/wrappers.factor
similarity index 100%
rename from basis/ui/gadgets/wrappers/wrappers.factor
rename to frameworks/ui/gadgets/wrappers/wrappers.factor
diff --git a/extra/benchmark/fib1/authors.txt b/frameworks/ui/gestures/authors.txt
similarity index 100%
rename from extra/benchmark/fib1/authors.txt
rename to frameworks/ui/gestures/authors.txt
diff --git a/basis/ui/gestures/gestures-docs.factor b/frameworks/ui/gestures/gestures-docs.factor
similarity index 100%
rename from basis/ui/gestures/gestures-docs.factor
rename to frameworks/ui/gestures/gestures-docs.factor
diff --git a/basis/ui/gestures/gestures.factor b/frameworks/ui/gestures/gestures.factor
similarity index 100%
rename from basis/ui/gestures/gestures.factor
rename to frameworks/ui/gestures/gestures.factor
diff --git a/basis/ui/gestures/summary.txt b/frameworks/ui/gestures/summary.txt
similarity index 100%
rename from basis/ui/gestures/summary.txt
rename to frameworks/ui/gestures/summary.txt
diff --git a/extra/benchmark/gc2/authors.txt b/frameworks/ui/images/authors.txt
similarity index 100%
rename from extra/benchmark/gc2/authors.txt
rename to frameworks/ui/images/authors.txt
diff --git a/basis/ui/images/images-tests.factor b/frameworks/ui/images/images-tests.factor
similarity index 100%
rename from basis/ui/images/images-tests.factor
rename to frameworks/ui/images/images-tests.factor
diff --git a/basis/ui/images/images.factor b/frameworks/ui/images/images.factor
similarity index 100%
rename from basis/ui/images/images.factor
rename to frameworks/ui/images/images.factor
diff --git a/extra/benchmark/fib2/authors.txt b/frameworks/ui/operations/authors.txt
similarity index 100%
rename from extra/benchmark/fib2/authors.txt
rename to frameworks/ui/operations/authors.txt
diff --git a/basis/ui/operations/operations-docs.factor b/frameworks/ui/operations/operations-docs.factor
similarity index 100%
rename from basis/ui/operations/operations-docs.factor
rename to frameworks/ui/operations/operations-docs.factor
diff --git a/basis/ui/operations/operations-tests.factor b/frameworks/ui/operations/operations-tests.factor
similarity index 100%
rename from basis/ui/operations/operations-tests.factor
rename to frameworks/ui/operations/operations-tests.factor
diff --git a/basis/ui/operations/operations.factor b/frameworks/ui/operations/operations.factor
similarity index 100%
rename from basis/ui/operations/operations.factor
rename to frameworks/ui/operations/operations.factor
diff --git a/basis/ui/operations/summary.txt b/frameworks/ui/operations/summary.txt
similarity index 100%
rename from basis/ui/operations/summary.txt
rename to frameworks/ui/operations/summary.txt
diff --git a/extra/benchmark/gc3/authors.txt b/frameworks/ui/pens/authors.txt
similarity index 100%
rename from extra/benchmark/gc3/authors.txt
rename to frameworks/ui/pens/authors.txt
diff --git a/extra/benchmark/javascript/authors.txt b/frameworks/ui/pens/caching/authors.txt
similarity index 100%
rename from extra/benchmark/javascript/authors.txt
rename to frameworks/ui/pens/caching/authors.txt
diff --git a/basis/ui/pens/caching/caching-tests.factor b/frameworks/ui/pens/caching/caching-tests.factor
similarity index 100%
rename from basis/ui/pens/caching/caching-tests.factor
rename to frameworks/ui/pens/caching/caching-tests.factor
diff --git a/basis/ui/pens/caching/caching.factor b/frameworks/ui/pens/caching/caching.factor
similarity index 100%
rename from basis/ui/pens/caching/caching.factor
rename to frameworks/ui/pens/caching/caching.factor
diff --git a/extra/benchmark/nbody-simd/authors.txt b/frameworks/ui/pens/gradient/authors.txt
similarity index 100%
rename from extra/benchmark/nbody-simd/authors.txt
rename to frameworks/ui/pens/gradient/authors.txt
diff --git a/basis/ui/pens/gradient/gradient-docs.factor b/frameworks/ui/pens/gradient/gradient-docs.factor
similarity index 100%
rename from basis/ui/pens/gradient/gradient-docs.factor
rename to frameworks/ui/pens/gradient/gradient-docs.factor
diff --git a/basis/ui/pens/gradient/gradient-tests.factor b/frameworks/ui/pens/gradient/gradient-tests.factor
similarity index 100%
rename from basis/ui/pens/gradient/gradient-tests.factor
rename to frameworks/ui/pens/gradient/gradient-tests.factor
diff --git a/basis/ui/pens/gradient/gradient.factor b/frameworks/ui/pens/gradient/gradient.factor
similarity index 100%
rename from basis/ui/pens/gradient/gradient.factor
rename to frameworks/ui/pens/gradient/gradient.factor
diff --git a/extra/benchmark/raytracer-simd/authors.txt b/frameworks/ui/pens/image/authors.txt
similarity index 100%
rename from extra/benchmark/raytracer-simd/authors.txt
rename to frameworks/ui/pens/image/authors.txt
diff --git a/basis/ui/pens/image/image-tests.factor b/frameworks/ui/pens/image/image-tests.factor
similarity index 100%
rename from basis/ui/pens/image/image-tests.factor
rename to frameworks/ui/pens/image/image-tests.factor
diff --git a/basis/ui/pens/image/image.factor b/frameworks/ui/pens/image/image.factor
similarity index 100%
rename from basis/ui/pens/image/image.factor
rename to frameworks/ui/pens/image/image.factor
diff --git a/basis/ui/pens/pens-docs.factor b/frameworks/ui/pens/pens-docs.factor
similarity index 100%
rename from basis/ui/pens/pens-docs.factor
rename to frameworks/ui/pens/pens-docs.factor
diff --git a/basis/ui/pens/pens-tests.factor b/frameworks/ui/pens/pens-tests.factor
similarity index 100%
rename from basis/ui/pens/pens-tests.factor
rename to frameworks/ui/pens/pens-tests.factor
diff --git a/basis/ui/pens/pens.factor b/frameworks/ui/pens/pens.factor
similarity index 100%
rename from basis/ui/pens/pens.factor
rename to frameworks/ui/pens/pens.factor
diff --git a/extra/benchmark/simd-1/authors.txt b/frameworks/ui/pens/polygon/authors.txt
similarity index 100%
rename from extra/benchmark/simd-1/authors.txt
rename to frameworks/ui/pens/polygon/authors.txt
diff --git a/basis/ui/pens/polygon/polygon-docs.factor b/frameworks/ui/pens/polygon/polygon-docs.factor
similarity index 100%
rename from basis/ui/pens/polygon/polygon-docs.factor
rename to frameworks/ui/pens/polygon/polygon-docs.factor
diff --git a/basis/ui/pens/polygon/polygon-tests.factor b/frameworks/ui/pens/polygon/polygon-tests.factor
similarity index 100%
rename from basis/ui/pens/polygon/polygon-tests.factor
rename to frameworks/ui/pens/polygon/polygon-tests.factor
diff --git a/basis/ui/pens/polygon/polygon.factor b/frameworks/ui/pens/polygon/polygon.factor
similarity index 100%
rename from basis/ui/pens/polygon/polygon.factor
rename to frameworks/ui/pens/polygon/polygon.factor
diff --git a/extra/benchmark/tuple-arrays/authors.txt b/frameworks/ui/pens/solid/authors.txt
similarity index 100%
rename from extra/benchmark/tuple-arrays/authors.txt
rename to frameworks/ui/pens/solid/authors.txt
diff --git a/basis/ui/pens/solid/solid-docs.factor b/frameworks/ui/pens/solid/solid-docs.factor
similarity index 100%
rename from basis/ui/pens/solid/solid-docs.factor
rename to frameworks/ui/pens/solid/solid-docs.factor
diff --git a/basis/ui/pens/solid/solid-tests.factor b/frameworks/ui/pens/solid/solid-tests.factor
similarity index 100%
rename from basis/ui/pens/solid/solid-tests.factor
rename to frameworks/ui/pens/solid/solid-tests.factor
diff --git a/basis/ui/pens/solid/solid.factor b/frameworks/ui/pens/solid/solid.factor
similarity index 100%
rename from basis/ui/pens/solid/solid.factor
rename to frameworks/ui/pens/solid/solid.factor
diff --git a/extra/color-table/authors.txt b/frameworks/ui/pens/tile/authors.txt
similarity index 100%
rename from extra/color-table/authors.txt
rename to frameworks/ui/pens/tile/authors.txt
diff --git a/basis/ui/pens/tile/tile-tests.factor b/frameworks/ui/pens/tile/tile-tests.factor
similarity index 100%
rename from basis/ui/pens/tile/tile-tests.factor
rename to frameworks/ui/pens/tile/tile-tests.factor
diff --git a/basis/ui/pens/tile/tile.factor b/frameworks/ui/pens/tile/tile.factor
similarity index 100%
rename from basis/ui/pens/tile/tile.factor
rename to frameworks/ui/pens/tile/tile.factor
diff --git a/extra/quadtrees/authors.txt b/frameworks/ui/pixel-formats/authors.txt
similarity index 100%
rename from extra/quadtrees/authors.txt
rename to frameworks/ui/pixel-formats/authors.txt
diff --git a/basis/ui/pixel-formats/pixel-formats-docs.factor b/frameworks/ui/pixel-formats/pixel-formats-docs.factor
similarity index 100%
rename from basis/ui/pixel-formats/pixel-formats-docs.factor
rename to frameworks/ui/pixel-formats/pixel-formats-docs.factor
diff --git a/basis/ui/pixel-formats/pixel-formats.factor b/frameworks/ui/pixel-formats/pixel-formats.factor
similarity index 100%
rename from basis/ui/pixel-formats/pixel-formats.factor
rename to frameworks/ui/pixel-formats/pixel-formats.factor
diff --git a/basis/ui/pixel-formats/summary.txt b/frameworks/ui/pixel-formats/summary.txt
similarity index 100%
rename from basis/ui/pixel-formats/summary.txt
rename to frameworks/ui/pixel-formats/summary.txt
diff --git a/extra/benchmark/fib3/authors.txt b/frameworks/ui/render/authors.txt
similarity index 100%
rename from extra/benchmark/fib3/authors.txt
rename to frameworks/ui/render/authors.txt
diff --git a/basis/ui/render/render-docs.factor b/frameworks/ui/render/render-docs.factor
similarity index 100%
rename from basis/ui/render/render-docs.factor
rename to frameworks/ui/render/render-docs.factor
diff --git a/basis/ui/render/render.factor b/frameworks/ui/render/render.factor
similarity index 100%
rename from basis/ui/render/render.factor
rename to frameworks/ui/render/render.factor
diff --git a/basis/ui/render/summary.txt b/frameworks/ui/render/summary.txt
similarity index 100%
rename from basis/ui/render/summary.txt
rename to frameworks/ui/render/summary.txt
diff --git a/extra/ui/render/test/reference.bmp b/frameworks/ui/render/test/reference.bmp
similarity index 100%
rename from extra/ui/render/test/reference.bmp
rename to frameworks/ui/render/test/reference.bmp
diff --git a/extra/ui/render/test/test.factor b/frameworks/ui/render/test/test.factor
similarity index 100%
rename from extra/ui/render/test/test.factor
rename to frameworks/ui/render/test/test.factor
diff --git a/basis/ui/summary.txt b/frameworks/ui/summary.txt
similarity index 100%
rename from basis/ui/summary.txt
rename to frameworks/ui/summary.txt
diff --git a/extra/mason/notify/authors.txt b/frameworks/ui/text/authors.txt
similarity index 100%
rename from extra/mason/notify/authors.txt
rename to frameworks/ui/text/authors.txt
diff --git a/extra/mason/twitter/authors.txt b/frameworks/ui/text/core-text/authors.txt
similarity index 100%
rename from extra/mason/twitter/authors.txt
rename to frameworks/ui/text/core-text/authors.txt
diff --git a/basis/ui/text/core-text/core-text.factor b/frameworks/ui/text/core-text/core-text.factor
similarity index 100%
rename from basis/ui/text/core-text/core-text.factor
rename to frameworks/ui/text/core-text/core-text.factor
diff --git a/basis/webbrowser/macosx/platforms.txt b/frameworks/ui/text/core-text/platforms.txt
similarity index 100%
rename from basis/webbrowser/macosx/platforms.txt
rename to frameworks/ui/text/core-text/platforms.txt
diff --git a/basis/ui/text/core-text/summary.txt b/frameworks/ui/text/core-text/summary.txt
similarity index 100%
rename from basis/ui/text/core-text/summary.txt
rename to frameworks/ui/text/core-text/summary.txt
diff --git a/extra/pairs/authors.txt b/frameworks/ui/text/pango/authors.txt
similarity index 100%
rename from extra/pairs/authors.txt
rename to frameworks/ui/text/pango/authors.txt
diff --git a/basis/ui/text/pango/pango.factor b/frameworks/ui/text/pango/pango.factor
similarity index 100%
rename from basis/ui/text/pango/pango.factor
rename to frameworks/ui/text/pango/pango.factor
diff --git a/basis/unix/utmpx/linux/platforms.txt b/frameworks/ui/text/pango/platforms.txt
similarity index 100%
rename from basis/unix/utmpx/linux/platforms.txt
rename to frameworks/ui/text/pango/platforms.txt
diff --git a/basis/ui/text/pango/summary.txt b/frameworks/ui/text/pango/summary.txt
similarity index 100%
rename from basis/ui/text/pango/summary.txt
rename to frameworks/ui/text/pango/summary.txt
diff --git a/basis/ui/text/text-docs.factor b/frameworks/ui/text/text-docs.factor
similarity index 100%
rename from basis/ui/text/text-docs.factor
rename to frameworks/ui/text/text-docs.factor
diff --git a/basis/ui/text/text-tests.factor b/frameworks/ui/text/text-tests.factor
similarity index 100%
rename from basis/ui/text/text-tests.factor
rename to frameworks/ui/text/text-tests.factor
diff --git a/basis/ui/text/text.factor b/frameworks/ui/text/text.factor
similarity index 100%
rename from basis/ui/text/text.factor
rename to frameworks/ui/text/text.factor
diff --git a/basis/ui/text/uniscribe/authors.txt b/frameworks/ui/text/uniscribe/authors.txt
similarity index 100%
rename from basis/ui/text/uniscribe/authors.txt
rename to frameworks/ui/text/uniscribe/authors.txt
diff --git a/basis/windows/user32/platforms.txt b/frameworks/ui/text/uniscribe/platforms.txt
similarity index 100%
rename from basis/windows/user32/platforms.txt
rename to frameworks/ui/text/uniscribe/platforms.txt
diff --git a/basis/ui/text/uniscribe/summary.txt b/frameworks/ui/text/uniscribe/summary.txt
similarity index 100%
rename from basis/ui/text/uniscribe/summary.txt
rename to frameworks/ui/text/uniscribe/summary.txt
diff --git a/basis/ui/text/uniscribe/uniscribe.factor b/frameworks/ui/text/uniscribe/uniscribe.factor
similarity index 100%
rename from basis/ui/text/uniscribe/uniscribe.factor
rename to frameworks/ui/text/uniscribe/uniscribe.factor
diff --git a/basis/ui/theme/authors.txt b/frameworks/ui/theme/authors.txt
similarity index 100%
rename from basis/ui/theme/authors.txt
rename to frameworks/ui/theme/authors.txt
diff --git a/basis/ui/theme/summary.txt b/frameworks/ui/theme/summary.txt
similarity index 100%
rename from basis/ui/theme/summary.txt
rename to frameworks/ui/theme/summary.txt
diff --git a/basis/ui/theme/switching/authors.txt b/frameworks/ui/theme/switching/authors.txt
similarity index 100%
rename from basis/ui/theme/switching/authors.txt
rename to frameworks/ui/theme/switching/authors.txt
diff --git a/basis/ui/theme/switching/summary.txt b/frameworks/ui/theme/switching/summary.txt
similarity index 100%
rename from basis/ui/theme/switching/summary.txt
rename to frameworks/ui/theme/switching/summary.txt
diff --git a/basis/ui/theme/switching/switching-docs.factor b/frameworks/ui/theme/switching/switching-docs.factor
similarity index 100%
rename from basis/ui/theme/switching/switching-docs.factor
rename to frameworks/ui/theme/switching/switching-docs.factor
diff --git a/basis/ui/theme/switching/switching.factor b/frameworks/ui/theme/switching/switching.factor
similarity index 100%
rename from basis/ui/theme/switching/switching.factor
rename to frameworks/ui/theme/switching/switching.factor
diff --git a/basis/ui/theme/theme.factor b/frameworks/ui/theme/theme.factor
similarity index 100%
rename from basis/ui/theme/theme.factor
rename to frameworks/ui/theme/theme.factor
diff --git a/extra/benchmark/fib4/authors.txt b/frameworks/ui/tools/authors.txt
similarity index 100%
rename from extra/benchmark/fib4/authors.txt
rename to frameworks/ui/tools/authors.txt
diff --git a/extra/benchmark/fib5/authors.txt b/frameworks/ui/tools/browser/authors.txt
similarity index 100%
rename from extra/benchmark/fib5/authors.txt
rename to frameworks/ui/tools/browser/authors.txt
diff --git a/basis/ui/tools/browser/browser-docs.factor b/frameworks/ui/tools/browser/browser-docs.factor
similarity index 100%
rename from basis/ui/tools/browser/browser-docs.factor
rename to frameworks/ui/tools/browser/browser-docs.factor
diff --git a/basis/ui/tools/browser/browser-tests.factor b/frameworks/ui/tools/browser/browser-tests.factor
similarity index 100%
rename from basis/ui/tools/browser/browser-tests.factor
rename to frameworks/ui/tools/browser/browser-tests.factor
diff --git a/basis/ui/tools/browser/browser.factor b/frameworks/ui/tools/browser/browser.factor
similarity index 100%
rename from basis/ui/tools/browser/browser.factor
rename to frameworks/ui/tools/browser/browser.factor
diff --git a/extra/site-watcher/email/authors.txt b/frameworks/ui/tools/browser/history/authors.txt
similarity index 100%
rename from extra/site-watcher/email/authors.txt
rename to frameworks/ui/tools/browser/history/authors.txt
diff --git a/basis/ui/tools/browser/history/history-tests.factor b/frameworks/ui/tools/browser/history/history-tests.factor
similarity index 100%
rename from basis/ui/tools/browser/history/history-tests.factor
rename to frameworks/ui/tools/browser/history/history-tests.factor
diff --git a/basis/ui/tools/browser/history/history.factor b/frameworks/ui/tools/browser/history/history.factor
similarity index 100%
rename from basis/ui/tools/browser/history/history.factor
rename to frameworks/ui/tools/browser/history/history.factor
diff --git a/extra/site-watcher/spider/authors.txt b/frameworks/ui/tools/browser/popups/authors.txt
similarity index 100%
rename from extra/site-watcher/spider/authors.txt
rename to frameworks/ui/tools/browser/popups/authors.txt
diff --git a/basis/ui/tools/browser/popups/popups.factor b/frameworks/ui/tools/browser/popups/popups.factor
similarity index 100%
rename from basis/ui/tools/browser/popups/popups.factor
rename to frameworks/ui/tools/browser/popups/popups.factor
diff --git a/basis/ui/tools/browser/summary.txt b/frameworks/ui/tools/browser/summary.txt
similarity index 100%
rename from basis/ui/tools/browser/summary.txt
rename to frameworks/ui/tools/browser/summary.txt
diff --git a/basis/help/vocabs/tags.txt b/frameworks/ui/tools/browser/tags.txt
similarity index 100%
rename from basis/help/vocabs/tags.txt
rename to frameworks/ui/tools/browser/tags.txt
diff --git a/basis/ui/tools/common/common.factor b/frameworks/ui/tools/common/common.factor
similarity index 100%
rename from basis/ui/tools/common/common.factor
rename to frameworks/ui/tools/common/common.factor
diff --git a/extra/benchmark/hashtables/authors.txt b/frameworks/ui/tools/debugger/authors.txt
similarity index 100%
rename from extra/benchmark/hashtables/authors.txt
rename to frameworks/ui/tools/debugger/authors.txt
diff --git a/basis/ui/tools/debugger/debugger-docs.factor b/frameworks/ui/tools/debugger/debugger-docs.factor
similarity index 100%
rename from basis/ui/tools/debugger/debugger-docs.factor
rename to frameworks/ui/tools/debugger/debugger-docs.factor
diff --git a/basis/ui/tools/debugger/debugger.factor b/frameworks/ui/tools/debugger/debugger.factor
similarity index 100%
rename from basis/ui/tools/debugger/debugger.factor
rename to frameworks/ui/tools/debugger/debugger.factor
diff --git a/basis/ui/tools/debugger/summary.txt b/frameworks/ui/tools/debugger/summary.txt
similarity index 100%
rename from basis/ui/tools/debugger/summary.txt
rename to frameworks/ui/tools/debugger/summary.txt
diff --git a/basis/listener/tags.txt b/frameworks/ui/tools/debugger/tags.txt
similarity index 100%
rename from basis/listener/tags.txt
rename to frameworks/ui/tools/debugger/tags.txt
diff --git a/extra/benchmark/iteration/authors.txt b/frameworks/ui/tools/deploy/authors.txt
similarity index 100%
rename from extra/benchmark/iteration/authors.txt
rename to frameworks/ui/tools/deploy/authors.txt
diff --git a/basis/ui/tools/deploy/deploy-docs.factor b/frameworks/ui/tools/deploy/deploy-docs.factor
similarity index 100%
rename from basis/ui/tools/deploy/deploy-docs.factor
rename to frameworks/ui/tools/deploy/deploy-docs.factor
diff --git a/basis/ui/tools/deploy/deploy.factor b/frameworks/ui/tools/deploy/deploy.factor
similarity index 100%
rename from basis/ui/tools/deploy/deploy.factor
rename to frameworks/ui/tools/deploy/deploy.factor
diff --git a/basis/ui/tools/deploy/summary.txt b/frameworks/ui/tools/deploy/summary.txt
similarity index 100%
rename from basis/ui/tools/deploy/summary.txt
rename to frameworks/ui/tools/deploy/summary.txt
diff --git a/extra/smalltalk/ast/authors.txt b/frameworks/ui/tools/error-list/authors.txt
similarity index 100%
rename from extra/smalltalk/ast/authors.txt
rename to frameworks/ui/tools/error-list/authors.txt
diff --git a/basis/ui/tools/error-list/error-list-docs.factor b/frameworks/ui/tools/error-list/error-list-docs.factor
similarity index 100%
rename from basis/ui/tools/error-list/error-list-docs.factor
rename to frameworks/ui/tools/error-list/error-list-docs.factor
diff --git a/basis/ui/tools/error-list/error-list.factor b/frameworks/ui/tools/error-list/error-list.factor
similarity index 100%
rename from basis/ui/tools/error-list/error-list.factor
rename to frameworks/ui/tools/error-list/error-list.factor
diff --git a/basis/ui/tools/error-list/icons/compiler-error.tiff b/frameworks/ui/tools/error-list/icons/compiler-error.tiff
similarity index 100%
rename from basis/ui/tools/error-list/icons/compiler-error.tiff
rename to frameworks/ui/tools/error-list/icons/compiler-error.tiff
diff --git a/basis/ui/tools/error-list/icons/deprecation-note.tiff b/frameworks/ui/tools/error-list/icons/deprecation-note.tiff
similarity index 100%
rename from basis/ui/tools/error-list/icons/deprecation-note.tiff
rename to frameworks/ui/tools/error-list/icons/deprecation-note.tiff
diff --git a/basis/ui/tools/error-list/icons/help-lint-error.tiff b/frameworks/ui/tools/error-list/icons/help-lint-error.tiff
similarity index 100%
rename from basis/ui/tools/error-list/icons/help-lint-error.tiff
rename to frameworks/ui/tools/error-list/icons/help-lint-error.tiff
diff --git a/basis/ui/tools/error-list/icons/linkage-error.tiff b/frameworks/ui/tools/error-list/icons/linkage-error.tiff
similarity index 100%
rename from basis/ui/tools/error-list/icons/linkage-error.tiff
rename to frameworks/ui/tools/error-list/icons/linkage-error.tiff
diff --git a/basis/ui/tools/error-list/icons/note.tiff b/frameworks/ui/tools/error-list/icons/note.tiff
similarity index 100%
rename from basis/ui/tools/error-list/icons/note.tiff
rename to frameworks/ui/tools/error-list/icons/note.tiff
diff --git a/basis/ui/tools/error-list/icons/source-file.tiff b/frameworks/ui/tools/error-list/icons/source-file.tiff
similarity index 100%
rename from basis/ui/tools/error-list/icons/source-file.tiff
rename to frameworks/ui/tools/error-list/icons/source-file.tiff
diff --git a/basis/ui/tools/error-list/icons/syntax-error.tiff b/frameworks/ui/tools/error-list/icons/syntax-error.tiff
similarity index 100%
rename from basis/ui/tools/error-list/icons/syntax-error.tiff
rename to frameworks/ui/tools/error-list/icons/syntax-error.tiff
diff --git a/basis/ui/tools/error-list/icons/unit-test-error.tiff b/frameworks/ui/tools/error-list/icons/unit-test-error.tiff
similarity index 100%
rename from basis/ui/tools/error-list/icons/unit-test-error.tiff
rename to frameworks/ui/tools/error-list/icons/unit-test-error.tiff
diff --git a/basis/ui/tools/error-list/icons/user-init-error.tiff b/frameworks/ui/tools/error-list/icons/user-init-error.tiff
similarity index 100%
rename from basis/ui/tools/error-list/icons/user-init-error.tiff
rename to frameworks/ui/tools/error-list/icons/user-init-error.tiff
diff --git a/extra/benchmark/mandel/authors.txt b/frameworks/ui/tools/inspector/authors.txt
similarity index 100%
rename from extra/benchmark/mandel/authors.txt
rename to frameworks/ui/tools/inspector/authors.txt
diff --git a/basis/ui/tools/inspector/inspector-docs.factor b/frameworks/ui/tools/inspector/inspector-docs.factor
similarity index 100%
rename from basis/ui/tools/inspector/inspector-docs.factor
rename to frameworks/ui/tools/inspector/inspector-docs.factor
diff --git a/basis/ui/tools/inspector/inspector-tests.factor b/frameworks/ui/tools/inspector/inspector-tests.factor
similarity index 100%
rename from basis/ui/tools/inspector/inspector-tests.factor
rename to frameworks/ui/tools/inspector/inspector-tests.factor
diff --git a/basis/ui/tools/inspector/inspector.factor b/frameworks/ui/tools/inspector/inspector.factor
similarity index 100%
rename from basis/ui/tools/inspector/inspector.factor
rename to frameworks/ui/tools/inspector/inspector.factor
diff --git a/basis/ui/tools/inspector/summary.txt b/frameworks/ui/tools/inspector/summary.txt
similarity index 100%
rename from basis/ui/tools/inspector/summary.txt
rename to frameworks/ui/tools/inspector/summary.txt
diff --git a/basis/ui/tools/browser/tags.txt b/frameworks/ui/tools/inspector/tags.txt
similarity index 100%
rename from basis/ui/tools/browser/tags.txt
rename to frameworks/ui/tools/inspector/tags.txt
diff --git a/extra/benchmark/nsieve-bits/authors.txt b/frameworks/ui/tools/listener/authors.txt
similarity index 100%
rename from extra/benchmark/nsieve-bits/authors.txt
rename to frameworks/ui/tools/listener/authors.txt
diff --git a/extra/smalltalk/authors.txt b/frameworks/ui/tools/listener/completion/authors.txt
similarity index 100%
rename from extra/smalltalk/authors.txt
rename to frameworks/ui/tools/listener/completion/authors.txt
diff --git a/basis/ui/tools/listener/completion/completion.factor b/frameworks/ui/tools/listener/completion/completion.factor
similarity index 100%
rename from basis/ui/tools/listener/completion/completion.factor
rename to frameworks/ui/tools/listener/completion/completion.factor
diff --git a/extra/smalltalk/classes/authors.txt b/frameworks/ui/tools/listener/history/authors.txt
similarity index 100%
rename from extra/smalltalk/classes/authors.txt
rename to frameworks/ui/tools/listener/history/authors.txt
diff --git a/basis/ui/tools/listener/history/history-tests.factor b/frameworks/ui/tools/listener/history/history-tests.factor
similarity index 100%
rename from basis/ui/tools/listener/history/history-tests.factor
rename to frameworks/ui/tools/listener/history/history-tests.factor
diff --git a/basis/ui/tools/listener/history/history.factor b/frameworks/ui/tools/listener/history/history.factor
similarity index 100%
rename from basis/ui/tools/listener/history/history.factor
rename to frameworks/ui/tools/listener/history/history.factor
diff --git a/basis/ui/tools/listener/listener-docs.factor b/frameworks/ui/tools/listener/listener-docs.factor
similarity index 100%
rename from basis/ui/tools/listener/listener-docs.factor
rename to frameworks/ui/tools/listener/listener-docs.factor
diff --git a/basis/ui/tools/listener/listener-tests.factor b/frameworks/ui/tools/listener/listener-tests.factor
similarity index 100%
rename from basis/ui/tools/listener/listener-tests.factor
rename to frameworks/ui/tools/listener/listener-tests.factor
diff --git a/basis/ui/tools/listener/listener.factor b/frameworks/ui/tools/listener/listener.factor
similarity index 100%
rename from basis/ui/tools/listener/listener.factor
rename to frameworks/ui/tools/listener/listener.factor
diff --git a/extra/smalltalk/compiler/assignment/authors.txt b/frameworks/ui/tools/listener/popups/authors.txt
similarity index 100%
rename from extra/smalltalk/compiler/assignment/authors.txt
rename to frameworks/ui/tools/listener/popups/authors.txt
diff --git a/basis/ui/tools/listener/popups/popups-tests.factor b/frameworks/ui/tools/listener/popups/popups-tests.factor
similarity index 100%
rename from basis/ui/tools/listener/popups/popups-tests.factor
rename to frameworks/ui/tools/listener/popups/popups-tests.factor
diff --git a/basis/ui/tools/listener/popups/popups.factor b/frameworks/ui/tools/listener/popups/popups.factor
similarity index 100%
rename from basis/ui/tools/listener/popups/popups.factor
rename to frameworks/ui/tools/listener/popups/popups.factor
diff --git a/basis/ui/tools/listener/summary.txt b/frameworks/ui/tools/listener/summary.txt
similarity index 100%
rename from basis/ui/tools/listener/summary.txt
rename to frameworks/ui/tools/listener/summary.txt
diff --git a/basis/ui/tools/debugger/tags.txt b/frameworks/ui/tools/listener/tags.txt
similarity index 100%
rename from basis/ui/tools/debugger/tags.txt
rename to frameworks/ui/tools/listener/tags.txt
diff --git a/extra/benchmark/nsieve/authors.txt b/frameworks/ui/tools/operations/authors.txt
similarity index 100%
rename from extra/benchmark/nsieve/authors.txt
rename to frameworks/ui/tools/operations/authors.txt
diff --git a/basis/ui/tools/operations/operations-docs.factor b/frameworks/ui/tools/operations/operations-docs.factor
similarity index 100%
rename from basis/ui/tools/operations/operations-docs.factor
rename to frameworks/ui/tools/operations/operations-docs.factor
diff --git a/basis/ui/tools/operations/operations.factor b/frameworks/ui/tools/operations/operations.factor
similarity index 100%
rename from basis/ui/tools/operations/operations.factor
rename to frameworks/ui/tools/operations/operations.factor
diff --git a/basis/ui/tools/operations/summary.txt b/frameworks/ui/tools/operations/summary.txt
similarity index 100%
rename from basis/ui/tools/operations/summary.txt
rename to frameworks/ui/tools/operations/summary.txt
diff --git a/basis/ui/tools/summary.txt b/frameworks/ui/tools/summary.txt
similarity index 100%
rename from basis/ui/tools/summary.txt
rename to frameworks/ui/tools/summary.txt
diff --git a/basis/ui/tools/inspector/tags.txt b/frameworks/ui/tools/tags.txt
similarity index 100%
rename from basis/ui/tools/inspector/tags.txt
rename to frameworks/ui/tools/tags.txt
diff --git a/basis/ui/tools/tools-docs.factor b/frameworks/ui/tools/tools-docs.factor
similarity index 100%
rename from basis/ui/tools/tools-docs.factor
rename to frameworks/ui/tools/tools-docs.factor
diff --git a/basis/ui/tools/tools.factor b/frameworks/ui/tools/tools.factor
similarity index 100%
rename from basis/ui/tools/tools.factor
rename to frameworks/ui/tools/tools.factor
diff --git a/extra/benchmark/partial-sums/authors.txt b/frameworks/ui/tools/traceback/authors.txt
similarity index 100%
rename from extra/benchmark/partial-sums/authors.txt
rename to frameworks/ui/tools/traceback/authors.txt
diff --git a/basis/ui/tools/traceback/summary.txt b/frameworks/ui/tools/traceback/summary.txt
similarity index 100%
rename from basis/ui/tools/traceback/summary.txt
rename to frameworks/ui/tools/traceback/summary.txt
diff --git a/basis/ui/tools/traceback/traceback.factor b/frameworks/ui/tools/traceback/traceback.factor
similarity index 100%
rename from basis/ui/tools/traceback/traceback.factor
rename to frameworks/ui/tools/traceback/traceback.factor
diff --git a/extra/benchmark/raytracer/authors.txt b/frameworks/ui/tools/walker/authors.txt
similarity index 100%
rename from extra/benchmark/raytracer/authors.txt
rename to frameworks/ui/tools/walker/authors.txt
diff --git a/basis/ui/tools/walker/summary.txt b/frameworks/ui/tools/walker/summary.txt
similarity index 100%
rename from basis/ui/tools/walker/summary.txt
rename to frameworks/ui/tools/walker/summary.txt
diff --git a/basis/ui/tools/listener/tags.txt b/frameworks/ui/tools/walker/tags.txt
similarity index 100%
rename from basis/ui/tools/listener/tags.txt
rename to frameworks/ui/tools/walker/tags.txt
diff --git a/basis/ui/tools/walker/walker-docs.factor b/frameworks/ui/tools/walker/walker-docs.factor
similarity index 100%
rename from basis/ui/tools/walker/walker-docs.factor
rename to frameworks/ui/tools/walker/walker-docs.factor
diff --git a/basis/ui/tools/walker/walker-tests.factor b/frameworks/ui/tools/walker/walker-tests.factor
similarity index 100%
rename from basis/ui/tools/walker/walker-tests.factor
rename to frameworks/ui/tools/walker/walker-tests.factor
diff --git a/basis/ui/tools/walker/walker.factor b/frameworks/ui/tools/walker/walker.factor
similarity index 100%
rename from basis/ui/tools/walker/walker.factor
rename to frameworks/ui/tools/walker/walker.factor
diff --git a/extra/benchmark/recursive/authors.txt b/frameworks/ui/traverse/authors.txt
similarity index 100%
rename from extra/benchmark/recursive/authors.txt
rename to frameworks/ui/traverse/authors.txt
diff --git a/basis/ui/traverse/summary.txt b/frameworks/ui/traverse/summary.txt
similarity index 100%
rename from basis/ui/traverse/summary.txt
rename to frameworks/ui/traverse/summary.txt
diff --git a/basis/ui/traverse/traverse-tests.factor b/frameworks/ui/traverse/traverse-tests.factor
similarity index 100%
rename from basis/ui/traverse/traverse-tests.factor
rename to frameworks/ui/traverse/traverse-tests.factor
diff --git a/basis/ui/traverse/traverse.factor b/frameworks/ui/traverse/traverse.factor
similarity index 100%
rename from basis/ui/traverse/traverse.factor
rename to frameworks/ui/traverse/traverse.factor
diff --git a/basis/ui/ui-docs.factor b/frameworks/ui/ui-docs.factor
similarity index 100%
rename from basis/ui/ui-docs.factor
rename to frameworks/ui/ui-docs.factor
diff --git a/basis/ui/ui.factor b/frameworks/ui/ui.factor
similarity index 100%
rename from basis/ui/ui.factor
rename to frameworks/ui/ui.factor
diff --git a/extra/ui/utils/utils.factor b/frameworks/ui/utils/utils.factor
similarity index 100%
rename from extra/ui/utils/utils.factor
rename to frameworks/ui/utils/utils.factor
diff --git a/extra/24-game/24-game-docs.factor b/games/24-game/24-game-docs.factor
similarity index 100%
rename from extra/24-game/24-game-docs.factor
rename to games/24-game/24-game-docs.factor
diff --git a/extra/24-game/24-game-tests.factor b/games/24-game/24-game-tests.factor
similarity index 100%
rename from extra/24-game/24-game-tests.factor
rename to games/24-game/24-game-tests.factor
diff --git a/extra/24-game/24-game.factor b/games/24-game/24-game.factor
similarity index 100%
rename from extra/24-game/24-game.factor
rename to games/24-game/24-game.factor
diff --git a/extra/24-game/authors.txt b/games/24-game/authors.txt
similarity index 100%
rename from extra/24-game/authors.txt
rename to games/24-game/authors.txt
diff --git a/extra/24-game/tags.txt b/games/24-game/tags.txt
similarity index 100%
rename from extra/24-game/tags.txt
rename to games/24-game/tags.txt
diff --git a/extra/nehe/5/authors.txt b/games/balloon-bomber/authors.txt
similarity index 100%
rename from extra/nehe/5/authors.txt
rename to games/balloon-bomber/authors.txt
diff --git a/extra/balloon-bomber/balloon-bomber-docs.factor b/games/balloon-bomber/balloon-bomber-docs.factor
similarity index 100%
rename from extra/balloon-bomber/balloon-bomber-docs.factor
rename to games/balloon-bomber/balloon-bomber-docs.factor
diff --git a/extra/balloon-bomber/balloon-bomber.factor b/games/balloon-bomber/balloon-bomber.factor
similarity index 100%
rename from extra/balloon-bomber/balloon-bomber.factor
rename to games/balloon-bomber/balloon-bomber.factor
diff --git a/extra/balloon-bomber/summary.txt b/games/balloon-bomber/summary.txt
similarity index 100%
rename from extra/balloon-bomber/summary.txt
rename to games/balloon-bomber/summary.txt
diff --git a/extra/balloon-bomber/tags.txt b/games/balloon-bomber/tags.txt
similarity index 100%
rename from extra/balloon-bomber/tags.txt
rename to games/balloon-bomber/tags.txt
diff --git a/extra/lua/authors.txt b/games/fluids/authors.txt
similarity index 100%
rename from extra/lua/authors.txt
rename to games/fluids/authors.txt
diff --git a/extra/fluids/colors.ppm b/games/fluids/colors.ppm
similarity index 100%
rename from extra/fluids/colors.ppm
rename to games/fluids/colors.ppm
diff --git a/extra/fluids/fluids.factor b/games/fluids/fluids.factor
similarity index 100%
rename from extra/fluids/fluids.factor
rename to games/fluids/fluids.factor
diff --git a/extra/fluids/particle2.pgm b/games/fluids/particle2.pgm
similarity index 100%
rename from extra/fluids/particle2.pgm
rename to games/fluids/particle2.pgm
diff --git a/extra/fluids/resources.txt b/games/fluids/resources.txt
similarity index 100%
rename from extra/fluids/resources.txt
rename to games/fluids/resources.txt
diff --git a/extra/gopher/authors.txt b/games/hamurabi/authors.txt
similarity index 100%
rename from extra/gopher/authors.txt
rename to games/hamurabi/authors.txt
diff --git a/extra/hamurabi/hamurabi.factor b/games/hamurabi/hamurabi.factor
similarity index 100%
rename from extra/hamurabi/hamurabi.factor
rename to games/hamurabi/hamurabi.factor
diff --git a/extra/hamurabi/summary.txt b/games/hamurabi/summary.txt
similarity index 100%
rename from extra/hamurabi/summary.txt
rename to games/hamurabi/summary.txt
diff --git a/extra/jamshred/gl/authors.txt b/games/jamshred/authors.txt
similarity index 100%
rename from extra/jamshred/gl/authors.txt
rename to games/jamshred/authors.txt
diff --git a/extra/jamshred/deploy.factor b/games/jamshred/deploy.factor
similarity index 100%
rename from extra/jamshred/deploy.factor
rename to games/jamshred/deploy.factor
diff --git a/extra/jamshred/oint/authors.txt b/games/jamshred/game/authors.txt
similarity index 100%
rename from extra/jamshred/oint/authors.txt
rename to games/jamshred/game/authors.txt
diff --git a/extra/jamshred/game/game.factor b/games/jamshred/game/game.factor
similarity index 100%
rename from extra/jamshred/game/game.factor
rename to games/jamshred/game/game.factor
diff --git a/extra/jamshred/player/authors.txt b/games/jamshred/gl/authors.txt
similarity index 100%
rename from extra/jamshred/player/authors.txt
rename to games/jamshred/gl/authors.txt
diff --git a/extra/jamshred/gl/gl.factor b/games/jamshred/gl/gl.factor
similarity index 100%
rename from extra/jamshred/gl/gl.factor
rename to games/jamshred/gl/gl.factor
diff --git a/extra/jamshred/jamshred.factor b/games/jamshred/jamshred.factor
similarity index 100%
rename from extra/jamshred/jamshred.factor
rename to games/jamshred/jamshred.factor
diff --git a/extra/jamshred/log/log.factor b/games/jamshred/log/log.factor
similarity index 100%
rename from extra/jamshred/log/log.factor
rename to games/jamshred/log/log.factor
diff --git a/extra/jamshred/tunnel/authors.txt b/games/jamshred/oint/authors.txt
similarity index 100%
rename from extra/jamshred/tunnel/authors.txt
rename to games/jamshred/oint/authors.txt
diff --git a/extra/jamshred/oint/oint-tests.factor b/games/jamshred/oint/oint-tests.factor
similarity index 100%
rename from extra/jamshred/oint/oint-tests.factor
rename to games/jamshred/oint/oint-tests.factor
diff --git a/extra/jamshred/oint/oint.factor b/games/jamshred/oint/oint.factor
similarity index 100%
rename from extra/jamshred/oint/oint.factor
rename to games/jamshred/oint/oint.factor
diff --git a/extra/opengl/glu/authors.txt b/games/jamshred/player/authors.txt
similarity index 100%
rename from extra/opengl/glu/authors.txt
rename to games/jamshred/player/authors.txt
diff --git a/extra/jamshred/player/player.factor b/games/jamshred/player/player.factor
similarity index 100%
rename from extra/jamshred/player/player.factor
rename to games/jamshred/player/player.factor
diff --git a/extra/jamshred/sound/sound.factor b/games/jamshred/sound/sound.factor
similarity index 100%
rename from extra/jamshred/sound/sound.factor
rename to games/jamshred/sound/sound.factor
diff --git a/extra/jamshred/summary.txt b/games/jamshred/summary.txt
similarity index 100%
rename from extra/jamshred/summary.txt
rename to games/jamshred/summary.txt
diff --git a/extra/jamshred/tags.txt b/games/jamshred/tags.txt
similarity index 100%
rename from extra/jamshred/tags.txt
rename to games/jamshred/tags.txt
diff --git a/extra/sequences/repeating/authors.txt b/games/jamshred/tunnel/authors.txt
similarity index 100%
rename from extra/sequences/repeating/authors.txt
rename to games/jamshred/tunnel/authors.txt
diff --git a/extra/jamshred/tunnel/tunnel-tests.factor b/games/jamshred/tunnel/tunnel-tests.factor
similarity index 100%
rename from extra/jamshred/tunnel/tunnel-tests.factor
rename to games/jamshred/tunnel/tunnel-tests.factor
diff --git a/extra/jamshred/tunnel/tunnel.factor b/games/jamshred/tunnel/tunnel.factor
similarity index 100%
rename from extra/jamshred/tunnel/tunnel.factor
rename to games/jamshred/tunnel/tunnel.factor
diff --git a/extra/nehe/authors.txt b/games/lunar-rescue/authors.txt
similarity index 100%
rename from extra/nehe/authors.txt
rename to games/lunar-rescue/authors.txt
diff --git a/extra/lunar-rescue/lunar-rescue-docs.factor b/games/lunar-rescue/lunar-rescue-docs.factor
similarity index 100%
rename from extra/lunar-rescue/lunar-rescue-docs.factor
rename to games/lunar-rescue/lunar-rescue-docs.factor
diff --git a/extra/lunar-rescue/lunar-rescue.factor b/games/lunar-rescue/lunar-rescue.factor
similarity index 100%
rename from extra/lunar-rescue/lunar-rescue.factor
rename to games/lunar-rescue/lunar-rescue.factor
diff --git a/extra/lunar-rescue/summary.txt b/games/lunar-rescue/summary.txt
similarity index 100%
rename from extra/lunar-rescue/summary.txt
rename to games/lunar-rescue/summary.txt
diff --git a/extra/lunar-rescue/tags.txt b/games/lunar-rescue/tags.txt
similarity index 100%
rename from extra/lunar-rescue/tags.txt
rename to games/lunar-rescue/tags.txt
diff --git a/extra/benchmark/reverse-complement/authors.txt b/games/numbers-game/authors.txt
similarity index 100%
rename from extra/benchmark/reverse-complement/authors.txt
rename to games/numbers-game/authors.txt
diff --git a/extra/numbers-game/numbers-game.factor b/games/numbers-game/numbers-game.factor
similarity index 100%
rename from extra/numbers-game/numbers-game.factor
rename to games/numbers-game/numbers-game.factor
diff --git a/extra/numbers-game/summary.txt b/games/numbers-game/summary.txt
similarity index 100%
rename from extra/numbers-game/summary.txt
rename to games/numbers-game/summary.txt
diff --git a/extra/talks/minneapolis-talk/tags.txt b/games/numbers-game/tags.txt
similarity index 100%
rename from extra/talks/minneapolis-talk/tags.txt
rename to games/numbers-game/tags.txt
diff --git a/extra/snake-game/_resources/background.png b/games/snake-game/_resources/background.png
similarity index 100%
rename from extra/snake-game/_resources/background.png
rename to games/snake-game/_resources/background.png
diff --git a/extra/snake-game/_resources/body.png b/games/snake-game/_resources/body.png
similarity index 100%
rename from extra/snake-game/_resources/body.png
rename to games/snake-game/_resources/body.png
diff --git a/extra/snake-game/_resources/food.png b/games/snake-game/_resources/food.png
similarity index 100%
rename from extra/snake-game/_resources/food.png
rename to games/snake-game/_resources/food.png
diff --git a/extra/snake-game/_resources/head.png b/games/snake-game/_resources/head.png
similarity index 100%
rename from extra/snake-game/_resources/head.png
rename to games/snake-game/_resources/head.png
diff --git a/extra/snake-game/_resources/tail.png b/games/snake-game/_resources/tail.png
similarity index 100%
rename from extra/snake-game/_resources/tail.png
rename to games/snake-game/_resources/tail.png
diff --git a/extra/snake-game/constants/constants.factor b/games/snake-game/constants/constants.factor
similarity index 100%
rename from extra/snake-game/constants/constants.factor
rename to games/snake-game/constants/constants.factor
diff --git a/extra/snake-game/game/game.factor b/games/snake-game/game/game.factor
similarity index 100%
rename from extra/snake-game/game/game.factor
rename to games/snake-game/game/game.factor
diff --git a/extra/snake-game/input/input.factor b/games/snake-game/input/input.factor
similarity index 100%
rename from extra/snake-game/input/input.factor
rename to games/snake-game/input/input.factor
diff --git a/extra/snake-game/snake-game-docs.factor b/games/snake-game/snake-game-docs.factor
similarity index 100%
rename from extra/snake-game/snake-game-docs.factor
rename to games/snake-game/snake-game-docs.factor
diff --git a/extra/snake-game/snake-game.factor b/games/snake-game/snake-game.factor
similarity index 100%
rename from extra/snake-game/snake-game.factor
rename to games/snake-game/snake-game.factor
diff --git a/extra/snake-game/sprites/sprites.factor b/games/snake-game/sprites/sprites.factor
similarity index 100%
rename from extra/snake-game/sprites/sprites.factor
rename to games/snake-game/sprites/sprites.factor
diff --git a/extra/snake-game/ui/ui.factor b/games/snake-game/ui/ui.factor
similarity index 100%
rename from extra/snake-game/ui/ui.factor
rename to games/snake-game/ui/ui.factor
diff --git a/extra/snake-game/util/util.factor b/games/snake-game/util/util.factor
similarity index 100%
rename from extra/snake-game/util/util.factor
rename to games/snake-game/util/util.factor
diff --git a/extra/space-invaders/authors.txt b/games/space-invaders/authors.txt
similarity index 100%
rename from extra/space-invaders/authors.txt
rename to games/space-invaders/authors.txt
diff --git a/extra/space-invaders/resources/BaseHit.wav b/games/space-invaders/resources/BaseHit.wav
similarity index 100%
rename from extra/space-invaders/resources/BaseHit.wav
rename to games/space-invaders/resources/BaseHit.wav
diff --git a/extra/space-invaders/resources/InvHit.Wav b/games/space-invaders/resources/InvHit.Wav
similarity index 100%
rename from extra/space-invaders/resources/InvHit.Wav
rename to games/space-invaders/resources/InvHit.Wav
diff --git a/extra/space-invaders/resources/Shot.wav b/games/space-invaders/resources/Shot.wav
similarity index 100%
rename from extra/space-invaders/resources/Shot.wav
rename to games/space-invaders/resources/Shot.wav
diff --git a/extra/space-invaders/resources/Ufo.wav b/games/space-invaders/resources/Ufo.wav
similarity index 100%
rename from extra/space-invaders/resources/Ufo.wav
rename to games/space-invaders/resources/Ufo.wav
diff --git a/extra/space-invaders/resources/UfoHit.wav b/games/space-invaders/resources/UfoHit.wav
similarity index 100%
rename from extra/space-invaders/resources/UfoHit.wav
rename to games/space-invaders/resources/UfoHit.wav
diff --git a/extra/space-invaders/resources/Walk1.wav b/games/space-invaders/resources/Walk1.wav
similarity index 100%
rename from extra/space-invaders/resources/Walk1.wav
rename to games/space-invaders/resources/Walk1.wav
diff --git a/extra/space-invaders/resources/Walk2.wav b/games/space-invaders/resources/Walk2.wav
similarity index 100%
rename from extra/space-invaders/resources/Walk2.wav
rename to games/space-invaders/resources/Walk2.wav
diff --git a/extra/space-invaders/resources/Walk3.wav b/games/space-invaders/resources/Walk3.wav
similarity index 100%
rename from extra/space-invaders/resources/Walk3.wav
rename to games/space-invaders/resources/Walk3.wav
diff --git a/extra/space-invaders/resources/Walk4.wav b/games/space-invaders/resources/Walk4.wav
similarity index 100%
rename from extra/space-invaders/resources/Walk4.wav
rename to games/space-invaders/resources/Walk4.wav
diff --git a/extra/space-invaders/space-invaders-docs.factor b/games/space-invaders/space-invaders-docs.factor
similarity index 100%
rename from extra/space-invaders/space-invaders-docs.factor
rename to games/space-invaders/space-invaders-docs.factor
diff --git a/extra/space-invaders/space-invaders.factor b/games/space-invaders/space-invaders.factor
similarity index 100%
rename from extra/space-invaders/space-invaders.factor
rename to games/space-invaders/space-invaders.factor
diff --git a/extra/space-invaders/summary.txt b/games/space-invaders/summary.txt
similarity index 100%
rename from extra/space-invaders/summary.txt
rename to games/space-invaders/summary.txt
diff --git a/extra/space-invaders/tags.txt b/games/space-invaders/tags.txt
similarity index 100%
rename from extra/space-invaders/tags.txt
rename to games/space-invaders/tags.txt
diff --git a/extra/benchmark/ring/authors.txt b/games/sudoku/authors.txt
similarity index 100%
rename from extra/benchmark/ring/authors.txt
rename to games/sudoku/authors.txt
diff --git a/extra/sudoku/deploy.factor b/games/sudoku/deploy.factor
similarity index 100%
rename from extra/sudoku/deploy.factor
rename to games/sudoku/deploy.factor
diff --git a/extra/sudoku/sudoku-tests.factor b/games/sudoku/sudoku-tests.factor
similarity index 100%
rename from extra/sudoku/sudoku-tests.factor
rename to games/sudoku/sudoku-tests.factor
diff --git a/extra/sudoku/sudoku.factor b/games/sudoku/sudoku.factor
similarity index 100%
rename from extra/sudoku/sudoku.factor
rename to games/sudoku/sudoku.factor
diff --git a/extra/sudoku/summary.txt b/games/sudoku/summary.txt
similarity index 100%
rename from extra/sudoku/summary.txt
rename to games/sudoku/summary.txt
diff --git a/extra/talks/otug-talk/tags.txt b/games/sudoku/tags.txt
similarity index 100%
rename from extra/talks/otug-talk/tags.txt
rename to games/sudoku/tags.txt
diff --git a/extra/codebook/authors.txt b/games/terrain/authors.txt
similarity index 100%
rename from extra/codebook/authors.txt
rename to games/terrain/authors.txt
diff --git a/extra/terrain/deploy.factor b/games/terrain/deploy.factor
similarity index 100%
rename from extra/terrain/deploy.factor
rename to games/terrain/deploy.factor
diff --git a/extra/terrain/generation/generation.factor b/games/terrain/generation/generation.factor
similarity index 100%
rename from extra/terrain/generation/generation.factor
rename to games/terrain/generation/generation.factor
diff --git a/extra/terrain/shaders/shaders.factor b/games/terrain/shaders/shaders.factor
similarity index 100%
rename from extra/terrain/shaders/shaders.factor
rename to games/terrain/shaders/shaders.factor
diff --git a/extra/terrain/summary.txt b/games/terrain/summary.txt
similarity index 100%
rename from extra/terrain/summary.txt
rename to games/terrain/summary.txt
diff --git a/extra/talks/vpri-talk/tags.txt b/games/terrain/tags.txt
similarity index 100%
rename from extra/talks/vpri-talk/tags.txt
rename to games/terrain/tags.txt
diff --git a/extra/terrain/terrain.factor b/games/terrain/terrain.factor
similarity index 100%
rename from extra/terrain/terrain.factor
rename to games/terrain/terrain.factor
diff --git a/extra/tetris/README.txt b/games/tetris/README.txt
similarity index 100%
rename from extra/tetris/README.txt
rename to games/tetris/README.txt
diff --git a/extra/tetris/authors.txt b/games/tetris/authors.txt
similarity index 100%
rename from extra/tetris/authors.txt
rename to games/tetris/authors.txt
diff --git a/extra/tetris/board/authors.txt b/games/tetris/board/authors.txt
similarity index 100%
rename from extra/tetris/board/authors.txt
rename to games/tetris/board/authors.txt
diff --git a/extra/tetris/board/board-tests.factor b/games/tetris/board/board-tests.factor
similarity index 100%
rename from extra/tetris/board/board-tests.factor
rename to games/tetris/board/board-tests.factor
diff --git a/extra/tetris/board/board.factor b/games/tetris/board/board.factor
similarity index 100%
rename from extra/tetris/board/board.factor
rename to games/tetris/board/board.factor
diff --git a/extra/tetris/deploy.factor b/games/tetris/deploy.factor
similarity index 100%
rename from extra/tetris/deploy.factor
rename to games/tetris/deploy.factor
diff --git a/extra/tetris/game/authors.txt b/games/tetris/game/authors.txt
similarity index 100%
rename from extra/tetris/game/authors.txt
rename to games/tetris/game/authors.txt
diff --git a/extra/tetris/game/game-tests.factor b/games/tetris/game/game-tests.factor
similarity index 100%
rename from extra/tetris/game/game-tests.factor
rename to games/tetris/game/game-tests.factor
diff --git a/extra/tetris/game/game.factor b/games/tetris/game/game.factor
similarity index 100%
rename from extra/tetris/game/game.factor
rename to games/tetris/game/game.factor
diff --git a/extra/tetris/gl/authors.txt b/games/tetris/gl/authors.txt
similarity index 100%
rename from extra/tetris/gl/authors.txt
rename to games/tetris/gl/authors.txt
diff --git a/extra/tetris/gl/gl.factor b/games/tetris/gl/gl.factor
similarity index 100%
rename from extra/tetris/gl/gl.factor
rename to games/tetris/gl/gl.factor
diff --git a/extra/tetris/piece/authors.txt b/games/tetris/piece/authors.txt
similarity index 100%
rename from extra/tetris/piece/authors.txt
rename to games/tetris/piece/authors.txt
diff --git a/extra/tetris/piece/piece-tests.factor b/games/tetris/piece/piece-tests.factor
similarity index 100%
rename from extra/tetris/piece/piece-tests.factor
rename to games/tetris/piece/piece-tests.factor
diff --git a/extra/tetris/piece/piece.factor b/games/tetris/piece/piece.factor
similarity index 100%
rename from extra/tetris/piece/piece.factor
rename to games/tetris/piece/piece.factor
diff --git a/extra/tetris/summary.txt b/games/tetris/summary.txt
similarity index 100%
rename from extra/tetris/summary.txt
rename to games/tetris/summary.txt
diff --git a/extra/tetris/tags.txt b/games/tetris/tags.txt
similarity index 100%
rename from extra/tetris/tags.txt
rename to games/tetris/tags.txt
diff --git a/extra/tetris/tetris.factor b/games/tetris/tetris.factor
similarity index 100%
rename from extra/tetris/tetris.factor
rename to games/tetris/tetris.factor
diff --git a/extra/tetris/tetromino/authors.txt b/games/tetris/tetromino/authors.txt
similarity index 100%
rename from extra/tetris/tetromino/authors.txt
rename to games/tetris/tetromino/authors.txt
diff --git a/extra/tetris/tetromino/tetromino.factor b/games/tetris/tetromino/tetromino.factor
similarity index 100%
rename from extra/tetris/tetromino/tetromino.factor
rename to games/tetris/tetromino/tetromino.factor
diff --git a/basis/alien/arrays/arrays.factor b/language/alien/arrays/arrays.factor
similarity index 100%
rename from basis/alien/arrays/arrays.factor
rename to language/alien/arrays/arrays.factor
diff --git a/extra/benchmark/sha1/authors.txt b/language/alien/arrays/authors.txt
similarity index 100%
rename from extra/benchmark/sha1/authors.txt
rename to language/alien/arrays/authors.txt
diff --git a/basis/alien/arrays/summary.txt b/language/alien/arrays/summary.txt
similarity index 100%
rename from basis/alien/arrays/summary.txt
rename to language/alien/arrays/summary.txt
diff --git a/extra/smalltalk/compiler/authors.txt b/language/alien/complex/authors.txt
similarity index 100%
rename from extra/smalltalk/compiler/authors.txt
rename to language/alien/complex/authors.txt
diff --git a/basis/alien/complex/complex-docs.factor b/language/alien/complex/complex-docs.factor
similarity index 100%
rename from basis/alien/complex/complex-docs.factor
rename to language/alien/complex/complex-docs.factor
diff --git a/basis/alien/complex/complex-tests.factor b/language/alien/complex/complex-tests.factor
similarity index 100%
rename from basis/alien/complex/complex-tests.factor
rename to language/alien/complex/complex-tests.factor
diff --git a/basis/alien/complex/complex.factor b/language/alien/complex/complex.factor
similarity index 100%
rename from basis/alien/complex/complex.factor
rename to language/alien/complex/complex.factor
diff --git a/extra/smalltalk/compiler/lexenv/authors.txt b/language/alien/complex/functor/authors.txt
similarity index 100%
rename from extra/smalltalk/compiler/lexenv/authors.txt
rename to language/alien/complex/functor/authors.txt
diff --git a/basis/alien/complex/functor/functor.factor b/language/alien/complex/functor/functor.factor
similarity index 100%
rename from basis/alien/complex/functor/functor.factor
rename to language/alien/complex/functor/functor.factor
diff --git a/basis/alien/complex/functor/summary.txt b/language/alien/complex/functor/summary.txt
similarity index 100%
rename from basis/alien/complex/functor/summary.txt
rename to language/alien/complex/functor/summary.txt
diff --git a/basis/alien/complex/summary.txt b/language/alien/complex/summary.txt
similarity index 100%
rename from basis/alien/complex/summary.txt
rename to language/alien/complex/summary.txt
diff --git a/extra/alien/cxx/cxx.factor b/language/alien/cxx/cxx.factor
similarity index 100%
rename from extra/alien/cxx/cxx.factor
rename to language/alien/cxx/cxx.factor
diff --git a/extra/alien/cxx/demangle/demangle.factor b/language/alien/cxx/demangle/demangle.factor
similarity index 100%
rename from extra/alien/cxx/demangle/demangle.factor
rename to language/alien/cxx/demangle/demangle.factor
diff --git a/extra/alien/cxx/demangle/libstdcxx/libstdcxx.factor b/language/alien/cxx/demangle/libstdcxx/libstdcxx.factor
similarity index 100%
rename from extra/alien/cxx/demangle/libstdcxx/libstdcxx.factor
rename to language/alien/cxx/demangle/libstdcxx/libstdcxx.factor
diff --git a/extra/alien/cxx/scaffold/scaffold.factor b/language/alien/cxx/scaffold/scaffold.factor
similarity index 100%
rename from extra/alien/cxx/scaffold/scaffold.factor
rename to language/alien/cxx/scaffold/scaffold.factor
diff --git a/extra/alien/cxx/tests/test.cpp b/language/alien/cxx/tests/test.cpp
similarity index 100%
rename from extra/alien/cxx/tests/test.cpp
rename to language/alien/cxx/tests/test.cpp
diff --git a/extra/benchmark/sort/authors.txt b/language/alien/data/authors.txt
similarity index 100%
rename from extra/benchmark/sort/authors.txt
rename to language/alien/data/authors.txt
diff --git a/basis/alien/data/data-docs.factor b/language/alien/data/data-docs.factor
similarity index 100%
rename from basis/alien/data/data-docs.factor
rename to language/alien/data/data-docs.factor
diff --git a/basis/alien/data/data-tests.factor b/language/alien/data/data-tests.factor
similarity index 100%
rename from basis/alien/data/data-tests.factor
rename to language/alien/data/data-tests.factor
diff --git a/basis/alien/data/data.factor b/language/alien/data/data.factor
similarity index 100%
rename from basis/alien/data/data.factor
rename to language/alien/data/data.factor
diff --git a/extra/sequences/inserters/authors.txt b/language/alien/data/map/authors.txt
similarity index 100%
rename from extra/sequences/inserters/authors.txt
rename to language/alien/data/map/authors.txt
diff --git a/extra/alien/data/map/map-tests.factor b/language/alien/data/map/map-tests.factor
similarity index 100%
rename from extra/alien/data/map/map-tests.factor
rename to language/alien/data/map/map-tests.factor
diff --git a/extra/alien/data/map/map.factor b/language/alien/data/map/map.factor
similarity index 100%
rename from extra/alien/data/map/map.factor
rename to language/alien/data/map/map.factor
diff --git a/extra/alien/data/map/summary.txt b/language/alien/data/map/summary.txt
similarity index 100%
rename from extra/alien/data/map/summary.txt
rename to language/alien/data/map/summary.txt
diff --git a/basis/alien/data/summary.txt b/language/alien/data/summary.txt
similarity index 100%
rename from basis/alien/data/summary.txt
rename to language/alien/data/summary.txt
diff --git a/extra/sequences/n-based/authors.txt b/language/alien/debugger/authors.txt
similarity index 100%
rename from extra/sequences/n-based/authors.txt
rename to language/alien/debugger/authors.txt
diff --git a/basis/alien/debugger/debugger.factor b/language/alien/debugger/debugger.factor
similarity index 100%
rename from basis/alien/debugger/debugger.factor
rename to language/alien/debugger/debugger.factor
diff --git a/extra/smalltalk/compiler/return/authors.txt b/language/alien/destructors/authors.txt
similarity index 100%
rename from extra/smalltalk/compiler/return/authors.txt
rename to language/alien/destructors/authors.txt
diff --git a/basis/alien/destructors/destructors-docs.factor b/language/alien/destructors/destructors-docs.factor
similarity index 100%
rename from basis/alien/destructors/destructors-docs.factor
rename to language/alien/destructors/destructors-docs.factor
diff --git a/basis/alien/destructors/destructors.factor b/language/alien/destructors/destructors.factor
similarity index 100%
rename from basis/alien/destructors/destructors.factor
rename to language/alien/destructors/destructors.factor
diff --git a/basis/alien/destructors/summary.txt b/language/alien/destructors/summary.txt
similarity index 100%
rename from basis/alien/destructors/summary.txt
rename to language/alien/destructors/summary.txt
diff --git a/extra/forestdb/paths/authors.txt b/language/alien/endian/authors.txt
similarity index 100%
rename from extra/forestdb/paths/authors.txt
rename to language/alien/endian/authors.txt
diff --git a/basis/alien/endian/endian-docs.factor b/language/alien/endian/endian-docs.factor
similarity index 100%
rename from basis/alien/endian/endian-docs.factor
rename to language/alien/endian/endian-docs.factor
diff --git a/basis/alien/endian/endian-tests.factor b/language/alien/endian/endian-tests.factor
similarity index 100%
rename from basis/alien/endian/endian-tests.factor
rename to language/alien/endian/endian-tests.factor
diff --git a/basis/alien/endian/endian.factor b/language/alien/endian/endian.factor
similarity index 100%
rename from basis/alien/endian/endian.factor
rename to language/alien/endian/endian.factor
diff --git a/basis/alien/enums/enums-docs.factor b/language/alien/enums/enums-docs.factor
similarity index 100%
rename from basis/alien/enums/enums-docs.factor
rename to language/alien/enums/enums-docs.factor
diff --git a/basis/alien/enums/enums-tests.factor b/language/alien/enums/enums-tests.factor
similarity index 100%
rename from basis/alien/enums/enums-tests.factor
rename to language/alien/enums/enums-tests.factor
diff --git a/basis/alien/enums/enums.factor b/language/alien/enums/enums.factor
similarity index 100%
rename from basis/alien/enums/enums.factor
rename to language/alien/enums/enums.factor
diff --git a/extra/spheres/authors.txt b/language/alien/fortran/authors.txt
similarity index 100%
rename from extra/spheres/authors.txt
rename to language/alien/fortran/authors.txt
diff --git a/extra/alien/fortran/fortran-docs.factor b/language/alien/fortran/fortran-docs.factor
similarity index 100%
rename from extra/alien/fortran/fortran-docs.factor
rename to language/alien/fortran/fortran-docs.factor
diff --git a/extra/alien/fortran/fortran-tests.factor b/language/alien/fortran/fortran-tests.factor
similarity index 100%
rename from extra/alien/fortran/fortran-tests.factor
rename to language/alien/fortran/fortran-tests.factor
diff --git a/extra/alien/fortran/fortran.factor b/language/alien/fortran/fortran.factor
similarity index 100%
rename from extra/alien/fortran/fortran.factor
rename to language/alien/fortran/fortran.factor
diff --git a/extra/alien/fortran/summary.txt b/language/alien/fortran/summary.txt
similarity index 100%
rename from extra/alien/fortran/summary.txt
rename to language/alien/fortran/summary.txt
diff --git a/extra/alien/fortran/tags.txt b/language/alien/fortran/tags.txt
similarity index 100%
rename from extra/alien/fortran/tags.txt
rename to language/alien/fortran/tags.txt
diff --git a/extra/vocabs/git/authors.txt b/language/alien/handles/authors.txt
similarity index 100%
rename from extra/vocabs/git/authors.txt
rename to language/alien/handles/authors.txt
diff --git a/extra/alien/handles/handles-tests.factor b/language/alien/handles/handles-tests.factor
similarity index 100%
rename from extra/alien/handles/handles-tests.factor
rename to language/alien/handles/handles-tests.factor
diff --git a/extra/alien/handles/handles.factor b/language/alien/handles/handles.factor
similarity index 100%
rename from extra/alien/handles/handles.factor
rename to language/alien/handles/handles.factor
diff --git a/extra/alien/handles/summary.txt b/language/alien/handles/summary.txt
similarity index 100%
rename from extra/alien/handles/summary.txt
rename to language/alien/handles/summary.txt
diff --git a/basis/alien/libraries/finder/finder-docs.factor b/language/alien/libraries/finder/finder-docs.factor
similarity index 100%
rename from basis/alien/libraries/finder/finder-docs.factor
rename to language/alien/libraries/finder/finder-docs.factor
diff --git a/basis/alien/libraries/finder/finder-tests.factor b/language/alien/libraries/finder/finder-tests.factor
similarity index 100%
rename from basis/alien/libraries/finder/finder-tests.factor
rename to language/alien/libraries/finder/finder-tests.factor
diff --git a/basis/alien/libraries/finder/finder.factor b/language/alien/libraries/finder/finder.factor
similarity index 100%
rename from basis/alien/libraries/finder/finder.factor
rename to language/alien/libraries/finder/finder.factor
diff --git a/basis/alien/libraries/finder/linux/linux-tests.factor b/language/alien/libraries/finder/linux/linux-tests.factor
similarity index 100%
rename from basis/alien/libraries/finder/linux/linux-tests.factor
rename to language/alien/libraries/finder/linux/linux-tests.factor
diff --git a/basis/alien/libraries/finder/linux/linux.factor b/language/alien/libraries/finder/linux/linux.factor
similarity index 100%
rename from basis/alien/libraries/finder/linux/linux.factor
rename to language/alien/libraries/finder/linux/linux.factor
diff --git a/basis/webbrowser/linux/platforms.txt b/language/alien/libraries/finder/linux/platforms.txt
similarity index 100%
rename from basis/webbrowser/linux/platforms.txt
rename to language/alien/libraries/finder/linux/platforms.txt
diff --git a/basis/alien/libraries/finder/macosx/macosx-tests.factor b/language/alien/libraries/finder/macosx/macosx-tests.factor
similarity index 100%
rename from basis/alien/libraries/finder/macosx/macosx-tests.factor
rename to language/alien/libraries/finder/macosx/macosx-tests.factor
diff --git a/basis/alien/libraries/finder/macosx/macosx.factor b/language/alien/libraries/finder/macosx/macosx.factor
similarity index 100%
rename from basis/alien/libraries/finder/macosx/macosx.factor
rename to language/alien/libraries/finder/macosx/macosx.factor
diff --git a/extra/file-picker/macosx/platforms.txt b/language/alien/libraries/finder/macosx/platforms.txt
similarity index 100%
rename from extra/file-picker/macosx/platforms.txt
rename to language/alien/libraries/finder/macosx/platforms.txt
diff --git a/basis/windows/usp10/platforms.txt b/language/alien/libraries/finder/windows/platforms.txt
similarity index 100%
rename from basis/windows/usp10/platforms.txt
rename to language/alien/libraries/finder/windows/platforms.txt
diff --git a/basis/alien/libraries/finder/windows/windows.factor b/language/alien/libraries/finder/windows/windows.factor
similarity index 100%
rename from basis/alien/libraries/finder/windows/windows.factor
rename to language/alien/libraries/finder/windows/windows.factor
diff --git a/extra/curses/ffi/platforms.txt b/language/alien/libraries/unix/platforms.txt
similarity index 100%
rename from extra/curses/ffi/platforms.txt
rename to language/alien/libraries/unix/platforms.txt
diff --git a/basis/alien/libraries/unix/unix.factor b/language/alien/libraries/unix/unix.factor
similarity index 100%
rename from basis/alien/libraries/unix/unix.factor
rename to language/alien/libraries/unix/unix.factor
diff --git a/basis/windows/winmm/platforms.txt b/language/alien/libraries/windows/platforms.txt
similarity index 100%
rename from basis/windows/winmm/platforms.txt
rename to language/alien/libraries/windows/platforms.txt
diff --git a/basis/alien/libraries/windows/windows.factor b/language/alien/libraries/windows/windows.factor
similarity index 100%
rename from basis/alien/libraries/windows/windows.factor
rename to language/alien/libraries/windows/windows.factor
diff --git a/basis/alien/parser/authors.txt b/language/alien/parser/authors.txt
similarity index 100%
rename from basis/alien/parser/authors.txt
rename to language/alien/parser/authors.txt
diff --git a/basis/alien/parser/parser-tests.factor b/language/alien/parser/parser-tests.factor
similarity index 100%
rename from basis/alien/parser/parser-tests.factor
rename to language/alien/parser/parser-tests.factor
diff --git a/basis/alien/parser/parser.factor b/language/alien/parser/parser.factor
similarity index 100%
rename from basis/alien/parser/parser.factor
rename to language/alien/parser/parser.factor
diff --git a/basis/alien/parser/summary.txt b/language/alien/parser/summary.txt
similarity index 100%
rename from basis/alien/parser/summary.txt
rename to language/alien/parser/summary.txt
diff --git a/basis/alien/prettyprint/prettyprint-tests.factor b/language/alien/prettyprint/prettyprint-tests.factor
similarity index 100%
rename from basis/alien/prettyprint/prettyprint-tests.factor
rename to language/alien/prettyprint/prettyprint-tests.factor
diff --git a/basis/alien/prettyprint/prettyprint.factor b/language/alien/prettyprint/prettyprint.factor
similarity index 100%
rename from basis/alien/prettyprint/prettyprint.factor
rename to language/alien/prettyprint/prettyprint.factor
diff --git a/basis/alien/prettyprint/summary.txt b/language/alien/prettyprint/summary.txt
similarity index 100%
rename from basis/alien/prettyprint/summary.txt
rename to language/alien/prettyprint/summary.txt
diff --git a/extra/benchmark/spectral-norm/authors.txt b/language/alien/remote-control/authors.txt
similarity index 100%
rename from extra/benchmark/spectral-norm/authors.txt
rename to language/alien/remote-control/authors.txt
diff --git a/basis/alien/remote-control/remote-control-tests.factor b/language/alien/remote-control/remote-control-tests.factor
similarity index 100%
rename from basis/alien/remote-control/remote-control-tests.factor
rename to language/alien/remote-control/remote-control-tests.factor
diff --git a/basis/alien/remote-control/remote-control.factor b/language/alien/remote-control/remote-control.factor
similarity index 100%
rename from basis/alien/remote-control/remote-control.factor
rename to language/alien/remote-control/remote-control.factor
diff --git a/basis/alien/remote-control/summary.txt b/language/alien/remote-control/summary.txt
similarity index 100%
rename from basis/alien/remote-control/summary.txt
rename to language/alien/remote-control/summary.txt
diff --git a/extra/benchmark/sum-file/authors.txt b/language/alien/syntax/authors.txt
similarity index 100%
rename from extra/benchmark/sum-file/authors.txt
rename to language/alien/syntax/authors.txt
diff --git a/basis/alien/syntax/summary.txt b/language/alien/syntax/summary.txt
similarity index 100%
rename from basis/alien/syntax/summary.txt
rename to language/alien/syntax/summary.txt
diff --git a/basis/alien/syntax/syntax-docs.factor b/language/alien/syntax/syntax-docs.factor
similarity index 100%
rename from basis/alien/syntax/syntax-docs.factor
rename to language/alien/syntax/syntax-docs.factor
diff --git a/basis/alien/syntax/syntax.factor b/language/alien/syntax/syntax.factor
similarity index 100%
rename from basis/alien/syntax/syntax.factor
rename to language/alien/syntax/syntax.factor
diff --git a/basis/alien/syntax/tags.txt b/language/alien/syntax/tags.txt
similarity index 100%
rename from basis/alien/syntax/tags.txt
rename to language/alien/syntax/tags.txt
diff --git a/extra/hamurabi/authors.txt b/language/backticks/authors.txt
similarity index 100%
rename from extra/hamurabi/authors.txt
rename to language/backticks/authors.txt
diff --git a/extra/backticks/backticks-docs.factor b/language/backticks/backticks-docs.factor
similarity index 100%
rename from extra/backticks/backticks-docs.factor
rename to language/backticks/backticks-docs.factor
diff --git a/extra/backticks/backticks.factor b/language/backticks/backticks.factor
similarity index 100%
rename from extra/backticks/backticks.factor
rename to language/backticks/backticks.factor
diff --git a/extra/backticks/summary.txt b/language/backticks/summary.txt
similarity index 100%
rename from extra/backticks/summary.txt
rename to language/backticks/summary.txt
diff --git a/extra/backtrack/authors.txt b/language/backtrack/authors.txt
similarity index 100%
rename from extra/backtrack/authors.txt
rename to language/backtrack/authors.txt
diff --git a/extra/backtrack/backtrack-docs.factor b/language/backtrack/backtrack-docs.factor
similarity index 100%
rename from extra/backtrack/backtrack-docs.factor
rename to language/backtrack/backtrack-docs.factor
diff --git a/extra/backtrack/backtrack-tests.factor b/language/backtrack/backtrack-tests.factor
similarity index 100%
rename from extra/backtrack/backtrack-tests.factor
rename to language/backtrack/backtrack-tests.factor
diff --git a/extra/backtrack/backtrack.factor b/language/backtrack/backtrack.factor
similarity index 100%
rename from extra/backtrack/backtrack.factor
rename to language/backtrack/backtrack.factor
diff --git a/extra/backtrack/summary.txt b/language/backtrack/summary.txt
similarity index 100%
rename from extra/backtrack/summary.txt
rename to language/backtrack/summary.txt
diff --git a/basis/boxes/boxes-docs.factor b/language/boxes/boxes-docs.factor
similarity index 100%
rename from basis/boxes/boxes-docs.factor
rename to language/boxes/boxes-docs.factor
diff --git a/basis/boxes/boxes-tests.factor b/language/boxes/boxes-tests.factor
similarity index 100%
rename from basis/boxes/boxes-tests.factor
rename to language/boxes/boxes-tests.factor
diff --git a/basis/boxes/boxes.factor b/language/boxes/boxes.factor
similarity index 100%
rename from basis/boxes/boxes.factor
rename to language/boxes/boxes.factor
diff --git a/basis/boxes/summary.txt b/language/boxes/summary.txt
similarity index 100%
rename from basis/boxes/summary.txt
rename to language/boxes/summary.txt
diff --git a/basis/cpu/ppc/32/32.factor b/language/cpu/ppc/32/32.factor
similarity index 100%
rename from basis/cpu/ppc/32/32.factor
rename to language/cpu/ppc/32/32.factor
diff --git a/basis/cpu/ppc/32/linux/linux.factor b/language/cpu/ppc/32/linux/linux.factor
similarity index 100%
rename from basis/cpu/ppc/32/linux/linux.factor
rename to language/cpu/ppc/32/linux/linux.factor
diff --git a/basis/cpu/ppc/32/linux/tags.txt b/language/cpu/ppc/32/linux/tags.txt
similarity index 100%
rename from basis/cpu/ppc/32/linux/tags.txt
rename to language/cpu/ppc/32/linux/tags.txt
diff --git a/basis/cpu/ppc/32/tags.txt b/language/cpu/ppc/32/tags.txt
similarity index 100%
rename from basis/cpu/ppc/32/tags.txt
rename to language/cpu/ppc/32/tags.txt
diff --git a/basis/cpu/ppc/64/64.factor b/language/cpu/ppc/64/64.factor
similarity index 100%
rename from basis/cpu/ppc/64/64.factor
rename to language/cpu/ppc/64/64.factor
diff --git a/basis/cpu/ppc/64/linux/linux.factor b/language/cpu/ppc/64/linux/linux.factor
similarity index 100%
rename from basis/cpu/ppc/64/linux/linux.factor
rename to language/cpu/ppc/64/linux/linux.factor
diff --git a/basis/cpu/ppc/64/linux/tags.txt b/language/cpu/ppc/64/linux/tags.txt
similarity index 100%
rename from basis/cpu/ppc/64/linux/tags.txt
rename to language/cpu/ppc/64/linux/tags.txt
diff --git a/basis/cpu/ppc/64/tags.txt b/language/cpu/ppc/64/tags.txt
similarity index 100%
rename from basis/cpu/ppc/64/tags.txt
rename to language/cpu/ppc/64/tags.txt
diff --git a/basis/cpu/ppc/assembler/assembler.factor b/language/cpu/ppc/assembler/assembler.factor
similarity index 100%
rename from basis/cpu/ppc/assembler/assembler.factor
rename to language/cpu/ppc/assembler/assembler.factor
diff --git a/extra/readline-listener/authors.txt b/language/cpu/ppc/authors.txt
similarity index 100%
rename from extra/readline-listener/authors.txt
rename to language/cpu/ppc/authors.txt
diff --git a/basis/cpu/ppc/ppc.factor b/language/cpu/ppc/ppc.factor
similarity index 100%
rename from basis/cpu/ppc/ppc.factor
rename to language/cpu/ppc/ppc.factor
diff --git a/basis/cpu/ppc/summary.txt b/language/cpu/ppc/summary.txt
similarity index 100%
rename from basis/cpu/ppc/summary.txt
rename to language/cpu/ppc/summary.txt
diff --git a/basis/cpu/ppc/tags.txt b/language/cpu/ppc/tags.txt
similarity index 100%
rename from basis/cpu/ppc/tags.txt
rename to language/cpu/ppc/tags.txt
diff --git a/basis/cpu/summary.txt b/language/cpu/summary.txt
similarity index 100%
rename from basis/cpu/summary.txt
rename to language/cpu/summary.txt
diff --git a/basis/cpu/tags.txt b/language/cpu/tags.txt
similarity index 100%
rename from basis/cpu/tags.txt
rename to language/cpu/tags.txt
diff --git a/basis/cpu/x86/32/32-tests.factor b/language/cpu/x86/32/32-tests.factor
similarity index 100%
rename from basis/cpu/x86/32/32-tests.factor
rename to language/cpu/x86/32/32-tests.factor
diff --git a/basis/cpu/x86/32/32.factor b/language/cpu/x86/32/32.factor
similarity index 100%
rename from basis/cpu/x86/32/32.factor
rename to language/cpu/x86/32/32.factor
diff --git a/extra/benchmark/typecheck1/authors.txt b/language/cpu/x86/32/authors.txt
similarity index 100%
rename from extra/benchmark/typecheck1/authors.txt
rename to language/cpu/x86/32/authors.txt
diff --git a/basis/cpu/x86/32/summary.txt b/language/cpu/x86/32/summary.txt
similarity index 100%
rename from basis/cpu/x86/32/summary.txt
rename to language/cpu/x86/32/summary.txt
diff --git a/basis/cpu/x86/32/tags.txt b/language/cpu/x86/32/tags.txt
similarity index 100%
rename from basis/cpu/x86/32/tags.txt
rename to language/cpu/x86/32/tags.txt
diff --git a/basis/cpu/x86/64/64-docs.factor b/language/cpu/x86/64/64-docs.factor
similarity index 100%
rename from basis/cpu/x86/64/64-docs.factor
rename to language/cpu/x86/64/64-docs.factor
diff --git a/basis/cpu/x86/64/64-tests.factor b/language/cpu/x86/64/64-tests.factor
similarity index 100%
rename from basis/cpu/x86/64/64-tests.factor
rename to language/cpu/x86/64/64-tests.factor
diff --git a/basis/cpu/x86/64/64.factor b/language/cpu/x86/64/64.factor
similarity index 100%
rename from basis/cpu/x86/64/64.factor
rename to language/cpu/x86/64/64.factor
diff --git a/extra/benchmark/typecheck2/authors.txt b/language/cpu/x86/64/authors.txt
similarity index 100%
rename from extra/benchmark/typecheck2/authors.txt
rename to language/cpu/x86/64/authors.txt
diff --git a/basis/cpu/x86/64/summary.txt b/language/cpu/x86/64/summary.txt
similarity index 100%
rename from basis/cpu/x86/64/summary.txt
rename to language/cpu/x86/64/summary.txt
diff --git a/basis/cpu/x86/64/tags.txt b/language/cpu/x86/64/tags.txt
similarity index 100%
rename from basis/cpu/x86/64/tags.txt
rename to language/cpu/x86/64/tags.txt
diff --git a/basis/cpu/x86/64/unix/summary.txt b/language/cpu/x86/64/unix/summary.txt
similarity index 100%
rename from basis/cpu/x86/64/unix/summary.txt
rename to language/cpu/x86/64/unix/summary.txt
diff --git a/basis/cpu/x86/sse/tags.txt b/language/cpu/x86/64/unix/tags.txt
similarity index 100%
rename from basis/cpu/x86/sse/tags.txt
rename to language/cpu/x86/64/unix/tags.txt
diff --git a/basis/cpu/x86/64/unix/unix.factor b/language/cpu/x86/64/unix/unix.factor
similarity index 100%
rename from basis/cpu/x86/64/unix/unix.factor
rename to language/cpu/x86/64/unix/unix.factor
diff --git a/basis/cpu/x86/64/windows/summary.txt b/language/cpu/x86/64/windows/summary.txt
similarity index 100%
rename from basis/cpu/x86/64/windows/summary.txt
rename to language/cpu/x86/64/windows/summary.txt
diff --git a/basis/cpu/x86/x87/tags.txt b/language/cpu/x86/64/windows/tags.txt
similarity index 100%
rename from basis/cpu/x86/x87/tags.txt
rename to language/cpu/x86/64/windows/tags.txt
diff --git a/basis/cpu/x86/64/windows/windows.factor b/language/cpu/x86/64/windows/windows.factor
similarity index 100%
rename from basis/cpu/x86/64/windows/windows.factor
rename to language/cpu/x86/64/windows/windows.factor
diff --git a/basis/cpu/x86/assembler/assembler-docs.factor b/language/cpu/x86/assembler/assembler-docs.factor
similarity index 100%
rename from basis/cpu/x86/assembler/assembler-docs.factor
rename to language/cpu/x86/assembler/assembler-docs.factor
diff --git a/basis/cpu/x86/assembler/assembler-tests.factor b/language/cpu/x86/assembler/assembler-tests.factor
similarity index 100%
rename from basis/cpu/x86/assembler/assembler-tests.factor
rename to language/cpu/x86/assembler/assembler-tests.factor
diff --git a/basis/cpu/x86/assembler/assembler.factor b/language/cpu/x86/assembler/assembler.factor
similarity index 100%
rename from basis/cpu/x86/assembler/assembler.factor
rename to language/cpu/x86/assembler/assembler.factor
diff --git a/extra/bunny/authors.txt b/language/cpu/x86/assembler/authors.txt
similarity index 100%
rename from extra/bunny/authors.txt
rename to language/cpu/x86/assembler/authors.txt
diff --git a/extra/sequences/squish/authors.txt b/language/cpu/x86/assembler/operands/authors.txt
similarity index 100%
rename from extra/sequences/squish/authors.txt
rename to language/cpu/x86/assembler/operands/authors.txt
diff --git a/basis/cpu/x86/assembler/operands/operands-docs.factor b/language/cpu/x86/assembler/operands/operands-docs.factor
similarity index 100%
rename from basis/cpu/x86/assembler/operands/operands-docs.factor
rename to language/cpu/x86/assembler/operands/operands-docs.factor
diff --git a/basis/cpu/x86/assembler/operands/operands-tests.factor b/language/cpu/x86/assembler/operands/operands-tests.factor
similarity index 100%
rename from basis/cpu/x86/assembler/operands/operands-tests.factor
rename to language/cpu/x86/assembler/operands/operands-tests.factor
diff --git a/basis/cpu/x86/assembler/operands/operands.factor b/language/cpu/x86/assembler/operands/operands.factor
similarity index 100%
rename from basis/cpu/x86/assembler/operands/operands.factor
rename to language/cpu/x86/assembler/operands/operands.factor
diff --git a/basis/cpu/x86/assembler/operands/summary.txt b/language/cpu/x86/assembler/operands/summary.txt
similarity index 100%
rename from basis/cpu/x86/assembler/operands/summary.txt
rename to language/cpu/x86/assembler/operands/summary.txt
diff --git a/basis/cpu/x86/assembler/summary.txt b/language/cpu/x86/assembler/summary.txt
similarity index 100%
rename from basis/cpu/x86/assembler/summary.txt
rename to language/cpu/x86/assembler/summary.txt
diff --git a/basis/cpu/x86/assembler/syntax/summary.txt b/language/cpu/x86/assembler/syntax/summary.txt
similarity index 100%
rename from basis/cpu/x86/assembler/syntax/summary.txt
rename to language/cpu/x86/assembler/syntax/summary.txt
diff --git a/basis/cpu/x86/assembler/syntax/syntax.factor b/language/cpu/x86/assembler/syntax/syntax.factor
similarity index 100%
rename from basis/cpu/x86/assembler/syntax/syntax.factor
rename to language/cpu/x86/assembler/syntax/syntax.factor
diff --git a/extra/benchmark/typecheck3/authors.txt b/language/cpu/x86/authors.txt
similarity index 100%
rename from extra/benchmark/typecheck3/authors.txt
rename to language/cpu/x86/authors.txt
diff --git a/extra/smalltalk/eval/authors.txt b/language/cpu/x86/features/authors.txt
similarity index 100%
rename from extra/smalltalk/eval/authors.txt
rename to language/cpu/x86/features/authors.txt
diff --git a/basis/cpu/x86/features/features-tests.factor b/language/cpu/x86/features/features-tests.factor
similarity index 100%
rename from basis/cpu/x86/features/features-tests.factor
rename to language/cpu/x86/features/features-tests.factor
diff --git a/basis/cpu/x86/features/features.factor b/language/cpu/x86/features/features.factor
similarity index 100%
rename from basis/cpu/x86/features/features.factor
rename to language/cpu/x86/features/features.factor
diff --git a/basis/ui/backend/x11/tags.txt b/language/cpu/x86/features/tags.txt
similarity index 100%
rename from basis/ui/backend/x11/tags.txt
rename to language/cpu/x86/features/tags.txt
diff --git a/language/cpu/x86/sse/authors.txt b/language/cpu/x86/sse/authors.txt
new file mode 100644
index 0000000000..580f882c8d
--- /dev/null
+++ b/language/cpu/x86/sse/authors.txt
@@ -0,0 +1,2 @@
+Slava Pestov
+Joe Groff
diff --git a/basis/cpu/x86/sse/sse.factor b/language/cpu/x86/sse/sse.factor
similarity index 100%
rename from basis/cpu/x86/sse/sse.factor
rename to language/cpu/x86/sse/sse.factor
diff --git a/basis/unix/stat/linux/32/tags.txt b/language/cpu/x86/sse/tags.txt
similarity index 100%
rename from basis/unix/stat/linux/32/tags.txt
rename to language/cpu/x86/sse/tags.txt
diff --git a/basis/cpu/x86/summary.txt b/language/cpu/x86/summary.txt
similarity index 100%
rename from basis/cpu/x86/summary.txt
rename to language/cpu/x86/summary.txt
diff --git a/basis/cpu/x86/tags.txt b/language/cpu/x86/tags.txt
similarity index 100%
rename from basis/cpu/x86/tags.txt
rename to language/cpu/x86/tags.txt
diff --git a/basis/cpu/x86/x86-docs.factor b/language/cpu/x86/x86-docs.factor
similarity index 100%
rename from basis/cpu/x86/x86-docs.factor
rename to language/cpu/x86/x86-docs.factor
diff --git a/basis/cpu/x86/x86-tests.factor b/language/cpu/x86/x86-tests.factor
similarity index 100%
rename from basis/cpu/x86/x86-tests.factor
rename to language/cpu/x86/x86-tests.factor
diff --git a/basis/cpu/x86/x86.factor b/language/cpu/x86/x86.factor
similarity index 100%
rename from basis/cpu/x86/x86.factor
rename to language/cpu/x86/x86.factor
diff --git a/extra/color-picker/authors.txt b/language/cpu/x86/x87/authors.txt
similarity index 100%
rename from extra/color-picker/authors.txt
rename to language/cpu/x86/x87/authors.txt
diff --git a/basis/unix/stat/linux/64/tags.txt b/language/cpu/x86/x87/tags.txt
similarity index 100%
rename from basis/unix/stat/linux/64/tags.txt
rename to language/cpu/x86/x87/tags.txt
diff --git a/basis/cpu/x86/x87/x87.factor b/language/cpu/x86/x87/x87.factor
similarity index 100%
rename from basis/cpu/x86/x87/x87.factor
rename to language/cpu/x86/x87/x87.factor
diff --git a/extra/descriptive/authors.txt b/language/descriptive/authors.txt
similarity index 100%
rename from extra/descriptive/authors.txt
rename to language/descriptive/authors.txt
diff --git a/extra/descriptive/descriptive-docs.factor b/language/descriptive/descriptive-docs.factor
similarity index 100%
rename from extra/descriptive/descriptive-docs.factor
rename to language/descriptive/descriptive-docs.factor
diff --git a/extra/descriptive/descriptive-tests.factor b/language/descriptive/descriptive-tests.factor
similarity index 100%
rename from extra/descriptive/descriptive-tests.factor
rename to language/descriptive/descriptive-tests.factor
diff --git a/extra/descriptive/descriptive.factor b/language/descriptive/descriptive.factor
similarity index 100%
rename from extra/descriptive/descriptive.factor
rename to language/descriptive/descriptive.factor
diff --git a/extra/descriptive/summary.txt b/language/descriptive/summary.txt
similarity index 100%
rename from extra/descriptive/summary.txt
rename to language/descriptive/summary.txt
diff --git a/basis/functors/tags.txt b/language/descriptive/tags.txt
similarity index 100%
rename from basis/functors/tags.txt
rename to language/descriptive/tags.txt
diff --git a/extra/benchmark/e-ratios/authors.txt b/language/environment/authors.txt
similarity index 100%
rename from extra/benchmark/e-ratios/authors.txt
rename to language/environment/authors.txt
diff --git a/basis/environment/environment-docs.factor b/language/environment/environment-docs.factor
similarity index 100%
rename from basis/environment/environment-docs.factor
rename to language/environment/environment-docs.factor
diff --git a/basis/environment/environment-tests.factor b/language/environment/environment-tests.factor
similarity index 100%
rename from basis/environment/environment-tests.factor
rename to language/environment/environment-tests.factor
diff --git a/basis/environment/environment.factor b/language/environment/environment.factor
similarity index 100%
rename from basis/environment/environment.factor
rename to language/environment/environment.factor
diff --git a/basis/environment/summary.txt b/language/environment/summary.txt
similarity index 100%
rename from basis/environment/summary.txt
rename to language/environment/summary.txt
diff --git a/extra/benchmark/mt/authors.txt b/language/environment/unix/authors.txt
similarity index 100%
rename from extra/benchmark/mt/authors.txt
rename to language/environment/unix/authors.txt
diff --git a/extra/benchmark/sfmt/authors.txt b/language/environment/unix/macosx/authors.txt
similarity index 100%
rename from extra/benchmark/sfmt/authors.txt
rename to language/environment/unix/macosx/authors.txt
diff --git a/basis/environment/unix/macosx/macosx.factor b/language/environment/unix/macosx/macosx.factor
similarity index 100%
rename from basis/environment/unix/macosx/macosx.factor
rename to language/environment/unix/macosx/macosx.factor
diff --git a/extra/qtkit/platforms.txt b/language/environment/unix/macosx/platforms.txt
similarity index 100%
rename from extra/qtkit/platforms.txt
rename to language/environment/unix/macosx/platforms.txt
diff --git a/basis/environment/unix/macosx/summary.txt b/language/environment/unix/macosx/summary.txt
similarity index 100%
rename from basis/environment/unix/macosx/summary.txt
rename to language/environment/unix/macosx/summary.txt
diff --git a/extra/curses/listener/platforms.txt b/language/environment/unix/platforms.txt
similarity index 100%
rename from extra/curses/listener/platforms.txt
rename to language/environment/unix/platforms.txt
diff --git a/basis/environment/unix/summary.txt b/language/environment/unix/summary.txt
similarity index 100%
rename from basis/environment/unix/summary.txt
rename to language/environment/unix/summary.txt
diff --git a/basis/environment/unix/unix.factor b/language/environment/unix/unix.factor
similarity index 100%
rename from basis/environment/unix/unix.factor
rename to language/environment/unix/unix.factor
diff --git a/extra/site-watcher/authors.txt b/language/environment/windows/authors.txt
similarity index 100%
rename from extra/site-watcher/authors.txt
rename to language/environment/windows/authors.txt
diff --git a/basis/windows/winsock/platforms.txt b/language/environment/windows/platforms.txt
similarity index 100%
rename from basis/windows/winsock/platforms.txt
rename to language/environment/windows/platforms.txt
diff --git a/basis/environment/windows/summary.txt b/language/environment/windows/summary.txt
similarity index 100%
rename from basis/environment/windows/summary.txt
rename to language/environment/windows/summary.txt
diff --git a/basis/environment/windows/windows.factor b/language/environment/windows/windows.factor
similarity index 100%
rename from basis/environment/windows/windows.factor
rename to language/environment/windows/windows.factor
diff --git a/extra/freetype/authors.txt b/language/functors/authors.txt
similarity index 100%
rename from extra/freetype/authors.txt
rename to language/functors/authors.txt
diff --git a/basis/functors/backend/backend.factor b/language/functors/backend/backend.factor
similarity index 100%
rename from basis/functors/backend/backend.factor
rename to language/functors/backend/backend.factor
diff --git a/basis/functors/functors-tests.factor b/language/functors/functors-tests.factor
similarity index 100%
rename from basis/functors/functors-tests.factor
rename to language/functors/functors-tests.factor
diff --git a/basis/functors/functors.factor b/language/functors/functors.factor
similarity index 100%
rename from basis/functors/functors.factor
rename to language/functors/functors.factor
diff --git a/basis/functors/summary.txt b/language/functors/summary.txt
similarity index 100%
rename from basis/functors/summary.txt
rename to language/functors/summary.txt
diff --git a/basis/help/syntax/tags.txt b/language/functors/tags.txt
similarity index 100%
rename from basis/help/syntax/tags.txt
rename to language/functors/tags.txt
diff --git a/extra/forestdb/utils/authors.txt b/tools/build-support/authors.txt
similarity index 100%
rename from extra/forestdb/utils/authors.txt
rename to tools/build-support/authors.txt
diff --git a/extra/build-support/build-support-tests.factor b/tools/build-support/build-support-tests.factor
similarity index 100%
rename from extra/build-support/build-support-tests.factor
rename to tools/build-support/build-support-tests.factor
diff --git a/extra/build-support/build-support.factor b/tools/build-support/build-support.factor
similarity index 100%
rename from extra/build-support/build-support.factor
rename to tools/build-support/build-support.factor
diff --git a/extra/curses/platforms.txt b/tools/build-support/platforms.txt
similarity index 100%
rename from extra/curses/platforms.txt
rename to tools/build-support/platforms.txt
diff --git a/extra/cap/cap.factor b/tools/cap/cap.factor
similarity index 100%
rename from extra/cap/cap.factor
rename to tools/cap/cap.factor
diff --git a/extra/terrain/authors.txt b/tools/codebook/authors.txt
similarity index 100%
rename from extra/terrain/authors.txt
rename to tools/codebook/authors.txt
diff --git a/extra/codebook/codebook.factor b/tools/codebook/codebook.factor
similarity index 100%
rename from extra/codebook/codebook.factor
rename to tools/codebook/codebook.factor
diff --git a/extra/codebook/cover.jpg b/tools/codebook/cover.jpg
similarity index 100%
rename from extra/codebook/cover.jpg
rename to tools/codebook/cover.jpg
diff --git a/extra/gesture-logger/authors.txt b/tools/color-picker/authors.txt
similarity index 100%
rename from extra/gesture-logger/authors.txt
rename to tools/color-picker/authors.txt
diff --git a/extra/color-picker/color-picker.factor b/tools/color-picker/color-picker.factor
similarity index 100%
rename from extra/color-picker/color-picker.factor
rename to tools/color-picker/color-picker.factor
diff --git a/extra/color-picker/deploy.factor b/tools/color-picker/deploy.factor
similarity index 100%
rename from extra/color-picker/deploy.factor
rename to tools/color-picker/deploy.factor
diff --git a/extra/color-picker/summary.txt b/tools/color-picker/summary.txt
similarity index 100%
rename from extra/color-picker/summary.txt
rename to tools/color-picker/summary.txt
diff --git a/extra/terrain/tags.txt b/tools/color-picker/tags.txt
similarity index 100%
rename from extra/terrain/tags.txt
rename to tools/color-picker/tags.txt
diff --git a/extra/hacker-news/authors.txt b/tools/dns/authors.txt
similarity index 100%
rename from extra/hacker-news/authors.txt
rename to tools/dns/authors.txt
diff --git a/extra/dns/dns.factor b/tools/dns/dns.factor
similarity index 100%
rename from extra/dns/dns.factor
rename to tools/dns/dns.factor
diff --git a/extra/key-logger/authors.txt b/tools/dns/unix/authors.txt
similarity index 100%
rename from extra/key-logger/authors.txt
rename to tools/dns/unix/authors.txt
diff --git a/extra/dns/unix/platforms.txt b/tools/dns/unix/platforms.txt
similarity index 100%
rename from extra/dns/unix/platforms.txt
rename to tools/dns/unix/platforms.txt
diff --git a/extra/dns/unix/unix.factor b/tools/dns/unix/unix.factor
similarity index 100%
rename from extra/dns/unix/unix.factor
rename to tools/dns/unix/unix.factor
diff --git a/extra/lint/authors.txt b/tools/dns/windows/authors.txt
similarity index 100%
rename from extra/lint/authors.txt
rename to tools/dns/windows/authors.txt
diff --git a/extra/dns/windows/platforms.txt b/tools/dns/windows/platforms.txt
similarity index 100%
rename from extra/dns/windows/platforms.txt
rename to tools/dns/windows/platforms.txt
diff --git a/extra/dns/windows/windows.factor b/tools/dns/windows/windows.factor
similarity index 100%
rename from extra/dns/windows/windows.factor
rename to tools/dns/windows/windows.factor
diff --git a/extra/help/pdf/authors.txt b/tools/echo-server/authors.txt
similarity index 100%
rename from extra/help/pdf/authors.txt
rename to tools/echo-server/authors.txt
diff --git a/extra/echo-server/echo-server.factor b/tools/echo-server/echo-server.factor
similarity index 100%
rename from extra/echo-server/echo-server.factor
rename to tools/echo-server/echo-server.factor
diff --git a/extra/ntp/authors.txt b/tools/file-monitor/authors.txt
similarity index 100%
rename from extra/ntp/authors.txt
rename to tools/file-monitor/authors.txt
diff --git a/extra/file-monitor/file-monitor.factor b/tools/file-monitor/file-monitor.factor
similarity index 100%
rename from extra/file-monitor/file-monitor.factor
rename to tools/file-monitor/file-monitor.factor
diff --git a/extra/file-monitor/summary.txt b/tools/file-monitor/summary.txt
similarity index 100%
rename from extra/file-monitor/summary.txt
rename to tools/file-monitor/summary.txt
diff --git a/extra/file-picker/file-picker.factor b/tools/file-picker/file-picker.factor
similarity index 100%
rename from extra/file-picker/file-picker.factor
rename to tools/file-picker/file-picker.factor
diff --git a/extra/file-picker/linux/linux.factor b/tools/file-picker/linux/linux.factor
similarity index 100%
rename from extra/file-picker/linux/linux.factor
rename to tools/file-picker/linux/linux.factor
diff --git a/extra/file-picker/linux/platforms.txt b/tools/file-picker/linux/platforms.txt
similarity index 100%
rename from extra/file-picker/linux/platforms.txt
rename to tools/file-picker/linux/platforms.txt
diff --git a/extra/file-picker/macosx/macosx.factor b/tools/file-picker/macosx/macosx.factor
similarity index 100%
rename from extra/file-picker/macosx/macosx.factor
rename to tools/file-picker/macosx/macosx.factor
diff --git a/extra/webkit-demo/platforms.txt b/tools/file-picker/macosx/platforms.txt
similarity index 100%
rename from extra/webkit-demo/platforms.txt
rename to tools/file-picker/macosx/platforms.txt
diff --git a/extra/file-picker/windows/platforms.txt b/tools/file-picker/windows/platforms.txt
similarity index 100%
rename from extra/file-picker/windows/platforms.txt
rename to tools/file-picker/windows/platforms.txt
diff --git a/extra/file-picker/windows/windows.factor b/tools/file-picker/windows/windows.factor
similarity index 100%
rename from extra/file-picker/windows/windows.factor
rename to tools/file-picker/windows/windows.factor
diff --git a/extra/pdf/authors.txt b/tools/file-server/authors.txt
similarity index 100%
rename from extra/pdf/authors.txt
rename to tools/file-server/authors.txt
diff --git a/extra/file-server/file-server.factor b/tools/file-server/file-server.factor
similarity index 100%
rename from extra/file-server/file-server.factor
rename to tools/file-server/file-server.factor
diff --git a/extra/file-server/summary.txt b/tools/file-server/summary.txt
similarity index 100%
rename from extra/file-server/summary.txt
rename to tools/file-server/summary.txt
diff --git a/extra/hello-ui/authors.txt b/tools/gesture-logger/authors.txt
similarity index 100%
rename from extra/hello-ui/authors.txt
rename to tools/gesture-logger/authors.txt
diff --git a/extra/gesture-logger/deploy.factor b/tools/gesture-logger/deploy.factor
similarity index 100%
rename from extra/gesture-logger/deploy.factor
rename to tools/gesture-logger/deploy.factor
diff --git a/extra/gesture-logger/gesture-logger.factor b/tools/gesture-logger/gesture-logger.factor
similarity index 100%
rename from extra/gesture-logger/gesture-logger.factor
rename to tools/gesture-logger/gesture-logger.factor
diff --git a/extra/gesture-logger/summary.txt b/tools/gesture-logger/summary.txt
similarity index 100%
rename from extra/gesture-logger/summary.txt
rename to tools/gesture-logger/summary.txt
diff --git a/extra/ping/authors.txt b/tools/gopher-ui/authors.txt
similarity index 100%
rename from extra/ping/authors.txt
rename to tools/gopher-ui/authors.txt
diff --git a/extra/gopher-ui/gopher-ui.factor b/tools/gopher-ui/gopher-ui.factor
similarity index 100%
rename from extra/gopher-ui/gopher-ui.factor
rename to tools/gopher-ui/gopher-ui.factor
diff --git a/extra/reddit/authors.txt b/tools/gopher/authors.txt
similarity index 100%
rename from extra/reddit/authors.txt
rename to tools/gopher/authors.txt
diff --git a/extra/gopher/gopher.factor b/tools/gopher/gopher.factor
similarity index 100%
rename from extra/gopher/gopher.factor
rename to tools/gopher/gopher.factor
diff --git a/extra/gopher/summary.txt b/tools/gopher/summary.txt
similarity index 100%
rename from extra/gopher/summary.txt
rename to tools/gopher/summary.txt
diff --git a/extra/gopher/tags.txt b/tools/gopher/tags.txt
similarity index 100%
rename from extra/gopher/tags.txt
rename to tools/gopher/tags.txt
diff --git a/extra/graphviz/attributes/attributes-docs.factor b/tools/graphviz/attributes/attributes-docs.factor
similarity index 100%
rename from extra/graphviz/attributes/attributes-docs.factor
rename to tools/graphviz/attributes/attributes-docs.factor
diff --git a/extra/graphviz/attributes/attributes.factor b/tools/graphviz/attributes/attributes.factor
similarity index 100%
rename from extra/graphviz/attributes/attributes.factor
rename to tools/graphviz/attributes/attributes.factor
diff --git a/extra/graphviz/builder/builder-docs.factor b/tools/graphviz/builder/builder-docs.factor
similarity index 100%
rename from extra/graphviz/builder/builder-docs.factor
rename to tools/graphviz/builder/builder-docs.factor
diff --git a/extra/graphviz/dot/dot-docs.factor b/tools/graphviz/dot/dot-docs.factor
similarity index 100%
rename from extra/graphviz/dot/dot-docs.factor
rename to tools/graphviz/dot/dot-docs.factor
diff --git a/extra/graphviz/dot/dot-tests.factor b/tools/graphviz/dot/dot-tests.factor
similarity index 100%
rename from extra/graphviz/dot/dot-tests.factor
rename to tools/graphviz/dot/dot-tests.factor
diff --git a/extra/graphviz/dot/dot.factor b/tools/graphviz/dot/dot.factor
similarity index 100%
rename from extra/graphviz/dot/dot.factor
rename to tools/graphviz/dot/dot.factor
diff --git a/extra/graphviz/gallery/c5.png b/tools/graphviz/gallery/c5.png
similarity index 100%
rename from extra/graphviz/gallery/c5.png
rename to tools/graphviz/gallery/c5.png
diff --git a/extra/graphviz/gallery/c6.png b/tools/graphviz/gallery/c6.png
similarity index 100%
rename from extra/graphviz/gallery/c6.png
rename to tools/graphviz/gallery/c6.png
diff --git a/extra/graphviz/gallery/c7.png b/tools/graphviz/gallery/c7.png
similarity index 100%
rename from extra/graphviz/gallery/c7.png
rename to tools/graphviz/gallery/c7.png
diff --git a/extra/graphviz/gallery/circles.png b/tools/graphviz/gallery/circles.png
similarity index 100%
rename from extra/graphviz/gallery/circles.png
rename to tools/graphviz/gallery/circles.png
diff --git a/extra/graphviz/gallery/cluster.png b/tools/graphviz/gallery/cluster.png
similarity index 100%
rename from extra/graphviz/gallery/cluster.png
rename to tools/graphviz/gallery/cluster.png
diff --git a/extra/graphviz/gallery/fsm.png b/tools/graphviz/gallery/fsm.png
similarity index 100%
rename from extra/graphviz/gallery/fsm.png
rename to tools/graphviz/gallery/fsm.png
diff --git a/extra/graphviz/gallery/k33.png b/tools/graphviz/gallery/k33.png
similarity index 100%
rename from extra/graphviz/gallery/k33.png
rename to tools/graphviz/gallery/k33.png
diff --git a/extra/graphviz/gallery/k34.png b/tools/graphviz/gallery/k34.png
similarity index 100%
rename from extra/graphviz/gallery/k34.png
rename to tools/graphviz/gallery/k34.png
diff --git a/extra/graphviz/gallery/k5.png b/tools/graphviz/gallery/k5.png
similarity index 100%
rename from extra/graphviz/gallery/k5.png
rename to tools/graphviz/gallery/k5.png
diff --git a/extra/graphviz/gallery/k54.png b/tools/graphviz/gallery/k54.png
similarity index 100%
rename from extra/graphviz/gallery/k54.png
rename to tools/graphviz/gallery/k54.png
diff --git a/extra/graphviz/gallery/k6.png b/tools/graphviz/gallery/k6.png
similarity index 100%
rename from extra/graphviz/gallery/k6.png
rename to tools/graphviz/gallery/k6.png
diff --git a/extra/graphviz/gallery/k7.png b/tools/graphviz/gallery/k7.png
similarity index 100%
rename from extra/graphviz/gallery/k7.png
rename to tools/graphviz/gallery/k7.png
diff --git a/extra/graphviz/gallery/record.png b/tools/graphviz/gallery/record.png
similarity index 100%
rename from extra/graphviz/gallery/record.png
rename to tools/graphviz/gallery/record.png
diff --git a/extra/graphviz/gallery/w6.png b/tools/graphviz/gallery/w6.png
similarity index 100%
rename from extra/graphviz/gallery/w6.png
rename to tools/graphviz/gallery/w6.png
diff --git a/extra/graphviz/gallery/w7.png b/tools/graphviz/gallery/w7.png
similarity index 100%
rename from extra/graphviz/gallery/w7.png
rename to tools/graphviz/gallery/w7.png
diff --git a/extra/graphviz/gallery/w8.png b/tools/graphviz/gallery/w8.png
similarity index 100%
rename from extra/graphviz/gallery/w8.png
rename to tools/graphviz/gallery/w8.png
diff --git a/extra/graphviz/graphviz-docs.factor b/tools/graphviz/graphviz-docs.factor
similarity index 100%
rename from extra/graphviz/graphviz-docs.factor
rename to tools/graphviz/graphviz-docs.factor
diff --git a/extra/graphviz/graphviz-tests.factor b/tools/graphviz/graphviz-tests.factor
similarity index 100%
rename from extra/graphviz/graphviz-tests.factor
rename to tools/graphviz/graphviz-tests.factor
diff --git a/extra/graphviz/graphviz.factor b/tools/graphviz/graphviz.factor
similarity index 100%
rename from extra/graphviz/graphviz.factor
rename to tools/graphviz/graphviz.factor
diff --git a/extra/graphviz/notation/notation-docs.factor b/tools/graphviz/notation/notation-docs.factor
similarity index 100%
rename from extra/graphviz/notation/notation-docs.factor
rename to tools/graphviz/notation/notation-docs.factor
diff --git a/extra/graphviz/notation/notation.factor b/tools/graphviz/notation/notation.factor
similarity index 100%
rename from extra/graphviz/notation/notation.factor
rename to tools/graphviz/notation/notation.factor
diff --git a/extra/graphviz/render/render-docs.factor b/tools/graphviz/render/render-docs.factor
similarity index 100%
rename from extra/graphviz/render/render-docs.factor
rename to tools/graphviz/render/render-docs.factor
diff --git a/extra/graphviz/render/render.factor b/tools/graphviz/render/render.factor
similarity index 100%
rename from extra/graphviz/render/render.factor
rename to tools/graphviz/render/render.factor
diff --git a/extra/graphviz/render/windows/platforms.txt b/tools/graphviz/render/windows/platforms.txt
similarity index 100%
rename from extra/graphviz/render/windows/platforms.txt
rename to tools/graphviz/render/windows/platforms.txt
diff --git a/extra/graphviz/render/windows/windows.factor b/tools/graphviz/render/windows/windows.factor
similarity index 100%
rename from extra/graphviz/render/windows/windows.factor
rename to tools/graphviz/render/windows/windows.factor
diff --git a/basis/help/apropos/apropos-docs.factor b/tools/help/apropos/apropos-docs.factor
similarity index 100%
rename from basis/help/apropos/apropos-docs.factor
rename to tools/help/apropos/apropos-docs.factor
diff --git a/basis/help/apropos/apropos-tests.factor b/tools/help/apropos/apropos-tests.factor
similarity index 100%
rename from basis/help/apropos/apropos-tests.factor
rename to tools/help/apropos/apropos-tests.factor
diff --git a/basis/help/apropos/apropos.factor b/tools/help/apropos/apropos.factor
similarity index 100%
rename from basis/help/apropos/apropos.factor
rename to tools/help/apropos/apropos.factor
diff --git a/extra/hello-world/authors.txt b/tools/help/authors.txt
similarity index 100%
rename from extra/hello-world/authors.txt
rename to tools/help/authors.txt
diff --git a/extra/lcd/authors.txt b/tools/help/cookbook/authors.txt
similarity index 100%
rename from extra/lcd/authors.txt
rename to tools/help/cookbook/authors.txt
diff --git a/basis/help/cookbook/cookbook.factor b/tools/help/cookbook/cookbook.factor
similarity index 100%
rename from basis/help/cookbook/cookbook.factor
rename to tools/help/cookbook/cookbook.factor
diff --git a/extra/log-viewer/authors.txt b/tools/help/crossref/authors.txt
similarity index 100%
rename from extra/log-viewer/authors.txt
rename to tools/help/crossref/authors.txt
diff --git a/basis/help/crossref/crossref-docs.factor b/tools/help/crossref/crossref-docs.factor
similarity index 100%
rename from basis/help/crossref/crossref-docs.factor
rename to tools/help/crossref/crossref-docs.factor
diff --git a/basis/help/crossref/crossref-tests.factor b/tools/help/crossref/crossref-tests.factor
similarity index 100%
rename from basis/help/crossref/crossref-tests.factor
rename to tools/help/crossref/crossref-tests.factor
diff --git a/basis/help/crossref/crossref.factor b/tools/help/crossref/crossref.factor
similarity index 100%
rename from basis/help/crossref/crossref.factor
rename to tools/help/crossref/crossref.factor
diff --git a/basis/help/crossref/summary.txt b/tools/help/crossref/summary.txt
similarity index 100%
rename from basis/help/crossref/summary.txt
rename to tools/help/crossref/summary.txt
diff --git a/extra/mason/disk/authors.txt b/tools/help/definitions/authors.txt
similarity index 100%
rename from extra/mason/disk/authors.txt
rename to tools/help/definitions/authors.txt
diff --git a/basis/help/definitions/definitions-tests.factor b/tools/help/definitions/definitions-tests.factor
similarity index 100%
rename from basis/help/definitions/definitions-tests.factor
rename to tools/help/definitions/definitions-tests.factor
diff --git a/basis/help/definitions/definitions.factor b/tools/help/definitions/definitions.factor
similarity index 100%
rename from basis/help/definitions/definitions.factor
rename to tools/help/definitions/definitions.factor
diff --git a/basis/help/definitions/summary.txt b/tools/help/definitions/summary.txt
similarity index 100%
rename from basis/help/definitions/summary.txt
rename to tools/help/definitions/summary.txt
diff --git a/extra/mason/git/authors.txt b/tools/help/handbook/authors.txt
similarity index 100%
rename from extra/mason/git/authors.txt
rename to tools/help/handbook/authors.txt
diff --git a/basis/help/handbook/handbook-tests.factor b/tools/help/handbook/handbook-tests.factor
similarity index 100%
rename from basis/help/handbook/handbook-tests.factor
rename to tools/help/handbook/handbook-tests.factor
diff --git a/basis/help/handbook/handbook.factor b/tools/help/handbook/handbook.factor
similarity index 100%
rename from basis/help/handbook/handbook.factor
rename to tools/help/handbook/handbook.factor
diff --git a/basis/help/handbook/summary.txt b/tools/help/handbook/summary.txt
similarity index 100%
rename from basis/help/handbook/summary.txt
rename to tools/help/handbook/summary.txt
diff --git a/basis/help/help-docs.factor b/tools/help/help-docs.factor
similarity index 100%
rename from basis/help/help-docs.factor
rename to tools/help/help-docs.factor
diff --git a/basis/help/help-tests.factor b/tools/help/help-tests.factor
similarity index 100%
rename from basis/help/help-tests.factor
rename to tools/help/help-tests.factor
diff --git a/basis/help/help.factor b/tools/help/help.factor
similarity index 100%
rename from basis/help/help.factor
rename to tools/help/help.factor
diff --git a/extra/smalltalk/library/authors.txt b/tools/help/home/authors.txt
similarity index 100%
rename from extra/smalltalk/library/authors.txt
rename to tools/help/home/authors.txt
diff --git a/basis/help/home/home-docs.factor b/tools/help/home/home-docs.factor
similarity index 100%
rename from basis/help/home/home-docs.factor
rename to tools/help/home/home-docs.factor
diff --git a/basis/help/home/home.factor b/tools/help/home/home.factor
similarity index 100%
rename from basis/help/home/home.factor
rename to tools/help/home/home.factor
diff --git a/basis/help/html/html-tests.factor b/tools/help/html/html-tests.factor
similarity index 100%
rename from basis/help/html/html-tests.factor
rename to tools/help/html/html-tests.factor
diff --git a/basis/help/html/html.factor b/tools/help/html/html.factor
similarity index 100%
rename from basis/help/html/html.factor
rename to tools/help/html/html.factor
diff --git a/basis/help/html/stylesheet.css b/tools/help/html/stylesheet.css
similarity index 100%
rename from basis/help/html/stylesheet.css
rename to tools/help/html/stylesheet.css
diff --git a/basis/help/html/summary.txt b/tools/help/html/summary.txt
similarity index 100%
rename from basis/help/html/summary.txt
rename to tools/help/html/summary.txt
diff --git a/extra/maze/authors.txt b/tools/help/lint/authors.txt
similarity index 100%
rename from extra/maze/authors.txt
rename to tools/help/lint/authors.txt
diff --git a/extra/smalltalk/listener/authors.txt b/tools/help/lint/checks/authors.txt
similarity index 100%
rename from extra/smalltalk/listener/authors.txt
rename to tools/help/lint/checks/authors.txt
diff --git a/basis/help/lint/checks/checks-docs.factor b/tools/help/lint/checks/checks-docs.factor
similarity index 100%
rename from basis/help/lint/checks/checks-docs.factor
rename to tools/help/lint/checks/checks-docs.factor
diff --git a/basis/help/lint/checks/checks.factor b/tools/help/lint/checks/checks.factor
similarity index 100%
rename from basis/help/lint/checks/checks.factor
rename to tools/help/lint/checks/checks.factor
diff --git a/basis/help/lint/lint-docs.factor b/tools/help/lint/lint-docs.factor
similarity index 100%
rename from basis/help/lint/lint-docs.factor
rename to tools/help/lint/lint-docs.factor
diff --git a/basis/help/lint/lint.factor b/tools/help/lint/lint.factor
similarity index 100%
rename from basis/help/lint/lint.factor
rename to tools/help/lint/lint.factor
diff --git a/basis/help/lint/summary.txt b/tools/help/lint/summary.txt
similarity index 100%
rename from basis/help/lint/summary.txt
rename to tools/help/lint/summary.txt
diff --git a/basis/ui/tools/tags.txt b/tools/help/lint/tags.txt
similarity index 100%
rename from basis/ui/tools/tags.txt
rename to tools/help/lint/tags.txt
diff --git a/extra/msxml-to-csv/authors.txt b/tools/help/markup/authors.txt
similarity index 100%
rename from extra/msxml-to-csv/authors.txt
rename to tools/help/markup/authors.txt
diff --git a/basis/help/markup/markup-tests.factor b/tools/help/markup/markup-tests.factor
similarity index 100%
rename from basis/help/markup/markup-tests.factor
rename to tools/help/markup/markup-tests.factor
diff --git a/basis/help/markup/markup.factor b/tools/help/markup/markup.factor
similarity index 100%
rename from basis/help/markup/markup.factor
rename to tools/help/markup/markup.factor
diff --git a/basis/help/markup/summary.txt b/tools/help/markup/summary.txt
similarity index 100%
rename from basis/help/markup/summary.txt
rename to tools/help/markup/summary.txt
diff --git a/extra/sequences/frozen/authors.txt b/tools/help/pdf/authors.txt
similarity index 100%
rename from extra/sequences/frozen/authors.txt
rename to tools/help/pdf/authors.txt
diff --git a/extra/help/pdf/pdf.factor b/tools/help/pdf/pdf.factor
similarity index 100%
rename from extra/help/pdf/pdf.factor
rename to tools/help/pdf/pdf.factor
diff --git a/extra/sequences/rotated/authors.txt b/tools/help/search/authors.txt
similarity index 100%
rename from extra/sequences/rotated/authors.txt
rename to tools/help/search/authors.txt
diff --git a/basis/help/search/search.factor b/tools/help/search/search.factor
similarity index 100%
rename from basis/help/search/search.factor
rename to tools/help/search/search.factor
diff --git a/basis/help/search/summary.txt b/tools/help/search/summary.txt
similarity index 100%
rename from basis/help/search/summary.txt
rename to tools/help/search/summary.txt
diff --git a/extra/numbers-game/authors.txt b/tools/help/stylesheet/authors.txt
similarity index 100%
rename from extra/numbers-game/authors.txt
rename to tools/help/stylesheet/authors.txt
diff --git a/basis/help/stylesheet/stylesheet.factor b/tools/help/stylesheet/stylesheet.factor
similarity index 100%
rename from basis/help/stylesheet/stylesheet.factor
rename to tools/help/stylesheet/stylesheet.factor
diff --git a/basis/help/stylesheet/summary.txt b/tools/help/stylesheet/summary.txt
similarity index 100%
rename from basis/help/stylesheet/summary.txt
rename to tools/help/stylesheet/summary.txt
diff --git a/basis/help/summary.txt b/tools/help/summary.txt
similarity index 100%
rename from basis/help/summary.txt
rename to tools/help/summary.txt
diff --git a/extra/sudoku/authors.txt b/tools/help/syntax/authors.txt
similarity index 100%
rename from extra/sudoku/authors.txt
rename to tools/help/syntax/authors.txt
diff --git a/basis/help/syntax/summary.txt b/tools/help/syntax/summary.txt
similarity index 100%
rename from basis/help/syntax/summary.txt
rename to tools/help/syntax/summary.txt
diff --git a/basis/help/syntax/syntax-tests.factor b/tools/help/syntax/syntax-tests.factor
similarity index 100%
rename from basis/help/syntax/syntax-tests.factor
rename to tools/help/syntax/syntax-tests.factor
diff --git a/basis/help/syntax/syntax.factor b/tools/help/syntax/syntax.factor
similarity index 100%
rename from basis/help/syntax/syntax.factor
rename to tools/help/syntax/syntax.factor
diff --git a/extra/descriptive/tags.txt b/tools/help/syntax/tags.txt
similarity index 100%
rename from extra/descriptive/tags.txt
rename to tools/help/syntax/tags.txt
diff --git a/extra/smalltalk/parser/authors.txt b/tools/help/tips/authors.txt
similarity index 100%
rename from extra/smalltalk/parser/authors.txt
rename to tools/help/tips/authors.txt
diff --git a/basis/help/tips/tips-docs.factor b/tools/help/tips/tips-docs.factor
similarity index 100%
rename from basis/help/tips/tips-docs.factor
rename to tools/help/tips/tips-docs.factor
diff --git a/basis/help/tips/tips.factor b/tools/help/tips/tips.factor
similarity index 100%
rename from basis/help/tips/tips.factor
rename to tools/help/tips/tips.factor
diff --git a/extra/talks/galois-talk/authors.txt b/tools/help/topics/authors.txt
similarity index 100%
rename from extra/talks/galois-talk/authors.txt
rename to tools/help/topics/authors.txt
diff --git a/basis/help/topics/summary.txt b/tools/help/topics/summary.txt
similarity index 100%
rename from basis/help/topics/summary.txt
rename to tools/help/topics/summary.txt
diff --git a/basis/help/topics/topics-docs.factor b/tools/help/topics/topics-docs.factor
similarity index 100%
rename from basis/help/topics/topics-docs.factor
rename to tools/help/topics/topics-docs.factor
diff --git a/basis/help/topics/topics-tests.factor b/tools/help/topics/topics-tests.factor
similarity index 100%
rename from basis/help/topics/topics-tests.factor
rename to tools/help/topics/topics-tests.factor
diff --git a/basis/help/topics/topics.factor b/tools/help/topics/topics.factor
similarity index 100%
rename from basis/help/topics/topics.factor
rename to tools/help/topics/topics.factor
diff --git a/extra/talks/google-tech-talk/authors.txt b/tools/help/tutorial/authors.txt
similarity index 100%
rename from extra/talks/google-tech-talk/authors.txt
rename to tools/help/tutorial/authors.txt
diff --git a/basis/help/tutorial/tutorial.factor b/tools/help/tutorial/tutorial.factor
similarity index 100%
rename from basis/help/tutorial/tutorial.factor
rename to tools/help/tutorial/tutorial.factor
diff --git a/basis/unix/authors.txt b/tools/help/vocabs/authors.txt
similarity index 100%
rename from basis/unix/authors.txt
rename to tools/help/vocabs/authors.txt
diff --git a/basis/help/vocabs/summary.txt b/tools/help/vocabs/summary.txt
similarity index 100%
rename from basis/help/vocabs/summary.txt
rename to tools/help/vocabs/summary.txt
diff --git a/basis/ui/tools/walker/tags.txt b/tools/help/vocabs/tags.txt
similarity index 100%
rename from basis/ui/tools/walker/tags.txt
rename to tools/help/vocabs/tags.txt
diff --git a/basis/help/vocabs/vocabs-docs.factor b/tools/help/vocabs/vocabs-docs.factor
similarity index 100%
rename from basis/help/vocabs/vocabs-docs.factor
rename to tools/help/vocabs/vocabs-docs.factor
diff --git a/basis/help/vocabs/vocabs-tests.factor b/tools/help/vocabs/vocabs-tests.factor
similarity index 100%
rename from basis/help/vocabs/vocabs-tests.factor
rename to tools/help/vocabs/vocabs-tests.factor
diff --git a/basis/help/vocabs/vocabs.factor b/tools/help/vocabs/vocabs.factor
similarity index 100%
rename from basis/help/vocabs/vocabs.factor
rename to tools/help/vocabs/vocabs.factor
diff --git a/extra/talks/minneapolis-talk/authors.txt b/tools/inspector/authors.txt
similarity index 100%
rename from extra/talks/minneapolis-talk/authors.txt
rename to tools/inspector/authors.txt
diff --git a/basis/inspector/inspector-docs.factor b/tools/inspector/inspector-docs.factor
similarity index 100%
rename from basis/inspector/inspector-docs.factor
rename to tools/inspector/inspector-docs.factor
diff --git a/basis/inspector/inspector-tests.factor b/tools/inspector/inspector-tests.factor
similarity index 100%
rename from basis/inspector/inspector-tests.factor
rename to tools/inspector/inspector-tests.factor
diff --git a/basis/inspector/inspector.factor b/tools/inspector/inspector.factor
similarity index 100%
rename from basis/inspector/inspector.factor
rename to tools/inspector/inspector.factor
diff --git a/basis/inspector/summary.txt b/tools/inspector/summary.txt
similarity index 100%
rename from basis/inspector/summary.txt
rename to tools/inspector/summary.txt
diff --git a/basis/inspector/tags.txt b/tools/inspector/tags.txt
similarity index 100%
rename from basis/inspector/tags.txt
rename to tools/inspector/tags.txt
diff --git a/extra/mason/release/dlls/authors.txt b/tools/lint/authors.txt
similarity index 100%
rename from extra/mason/release/dlls/authors.txt
rename to tools/lint/authors.txt
diff --git a/extra/lint/lint-tests.factor b/tools/lint/lint-tests.factor
similarity index 100%
rename from extra/lint/lint-tests.factor
rename to tools/lint/lint-tests.factor
diff --git a/extra/lint/lint.factor b/tools/lint/lint.factor
similarity index 100%
rename from extra/lint/lint.factor
rename to tools/lint/lint.factor
diff --git a/extra/lint/summary.txt b/tools/lint/summary.txt
similarity index 100%
rename from extra/lint/summary.txt
rename to tools/lint/summary.txt
diff --git a/extra/talks/otug-talk/authors.txt b/tools/listener/authors.txt
similarity index 100%
rename from extra/talks/otug-talk/authors.txt
rename to tools/listener/authors.txt
diff --git a/basis/listener/listener-docs.factor b/tools/listener/listener-docs.factor
similarity index 100%
rename from basis/listener/listener-docs.factor
rename to tools/listener/listener-docs.factor
diff --git a/basis/listener/listener-tests.factor b/tools/listener/listener-tests.factor
similarity index 100%
rename from basis/listener/listener-tests.factor
rename to tools/listener/listener-tests.factor
diff --git a/basis/listener/listener.factor b/tools/listener/listener.factor
similarity index 100%
rename from basis/listener/listener.factor
rename to tools/listener/listener.factor
diff --git a/basis/listener/summary.txt b/tools/listener/summary.txt
similarity index 100%
rename from basis/listener/summary.txt
rename to tools/listener/summary.txt
diff --git a/extra/project-euler/ave-time/tags.txt b/tools/listener/tags.txt
similarity index 100%
rename from extra/project-euler/ave-time/tags.txt
rename to tools/listener/tags.txt
diff --git a/extra/mason/authors.txt b/tools/mason/authors.txt
similarity index 100%
rename from extra/mason/authors.txt
rename to tools/mason/authors.txt
diff --git a/extra/mason/build/build.factor b/tools/mason/build/build.factor
similarity index 100%
rename from extra/mason/build/build.factor
rename to tools/mason/build/build.factor
diff --git a/extra/mason/child/child-tests.factor b/tools/mason/child/child-tests.factor
similarity index 100%
rename from extra/mason/child/child-tests.factor
rename to tools/mason/child/child-tests.factor
diff --git a/extra/mason/child/child.factor b/tools/mason/child/child.factor
similarity index 100%
rename from extra/mason/child/child.factor
rename to tools/mason/child/child.factor
diff --git a/extra/mason/cleanup/cleanup.factor b/tools/mason/cleanup/cleanup.factor
similarity index 100%
rename from extra/mason/cleanup/cleanup.factor
rename to tools/mason/cleanup/cleanup.factor
diff --git a/extra/mason/common/common-tests.factor b/tools/mason/common/common-tests.factor
similarity index 100%
rename from extra/mason/common/common-tests.factor
rename to tools/mason/common/common-tests.factor
diff --git a/extra/mason/common/common.factor b/tools/mason/common/common.factor
similarity index 100%
rename from extra/mason/common/common.factor
rename to tools/mason/common/common.factor
diff --git a/extra/mason/config/config.factor b/tools/mason/config/config.factor
similarity index 100%
rename from extra/mason/config/config.factor
rename to tools/mason/config/config.factor
diff --git a/extra/talks/vpri-talk/authors.txt b/tools/mason/disk/authors.txt
similarity index 100%
rename from extra/talks/vpri-talk/authors.txt
rename to tools/mason/disk/authors.txt
diff --git a/extra/mason/disk/disk-tests.factor b/tools/mason/disk/disk-tests.factor
similarity index 100%
rename from extra/mason/disk/disk-tests.factor
rename to tools/mason/disk/disk-tests.factor
diff --git a/extra/mason/disk/disk.factor b/tools/mason/disk/disk.factor
similarity index 100%
rename from extra/mason/disk/disk.factor
rename to tools/mason/disk/disk.factor
diff --git a/extra/mason/docs/docs.factor b/tools/mason/docs/docs.factor
similarity index 100%
rename from extra/mason/docs/docs.factor
rename to tools/mason/docs/docs.factor
diff --git a/extra/mason/email/email-tests.factor b/tools/mason/email/email-tests.factor
similarity index 100%
rename from extra/mason/email/email-tests.factor
rename to tools/mason/email/email-tests.factor
diff --git a/extra/mason/email/email.factor b/tools/mason/email/email.factor
similarity index 100%
rename from extra/mason/email/email.factor
rename to tools/mason/email/email.factor
diff --git a/extra/turing/authors.txt b/tools/mason/git/authors.txt
similarity index 100%
rename from extra/turing/authors.txt
rename to tools/mason/git/authors.txt
diff --git a/extra/mason/git/git.factor b/tools/mason/git/git.factor
similarity index 100%
rename from extra/mason/git/git.factor
rename to tools/mason/git/git.factor
diff --git a/extra/mason/mason.factor b/tools/mason/mason.factor
similarity index 100%
rename from extra/mason/mason.factor
rename to tools/mason/mason.factor
diff --git a/extra/smalltalk/printer/authors.txt b/tools/mason/notify/authors.txt
similarity index 100%
rename from extra/smalltalk/printer/authors.txt
rename to tools/mason/notify/authors.txt
diff --git a/extra/mason/notify/notify.factor b/tools/mason/notify/notify.factor
similarity index 100%
rename from extra/mason/notify/notify.factor
rename to tools/mason/notify/notify.factor
diff --git a/extra/mason/platform/platform-tests.factor b/tools/mason/platform/platform-tests.factor
similarity index 100%
rename from extra/mason/platform/platform-tests.factor
rename to tools/mason/platform/platform-tests.factor
diff --git a/extra/mason/platform/platform.factor b/tools/mason/platform/platform.factor
similarity index 100%
rename from extra/mason/platform/platform.factor
rename to tools/mason/platform/platform.factor
diff --git a/extra/mason/release/archive/archive-tests.factor b/tools/mason/release/archive/archive-tests.factor
similarity index 100%
rename from extra/mason/release/archive/archive-tests.factor
rename to tools/mason/release/archive/archive-tests.factor
diff --git a/extra/mason/release/archive/archive.factor b/tools/mason/release/archive/archive.factor
similarity index 100%
rename from extra/mason/release/archive/archive.factor
rename to tools/mason/release/archive/archive.factor
diff --git a/extra/mason/release/branch/branch-tests.factor b/tools/mason/release/branch/branch-tests.factor
similarity index 100%
rename from extra/mason/release/branch/branch-tests.factor
rename to tools/mason/release/branch/branch-tests.factor
diff --git a/extra/mason/release/branch/branch.factor b/tools/mason/release/branch/branch.factor
similarity index 100%
rename from extra/mason/release/branch/branch.factor
rename to tools/mason/release/branch/branch.factor
diff --git a/extra/mason/release/sign/authors.txt b/tools/mason/release/dlls/authors.txt
similarity index 100%
rename from extra/mason/release/sign/authors.txt
rename to tools/mason/release/dlls/authors.txt
diff --git a/extra/mason/release/dlls/dlls.factor b/tools/mason/release/dlls/dlls.factor
similarity index 100%
rename from extra/mason/release/dlls/dlls.factor
rename to tools/mason/release/dlls/dlls.factor
diff --git a/extra/mason/release/release.factor b/tools/mason/release/release.factor
similarity index 100%
rename from extra/mason/release/release.factor
rename to tools/mason/release/release.factor
diff --git a/extra/project-euler/089/authors.txt b/tools/mason/release/sign/authors.txt
similarity index 100%
rename from extra/project-euler/089/authors.txt
rename to tools/mason/release/sign/authors.txt
diff --git a/extra/mason/release/sign/sign.factor b/tools/mason/release/sign/sign.factor
similarity index 100%
rename from extra/mason/release/sign/sign.factor
rename to tools/mason/release/sign/sign.factor
diff --git a/extra/mason/release/tidy/tidy-tests.factor b/tools/mason/release/tidy/tidy-tests.factor
similarity index 100%
rename from extra/mason/release/tidy/tidy-tests.factor
rename to tools/mason/release/tidy/tidy-tests.factor
diff --git a/extra/mason/release/tidy/tidy.factor b/tools/mason/release/tidy/tidy.factor
similarity index 100%
rename from extra/mason/release/tidy/tidy.factor
rename to tools/mason/release/tidy/tidy.factor
diff --git a/extra/mason/release/upload/upload-tests.factor b/tools/mason/release/upload/upload-tests.factor
similarity index 100%
rename from extra/mason/release/upload/upload-tests.factor
rename to tools/mason/release/upload/upload-tests.factor
diff --git a/extra/mason/release/upload/upload.factor b/tools/mason/release/upload/upload.factor
similarity index 100%
rename from extra/mason/release/upload/upload.factor
rename to tools/mason/release/upload/upload.factor
diff --git a/extra/mason/report/fake-data/benchmark-error-messages b/tools/mason/report/fake-data/benchmark-error-messages
similarity index 100%
rename from extra/mason/report/fake-data/benchmark-error-messages
rename to tools/mason/report/fake-data/benchmark-error-messages
diff --git a/extra/mason/report/fake-data/benchmark-error-vocabs b/tools/mason/report/fake-data/benchmark-error-vocabs
similarity index 100%
rename from extra/mason/report/fake-data/benchmark-error-vocabs
rename to tools/mason/report/fake-data/benchmark-error-vocabs
diff --git a/extra/mason/report/fake-data/benchmark-time b/tools/mason/report/fake-data/benchmark-time
similarity index 100%
rename from extra/mason/report/fake-data/benchmark-time
rename to tools/mason/report/fake-data/benchmark-time
diff --git a/extra/mason/report/fake-data/benchmarks b/tools/mason/report/fake-data/benchmarks
similarity index 100%
rename from extra/mason/report/fake-data/benchmarks
rename to tools/mason/report/fake-data/benchmarks
diff --git a/extra/mason/report/fake-data/boot-log b/tools/mason/report/fake-data/boot-log
similarity index 100%
rename from extra/mason/report/fake-data/boot-log
rename to tools/mason/report/fake-data/boot-log
diff --git a/extra/mason/report/fake-data/boot-time b/tools/mason/report/fake-data/boot-time
similarity index 100%
rename from extra/mason/report/fake-data/boot-time
rename to tools/mason/report/fake-data/boot-time
diff --git a/extra/mason/report/fake-data/compile-log b/tools/mason/report/fake-data/compile-log
similarity index 100%
rename from extra/mason/report/fake-data/compile-log
rename to tools/mason/report/fake-data/compile-log
diff --git a/extra/mason/report/fake-data/compiler-error-messages b/tools/mason/report/fake-data/compiler-error-messages
similarity index 100%
rename from extra/mason/report/fake-data/compiler-error-messages
rename to tools/mason/report/fake-data/compiler-error-messages
diff --git a/extra/mason/report/fake-data/compiler-errors b/tools/mason/report/fake-data/compiler-errors
similarity index 100%
rename from extra/mason/report/fake-data/compiler-errors
rename to tools/mason/report/fake-data/compiler-errors
diff --git a/extra/mason/report/fake-data/git-id b/tools/mason/report/fake-data/git-id
similarity index 100%
rename from extra/mason/report/fake-data/git-id
rename to tools/mason/report/fake-data/git-id
diff --git a/extra/mason/report/fake-data/help-lint-errors b/tools/mason/report/fake-data/help-lint-errors
similarity index 100%
rename from extra/mason/report/fake-data/help-lint-errors
rename to tools/mason/report/fake-data/help-lint-errors
diff --git a/extra/mason/report/fake-data/help-lint-time b/tools/mason/report/fake-data/help-lint-time
similarity index 100%
rename from extra/mason/report/fake-data/help-lint-time
rename to tools/mason/report/fake-data/help-lint-time
diff --git a/extra/mason/report/fake-data/help-lint-vocabs b/tools/mason/report/fake-data/help-lint-vocabs
similarity index 100%
rename from extra/mason/report/fake-data/help-lint-vocabs
rename to tools/mason/report/fake-data/help-lint-vocabs
diff --git a/extra/mason/report/fake-data/html-help-time b/tools/mason/report/fake-data/html-help-time
similarity index 100%
rename from extra/mason/report/fake-data/html-help-time
rename to tools/mason/report/fake-data/html-help-time
diff --git a/extra/mason/report/fake-data/load-everything-errors b/tools/mason/report/fake-data/load-everything-errors
similarity index 100%
rename from extra/mason/report/fake-data/load-everything-errors
rename to tools/mason/report/fake-data/load-everything-errors
diff --git a/extra/mason/report/fake-data/load-everything-vocabs b/tools/mason/report/fake-data/load-everything-vocabs
similarity index 100%
rename from extra/mason/report/fake-data/load-everything-vocabs
rename to tools/mason/report/fake-data/load-everything-vocabs
diff --git a/extra/mason/report/fake-data/load-time b/tools/mason/report/fake-data/load-time
similarity index 100%
rename from extra/mason/report/fake-data/load-time
rename to tools/mason/report/fake-data/load-time
diff --git a/extra/mason/report/fake-data/test-all-errors b/tools/mason/report/fake-data/test-all-errors
similarity index 100%
rename from extra/mason/report/fake-data/test-all-errors
rename to tools/mason/report/fake-data/test-all-errors
diff --git a/extra/mason/report/fake-data/test-all-vocabs b/tools/mason/report/fake-data/test-all-vocabs
similarity index 100%
rename from extra/mason/report/fake-data/test-all-vocabs
rename to tools/mason/report/fake-data/test-all-vocabs
diff --git a/extra/mason/report/fake-data/test-log b/tools/mason/report/fake-data/test-log
similarity index 100%
rename from extra/mason/report/fake-data/test-log
rename to tools/mason/report/fake-data/test-log
diff --git a/extra/mason/report/fake-data/test-time b/tools/mason/report/fake-data/test-time
similarity index 100%
rename from extra/mason/report/fake-data/test-time
rename to tools/mason/report/fake-data/test-time
diff --git a/extra/mason/report/report-tests.factor b/tools/mason/report/report-tests.factor
similarity index 100%
rename from extra/mason/report/report-tests.factor
rename to tools/mason/report/report-tests.factor
diff --git a/extra/mason/report/report.factor b/tools/mason/report/report.factor
similarity index 100%
rename from extra/mason/report/report.factor
rename to tools/mason/report/report.factor
diff --git a/extra/mason/summary.txt b/tools/mason/summary.txt
similarity index 100%
rename from extra/mason/summary.txt
rename to tools/mason/summary.txt
diff --git a/extra/mason/test/test.factor b/tools/mason/test/test.factor
similarity index 100%
rename from extra/mason/test/test.factor
rename to tools/mason/test/test.factor
diff --git a/extra/smalltalk/selectors/authors.txt b/tools/mason/twitter/authors.txt
similarity index 100%
rename from extra/smalltalk/selectors/authors.txt
rename to tools/mason/twitter/authors.txt
diff --git a/extra/mason/twitter/twitter.factor b/tools/mason/twitter/twitter.factor
similarity index 100%
rename from extra/mason/twitter/twitter.factor
rename to tools/mason/twitter/twitter.factor
diff --git a/extra/mason/updates/updates.factor b/tools/mason/updates/updates.factor
similarity index 100%
rename from extra/mason/updates/updates.factor
rename to tools/mason/updates/updates.factor
diff --git a/extra/model-viewer/model-viewer.factor b/tools/model-viewer/model-viewer.factor
similarity index 100%
rename from extra/model-viewer/model-viewer.factor
rename to tools/model-viewer/model-viewer.factor
diff --git a/extra/ui/gadgets/lists/authors.txt b/tools/msxml-to-csv/authors.txt
similarity index 100%
rename from extra/ui/gadgets/lists/authors.txt
rename to tools/msxml-to-csv/authors.txt
diff --git a/extra/msxml-to-csv/msxml-to-csv-tests.factor b/tools/msxml-to-csv/msxml-to-csv-tests.factor
similarity index 100%
rename from extra/msxml-to-csv/msxml-to-csv-tests.factor
rename to tools/msxml-to-csv/msxml-to-csv-tests.factor
diff --git a/extra/msxml-to-csv/msxml-to-csv.factor b/tools/msxml-to-csv/msxml-to-csv.factor
similarity index 100%
rename from extra/msxml-to-csv/msxml-to-csv.factor
rename to tools/msxml-to-csv/msxml-to-csv.factor
diff --git a/extra/msxml-to-csv/summary.txt b/tools/msxml-to-csv/summary.txt
similarity index 100%
rename from extra/msxml-to-csv/summary.txt
rename to tools/msxml-to-csv/summary.txt
diff --git a/extra/msxml-to-csv/test.csv b/tools/msxml-to-csv/test.csv
similarity index 100%
rename from extra/msxml-to-csv/test.csv
rename to tools/msxml-to-csv/test.csv
diff --git a/extra/msxml-to-csv/test.xml b/tools/msxml-to-csv/test.xml
similarity index 100%
rename from extra/msxml-to-csv/test.xml
rename to tools/msxml-to-csv/test.xml
diff --git a/extra/native-thread-test/native-thread-test.factor b/tools/native-thread-test/native-thread-test.factor
similarity index 100%
rename from extra/native-thread-test/native-thread-test.factor
rename to tools/native-thread-test/native-thread-test.factor
diff --git a/extra/webapps/mason/backend/watchdog/authors.txt b/tools/none/authors.txt
similarity index 100%
rename from extra/webapps/mason/backend/watchdog/authors.txt
rename to tools/none/authors.txt
diff --git a/basis/none/deploy.factor b/tools/none/deploy.factor
similarity index 100%
rename from basis/none/deploy.factor
rename to tools/none/deploy.factor
diff --git a/basis/none/none-docs.factor b/tools/none/none-docs.factor
similarity index 100%
rename from basis/none/none-docs.factor
rename to tools/none/none-docs.factor
diff --git a/basis/none/none.factor b/tools/none/none.factor
similarity index 100%
rename from basis/none/none.factor
rename to tools/none/none.factor
diff --git a/basis/none/summary.txt b/tools/none/summary.txt
similarity index 100%
rename from basis/none/summary.txt
rename to tools/none/summary.txt
diff --git a/extra/sequences/shifted/authors.txt b/tools/ntp/authors.txt
similarity index 100%
rename from extra/sequences/shifted/authors.txt
rename to tools/ntp/authors.txt
diff --git a/extra/ntp/ntp-docs.factor b/tools/ntp/ntp-docs.factor
similarity index 100%
rename from extra/ntp/ntp-docs.factor
rename to tools/ntp/ntp-docs.factor
diff --git a/extra/ntp/ntp.factor b/tools/ntp/ntp.factor
similarity index 100%
rename from extra/ntp/ntp.factor
rename to tools/ntp/ntp.factor
diff --git a/extra/ntp/summary.txt b/tools/ntp/summary.txt
similarity index 100%
rename from extra/ntp/summary.txt
rename to tools/ntp/summary.txt
diff --git a/extra/sequences/snipped/authors.txt b/tools/pdf/authors.txt
similarity index 100%
rename from extra/sequences/snipped/authors.txt
rename to tools/pdf/authors.txt
diff --git a/extra/pdf/canvas/canvas.factor b/tools/pdf/canvas/canvas.factor
similarity index 100%
rename from extra/pdf/canvas/canvas.factor
rename to tools/pdf/canvas/canvas.factor
diff --git a/extra/pdf/layout/layout.factor b/tools/pdf/layout/layout.factor
similarity index 100%
rename from extra/pdf/layout/layout.factor
rename to tools/pdf/layout/layout.factor
diff --git a/extra/pdf/pdf-docs.factor b/tools/pdf/pdf-docs.factor
similarity index 100%
rename from extra/pdf/pdf-docs.factor
rename to tools/pdf/pdf-docs.factor
diff --git a/extra/pdf/pdf-tests.factor b/tools/pdf/pdf-tests.factor
similarity index 100%
rename from extra/pdf/pdf-tests.factor
rename to tools/pdf/pdf-tests.factor
diff --git a/extra/pdf/pdf.factor b/tools/pdf/pdf.factor
similarity index 100%
rename from extra/pdf/pdf.factor
rename to tools/pdf/pdf.factor
diff --git a/extra/pdf/streams/streams.factor b/tools/pdf/streams/streams.factor
similarity index 100%
rename from extra/pdf/streams/streams.factor
rename to tools/pdf/streams/streams.factor
diff --git a/extra/pdf/streams/summary.txt b/tools/pdf/streams/summary.txt
similarity index 100%
rename from extra/pdf/streams/summary.txt
rename to tools/pdf/streams/summary.txt
diff --git a/extra/pdf/summary.txt b/tools/pdf/summary.txt
similarity index 100%
rename from extra/pdf/summary.txt
rename to tools/pdf/summary.txt
diff --git a/extra/pdf/text/text.factor b/tools/pdf/text/text.factor
similarity index 100%
rename from extra/pdf/text/text.factor
rename to tools/pdf/text/text.factor
diff --git a/extra/pdf/units/units-tests.factor b/tools/pdf/units/units-tests.factor
similarity index 100%
rename from extra/pdf/units/units-tests.factor
rename to tools/pdf/units/units-tests.factor
diff --git a/extra/pdf/units/units.factor b/tools/pdf/units/units.factor
similarity index 100%
rename from extra/pdf/units/units.factor
rename to tools/pdf/units/units.factor
diff --git a/extra/pdf/values/values.factor b/tools/pdf/values/values.factor
similarity index 100%
rename from extra/pdf/values/values.factor
rename to tools/pdf/values/values.factor
diff --git a/extra/pdf/wrap/wrap-tests.factor b/tools/pdf/wrap/wrap-tests.factor
similarity index 100%
rename from extra/pdf/wrap/wrap-tests.factor
rename to tools/pdf/wrap/wrap-tests.factor
diff --git a/extra/pdf/wrap/wrap.factor b/tools/pdf/wrap/wrap.factor
similarity index 100%
rename from extra/pdf/wrap/wrap.factor
rename to tools/pdf/wrap/wrap.factor
diff --git a/extra/sequences/zipped/authors.txt b/tools/ping/authors.txt
similarity index 100%
rename from extra/sequences/zipped/authors.txt
rename to tools/ping/authors.txt
diff --git a/extra/ping/ping-tests.factor b/tools/ping/ping-tests.factor
similarity index 100%
rename from extra/ping/ping-tests.factor
rename to tools/ping/ping-tests.factor
diff --git a/extra/ping/ping.factor b/tools/ping/ping.factor
similarity index 100%
rename from extra/ping/ping.factor
rename to tools/ping/ping.factor
diff --git a/extra/ping/platforms.txt b/tools/ping/platforms.txt
similarity index 100%
rename from extra/ping/platforms.txt
rename to tools/ping/platforms.txt
diff --git a/extra/ping/summary.txt b/tools/ping/summary.txt
similarity index 100%
rename from extra/ping/summary.txt
rename to tools/ping/summary.txt
diff --git a/extra/readline/authors.txt b/tools/readline-listener/authors.txt
similarity index 100%
rename from extra/readline/authors.txt
rename to tools/readline-listener/authors.txt
diff --git a/extra/readline/platforms.txt b/tools/readline-listener/platforms.txt
similarity index 100%
rename from extra/readline/platforms.txt
rename to tools/readline-listener/platforms.txt
diff --git a/extra/readline-listener/readline-listener-docs.factor b/tools/readline-listener/readline-listener-docs.factor
similarity index 100%
rename from extra/readline-listener/readline-listener-docs.factor
rename to tools/readline-listener/readline-listener-docs.factor
diff --git a/extra/readline-listener/readline-listener.factor b/tools/readline-listener/readline-listener.factor
similarity index 100%
rename from extra/readline-listener/readline-listener.factor
rename to tools/readline-listener/readline-listener.factor
diff --git a/extra/readline-listener/summary.txt b/tools/readline-listener/summary.txt
similarity index 100%
rename from extra/readline-listener/summary.txt
rename to tools/readline-listener/summary.txt
diff --git a/extra/readline-listener/tags.txt b/tools/readline-listener/tags.txt
similarity index 100%
rename from extra/readline-listener/tags.txt
rename to tools/readline-listener/tags.txt
diff --git a/extra/reports/noise/noise.factor b/tools/reports/noise/noise.factor
similarity index 100%
rename from extra/reports/noise/noise.factor
rename to tools/reports/noise/noise.factor
diff --git a/extra/resolv-conf/authors.txt b/tools/resolv-conf/authors.txt
similarity index 100%
rename from extra/resolv-conf/authors.txt
rename to tools/resolv-conf/authors.txt
diff --git a/extra/resolv-conf/resolv-conf.factor b/tools/resolv-conf/resolv-conf.factor
similarity index 100%
rename from extra/resolv-conf/resolv-conf.factor
rename to tools/resolv-conf/resolv-conf.factor
diff --git a/extra/resolv-conf/resolv-conf.test b/tools/resolv-conf/resolv-conf.test
similarity index 100%
rename from extra/resolv-conf/resolv-conf.test
rename to tools/resolv-conf/resolv-conf.test
diff --git a/extra/spider/authors.txt b/tools/spider/authors.txt
similarity index 100%
rename from extra/spider/authors.txt
rename to tools/spider/authors.txt
diff --git a/extra/spider/report/authors.txt b/tools/spider/report/authors.txt
similarity index 100%
rename from extra/spider/report/authors.txt
rename to tools/spider/report/authors.txt
diff --git a/extra/spider/report/report.factor b/tools/spider/report/report.factor
similarity index 100%
rename from extra/spider/report/report.factor
rename to tools/spider/report/report.factor
diff --git a/extra/spider/spider-docs.factor b/tools/spider/spider-docs.factor
similarity index 100%
rename from extra/spider/spider-docs.factor
rename to tools/spider/spider-docs.factor
diff --git a/extra/spider/spider.factor b/tools/spider/spider.factor
similarity index 100%
rename from extra/spider/spider.factor
rename to tools/spider/spider.factor
diff --git a/extra/site-watcher/db/authors.txt b/tools/spider/unique-deque/authors.txt
similarity index 100%
rename from extra/site-watcher/db/authors.txt
rename to tools/spider/unique-deque/authors.txt
diff --git a/extra/spider/unique-deque/unique-deque.factor b/tools/spider/unique-deque/unique-deque.factor
similarity index 100%
rename from extra/spider/unique-deque/unique-deque.factor
rename to tools/spider/unique-deque/unique-deque.factor
diff --git a/extra/tar/authors.txt b/tools/tar/authors.txt
similarity index 100%
rename from extra/tar/authors.txt
rename to tools/tar/authors.txt
diff --git a/extra/tar/tar.factor b/tools/tar/tar.factor
similarity index 100%
rename from extra/tar/tar.factor
rename to tools/tar/tar.factor
diff --git a/extra/text-to-pdf/authors.txt b/tools/text-to-pdf/authors.txt
similarity index 100%
rename from extra/text-to-pdf/authors.txt
rename to tools/text-to-pdf/authors.txt
diff --git a/extra/text-to-pdf/summary.txt b/tools/text-to-pdf/summary.txt
similarity index 100%
rename from extra/text-to-pdf/summary.txt
rename to tools/text-to-pdf/summary.txt
diff --git a/extra/text-to-pdf/text-to-pdf.factor b/tools/text-to-pdf/text-to-pdf.factor
similarity index 100%
rename from extra/text-to-pdf/text-to-pdf.factor
rename to tools/text-to-pdf/text-to-pdf.factor
diff --git a/extra/text-to-pdf/text-to-pdf.pdf b/tools/text-to-pdf/text-to-pdf.pdf
similarity index 100%
rename from extra/text-to-pdf/text-to-pdf.pdf
rename to tools/text-to-pdf/text-to-pdf.pdf
diff --git a/extra/talks/chicago-talk/authors.txt b/tools/time-server/authors.txt
similarity index 100%
rename from extra/talks/chicago-talk/authors.txt
rename to tools/time-server/authors.txt
diff --git a/extra/time-server/time-server-tests.factor b/tools/time-server/time-server-tests.factor
similarity index 100%
rename from extra/time-server/time-server-tests.factor
rename to tools/time-server/time-server-tests.factor
diff --git a/extra/time-server/time-server.factor b/tools/time-server/time-server.factor
similarity index 100%
rename from extra/time-server/time-server.factor
rename to tools/time-server/time-server.factor
diff --git a/extra/tools/cat/authors.txt b/tools/tools/cat/authors.txt
similarity index 100%
rename from extra/tools/cat/authors.txt
rename to tools/tools/cat/authors.txt
diff --git a/extra/tools/cat/cat.factor b/tools/tools/cat/cat.factor
similarity index 100%
rename from extra/tools/cat/cat.factor
rename to tools/tools/cat/cat.factor
diff --git a/extra/tools/cat/deploy.factor b/tools/tools/cat/deploy.factor
similarity index 100%
rename from extra/tools/cat/deploy.factor
rename to tools/tools/cat/deploy.factor
diff --git a/extra/tools/copy/authors.txt b/tools/tools/copy/authors.txt
similarity index 100%
rename from extra/tools/copy/authors.txt
rename to tools/tools/copy/authors.txt
diff --git a/extra/tools/copy/copy.factor b/tools/tools/copy/copy.factor
similarity index 100%
rename from extra/tools/copy/copy.factor
rename to tools/tools/copy/copy.factor
diff --git a/extra/tools/copy/deploy.factor b/tools/tools/copy/deploy.factor
similarity index 100%
rename from extra/tools/copy/deploy.factor
rename to tools/tools/copy/deploy.factor
diff --git a/extra/tools/dns/authors.txt b/tools/tools/dns/authors.txt
similarity index 100%
rename from extra/tools/dns/authors.txt
rename to tools/tools/dns/authors.txt
diff --git a/extra/tools/dns/dns.factor b/tools/tools/dns/dns.factor
similarity index 100%
rename from extra/tools/dns/dns.factor
rename to tools/tools/dns/dns.factor
diff --git a/extra/tools/dns/public/authors.txt b/tools/tools/dns/public/authors.txt
similarity index 100%
rename from extra/tools/dns/public/authors.txt
rename to tools/tools/dns/public/authors.txt
diff --git a/extra/tools/dns/public/public.factor b/tools/tools/dns/public/public.factor
similarity index 100%
rename from extra/tools/dns/public/public.factor
rename to tools/tools/dns/public/public.factor
diff --git a/extra/tools/echo/authors.txt b/tools/tools/echo/authors.txt
similarity index 100%
rename from extra/tools/echo/authors.txt
rename to tools/tools/echo/authors.txt
diff --git a/extra/tools/echo/deploy.factor b/tools/tools/echo/deploy.factor
similarity index 100%
rename from extra/tools/echo/deploy.factor
rename to tools/tools/echo/deploy.factor
diff --git a/extra/tools/echo/echo.factor b/tools/tools/echo/echo.factor
similarity index 100%
rename from extra/tools/echo/echo.factor
rename to tools/tools/echo/echo.factor
diff --git a/extra/tools/grep/deploy.factor b/tools/tools/grep/deploy.factor
similarity index 100%
rename from extra/tools/grep/deploy.factor
rename to tools/tools/grep/deploy.factor
diff --git a/extra/tools/grep/grep.factor b/tools/tools/grep/grep.factor
similarity index 100%
rename from extra/tools/grep/grep.factor
rename to tools/tools/grep/grep.factor
diff --git a/extra/tools/image-analyzer/code-heap-reader/code-heap-reader.factor b/tools/tools/image-analyzer/code-heap-reader/code-heap-reader.factor
similarity index 100%
rename from extra/tools/image-analyzer/code-heap-reader/code-heap-reader.factor
rename to tools/tools/image-analyzer/code-heap-reader/code-heap-reader.factor
diff --git a/extra/tools/image-analyzer/data-heap-reader/data-heap-reader.factor b/tools/tools/image-analyzer/data-heap-reader/data-heap-reader.factor
similarity index 100%
rename from extra/tools/image-analyzer/data-heap-reader/data-heap-reader.factor
rename to tools/tools/image-analyzer/data-heap-reader/data-heap-reader.factor
diff --git a/extra/tools/image-analyzer/gc-info/gc-info-docs.factor b/tools/tools/image-analyzer/gc-info/gc-info-docs.factor
similarity index 100%
rename from extra/tools/image-analyzer/gc-info/gc-info-docs.factor
rename to tools/tools/image-analyzer/gc-info/gc-info-docs.factor
diff --git a/extra/tools/image-analyzer/gc-info/gc-info-tests.factor b/tools/tools/image-analyzer/gc-info/gc-info-tests.factor
similarity index 100%
rename from extra/tools/image-analyzer/gc-info/gc-info-tests.factor
rename to tools/tools/image-analyzer/gc-info/gc-info-tests.factor
diff --git a/extra/tools/image-analyzer/gc-info/gc-info.factor b/tools/tools/image-analyzer/gc-info/gc-info.factor
similarity index 100%
rename from extra/tools/image-analyzer/gc-info/gc-info.factor
rename to tools/tools/image-analyzer/gc-info/gc-info.factor
diff --git a/extra/tools/image-analyzer/graphviz/graphviz-tests.factor b/tools/tools/image-analyzer/graphviz/graphviz-tests.factor
similarity index 100%
rename from extra/tools/image-analyzer/graphviz/graphviz-tests.factor
rename to tools/tools/image-analyzer/graphviz/graphviz-tests.factor
diff --git a/extra/tools/image-analyzer/graphviz/graphviz.factor b/tools/tools/image-analyzer/graphviz/graphviz.factor
similarity index 100%
rename from extra/tools/image-analyzer/graphviz/graphviz.factor
rename to tools/tools/image-analyzer/graphviz/graphviz.factor
diff --git a/extra/tools/image-analyzer/image-analyzer-docs.factor b/tools/tools/image-analyzer/image-analyzer-docs.factor
similarity index 100%
rename from extra/tools/image-analyzer/image-analyzer-docs.factor
rename to tools/tools/image-analyzer/image-analyzer-docs.factor
diff --git a/extra/tools/image-analyzer/image-analyzer-tests.factor b/tools/tools/image-analyzer/image-analyzer-tests.factor
similarity index 100%
rename from extra/tools/image-analyzer/image-analyzer-tests.factor
rename to tools/tools/image-analyzer/image-analyzer-tests.factor
diff --git a/extra/tools/image-analyzer/image-analyzer.factor b/tools/tools/image-analyzer/image-analyzer.factor
similarity index 100%
rename from extra/tools/image-analyzer/image-analyzer.factor
rename to tools/tools/image-analyzer/image-analyzer.factor
diff --git a/extra/tools/image-analyzer/references/references.factor b/tools/tools/image-analyzer/references/references.factor
similarity index 100%
rename from extra/tools/image-analyzer/references/references.factor
rename to tools/tools/image-analyzer/references/references.factor
diff --git a/extra/tools/image-analyzer/relocations/relocations.factor b/tools/tools/image-analyzer/relocations/relocations.factor
similarity index 100%
rename from extra/tools/image-analyzer/relocations/relocations.factor
rename to tools/tools/image-analyzer/relocations/relocations.factor
diff --git a/extra/tools/image-analyzer/utils/utils-tests.factor b/tools/tools/image-analyzer/utils/utils-tests.factor
similarity index 100%
rename from extra/tools/image-analyzer/utils/utils-tests.factor
rename to tools/tools/image-analyzer/utils/utils-tests.factor
diff --git a/extra/tools/image-analyzer/utils/utils.factor b/tools/tools/image-analyzer/utils/utils.factor
similarity index 100%
rename from extra/tools/image-analyzer/utils/utils.factor
rename to tools/tools/image-analyzer/utils/utils.factor
diff --git a/extra/tools/image-analyzer/vm/32/32.factor b/tools/tools/image-analyzer/vm/32/32.factor
similarity index 100%
rename from extra/tools/image-analyzer/vm/32/32.factor
rename to tools/tools/image-analyzer/vm/32/32.factor
diff --git a/extra/tools/image-analyzer/vm/64/64.factor b/tools/tools/image-analyzer/vm/64/64.factor
similarity index 100%
rename from extra/tools/image-analyzer/vm/64/64.factor
rename to tools/tools/image-analyzer/vm/64/64.factor
diff --git a/extra/tools/image-analyzer/vm/vm.factor b/tools/tools/image-analyzer/vm/vm.factor
similarity index 100%
rename from extra/tools/image-analyzer/vm/vm.factor
rename to tools/tools/image-analyzer/vm/vm.factor
diff --git a/extra/tools/move/authors.txt b/tools/tools/move/authors.txt
similarity index 100%
rename from extra/tools/move/authors.txt
rename to tools/tools/move/authors.txt
diff --git a/extra/tools/move/deploy.factor b/tools/tools/move/deploy.factor
similarity index 100%
rename from extra/tools/move/deploy.factor
rename to tools/tools/move/deploy.factor
diff --git a/extra/tools/move/move.factor b/tools/tools/move/move.factor
similarity index 100%
rename from extra/tools/move/move.factor
rename to tools/tools/move/move.factor
diff --git a/extra/tools/seq/authors.txt b/tools/tools/seq/authors.txt
similarity index 100%
rename from extra/tools/seq/authors.txt
rename to tools/tools/seq/authors.txt
diff --git a/extra/tools/seq/deploy.factor b/tools/tools/seq/deploy.factor
similarity index 100%
rename from extra/tools/seq/deploy.factor
rename to tools/tools/seq/deploy.factor
diff --git a/extra/tools/seq/seq.factor b/tools/tools/seq/seq.factor
similarity index 100%
rename from extra/tools/seq/seq.factor
rename to tools/tools/seq/seq.factor
diff --git a/extra/tools/time/struct/authors.txt b/tools/tools/time/struct/authors.txt
similarity index 100%
rename from extra/tools/time/struct/authors.txt
rename to tools/tools/time/struct/authors.txt
diff --git a/extra/tools/time/struct/struct.factor b/tools/tools/time/struct/struct.factor
similarity index 100%
rename from extra/tools/time/struct/struct.factor
rename to tools/tools/time/struct/struct.factor
diff --git a/extra/tools/tree/authors.txt b/tools/tools/tree/authors.txt
similarity index 100%
rename from extra/tools/tree/authors.txt
rename to tools/tools/tree/authors.txt
diff --git a/extra/tools/tree/deploy.factor b/tools/tools/tree/deploy.factor
similarity index 100%
rename from extra/tools/tree/deploy.factor
rename to tools/tools/tree/deploy.factor
diff --git a/extra/tools/tree/tree.factor b/tools/tools/tree/tree.factor
similarity index 100%
rename from extra/tools/tree/tree.factor
rename to tools/tools/tree/tree.factor
diff --git a/extra/tools/uniq/authors.txt b/tools/tools/uniq/authors.txt
similarity index 100%
rename from extra/tools/uniq/authors.txt
rename to tools/tools/uniq/authors.txt
diff --git a/extra/tools/uniq/deploy.factor b/tools/tools/uniq/deploy.factor
similarity index 100%
rename from extra/tools/uniq/deploy.factor
rename to tools/tools/uniq/deploy.factor
diff --git a/extra/tools/uniq/uniq.factor b/tools/tools/uniq/uniq.factor
similarity index 100%
rename from extra/tools/uniq/uniq.factor
rename to tools/tools/uniq/uniq.factor
diff --git a/extra/tools/which/authors.txt b/tools/tools/which/authors.txt
similarity index 100%
rename from extra/tools/which/authors.txt
rename to tools/tools/which/authors.txt
diff --git a/extra/tools/which/which-docs.factor b/tools/tools/which/which-docs.factor
similarity index 100%
rename from extra/tools/which/which-docs.factor
rename to tools/tools/which/which-docs.factor
diff --git a/extra/tools/which/which.factor b/tools/tools/which/which.factor
similarity index 100%
rename from extra/tools/which/which.factor
rename to tools/tools/which/which.factor
diff --git a/extra/tty-server/authors.txt b/tools/tty-server/authors.txt
similarity index 100%
rename from extra/tty-server/authors.txt
rename to tools/tty-server/authors.txt
diff --git a/extra/tty-server/summary.txt b/tools/tty-server/summary.txt
similarity index 100%
rename from extra/tty-server/summary.txt
rename to tools/tty-server/summary.txt
diff --git a/extra/tty-server/tags.txt b/tools/tty-server/tags.txt
similarity index 100%
rename from extra/tty-server/tags.txt
rename to tools/tty-server/tags.txt
diff --git a/extra/tty-server/tty-server.factor b/tools/tty-server/tty-server.factor
similarity index 100%
rename from extra/tty-server/tty-server.factor
rename to tools/tty-server/tty-server.factor
diff --git a/extra/window-controls-demo/authors.txt b/tools/vocabs/git/authors.txt
similarity index 100%
rename from extra/window-controls-demo/authors.txt
rename to tools/vocabs/git/authors.txt
diff --git a/extra/vocabs/git/git.factor b/tools/vocabs/git/git.factor
similarity index 100%
rename from extra/vocabs/git/git.factor
rename to tools/vocabs/git/git.factor
diff --git a/extra/wake-on-lan/authors.txt b/tools/wake-on-lan/authors.txt
similarity index 100%
rename from extra/wake-on-lan/authors.txt
rename to tools/wake-on-lan/authors.txt
diff --git a/extra/wake-on-lan/summary.txt b/tools/wake-on-lan/summary.txt
similarity index 100%
rename from extra/wake-on-lan/summary.txt
rename to tools/wake-on-lan/summary.txt
diff --git a/extra/wake-on-lan/wake-on-lan.factor b/tools/wake-on-lan/wake-on-lan.factor
similarity index 100%
rename from extra/wake-on-lan/wake-on-lan.factor
rename to tools/wake-on-lan/wake-on-lan.factor
diff --git a/extra/spider/unique-deque/authors.txt b/webapps/site-watcher/authors.txt
similarity index 100%
rename from extra/spider/unique-deque/authors.txt
rename to webapps/site-watcher/authors.txt
diff --git a/extra/talks/tc-lisp-talk/authors.txt b/webapps/site-watcher/db/authors.txt
similarity index 100%
rename from extra/talks/tc-lisp-talk/authors.txt
rename to webapps/site-watcher/db/authors.txt
diff --git a/extra/site-watcher/db/db.factor b/webapps/site-watcher/db/db.factor
similarity index 100%
rename from extra/site-watcher/db/db.factor
rename to webapps/site-watcher/db/db.factor
diff --git a/extra/talks/jvm-summit-talk/authors.txt b/webapps/site-watcher/email/authors.txt
similarity index 100%
rename from extra/talks/jvm-summit-talk/authors.txt
rename to webapps/site-watcher/email/authors.txt
diff --git a/extra/site-watcher/email/email.factor b/webapps/site-watcher/email/email.factor
similarity index 100%
rename from extra/site-watcher/email/email.factor
rename to webapps/site-watcher/email/email.factor
diff --git a/extra/site-watcher/site-watcher-tests.factor b/webapps/site-watcher/site-watcher-tests.factor
similarity index 100%
rename from extra/site-watcher/site-watcher-tests.factor
rename to webapps/site-watcher/site-watcher-tests.factor
diff --git a/extra/site-watcher/site-watcher.factor b/webapps/site-watcher/site-watcher.factor
similarity index 100%
rename from extra/site-watcher/site-watcher.factor
rename to webapps/site-watcher/site-watcher.factor
diff --git a/extra/time-server/authors.txt b/webapps/site-watcher/spider/authors.txt
similarity index 100%
rename from extra/time-server/authors.txt
rename to webapps/site-watcher/spider/authors.txt
diff --git a/extra/site-watcher/spider/spider.factor b/webapps/site-watcher/spider/spider.factor
similarity index 100%
rename from extra/site-watcher/spider/spider.factor
rename to webapps/site-watcher/spider/spider.factor
diff --git a/extra/webapps/benchmark/benchmark.factor b/webapps/webapps/benchmark/benchmark.factor
similarity index 100%
rename from extra/webapps/benchmark/benchmark.factor
rename to webapps/webapps/benchmark/benchmark.factor
diff --git a/extra/webapps/blogs/blogs-common.xml b/webapps/webapps/blogs/blogs-common.xml
similarity index 100%
rename from extra/webapps/blogs/blogs-common.xml
rename to webapps/webapps/blogs/blogs-common.xml
diff --git a/extra/webapps/blogs/blogs.css b/webapps/webapps/blogs/blogs.css
similarity index 100%
rename from extra/webapps/blogs/blogs.css
rename to webapps/webapps/blogs/blogs.css
diff --git a/extra/webapps/blogs/blogs.factor b/webapps/webapps/blogs/blogs.factor
similarity index 100%
rename from extra/webapps/blogs/blogs.factor
rename to webapps/webapps/blogs/blogs.factor
diff --git a/extra/webapps/blogs/edit-post.xml b/webapps/webapps/blogs/edit-post.xml
similarity index 100%
rename from extra/webapps/blogs/edit-post.xml
rename to webapps/webapps/blogs/edit-post.xml
diff --git a/extra/webapps/blogs/list-posts.xml b/webapps/webapps/blogs/list-posts.xml
similarity index 100%
rename from extra/webapps/blogs/list-posts.xml
rename to webapps/webapps/blogs/list-posts.xml
diff --git a/extra/webapps/blogs/new-post.xml b/webapps/webapps/blogs/new-post.xml
similarity index 100%
rename from extra/webapps/blogs/new-post.xml
rename to webapps/webapps/blogs/new-post.xml
diff --git a/extra/webapps/blogs/posts-by.xml b/webapps/webapps/blogs/posts-by.xml
similarity index 100%
rename from extra/webapps/blogs/posts-by.xml
rename to webapps/webapps/blogs/posts-by.xml
diff --git a/extra/webapps/blogs/tags.txt b/webapps/webapps/blogs/tags.txt
similarity index 100%
rename from extra/webapps/blogs/tags.txt
rename to webapps/webapps/blogs/tags.txt
diff --git a/extra/webapps/blogs/view-post.xml b/webapps/webapps/blogs/view-post.xml
similarity index 100%
rename from extra/webapps/blogs/view-post.xml
rename to webapps/webapps/blogs/view-post.xml
diff --git a/extra/webapps/calculator/calculator.factor b/webapps/webapps/calculator/calculator.factor
similarity index 100%
rename from extra/webapps/calculator/calculator.factor
rename to webapps/webapps/calculator/calculator.factor
diff --git a/extra/webapps/calculator/calculator.xml b/webapps/webapps/calculator/calculator.xml
similarity index 100%
rename from extra/webapps/calculator/calculator.xml
rename to webapps/webapps/calculator/calculator.xml
diff --git a/extra/webapps/calculator/tags.txt b/webapps/webapps/calculator/tags.txt
similarity index 100%
rename from extra/webapps/calculator/tags.txt
rename to webapps/webapps/calculator/tags.txt
diff --git a/extra/webapps/counter/counter.factor b/webapps/webapps/counter/counter.factor
similarity index 100%
rename from extra/webapps/counter/counter.factor
rename to webapps/webapps/counter/counter.factor
diff --git a/extra/webapps/counter/counter.xml b/webapps/webapps/counter/counter.xml
similarity index 100%
rename from extra/webapps/counter/counter.xml
rename to webapps/webapps/counter/counter.xml
diff --git a/extra/webapps/counter/tags.txt b/webapps/webapps/counter/tags.txt
similarity index 100%
rename from extra/webapps/counter/tags.txt
rename to webapps/webapps/counter/tags.txt
diff --git a/extra/webapps/fjsc/authors.txt b/webapps/webapps/fjsc/authors.txt
similarity index 100%
rename from extra/webapps/fjsc/authors.txt
rename to webapps/webapps/fjsc/authors.txt
diff --git a/extra/webapps/fjsc/fjsc.factor b/webapps/webapps/fjsc/fjsc.factor
similarity index 100%
rename from extra/webapps/fjsc/fjsc.factor
rename to webapps/webapps/fjsc/fjsc.factor
diff --git a/extra/webapps/fjsc/fjsc.xml b/webapps/webapps/fjsc/fjsc.xml
similarity index 100%
rename from extra/webapps/fjsc/fjsc.xml
rename to webapps/webapps/fjsc/fjsc.xml
diff --git a/extra/webapps/fjsc/main.xml b/webapps/webapps/fjsc/main.xml
similarity index 100%
rename from extra/webapps/fjsc/main.xml
rename to webapps/webapps/fjsc/main.xml
diff --git a/extra/webapps/fjsc/summary.txt b/webapps/webapps/fjsc/summary.txt
similarity index 100%
rename from extra/webapps/fjsc/summary.txt
rename to webapps/webapps/fjsc/summary.txt
diff --git a/extra/webapps/fjsc/tags.txt b/webapps/webapps/fjsc/tags.txt
similarity index 100%
rename from extra/webapps/fjsc/tags.txt
rename to webapps/webapps/fjsc/tags.txt
diff --git a/extra/webapps/fjsc/www/repl.js b/webapps/webapps/fjsc/www/repl.js
similarity index 100%
rename from extra/webapps/fjsc/www/repl.js
rename to webapps/webapps/fjsc/www/repl.js
diff --git a/extra/webapps/fjsc/www/termlib/faq.html b/webapps/webapps/fjsc/www/termlib/faq.html
similarity index 100%
rename from extra/webapps/fjsc/www/termlib/faq.html
rename to webapps/webapps/fjsc/www/termlib/faq.html
diff --git a/extra/webapps/fjsc/www/termlib/index.html b/webapps/webapps/fjsc/www/termlib/index.html
similarity index 100%
rename from extra/webapps/fjsc/www/termlib/index.html
rename to webapps/webapps/fjsc/www/termlib/index.html
diff --git a/extra/webapps/fjsc/www/termlib/multiterm_test.html b/webapps/webapps/fjsc/www/termlib/multiterm_test.html
similarity index 100%
rename from extra/webapps/fjsc/www/termlib/multiterm_test.html
rename to webapps/webapps/fjsc/www/termlib/multiterm_test.html
diff --git a/extra/webapps/fjsc/www/termlib/parser_sample.html b/webapps/webapps/fjsc/www/termlib/parser_sample.html
similarity index 100%
rename from extra/webapps/fjsc/www/termlib/parser_sample.html
rename to webapps/webapps/fjsc/www/termlib/parser_sample.html
diff --git a/extra/webapps/fjsc/www/termlib/readme.txt b/webapps/webapps/fjsc/www/termlib/readme.txt
similarity index 100%
rename from extra/webapps/fjsc/www/termlib/readme.txt
rename to webapps/webapps/fjsc/www/termlib/readme.txt
diff --git a/extra/webapps/fjsc/www/termlib/term_styles.css b/webapps/webapps/fjsc/www/termlib/term_styles.css
similarity index 100%
rename from extra/webapps/fjsc/www/termlib/term_styles.css
rename to webapps/webapps/fjsc/www/termlib/term_styles.css
diff --git a/extra/webapps/fjsc/www/termlib/termlib.js b/webapps/webapps/fjsc/www/termlib/termlib.js
similarity index 100%
rename from extra/webapps/fjsc/www/termlib/termlib.js
rename to webapps/webapps/fjsc/www/termlib/termlib.js
diff --git a/extra/webapps/fjsc/www/termlib/termlib_parser.js b/webapps/webapps/fjsc/www/termlib/termlib_parser.js
similarity index 100%
rename from extra/webapps/fjsc/www/termlib/termlib_parser.js
rename to webapps/webapps/fjsc/www/termlib/termlib_parser.js
diff --git a/extra/webapps/help/help.factor b/webapps/webapps/help/help.factor
similarity index 100%
rename from extra/webapps/help/help.factor
rename to webapps/webapps/help/help.factor
diff --git a/extra/webapps/help/search.xml b/webapps/webapps/help/search.xml
similarity index 100%
rename from extra/webapps/help/search.xml
rename to webapps/webapps/help/search.xml
diff --git a/extra/webapps/imagebin/authors.txt b/webapps/webapps/imagebin/authors.txt
similarity index 100%
rename from extra/webapps/imagebin/authors.txt
rename to webapps/webapps/imagebin/authors.txt
diff --git a/extra/webapps/imagebin/imagebin.factor b/webapps/webapps/imagebin/imagebin.factor
similarity index 100%
rename from extra/webapps/imagebin/imagebin.factor
rename to webapps/webapps/imagebin/imagebin.factor
diff --git a/extra/webapps/imagebin/upload-image.xml b/webapps/webapps/imagebin/upload-image.xml
similarity index 100%
rename from extra/webapps/imagebin/upload-image.xml
rename to webapps/webapps/imagebin/upload-image.xml
diff --git a/extra/webapps/imagebin/uploaded-image.xml b/webapps/webapps/imagebin/uploaded-image.xml
similarity index 100%
rename from extra/webapps/imagebin/uploaded-image.xml
rename to webapps/webapps/imagebin/uploaded-image.xml
diff --git a/extra/webapps/ip/ip.factor b/webapps/webapps/ip/ip.factor
similarity index 100%
rename from extra/webapps/ip/ip.factor
rename to webapps/webapps/ip/ip.factor
diff --git a/extra/webapps/ip/ip.xml b/webapps/webapps/ip/ip.xml
similarity index 100%
rename from extra/webapps/ip/ip.xml
rename to webapps/webapps/ip/ip.xml
diff --git a/extra/webapps/irc-log/authors.txt b/webapps/webapps/irc-log/authors.txt
similarity index 100%
rename from extra/webapps/irc-log/authors.txt
rename to webapps/webapps/irc-log/authors.txt
diff --git a/extra/webapps/irc-log/irc-log.factor b/webapps/webapps/irc-log/irc-log.factor
similarity index 100%
rename from extra/webapps/irc-log/irc-log.factor
rename to webapps/webapps/irc-log/irc-log.factor
diff --git a/extra/webapps/mason/authors.txt b/webapps/webapps/mason/authors.txt
similarity index 100%
rename from extra/webapps/mason/authors.txt
rename to webapps/webapps/mason/authors.txt
diff --git a/extra/webapps/mason/backend/authors.txt b/webapps/webapps/mason/backend/authors.txt
similarity index 100%
rename from extra/webapps/mason/backend/authors.txt
rename to webapps/webapps/mason/backend/authors.txt
diff --git a/extra/webapps/mason/backend/backend-docs.factor b/webapps/webapps/mason/backend/backend-docs.factor
similarity index 100%
rename from extra/webapps/mason/backend/backend-docs.factor
rename to webapps/webapps/mason/backend/backend-docs.factor
diff --git a/extra/webapps/mason/backend/backend-tests.factor b/webapps/webapps/mason/backend/backend-tests.factor
similarity index 100%
rename from extra/webapps/mason/backend/backend-tests.factor
rename to webapps/webapps/mason/backend/backend-tests.factor
diff --git a/extra/webapps/mason/backend/backend.factor b/webapps/webapps/mason/backend/backend.factor
similarity index 100%
rename from extra/webapps/mason/backend/backend.factor
rename to webapps/webapps/mason/backend/backend.factor
diff --git a/extra/webapps/mason/docs-update/authors.txt b/webapps/webapps/mason/backend/watchdog/authors.txt
similarity index 100%
rename from extra/webapps/mason/docs-update/authors.txt
rename to webapps/webapps/mason/backend/watchdog/authors.txt
diff --git a/extra/webapps/mason/backend/watchdog/watchdog.factor b/webapps/webapps/mason/backend/watchdog/watchdog.factor
similarity index 100%
rename from extra/webapps/mason/backend/watchdog/watchdog.factor
rename to webapps/webapps/mason/backend/watchdog/watchdog.factor
diff --git a/extra/webapps/mason/counter/counter.factor b/webapps/webapps/mason/counter/counter.factor
similarity index 100%
rename from extra/webapps/mason/counter/counter.factor
rename to webapps/webapps/mason/counter/counter.factor
diff --git a/extra/webapps/mason/dashboard.xml b/webapps/webapps/mason/dashboard.xml
similarity index 100%
rename from extra/webapps/mason/dashboard.xml
rename to webapps/webapps/mason/dashboard.xml
diff --git a/extra/webapps/mason/dashboard/dashboard-tests.factor b/webapps/webapps/mason/dashboard/dashboard-tests.factor
similarity index 100%
rename from extra/webapps/mason/dashboard/dashboard-tests.factor
rename to webapps/webapps/mason/dashboard/dashboard-tests.factor
diff --git a/extra/webapps/mason/dashboard/dashboard.factor b/webapps/webapps/mason/dashboard/dashboard.factor
similarity index 100%
rename from extra/webapps/mason/dashboard/dashboard.factor
rename to webapps/webapps/mason/dashboard/dashboard.factor
diff --git a/extra/webapps/mason/downloads/authors.txt b/webapps/webapps/mason/docs-update/authors.txt
similarity index 100%
rename from extra/webapps/mason/downloads/authors.txt
rename to webapps/webapps/mason/docs-update/authors.txt
diff --git a/extra/webapps/mason/docs-update/docs-update.factor b/webapps/webapps/mason/docs-update/docs-update.factor
similarity index 100%
rename from extra/webapps/mason/docs-update/docs-update.factor
rename to webapps/webapps/mason/docs-update/docs-update.factor
diff --git a/extra/webapps/mason/download-package.xml b/webapps/webapps/mason/download-package.xml
similarity index 100%
rename from extra/webapps/mason/download-package.xml
rename to webapps/webapps/mason/download-package.xml
diff --git a/extra/webapps/mason/download-release.xml b/webapps/webapps/mason/download-release.xml
similarity index 100%
rename from extra/webapps/mason/download-release.xml
rename to webapps/webapps/mason/download-release.xml
diff --git a/extra/webapps/mason/downloads.xml b/webapps/webapps/mason/downloads.xml
similarity index 100%
rename from extra/webapps/mason/downloads.xml
rename to webapps/webapps/mason/downloads.xml
diff --git a/extra/webapps/mason/status-update/authors.txt b/webapps/webapps/mason/downloads/authors.txt
similarity index 100%
rename from extra/webapps/mason/status-update/authors.txt
rename to webapps/webapps/mason/downloads/authors.txt
diff --git a/extra/webapps/mason/downloads/downloads.factor b/webapps/webapps/mason/downloads/downloads.factor
similarity index 100%
rename from extra/webapps/mason/downloads/downloads.factor
rename to webapps/webapps/mason/downloads/downloads.factor
diff --git a/extra/webapps/mason/grids/authors.txt b/webapps/webapps/mason/grids/authors.txt
similarity index 100%
rename from extra/webapps/mason/grids/authors.txt
rename to webapps/webapps/mason/grids/authors.txt
diff --git a/extra/webapps/mason/grids/grids.factor b/webapps/webapps/mason/grids/grids.factor
similarity index 100%
rename from extra/webapps/mason/grids/grids.factor
rename to webapps/webapps/mason/grids/grids.factor
diff --git a/extra/webapps/mason/increment-counter/increment-counter.factor b/webapps/webapps/mason/increment-counter/increment-counter.factor
similarity index 100%
rename from extra/webapps/mason/increment-counter/increment-counter.factor
rename to webapps/webapps/mason/increment-counter/increment-counter.factor
diff --git a/extra/webapps/mason/make-release/authors.txt b/webapps/webapps/mason/make-release/authors.txt
similarity index 100%
rename from extra/webapps/mason/make-release/authors.txt
rename to webapps/webapps/mason/make-release/authors.txt
diff --git a/extra/webapps/mason/make-release/make-release.factor b/webapps/webapps/mason/make-release/make-release.factor
similarity index 100%
rename from extra/webapps/mason/make-release/make-release.factor
rename to webapps/webapps/mason/make-release/make-release.factor
diff --git a/extra/webapps/mason/mason.factor b/webapps/webapps/mason/mason.factor
similarity index 100%
rename from extra/webapps/mason/mason.factor
rename to webapps/webapps/mason/mason.factor
diff --git a/extra/webapps/mason/package/authors.txt b/webapps/webapps/mason/package/authors.txt
similarity index 100%
rename from extra/webapps/mason/package/authors.txt
rename to webapps/webapps/mason/package/authors.txt
diff --git a/extra/webapps/mason/package/package.factor b/webapps/webapps/mason/package/package.factor
similarity index 100%
rename from extra/webapps/mason/package/package.factor
rename to webapps/webapps/mason/package/package.factor
diff --git a/extra/webapps/mason/release/authors.txt b/webapps/webapps/mason/release/authors.txt
similarity index 100%
rename from extra/webapps/mason/release/authors.txt
rename to webapps/webapps/mason/release/authors.txt
diff --git a/extra/webapps/mason/release/release.factor b/webapps/webapps/mason/release/release.factor
similarity index 100%
rename from extra/webapps/mason/release/release.factor
rename to webapps/webapps/mason/release/release.factor
diff --git a/extra/webapps/mason/report/authors.txt b/webapps/webapps/mason/report/authors.txt
similarity index 100%
rename from extra/webapps/mason/report/authors.txt
rename to webapps/webapps/mason/report/authors.txt
diff --git a/extra/webapps/mason/report/report-tests.factor b/webapps/webapps/mason/report/report-tests.factor
similarity index 100%
rename from extra/webapps/mason/report/report-tests.factor
rename to webapps/webapps/mason/report/report-tests.factor
diff --git a/extra/webapps/mason/report/report.factor b/webapps/webapps/mason/report/report.factor
similarity index 100%
rename from extra/webapps/mason/report/report.factor
rename to webapps/webapps/mason/report/report.factor
diff --git a/extra/webapps/mason/version/authors.txt b/webapps/webapps/mason/status-update/authors.txt
similarity index 100%
rename from extra/webapps/mason/version/authors.txt
rename to webapps/webapps/mason/status-update/authors.txt
diff --git a/extra/webapps/mason/status-update/status-update-docs.factor b/webapps/webapps/mason/status-update/status-update-docs.factor
similarity index 100%
rename from extra/webapps/mason/status-update/status-update-docs.factor
rename to webapps/webapps/mason/status-update/status-update-docs.factor
diff --git a/extra/webapps/mason/status-update/status-update-tests.factor b/webapps/webapps/mason/status-update/status-update-tests.factor
similarity index 100%
rename from extra/webapps/mason/status-update/status-update-tests.factor
rename to webapps/webapps/mason/status-update/status-update-tests.factor
diff --git a/extra/webapps/mason/status-update/status-update.factor b/webapps/webapps/mason/status-update/status-update.factor
similarity index 100%
rename from extra/webapps/mason/status-update/status-update.factor
rename to webapps/webapps/mason/status-update/status-update.factor
diff --git a/extra/webapps/mason/utils/authors.txt b/webapps/webapps/mason/utils/authors.txt
similarity index 100%
rename from extra/webapps/mason/utils/authors.txt
rename to webapps/webapps/mason/utils/authors.txt
diff --git a/extra/webapps/mason/utils/utils-tests.factor b/webapps/webapps/mason/utils/utils-tests.factor
similarity index 100%
rename from extra/webapps/mason/utils/utils-tests.factor
rename to webapps/webapps/mason/utils/utils-tests.factor
diff --git a/extra/webapps/mason/utils/utils.factor b/webapps/webapps/mason/utils/utils.factor
similarity index 100%
rename from extra/webapps/mason/utils/utils.factor
rename to webapps/webapps/mason/utils/utils.factor
diff --git a/extra/webapps/mason/version/binary/authors.txt b/webapps/webapps/mason/version/authors.txt
similarity index 100%
rename from extra/webapps/mason/version/binary/authors.txt
rename to webapps/webapps/mason/version/authors.txt
diff --git a/extra/webapps/mason/version/common/authors.txt b/webapps/webapps/mason/version/binary/authors.txt
similarity index 100%
rename from extra/webapps/mason/version/common/authors.txt
rename to webapps/webapps/mason/version/binary/authors.txt
diff --git a/extra/webapps/mason/version/binary/binary.factor b/webapps/webapps/mason/version/binary/binary.factor
similarity index 100%
rename from extra/webapps/mason/version/binary/binary.factor
rename to webapps/webapps/mason/version/binary/binary.factor
diff --git a/extra/webapps/mason/version/data/authors.txt b/webapps/webapps/mason/version/common/authors.txt
similarity index 100%
rename from extra/webapps/mason/version/data/authors.txt
rename to webapps/webapps/mason/version/common/authors.txt
diff --git a/extra/webapps/mason/version/common/common.factor b/webapps/webapps/mason/version/common/common.factor
similarity index 100%
rename from extra/webapps/mason/version/common/common.factor
rename to webapps/webapps/mason/version/common/common.factor
diff --git a/extra/webapps/mason/version/files/authors.txt b/webapps/webapps/mason/version/data/authors.txt
similarity index 100%
rename from extra/webapps/mason/version/files/authors.txt
rename to webapps/webapps/mason/version/data/authors.txt
diff --git a/extra/webapps/mason/version/data/data.factor b/webapps/webapps/mason/version/data/data.factor
similarity index 100%
rename from extra/webapps/mason/version/data/data.factor
rename to webapps/webapps/mason/version/data/data.factor
diff --git a/extra/webapps/mason/version/source/authors.txt b/webapps/webapps/mason/version/files/authors.txt
similarity index 100%
rename from extra/webapps/mason/version/source/authors.txt
rename to webapps/webapps/mason/version/files/authors.txt
diff --git a/extra/webapps/mason/version/files/files.factor b/webapps/webapps/mason/version/files/files.factor
similarity index 100%
rename from extra/webapps/mason/version/files/files.factor
rename to webapps/webapps/mason/version/files/files.factor
diff --git a/extra/webapps/pastebin/authors.txt b/webapps/webapps/mason/version/source/authors.txt
similarity index 100%
rename from extra/webapps/pastebin/authors.txt
rename to webapps/webapps/mason/version/source/authors.txt
diff --git a/extra/webapps/mason/version/source/source.factor b/webapps/webapps/mason/version/source/source.factor
similarity index 100%
rename from extra/webapps/mason/version/source/source.factor
rename to webapps/webapps/mason/version/source/source.factor
diff --git a/extra/webapps/mason/version/version.factor b/webapps/webapps/mason/version/version.factor
similarity index 100%
rename from extra/webapps/mason/version/version.factor
rename to webapps/webapps/mason/version/version.factor
diff --git a/extra/webapps/planet/authors.txt b/webapps/webapps/pastebin/authors.txt
similarity index 100%
rename from extra/webapps/planet/authors.txt
rename to webapps/webapps/pastebin/authors.txt
diff --git a/extra/webapps/pastebin/new-paste.xml b/webapps/webapps/pastebin/new-paste.xml
similarity index 100%
rename from extra/webapps/pastebin/new-paste.xml
rename to webapps/webapps/pastebin/new-paste.xml
diff --git a/extra/webapps/pastebin/paste.xml b/webapps/webapps/pastebin/paste.xml
similarity index 100%
rename from extra/webapps/pastebin/paste.xml
rename to webapps/webapps/pastebin/paste.xml
diff --git a/extra/webapps/pastebin/pastebin-common.xml b/webapps/webapps/pastebin/pastebin-common.xml
similarity index 100%
rename from extra/webapps/pastebin/pastebin-common.xml
rename to webapps/webapps/pastebin/pastebin-common.xml
diff --git a/extra/webapps/pastebin/pastebin.css b/webapps/webapps/pastebin/pastebin.css
similarity index 100%
rename from extra/webapps/pastebin/pastebin.css
rename to webapps/webapps/pastebin/pastebin.css
diff --git a/extra/webapps/pastebin/pastebin.factor b/webapps/webapps/pastebin/pastebin.factor
similarity index 100%
rename from extra/webapps/pastebin/pastebin.factor
rename to webapps/webapps/pastebin/pastebin.factor
diff --git a/extra/webapps/pastebin/pastebin.xml b/webapps/webapps/pastebin/pastebin.xml
similarity index 100%
rename from extra/webapps/pastebin/pastebin.xml
rename to webapps/webapps/pastebin/pastebin.xml
diff --git a/extra/webapps/pastebin/tags.txt b/webapps/webapps/pastebin/tags.txt
similarity index 100%
rename from extra/webapps/pastebin/tags.txt
rename to webapps/webapps/pastebin/tags.txt
diff --git a/extra/webapps/planet/admin.xml b/webapps/webapps/planet/admin.xml
similarity index 100%
rename from extra/webapps/planet/admin.xml
rename to webapps/webapps/planet/admin.xml
diff --git a/extra/webkit-demo/authors.txt b/webapps/webapps/planet/authors.txt
similarity index 100%
rename from extra/webkit-demo/authors.txt
rename to webapps/webapps/planet/authors.txt
diff --git a/extra/webapps/planet/edit-blog.xml b/webapps/webapps/planet/edit-blog.xml
similarity index 100%
rename from extra/webapps/planet/edit-blog.xml
rename to webapps/webapps/planet/edit-blog.xml
diff --git a/extra/webapps/planet/icons/feed-icon-14x14.png b/webapps/webapps/planet/icons/feed-icon-14x14.png
similarity index 100%
rename from extra/webapps/planet/icons/feed-icon-14x14.png
rename to webapps/webapps/planet/icons/feed-icon-14x14.png
diff --git a/extra/webapps/planet/new-blog.xml b/webapps/webapps/planet/new-blog.xml
similarity index 100%
rename from extra/webapps/planet/new-blog.xml
rename to webapps/webapps/planet/new-blog.xml
diff --git a/extra/webapps/planet/planet-common.xml b/webapps/webapps/planet/planet-common.xml
similarity index 100%
rename from extra/webapps/planet/planet-common.xml
rename to webapps/webapps/planet/planet-common.xml
diff --git a/extra/webapps/planet/planet.css b/webapps/webapps/planet/planet.css
similarity index 100%
rename from extra/webapps/planet/planet.css
rename to webapps/webapps/planet/planet.css
diff --git a/extra/webapps/planet/planet.factor b/webapps/webapps/planet/planet.factor
similarity index 100%
rename from extra/webapps/planet/planet.factor
rename to webapps/webapps/planet/planet.factor
diff --git a/extra/webapps/planet/planet.xml b/webapps/webapps/planet/planet.xml
similarity index 100%
rename from extra/webapps/planet/planet.xml
rename to webapps/webapps/planet/planet.xml
diff --git a/extra/webapps/planet/tags.txt b/webapps/webapps/planet/tags.txt
similarity index 100%
rename from extra/webapps/planet/tags.txt
rename to webapps/webapps/planet/tags.txt
diff --git a/extra/webapps/site-watcher/authors.txt b/webapps/webapps/site-watcher/authors.txt
similarity index 100%
rename from extra/webapps/site-watcher/authors.txt
rename to webapps/webapps/site-watcher/authors.txt
diff --git a/extra/webapps/site-watcher/common/authors.txt b/webapps/webapps/site-watcher/common/authors.txt
similarity index 100%
rename from extra/webapps/site-watcher/common/authors.txt
rename to webapps/webapps/site-watcher/common/authors.txt
diff --git a/extra/webapps/site-watcher/common/common.factor b/webapps/webapps/site-watcher/common/common.factor
similarity index 100%
rename from extra/webapps/site-watcher/common/common.factor
rename to webapps/webapps/site-watcher/common/common.factor
diff --git a/extra/webapps/site-watcher/common/main.xml b/webapps/webapps/site-watcher/common/main.xml
similarity index 100%
rename from extra/webapps/site-watcher/common/main.xml
rename to webapps/webapps/site-watcher/common/main.xml
diff --git a/extra/webapps/site-watcher/common/site-list.xml b/webapps/webapps/site-watcher/common/site-list.xml
similarity index 100%
rename from extra/webapps/site-watcher/common/site-list.xml
rename to webapps/webapps/site-watcher/common/site-list.xml
diff --git a/extra/webapps/site-watcher/common/site-watcher.xml b/webapps/webapps/site-watcher/common/site-watcher.xml
similarity index 100%
rename from extra/webapps/site-watcher/common/site-watcher.xml
rename to webapps/webapps/site-watcher/common/site-watcher.xml
diff --git a/extra/webapps/site-watcher/common/spider-list.xml b/webapps/webapps/site-watcher/common/spider-list.xml
similarity index 100%
rename from extra/webapps/site-watcher/common/spider-list.xml
rename to webapps/webapps/site-watcher/common/spider-list.xml
diff --git a/extra/webapps/site-watcher/common/update-notify.xml b/webapps/webapps/site-watcher/common/update-notify.xml
similarity index 100%
rename from extra/webapps/site-watcher/common/update-notify.xml
rename to webapps/webapps/site-watcher/common/update-notify.xml
diff --git a/extra/webapps/site-watcher/site-watcher.factor b/webapps/webapps/site-watcher/site-watcher.factor
similarity index 100%
rename from extra/webapps/site-watcher/site-watcher.factor
rename to webapps/webapps/site-watcher/site-watcher.factor
diff --git a/extra/webapps/site-watcher/spidering/authors.txt b/webapps/webapps/site-watcher/spidering/authors.txt
similarity index 100%
rename from extra/webapps/site-watcher/spidering/authors.txt
rename to webapps/webapps/site-watcher/spidering/authors.txt
diff --git a/extra/webapps/site-watcher/spidering/spidering.factor b/webapps/webapps/site-watcher/spidering/spidering.factor
similarity index 100%
rename from extra/webapps/site-watcher/spidering/spidering.factor
rename to webapps/webapps/site-watcher/spidering/spidering.factor
diff --git a/extra/webapps/site-watcher/watching/authors.txt b/webapps/webapps/site-watcher/watching/authors.txt
similarity index 100%
rename from extra/webapps/site-watcher/watching/authors.txt
rename to webapps/webapps/site-watcher/watching/authors.txt
diff --git a/extra/webapps/site-watcher/watching/watching.factor b/webapps/webapps/site-watcher/watching/watching.factor
similarity index 100%
rename from extra/webapps/site-watcher/watching/watching.factor
rename to webapps/webapps/site-watcher/watching/watching.factor
diff --git a/extra/webapps/todo/edit-todo.xml b/webapps/webapps/todo/edit-todo.xml
similarity index 100%
rename from extra/webapps/todo/edit-todo.xml
rename to webapps/webapps/todo/edit-todo.xml
diff --git a/extra/webapps/todo/new-todo.xml b/webapps/webapps/todo/new-todo.xml
similarity index 100%
rename from extra/webapps/todo/new-todo.xml
rename to webapps/webapps/todo/new-todo.xml
diff --git a/extra/webapps/todo/tags.txt b/webapps/webapps/todo/tags.txt
similarity index 100%
rename from extra/webapps/todo/tags.txt
rename to webapps/webapps/todo/tags.txt
diff --git a/extra/webapps/todo/todo-list.xml b/webapps/webapps/todo/todo-list.xml
similarity index 100%
rename from extra/webapps/todo/todo-list.xml
rename to webapps/webapps/todo/todo-list.xml
diff --git a/extra/webapps/todo/todo.css b/webapps/webapps/todo/todo.css
similarity index 100%
rename from extra/webapps/todo/todo.css
rename to webapps/webapps/todo/todo.css
diff --git a/extra/webapps/todo/todo.factor b/webapps/webapps/todo/todo.factor
similarity index 100%
rename from extra/webapps/todo/todo.factor
rename to webapps/webapps/todo/todo.factor
diff --git a/extra/webapps/todo/todo.xml b/webapps/webapps/todo/todo.xml
similarity index 100%
rename from extra/webapps/todo/todo.xml
rename to webapps/webapps/todo/todo.xml
diff --git a/extra/webapps/todo/view-todo.xml b/webapps/webapps/todo/view-todo.xml
similarity index 100%
rename from extra/webapps/todo/view-todo.xml
rename to webapps/webapps/todo/view-todo.xml
diff --git a/extra/webapps/user-admin/edit-user.xml b/webapps/webapps/user-admin/edit-user.xml
similarity index 100%
rename from extra/webapps/user-admin/edit-user.xml
rename to webapps/webapps/user-admin/edit-user.xml
diff --git a/extra/webapps/user-admin/new-user.xml b/webapps/webapps/user-admin/new-user.xml
similarity index 100%
rename from extra/webapps/user-admin/new-user.xml
rename to webapps/webapps/user-admin/new-user.xml
diff --git a/extra/webapps/user-admin/tags.txt b/webapps/webapps/user-admin/tags.txt
similarity index 100%
rename from extra/webapps/user-admin/tags.txt
rename to webapps/webapps/user-admin/tags.txt
diff --git a/extra/webapps/user-admin/user-admin-docs.factor b/webapps/webapps/user-admin/user-admin-docs.factor
similarity index 100%
rename from extra/webapps/user-admin/user-admin-docs.factor
rename to webapps/webapps/user-admin/user-admin-docs.factor
diff --git a/extra/webapps/user-admin/user-admin.factor b/webapps/webapps/user-admin/user-admin.factor
similarity index 100%
rename from extra/webapps/user-admin/user-admin.factor
rename to webapps/webapps/user-admin/user-admin.factor
diff --git a/extra/webapps/user-admin/user-admin.xml b/webapps/webapps/user-admin/user-admin.xml
similarity index 100%
rename from extra/webapps/user-admin/user-admin.xml
rename to webapps/webapps/user-admin/user-admin.xml
diff --git a/extra/webapps/user-admin/user-list.xml b/webapps/webapps/user-admin/user-list.xml
similarity index 100%
rename from extra/webapps/user-admin/user-list.xml
rename to webapps/webapps/user-admin/user-list.xml
diff --git a/extra/webapps/utils/utils.factor b/webapps/webapps/utils/utils.factor
similarity index 100%
rename from extra/webapps/utils/utils.factor
rename to webapps/webapps/utils/utils.factor
diff --git a/extra/webapps/wee-url/shorten.xml b/webapps/webapps/wee-url/shorten.xml
similarity index 100%
rename from extra/webapps/wee-url/shorten.xml
rename to webapps/webapps/wee-url/shorten.xml
diff --git a/extra/webapps/wee-url/show.xml b/webapps/webapps/wee-url/show.xml
similarity index 100%
rename from extra/webapps/wee-url/show.xml
rename to webapps/webapps/wee-url/show.xml
diff --git a/extra/webapps/wee-url/tags.txt b/webapps/webapps/wee-url/tags.txt
similarity index 100%
rename from extra/webapps/wee-url/tags.txt
rename to webapps/webapps/wee-url/tags.txt
diff --git a/extra/webapps/wee-url/wee-url.factor b/webapps/webapps/wee-url/wee-url.factor
similarity index 100%
rename from extra/webapps/wee-url/wee-url.factor
rename to webapps/webapps/wee-url/wee-url.factor
diff --git a/extra/webapps/wee-url/wee-url.xml b/webapps/webapps/wee-url/wee-url.xml
similarity index 100%
rename from extra/webapps/wee-url/wee-url.xml
rename to webapps/webapps/wee-url/wee-url.xml
diff --git a/extra/webapps/wiki/articles.xml b/webapps/webapps/wiki/articles.xml
similarity index 100%
rename from extra/webapps/wiki/articles.xml
rename to webapps/webapps/wiki/articles.xml
diff --git a/extra/webapps/wiki/changes.xml b/webapps/webapps/wiki/changes.xml
similarity index 100%
rename from extra/webapps/wiki/changes.xml
rename to webapps/webapps/wiki/changes.xml
diff --git a/extra/webapps/wiki/diff.xml b/webapps/webapps/wiki/diff.xml
similarity index 100%
rename from extra/webapps/wiki/diff.xml
rename to webapps/webapps/wiki/diff.xml
diff --git a/extra/webapps/wiki/edit.xml b/webapps/webapps/wiki/edit.xml
similarity index 100%
rename from extra/webapps/wiki/edit.xml
rename to webapps/webapps/wiki/edit.xml
diff --git a/extra/webapps/wiki/example/example.factor b/webapps/webapps/wiki/example/example.factor
similarity index 100%
rename from extra/webapps/wiki/example/example.factor
rename to webapps/webapps/wiki/example/example.factor
diff --git a/extra/webapps/wiki/initial-content/Farkup.txt b/webapps/webapps/wiki/initial-content/Farkup.txt
similarity index 100%
rename from extra/webapps/wiki/initial-content/Farkup.txt
rename to webapps/webapps/wiki/initial-content/Farkup.txt
diff --git a/extra/webapps/wiki/initial-content/Front Page.txt b/webapps/webapps/wiki/initial-content/Front Page.txt
similarity index 100%
rename from extra/webapps/wiki/initial-content/Front Page.txt
rename to webapps/webapps/wiki/initial-content/Front Page.txt
diff --git a/extra/webapps/wiki/initial-content/Wiki Help.txt b/webapps/webapps/wiki/initial-content/Wiki Help.txt
similarity index 100%
rename from extra/webapps/wiki/initial-content/Wiki Help.txt
rename to webapps/webapps/wiki/initial-content/Wiki Help.txt
diff --git a/extra/webapps/wiki/page-common.xml b/webapps/webapps/wiki/page-common.xml
similarity index 100%
rename from extra/webapps/wiki/page-common.xml
rename to webapps/webapps/wiki/page-common.xml
diff --git a/extra/webapps/wiki/revisions-common.xml b/webapps/webapps/wiki/revisions-common.xml
similarity index 100%
rename from extra/webapps/wiki/revisions-common.xml
rename to webapps/webapps/wiki/revisions-common.xml
diff --git a/extra/webapps/wiki/revisions.xml b/webapps/webapps/wiki/revisions.xml
similarity index 100%
rename from extra/webapps/wiki/revisions.xml
rename to webapps/webapps/wiki/revisions.xml
diff --git a/extra/webapps/wiki/tags.txt b/webapps/webapps/wiki/tags.txt
similarity index 100%
rename from extra/webapps/wiki/tags.txt
rename to webapps/webapps/wiki/tags.txt
diff --git a/extra/webapps/wiki/user-edits.xml b/webapps/webapps/wiki/user-edits.xml
similarity index 100%
rename from extra/webapps/wiki/user-edits.xml
rename to webapps/webapps/wiki/user-edits.xml
diff --git a/extra/webapps/wiki/view.xml b/webapps/webapps/wiki/view.xml
similarity index 100%
rename from extra/webapps/wiki/view.xml
rename to webapps/webapps/wiki/view.xml
diff --git a/extra/webapps/wiki/wiki-common.xml b/webapps/webapps/wiki/wiki-common.xml
similarity index 100%
rename from extra/webapps/wiki/wiki-common.xml
rename to webapps/webapps/wiki/wiki-common.xml
diff --git a/extra/webapps/wiki/wiki.css b/webapps/webapps/wiki/wiki.css
similarity index 100%
rename from extra/webapps/wiki/wiki.css
rename to webapps/webapps/wiki/wiki.css
diff --git a/extra/webapps/wiki/wiki.factor b/webapps/webapps/wiki/wiki.factor
similarity index 100%
rename from extra/webapps/wiki/wiki.factor
rename to webapps/webapps/wiki/wiki.factor
diff --git a/extra/websites/concatenative/concatenative.factor b/webapps/websites/concatenative/concatenative.factor
similarity index 100%
rename from extra/websites/concatenative/concatenative.factor
rename to webapps/websites/concatenative/concatenative.factor
diff --git a/extra/websites/concatenative/page.css b/webapps/websites/concatenative/page.css
similarity index 100%
rename from extra/websites/concatenative/page.css
rename to webapps/websites/concatenative/page.css
diff --git a/extra/websites/concatenative/page.xml b/webapps/websites/concatenative/page.xml
similarity index 100%
rename from extra/websites/concatenative/page.xml
rename to webapps/websites/concatenative/page.xml
diff --git a/extra/websites/factorcode/bg_header.jpg b/webapps/websites/factorcode/bg_header.jpg
similarity index 100%
rename from extra/websites/factorcode/bg_header.jpg
rename to webapps/websites/factorcode/bg_header.jpg
diff --git a/extra/websites/factorcode/examples.txt b/webapps/websites/factorcode/examples.txt
similarity index 100%
rename from extra/websites/factorcode/examples.txt
rename to webapps/websites/factorcode/examples.txt
diff --git a/extra/websites/factorcode/factor-macosx.png b/webapps/websites/factorcode/factor-macosx.png
similarity index 100%
rename from extra/websites/factorcode/factor-macosx.png
rename to webapps/websites/factorcode/factor-macosx.png
diff --git a/extra/websites/factorcode/factor-windows7.png b/webapps/websites/factorcode/factor-windows7.png
similarity index 100%
rename from extra/websites/factorcode/factor-windows7.png
rename to webapps/websites/factorcode/factor-windows7.png
diff --git a/extra/websites/factorcode/factorcode.factor b/webapps/websites/factorcode/factorcode.factor
similarity index 100%
rename from extra/websites/factorcode/factorcode.factor
rename to webapps/websites/factorcode/factorcode.factor
diff --git a/extra/websites/factorcode/index.fhtml b/webapps/websites/factorcode/index.fhtml
similarity index 100%
rename from extra/websites/factorcode/index.fhtml
rename to webapps/websites/factorcode/index.fhtml
diff --git a/extra/websites/factorcode/license.txt b/webapps/websites/factorcode/license.txt
similarity index 100%
rename from extra/websites/factorcode/license.txt
rename to webapps/websites/factorcode/license.txt
diff --git a/extra/websites/factorcode/logo.png b/webapps/websites/factorcode/logo.png
similarity index 100%
rename from extra/websites/factorcode/logo.png
rename to webapps/websites/factorcode/logo.png
diff --git a/extra/websites/factorcode/master.css b/webapps/websites/factorcode/master.css
similarity index 100%
rename from extra/websites/factorcode/master.css
rename to webapps/websites/factorcode/master.css
diff --git a/extra/websites/factorcode/rackspace.jpg b/webapps/websites/factorcode/rackspace.jpg
similarity index 100%
rename from extra/websites/factorcode/rackspace.jpg
rename to webapps/websites/factorcode/rackspace.jpg