diff --git a/core/bootstrap/stage1.factor b/core/bootstrap/stage1.factor index 5b57d2de17..3dd7f0b2a5 100644 --- a/core/bootstrap/stage1.factor +++ b/core/bootstrap/stage1.factor @@ -53,7 +53,7 @@ load-help? off init-resource-path - "resource:basis/bootstrap/stage2.factor" + "resource:language/bootstrap/stage2.factor" dup exists? [ run-file ] [ diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor index 1de8ecabd5..d993f39a52 100644 --- a/core/vocabs/loader/loader.factor +++ b/core/vocabs/loader/loader.factor @@ -12,8 +12,17 @@ SYMBOL: add-vocab-root-hook [ V{ "resource:core" - "resource:basis" - "resource:extra" + "resource:language" + "resource:collections" + "resource:ffi" + "resource:libs" + "resource:frameworks" + "resource:apps" + "resource:tools" + "resource:webapps" + "resource:games" + "resource:demos" + "resource:benchmarks" "resource:work" } clone vocab-roots set-global diff --git a/basis/ui/theme/images/active-tab-left.tiff b/frameworks/ui/theme/images/active-tab-left.tiff similarity index 100% rename from basis/ui/theme/images/active-tab-left.tiff rename to frameworks/ui/theme/images/active-tab-left.tiff diff --git a/basis/ui/theme/images/active-tab-lip.tiff b/frameworks/ui/theme/images/active-tab-lip.tiff similarity index 100% rename from basis/ui/theme/images/active-tab-lip.tiff rename to frameworks/ui/theme/images/active-tab-lip.tiff diff --git a/basis/ui/theme/images/active-tab-middle.tiff b/frameworks/ui/theme/images/active-tab-middle.tiff similarity index 100% rename from basis/ui/theme/images/active-tab-middle.tiff rename to frameworks/ui/theme/images/active-tab-middle.tiff diff --git a/basis/ui/theme/images/active-tab-right.tiff b/frameworks/ui/theme/images/active-tab-right.tiff similarity index 100% rename from basis/ui/theme/images/active-tab-right.tiff rename to frameworks/ui/theme/images/active-tab-right.tiff diff --git a/basis/ui/theme/images/authors.txt b/frameworks/ui/theme/images/authors.txt similarity index 100% rename from basis/ui/theme/images/authors.txt rename to frameworks/ui/theme/images/authors.txt diff --git a/basis/ui/theme/images/button-clicked-left.tiff b/frameworks/ui/theme/images/button-clicked-left.tiff similarity index 100% rename from basis/ui/theme/images/button-clicked-left.tiff rename to frameworks/ui/theme/images/button-clicked-left.tiff diff --git a/basis/ui/theme/images/button-clicked-middle.tiff b/frameworks/ui/theme/images/button-clicked-middle.tiff similarity index 100% rename from basis/ui/theme/images/button-clicked-middle.tiff rename to frameworks/ui/theme/images/button-clicked-middle.tiff diff --git a/basis/ui/theme/images/button-clicked-right.tiff b/frameworks/ui/theme/images/button-clicked-right.tiff similarity index 100% rename from basis/ui/theme/images/button-clicked-right.tiff rename to frameworks/ui/theme/images/button-clicked-right.tiff diff --git a/basis/ui/theme/images/button-left.tiff b/frameworks/ui/theme/images/button-left.tiff similarity index 100% rename from basis/ui/theme/images/button-left.tiff rename to frameworks/ui/theme/images/button-left.tiff diff --git a/basis/ui/theme/images/button-middle.tiff b/frameworks/ui/theme/images/button-middle.tiff similarity index 100% rename from basis/ui/theme/images/button-middle.tiff rename to frameworks/ui/theme/images/button-middle.tiff diff --git a/basis/ui/theme/images/button-right.tiff b/frameworks/ui/theme/images/button-right.tiff similarity index 100% rename from basis/ui/theme/images/button-right.tiff rename to frameworks/ui/theme/images/button-right.tiff diff --git a/basis/ui/theme/images/checkbox-clicked.tiff b/frameworks/ui/theme/images/checkbox-clicked.tiff similarity index 100% rename from basis/ui/theme/images/checkbox-clicked.tiff rename to frameworks/ui/theme/images/checkbox-clicked.tiff diff --git a/basis/ui/theme/images/checkbox-set-clicked.tiff b/frameworks/ui/theme/images/checkbox-set-clicked.tiff similarity index 100% rename from basis/ui/theme/images/checkbox-set-clicked.tiff rename to frameworks/ui/theme/images/checkbox-set-clicked.tiff diff --git a/basis/ui/theme/images/checkbox-set.tiff b/frameworks/ui/theme/images/checkbox-set.tiff similarity index 100% rename from basis/ui/theme/images/checkbox-set.tiff rename to frameworks/ui/theme/images/checkbox-set.tiff diff --git a/basis/ui/theme/images/checkbox.tiff b/frameworks/ui/theme/images/checkbox.tiff similarity index 100% rename from basis/ui/theme/images/checkbox.tiff rename to frameworks/ui/theme/images/checkbox.tiff diff --git a/basis/ui/theme/images/clear-button-clicked.tiff b/frameworks/ui/theme/images/clear-button-clicked.tiff similarity index 100% rename from basis/ui/theme/images/clear-button-clicked.tiff rename to frameworks/ui/theme/images/clear-button-clicked.tiff diff --git a/basis/ui/theme/images/clear-button.tiff b/frameworks/ui/theme/images/clear-button.tiff similarity index 100% rename from basis/ui/theme/images/clear-button.tiff rename to frameworks/ui/theme/images/clear-button.tiff diff --git a/basis/ui/theme/images/horizontal-scroller-handle-grip.tiff b/frameworks/ui/theme/images/horizontal-scroller-handle-grip.tiff similarity index 100% rename from basis/ui/theme/images/horizontal-scroller-handle-grip.tiff rename to frameworks/ui/theme/images/horizontal-scroller-handle-grip.tiff diff --git a/basis/ui/theme/images/horizontal-scroller-handle-left.tiff b/frameworks/ui/theme/images/horizontal-scroller-handle-left.tiff similarity index 100% rename from basis/ui/theme/images/horizontal-scroller-handle-left.tiff rename to frameworks/ui/theme/images/horizontal-scroller-handle-left.tiff diff --git a/basis/ui/theme/images/horizontal-scroller-handle-middle.tiff b/frameworks/ui/theme/images/horizontal-scroller-handle-middle.tiff similarity index 100% rename from basis/ui/theme/images/horizontal-scroller-handle-middle.tiff rename to frameworks/ui/theme/images/horizontal-scroller-handle-middle.tiff diff --git a/basis/ui/theme/images/horizontal-scroller-handle-right.tiff b/frameworks/ui/theme/images/horizontal-scroller-handle-right.tiff similarity index 100% rename from basis/ui/theme/images/horizontal-scroller-handle-right.tiff rename to frameworks/ui/theme/images/horizontal-scroller-handle-right.tiff diff --git a/basis/ui/theme/images/horizontal-scroller-left.tiff b/frameworks/ui/theme/images/horizontal-scroller-left.tiff similarity index 100% rename from basis/ui/theme/images/horizontal-scroller-left.tiff rename to frameworks/ui/theme/images/horizontal-scroller-left.tiff diff --git a/basis/ui/theme/images/horizontal-scroller-leftarrow-clicked.tiff b/frameworks/ui/theme/images/horizontal-scroller-leftarrow-clicked.tiff similarity index 100% rename from basis/ui/theme/images/horizontal-scroller-leftarrow-clicked.tiff rename to frameworks/ui/theme/images/horizontal-scroller-leftarrow-clicked.tiff diff --git a/basis/ui/theme/images/horizontal-scroller-middle.tiff b/frameworks/ui/theme/images/horizontal-scroller-middle.tiff similarity index 100% rename from basis/ui/theme/images/horizontal-scroller-middle.tiff rename to frameworks/ui/theme/images/horizontal-scroller-middle.tiff diff --git a/basis/ui/theme/images/horizontal-scroller-right-disabled.tiff b/frameworks/ui/theme/images/horizontal-scroller-right-disabled.tiff similarity index 100% rename from basis/ui/theme/images/horizontal-scroller-right-disabled.tiff rename to frameworks/ui/theme/images/horizontal-scroller-right-disabled.tiff diff --git a/basis/ui/theme/images/horizontal-scroller-right.tiff b/frameworks/ui/theme/images/horizontal-scroller-right.tiff similarity index 100% rename from basis/ui/theme/images/horizontal-scroller-right.tiff rename to frameworks/ui/theme/images/horizontal-scroller-right.tiff diff --git a/basis/ui/theme/images/horizontal-scroller-rightarrow-clicked.tiff b/frameworks/ui/theme/images/horizontal-scroller-rightarrow-clicked.tiff similarity index 100% rename from basis/ui/theme/images/horizontal-scroller-rightarrow-clicked.tiff rename to frameworks/ui/theme/images/horizontal-scroller-rightarrow-clicked.tiff diff --git a/basis/ui/theme/images/images.factor b/frameworks/ui/theme/images/images.factor similarity index 100% rename from basis/ui/theme/images/images.factor rename to frameworks/ui/theme/images/images.factor diff --git a/basis/ui/theme/images/inactive-tab-left.tiff b/frameworks/ui/theme/images/inactive-tab-left.tiff similarity index 100% rename from basis/ui/theme/images/inactive-tab-left.tiff rename to frameworks/ui/theme/images/inactive-tab-left.tiff diff --git a/basis/ui/theme/images/inactive-tab-middle.tiff b/frameworks/ui/theme/images/inactive-tab-middle.tiff similarity index 100% rename from basis/ui/theme/images/inactive-tab-middle.tiff rename to frameworks/ui/theme/images/inactive-tab-middle.tiff diff --git a/basis/ui/theme/images/inactive-tab-right.tiff b/frameworks/ui/theme/images/inactive-tab-right.tiff similarity index 100% rename from basis/ui/theme/images/inactive-tab-right.tiff rename to frameworks/ui/theme/images/inactive-tab-right.tiff diff --git a/basis/ui/theme/images/radio-clicked.tiff b/frameworks/ui/theme/images/radio-clicked.tiff similarity index 100% rename from basis/ui/theme/images/radio-clicked.tiff rename to frameworks/ui/theme/images/radio-clicked.tiff diff --git a/basis/ui/theme/images/radio-set-clicked.tiff b/frameworks/ui/theme/images/radio-set-clicked.tiff similarity index 100% rename from basis/ui/theme/images/radio-set-clicked.tiff rename to frameworks/ui/theme/images/radio-set-clicked.tiff diff --git a/basis/ui/theme/images/radio-set.tiff b/frameworks/ui/theme/images/radio-set.tiff similarity index 100% rename from basis/ui/theme/images/radio-set.tiff rename to frameworks/ui/theme/images/radio-set.tiff diff --git a/basis/ui/theme/images/radio.tiff b/frameworks/ui/theme/images/radio.tiff similarity index 100% rename from basis/ui/theme/images/radio.tiff rename to frameworks/ui/theme/images/radio.tiff diff --git a/basis/ui/theme/images/resources.txt b/frameworks/ui/theme/images/resources.txt similarity index 100% rename from basis/ui/theme/images/resources.txt rename to frameworks/ui/theme/images/resources.txt diff --git a/basis/ui/theme/images/summary.txt b/frameworks/ui/theme/images/summary.txt similarity index 100% rename from basis/ui/theme/images/summary.txt rename to frameworks/ui/theme/images/summary.txt diff --git a/basis/ui/theme/images/vertical-scroller-bottom-disabled.tiff b/frameworks/ui/theme/images/vertical-scroller-bottom-disabled.tiff similarity index 100% rename from basis/ui/theme/images/vertical-scroller-bottom-disabled.tiff rename to frameworks/ui/theme/images/vertical-scroller-bottom-disabled.tiff diff --git a/basis/ui/theme/images/vertical-scroller-bottom.tiff b/frameworks/ui/theme/images/vertical-scroller-bottom.tiff similarity index 100% rename from basis/ui/theme/images/vertical-scroller-bottom.tiff rename to frameworks/ui/theme/images/vertical-scroller-bottom.tiff diff --git a/basis/ui/theme/images/vertical-scroller-downarrow-clicked.tiff b/frameworks/ui/theme/images/vertical-scroller-downarrow-clicked.tiff similarity index 100% rename from basis/ui/theme/images/vertical-scroller-downarrow-clicked.tiff rename to frameworks/ui/theme/images/vertical-scroller-downarrow-clicked.tiff diff --git a/basis/ui/theme/images/vertical-scroller-handle-bottom.tiff b/frameworks/ui/theme/images/vertical-scroller-handle-bottom.tiff similarity index 100% rename from basis/ui/theme/images/vertical-scroller-handle-bottom.tiff rename to frameworks/ui/theme/images/vertical-scroller-handle-bottom.tiff diff --git a/basis/ui/theme/images/vertical-scroller-handle-grip.tiff b/frameworks/ui/theme/images/vertical-scroller-handle-grip.tiff similarity index 100% rename from basis/ui/theme/images/vertical-scroller-handle-grip.tiff rename to frameworks/ui/theme/images/vertical-scroller-handle-grip.tiff diff --git a/basis/ui/theme/images/vertical-scroller-handle-middle.tiff b/frameworks/ui/theme/images/vertical-scroller-handle-middle.tiff similarity index 100% rename from basis/ui/theme/images/vertical-scroller-handle-middle.tiff rename to frameworks/ui/theme/images/vertical-scroller-handle-middle.tiff diff --git a/basis/ui/theme/images/vertical-scroller-handle-top.tiff b/frameworks/ui/theme/images/vertical-scroller-handle-top.tiff similarity index 100% rename from basis/ui/theme/images/vertical-scroller-handle-top.tiff rename to frameworks/ui/theme/images/vertical-scroller-handle-top.tiff diff --git a/basis/ui/theme/images/vertical-scroller-middle.tiff b/frameworks/ui/theme/images/vertical-scroller-middle.tiff similarity index 100% rename from basis/ui/theme/images/vertical-scroller-middle.tiff rename to frameworks/ui/theme/images/vertical-scroller-middle.tiff diff --git a/basis/ui/theme/images/vertical-scroller-top.tiff b/frameworks/ui/theme/images/vertical-scroller-top.tiff similarity index 100% rename from basis/ui/theme/images/vertical-scroller-top.tiff rename to frameworks/ui/theme/images/vertical-scroller-top.tiff diff --git a/basis/ui/theme/images/vertical-scroller-uparrow-clicked.tiff b/frameworks/ui/theme/images/vertical-scroller-uparrow-clicked.tiff similarity index 100% rename from basis/ui/theme/images/vertical-scroller-uparrow-clicked.tiff rename to frameworks/ui/theme/images/vertical-scroller-uparrow-clicked.tiff diff --git a/libs/colors/constants/constants.factor b/libs/colors/constants/constants.factor index 9be352ca47..f59818990a 100644 --- a/libs/colors/constants/constants.factor +++ b/libs/colors/constants/constants.factor @@ -17,9 +17,9 @@ IN: colors.constants [ parse-color ] H{ } map>assoc ; MEMO: colors ( -- assoc ) - "resource:basis/colors/constants/rgb.txt" - "resource:basis/colors/constants/factor-colors.txt" - "resource:basis/colors/constants/solarized-colors.txt" + "vocab:colors/constants/rgb.txt" + "vocab:colors/constants/factor-colors.txt" + "vocab:colors/constants/solarized-colors.txt" [ utf8 file-lines parse-colors ] tri@ assoc-union assoc-union ; PRIVATE> diff --git a/tools/annotations/annotations-docs.factor b/tools/tools/annotations/annotations-docs.factor similarity index 100% rename from tools/annotations/annotations-docs.factor rename to tools/tools/annotations/annotations-docs.factor diff --git a/tools/annotations/annotations-tests.factor b/tools/tools/annotations/annotations-tests.factor similarity index 100% rename from tools/annotations/annotations-tests.factor rename to tools/tools/annotations/annotations-tests.factor diff --git a/tools/annotations/annotations.factor b/tools/tools/annotations/annotations.factor similarity index 100% rename from tools/annotations/annotations.factor rename to tools/tools/annotations/annotations.factor diff --git a/tools/annotations/assertions/assertions.factor b/tools/tools/annotations/assertions/assertions.factor similarity index 100% rename from tools/annotations/assertions/assertions.factor rename to tools/tools/annotations/assertions/assertions.factor diff --git a/tools/annotations/authors.txt b/tools/tools/annotations/authors.txt similarity index 100% rename from tools/annotations/authors.txt rename to tools/tools/annotations/authors.txt diff --git a/tools/annotations/summary.txt b/tools/tools/annotations/summary.txt similarity index 100% rename from tools/annotations/summary.txt rename to tools/tools/annotations/summary.txt diff --git a/tools/annotations/tags.txt b/tools/tools/annotations/tags.txt similarity index 100% rename from tools/annotations/tags.txt rename to tools/tools/annotations/tags.txt diff --git a/tools/cocoa/cocoa.factor b/tools/tools/cocoa/cocoa.factor similarity index 100% rename from tools/cocoa/cocoa.factor rename to tools/tools/cocoa/cocoa.factor diff --git a/tools/cocoa/platforms.txt b/tools/tools/cocoa/platforms.txt similarity index 100% rename from tools/cocoa/platforms.txt rename to tools/tools/cocoa/platforms.txt diff --git a/tools/completion/authors.txt b/tools/tools/completion/authors.txt similarity index 100% rename from tools/completion/authors.txt rename to tools/tools/completion/authors.txt diff --git a/tools/completion/completion-docs.factor b/tools/tools/completion/completion-docs.factor similarity index 100% rename from tools/completion/completion-docs.factor rename to tools/tools/completion/completion-docs.factor diff --git a/tools/completion/completion-tests.factor b/tools/tools/completion/completion-tests.factor similarity index 100% rename from tools/completion/completion-tests.factor rename to tools/tools/completion/completion-tests.factor diff --git a/tools/completion/completion.factor b/tools/tools/completion/completion.factor similarity index 100% rename from tools/completion/completion.factor rename to tools/tools/completion/completion.factor diff --git a/tools/completion/summary.txt b/tools/tools/completion/summary.txt similarity index 100% rename from tools/completion/summary.txt rename to tools/tools/completion/summary.txt diff --git a/tools/continuations/authors.txt b/tools/tools/continuations/authors.txt similarity index 100% rename from tools/continuations/authors.txt rename to tools/tools/continuations/authors.txt diff --git a/tools/continuations/continuations-docs.factor b/tools/tools/continuations/continuations-docs.factor similarity index 100% rename from tools/continuations/continuations-docs.factor rename to tools/tools/continuations/continuations-docs.factor diff --git a/tools/continuations/continuations.factor b/tools/tools/continuations/continuations.factor similarity index 100% rename from tools/continuations/continuations.factor rename to tools/tools/continuations/continuations.factor diff --git a/tools/coverage/authors.txt b/tools/tools/coverage/authors.txt similarity index 100% rename from tools/coverage/authors.txt rename to tools/tools/coverage/authors.txt diff --git a/tools/coverage/coverage-docs.factor b/tools/tools/coverage/coverage-docs.factor similarity index 100% rename from tools/coverage/coverage-docs.factor rename to tools/tools/coverage/coverage-docs.factor diff --git a/tools/coverage/coverage-tests.factor b/tools/tools/coverage/coverage-tests.factor similarity index 100% rename from tools/coverage/coverage-tests.factor rename to tools/tools/coverage/coverage-tests.factor diff --git a/tools/coverage/coverage.factor b/tools/tools/coverage/coverage.factor similarity index 100% rename from tools/coverage/coverage.factor rename to tools/tools/coverage/coverage.factor diff --git a/tools/coverage/summary.txt b/tools/tools/coverage/summary.txt similarity index 100% rename from tools/coverage/summary.txt rename to tools/tools/coverage/summary.txt diff --git a/tools/coverage/testvocab/authors.txt b/tools/tools/coverage/testvocab/authors.txt similarity index 100% rename from tools/coverage/testvocab/authors.txt rename to tools/tools/coverage/testvocab/authors.txt diff --git a/tools/coverage/testvocab/child/authors.txt b/tools/tools/coverage/testvocab/child/authors.txt similarity index 100% rename from tools/coverage/testvocab/child/authors.txt rename to tools/tools/coverage/testvocab/child/authors.txt diff --git a/tools/coverage/testvocab/child/child-tests.factor b/tools/tools/coverage/testvocab/child/child-tests.factor similarity index 100% rename from tools/coverage/testvocab/child/child-tests.factor rename to tools/tools/coverage/testvocab/child/child-tests.factor diff --git a/tools/coverage/testvocab/child/child.factor b/tools/tools/coverage/testvocab/child/child.factor similarity index 100% rename from tools/coverage/testvocab/child/child.factor rename to tools/tools/coverage/testvocab/child/child.factor diff --git a/tools/coverage/testvocab/testvocab-docs.factor b/tools/tools/coverage/testvocab/testvocab-docs.factor similarity index 100% rename from tools/coverage/testvocab/testvocab-docs.factor rename to tools/tools/coverage/testvocab/testvocab-docs.factor diff --git a/tools/coverage/testvocab/testvocab-tests.factor b/tools/tools/coverage/testvocab/testvocab-tests.factor similarity index 100% rename from tools/coverage/testvocab/testvocab-tests.factor rename to tools/tools/coverage/testvocab/testvocab-tests.factor diff --git a/tools/coverage/testvocab/testvocab.factor b/tools/tools/coverage/testvocab/testvocab.factor similarity index 100% rename from tools/coverage/testvocab/testvocab.factor rename to tools/tools/coverage/testvocab/testvocab.factor diff --git a/tools/crossref/authors.txt b/tools/tools/crossref/authors.txt similarity index 100% rename from tools/crossref/authors.txt rename to tools/tools/crossref/authors.txt diff --git a/tools/crossref/crossref-docs.factor b/tools/tools/crossref/crossref-docs.factor similarity index 100% rename from tools/crossref/crossref-docs.factor rename to tools/tools/crossref/crossref-docs.factor diff --git a/tools/crossref/crossref-tests.factor b/tools/tools/crossref/crossref-tests.factor similarity index 100% rename from tools/crossref/crossref-tests.factor rename to tools/tools/crossref/crossref-tests.factor diff --git a/tools/crossref/crossref.factor b/tools/tools/crossref/crossref.factor similarity index 100% rename from tools/crossref/crossref.factor rename to tools/tools/crossref/crossref.factor diff --git a/tools/crossref/summary.txt b/tools/tools/crossref/summary.txt similarity index 100% rename from tools/crossref/summary.txt rename to tools/tools/crossref/summary.txt diff --git a/tools/crossref/tags.txt b/tools/tools/crossref/tags.txt similarity index 100% rename from tools/crossref/tags.txt rename to tools/tools/crossref/tags.txt diff --git a/tools/crossref/test/foo.factor b/tools/tools/crossref/test/foo.factor similarity index 100% rename from tools/crossref/test/foo.factor rename to tools/tools/crossref/test/foo.factor diff --git a/tools/deploy/authors.txt b/tools/tools/deploy/authors.txt similarity index 100% rename from tools/deploy/authors.txt rename to tools/tools/deploy/authors.txt diff --git a/tools/deploy/backend/authors.txt b/tools/tools/deploy/backend/authors.txt similarity index 100% rename from tools/deploy/backend/authors.txt rename to tools/tools/deploy/backend/authors.txt diff --git a/tools/deploy/backend/backend-tests.factor b/tools/tools/deploy/backend/backend-tests.factor similarity index 100% rename from tools/deploy/backend/backend-tests.factor rename to tools/tools/deploy/backend/backend-tests.factor diff --git a/tools/deploy/backend/backend.factor b/tools/tools/deploy/backend/backend.factor similarity index 100% rename from tools/deploy/backend/backend.factor rename to tools/tools/deploy/backend/backend.factor diff --git a/tools/deploy/config/authors.txt b/tools/tools/deploy/config/authors.txt similarity index 100% rename from tools/deploy/config/authors.txt rename to tools/tools/deploy/config/authors.txt diff --git a/tools/deploy/config/config-docs.factor b/tools/tools/deploy/config/config-docs.factor similarity index 100% rename from tools/deploy/config/config-docs.factor rename to tools/tools/deploy/config/config-docs.factor diff --git a/tools/deploy/config/config-tests.factor b/tools/tools/deploy/config/config-tests.factor similarity index 100% rename from tools/deploy/config/config-tests.factor rename to tools/tools/deploy/config/config-tests.factor diff --git a/tools/deploy/config/config.factor b/tools/tools/deploy/config/config.factor similarity index 100% rename from tools/deploy/config/config.factor rename to tools/tools/deploy/config/config.factor diff --git a/tools/deploy/config/editor/editor-docs.factor b/tools/tools/deploy/config/editor/editor-docs.factor similarity index 100% rename from tools/deploy/config/editor/editor-docs.factor rename to tools/tools/deploy/config/editor/editor-docs.factor diff --git a/tools/deploy/config/editor/editor.factor b/tools/tools/deploy/config/editor/editor.factor similarity index 100% rename from tools/deploy/config/editor/editor.factor rename to tools/tools/deploy/config/editor/editor.factor diff --git a/tools/deploy/deploy-docs.factor b/tools/tools/deploy/deploy-docs.factor similarity index 100% rename from tools/deploy/deploy-docs.factor rename to tools/tools/deploy/deploy-docs.factor diff --git a/tools/deploy/deploy-tests.factor b/tools/tools/deploy/deploy-tests.factor similarity index 100% rename from tools/deploy/deploy-tests.factor rename to tools/tools/deploy/deploy-tests.factor diff --git a/tools/deploy/deploy.factor b/tools/tools/deploy/deploy.factor similarity index 100% rename from tools/deploy/deploy.factor rename to tools/tools/deploy/deploy.factor diff --git a/tools/deploy/embed/authors.txt b/tools/tools/deploy/embed/authors.txt similarity index 100% rename from tools/deploy/embed/authors.txt rename to tools/tools/deploy/embed/authors.txt diff --git a/tools/deploy/embed/embed.factor b/tools/tools/deploy/embed/embed.factor similarity index 100% rename from tools/deploy/embed/embed.factor rename to tools/tools/deploy/embed/embed.factor diff --git a/tools/deploy/embed/summary.txt b/tools/tools/deploy/embed/summary.txt similarity index 100% rename from tools/deploy/embed/summary.txt rename to tools/tools/deploy/embed/summary.txt diff --git a/tools/deploy/embed/tags.txt b/tools/tools/deploy/embed/tags.txt similarity index 100% rename from tools/deploy/embed/tags.txt rename to tools/tools/deploy/embed/tags.txt diff --git a/tools/deploy/libraries/libraries.factor b/tools/tools/deploy/libraries/libraries.factor similarity index 100% rename from tools/deploy/libraries/libraries.factor rename to tools/tools/deploy/libraries/libraries.factor diff --git a/tools/deploy/libraries/unix/platforms.txt b/tools/tools/deploy/libraries/unix/platforms.txt similarity index 100% rename from tools/deploy/libraries/unix/platforms.txt rename to tools/tools/deploy/libraries/unix/platforms.txt diff --git a/tools/deploy/libraries/unix/unix.factor b/tools/tools/deploy/libraries/unix/unix.factor similarity index 100% rename from tools/deploy/libraries/unix/unix.factor rename to tools/tools/deploy/libraries/unix/unix.factor diff --git a/tools/deploy/libraries/windows/platforms.txt b/tools/tools/deploy/libraries/windows/platforms.txt similarity index 100% rename from tools/deploy/libraries/windows/platforms.txt rename to tools/tools/deploy/libraries/windows/platforms.txt diff --git a/tools/deploy/libraries/windows/windows.factor b/tools/tools/deploy/libraries/windows/windows.factor similarity index 100% rename from tools/deploy/libraries/windows/windows.factor rename to tools/tools/deploy/libraries/windows/windows.factor diff --git a/tools/deploy/macosx/authors.txt b/tools/tools/deploy/macosx/authors.txt similarity index 100% rename from tools/deploy/macosx/authors.txt rename to tools/tools/deploy/macosx/authors.txt diff --git a/tools/deploy/macosx/macosx.factor b/tools/tools/deploy/macosx/macosx.factor similarity index 100% rename from tools/deploy/macosx/macosx.factor rename to tools/tools/deploy/macosx/macosx.factor diff --git a/tools/deploy/macosx/platforms.txt b/tools/tools/deploy/macosx/platforms.txt similarity index 100% rename from tools/deploy/macosx/platforms.txt rename to tools/tools/deploy/macosx/platforms.txt diff --git a/tools/deploy/macosx/summary.txt b/tools/tools/deploy/macosx/summary.txt similarity index 100% rename from tools/deploy/macosx/summary.txt rename to tools/tools/deploy/macosx/summary.txt diff --git a/tools/deploy/macosx/tags.txt b/tools/tools/deploy/macosx/tags.txt similarity index 100% rename from tools/deploy/macosx/tags.txt rename to tools/tools/deploy/macosx/tags.txt diff --git a/tools/deploy/restage/restage.factor b/tools/tools/deploy/restage/restage.factor similarity index 100% rename from tools/deploy/restage/restage.factor rename to tools/tools/deploy/restage/restage.factor diff --git a/tools/deploy/shaker/authors.txt b/tools/tools/deploy/shaker/authors.txt similarity index 100% rename from tools/deploy/shaker/authors.txt rename to tools/tools/deploy/shaker/authors.txt diff --git a/tools/deploy/shaker/next-methods.factor b/tools/tools/deploy/shaker/next-methods.factor similarity index 100% rename from tools/deploy/shaker/next-methods.factor rename to tools/tools/deploy/shaker/next-methods.factor diff --git a/tools/deploy/shaker/shaker-docs.factor b/tools/tools/deploy/shaker/shaker-docs.factor similarity index 100% rename from tools/deploy/shaker/shaker-docs.factor rename to tools/tools/deploy/shaker/shaker-docs.factor diff --git a/tools/deploy/shaker/shaker.factor b/tools/tools/deploy/shaker/shaker.factor similarity index 100% rename from tools/deploy/shaker/shaker.factor rename to tools/tools/deploy/shaker/shaker.factor diff --git a/tools/deploy/shaker/strip-c-io.factor b/tools/tools/deploy/shaker/strip-c-io.factor similarity index 100% rename from tools/deploy/shaker/strip-c-io.factor rename to tools/tools/deploy/shaker/strip-c-io.factor diff --git a/tools/deploy/shaker/strip-call.factor b/tools/tools/deploy/shaker/strip-call.factor similarity index 100% rename from tools/deploy/shaker/strip-call.factor rename to tools/tools/deploy/shaker/strip-call.factor diff --git a/tools/deploy/shaker/strip-cocoa.factor b/tools/tools/deploy/shaker/strip-cocoa.factor similarity index 100% rename from tools/deploy/shaker/strip-cocoa.factor rename to tools/tools/deploy/shaker/strip-cocoa.factor diff --git a/tools/deploy/shaker/strip-debugger.factor b/tools/tools/deploy/shaker/strip-debugger.factor similarity index 100% rename from tools/deploy/shaker/strip-debugger.factor rename to tools/tools/deploy/shaker/strip-debugger.factor diff --git a/tools/deploy/shaker/strip-destructors.factor b/tools/tools/deploy/shaker/strip-destructors.factor similarity index 100% rename from tools/deploy/shaker/strip-destructors.factor rename to tools/tools/deploy/shaker/strip-destructors.factor diff --git a/tools/deploy/shaker/strip-gobject.factor b/tools/tools/deploy/shaker/strip-gobject.factor similarity index 100% rename from tools/deploy/shaker/strip-gobject.factor rename to tools/tools/deploy/shaker/strip-gobject.factor diff --git a/tools/deploy/shaker/strip-gtk-icon.factor b/tools/tools/deploy/shaker/strip-gtk-icon.factor similarity index 100% rename from tools/deploy/shaker/strip-gtk-icon.factor rename to tools/tools/deploy/shaker/strip-gtk-icon.factor diff --git a/tools/deploy/shaker/strip-libc.factor b/tools/tools/deploy/shaker/strip-libc.factor similarity index 100% rename from tools/deploy/shaker/strip-libc.factor rename to tools/tools/deploy/shaker/strip-libc.factor diff --git a/tools/deploy/shaker/strip-specialized-arrays.factor b/tools/tools/deploy/shaker/strip-specialized-arrays.factor similarity index 100% rename from tools/deploy/shaker/strip-specialized-arrays.factor rename to tools/tools/deploy/shaker/strip-specialized-arrays.factor diff --git a/tools/deploy/shaker/strip-ui-error-hook.factor b/tools/tools/deploy/shaker/strip-ui-error-hook.factor similarity index 100% rename from tools/deploy/shaker/strip-ui-error-hook.factor rename to tools/tools/deploy/shaker/strip-ui-error-hook.factor diff --git a/tools/deploy/summary.txt b/tools/tools/deploy/summary.txt similarity index 100% rename from tools/deploy/summary.txt rename to tools/tools/deploy/summary.txt diff --git a/tools/deploy/tags.txt b/tools/tools/deploy/tags.txt similarity index 100% rename from tools/deploy/tags.txt rename to tools/tools/deploy/tags.txt diff --git a/tools/deploy/test/1/1.factor b/tools/tools/deploy/test/1/1.factor similarity index 100% rename from tools/deploy/test/1/1.factor rename to tools/tools/deploy/test/1/1.factor diff --git a/tools/deploy/test/1/deploy.factor b/tools/tools/deploy/test/1/deploy.factor similarity index 100% rename from tools/deploy/test/1/deploy.factor rename to tools/tools/deploy/test/1/deploy.factor diff --git a/tools/deploy/test/10/10-tests.factor b/tools/tools/deploy/test/10/10-tests.factor similarity index 100% rename from tools/deploy/test/10/10-tests.factor rename to tools/tools/deploy/test/10/10-tests.factor diff --git a/tools/deploy/test/10/10.factor b/tools/tools/deploy/test/10/10.factor similarity index 100% rename from tools/deploy/test/10/10.factor rename to tools/tools/deploy/test/10/10.factor diff --git a/tools/deploy/test/10/authors.txt b/tools/tools/deploy/test/10/authors.txt similarity index 100% rename from tools/deploy/test/10/authors.txt rename to tools/tools/deploy/test/10/authors.txt diff --git a/tools/deploy/test/10/deploy.factor b/tools/tools/deploy/test/10/deploy.factor similarity index 100% rename from tools/deploy/test/10/deploy.factor rename to tools/tools/deploy/test/10/deploy.factor diff --git a/tools/deploy/test/11/11-tests.factor b/tools/tools/deploy/test/11/11-tests.factor similarity index 100% rename from tools/deploy/test/11/11-tests.factor rename to tools/tools/deploy/test/11/11-tests.factor diff --git a/tools/deploy/test/11/11.factor b/tools/tools/deploy/test/11/11.factor similarity index 100% rename from tools/deploy/test/11/11.factor rename to tools/tools/deploy/test/11/11.factor diff --git a/tools/deploy/test/11/authors.txt b/tools/tools/deploy/test/11/authors.txt similarity index 100% rename from tools/deploy/test/11/authors.txt rename to tools/tools/deploy/test/11/authors.txt diff --git a/tools/deploy/test/11/deploy.factor b/tools/tools/deploy/test/11/deploy.factor similarity index 100% rename from tools/deploy/test/11/deploy.factor rename to tools/tools/deploy/test/11/deploy.factor diff --git a/tools/deploy/test/12/12.factor b/tools/tools/deploy/test/12/12.factor similarity index 100% rename from tools/deploy/test/12/12.factor rename to tools/tools/deploy/test/12/12.factor diff --git a/tools/deploy/test/12/authors.txt b/tools/tools/deploy/test/12/authors.txt similarity index 100% rename from tools/deploy/test/12/authors.txt rename to tools/tools/deploy/test/12/authors.txt diff --git a/tools/deploy/test/12/deploy.factor b/tools/tools/deploy/test/12/deploy.factor similarity index 100% rename from tools/deploy/test/12/deploy.factor rename to tools/tools/deploy/test/12/deploy.factor diff --git a/tools/deploy/test/13/13.factor b/tools/tools/deploy/test/13/13.factor similarity index 100% rename from tools/deploy/test/13/13.factor rename to tools/tools/deploy/test/13/13.factor diff --git a/tools/deploy/test/13/authors.txt b/tools/tools/deploy/test/13/authors.txt similarity index 100% rename from tools/deploy/test/13/authors.txt rename to tools/tools/deploy/test/13/authors.txt diff --git a/tools/deploy/test/13/deploy.factor b/tools/tools/deploy/test/13/deploy.factor similarity index 100% rename from tools/deploy/test/13/deploy.factor rename to tools/tools/deploy/test/13/deploy.factor diff --git a/tools/deploy/test/14/14.factor b/tools/tools/deploy/test/14/14.factor similarity index 100% rename from tools/deploy/test/14/14.factor rename to tools/tools/deploy/test/14/14.factor diff --git a/tools/deploy/test/14/authors.txt b/tools/tools/deploy/test/14/authors.txt similarity index 100% rename from tools/deploy/test/14/authors.txt rename to tools/tools/deploy/test/14/authors.txt diff --git a/tools/deploy/test/14/deploy.factor b/tools/tools/deploy/test/14/deploy.factor similarity index 100% rename from tools/deploy/test/14/deploy.factor rename to tools/tools/deploy/test/14/deploy.factor diff --git a/tools/deploy/test/14/platforms.txt b/tools/tools/deploy/test/14/platforms.txt similarity index 100% rename from tools/deploy/test/14/platforms.txt rename to tools/tools/deploy/test/14/platforms.txt diff --git a/tools/deploy/test/15/15.factor b/tools/tools/deploy/test/15/15.factor similarity index 100% rename from tools/deploy/test/15/15.factor rename to tools/tools/deploy/test/15/15.factor diff --git a/tools/deploy/test/16/16.factor b/tools/tools/deploy/test/16/16.factor similarity index 100% rename from tools/deploy/test/16/16.factor rename to tools/tools/deploy/test/16/16.factor diff --git a/tools/deploy/test/16/deploy.factor b/tools/tools/deploy/test/16/deploy.factor similarity index 100% rename from tools/deploy/test/16/deploy.factor rename to tools/tools/deploy/test/16/deploy.factor diff --git a/tools/deploy/test/17/17.factor b/tools/tools/deploy/test/17/17.factor similarity index 100% rename from tools/deploy/test/17/17.factor rename to tools/tools/deploy/test/17/17.factor diff --git a/tools/deploy/test/17/deploy.factor b/tools/tools/deploy/test/17/deploy.factor similarity index 100% rename from tools/deploy/test/17/deploy.factor rename to tools/tools/deploy/test/17/deploy.factor diff --git a/tools/deploy/test/18/18.factor b/tools/tools/deploy/test/18/18.factor similarity index 100% rename from tools/deploy/test/18/18.factor rename to tools/tools/deploy/test/18/18.factor diff --git a/tools/deploy/test/18/authors.txt b/tools/tools/deploy/test/18/authors.txt similarity index 100% rename from tools/deploy/test/18/authors.txt rename to tools/tools/deploy/test/18/authors.txt diff --git a/tools/deploy/test/18/deploy.factor b/tools/tools/deploy/test/18/deploy.factor similarity index 100% rename from tools/deploy/test/18/deploy.factor rename to tools/tools/deploy/test/18/deploy.factor diff --git a/tools/deploy/test/19/19.factor b/tools/tools/deploy/test/19/19.factor similarity index 100% rename from tools/deploy/test/19/19.factor rename to tools/tools/deploy/test/19/19.factor diff --git a/tools/deploy/test/19/authors.txt b/tools/tools/deploy/test/19/authors.txt similarity index 100% rename from tools/deploy/test/19/authors.txt rename to tools/tools/deploy/test/19/authors.txt diff --git a/tools/deploy/test/19/deploy.factor b/tools/tools/deploy/test/19/deploy.factor similarity index 100% rename from tools/deploy/test/19/deploy.factor rename to tools/tools/deploy/test/19/deploy.factor diff --git a/tools/deploy/test/19/license.txt b/tools/tools/deploy/test/19/license.txt similarity index 100% rename from tools/deploy/test/19/license.txt rename to tools/tools/deploy/test/19/license.txt diff --git a/tools/deploy/test/19/resources.txt b/tools/tools/deploy/test/19/resources.txt similarity index 100% rename from tools/deploy/test/19/resources.txt rename to tools/tools/deploy/test/19/resources.txt diff --git a/tools/deploy/test/2/2.factor b/tools/tools/deploy/test/2/2.factor similarity index 100% rename from tools/deploy/test/2/2.factor rename to tools/tools/deploy/test/2/2.factor diff --git a/tools/deploy/test/2/deploy.factor b/tools/tools/deploy/test/2/deploy.factor similarity index 100% rename from tools/deploy/test/2/deploy.factor rename to tools/tools/deploy/test/2/deploy.factor diff --git a/tools/deploy/test/20/20.factor b/tools/tools/deploy/test/20/20.factor similarity index 100% rename from tools/deploy/test/20/20.factor rename to tools/tools/deploy/test/20/20.factor diff --git a/tools/deploy/test/20/deploy.factor b/tools/tools/deploy/test/20/deploy.factor similarity index 100% rename from tools/deploy/test/20/deploy.factor rename to tools/tools/deploy/test/20/deploy.factor diff --git a/tools/deploy/test/21/21.factor b/tools/tools/deploy/test/21/21.factor similarity index 100% rename from tools/deploy/test/21/21.factor rename to tools/tools/deploy/test/21/21.factor diff --git a/tools/deploy/test/21/deploy.factor b/tools/tools/deploy/test/21/deploy.factor similarity index 100% rename from tools/deploy/test/21/deploy.factor rename to tools/tools/deploy/test/21/deploy.factor diff --git a/tools/deploy/test/22/22.factor b/tools/tools/deploy/test/22/22.factor similarity index 100% rename from tools/deploy/test/22/22.factor rename to tools/tools/deploy/test/22/22.factor diff --git a/tools/deploy/test/22/deploy.factor b/tools/tools/deploy/test/22/deploy.factor similarity index 100% rename from tools/deploy/test/22/deploy.factor rename to tools/tools/deploy/test/22/deploy.factor diff --git a/tools/deploy/test/3/3.factor b/tools/tools/deploy/test/3/3.factor similarity index 100% rename from tools/deploy/test/3/3.factor rename to tools/tools/deploy/test/3/3.factor diff --git a/tools/deploy/test/3/deploy.factor b/tools/tools/deploy/test/3/deploy.factor similarity index 100% rename from tools/deploy/test/3/deploy.factor rename to tools/tools/deploy/test/3/deploy.factor diff --git a/tools/deploy/test/4/4.factor b/tools/tools/deploy/test/4/4.factor similarity index 100% rename from tools/deploy/test/4/4.factor rename to tools/tools/deploy/test/4/4.factor diff --git a/tools/deploy/test/4/deploy.factor b/tools/tools/deploy/test/4/deploy.factor similarity index 100% rename from tools/deploy/test/4/deploy.factor rename to tools/tools/deploy/test/4/deploy.factor diff --git a/tools/deploy/test/5/5.factor b/tools/tools/deploy/test/5/5.factor similarity index 100% rename from tools/deploy/test/5/5.factor rename to tools/tools/deploy/test/5/5.factor diff --git a/tools/deploy/test/5/deploy.factor b/tools/tools/deploy/test/5/deploy.factor similarity index 100% rename from tools/deploy/test/5/deploy.factor rename to tools/tools/deploy/test/5/deploy.factor diff --git a/tools/deploy/test/6/6.factor b/tools/tools/deploy/test/6/6.factor similarity index 100% rename from tools/deploy/test/6/6.factor rename to tools/tools/deploy/test/6/6.factor diff --git a/tools/deploy/test/6/deploy.factor b/tools/tools/deploy/test/6/deploy.factor similarity index 100% rename from tools/deploy/test/6/deploy.factor rename to tools/tools/deploy/test/6/deploy.factor diff --git a/tools/deploy/test/7/7.factor b/tools/tools/deploy/test/7/7.factor similarity index 100% rename from tools/deploy/test/7/7.factor rename to tools/tools/deploy/test/7/7.factor diff --git a/tools/deploy/test/7/deploy.factor b/tools/tools/deploy/test/7/deploy.factor similarity index 100% rename from tools/deploy/test/7/deploy.factor rename to tools/tools/deploy/test/7/deploy.factor diff --git a/tools/deploy/test/8/8.factor b/tools/tools/deploy/test/8/8.factor similarity index 100% rename from tools/deploy/test/8/8.factor rename to tools/tools/deploy/test/8/8.factor diff --git a/tools/deploy/test/8/deploy.factor b/tools/tools/deploy/test/8/deploy.factor similarity index 100% rename from tools/deploy/test/8/deploy.factor rename to tools/tools/deploy/test/8/deploy.factor diff --git a/tools/deploy/test/9/9.factor b/tools/tools/deploy/test/9/9.factor similarity index 100% rename from tools/deploy/test/9/9.factor rename to tools/tools/deploy/test/9/9.factor diff --git a/tools/deploy/test/9/deploy.factor b/tools/tools/deploy/test/9/deploy.factor similarity index 100% rename from tools/deploy/test/9/deploy.factor rename to tools/tools/deploy/test/9/deploy.factor diff --git a/tools/deploy/test/test.factor b/tools/tools/deploy/test/test.factor similarity index 100% rename from tools/deploy/test/test.factor rename to tools/tools/deploy/test/test.factor diff --git a/tools/deploy/unix/authors.txt b/tools/tools/deploy/unix/authors.txt similarity index 100% rename from tools/deploy/unix/authors.txt rename to tools/tools/deploy/unix/authors.txt diff --git a/tools/deploy/unix/platforms.txt b/tools/tools/deploy/unix/platforms.txt similarity index 100% rename from tools/deploy/unix/platforms.txt rename to tools/tools/deploy/unix/platforms.txt diff --git a/tools/deploy/unix/summary.txt b/tools/tools/deploy/unix/summary.txt similarity index 100% rename from tools/deploy/unix/summary.txt rename to tools/tools/deploy/unix/summary.txt diff --git a/tools/deploy/unix/tags.txt b/tools/tools/deploy/unix/tags.txt similarity index 100% rename from tools/deploy/unix/tags.txt rename to tools/tools/deploy/unix/tags.txt diff --git a/tools/deploy/unix/unix.factor b/tools/tools/deploy/unix/unix.factor similarity index 100% rename from tools/deploy/unix/unix.factor rename to tools/tools/deploy/unix/unix.factor diff --git a/tools/deploy/windows/authors.txt b/tools/tools/deploy/windows/authors.txt similarity index 100% rename from tools/deploy/windows/authors.txt rename to tools/tools/deploy/windows/authors.txt diff --git a/tools/deploy/windows/ico/ico.factor b/tools/tools/deploy/windows/ico/ico.factor similarity index 100% rename from tools/deploy/windows/ico/ico.factor rename to tools/tools/deploy/windows/ico/ico.factor diff --git a/tools/deploy/windows/ico/platforms.txt b/tools/tools/deploy/windows/ico/platforms.txt similarity index 100% rename from tools/deploy/windows/ico/platforms.txt rename to tools/tools/deploy/windows/ico/platforms.txt diff --git a/tools/deploy/windows/platforms.txt b/tools/tools/deploy/windows/platforms.txt similarity index 100% rename from tools/deploy/windows/platforms.txt rename to tools/tools/deploy/windows/platforms.txt diff --git a/tools/deploy/windows/summary.txt b/tools/tools/deploy/windows/summary.txt similarity index 100% rename from tools/deploy/windows/summary.txt rename to tools/tools/deploy/windows/summary.txt diff --git a/tools/deploy/windows/tags.txt b/tools/tools/deploy/windows/tags.txt similarity index 100% rename from tools/deploy/windows/tags.txt rename to tools/tools/deploy/windows/tags.txt diff --git a/tools/deploy/windows/windows-tests.factor b/tools/tools/deploy/windows/windows-tests.factor similarity index 100% rename from tools/deploy/windows/windows-tests.factor rename to tools/tools/deploy/windows/windows-tests.factor diff --git a/tools/deploy/windows/windows.factor b/tools/tools/deploy/windows/windows.factor similarity index 100% rename from tools/deploy/windows/windows.factor rename to tools/tools/deploy/windows/windows.factor diff --git a/tools/deprecation/authors.txt b/tools/tools/deprecation/authors.txt similarity index 100% rename from tools/deprecation/authors.txt rename to tools/tools/deprecation/authors.txt diff --git a/tools/deprecation/deprecation-docs.factor b/tools/tools/deprecation/deprecation-docs.factor similarity index 100% rename from tools/deprecation/deprecation-docs.factor rename to tools/tools/deprecation/deprecation-docs.factor diff --git a/tools/deprecation/deprecation.factor b/tools/tools/deprecation/deprecation.factor similarity index 100% rename from tools/deprecation/deprecation.factor rename to tools/tools/deprecation/deprecation.factor diff --git a/tools/deprecation/summary.txt b/tools/tools/deprecation/summary.txt similarity index 100% rename from tools/deprecation/summary.txt rename to tools/tools/deprecation/summary.txt diff --git a/tools/destructors/authors.txt b/tools/tools/destructors/authors.txt similarity index 100% rename from tools/destructors/authors.txt rename to tools/tools/destructors/authors.txt diff --git a/tools/destructors/destructors-docs.factor b/tools/tools/destructors/destructors-docs.factor similarity index 100% rename from tools/destructors/destructors-docs.factor rename to tools/tools/destructors/destructors-docs.factor diff --git a/tools/destructors/destructors-tests.factor b/tools/tools/destructors/destructors-tests.factor similarity index 100% rename from tools/destructors/destructors-tests.factor rename to tools/tools/destructors/destructors-tests.factor diff --git a/tools/destructors/destructors.factor b/tools/tools/destructors/destructors.factor similarity index 100% rename from tools/destructors/destructors.factor rename to tools/tools/destructors/destructors.factor diff --git a/tools/disassembler/authors.txt b/tools/tools/disassembler/authors.txt similarity index 100% rename from tools/disassembler/authors.txt rename to tools/tools/disassembler/authors.txt diff --git a/tools/disassembler/disassembler-docs.factor b/tools/tools/disassembler/disassembler-docs.factor similarity index 100% rename from tools/disassembler/disassembler-docs.factor rename to tools/tools/disassembler/disassembler-docs.factor diff --git a/tools/disassembler/disassembler-tests.factor b/tools/tools/disassembler/disassembler-tests.factor similarity index 100% rename from tools/disassembler/disassembler-tests.factor rename to tools/tools/disassembler/disassembler-tests.factor diff --git a/tools/disassembler/disassembler.factor b/tools/tools/disassembler/disassembler.factor similarity index 100% rename from tools/disassembler/disassembler.factor rename to tools/tools/disassembler/disassembler.factor diff --git a/tools/disassembler/gdb/gdb.factor b/tools/tools/disassembler/gdb/gdb.factor similarity index 100% rename from tools/disassembler/gdb/gdb.factor rename to tools/tools/disassembler/gdb/gdb.factor diff --git a/tools/disassembler/gdb/tags.txt b/tools/tools/disassembler/gdb/tags.txt similarity index 100% rename from tools/disassembler/gdb/tags.txt rename to tools/tools/disassembler/gdb/tags.txt diff --git a/tools/disassembler/summary.txt b/tools/tools/disassembler/summary.txt similarity index 100% rename from tools/disassembler/summary.txt rename to tools/tools/disassembler/summary.txt diff --git a/tools/disassembler/udis/tags.txt b/tools/tools/disassembler/udis/tags.txt similarity index 100% rename from tools/disassembler/udis/tags.txt rename to tools/tools/disassembler/udis/tags.txt diff --git a/tools/disassembler/udis/udis.factor b/tools/tools/disassembler/udis/udis.factor similarity index 100% rename from tools/disassembler/udis/udis.factor rename to tools/tools/disassembler/udis/udis.factor diff --git a/tools/disassembler/utils/utils.factor b/tools/tools/disassembler/utils/utils.factor similarity index 100% rename from tools/disassembler/utils/utils.factor rename to tools/tools/disassembler/utils/utils.factor diff --git a/tools/dispatch/authors.txt b/tools/tools/dispatch/authors.txt similarity index 100% rename from tools/dispatch/authors.txt rename to tools/tools/dispatch/authors.txt diff --git a/tools/dispatch/dispatch-docs.factor b/tools/tools/dispatch/dispatch-docs.factor similarity index 100% rename from tools/dispatch/dispatch-docs.factor rename to tools/tools/dispatch/dispatch-docs.factor diff --git a/tools/dispatch/dispatch.factor b/tools/tools/dispatch/dispatch.factor similarity index 100% rename from tools/dispatch/dispatch.factor rename to tools/tools/dispatch/dispatch.factor diff --git a/tools/errors/authors.txt b/tools/tools/errors/authors.txt similarity index 100% rename from tools/errors/authors.txt rename to tools/tools/errors/authors.txt diff --git a/tools/errors/errors-docs.factor b/tools/tools/errors/errors-docs.factor similarity index 100% rename from tools/errors/errors-docs.factor rename to tools/tools/errors/errors-docs.factor diff --git a/tools/errors/errors-tests.factor b/tools/tools/errors/errors-tests.factor similarity index 100% rename from tools/errors/errors-tests.factor rename to tools/tools/errors/errors-tests.factor diff --git a/tools/errors/errors.factor b/tools/tools/errors/errors.factor similarity index 100% rename from tools/errors/errors.factor rename to tools/tools/errors/errors.factor diff --git a/tools/errors/model/authors.txt b/tools/tools/errors/model/authors.txt similarity index 100% rename from tools/errors/model/authors.txt rename to tools/tools/errors/model/authors.txt diff --git a/tools/errors/model/model.factor b/tools/tools/errors/model/model.factor similarity index 100% rename from tools/errors/model/model.factor rename to tools/tools/errors/model/model.factor diff --git a/tools/files/authors.txt b/tools/tools/files/authors.txt similarity index 100% rename from tools/files/authors.txt rename to tools/tools/files/authors.txt diff --git a/tools/files/files-docs.factor b/tools/tools/files/files-docs.factor similarity index 100% rename from tools/files/files-docs.factor rename to tools/tools/files/files-docs.factor diff --git a/tools/files/files-tests.factor b/tools/tools/files/files-tests.factor similarity index 100% rename from tools/files/files-tests.factor rename to tools/tools/files/files-tests.factor diff --git a/tools/files/files.factor b/tools/tools/files/files.factor similarity index 100% rename from tools/files/files.factor rename to tools/tools/files/files.factor diff --git a/tools/files/summary.txt b/tools/tools/files/summary.txt similarity index 100% rename from tools/files/summary.txt rename to tools/tools/files/summary.txt diff --git a/tools/files/unix/authors.txt b/tools/tools/files/unix/authors.txt similarity index 100% rename from tools/files/unix/authors.txt rename to tools/tools/files/unix/authors.txt diff --git a/tools/files/unix/platforms.txt b/tools/tools/files/unix/platforms.txt similarity index 100% rename from tools/files/unix/platforms.txt rename to tools/tools/files/unix/platforms.txt diff --git a/tools/files/unix/unix.factor b/tools/tools/files/unix/unix.factor similarity index 100% rename from tools/files/unix/unix.factor rename to tools/tools/files/unix/unix.factor diff --git a/tools/files/windows/authors.txt b/tools/tools/files/windows/authors.txt similarity index 100% rename from tools/files/windows/authors.txt rename to tools/tools/files/windows/authors.txt diff --git a/tools/files/windows/platforms.txt b/tools/tools/files/windows/platforms.txt similarity index 100% rename from tools/files/windows/platforms.txt rename to tools/tools/files/windows/platforms.txt diff --git a/tools/files/windows/windows.factor b/tools/tools/files/windows/windows.factor similarity index 100% rename from tools/files/windows/windows.factor rename to tools/tools/files/windows/windows.factor diff --git a/tools/hexdump/authors.txt b/tools/tools/hexdump/authors.txt similarity index 100% rename from tools/hexdump/authors.txt rename to tools/tools/hexdump/authors.txt diff --git a/tools/hexdump/hexdump-docs.factor b/tools/tools/hexdump/hexdump-docs.factor similarity index 100% rename from tools/hexdump/hexdump-docs.factor rename to tools/tools/hexdump/hexdump-docs.factor diff --git a/tools/hexdump/hexdump-tests.factor b/tools/tools/hexdump/hexdump-tests.factor similarity index 100% rename from tools/hexdump/hexdump-tests.factor rename to tools/tools/hexdump/hexdump-tests.factor diff --git a/tools/hexdump/hexdump.factor b/tools/tools/hexdump/hexdump.factor similarity index 100% rename from tools/hexdump/hexdump.factor rename to tools/tools/hexdump/hexdump.factor diff --git a/tools/hexdump/summary.txt b/tools/tools/hexdump/summary.txt similarity index 100% rename from tools/hexdump/summary.txt rename to tools/tools/hexdump/summary.txt diff --git a/tools/memory/authors.txt b/tools/tools/memory/authors.txt similarity index 100% rename from tools/memory/authors.txt rename to tools/tools/memory/authors.txt diff --git a/tools/memory/memory-docs.factor b/tools/tools/memory/memory-docs.factor similarity index 100% rename from tools/memory/memory-docs.factor rename to tools/tools/memory/memory-docs.factor diff --git a/tools/memory/memory-tests.factor b/tools/tools/memory/memory-tests.factor similarity index 100% rename from tools/memory/memory-tests.factor rename to tools/tools/memory/memory-tests.factor diff --git a/tools/memory/memory.factor b/tools/tools/memory/memory.factor similarity index 100% rename from tools/memory/memory.factor rename to tools/tools/memory/memory.factor diff --git a/tools/memory/summary.txt b/tools/tools/memory/summary.txt similarity index 100% rename from tools/memory/summary.txt rename to tools/tools/memory/summary.txt diff --git a/tools/memory/tags.txt b/tools/tools/memory/tags.txt similarity index 100% rename from tools/memory/tags.txt rename to tools/tools/memory/tags.txt diff --git a/tools/profiler/sampling/authors.txt b/tools/tools/profiler/sampling/authors.txt similarity index 100% rename from tools/profiler/sampling/authors.txt rename to tools/tools/profiler/sampling/authors.txt diff --git a/tools/profiler/sampling/sampling-docs.factor b/tools/tools/profiler/sampling/sampling-docs.factor similarity index 100% rename from tools/profiler/sampling/sampling-docs.factor rename to tools/tools/profiler/sampling/sampling-docs.factor diff --git a/tools/profiler/sampling/sampling-tests.factor b/tools/tools/profiler/sampling/sampling-tests.factor similarity index 100% rename from tools/profiler/sampling/sampling-tests.factor rename to tools/tools/profiler/sampling/sampling-tests.factor diff --git a/tools/profiler/sampling/sampling.factor b/tools/tools/profiler/sampling/sampling.factor similarity index 100% rename from tools/profiler/sampling/sampling.factor rename to tools/tools/profiler/sampling/sampling.factor diff --git a/tools/profiler/sampling/summary.txt b/tools/tools/profiler/sampling/summary.txt similarity index 100% rename from tools/profiler/sampling/summary.txt rename to tools/tools/profiler/sampling/summary.txt diff --git a/tools/ps/authors.txt b/tools/tools/ps/authors.txt similarity index 100% rename from tools/ps/authors.txt rename to tools/tools/ps/authors.txt diff --git a/tools/ps/linux/authors.txt b/tools/tools/ps/linux/authors.txt similarity index 100% rename from tools/ps/linux/authors.txt rename to tools/tools/ps/linux/authors.txt diff --git a/tools/ps/linux/linux.factor b/tools/tools/ps/linux/linux.factor similarity index 100% rename from tools/ps/linux/linux.factor rename to tools/tools/ps/linux/linux.factor diff --git a/tools/ps/linux/platforms.txt b/tools/tools/ps/linux/platforms.txt similarity index 100% rename from tools/ps/linux/platforms.txt rename to tools/tools/ps/linux/platforms.txt diff --git a/tools/ps/macosx/authors.txt b/tools/tools/ps/macosx/authors.txt similarity index 100% rename from tools/ps/macosx/authors.txt rename to tools/tools/ps/macosx/authors.txt diff --git a/tools/ps/macosx/macosx.factor b/tools/tools/ps/macosx/macosx.factor similarity index 100% rename from tools/ps/macosx/macosx.factor rename to tools/tools/ps/macosx/macosx.factor diff --git a/tools/ps/macosx/platforms.txt b/tools/tools/ps/macosx/platforms.txt similarity index 100% rename from tools/ps/macosx/platforms.txt rename to tools/tools/ps/macosx/platforms.txt diff --git a/tools/ps/ps-tests.factor b/tools/tools/ps/ps-tests.factor similarity index 100% rename from tools/ps/ps-tests.factor rename to tools/tools/ps/ps-tests.factor diff --git a/tools/ps/ps.factor b/tools/tools/ps/ps.factor similarity index 100% rename from tools/ps/ps.factor rename to tools/tools/ps/ps.factor diff --git a/tools/ps/summary.txt b/tools/tools/ps/summary.txt similarity index 100% rename from tools/ps/summary.txt rename to tools/tools/ps/summary.txt diff --git a/tools/ps/windows/platforms.txt b/tools/tools/ps/windows/platforms.txt similarity index 100% rename from tools/ps/windows/platforms.txt rename to tools/tools/ps/windows/platforms.txt diff --git a/tools/ps/windows/windows.factor b/tools/tools/ps/windows/windows.factor similarity index 100% rename from tools/ps/windows/windows.factor rename to tools/tools/ps/windows/windows.factor diff --git a/tools/scaffold/authors.txt b/tools/tools/scaffold/authors.txt similarity index 100% rename from tools/scaffold/authors.txt rename to tools/tools/scaffold/authors.txt diff --git a/tools/scaffold/scaffold-docs.factor b/tools/tools/scaffold/scaffold-docs.factor similarity index 100% rename from tools/scaffold/scaffold-docs.factor rename to tools/tools/scaffold/scaffold-docs.factor diff --git a/tools/scaffold/scaffold-tests.factor b/tools/tools/scaffold/scaffold-tests.factor similarity index 100% rename from tools/scaffold/scaffold-tests.factor rename to tools/tools/scaffold/scaffold-tests.factor diff --git a/tools/scaffold/scaffold.factor b/tools/tools/scaffold/scaffold.factor similarity index 100% rename from tools/scaffold/scaffold.factor rename to tools/tools/scaffold/scaffold.factor diff --git a/tools/scaffold/summary.txt b/tools/tools/scaffold/summary.txt similarity index 100% rename from tools/scaffold/summary.txt rename to tools/tools/scaffold/summary.txt diff --git a/tools/scaffold/windows/authors.txt b/tools/tools/scaffold/windows/authors.txt similarity index 100% rename from tools/scaffold/windows/authors.txt rename to tools/tools/scaffold/windows/authors.txt diff --git a/tools/scaffold/windows/platforms.txt b/tools/tools/scaffold/windows/platforms.txt similarity index 100% rename from tools/scaffold/windows/platforms.txt rename to tools/tools/scaffold/windows/platforms.txt diff --git a/tools/scaffold/windows/windows.factor b/tools/tools/scaffold/windows/windows.factor similarity index 100% rename from tools/scaffold/windows/windows.factor rename to tools/tools/scaffold/windows/windows.factor diff --git a/tools/test/authors.txt b/tools/tools/test/authors.txt similarity index 100% rename from tools/test/authors.txt rename to tools/tools/test/authors.txt diff --git a/tools/test/fuzz/authors.txt b/tools/tools/test/fuzz/authors.txt similarity index 100% rename from tools/test/fuzz/authors.txt rename to tools/tools/test/fuzz/authors.txt diff --git a/tools/test/fuzz/fuzz-tests.factor b/tools/tools/test/fuzz/fuzz-tests.factor similarity index 100% rename from tools/test/fuzz/fuzz-tests.factor rename to tools/tools/test/fuzz/fuzz-tests.factor diff --git a/tools/test/fuzz/fuzz.factor b/tools/tools/test/fuzz/fuzz.factor similarity index 100% rename from tools/test/fuzz/fuzz.factor rename to tools/tools/test/fuzz/fuzz.factor diff --git a/tools/test/summary.txt b/tools/tools/test/summary.txt similarity index 100% rename from tools/test/summary.txt rename to tools/tools/test/summary.txt diff --git a/tools/test/tags.txt b/tools/tools/test/tags.txt similarity index 100% rename from tools/test/tags.txt rename to tools/tools/test/tags.txt diff --git a/tools/test/test-docs.factor b/tools/tools/test/test-docs.factor similarity index 100% rename from tools/test/test-docs.factor rename to tools/tools/test/test-docs.factor diff --git a/tools/test/test-tests.factor b/tools/tools/test/test-tests.factor similarity index 100% rename from tools/test/test-tests.factor rename to tools/tools/test/test-tests.factor diff --git a/tools/test/test.factor b/tools/tools/test/test.factor similarity index 100% rename from tools/test/test.factor rename to tools/tools/test/test.factor diff --git a/tools/threads/summary.txt b/tools/tools/threads/summary.txt similarity index 100% rename from tools/threads/summary.txt rename to tools/tools/threads/summary.txt diff --git a/tools/threads/threads-docs.factor b/tools/tools/threads/threads-docs.factor similarity index 100% rename from tools/threads/threads-docs.factor rename to tools/tools/threads/threads-docs.factor diff --git a/tools/threads/threads.factor b/tools/tools/threads/threads.factor similarity index 100% rename from tools/threads/threads.factor rename to tools/tools/threads/threads.factor diff --git a/tools/time/authors.txt b/tools/tools/time/authors.txt similarity index 100% rename from tools/time/authors.txt rename to tools/tools/time/authors.txt diff --git a/tools/time/summary.txt b/tools/tools/time/summary.txt similarity index 100% rename from tools/time/summary.txt rename to tools/tools/time/summary.txt diff --git a/tools/time/tags.txt b/tools/tools/time/tags.txt similarity index 100% rename from tools/time/tags.txt rename to tools/tools/time/tags.txt diff --git a/tools/time/time-docs.factor b/tools/tools/time/time-docs.factor similarity index 100% rename from tools/time/time-docs.factor rename to tools/tools/time/time-docs.factor diff --git a/tools/time/time-tests.factor b/tools/tools/time/time-tests.factor similarity index 100% rename from tools/time/time-tests.factor rename to tools/tools/time/time-tests.factor diff --git a/tools/time/time.factor b/tools/tools/time/time.factor similarity index 100% rename from tools/time/time.factor rename to tools/tools/time/time.factor diff --git a/tools/trace/authors.txt b/tools/tools/trace/authors.txt similarity index 100% rename from tools/trace/authors.txt rename to tools/tools/trace/authors.txt diff --git a/tools/trace/trace-tests.factor b/tools/tools/trace/trace-tests.factor similarity index 100% rename from tools/trace/trace-tests.factor rename to tools/tools/trace/trace-tests.factor diff --git a/tools/trace/trace.factor b/tools/tools/trace/trace.factor similarity index 100% rename from tools/trace/trace.factor rename to tools/tools/trace/trace.factor diff --git a/tools/walker/authors.txt b/tools/tools/walker/authors.txt similarity index 100% rename from tools/walker/authors.txt rename to tools/tools/walker/authors.txt diff --git a/tools/walker/debug/authors.txt b/tools/tools/walker/debug/authors.txt similarity index 100% rename from tools/walker/debug/authors.txt rename to tools/tools/walker/debug/authors.txt diff --git a/tools/walker/debug/debug.factor b/tools/tools/walker/debug/debug.factor similarity index 100% rename from tools/walker/debug/debug.factor rename to tools/tools/walker/debug/debug.factor diff --git a/tools/walker/summary.txt b/tools/tools/walker/summary.txt similarity index 100% rename from tools/walker/summary.txt rename to tools/tools/walker/summary.txt diff --git a/tools/walker/walker-docs.factor b/tools/tools/walker/walker-docs.factor similarity index 100% rename from tools/walker/walker-docs.factor rename to tools/tools/walker/walker-docs.factor diff --git a/tools/walker/walker-tests.factor b/tools/tools/walker/walker-tests.factor similarity index 100% rename from tools/walker/walker-tests.factor rename to tools/tools/walker/walker-tests.factor diff --git a/tools/walker/walker.factor b/tools/tools/walker/walker.factor similarity index 100% rename from tools/walker/walker.factor rename to tools/tools/walker/walker.factor