Rename test/widget to test/widgets to match the library (#6716)

diff --git a/packages/flutter/test/material/tooltip_test.dart b/packages/flutter/test/material/tooltip_test.dart
index 17c380a..9157b97 100644
--- a/packages/flutter/test/material/tooltip_test.dart
+++ b/packages/flutter/test/material/tooltip_test.dart
@@ -8,7 +8,7 @@
 import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
 
-import '../widget/semantics_tester.dart';
+import '../widgets/semantics_tester.dart';
 
 // This file uses "as dynamic" in a few places to defeat the static
 // analysis. In general you want to avoid using this style in your
diff --git a/packages/flutter/test/widget/align_test.dart b/packages/flutter/test/widgets/align_test.dart
similarity index 100%
rename from packages/flutter/test/widget/align_test.dart
rename to packages/flutter/test/widgets/align_test.dart
diff --git a/packages/flutter/test/widget/animated_container_test.dart b/packages/flutter/test/widgets/animated_container_test.dart
similarity index 100%
rename from packages/flutter/test/widget/animated_container_test.dart
rename to packages/flutter/test/widgets/animated_container_test.dart
diff --git a/packages/flutter/test/widget/animated_cross_fade_test.dart b/packages/flutter/test/widgets/animated_cross_fade_test.dart
similarity index 100%
rename from packages/flutter/test/widget/animated_cross_fade_test.dart
rename to packages/flutter/test/widgets/animated_cross_fade_test.dart
diff --git a/packages/flutter/test/widget/animated_positioned_test.dart b/packages/flutter/test/widgets/animated_positioned_test.dart
similarity index 100%
rename from packages/flutter/test/widget/animated_positioned_test.dart
rename to packages/flutter/test/widgets/animated_positioned_test.dart
diff --git a/packages/flutter/test/widget/animated_size_test.dart b/packages/flutter/test/widgets/animated_size_test.dart
similarity index 100%
rename from packages/flutter/test/widget/animated_size_test.dart
rename to packages/flutter/test/widgets/animated_size_test.dart
diff --git a/packages/flutter/test/widget/aspect_ratio_test.dart b/packages/flutter/test/widgets/aspect_ratio_test.dart
similarity index 100%
rename from packages/flutter/test/widget/aspect_ratio_test.dart
rename to packages/flutter/test/widgets/aspect_ratio_test.dart
diff --git a/packages/flutter/test/widget/banner_test.dart b/packages/flutter/test/widgets/banner_test.dart
similarity index 100%
rename from packages/flutter/test/widget/banner_test.dart
rename to packages/flutter/test/widgets/banner_test.dart
diff --git a/packages/flutter/test/widget/block_test.dart b/packages/flutter/test/widgets/block_test.dart
similarity index 100%
rename from packages/flutter/test/widget/block_test.dart
rename to packages/flutter/test/widgets/block_test.dart
diff --git a/packages/flutter/test/widget/bottom_sheet_rebuild_test.dart b/packages/flutter/test/widgets/bottom_sheet_rebuild_test.dart
similarity index 100%
rename from packages/flutter/test/widget/bottom_sheet_rebuild_test.dart
rename to packages/flutter/test/widgets/bottom_sheet_rebuild_test.dart
diff --git a/packages/flutter/test/widget/bottom_sheet_test.dart b/packages/flutter/test/widgets/bottom_sheet_test.dart
similarity index 100%
rename from packages/flutter/test/widget/bottom_sheet_test.dart
rename to packages/flutter/test/widgets/bottom_sheet_test.dart
diff --git a/packages/flutter/test/widget/box_decoration_test.dart b/packages/flutter/test/widgets/box_decoration_test.dart
similarity index 100%
rename from packages/flutter/test/widget/box_decoration_test.dart
rename to packages/flutter/test/widgets/box_decoration_test.dart
diff --git a/packages/flutter/test/widget/build_scope_test.dart b/packages/flutter/test/widgets/build_scope_test.dart
similarity index 100%
rename from packages/flutter/test/widget/build_scope_test.dart
rename to packages/flutter/test/widgets/build_scope_test.dart
diff --git a/packages/flutter/test/widget/buttons_test.dart b/packages/flutter/test/widgets/buttons_test.dart
similarity index 100%
rename from packages/flutter/test/widget/buttons_test.dart
rename to packages/flutter/test/widgets/buttons_test.dart
diff --git a/packages/flutter/test/widget/center_test.dart b/packages/flutter/test/widgets/center_test.dart
similarity index 100%
rename from packages/flutter/test/widget/center_test.dart
rename to packages/flutter/test/widgets/center_test.dart
diff --git a/packages/flutter/test/widget/clamp_overscrolls_test.dart b/packages/flutter/test/widgets/clamp_overscrolls_test.dart
similarity index 100%
rename from packages/flutter/test/widget/clamp_overscrolls_test.dart
rename to packages/flutter/test/widgets/clamp_overscrolls_test.dart
diff --git a/packages/flutter/test/widget/clip_test.dart b/packages/flutter/test/widgets/clip_test.dart
similarity index 100%
rename from packages/flutter/test/widget/clip_test.dart
rename to packages/flutter/test/widgets/clip_test.dart
diff --git a/packages/flutter/test/widget/column_test.dart b/packages/flutter/test/widgets/column_test.dart
similarity index 100%
rename from packages/flutter/test/widget/column_test.dart
rename to packages/flutter/test/widgets/column_test.dart
diff --git a/packages/flutter/test/widget/container_test.dart b/packages/flutter/test/widgets/container_test.dart
similarity index 100%
rename from packages/flutter/test/widget/container_test.dart
rename to packages/flutter/test/widgets/container_test.dart
diff --git a/packages/flutter/test/widget/coordinates_test.dart b/packages/flutter/test/widgets/coordinates_test.dart
similarity index 100%
rename from packages/flutter/test/widget/coordinates_test.dart
rename to packages/flutter/test/widgets/coordinates_test.dart
diff --git a/packages/flutter/test/widget/custom_multi_child_layout_test.dart b/packages/flutter/test/widgets/custom_multi_child_layout_test.dart
similarity index 100%
rename from packages/flutter/test/widget/custom_multi_child_layout_test.dart
rename to packages/flutter/test/widgets/custom_multi_child_layout_test.dart
diff --git a/packages/flutter/test/widget/custom_one_child_layout_test.dart b/packages/flutter/test/widgets/custom_one_child_layout_test.dart
similarity index 100%
rename from packages/flutter/test/widget/custom_one_child_layout_test.dart
rename to packages/flutter/test/widgets/custom_one_child_layout_test.dart
diff --git a/packages/flutter/test/widget/custom_paint_test.dart b/packages/flutter/test/widgets/custom_paint_test.dart
similarity index 100%
rename from packages/flutter/test/widget/custom_paint_test.dart
rename to packages/flutter/test/widgets/custom_paint_test.dart
diff --git a/packages/flutter/test/widget/date_picker_test_disabled.dart b/packages/flutter/test/widgets/date_picker_test_disabled.dart
similarity index 100%
rename from packages/flutter/test/widget/date_picker_test_disabled.dart
rename to packages/flutter/test/widgets/date_picker_test_disabled.dart
diff --git a/packages/flutter/test/widget/dismissable_test.dart b/packages/flutter/test/widgets/dismissable_test.dart
similarity index 100%
rename from packages/flutter/test/widget/dismissable_test.dart
rename to packages/flutter/test/widgets/dismissable_test.dart
diff --git a/packages/flutter/test/widget/draggable_test.dart b/packages/flutter/test/widgets/draggable_test.dart
similarity index 100%
rename from packages/flutter/test/widget/draggable_test.dart
rename to packages/flutter/test/widgets/draggable_test.dart
diff --git a/packages/flutter/test/widget/drawer_test.dart b/packages/flutter/test/widgets/drawer_test.dart
similarity index 100%
rename from packages/flutter/test/widget/drawer_test.dart
rename to packages/flutter/test/widgets/drawer_test.dart
diff --git a/packages/flutter/test/widget/duplicate_key_test.dart b/packages/flutter/test/widgets/duplicate_key_test.dart
similarity index 100%
rename from packages/flutter/test/widget/duplicate_key_test.dart
rename to packages/flutter/test/widgets/duplicate_key_test.dart
diff --git a/packages/flutter/test/widget/fitted_box_test.dart b/packages/flutter/test/widgets/fitted_box_test.dart
similarity index 100%
rename from packages/flutter/test/widget/fitted_box_test.dart
rename to packages/flutter/test/widgets/fitted_box_test.dart
diff --git a/packages/flutter/test/widget/flex_test.dart b/packages/flutter/test/widgets/flex_test.dart
similarity index 100%
rename from packages/flutter/test/widget/flex_test.dart
rename to packages/flutter/test/widgets/flex_test.dart
diff --git a/packages/flutter/test/widget/flow_test.dart b/packages/flutter/test/widgets/flow_test.dart
similarity index 100%
rename from packages/flutter/test/widget/flow_test.dart
rename to packages/flutter/test/widgets/flow_test.dart
diff --git a/packages/flutter/test/widget/focus_test.dart b/packages/flutter/test/widgets/focus_test.dart
similarity index 100%
rename from packages/flutter/test/widget/focus_test.dart
rename to packages/flutter/test/widgets/focus_test.dart
diff --git a/packages/flutter/test/widget/form_test.dart b/packages/flutter/test/widgets/form_test.dart
similarity index 100%
rename from packages/flutter/test/widget/form_test.dart
rename to packages/flutter/test/widgets/form_test.dart
diff --git a/packages/flutter/test/widget/fractionally_sized_box_test.dart b/packages/flutter/test/widgets/fractionally_sized_box_test.dart
similarity index 100%
rename from packages/flutter/test/widget/fractionally_sized_box_test.dart
rename to packages/flutter/test/widgets/fractionally_sized_box_test.dart
diff --git a/packages/flutter/test/widget/gesture_detector_test.dart b/packages/flutter/test/widgets/gesture_detector_test.dart
similarity index 100%
rename from packages/flutter/test/widget/gesture_detector_test.dart
rename to packages/flutter/test/widgets/gesture_detector_test.dart
diff --git a/packages/flutter/test/widget/grid_paper_test.dart b/packages/flutter/test/widgets/grid_paper_test.dart
similarity index 100%
rename from packages/flutter/test/widget/grid_paper_test.dart
rename to packages/flutter/test/widgets/grid_paper_test.dart
diff --git a/packages/flutter/test/widget/heroes_test.dart b/packages/flutter/test/widgets/heroes_test.dart
similarity index 100%
rename from packages/flutter/test/widget/heroes_test.dart
rename to packages/flutter/test/widgets/heroes_test.dart
diff --git a/packages/flutter/test/widget/hit_testing_test.dart b/packages/flutter/test/widgets/hit_testing_test.dart
similarity index 100%
rename from packages/flutter/test/widget/hit_testing_test.dart
rename to packages/flutter/test/widgets/hit_testing_test.dart
diff --git a/packages/flutter/test/widget/hyperlink_test.dart b/packages/flutter/test/widgets/hyperlink_test.dart
similarity index 100%
rename from packages/flutter/test/widget/hyperlink_test.dart
rename to packages/flutter/test/widgets/hyperlink_test.dart
diff --git a/packages/flutter/test/widget/icon_test.dart b/packages/flutter/test/widgets/icon_test.dart
similarity index 100%
rename from packages/flutter/test/widget/icon_test.dart
rename to packages/flutter/test/widgets/icon_test.dart
diff --git a/packages/flutter/test/widget/image_resolution_test.dart b/packages/flutter/test/widgets/image_resolution_test.dart
similarity index 100%
rename from packages/flutter/test/widget/image_resolution_test.dart
rename to packages/flutter/test/widgets/image_resolution_test.dart
diff --git a/packages/flutter/test/widget/image_test.dart b/packages/flutter/test/widgets/image_test.dart
similarity index 100%
rename from packages/flutter/test/widget/image_test.dart
rename to packages/flutter/test/widgets/image_test.dart
diff --git a/packages/flutter/test/widget/implicit_animations_test.dart b/packages/flutter/test/widgets/implicit_animations_test.dart
similarity index 100%
rename from packages/flutter/test/widget/implicit_animations_test.dart
rename to packages/flutter/test/widgets/implicit_animations_test.dart
diff --git a/packages/flutter/test/widget/independent_widget_layout_test.dart b/packages/flutter/test/widgets/independent_widget_layout_test.dart
similarity index 100%
rename from packages/flutter/test/widget/independent_widget_layout_test.dart
rename to packages/flutter/test/widgets/independent_widget_layout_test.dart
diff --git a/packages/flutter/test/widget/inherited_test.dart b/packages/flutter/test/widgets/inherited_test.dart
similarity index 100%
rename from packages/flutter/test/widget/inherited_test.dart
rename to packages/flutter/test/widgets/inherited_test.dart
diff --git a/packages/flutter/test/widget/init_state_test.dart b/packages/flutter/test/widgets/init_state_test.dart
similarity index 100%
rename from packages/flutter/test/widget/init_state_test.dart
rename to packages/flutter/test/widgets/init_state_test.dart
diff --git a/packages/flutter/test/widget/input_test.dart b/packages/flutter/test/widgets/input_test.dart
similarity index 100%
rename from packages/flutter/test/widget/input_test.dart
rename to packages/flutter/test/widgets/input_test.dart
diff --git a/packages/flutter/test/widget/layout_builder_and_global_keys_test.dart b/packages/flutter/test/widgets/layout_builder_and_global_keys_test.dart
similarity index 100%
rename from packages/flutter/test/widget/layout_builder_and_global_keys_test.dart
rename to packages/flutter/test/widgets/layout_builder_and_global_keys_test.dart
diff --git a/packages/flutter/test/widget/layout_builder_and_parent_data_test.dart b/packages/flutter/test/widgets/layout_builder_and_parent_data_test.dart
similarity index 100%
rename from packages/flutter/test/widget/layout_builder_and_parent_data_test.dart
rename to packages/flutter/test/widgets/layout_builder_and_parent_data_test.dart
diff --git a/packages/flutter/test/widget/layout_builder_and_state_test.dart b/packages/flutter/test/widgets/layout_builder_and_state_test.dart
similarity index 100%
rename from packages/flutter/test/widget/layout_builder_and_state_test.dart
rename to packages/flutter/test/widgets/layout_builder_and_state_test.dart
diff --git a/packages/flutter/test/widget/layout_builder_mutations_test.dart b/packages/flutter/test/widgets/layout_builder_mutations_test.dart
similarity index 100%
rename from packages/flutter/test/widget/layout_builder_mutations_test.dart
rename to packages/flutter/test/widgets/layout_builder_mutations_test.dart
diff --git a/packages/flutter/test/widget/layout_builder_test.dart b/packages/flutter/test/widgets/layout_builder_test.dart
similarity index 100%
rename from packages/flutter/test/widget/layout_builder_test.dart
rename to packages/flutter/test/widgets/layout_builder_test.dart
diff --git a/packages/flutter/test/widget/lazy_block_fling_test.dart b/packages/flutter/test/widgets/lazy_block_fling_test.dart
similarity index 100%
rename from packages/flutter/test/widget/lazy_block_fling_test.dart
rename to packages/flutter/test/widgets/lazy_block_fling_test.dart
diff --git a/packages/flutter/test/widget/lazy_block_test.dart b/packages/flutter/test/widgets/lazy_block_test.dart
similarity index 100%
rename from packages/flutter/test/widget/lazy_block_test.dart
rename to packages/flutter/test/widgets/lazy_block_test.dart
diff --git a/packages/flutter/test/widget/lazy_block_viewport_test.dart b/packages/flutter/test/widgets/lazy_block_viewport_test.dart
similarity index 100%
rename from packages/flutter/test/widget/lazy_block_viewport_test.dart
rename to packages/flutter/test/widgets/lazy_block_viewport_test.dart
diff --git a/packages/flutter/test/widget/listener_test.dart b/packages/flutter/test/widgets/listener_test.dart
similarity index 100%
rename from packages/flutter/test/widget/listener_test.dart
rename to packages/flutter/test/widgets/listener_test.dart
diff --git a/packages/flutter/test/widget/media_query_test.dart b/packages/flutter/test/widgets/media_query_test.dart
similarity index 100%
rename from packages/flutter/test/widget/media_query_test.dart
rename to packages/flutter/test/widgets/media_query_test.dart
diff --git a/packages/flutter/test/widget/mock_text_input.dart b/packages/flutter/test/widgets/mock_text_input.dart
similarity index 100%
rename from packages/flutter/test/widget/mock_text_input.dart
rename to packages/flutter/test/widgets/mock_text_input.dart
diff --git a/packages/flutter/test/widget/modal_barrier_test.dart b/packages/flutter/test/widgets/modal_barrier_test.dart
similarity index 100%
rename from packages/flutter/test/widget/modal_barrier_test.dart
rename to packages/flutter/test/widgets/modal_barrier_test.dart
diff --git a/packages/flutter/test/widget/multichild_test.dart b/packages/flutter/test/widgets/multichild_test.dart
similarity index 100%
rename from packages/flutter/test/widget/multichild_test.dart
rename to packages/flutter/test/widgets/multichild_test.dart
diff --git a/packages/flutter/test/widget/navigator_test.dart b/packages/flutter/test/widgets/navigator_test.dart
similarity index 100%
rename from packages/flutter/test/widget/navigator_test.dart
rename to packages/flutter/test/widgets/navigator_test.dart
diff --git a/packages/flutter/test/widget/overflow_box_test.dart b/packages/flutter/test/widgets/overflow_box_test.dart
similarity index 100%
rename from packages/flutter/test/widget/overflow_box_test.dart
rename to packages/flutter/test/widgets/overflow_box_test.dart
diff --git a/packages/flutter/test/widget/overlay_test.dart b/packages/flutter/test/widgets/overlay_test.dart
similarity index 100%
rename from packages/flutter/test/widget/overlay_test.dart
rename to packages/flutter/test/widgets/overlay_test.dart
diff --git a/packages/flutter/test/widget/page_forward_transitions_test.dart b/packages/flutter/test/widgets/page_forward_transitions_test.dart
similarity index 100%
rename from packages/flutter/test/widget/page_forward_transitions_test.dart
rename to packages/flutter/test/widgets/page_forward_transitions_test.dart
diff --git a/packages/flutter/test/widget/page_storage_test.dart b/packages/flutter/test/widgets/page_storage_test.dart
similarity index 100%
rename from packages/flutter/test/widget/page_storage_test.dart
rename to packages/flutter/test/widgets/page_storage_test.dart
diff --git a/packages/flutter/test/widget/page_transitions_test.dart b/packages/flutter/test/widgets/page_transitions_test.dart
similarity index 100%
rename from packages/flutter/test/widget/page_transitions_test.dart
rename to packages/flutter/test/widgets/page_transitions_test.dart
diff --git a/packages/flutter/test/widget/pageable_list_test.dart b/packages/flutter/test/widgets/pageable_list_test.dart
similarity index 100%
rename from packages/flutter/test/widget/pageable_list_test.dart
rename to packages/flutter/test/widgets/pageable_list_test.dart
diff --git a/packages/flutter/test/widget/parent_data_test.dart b/packages/flutter/test/widgets/parent_data_test.dart
similarity index 100%
rename from packages/flutter/test/widget/parent_data_test.dart
rename to packages/flutter/test/widgets/parent_data_test.dart
diff --git a/packages/flutter/test/widget/positioned_test.dart b/packages/flutter/test/widgets/positioned_test.dart
similarity index 100%
rename from packages/flutter/test/widget/positioned_test.dart
rename to packages/flutter/test/widgets/positioned_test.dart
diff --git a/packages/flutter/test/widget/raw_keyboard_listener_test.dart b/packages/flutter/test/widgets/raw_keyboard_listener_test.dart
similarity index 100%
rename from packages/flutter/test/widget/raw_keyboard_listener_test.dart
rename to packages/flutter/test/widgets/raw_keyboard_listener_test.dart
diff --git a/packages/flutter/test/widget/reassemble_test.dart b/packages/flutter/test/widgets/reassemble_test.dart
similarity index 100%
rename from packages/flutter/test/widget/reassemble_test.dart
rename to packages/flutter/test/widgets/reassemble_test.dart
diff --git a/packages/flutter/test/widget/remember_scroll_position_test.dart b/packages/flutter/test/widgets/remember_scroll_position_test.dart
similarity index 100%
rename from packages/flutter/test/widget/remember_scroll_position_test.dart
rename to packages/flutter/test/widgets/remember_scroll_position_test.dart
diff --git a/packages/flutter/test/widget/render_object_widget_test.dart b/packages/flutter/test/widgets/render_object_widget_test.dart
similarity index 100%
rename from packages/flutter/test/widget/render_object_widget_test.dart
rename to packages/flutter/test/widgets/render_object_widget_test.dart
diff --git a/packages/flutter/test/widget/reparent_state_harder_test.dart b/packages/flutter/test/widgets/reparent_state_harder_test.dart
similarity index 100%
rename from packages/flutter/test/widget/reparent_state_harder_test.dart
rename to packages/flutter/test/widgets/reparent_state_harder_test.dart
diff --git a/packages/flutter/test/widget/reparent_state_test.dart b/packages/flutter/test/widgets/reparent_state_test.dart
similarity index 100%
rename from packages/flutter/test/widget/reparent_state_test.dart
rename to packages/flutter/test/widgets/reparent_state_test.dart
diff --git a/packages/flutter/test/widget/reparent_state_with_layout_builder_test.dart b/packages/flutter/test/widgets/reparent_state_with_layout_builder_test.dart
similarity index 100%
rename from packages/flutter/test/widget/reparent_state_with_layout_builder_test.dart
rename to packages/flutter/test/widgets/reparent_state_with_layout_builder_test.dart
diff --git a/packages/flutter/test/widget/rotated_box_test.dart b/packages/flutter/test/widgets/rotated_box_test.dart
similarity index 100%
rename from packages/flutter/test/widget/rotated_box_test.dart
rename to packages/flutter/test/widgets/rotated_box_test.dart
diff --git a/packages/flutter/test/widget/routes_test.dart b/packages/flutter/test/widgets/routes_test.dart
similarity index 100%
rename from packages/flutter/test/widget/routes_test.dart
rename to packages/flutter/test/widgets/routes_test.dart
diff --git a/packages/flutter/test/widget/row_test.dart b/packages/flutter/test/widgets/row_test.dart
similarity index 100%
rename from packages/flutter/test/widget/row_test.dart
rename to packages/flutter/test/widgets/row_test.dart
diff --git a/packages/flutter/test/widget/run_app_test.dart b/packages/flutter/test/widgets/run_app_test.dart
similarity index 100%
rename from packages/flutter/test/widget/run_app_test.dart
rename to packages/flutter/test/widgets/run_app_test.dart
diff --git a/packages/flutter/test/widget/scroll_behavior_test.dart b/packages/flutter/test/widgets/scroll_behavior_test.dart
similarity index 100%
rename from packages/flutter/test/widget/scroll_behavior_test.dart
rename to packages/flutter/test/widgets/scroll_behavior_test.dart
diff --git a/packages/flutter/test/widget/scroll_events_test.dart b/packages/flutter/test/widgets/scroll_events_test.dart
similarity index 100%
rename from packages/flutter/test/widget/scroll_events_test.dart
rename to packages/flutter/test/widgets/scroll_events_test.dart
diff --git a/packages/flutter/test/widget/scroll_interaction_test.dart b/packages/flutter/test/widgets/scroll_interaction_test.dart
similarity index 100%
rename from packages/flutter/test/widget/scroll_interaction_test.dart
rename to packages/flutter/test/widgets/scroll_interaction_test.dart
diff --git a/packages/flutter/test/widget/scroll_notification_test.dart b/packages/flutter/test/widgets/scroll_notification_test.dart
similarity index 100%
rename from packages/flutter/test/widget/scroll_notification_test.dart
rename to packages/flutter/test/widgets/scroll_notification_test.dart
diff --git a/packages/flutter/test/widget/scrollable_dispose_test.dart b/packages/flutter/test/widgets/scrollable_dispose_test.dart
similarity index 100%
rename from packages/flutter/test/widget/scrollable_dispose_test.dart
rename to packages/flutter/test/widgets/scrollable_dispose_test.dart
diff --git a/packages/flutter/test/widget/scrollable_fling_test.dart b/packages/flutter/test/widgets/scrollable_fling_test.dart
similarity index 100%
rename from packages/flutter/test/widget/scrollable_fling_test.dart
rename to packages/flutter/test/widgets/scrollable_fling_test.dart
diff --git a/packages/flutter/test/widget/scrollable_grid_test.dart b/packages/flutter/test/widgets/scrollable_grid_test.dart
similarity index 100%
rename from packages/flutter/test/widget/scrollable_grid_test.dart
rename to packages/flutter/test/widgets/scrollable_grid_test.dart
diff --git a/packages/flutter/test/widget/scrollable_lazy_list_test.dart b/packages/flutter/test/widgets/scrollable_lazy_list_test.dart
similarity index 100%
rename from packages/flutter/test/widget/scrollable_lazy_list_test.dart
rename to packages/flutter/test/widgets/scrollable_lazy_list_test.dart
diff --git a/packages/flutter/test/widget/scrollable_list_hit_testing_test.dart b/packages/flutter/test/widgets/scrollable_list_hit_testing_test.dart
similarity index 100%
rename from packages/flutter/test/widget/scrollable_list_hit_testing_test.dart
rename to packages/flutter/test/widgets/scrollable_list_hit_testing_test.dart
diff --git a/packages/flutter/test/widget/scrollable_list_horizontal_test.dart b/packages/flutter/test/widgets/scrollable_list_horizontal_test.dart
similarity index 100%
rename from packages/flutter/test/widget/scrollable_list_horizontal_test.dart
rename to packages/flutter/test/widgets/scrollable_list_horizontal_test.dart
diff --git a/packages/flutter/test/widget/scrollable_list_test.dart b/packages/flutter/test/widgets/scrollable_list_test.dart
similarity index 100%
rename from packages/flutter/test/widget/scrollable_list_test.dart
rename to packages/flutter/test/widgets/scrollable_list_test.dart
diff --git a/packages/flutter/test/widget/scrollable_list_vertical_test.dart b/packages/flutter/test/widgets/scrollable_list_vertical_test.dart
similarity index 100%
rename from packages/flutter/test/widget/scrollable_list_vertical_test.dart
rename to packages/flutter/test/widgets/scrollable_list_vertical_test.dart
diff --git a/packages/flutter/test/widget/scrollable_list_with_inherited_test.dart b/packages/flutter/test/widgets/scrollable_list_with_inherited_test.dart
similarity index 100%
rename from packages/flutter/test/widget/scrollable_list_with_inherited_test.dart
rename to packages/flutter/test/widgets/scrollable_list_with_inherited_test.dart
diff --git a/packages/flutter/test/widget/semantics_1_test.dart b/packages/flutter/test/widgets/semantics_1_test.dart
similarity index 100%
rename from packages/flutter/test/widget/semantics_1_test.dart
rename to packages/flutter/test/widgets/semantics_1_test.dart
diff --git a/packages/flutter/test/widget/semantics_2_test.dart b/packages/flutter/test/widgets/semantics_2_test.dart
similarity index 100%
rename from packages/flutter/test/widget/semantics_2_test.dart
rename to packages/flutter/test/widgets/semantics_2_test.dart
diff --git a/packages/flutter/test/widget/semantics_3_test.dart b/packages/flutter/test/widgets/semantics_3_test.dart
similarity index 100%
rename from packages/flutter/test/widget/semantics_3_test.dart
rename to packages/flutter/test/widgets/semantics_3_test.dart
diff --git a/packages/flutter/test/widget/semantics_4_test.dart b/packages/flutter/test/widgets/semantics_4_test.dart
similarity index 100%
rename from packages/flutter/test/widget/semantics_4_test.dart
rename to packages/flutter/test/widgets/semantics_4_test.dart
diff --git a/packages/flutter/test/widget/semantics_5_test.dart b/packages/flutter/test/widgets/semantics_5_test.dart
similarity index 100%
rename from packages/flutter/test/widget/semantics_5_test.dart
rename to packages/flutter/test/widgets/semantics_5_test.dart
diff --git a/packages/flutter/test/widget/semantics_7_test.dart b/packages/flutter/test/widgets/semantics_7_test.dart
similarity index 100%
rename from packages/flutter/test/widget/semantics_7_test.dart
rename to packages/flutter/test/widgets/semantics_7_test.dart
diff --git a/packages/flutter/test/widget/semantics_8_test.dart b/packages/flutter/test/widgets/semantics_8_test.dart
similarity index 100%
rename from packages/flutter/test/widget/semantics_8_test.dart
rename to packages/flutter/test/widgets/semantics_8_test.dart
diff --git a/packages/flutter/test/widget/semantics_debugger_test.dart b/packages/flutter/test/widgets/semantics_debugger_test.dart
similarity index 100%
rename from packages/flutter/test/widget/semantics_debugger_test.dart
rename to packages/flutter/test/widgets/semantics_debugger_test.dart
diff --git a/packages/flutter/test/widget/semantics_test.dart b/packages/flutter/test/widgets/semantics_test.dart
similarity index 100%
rename from packages/flutter/test/widget/semantics_test.dart
rename to packages/flutter/test/widgets/semantics_test.dart
diff --git a/packages/flutter/test/widget/semantics_tester.dart b/packages/flutter/test/widgets/semantics_tester.dart
similarity index 100%
rename from packages/flutter/test/widget/semantics_tester.dart
rename to packages/flutter/test/widgets/semantics_tester.dart
diff --git a/packages/flutter/test/widget/set_state_1_test.dart b/packages/flutter/test/widgets/set_state_1_test.dart
similarity index 100%
rename from packages/flutter/test/widget/set_state_1_test.dart
rename to packages/flutter/test/widgets/set_state_1_test.dart
diff --git a/packages/flutter/test/widget/set_state_2_test.dart b/packages/flutter/test/widgets/set_state_2_test.dart
similarity index 100%
rename from packages/flutter/test/widget/set_state_2_test.dart
rename to packages/flutter/test/widgets/set_state_2_test.dart
diff --git a/packages/flutter/test/widget/set_state_3_test.dart b/packages/flutter/test/widgets/set_state_3_test.dart
similarity index 100%
rename from packages/flutter/test/widget/set_state_3_test.dart
rename to packages/flutter/test/widgets/set_state_3_test.dart
diff --git a/packages/flutter/test/widget/set_state_4_test.dart b/packages/flutter/test/widgets/set_state_4_test.dart
similarity index 100%
rename from packages/flutter/test/widget/set_state_4_test.dart
rename to packages/flutter/test/widgets/set_state_4_test.dart
diff --git a/packages/flutter/test/widget/shader_mask_test.dart b/packages/flutter/test/widgets/shader_mask_test.dart
similarity index 100%
rename from packages/flutter/test/widget/shader_mask_test.dart
rename to packages/flutter/test/widgets/shader_mask_test.dart
diff --git a/packages/flutter/test/widget/size_changed_layout_notification_test.dart b/packages/flutter/test/widgets/size_changed_layout_notification_test.dart
similarity index 100%
rename from packages/flutter/test/widget/size_changed_layout_notification_test.dart
rename to packages/flutter/test/widgets/size_changed_layout_notification_test.dart
diff --git a/packages/flutter/test/widget/snap_scrolling_test.dart b/packages/flutter/test/widgets/snap_scrolling_test.dart
similarity index 100%
rename from packages/flutter/test/widget/snap_scrolling_test.dart
rename to packages/flutter/test/widgets/snap_scrolling_test.dart
diff --git a/packages/flutter/test/widget/stack_test.dart b/packages/flutter/test/widgets/stack_test.dart
similarity index 100%
rename from packages/flutter/test/widget/stack_test.dart
rename to packages/flutter/test/widgets/stack_test.dart
diff --git a/packages/flutter/test/widget/state_setting_in_scrollables_test.dart b/packages/flutter/test/widgets/state_setting_in_scrollables_test.dart
similarity index 100%
rename from packages/flutter/test/widget/state_setting_in_scrollables_test.dart
rename to packages/flutter/test/widgets/state_setting_in_scrollables_test.dart
diff --git a/packages/flutter/test/widget/stateful_component_test.dart b/packages/flutter/test/widgets/stateful_component_test.dart
similarity index 100%
rename from packages/flutter/test/widget/stateful_component_test.dart
rename to packages/flutter/test/widgets/stateful_component_test.dart
diff --git a/packages/flutter/test/widget/stateful_components_test.dart b/packages/flutter/test/widgets/stateful_components_test.dart
similarity index 100%
rename from packages/flutter/test/widget/stateful_components_test.dart
rename to packages/flutter/test/widgets/stateful_components_test.dart
diff --git a/packages/flutter/test/widget/syncing_test.dart b/packages/flutter/test/widgets/syncing_test.dart
similarity index 100%
rename from packages/flutter/test/widget/syncing_test.dart
rename to packages/flutter/test/widgets/syncing_test.dart
diff --git a/packages/flutter/test/widget/table_test.dart b/packages/flutter/test/widgets/table_test.dart
similarity index 100%
rename from packages/flutter/test/widget/table_test.dart
rename to packages/flutter/test/widgets/table_test.dart
diff --git a/packages/flutter/test/widget/test_widgets.dart b/packages/flutter/test/widgets/test_widgets.dart
similarity index 100%
rename from packages/flutter/test/widget/test_widgets.dart
rename to packages/flutter/test/widgets/test_widgets.dart
diff --git a/packages/flutter/test/widget/text_test.dart b/packages/flutter/test/widgets/text_test.dart
similarity index 100%
rename from packages/flutter/test/widget/text_test.dart
rename to packages/flutter/test/widgets/text_test.dart
diff --git a/packages/flutter/test/widget/ticker_provider_test.dart b/packages/flutter/test/widgets/ticker_provider_test.dart
similarity index 100%
rename from packages/flutter/test/widget/ticker_provider_test.dart
rename to packages/flutter/test/widgets/ticker_provider_test.dart
diff --git a/packages/flutter/test/widget/transform_test.dart b/packages/flutter/test/widgets/transform_test.dart
similarity index 100%
rename from packages/flutter/test/widget/transform_test.dart
rename to packages/flutter/test/widgets/transform_test.dart