diff --git a/Cargo.toml b/Cargo.toml index 06a58e6e..41e18282 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,15 +1,15 @@ [workspace] resolver = "2" members = [ - "crates/xilem_core", - "crates/xilem_web", - "crates/xilem_web/web_examples/counter", - "crates/xilem_web/web_examples/counter_custom_element", - "crates/xilem_web/web_examples/todomvc", - "crates/xilem_web/web_examples/mathml_svg", - "crates/xilem_web/web_examples/svgtoy", - "crates/masonry", - "crates/xilem_masonry", + "xilem_core", + "xilem_web", + "xilem_web/web_examples/counter", + "xilem_web/web_examples/counter_custom_element", + "xilem_web/web_examples/todomvc", + "xilem_web/web_examples/mathml_svg", + "xilem_web/web_examples/svgtoy", + "masonry", + "xilem", ] [workspace.package] @@ -22,8 +22,8 @@ homepage = "https://xilem.dev/" clippy.semicolon_if_nothing_returned = "warn" [workspace.dependencies] -xilem_core = { version = "0.1.0", path = "crates/xilem_core" } -masonry = { version = "0.2.0", path = "crates/masonry" } +xilem_core = { version = "0.1.0", path = "xilem_core" } +masonry = { version = "0.2.0", path = "masonry" } vello = "0.1.0" wgpu = "0.19.4" kurbo = "0.11.0" diff --git a/crates/masonry/.gitignore b/masonry/.gitignore similarity index 100% rename from crates/masonry/.gitignore rename to masonry/.gitignore diff --git a/crates/masonry/Cargo.toml b/masonry/Cargo.toml similarity index 100% rename from crates/masonry/Cargo.toml rename to masonry/Cargo.toml diff --git a/crates/masonry/LICENSE b/masonry/LICENSE similarity index 100% rename from crates/masonry/LICENSE rename to masonry/LICENSE diff --git a/crates/masonry/README.md b/masonry/README.md similarity index 100% rename from crates/masonry/README.md rename to masonry/README.md diff --git a/crates/masonry/doc/ARCHITECTURE.md b/masonry/doc/ARCHITECTURE.md similarity index 100% rename from crates/masonry/doc/ARCHITECTURE.md rename to masonry/doc/ARCHITECTURE.md diff --git a/crates/masonry/doc/ROADMAP.md b/masonry/doc/ROADMAP.md similarity index 100% rename from crates/masonry/doc/ROADMAP.md rename to masonry/doc/ROADMAP.md diff --git a/crates/masonry/examples/assets/PicWithAlpha.png b/masonry/examples/assets/PicWithAlpha.png similarity index 100% rename from crates/masonry/examples/assets/PicWithAlpha.png rename to masonry/examples/assets/PicWithAlpha.png diff --git a/crates/masonry/examples/calc.rs b/masonry/examples/calc.rs similarity index 100% rename from crates/masonry/examples/calc.rs rename to masonry/examples/calc.rs diff --git a/crates/masonry/examples/custom_widget.rs b/masonry/examples/custom_widget.rs similarity index 100% rename from crates/masonry/examples/custom_widget.rs rename to masonry/examples/custom_widget.rs diff --git a/crates/masonry/examples/hello_masonry.rs b/masonry/examples/hello_masonry.rs similarity index 100% rename from crates/masonry/examples/hello_masonry.rs rename to masonry/examples/hello_masonry.rs diff --git a/crates/masonry/examples/readme.md b/masonry/examples/readme.md similarity index 100% rename from crates/masonry/examples/readme.md rename to masonry/examples/readme.md diff --git a/crates/masonry/examples/simple_image.rs b/masonry/examples/simple_image.rs similarity index 100% rename from crates/masonry/examples/simple_image.rs rename to masonry/examples/simple_image.rs diff --git a/crates/masonry/resources/i18n/de-DE/builtin.ftl b/masonry/resources/i18n/de-DE/builtin.ftl similarity index 100% rename from crates/masonry/resources/i18n/de-DE/builtin.ftl rename to masonry/resources/i18n/de-DE/builtin.ftl diff --git a/crates/masonry/resources/i18n/en-US/builtin.ftl b/masonry/resources/i18n/en-US/builtin.ftl similarity index 100% rename from crates/masonry/resources/i18n/en-US/builtin.ftl rename to masonry/resources/i18n/en-US/builtin.ftl diff --git a/crates/masonry/resources/i18n/fr-CA/builtin.ftl b/masonry/resources/i18n/fr-CA/builtin.ftl similarity index 100% rename from crates/masonry/resources/i18n/fr-CA/builtin.ftl rename to masonry/resources/i18n/fr-CA/builtin.ftl diff --git a/crates/masonry/resources/i18n/it-IT/builtin.ftl b/masonry/resources/i18n/it-IT/builtin.ftl similarity index 100% rename from crates/masonry/resources/i18n/it-IT/builtin.ftl rename to masonry/resources/i18n/it-IT/builtin.ftl diff --git a/crates/masonry/src/action.rs b/masonry/src/action.rs similarity index 100% rename from crates/masonry/src/action.rs rename to masonry/src/action.rs diff --git a/crates/masonry/src/app_driver.rs b/masonry/src/app_driver.rs similarity index 100% rename from crates/masonry/src/app_driver.rs rename to masonry/src/app_driver.rs diff --git a/crates/masonry/src/bloom.rs b/masonry/src/bloom.rs similarity index 100% rename from crates/masonry/src/bloom.rs rename to masonry/src/bloom.rs diff --git a/crates/masonry/src/box_constraints.rs b/masonry/src/box_constraints.rs similarity index 100% rename from crates/masonry/src/box_constraints.rs rename to masonry/src/box_constraints.rs diff --git a/crates/masonry/src/contexts.rs b/masonry/src/contexts.rs similarity index 100% rename from crates/masonry/src/contexts.rs rename to masonry/src/contexts.rs diff --git a/crates/masonry/src/debug_logger.rs b/masonry/src/debug_logger.rs similarity index 100% rename from crates/masonry/src/debug_logger.rs rename to masonry/src/debug_logger.rs diff --git a/crates/masonry/src/debug_values.rs b/masonry/src/debug_values.rs similarity index 100% rename from crates/masonry/src/debug_values.rs rename to masonry/src/debug_values.rs diff --git a/crates/masonry/src/event.rs b/masonry/src/event.rs similarity index 100% rename from crates/masonry/src/event.rs rename to masonry/src/event.rs diff --git a/crates/masonry/src/event_loop_runner.rs b/masonry/src/event_loop_runner.rs similarity index 100% rename from crates/masonry/src/event_loop_runner.rs rename to masonry/src/event_loop_runner.rs diff --git a/crates/masonry/src/ext_event.rs b/masonry/src/ext_event.rs similarity index 100% rename from crates/masonry/src/ext_event.rs rename to masonry/src/ext_event.rs diff --git a/crates/masonry/src/lib.rs b/masonry/src/lib.rs similarity index 100% rename from crates/masonry/src/lib.rs rename to masonry/src/lib.rs diff --git a/crates/masonry/src/paint_scene_helpers.rs b/masonry/src/paint_scene_helpers.rs similarity index 100% rename from crates/masonry/src/paint_scene_helpers.rs rename to masonry/src/paint_scene_helpers.rs diff --git a/crates/masonry/src/promise.rs b/masonry/src/promise.rs similarity index 100% rename from crates/masonry/src/promise.rs rename to masonry/src/promise.rs diff --git a/crates/masonry/src/render_root.rs b/masonry/src/render_root.rs similarity index 100% rename from crates/masonry/src/render_root.rs rename to masonry/src/render_root.rs diff --git a/crates/masonry/src/testing/harness.rs b/masonry/src/testing/harness.rs similarity index 100% rename from crates/masonry/src/testing/harness.rs rename to masonry/src/testing/harness.rs diff --git a/crates/masonry/src/testing/helper_widgets.rs b/masonry/src/testing/helper_widgets.rs similarity index 100% rename from crates/masonry/src/testing/helper_widgets.rs rename to masonry/src/testing/helper_widgets.rs diff --git a/crates/masonry/src/testing/mod.rs b/masonry/src/testing/mod.rs similarity index 100% rename from crates/masonry/src/testing/mod.rs rename to masonry/src/testing/mod.rs diff --git a/crates/masonry/src/testing/screenshots.rs b/masonry/src/testing/screenshots.rs similarity index 100% rename from crates/masonry/src/testing/screenshots.rs rename to masonry/src/testing/screenshots.rs diff --git a/crates/masonry/src/testing/snapshot_utils.rs b/masonry/src/testing/snapshot_utils.rs similarity index 100% rename from crates/masonry/src/testing/snapshot_utils.rs rename to masonry/src/testing/snapshot_utils.rs diff --git a/crates/masonry/src/text/README.md b/masonry/src/text/README.md similarity index 100% rename from crates/masonry/src/text/README.md rename to masonry/src/text/README.md diff --git a/crates/masonry/src/text/attribute.rs b/masonry/src/text/attribute.rs similarity index 100% rename from crates/masonry/src/text/attribute.rs rename to masonry/src/text/attribute.rs diff --git a/crates/masonry/src/text/backspace.rs b/masonry/src/text/backspace.rs similarity index 100% rename from crates/masonry/src/text/backspace.rs rename to masonry/src/text/backspace.rs diff --git a/crates/masonry/src/text/editable_text.rs b/masonry/src/text/editable_text.rs similarity index 100% rename from crates/masonry/src/text/editable_text.rs rename to masonry/src/text/editable_text.rs diff --git a/crates/masonry/src/text/font_descriptor.rs b/masonry/src/text/font_descriptor.rs similarity index 100% rename from crates/masonry/src/text/font_descriptor.rs rename to masonry/src/text/font_descriptor.rs diff --git a/crates/masonry/src/text/input_component.rs b/masonry/src/text/input_component.rs similarity index 100% rename from crates/masonry/src/text/input_component.rs rename to masonry/src/text/input_component.rs diff --git a/crates/masonry/src/text/layout.rs b/masonry/src/text/layout.rs similarity index 100% rename from crates/masonry/src/text/layout.rs rename to masonry/src/text/layout.rs diff --git a/crates/masonry/src/text/mod.rs b/masonry/src/text/mod.rs similarity index 100% rename from crates/masonry/src/text/mod.rs rename to masonry/src/text/mod.rs diff --git a/crates/masonry/src/text/movement.rs b/masonry/src/text/movement.rs similarity index 100% rename from crates/masonry/src/text/movement.rs rename to masonry/src/text/movement.rs diff --git a/crates/masonry/src/text/rich_text.rs b/masonry/src/text/rich_text.rs similarity index 100% rename from crates/masonry/src/text/rich_text.rs rename to masonry/src/text/rich_text.rs diff --git a/crates/masonry/src/text/shell_text.rs b/masonry/src/text/shell_text.rs similarity index 100% rename from crates/masonry/src/text/shell_text.rs rename to masonry/src/text/shell_text.rs diff --git a/crates/masonry/src/text/storage.rs b/masonry/src/text/storage.rs similarity index 100% rename from crates/masonry/src/text/storage.rs rename to masonry/src/text/storage.rs diff --git a/crates/masonry/src/text/util.rs b/masonry/src/text/util.rs similarity index 100% rename from crates/masonry/src/text/util.rs rename to masonry/src/text/util.rs diff --git a/crates/masonry/src/text2/edit.rs b/masonry/src/text2/edit.rs similarity index 100% rename from crates/masonry/src/text2/edit.rs rename to masonry/src/text2/edit.rs diff --git a/crates/masonry/src/text2/layout.rs b/masonry/src/text2/layout.rs similarity index 100% rename from crates/masonry/src/text2/layout.rs rename to masonry/src/text2/layout.rs diff --git a/crates/masonry/src/text2/mod.rs b/masonry/src/text2/mod.rs similarity index 100% rename from crates/masonry/src/text2/mod.rs rename to masonry/src/text2/mod.rs diff --git a/crates/masonry/src/text2/movement.rs b/masonry/src/text2/movement.rs similarity index 100% rename from crates/masonry/src/text2/movement.rs rename to masonry/src/text2/movement.rs diff --git a/crates/masonry/src/text2/selection.rs b/masonry/src/text2/selection.rs similarity index 100% rename from crates/masonry/src/text2/selection.rs rename to masonry/src/text2/selection.rs diff --git a/crates/masonry/src/text2/store.rs b/masonry/src/text2/store.rs similarity index 100% rename from crates/masonry/src/text2/store.rs rename to masonry/src/text2/store.rs diff --git a/crates/masonry/src/text_helpers.rs b/masonry/src/text_helpers.rs similarity index 100% rename from crates/masonry/src/text_helpers.rs rename to masonry/src/text_helpers.rs diff --git a/crates/masonry/src/theme.rs b/masonry/src/theme.rs similarity index 100% rename from crates/masonry/src/theme.rs rename to masonry/src/theme.rs diff --git a/crates/masonry/src/util.rs b/masonry/src/util.rs similarity index 100% rename from crates/masonry/src/util.rs rename to masonry/src/util.rs diff --git a/crates/masonry/src/widget/align.rs b/masonry/src/widget/align.rs similarity index 100% rename from crates/masonry/src/widget/align.rs rename to masonry/src/widget/align.rs diff --git a/crates/masonry/src/widget/button.rs b/masonry/src/widget/button.rs similarity index 100% rename from crates/masonry/src/widget/button.rs rename to masonry/src/widget/button.rs diff --git a/crates/masonry/src/widget/checkbox.rs b/masonry/src/widget/checkbox.rs similarity index 100% rename from crates/masonry/src/widget/checkbox.rs rename to masonry/src/widget/checkbox.rs diff --git a/crates/masonry/src/widget/flex.rs b/masonry/src/widget/flex.rs similarity index 100% rename from crates/masonry/src/widget/flex.rs rename to masonry/src/widget/flex.rs diff --git a/crates/masonry/src/widget/image.rs b/masonry/src/widget/image.rs similarity index 100% rename from crates/masonry/src/widget/image.rs rename to masonry/src/widget/image.rs diff --git a/crates/masonry/src/widget/label.rs b/masonry/src/widget/label.rs similarity index 100% rename from crates/masonry/src/widget/label.rs rename to masonry/src/widget/label.rs diff --git a/crates/masonry/src/widget/mod.rs b/masonry/src/widget/mod.rs similarity index 100% rename from crates/masonry/src/widget/mod.rs rename to masonry/src/widget/mod.rs diff --git a/crates/masonry/src/widget/portal.rs b/masonry/src/widget/portal.rs similarity index 100% rename from crates/masonry/src/widget/portal.rs rename to masonry/src/widget/portal.rs diff --git a/crates/masonry/src/widget/prose.rs b/masonry/src/widget/prose.rs similarity index 100% rename from crates/masonry/src/widget/prose.rs rename to masonry/src/widget/prose.rs diff --git a/crates/masonry/src/widget/root_widget.rs b/masonry/src/widget/root_widget.rs similarity index 100% rename from crates/masonry/src/widget/root_widget.rs rename to masonry/src/widget/root_widget.rs diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__align__tests__centered.png b/masonry/src/widget/screenshots/masonry__widget__align__tests__centered.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__align__tests__centered.png rename to masonry/src/widget/screenshots/masonry__widget__align__tests__centered.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__align__tests__left.png b/masonry/src/widget/screenshots/masonry__widget__align__tests__left.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__align__tests__left.png rename to masonry/src/widget/screenshots/masonry__widget__align__tests__left.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__align__tests__right.png b/masonry/src/widget/screenshots/masonry__widget__align__tests__right.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__align__tests__right.png rename to masonry/src/widget/screenshots/masonry__widget__align__tests__right.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__button__tests__hello.png b/masonry/src/widget/screenshots/masonry__widget__button__tests__hello.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__button__tests__hello.png rename to masonry/src/widget/screenshots/masonry__widget__button__tests__hello.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__checkbox__tests__hello_checked.png b/masonry/src/widget/screenshots/masonry__widget__checkbox__tests__hello_checked.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__checkbox__tests__hello_checked.png rename to masonry/src/widget/screenshots/masonry__widget__checkbox__tests__hello_checked.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__checkbox__tests__hello_unchecked.png b/masonry/src/widget/screenshots/masonry__widget__checkbox__tests__hello_unchecked.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__checkbox__tests__hello_unchecked.png rename to masonry/src/widget/screenshots/masonry__widget__checkbox__tests__hello_unchecked.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_cross_axis_baseline.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_cross_axis_baseline.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_cross_axis_baseline.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__col_cross_axis_baseline.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_cross_axis_center.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_cross_axis_center.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_cross_axis_center.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__col_cross_axis_center.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_cross_axis_end.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_cross_axis_end.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_cross_axis_end.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__col_cross_axis_end.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_cross_axis_fill.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_cross_axis_fill.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_cross_axis_fill.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__col_cross_axis_fill.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_cross_axis_start.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_cross_axis_start.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_cross_axis_start.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__col_cross_axis_start.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_fill_main_axis.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_fill_main_axis.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_fill_main_axis.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__col_fill_main_axis.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_center.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_center.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_center.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_center.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_end.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_end.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_end.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_end.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_spaceAround.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_spaceAround.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_spaceAround.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_spaceAround.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_spaceBetween.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_spaceBetween.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_spaceBetween.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_spaceBetween.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_spaceEvenly.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_spaceEvenly.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_spaceEvenly.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_spaceEvenly.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_start.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_start.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_start.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__col_main_axis_start.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_cross_axis_baseline.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_cross_axis_baseline.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_cross_axis_baseline.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__row_cross_axis_baseline.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_cross_axis_center.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_cross_axis_center.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_cross_axis_center.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__row_cross_axis_center.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_cross_axis_end.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_cross_axis_end.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_cross_axis_end.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__row_cross_axis_end.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_cross_axis_fill.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_cross_axis_fill.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_cross_axis_fill.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__row_cross_axis_fill.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_cross_axis_start.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_cross_axis_start.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_cross_axis_start.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__row_cross_axis_start.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_fill_main_axis.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_fill_main_axis.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_fill_main_axis.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__row_fill_main_axis.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_center.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_center.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_center.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_center.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_end.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_end.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_end.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_end.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_spaceAround.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_spaceAround.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_spaceAround.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_spaceAround.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_spaceBetween.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_spaceBetween.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_spaceBetween.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_spaceBetween.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_spaceEvenly.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_spaceEvenly.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_spaceEvenly.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_spaceEvenly.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_start.png b/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_start.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_start.png rename to masonry/src/widget/screenshots/masonry__widget__flex__tests__row_main_axis_start.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__image__tests__tall_paint.png b/masonry/src/widget/screenshots/masonry__widget__image__tests__tall_paint.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__image__tests__tall_paint.png rename to masonry/src/widget/screenshots/masonry__widget__image__tests__tall_paint.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__label__tests__hello.png b/masonry/src/widget/screenshots/masonry__widget__label__tests__hello.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__label__tests__hello.png rename to masonry/src/widget/screenshots/masonry__widget__label__tests__hello.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__label__tests__line_break_modes.png b/masonry/src/widget/screenshots/masonry__widget__label__tests__line_break_modes.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__label__tests__line_break_modes.png rename to masonry/src/widget/screenshots/masonry__widget__label__tests__line_break_modes.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__label__tests__styled_label.png b/masonry/src/widget/screenshots/masonry__widget__label__tests__styled_label.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__label__tests__styled_label.png rename to masonry/src/widget/screenshots/masonry__widget__label__tests__styled_label.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__portal__tests__button_list_no_scroll.png b/masonry/src/widget/screenshots/masonry__widget__portal__tests__button_list_no_scroll.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__portal__tests__button_list_no_scroll.png rename to masonry/src/widget/screenshots/masonry__widget__portal__tests__button_list_no_scroll.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__portal__tests__button_list_scroll_to_item_13.png b/masonry/src/widget/screenshots/masonry__widget__portal__tests__button_list_scroll_to_item_13.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__portal__tests__button_list_scroll_to_item_13.png rename to masonry/src/widget/screenshots/masonry__widget__portal__tests__button_list_scroll_to_item_13.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__portal__tests__button_list_scroll_to_item_3.png b/masonry/src/widget/screenshots/masonry__widget__portal__tests__button_list_scroll_to_item_3.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__portal__tests__button_list_scroll_to_item_3.png rename to masonry/src/widget/screenshots/masonry__widget__portal__tests__button_list_scroll_to_item_3.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__portal__tests__button_list_scrolled.png b/masonry/src/widget/screenshots/masonry__widget__portal__tests__button_list_scrolled.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__portal__tests__button_list_scrolled.png rename to masonry/src/widget/screenshots/masonry__widget__portal__tests__button_list_scrolled.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_bottom.png b/masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_bottom.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_bottom.png rename to masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_bottom.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_default.png b/masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_default.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_default.png rename to masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_default.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_down.png b/masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_down.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_down.png rename to masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_down.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_horizontal.png b/masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_horizontal.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_horizontal.png rename to masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_horizontal.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_horizontal_middle.png b/masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_horizontal_middle.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_horizontal_middle.png rename to masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_horizontal_middle.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_middle.png b/masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_middle.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_middle.png rename to masonry/src/widget/screenshots/masonry__widget__scroll_bar__tests__scrollbar_middle.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__sized_box__tests__empty_box.png b/masonry/src/widget/screenshots/masonry__widget__sized_box__tests__empty_box.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__sized_box__tests__empty_box.png rename to masonry/src/widget/screenshots/masonry__widget__sized_box__tests__empty_box.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__sized_box__tests__label_box_no_size.png b/masonry/src/widget/screenshots/masonry__widget__sized_box__tests__label_box_no_size.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__sized_box__tests__label_box_no_size.png rename to masonry/src/widget/screenshots/masonry__widget__sized_box__tests__label_box_no_size.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__spinner__tests__spinner_init.png b/masonry/src/widget/screenshots/masonry__widget__spinner__tests__spinner_init.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__spinner__tests__spinner_init.png rename to masonry/src/widget/screenshots/masonry__widget__spinner__tests__spinner_init.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__split__tests__columns.png b/masonry/src/widget/screenshots/masonry__widget__split__tests__columns.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__split__tests__columns.png rename to masonry/src/widget/screenshots/masonry__widget__split__tests__columns.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__split__tests__rows.png b/masonry/src/widget/screenshots/masonry__widget__split__tests__rows.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__split__tests__rows.png rename to masonry/src/widget/screenshots/masonry__widget__split__tests__rows.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__textbox__tests__hello.png b/masonry/src/widget/screenshots/masonry__widget__textbox__tests__hello.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__textbox__tests__hello.png rename to masonry/src/widget/screenshots/masonry__widget__textbox__tests__hello.png diff --git a/crates/masonry/src/widget/screenshots/masonry__widget__textbox__tests__placeholder.png b/masonry/src/widget/screenshots/masonry__widget__textbox__tests__placeholder.png similarity index 100% rename from crates/masonry/src/widget/screenshots/masonry__widget__textbox__tests__placeholder.png rename to masonry/src/widget/screenshots/masonry__widget__textbox__tests__placeholder.png diff --git a/crates/masonry/src/widget/scroll_bar.rs b/masonry/src/widget/scroll_bar.rs similarity index 100% rename from crates/masonry/src/widget/scroll_bar.rs rename to masonry/src/widget/scroll_bar.rs diff --git a/crates/masonry/src/widget/sized_box.rs b/masonry/src/widget/sized_box.rs similarity index 100% rename from crates/masonry/src/widget/sized_box.rs rename to masonry/src/widget/sized_box.rs diff --git a/crates/masonry/src/widget/snapshots/masonry__widget__align__tests__centered.snap b/masonry/src/widget/snapshots/masonry__widget__align__tests__centered.snap similarity index 100% rename from crates/masonry/src/widget/snapshots/masonry__widget__align__tests__centered.snap rename to masonry/src/widget/snapshots/masonry__widget__align__tests__centered.snap diff --git a/crates/masonry/src/widget/snapshots/masonry__widget__align__tests__left.snap b/masonry/src/widget/snapshots/masonry__widget__align__tests__left.snap similarity index 100% rename from crates/masonry/src/widget/snapshots/masonry__widget__align__tests__left.snap rename to masonry/src/widget/snapshots/masonry__widget__align__tests__left.snap diff --git a/crates/masonry/src/widget/snapshots/masonry__widget__align__tests__right.snap b/masonry/src/widget/snapshots/masonry__widget__align__tests__right.snap similarity index 100% rename from crates/masonry/src/widget/snapshots/masonry__widget__align__tests__right.snap rename to masonry/src/widget/snapshots/masonry__widget__align__tests__right.snap diff --git a/crates/masonry/src/widget/snapshots/masonry__widget__button__tests__simple_button.snap b/masonry/src/widget/snapshots/masonry__widget__button__tests__simple_button.snap similarity index 100% rename from crates/masonry/src/widget/snapshots/masonry__widget__button__tests__simple_button.snap rename to masonry/src/widget/snapshots/masonry__widget__button__tests__simple_button.snap diff --git a/crates/masonry/src/widget/snapshots/masonry__widget__checkbox__tests__simple_checkbox-2.snap b/masonry/src/widget/snapshots/masonry__widget__checkbox__tests__simple_checkbox-2.snap similarity index 100% rename from crates/masonry/src/widget/snapshots/masonry__widget__checkbox__tests__simple_checkbox-2.snap rename to masonry/src/widget/snapshots/masonry__widget__checkbox__tests__simple_checkbox-2.snap diff --git a/crates/masonry/src/widget/snapshots/masonry__widget__checkbox__tests__simple_checkbox.snap b/masonry/src/widget/snapshots/masonry__widget__checkbox__tests__simple_checkbox.snap similarity index 100% rename from crates/masonry/src/widget/snapshots/masonry__widget__checkbox__tests__simple_checkbox.snap rename to masonry/src/widget/snapshots/masonry__widget__checkbox__tests__simple_checkbox.snap diff --git a/crates/masonry/src/widget/snapshots/masonry__widget__label__tests__simple_label.snap b/masonry/src/widget/snapshots/masonry__widget__label__tests__simple_label.snap similarity index 100% rename from crates/masonry/src/widget/snapshots/masonry__widget__label__tests__simple_label.snap rename to masonry/src/widget/snapshots/masonry__widget__label__tests__simple_label.snap diff --git a/crates/masonry/src/widget/snapshots/masonry__widget__portal__tests__button_list.snap b/masonry/src/widget/snapshots/masonry__widget__portal__tests__button_list.snap similarity index 100% rename from crates/masonry/src/widget/snapshots/masonry__widget__portal__tests__button_list.snap rename to masonry/src/widget/snapshots/masonry__widget__portal__tests__button_list.snap diff --git a/crates/masonry/src/widget/snapshots/masonry__widget__scroll_bar__tests__horizontal_scrollbar.snap b/masonry/src/widget/snapshots/masonry__widget__scroll_bar__tests__horizontal_scrollbar.snap similarity index 100% rename from crates/masonry/src/widget/snapshots/masonry__widget__scroll_bar__tests__horizontal_scrollbar.snap rename to masonry/src/widget/snapshots/masonry__widget__scroll_bar__tests__horizontal_scrollbar.snap diff --git a/crates/masonry/src/widget/snapshots/masonry__widget__scroll_bar__tests__simple_scrollbar.snap b/masonry/src/widget/snapshots/masonry__widget__scroll_bar__tests__simple_scrollbar.snap similarity index 100% rename from crates/masonry/src/widget/snapshots/masonry__widget__scroll_bar__tests__simple_scrollbar.snap rename to masonry/src/widget/snapshots/masonry__widget__scroll_bar__tests__simple_scrollbar.snap diff --git a/crates/masonry/src/widget/snapshots/masonry__widget__sized_box__tests__empty_box.snap b/masonry/src/widget/snapshots/masonry__widget__sized_box__tests__empty_box.snap similarity index 100% rename from crates/masonry/src/widget/snapshots/masonry__widget__sized_box__tests__empty_box.snap rename to masonry/src/widget/snapshots/masonry__widget__sized_box__tests__empty_box.snap diff --git a/crates/masonry/src/widget/snapshots/masonry__widget__sized_box__tests__impl-2.snap b/masonry/src/widget/snapshots/masonry__widget__sized_box__tests__impl-2.snap similarity index 100% rename from crates/masonry/src/widget/snapshots/masonry__widget__sized_box__tests__impl-2.snap rename to masonry/src/widget/snapshots/masonry__widget__sized_box__tests__impl-2.snap diff --git a/crates/masonry/src/widget/snapshots/masonry__widget__sized_box__tests__impl-3.snap b/masonry/src/widget/snapshots/masonry__widget__sized_box__tests__impl-3.snap similarity index 100% rename from crates/masonry/src/widget/snapshots/masonry__widget__sized_box__tests__impl-3.snap rename to masonry/src/widget/snapshots/masonry__widget__sized_box__tests__impl-3.snap diff --git a/crates/masonry/src/widget/snapshots/masonry__widget__sized_box__tests__impl.snap b/masonry/src/widget/snapshots/masonry__widget__sized_box__tests__impl.snap similarity index 100% rename from crates/masonry/src/widget/snapshots/masonry__widget__sized_box__tests__impl.snap rename to masonry/src/widget/snapshots/masonry__widget__sized_box__tests__impl.snap diff --git a/crates/masonry/src/widget/snapshots/masonry__widget__sized_box__tests__label_box_no_size.snap b/masonry/src/widget/snapshots/masonry__widget__sized_box__tests__label_box_no_size.snap similarity index 100% rename from crates/masonry/src/widget/snapshots/masonry__widget__sized_box__tests__label_box_no_size.snap rename to masonry/src/widget/snapshots/masonry__widget__sized_box__tests__label_box_no_size.snap diff --git a/crates/masonry/src/widget/snapshots/masonry__widget__sized_box__tests__label_box_with_size.snap b/masonry/src/widget/snapshots/masonry__widget__sized_box__tests__label_box_with_size.snap similarity index 100% rename from crates/masonry/src/widget/snapshots/masonry__widget__sized_box__tests__label_box_with_size.snap rename to masonry/src/widget/snapshots/masonry__widget__sized_box__tests__label_box_with_size.snap diff --git a/crates/masonry/src/widget/snapshots/masonry__widget__split__tests__columns.snap b/masonry/src/widget/snapshots/masonry__widget__split__tests__columns.snap similarity index 100% rename from crates/masonry/src/widget/snapshots/masonry__widget__split__tests__columns.snap rename to masonry/src/widget/snapshots/masonry__widget__split__tests__columns.snap diff --git a/crates/masonry/src/widget/snapshots/masonry__widget__split__tests__rows.snap b/masonry/src/widget/snapshots/masonry__widget__split__tests__rows.snap similarity index 100% rename from crates/masonry/src/widget/snapshots/masonry__widget__split__tests__rows.snap rename to masonry/src/widget/snapshots/masonry__widget__split__tests__rows.snap diff --git a/crates/masonry/src/widget/snapshots/masonry__widget__textbox__tests__simple_textbox.snap b/masonry/src/widget/snapshots/masonry__widget__textbox__tests__simple_textbox.snap similarity index 100% rename from crates/masonry/src/widget/snapshots/masonry__widget__textbox__tests__simple_textbox.snap rename to masonry/src/widget/snapshots/masonry__widget__textbox__tests__simple_textbox.snap diff --git a/crates/masonry/src/widget/snapshots/masonry__widget__textbox__tests__simple_textbox_placeholder.snap b/masonry/src/widget/snapshots/masonry__widget__textbox__tests__simple_textbox_placeholder.snap similarity index 100% rename from crates/masonry/src/widget/snapshots/masonry__widget__textbox__tests__simple_textbox_placeholder.snap rename to masonry/src/widget/snapshots/masonry__widget__textbox__tests__simple_textbox_placeholder.snap diff --git a/crates/masonry/src/widget/spinner.rs b/masonry/src/widget/spinner.rs similarity index 100% rename from crates/masonry/src/widget/spinner.rs rename to masonry/src/widget/spinner.rs diff --git a/crates/masonry/src/widget/split.rs b/masonry/src/widget/split.rs similarity index 100% rename from crates/masonry/src/widget/split.rs rename to masonry/src/widget/split.rs diff --git a/crates/masonry/src/widget/tests/layout.rs b/masonry/src/widget/tests/layout.rs similarity index 100% rename from crates/masonry/src/widget/tests/layout.rs rename to masonry/src/widget/tests/layout.rs diff --git a/crates/masonry/src/widget/tests/lifecycle_basic.rs b/masonry/src/widget/tests/lifecycle_basic.rs similarity index 100% rename from crates/masonry/src/widget/tests/lifecycle_basic.rs rename to masonry/src/widget/tests/lifecycle_basic.rs diff --git a/crates/masonry/src/widget/tests/lifecycle_disable.rs b/masonry/src/widget/tests/lifecycle_disable.rs similarity index 100% rename from crates/masonry/src/widget/tests/lifecycle_disable.rs rename to masonry/src/widget/tests/lifecycle_disable.rs diff --git a/crates/masonry/src/widget/tests/lifecycle_focus.rs b/masonry/src/widget/tests/lifecycle_focus.rs similarity index 100% rename from crates/masonry/src/widget/tests/lifecycle_focus.rs rename to masonry/src/widget/tests/lifecycle_focus.rs diff --git a/crates/masonry/src/widget/tests/mod.rs b/masonry/src/widget/tests/mod.rs similarity index 100% rename from crates/masonry/src/widget/tests/mod.rs rename to masonry/src/widget/tests/mod.rs diff --git a/crates/masonry/src/widget/tests/safety_rails.rs b/masonry/src/widget/tests/safety_rails.rs similarity index 100% rename from crates/masonry/src/widget/tests/safety_rails.rs rename to masonry/src/widget/tests/safety_rails.rs diff --git a/crates/masonry/src/widget/tests/snapshots/masonry__widget__tests__lifecycle_basic__adding_child.snap b/masonry/src/widget/tests/snapshots/masonry__widget__tests__lifecycle_basic__adding_child.snap similarity index 100% rename from crates/masonry/src/widget/tests/snapshots/masonry__widget__tests__lifecycle_basic__adding_child.snap rename to masonry/src/widget/tests/snapshots/masonry__widget__tests__lifecycle_basic__adding_child.snap diff --git a/crates/masonry/src/widget/tests/snapshots/masonry__widget__tests__lifecycle_basic__app_creation.snap b/masonry/src/widget/tests/snapshots/masonry__widget__tests__lifecycle_basic__app_creation.snap similarity index 100% rename from crates/masonry/src/widget/tests/snapshots/masonry__widget__tests__lifecycle_basic__app_creation.snap rename to masonry/src/widget/tests/snapshots/masonry__widget__tests__lifecycle_basic__app_creation.snap diff --git a/crates/masonry/src/widget/tests/snapshots/masonry__widget__tests__lifecycle_basic__impl-2.snap b/masonry/src/widget/tests/snapshots/masonry__widget__tests__lifecycle_basic__impl-2.snap similarity index 100% rename from crates/masonry/src/widget/tests/snapshots/masonry__widget__tests__lifecycle_basic__impl-2.snap rename to masonry/src/widget/tests/snapshots/masonry__widget__tests__lifecycle_basic__impl-2.snap diff --git a/crates/masonry/src/widget/tests/snapshots/masonry__widget__tests__lifecycle_basic__impl.snap b/masonry/src/widget/tests/snapshots/masonry__widget__tests__lifecycle_basic__impl.snap similarity index 100% rename from crates/masonry/src/widget/tests/snapshots/masonry__widget__tests__lifecycle_basic__impl.snap rename to masonry/src/widget/tests/snapshots/masonry__widget__tests__lifecycle_basic__impl.snap diff --git a/crates/masonry/src/widget/tests/status_change.rs b/masonry/src/widget/tests/status_change.rs similarity index 100% rename from crates/masonry/src/widget/tests/status_change.rs rename to masonry/src/widget/tests/status_change.rs diff --git a/crates/masonry/src/widget/textbox.rs b/masonry/src/widget/textbox.rs similarity index 100% rename from crates/masonry/src/widget/textbox.rs rename to masonry/src/widget/textbox.rs diff --git a/crates/masonry/src/widget/widget.rs b/masonry/src/widget/widget.rs similarity index 100% rename from crates/masonry/src/widget/widget.rs rename to masonry/src/widget/widget.rs diff --git a/crates/masonry/src/widget/widget_mut.rs b/masonry/src/widget/widget_mut.rs similarity index 100% rename from crates/masonry/src/widget/widget_mut.rs rename to masonry/src/widget/widget_mut.rs diff --git a/crates/masonry/src/widget/widget_pod.rs b/masonry/src/widget/widget_pod.rs similarity index 100% rename from crates/masonry/src/widget/widget_pod.rs rename to masonry/src/widget/widget_pod.rs diff --git a/crates/masonry/src/widget/widget_ref.rs b/masonry/src/widget/widget_ref.rs similarity index 100% rename from crates/masonry/src/widget/widget_ref.rs rename to masonry/src/widget/widget_ref.rs diff --git a/crates/masonry/src/widget/widget_state.rs b/masonry/src/widget/widget_state.rs similarity index 100% rename from crates/masonry/src/widget/widget_state.rs rename to masonry/src/widget/widget_state.rs diff --git a/crates/xilem_masonry/Cargo.toml b/xilem/Cargo.toml similarity index 100% rename from crates/xilem_masonry/Cargo.toml rename to xilem/Cargo.toml diff --git a/crates/xilem_core/LICENSE b/xilem/LICENSE similarity index 100% rename from crates/xilem_core/LICENSE rename to xilem/LICENSE diff --git a/crates/xilem_masonry/README.md b/xilem/README.md similarity index 100% rename from crates/xilem_masonry/README.md rename to xilem/README.md diff --git a/crates/xilem_masonry/examples/flex.rs b/xilem/examples/flex.rs similarity index 100% rename from crates/xilem_masonry/examples/flex.rs rename to xilem/examples/flex.rs diff --git a/crates/xilem_masonry/examples/mason.rs b/xilem/examples/mason.rs similarity index 100% rename from crates/xilem_masonry/examples/mason.rs rename to xilem/examples/mason.rs diff --git a/crates/xilem_masonry/examples/to_do_mvc.rs b/xilem/examples/to_do_mvc.rs similarity index 100% rename from crates/xilem_masonry/examples/to_do_mvc.rs rename to xilem/examples/to_do_mvc.rs diff --git a/crates/xilem_masonry/src/any_view.rs b/xilem/src/any_view.rs similarity index 100% rename from crates/xilem_masonry/src/any_view.rs rename to xilem/src/any_view.rs diff --git a/crates/xilem_masonry/src/id.rs b/xilem/src/id.rs similarity index 100% rename from crates/xilem_masonry/src/id.rs rename to xilem/src/id.rs diff --git a/crates/xilem_masonry/src/lib.rs b/xilem/src/lib.rs similarity index 100% rename from crates/xilem_masonry/src/lib.rs rename to xilem/src/lib.rs diff --git a/crates/xilem_masonry/src/sequence.rs b/xilem/src/sequence.rs similarity index 100% rename from crates/xilem_masonry/src/sequence.rs rename to xilem/src/sequence.rs diff --git a/crates/xilem_masonry/src/vec_splice.rs b/xilem/src/vec_splice.rs similarity index 100% rename from crates/xilem_masonry/src/vec_splice.rs rename to xilem/src/vec_splice.rs diff --git a/crates/xilem_masonry/src/view/button.rs b/xilem/src/view/button.rs similarity index 100% rename from crates/xilem_masonry/src/view/button.rs rename to xilem/src/view/button.rs diff --git a/crates/xilem_masonry/src/view/checkbox.rs b/xilem/src/view/checkbox.rs similarity index 100% rename from crates/xilem_masonry/src/view/checkbox.rs rename to xilem/src/view/checkbox.rs diff --git a/crates/xilem_masonry/src/view/flex.rs b/xilem/src/view/flex.rs similarity index 100% rename from crates/xilem_masonry/src/view/flex.rs rename to xilem/src/view/flex.rs diff --git a/crates/xilem_masonry/src/view/label.rs b/xilem/src/view/label.rs similarity index 100% rename from crates/xilem_masonry/src/view/label.rs rename to xilem/src/view/label.rs diff --git a/crates/xilem_masonry/src/view/mod.rs b/xilem/src/view/mod.rs similarity index 100% rename from crates/xilem_masonry/src/view/mod.rs rename to xilem/src/view/mod.rs diff --git a/crates/xilem_masonry/src/view/prose.rs b/xilem/src/view/prose.rs similarity index 100% rename from crates/xilem_masonry/src/view/prose.rs rename to xilem/src/view/prose.rs diff --git a/crates/xilem_masonry/src/view/textbox.rs b/xilem/src/view/textbox.rs similarity index 100% rename from crates/xilem_masonry/src/view/textbox.rs rename to xilem/src/view/textbox.rs diff --git a/crates/xilem_core/Cargo.toml b/xilem_core/Cargo.toml similarity index 100% rename from crates/xilem_core/Cargo.toml rename to xilem_core/Cargo.toml diff --git a/crates/xilem_masonry/LICENSE b/xilem_core/LICENSE similarity index 100% rename from crates/xilem_masonry/LICENSE rename to xilem_core/LICENSE diff --git a/crates/xilem_core/src/any_view.rs b/xilem_core/src/any_view.rs similarity index 100% rename from crates/xilem_core/src/any_view.rs rename to xilem_core/src/any_view.rs diff --git a/crates/xilem_core/src/id.rs b/xilem_core/src/id.rs similarity index 100% rename from crates/xilem_core/src/id.rs rename to xilem_core/src/id.rs diff --git a/crates/xilem_core/src/lib.rs b/xilem_core/src/lib.rs similarity index 100% rename from crates/xilem_core/src/lib.rs rename to xilem_core/src/lib.rs diff --git a/crates/xilem_core/src/message.rs b/xilem_core/src/message.rs similarity index 100% rename from crates/xilem_core/src/message.rs rename to xilem_core/src/message.rs diff --git a/crates/xilem_core/src/sequence.rs b/xilem_core/src/sequence.rs similarity index 100% rename from crates/xilem_core/src/sequence.rs rename to xilem_core/src/sequence.rs diff --git a/crates/xilem_core/src/vec_splice.rs b/xilem_core/src/vec_splice.rs similarity index 100% rename from crates/xilem_core/src/vec_splice.rs rename to xilem_core/src/vec_splice.rs diff --git a/crates/xilem_core/src/view/adapt.rs b/xilem_core/src/view/adapt.rs similarity index 100% rename from crates/xilem_core/src/view/adapt.rs rename to xilem_core/src/view/adapt.rs diff --git a/crates/xilem_core/src/view/memoize.rs b/xilem_core/src/view/memoize.rs similarity index 100% rename from crates/xilem_core/src/view/memoize.rs rename to xilem_core/src/view/memoize.rs diff --git a/crates/xilem_core/src/view/mod.rs b/xilem_core/src/view/mod.rs similarity index 100% rename from crates/xilem_core/src/view/mod.rs rename to xilem_core/src/view/mod.rs diff --git a/crates/xilem_web/.gitignore b/xilem_web/.gitignore similarity index 100% rename from crates/xilem_web/.gitignore rename to xilem_web/.gitignore diff --git a/crates/xilem_web/Cargo.toml b/xilem_web/Cargo.toml similarity index 100% rename from crates/xilem_web/Cargo.toml rename to xilem_web/Cargo.toml diff --git a/crates/xilem_web/LICENSE b/xilem_web/LICENSE similarity index 100% rename from crates/xilem_web/LICENSE rename to xilem_web/LICENSE diff --git a/crates/xilem_web/README.md b/xilem_web/README.md similarity index 100% rename from crates/xilem_web/README.md rename to xilem_web/README.md diff --git a/crates/xilem_web/src/app.rs b/xilem_web/src/app.rs similarity index 100% rename from crates/xilem_web/src/app.rs rename to xilem_web/src/app.rs diff --git a/crates/xilem_web/src/attribute.rs b/xilem_web/src/attribute.rs similarity index 100% rename from crates/xilem_web/src/attribute.rs rename to xilem_web/src/attribute.rs diff --git a/crates/xilem_web/src/attribute_value.rs b/xilem_web/src/attribute_value.rs similarity index 100% rename from crates/xilem_web/src/attribute_value.rs rename to xilem_web/src/attribute_value.rs diff --git a/crates/xilem_web/src/class.rs b/xilem_web/src/class.rs similarity index 100% rename from crates/xilem_web/src/class.rs rename to xilem_web/src/class.rs diff --git a/crates/xilem_web/src/context.rs b/xilem_web/src/context.rs similarity index 100% rename from crates/xilem_web/src/context.rs rename to xilem_web/src/context.rs diff --git a/crates/xilem_web/src/diff.rs b/xilem_web/src/diff.rs similarity index 100% rename from crates/xilem_web/src/diff.rs rename to xilem_web/src/diff.rs diff --git a/crates/xilem_web/src/elements.rs b/xilem_web/src/elements.rs similarity index 100% rename from crates/xilem_web/src/elements.rs rename to xilem_web/src/elements.rs diff --git a/crates/xilem_web/src/events.rs b/xilem_web/src/events.rs similarity index 100% rename from crates/xilem_web/src/events.rs rename to xilem_web/src/events.rs diff --git a/crates/xilem_web/src/interfaces.rs b/xilem_web/src/interfaces.rs similarity index 100% rename from crates/xilem_web/src/interfaces.rs rename to xilem_web/src/interfaces.rs diff --git a/crates/xilem_web/src/lib.rs b/xilem_web/src/lib.rs similarity index 100% rename from crates/xilem_web/src/lib.rs rename to xilem_web/src/lib.rs diff --git a/crates/xilem_web/src/one_of.rs b/xilem_web/src/one_of.rs similarity index 100% rename from crates/xilem_web/src/one_of.rs rename to xilem_web/src/one_of.rs diff --git a/crates/xilem_web/src/optional_action.rs b/xilem_web/src/optional_action.rs similarity index 100% rename from crates/xilem_web/src/optional_action.rs rename to xilem_web/src/optional_action.rs diff --git a/crates/xilem_web/src/pointer.rs b/xilem_web/src/pointer.rs similarity index 100% rename from crates/xilem_web/src/pointer.rs rename to xilem_web/src/pointer.rs diff --git a/crates/xilem_web/src/style.rs b/xilem_web/src/style.rs similarity index 100% rename from crates/xilem_web/src/style.rs rename to xilem_web/src/style.rs diff --git a/crates/xilem_web/src/svg/common_attrs.rs b/xilem_web/src/svg/common_attrs.rs similarity index 100% rename from crates/xilem_web/src/svg/common_attrs.rs rename to xilem_web/src/svg/common_attrs.rs diff --git a/crates/xilem_web/src/svg/kurbo_shape.rs b/xilem_web/src/svg/kurbo_shape.rs similarity index 100% rename from crates/xilem_web/src/svg/kurbo_shape.rs rename to xilem_web/src/svg/kurbo_shape.rs diff --git a/crates/xilem_web/src/svg/mod.rs b/xilem_web/src/svg/mod.rs similarity index 100% rename from crates/xilem_web/src/svg/mod.rs rename to xilem_web/src/svg/mod.rs diff --git a/crates/xilem_web/src/vecmap.rs b/xilem_web/src/vecmap.rs similarity index 100% rename from crates/xilem_web/src/vecmap.rs rename to xilem_web/src/vecmap.rs diff --git a/crates/xilem_web/src/view.rs b/xilem_web/src/view.rs similarity index 100% rename from crates/xilem_web/src/view.rs rename to xilem_web/src/view.rs diff --git a/crates/xilem_web/src/view_ext.rs b/xilem_web/src/view_ext.rs similarity index 100% rename from crates/xilem_web/src/view_ext.rs rename to xilem_web/src/view_ext.rs diff --git a/crates/xilem_web/web_examples/counter/Cargo.toml b/xilem_web/web_examples/counter/Cargo.toml similarity index 100% rename from crates/xilem_web/web_examples/counter/Cargo.toml rename to xilem_web/web_examples/counter/Cargo.toml diff --git a/crates/xilem_web/web_examples/counter/index.html b/xilem_web/web_examples/counter/index.html similarity index 100% rename from crates/xilem_web/web_examples/counter/index.html rename to xilem_web/web_examples/counter/index.html diff --git a/crates/xilem_web/web_examples/counter/src/main.rs b/xilem_web/web_examples/counter/src/main.rs similarity index 100% rename from crates/xilem_web/web_examples/counter/src/main.rs rename to xilem_web/web_examples/counter/src/main.rs diff --git a/crates/xilem_web/web_examples/counter_custom_element/Cargo.toml b/xilem_web/web_examples/counter_custom_element/Cargo.toml similarity index 100% rename from crates/xilem_web/web_examples/counter_custom_element/Cargo.toml rename to xilem_web/web_examples/counter_custom_element/Cargo.toml diff --git a/crates/xilem_web/web_examples/counter_custom_element/index.html b/xilem_web/web_examples/counter_custom_element/index.html similarity index 100% rename from crates/xilem_web/web_examples/counter_custom_element/index.html rename to xilem_web/web_examples/counter_custom_element/index.html diff --git a/crates/xilem_web/web_examples/counter_custom_element/src/main.rs b/xilem_web/web_examples/counter_custom_element/src/main.rs similarity index 100% rename from crates/xilem_web/web_examples/counter_custom_element/src/main.rs rename to xilem_web/web_examples/counter_custom_element/src/main.rs diff --git a/crates/xilem_web/web_examples/mathml_svg/Cargo.toml b/xilem_web/web_examples/mathml_svg/Cargo.toml similarity index 100% rename from crates/xilem_web/web_examples/mathml_svg/Cargo.toml rename to xilem_web/web_examples/mathml_svg/Cargo.toml diff --git a/crates/xilem_web/web_examples/mathml_svg/index.html b/xilem_web/web_examples/mathml_svg/index.html similarity index 100% rename from crates/xilem_web/web_examples/mathml_svg/index.html rename to xilem_web/web_examples/mathml_svg/index.html diff --git a/crates/xilem_web/web_examples/mathml_svg/src/main.rs b/xilem_web/web_examples/mathml_svg/src/main.rs similarity index 100% rename from crates/xilem_web/web_examples/mathml_svg/src/main.rs rename to xilem_web/web_examples/mathml_svg/src/main.rs diff --git a/crates/xilem_web/web_examples/svgtoy/Cargo.toml b/xilem_web/web_examples/svgtoy/Cargo.toml similarity index 100% rename from crates/xilem_web/web_examples/svgtoy/Cargo.toml rename to xilem_web/web_examples/svgtoy/Cargo.toml diff --git a/crates/xilem_web/web_examples/svgtoy/index.html b/xilem_web/web_examples/svgtoy/index.html similarity index 100% rename from crates/xilem_web/web_examples/svgtoy/index.html rename to xilem_web/web_examples/svgtoy/index.html diff --git a/crates/xilem_web/web_examples/svgtoy/src/main.rs b/xilem_web/web_examples/svgtoy/src/main.rs similarity index 100% rename from crates/xilem_web/web_examples/svgtoy/src/main.rs rename to xilem_web/web_examples/svgtoy/src/main.rs diff --git a/crates/xilem_web/web_examples/todomvc/Cargo.toml b/xilem_web/web_examples/todomvc/Cargo.toml similarity index 100% rename from crates/xilem_web/web_examples/todomvc/Cargo.toml rename to xilem_web/web_examples/todomvc/Cargo.toml diff --git a/crates/xilem_web/web_examples/todomvc/README.md b/xilem_web/web_examples/todomvc/README.md similarity index 100% rename from crates/xilem_web/web_examples/todomvc/README.md rename to xilem_web/web_examples/todomvc/README.md diff --git a/crates/xilem_web/web_examples/todomvc/index.html b/xilem_web/web_examples/todomvc/index.html similarity index 100% rename from crates/xilem_web/web_examples/todomvc/index.html rename to xilem_web/web_examples/todomvc/index.html diff --git a/crates/xilem_web/web_examples/todomvc/src/main.rs b/xilem_web/web_examples/todomvc/src/main.rs similarity index 100% rename from crates/xilem_web/web_examples/todomvc/src/main.rs rename to xilem_web/web_examples/todomvc/src/main.rs diff --git a/crates/xilem_web/web_examples/todomvc/src/state.rs b/xilem_web/web_examples/todomvc/src/state.rs similarity index 100% rename from crates/xilem_web/web_examples/todomvc/src/state.rs rename to xilem_web/web_examples/todomvc/src/state.rs