Refactor test/shared/ tests to match shared/ directory structure (#8588)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 9d209c6..9e614ef 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json

@@ -1,5 +1,5 @@
 {
     // Set current working directory to devtools_app.
-    "terminal.integrated.cwd": "devtools_app",
+    "terminal.integrated.cwd": "packages/devtools_app",
     "dart.showTodos": false,
 }

diff --git a/packages/devtools_app/lib/src/screens/debugger/program_explorer.dart b/packages/devtools_app/lib/src/screens/debugger/program_explorer.dart
index 39df098..3074b18 100644
--- a/packages/devtools_app/lib/src/screens/debugger/program_explorer.dart
+++ b/packages/devtools_app/lib/src/screens/debugger/program_explorer.dart

@@ -12,9 +12,9 @@
 
 import '../../shared/globals.dart';
 import '../../shared/primitives/utils.dart';
-import '../../shared/tree.dart';
 import '../../shared/ui/colors.dart';
 import '../../shared/ui/common_widgets.dart';
+import '../../shared/ui/tree_view.dart';
 import 'program_explorer_controller.dart';
 import 'program_explorer_model.dart';
 

diff --git a/packages/devtools_app/lib/src/screens/debugger/variables.dart b/packages/devtools_app/lib/src/screens/debugger/variables.dart
index 0a090a5..de9b07f 100644
--- a/packages/devtools_app/lib/src/screens/debugger/variables.dart
+++ b/packages/devtools_app/lib/src/screens/debugger/variables.dart

@@ -16,7 +16,7 @@
 import '../../shared/diagnostics/tree_builder.dart';
 import '../../shared/feature_flags.dart';
 import '../../shared/globals.dart';
-import '../../shared/tree.dart';
+import '../../shared/ui/tree_view.dart';
 
 class Variables extends StatelessWidget {
   const Variables({super.key});

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/class_hierarchy_explorer.dart b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/class_hierarchy_explorer.dart
index a1493b4..85e8511 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/class_hierarchy_explorer.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/class_hierarchy_explorer.dart

@@ -4,8 +4,8 @@
 
 import 'package:flutter/material.dart';
 
-import '../../../shared/tree.dart';
 import '../../../shared/ui/common_widgets.dart';
+import '../../../shared/ui/tree_view.dart';
 import '../vm_developer_common_widgets.dart';
 import 'class_hierarchy_explorer_controller.dart';
 import 'object_inspector_view_controller.dart';

diff --git a/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_common_widgets.dart b/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_common_widgets.dart
index b4917f2..aedee03 100644
--- a/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_common_widgets.dart
+++ b/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_common_widgets.dart

@@ -16,8 +16,8 @@
 import '../../shared/globals.dart';
 import '../../shared/primitives/byte_utils.dart';
 import '../../shared/primitives/utils.dart';
-import '../../shared/tree.dart';
 import '../../shared/ui/common_widgets.dart';
+import '../../shared/ui/tree_view.dart';
 import '../debugger/codeview.dart';
 import '../debugger/codeview_controller.dart';
 import '../debugger/debugger_model.dart';

diff --git a/packages/devtools_app/lib/src/shared/console/widgets/expandable_variable.dart b/packages/devtools_app/lib/src/shared/console/widgets/expandable_variable.dart
index 1dd9acc..9800fa0 100644
--- a/packages/devtools_app/lib/src/shared/console/widgets/expandable_variable.dart
+++ b/packages/devtools_app/lib/src/shared/console/widgets/expandable_variable.dart

@@ -7,9 +7,9 @@
 import 'package:flutter/material.dart' hide Stack;
 
 import '../../../shared/primitives/listenable.dart';
-import '../../../shared/tree.dart';
 import '../../diagnostics/dart_object_node.dart';
 import '../../diagnostics/tree_builder.dart';
+import '../../ui/tree_view.dart';
 import 'display_provider.dart';
 
 class ExpandableVariable extends StatelessWidget {

diff --git a/packages/devtools_app/lib/src/utils/list_queue_value_notifier.dart b/packages/devtools_app/lib/src/shared/primitives/list_queue_value_notifier.dart
similarity index 100%
rename from packages/devtools_app/lib/src/utils/list_queue_value_notifier.dart
rename to packages/devtools_app/lib/src/shared/primitives/list_queue_value_notifier.dart


diff --git a/packages/devtools_app/lib/src/shared/tree.dart b/packages/devtools_app/lib/src/shared/ui/tree_view.dart
similarity index 98%
rename from packages/devtools_app/lib/src/shared/tree.dart
rename to packages/devtools_app/lib/src/shared/ui/tree_view.dart
index 081e89d..1f3d061 100644
--- a/packages/devtools_app/lib/src/shared/tree.dart
+++ b/packages/devtools_app/lib/src/shared/ui/tree_view.dart

@@ -9,8 +9,8 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart' hide Stack;
 
-import 'primitives/collapsible_mixin.dart';
-import 'primitives/trees.dart';
+import '../primitives/collapsible_mixin.dart';
+import '../primitives/trees.dart';
 
 double get defaultTreeViewRowHeight => scaleByFontFactor(20.0);
 

diff --git a/packages/devtools_app/test/shared/disconnect_observer_test.dart b/packages/devtools_app/test/framework/disconnect_observer_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/disconnect_observer_test.dart
rename to packages/devtools_app/test/framework/disconnect_observer_test.dart


diff --git a/packages/devtools_app/test/shared/home_screen_test.dart b/packages/devtools_app/test/framework/home_screen_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/home_screen_test.dart
rename to packages/devtools_app/test/framework/home_screen_test.dart


diff --git a/packages/devtools_app/test/shared/initializer_test.dart b/packages/devtools_app/test/framework/initializer_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/initializer_test.dart
rename to packages/devtools_app/test/framework/initializer_test.dart


diff --git a/packages/devtools_app/test/shared/notifications_test.dart b/packages/devtools_app/test/framework/notifications_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/notifications_test.dart
rename to packages/devtools_app/test/framework/notifications_test.dart


diff --git a/packages/devtools_app/test/shared/release_notes_test.dart b/packages/devtools_app/test/framework/release_notes_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/release_notes_test.dart
rename to packages/devtools_app/test/framework/release_notes_test.dart


diff --git a/packages/devtools_app/test/shared/about_dialog_test.dart b/packages/devtools_app/test/framework/scaffold/about_dialog_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/about_dialog_test.dart
rename to packages/devtools_app/test/framework/scaffold/about_dialog_test.dart


diff --git a/packages/devtools_app/test/shared/scaffold_debugger_test.dart b/packages/devtools_app/test/framework/scaffold/scaffold_debugger_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/scaffold_debugger_test.dart
rename to packages/devtools_app/test/framework/scaffold/scaffold_debugger_test.dart


diff --git a/packages/devtools_app/test/shared/scaffold_debugging_controls_test.dart b/packages/devtools_app/test/framework/scaffold/scaffold_debugging_controls_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/scaffold_debugging_controls_test.dart
rename to packages/devtools_app/test/framework/scaffold/scaffold_debugging_controls_test.dart


diff --git a/packages/devtools_app/test/shared/scaffold_no_app_test.dart b/packages/devtools_app/test/framework/scaffold/scaffold_no_app_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/scaffold_no_app_test.dart
rename to packages/devtools_app/test/framework/scaffold/scaffold_no_app_test.dart


diff --git a/packages/devtools_app/test/shared/scaffold_profile_test.dart b/packages/devtools_app/test/framework/scaffold/scaffold_profile_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/scaffold_profile_test.dart
rename to packages/devtools_app/test/framework/scaffold/scaffold_profile_test.dart


diff --git a/packages/devtools_app/test/shared/scaffold_test.dart b/packages/devtools_app/test/framework/scaffold/scaffold_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/scaffold_test.dart
rename to packages/devtools_app/test/framework/scaffold/scaffold_test.dart


diff --git a/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/arrow_bidirectional_horizontal.png b/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/arrow_bidirectional_horizontal.png
deleted file mode 100644
index d4db9f0..0000000
--- a/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/arrow_bidirectional_horizontal.png
+++ /dev/null
Binary files differ

diff --git a/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/arrow_bidirectional_vertical.png b/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/arrow_bidirectional_vertical.png
deleted file mode 100644
index dd855d2..0000000
--- a/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/arrow_bidirectional_vertical.png
+++ /dev/null
Binary files differ

diff --git a/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/arrow_unidirectional_down.png b/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/arrow_unidirectional_down.png
deleted file mode 100644
index 6e864b5..0000000
--- a/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/arrow_unidirectional_down.png
+++ /dev/null
Binary files differ

diff --git a/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/arrow_unidirectional_left.png b/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/arrow_unidirectional_left.png
deleted file mode 100644
index ad28c36..0000000
--- a/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/arrow_unidirectional_left.png
+++ /dev/null
Binary files differ

diff --git a/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/arrow_unidirectional_right.png b/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/arrow_unidirectional_right.png
deleted file mode 100644
index aca9379..0000000
--- a/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/arrow_unidirectional_right.png
+++ /dev/null
Binary files differ

diff --git a/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/arrow_unidirectional_up.png b/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/arrow_unidirectional_up.png
deleted file mode 100644
index d3f2615..0000000
--- a/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/arrow_unidirectional_up.png
+++ /dev/null
Binary files differ

diff --git a/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/story_of_column_layout.png b/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/story_of_column_layout.png
deleted file mode 100644
index b900850..0000000
--- a/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/story_of_column_layout.png
+++ /dev/null
Binary files differ

diff --git a/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/story_of_row_layout.png b/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/story_of_row_layout.png
deleted file mode 100644
index a2ac431..0000000
--- a/packages/devtools_app/test/inspector_v2/layout_explorer/flex/goldens/story_of_row_layout.png
+++ /dev/null
Binary files differ

diff --git a/packages/devtools_app/test/app_size/app_size_screen_test.dart b/packages/devtools_app/test/screens/app_size/app_size_screen_test.dart
similarity index 97%
rename from packages/devtools_app/test/app_size/app_size_screen_test.dart
rename to packages/devtools_app/test/screens/app_size/app_size_screen_test.dart
index dfdb3b2..031f21a 100644
--- a/packages/devtools_app/test/app_size/app_size_screen_test.dart
+++ b/packages/devtools_app/test/screens/app_size/app_size_screen_test.dart

@@ -16,13 +16,13 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
-import '../test_infra/test_data/app_size/deferred_app.dart';
-import '../test_infra/test_data/app_size/diff_deferred_app.dart';
-import '../test_infra/test_data/app_size/diff_no_deferred_app.dart';
-import '../test_infra/test_data/app_size/new_v8.dart';
-import '../test_infra/test_data/app_size/old_v8.dart';
-import '../test_infra/test_data/app_size/sizes.dart';
-import '../test_infra/test_data/app_size/unsupported_file.dart';
+import '../../test_infra/test_data/app_size/deferred_app.dart';
+import '../../test_infra/test_data/app_size/diff_deferred_app.dart';
+import '../../test_infra/test_data/app_size/diff_no_deferred_app.dart';
+import '../../test_infra/test_data/app_size/new_v8.dart';
+import '../../test_infra/test_data/app_size/old_v8.dart';
+import '../../test_infra/test_data/app_size/sizes.dart';
+import '../../test_infra/test_data/app_size/unsupported_file.dart';
 
 void main() {
   setUp(() {

diff --git a/packages/devtools_app/test/app_size/code_size_attribution_test.dart b/packages/devtools_app/test/screens/app_size/code_size_attribution_test.dart
similarity index 98%
rename from packages/devtools_app/test/app_size/code_size_attribution_test.dart
rename to packages/devtools_app/test/screens/app_size/code_size_attribution_test.dart
index 1e5d821..ab96db9 100644
--- a/packages/devtools_app/test/app_size/code_size_attribution_test.dart
+++ b/packages/devtools_app/test/screens/app_size/code_size_attribution_test.dart

@@ -14,7 +14,7 @@
 import 'package:vm_snapshot_analysis/precompiler_trace.dart';
 import 'package:vm_snapshot_analysis/program_info.dart';
 
-import '../test_infra/test_data/app_size/precompiler_trace.dart';
+import '../../test_infra/test_data/app_size/precompiler_trace.dart';
 
 void main() {
   late CallGraph callGraph;

diff --git a/packages/devtools_app/test/cpu_profiler/cpu_profile_model_test.dart b/packages/devtools_app/test/screens/cpu_profiler/cpu_profile_model_test.dart
similarity index 99%
rename from packages/devtools_app/test/cpu_profiler/cpu_profile_model_test.dart
rename to packages/devtools_app/test/screens/cpu_profiler/cpu_profile_model_test.dart
index 9cf54c9..0f77190 100644
--- a/packages/devtools_app/test/cpu_profiler/cpu_profile_model_test.dart
+++ b/packages/devtools_app/test/screens/cpu_profiler/cpu_profile_model_test.dart

@@ -10,7 +10,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_infra/test_data/cpu_profiler/cpu_profile.dart';
+import '../../test_infra/test_data/cpu_profiler/cpu_profile.dart';
 
 void main() {
   group('CpuProfileData', () {

diff --git a/packages/devtools_app/test/cpu_profiler/cpu_profile_transformer_test.dart b/packages/devtools_app/test/screens/cpu_profiler/cpu_profile_transformer_test.dart
similarity index 98%
rename from packages/devtools_app/test/cpu_profiler/cpu_profile_transformer_test.dart
rename to packages/devtools_app/test/screens/cpu_profiler/cpu_profile_transformer_test.dart
index 52a31ca..23e697f 100644
--- a/packages/devtools_app/test/cpu_profiler/cpu_profile_transformer_test.dart
+++ b/packages/devtools_app/test/screens/cpu_profiler/cpu_profile_transformer_test.dart

@@ -7,7 +7,7 @@
 import 'package:devtools_app/src/shared/utils/profiler_utils.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../test_infra/test_data/cpu_profiler/cpu_profile.dart';
+import '../../test_infra/test_data/cpu_profiler/cpu_profile.dart';
 
 void main() {
   group('CpuProfileTransformer', () {

diff --git a/packages/devtools_app/test/cpu_profiler/cpu_profiler_controller_test.dart b/packages/devtools_app/test/screens/cpu_profiler/cpu_profiler_controller_test.dart
similarity index 99%
rename from packages/devtools_app/test/cpu_profiler/cpu_profiler_controller_test.dart
rename to packages/devtools_app/test/screens/cpu_profiler/cpu_profiler_controller_test.dart
index 58ace8a..c57f244 100644
--- a/packages/devtools_app/test/cpu_profiler/cpu_profiler_controller_test.dart
+++ b/packages/devtools_app/test/screens/cpu_profiler/cpu_profiler_controller_test.dart

@@ -12,7 +12,7 @@
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_infra/test_data/cpu_profiler/cpu_profile.dart';
+import '../../test_infra/test_data/cpu_profiler/cpu_profile.dart';
 
 void main() {
   late ServiceConnectionManager fakeServiceManager;

diff --git a/packages/devtools_app/test/cpu_profiler/cpu_profiler_test.dart b/packages/devtools_app/test/screens/cpu_profiler/cpu_profiler_test.dart
similarity index 99%
rename from packages/devtools_app/test/cpu_profiler/cpu_profiler_test.dart
rename to packages/devtools_app/test/screens/cpu_profiler/cpu_profiler_test.dart
index 5a5eca0..338b143 100644
--- a/packages/devtools_app/test/cpu_profiler/cpu_profiler_test.dart
+++ b/packages/devtools_app/test/screens/cpu_profiler/cpu_profiler_test.dart

@@ -23,8 +23,8 @@
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_infra/test_data/cpu_profiler/cpu_profile.dart';
-import '../test_infra/utils/test_utils.dart';
+import '../../test_infra/test_data/cpu_profiler/cpu_profile.dart';
+import '../../test_infra/utils/test_utils.dart';
 
 void main() {
   late CpuProfiler cpuProfiler;

diff --git a/packages/devtools_app/test/cpu_profiler/method_table/method_table_controller_test.dart b/packages/devtools_app/test/screens/cpu_profiler/method_table/method_table_controller_test.dart
similarity index 97%
rename from packages/devtools_app/test/cpu_profiler/method_table/method_table_controller_test.dart
rename to packages/devtools_app/test/screens/cpu_profiler/method_table/method_table_controller_test.dart
index 76592c3..eff216c 100644
--- a/packages/devtools_app/test/cpu_profiler/method_table/method_table_controller_test.dart
+++ b/packages/devtools_app/test/screens/cpu_profiler/method_table/method_table_controller_test.dart

@@ -9,8 +9,8 @@
 import 'package:devtools_app/src/screens/profiler/panes/method_table/method_table_model.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../test_infra/test_data/cpu_profiler/simple_profile_1.dart';
-import '../../test_infra/test_data/cpu_profiler/simple_profile_2.dart';
+import '../../../test_infra/test_data/cpu_profiler/simple_profile_1.dart';
+import '../../../test_infra/test_data/cpu_profiler/simple_profile_2.dart';
 
 void main() {
   group('$MethodTableController', () {

diff --git a/packages/devtools_app/test/cpu_profiler/method_table/method_table_model_test.dart b/packages/devtools_app/test/screens/cpu_profiler/method_table/method_table_model_test.dart
similarity index 100%
rename from packages/devtools_app/test/cpu_profiler/method_table/method_table_model_test.dart
rename to packages/devtools_app/test/screens/cpu_profiler/method_table/method_table_model_test.dart


diff --git a/packages/devtools_app/test/cpu_profiler/method_table/method_table_test.dart b/packages/devtools_app/test/screens/cpu_profiler/method_table/method_table_test.dart
similarity index 90%
rename from packages/devtools_app/test/cpu_profiler/method_table/method_table_test.dart
rename to packages/devtools_app/test/screens/cpu_profiler/method_table/method_table_test.dart
index dd59c16..8595b80 100644
--- a/packages/devtools_app/test/cpu_profiler/method_table/method_table_test.dart
+++ b/packages/devtools_app/test/screens/cpu_profiler/method_table/method_table_test.dart

@@ -17,9 +17,9 @@
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../../test_infra/matchers/matchers.dart';
-import '../../test_infra/test_data/cpu_profiler/simple_profile_2.dart';
-import '../../test_infra/utils/test_utils.dart';
+import '../../../test_infra/matchers/matchers.dart';
+import '../../../test_infra/test_data/cpu_profiler/simple_profile_2.dart';
+import '../../../test_infra/utils/test_utils.dart';
 
 void main() {
   late MethodTableController methodTableController;
@@ -78,7 +78,7 @@
       await expectLater(
         find.byType(CpuMethodTable),
         matchesDevToolsGolden(
-          '../../test_infra/goldens/cpu_profiler/method_table_no_selection.png',
+          '../../../test_infra/goldens/cpu_profiler/method_table_no_selection.png',
         ),
       );
     });
@@ -110,7 +110,7 @@
       await expectLater(
         find.byType(CpuMethodTable),
         matchesDevToolsGolden(
-          '../../test_infra/goldens/cpu_profiler/method_table_with_selection.png',
+          '../../../test_infra/goldens/cpu_profiler/method_table_with_selection.png',
         ),
       );
 
@@ -120,7 +120,7 @@
       await expectLater(
         find.byType(CpuMethodTable),
         matchesDevToolsGolden(
-          '../../test_infra/goldens/cpu_profiler/method_table_with_selection_2.png',
+          '../../../test_infra/goldens/cpu_profiler/method_table_with_selection_2.png',
         ),
       );
     });

diff --git a/packages/devtools_app/test/cpu_profiler/profiler_screen_controller_test.dart b/packages/devtools_app/test/screens/cpu_profiler/profiler_screen_controller_test.dart
similarity index 100%
rename from packages/devtools_app/test/cpu_profiler/profiler_screen_controller_test.dart
rename to packages/devtools_app/test/screens/cpu_profiler/profiler_screen_controller_test.dart


diff --git a/packages/devtools_app/test/cpu_profiler/profiler_screen_test.dart b/packages/devtools_app/test/screens/cpu_profiler/profiler_screen_test.dart
similarity index 96%
rename from packages/devtools_app/test/cpu_profiler/profiler_screen_test.dart
rename to packages/devtools_app/test/screens/cpu_profiler/profiler_screen_test.dart
index 7edcac6..fa6d5b4 100644
--- a/packages/devtools_app/test/cpu_profiler/profiler_screen_test.dart
+++ b/packages/devtools_app/test/screens/cpu_profiler/profiler_screen_test.dart

@@ -14,9 +14,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../test_infra/scenes/cpu_profiler/default.dart';
-import '../test_infra/scenes/scene_test_extensions.dart';
-import '../test_infra/utils/test_utils.dart';
+import '../../test_infra/scenes/cpu_profiler/default.dart';
+import '../../test_infra/scenes/scene_test_extensions.dart';
+import '../../test_infra/utils/test_utils.dart';
 
 void main() {
   late CpuProfilerDefaultScene scene;

diff --git a/packages/devtools_app/test/debugger/association_variable_test.dart b/packages/devtools_app/test/screens/debugger/association_variable_test.dart
similarity index 100%
rename from packages/devtools_app/test/debugger/association_variable_test.dart
rename to packages/devtools_app/test/screens/debugger/association_variable_test.dart


diff --git a/packages/devtools_app/test/debugger/debugger_codeview_statistics_test.dart b/packages/devtools_app/test/screens/debugger/debugger_codeview_statistics_test.dart
similarity index 100%
rename from packages/devtools_app/test/debugger/debugger_codeview_statistics_test.dart
rename to packages/devtools_app/test/screens/debugger/debugger_codeview_statistics_test.dart


diff --git a/packages/devtools_app/test/debugger/debugger_codeview_test.dart b/packages/devtools_app/test/screens/debugger/debugger_codeview_test.dart
similarity index 97%
rename from packages/devtools_app/test/debugger/debugger_codeview_test.dart
rename to packages/devtools_app/test/screens/debugger/debugger_codeview_test.dart
index 263b2fb..814d526 100644
--- a/packages/devtools_app/test/debugger/debugger_codeview_test.dart
+++ b/packages/devtools_app/test/screens/debugger/debugger_codeview_test.dart

@@ -15,7 +15,7 @@
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_infra/matchers/matchers.dart';
+import '../../test_infra/matchers/matchers.dart';
 
 void main() {
   const mockScriptRefFileUri = 'the/path/mapped/to/script/ref/uri';
@@ -109,7 +109,9 @@
       );
       await expectLater(
         find.byType(CodeView),
-        matchesDevToolsGolden('../test_infra/goldens/codeview_scrollbars.png'),
+        matchesDevToolsGolden(
+          '../../test_infra/goldens/codeview_scrollbars.png',
+        ),
       );
     },
   );

diff --git a/packages/devtools_app/test/debugger/debugger_console_test.dart b/packages/devtools_app/test/screens/debugger/debugger_console_test.dart
similarity index 98%
rename from packages/devtools_app/test/debugger/debugger_console_test.dart
rename to packages/devtools_app/test/screens/debugger/debugger_console_test.dart
index 0e0294e..ed5501b 100644
--- a/packages/devtools_app/test/debugger/debugger_console_test.dart
+++ b/packages/devtools_app/test/screens/debugger/debugger_console_test.dart

@@ -14,7 +14,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
-import '../test_infra/utils/test_utils.dart';
+import '../../test_infra/utils/test_utils.dart';
 
 void main() {
   final fakeServiceConnection = FakeServiceConnectionManager();

diff --git a/packages/devtools_app/test/debugger/debugger_controller_stdio_test.dart b/packages/devtools_app/test/screens/debugger/debugger_controller_stdio_test.dart
similarity index 100%
rename from packages/devtools_app/test/debugger/debugger_controller_stdio_test.dart
rename to packages/devtools_app/test/screens/debugger/debugger_controller_stdio_test.dart


diff --git a/packages/devtools_app/test/debugger/debugger_controller_test.dart b/packages/devtools_app/test/screens/debugger/debugger_controller_test.dart
similarity index 100%
rename from packages/devtools_app/test/debugger/debugger_controller_test.dart
rename to packages/devtools_app/test/screens/debugger/debugger_controller_test.dart


diff --git a/packages/devtools_app/test/debugger/debugger_evaluation_test.dart b/packages/devtools_app/test/screens/debugger/debugger_evaluation_test.dart
similarity index 97%
rename from packages/devtools_app/test/debugger/debugger_evaluation_test.dart
rename to packages/devtools_app/test/screens/debugger/debugger_evaluation_test.dart
index c717afc..0351e35 100644
--- a/packages/devtools_app/test/debugger/debugger_evaluation_test.dart
+++ b/packages/devtools_app/test/screens/debugger/debugger_evaluation_test.dart

@@ -11,9 +11,9 @@
 import 'package:devtools_test/helpers.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../test_infra/flutter_test_driver.dart';
-import '../test_infra/flutter_test_environment.dart';
-import '../test_infra/flutter_test_storage.dart';
+import '../../test_infra/flutter_test_driver.dart';
+import '../../test_infra/flutter_test_environment.dart';
+import '../../test_infra/flutter_test_storage.dart';
 
 void main() {
   setGlobal(Storage, FlutterTestStorage());

diff --git a/packages/devtools_app/test/debugger/debugger_floating_test.dart b/packages/devtools_app/test/screens/debugger/debugger_floating_test.dart
similarity index 100%
rename from packages/devtools_app/test/debugger/debugger_floating_test.dart
rename to packages/devtools_app/test/screens/debugger/debugger_floating_test.dart


diff --git a/packages/devtools_app/test/debugger/debugger_screen_breakpoints_test.dart b/packages/devtools_app/test/screens/debugger/debugger_screen_breakpoints_test.dart
similarity index 100%
rename from packages/devtools_app/test/debugger/debugger_screen_breakpoints_test.dart
rename to packages/devtools_app/test/screens/debugger/debugger_screen_breakpoints_test.dart


diff --git a/packages/devtools_app/test/debugger/debugger_screen_call_stack_test.dart b/packages/devtools_app/test/screens/debugger/debugger_screen_call_stack_test.dart
similarity index 100%
rename from packages/devtools_app/test/debugger/debugger_screen_call_stack_test.dart
rename to packages/devtools_app/test/screens/debugger/debugger_screen_call_stack_test.dart


diff --git a/packages/devtools_app/test/debugger/debugger_screen_dap_variables_test.dart b/packages/devtools_app/test/screens/debugger/debugger_screen_dap_variables_test.dart
similarity index 100%
rename from packages/devtools_app/test/debugger/debugger_screen_dap_variables_test.dart
rename to packages/devtools_app/test/screens/debugger/debugger_screen_dap_variables_test.dart


diff --git a/packages/devtools_app/test/debugger/debugger_screen_explorer_visibility_test.dart b/packages/devtools_app/test/screens/debugger/debugger_screen_explorer_visibility_test.dart
similarity index 100%
rename from packages/devtools_app/test/debugger/debugger_screen_explorer_visibility_test.dart
rename to packages/devtools_app/test/screens/debugger/debugger_screen_explorer_visibility_test.dart


diff --git a/packages/devtools_app/test/debugger/debugger_screen_paused_test.dart b/packages/devtools_app/test/screens/debugger/debugger_screen_paused_test.dart
similarity index 98%
rename from packages/devtools_app/test/debugger/debugger_screen_paused_test.dart
rename to packages/devtools_app/test/screens/debugger/debugger_screen_paused_test.dart
index 897c4f2..18a327f 100644
--- a/packages/devtools_app/test/debugger/debugger_screen_paused_test.dart
+++ b/packages/devtools_app/test/screens/debugger/debugger_screen_paused_test.dart

@@ -16,8 +16,8 @@
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_infra/utils/debugger_utils.dart';
-import '../test_infra/utils/test_utils.dart';
+import '../../test_infra/utils/debugger_utils.dart';
+import '../../test_infra/utils/test_utils.dart';
 
 void main() {
   const windowSize = Size(2500.0, 1200.0);

diff --git a/packages/devtools_app/test/debugger/debugger_screen_test.dart b/packages/devtools_app/test/screens/debugger/debugger_screen_test.dart
similarity index 96%
rename from packages/devtools_app/test/debugger/debugger_screen_test.dart
rename to packages/devtools_app/test/screens/debugger/debugger_screen_test.dart
index de473d5..7664671 100644
--- a/packages/devtools_app/test/debugger/debugger_screen_test.dart
+++ b/packages/devtools_app/test/screens/debugger/debugger_screen_test.dart

@@ -16,10 +16,10 @@
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_infra/test_data/debugger/vm_service_object_tree.dart';
-import '../test_infra/utils/debugger_utils.dart';
-import '../test_infra/utils/test_utils.dart';
-import '../test_infra/utils/tree_utils.dart';
+import '../../test_infra/test_data/debugger/vm_service_object_tree.dart';
+import '../../test_infra/utils/debugger_utils.dart';
+import '../../test_infra/utils/test_utils.dart';
+import '../../test_infra/utils/tree_utils.dart';
 
 void main() {
   final screen = DebuggerScreen();

diff --git a/packages/devtools_app/test/debugger/debugger_screen_variables_test.dart b/packages/devtools_app/test/screens/debugger/debugger_screen_variables_test.dart
similarity index 98%
rename from packages/devtools_app/test/debugger/debugger_screen_variables_test.dart
rename to packages/devtools_app/test/screens/debugger/debugger_screen_variables_test.dart
index fc652d2..74838ed 100644
--- a/packages/devtools_app/test/debugger/debugger_screen_variables_test.dart
+++ b/packages/devtools_app/test/screens/debugger/debugger_screen_variables_test.dart

@@ -12,7 +12,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
-import '../test_infra/utils/variable_utils.dart';
+import '../../test_infra/utils/variable_utils.dart';
 
 void main() {
   late FakeServiceConnectionManager fakeServiceConnection;

diff --git a/packages/devtools_app/test/debugger/debugger_scripts_test.dart b/packages/devtools_app/test/screens/debugger/debugger_scripts_test.dart
similarity index 99%
rename from packages/devtools_app/test/debugger/debugger_scripts_test.dart
rename to packages/devtools_app/test/screens/debugger/debugger_scripts_test.dart
index c671f81..fa968d2 100644
--- a/packages/devtools_app/test/debugger/debugger_scripts_test.dart
+++ b/packages/devtools_app/test/screens/debugger/debugger_scripts_test.dart

@@ -15,7 +15,7 @@
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_infra/utils/test_utils.dart';
+import '../../test_infra/utils/test_utils.dart';
 
 void main() {
   late CodeViewController codeViewController;

diff --git a/packages/devtools_app/test/debugger/eval_field_test.dart b/packages/devtools_app/test/screens/debugger/eval_field_test.dart
similarity index 100%
rename from packages/devtools_app/test/debugger/eval_field_test.dart
rename to packages/devtools_app/test/screens/debugger/eval_field_test.dart


diff --git a/packages/devtools_app/test/debugger/file_search_test.dart b/packages/devtools_app/test/screens/debugger/file_search_test.dart
similarity index 100%
rename from packages/devtools_app/test/debugger/file_search_test.dart
rename to packages/devtools_app/test/screens/debugger/file_search_test.dart


diff --git a/packages/devtools_app/test/debugger/program_explorer_test.dart b/packages/devtools_app/test/screens/debugger/program_explorer_test.dart
similarity index 97%
rename from packages/devtools_app/test/debugger/program_explorer_test.dart
rename to packages/devtools_app/test/screens/debugger/program_explorer_test.dart
index 30e6ea2..5212998 100644
--- a/packages/devtools_app/test/debugger/program_explorer_test.dart
+++ b/packages/devtools_app/test/screens/debugger/program_explorer_test.dart

@@ -15,8 +15,8 @@
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_infra/test_data/debugger/vm_service_object_tree.dart';
-import '../test_infra/utils/tree_utils.dart';
+import '../../test_infra/test_data/debugger/vm_service_object_tree.dart';
+import '../../test_infra/utils/tree_utils.dart';
 
 void main() {
   group('Mock ProgramExplorer', () {

diff --git a/packages/devtools_app/test/debugger/records_variable_test.dart b/packages/devtools_app/test/screens/debugger/records_variable_test.dart
similarity index 100%
rename from packages/devtools_app/test/debugger/records_variable_test.dart
rename to packages/devtools_app/test/screens/debugger/records_variable_test.dart


diff --git a/packages/devtools_app/test/shared/span_parser_test.dart b/packages/devtools_app/test/screens/debugger/span_parser_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/span_parser_test.dart
rename to packages/devtools_app/test/screens/debugger/span_parser_test.dart


diff --git a/packages/devtools_app/test/shared/syntax_highlighter_test.dart b/packages/devtools_app/test/screens/debugger/syntax_highlighter_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/syntax_highlighter_test.dart
rename to packages/devtools_app/test/screens/debugger/syntax_highlighter_test.dart


diff --git a/packages/devtools_app/test/debugger/typed_data_variable_test.dart b/packages/devtools_app/test/screens/debugger/typed_data_variable_test.dart
similarity index 100%
rename from packages/devtools_app/test/debugger/typed_data_variable_test.dart
rename to packages/devtools_app/test/screens/debugger/typed_data_variable_test.dart


diff --git a/packages/devtools_app/test/debugger/variables_test.dart b/packages/devtools_app/test/screens/debugger/variables_test.dart
similarity index 96%
rename from packages/devtools_app/test/debugger/variables_test.dart
rename to packages/devtools_app/test/screens/debugger/variables_test.dart
index bfe9b55..7b02de9 100644
--- a/packages/devtools_app/test/debugger/variables_test.dart
+++ b/packages/devtools_app/test/screens/debugger/variables_test.dart

@@ -5,7 +5,7 @@
 import 'package:devtools_app/devtools_app.dart';
 import 'package:devtools_app/src/shared/console/widgets/expandable_variable.dart';
 import 'package:devtools_app/src/shared/diagnostics/dart_object_node.dart';
-import 'package:devtools_app/src/shared/tree.dart';
+import 'package:devtools_app/src/shared/ui/tree_view.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_test/devtools_test.dart';

diff --git a/packages/devtools_app/test/deep_link_vlidation/app_link_settings_test.dart b/packages/devtools_app/test/screens/deep_link_vlidation/app_link_settings_test.dart
similarity index 100%
rename from packages/devtools_app/test/deep_link_vlidation/app_link_settings_test.dart
rename to packages/devtools_app/test/screens/deep_link_vlidation/app_link_settings_test.dart


diff --git a/packages/devtools_app/test/deep_link_vlidation/deep_links_screen_test.dart b/packages/devtools_app/test/screens/deep_link_vlidation/deep_links_screen_test.dart
similarity index 99%
rename from packages/devtools_app/test/deep_link_vlidation/deep_links_screen_test.dart
rename to packages/devtools_app/test/screens/deep_link_vlidation/deep_links_screen_test.dart
index dcb4031..6853581 100644
--- a/packages/devtools_app/test/deep_link_vlidation/deep_links_screen_test.dart
+++ b/packages/devtools_app/test/screens/deep_link_vlidation/deep_links_screen_test.dart

@@ -20,8 +20,8 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
-import '../test_infra/test_data/deep_link/fake_responses.dart';
-import '../test_infra/utils/deep_links_utils.dart';
+import '../../test_infra/test_data/deep_link/fake_responses.dart';
+import '../../test_infra/utils/deep_links_utils.dart';
 
 final xcodeBuildOptions = XcodeBuildOptions.fromJson(
   '''{"configurations":["debug", "release"],"targets":["runner","runnerTests"]}''',

diff --git a/packages/devtools_app/test/deep_link_vlidation/select_project_view_test.dart b/packages/devtools_app/test/screens/deep_link_vlidation/select_project_view_test.dart
similarity index 98%
rename from packages/devtools_app/test/deep_link_vlidation/select_project_view_test.dart
rename to packages/devtools_app/test/screens/deep_link_vlidation/select_project_view_test.dart
index 6370236..37d6f25 100644
--- a/packages/devtools_app/test/deep_link_vlidation/select_project_view_test.dart
+++ b/packages/devtools_app/test/screens/deep_link_vlidation/select_project_view_test.dart

@@ -16,7 +16,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
-import '../test_infra/utils/deep_links_utils.dart';
+import '../../test_infra/utils/deep_links_utils.dart';
 
 void main() {
   // ignore: avoid-redundant-async, false positive.

diff --git a/packages/devtools_app/test/deep_link_vlidation/universal_link_settings_test.dart b/packages/devtools_app/test/screens/deep_link_vlidation/universal_link_settings_test.dart
similarity index 100%
rename from packages/devtools_app/test/deep_link_vlidation/universal_link_settings_test.dart
rename to packages/devtools_app/test/screens/deep_link_vlidation/universal_link_settings_test.dart


diff --git a/packages/devtools_app/test/inspector/diagnostics_test.dart b/packages/devtools_app/test/screens/inspector/diagnostics_test.dart
similarity index 100%
rename from packages/devtools_app/test/inspector/diagnostics_test.dart
rename to packages/devtools_app/test/screens/inspector/diagnostics_test.dart


diff --git a/packages/devtools_app/test/inspector/inspector_error_navigator_test.dart b/packages/devtools_app/test/screens/inspector/inspector_error_navigator_test.dart
similarity index 100%
rename from packages/devtools_app/test/inspector/inspector_error_navigator_test.dart
rename to packages/devtools_app/test/screens/inspector/inspector_error_navigator_test.dart


diff --git a/packages/devtools_app/test/inspector/inspector_integration_test.dart b/packages/devtools_app/test/screens/inspector/inspector_integration_test.dart
similarity index 94%
rename from packages/devtools_app/test/inspector/inspector_integration_test.dart
rename to packages/devtools_app/test/screens/inspector/inspector_integration_test.dart
index 38cd757..e070bc7 100644
--- a/packages/devtools_app/test/inspector/inspector_integration_test.dart
+++ b/packages/devtools_app/test/screens/inspector/inspector_integration_test.dart

@@ -7,9 +7,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../test_infra/flutter_test_driver.dart' show FlutterRunConfiguration;
-import '../test_infra/flutter_test_environment.dart';
-import '../test_infra/matchers/matchers.dart';
+import '../../test_infra/flutter_test_driver.dart' show FlutterRunConfiguration;
+import '../../test_infra/flutter_test_environment.dart';
+import '../../test_infra/matchers/matchers.dart';
 
 // This is a bit conservative to ensure we do not get flakes due to
 // slow interactions with the VM Service. This delay could likely be
@@ -75,7 +75,7 @@
       await expectLater(
         find.byType(InspectorScreenBody),
         matchesDevToolsGolden(
-          '../test_infra/goldens/integration_inspector_initial_load.png',
+          '../../test_infra/goldens/integration_inspector_initial_load.png',
         ),
       );
 
@@ -85,7 +85,7 @@
       await expectLater(
         find.byType(InspectorScreenBody),
         matchesDevToolsGolden(
-          '../test_infra/goldens/integration_inspector_select_center.png',
+          '../../test_infra/goldens/integration_inspector_select_center.png',
         ),
       );
 
@@ -97,7 +97,7 @@
       await expectLater(
         find.byType(InspectorScreenBody),
         matchesDevToolsGolden(
-          '../test_infra/goldens/integration_inspector_select_center_details_tree.png',
+          '../../test_infra/goldens/integration_inspector_select_center_details_tree.png',
         ),
       );
 
@@ -107,7 +107,7 @@
       await expectLater(
         find.byType(InspectorScreenBody),
         matchesDevToolsGolden(
-          '../test_infra/goldens/integration_inspector_richtext_selected.png',
+          '../../test_infra/goldens/integration_inspector_richtext_selected.png',
         ),
       );
 
@@ -129,7 +129,7 @@
       await expectLater(
         find.byType(InspectorScreenBody),
         matchesDevToolsGolden(
-          '../test_infra/goldens/integration_inspector_scaffold_selected.png',
+          '../../test_infra/goldens/integration_inspector_scaffold_selected.png',
         ),
       );
 
@@ -141,7 +141,7 @@
       await expectLater(
         find.byType(InspectorScreenBody),
         matchesDevToolsGolden(
-          '../test_infra/goldens/integration_animated_physical_model_selected.png',
+          '../../test_infra/goldens/integration_animated_physical_model_selected.png',
         ),
       );
 
@@ -432,7 +432,7 @@
       await expectLater(
         find.byType(InspectorScreenBody),
         matchesDevToolsGolden(
-          '../test_infra/goldens/integration_inspector_errors_1_initial_load.png',
+          '../../test_infra/goldens/integration_inspector_errors_1_initial_load.png',
         ),
       );
 
@@ -444,7 +444,7 @@
       await expectLater(
         find.byType(InspectorScreenBody),
         matchesDevToolsGolden(
-          '../test_infra/goldens/integration_inspector_errors_2_error_selected.png',
+          '../../test_infra/goldens/integration_inspector_errors_2_error_selected.png',
         ),
       );
 

diff --git a/packages/devtools_app/test/inspector/inspector_screen_test.dart b/packages/devtools_app/test/screens/inspector/inspector_screen_test.dart
similarity index 99%
rename from packages/devtools_app/test/inspector/inspector_screen_test.dart
rename to packages/devtools_app/test/screens/inspector/inspector_screen_test.dart
index 7cc2743..9dcb8d2 100644
--- a/packages/devtools_app/test/inspector/inspector_screen_test.dart
+++ b/packages/devtools_app/test/screens/inspector/inspector_screen_test.dart

@@ -20,7 +20,7 @@
 import 'package:flutter_test/flutter_test.dart' hide Fake;
 import 'package:mockito/mockito.dart';
 
-import '../test_infra/flutter_test_storage.dart';
+import '../../test_infra/flutter_test_storage.dart';
 
 void main() {
   final screen = InspectorScreen();

diff --git a/packages/devtools_app/test/inspector/inspector_tree_test.dart b/packages/devtools_app/test/screens/inspector/inspector_tree_test.dart
similarity index 100%
rename from packages/devtools_app/test/inspector/inspector_tree_test.dart
rename to packages/devtools_app/test/screens/inspector/inspector_tree_test.dart


diff --git a/packages/devtools_app/test/inspector/layout_explorer/flex/arrow_test.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/flex/arrow_test.dart
similarity index 78%
rename from packages/devtools_app/test/inspector/layout_explorer/flex/arrow_test.dart
rename to packages/devtools_app/test/screens/inspector/layout_explorer/flex/arrow_test.dart
index efde5ab..a6b61f7 100644
--- a/packages/devtools_app/test/inspector/layout_explorer/flex/arrow_test.dart
+++ b/packages/devtools_app/test/screens/inspector/layout_explorer/flex/arrow_test.dart

@@ -7,9 +7,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../../test_infra/matchers/matchers.dart';
+import '../../../../test_infra/matchers/matchers.dart';
 
 void main() {
+  const relativeGoldenPath =
+      '../../../../test_infra/goldens/inspector/layout_explorer/flex';
+
   group('Arrow Golden Tests', () {
     group('Unidirectional', () {
       Widget buildUnidirectionalArrowWrapper(ArrowType type) => Directionality(
@@ -30,7 +33,9 @@
         await tester.pumpWidget(widget);
         await expectLater(
           find.byWidget(widget),
-          matchesDevToolsGolden('goldens/arrow_unidirectional_left.png'),
+          matchesDevToolsGolden(
+            '$relativeGoldenPath/arrow_unidirectional_left.png',
+          ),
         );
       }, skip: kIsWeb);
       testWidgets('up', (WidgetTester tester) async {
@@ -38,7 +43,9 @@
         await tester.pumpWidget(widget);
         await expectLater(
           find.byWidget(widget),
-          matchesDevToolsGolden('goldens/arrow_unidirectional_up.png'),
+          matchesDevToolsGolden(
+            '$relativeGoldenPath/arrow_unidirectional_up.png',
+          ),
         );
       }, skip: kIsWeb);
       testWidgets('right', (WidgetTester tester) async {
@@ -46,7 +53,9 @@
         await tester.pumpWidget(widget);
         await expectLater(
           find.byWidget(widget),
-          matchesDevToolsGolden('goldens/arrow_unidirectional_right.png'),
+          matchesDevToolsGolden(
+            '$relativeGoldenPath/arrow_unidirectional_right.png',
+          ),
         );
       }, skip: kIsWeb);
       testWidgets('down', (WidgetTester tester) async {
@@ -54,7 +63,9 @@
         await tester.pumpWidget(widget);
         await expectLater(
           find.byWidget(widget),
-          matchesDevToolsGolden('goldens/arrow_unidirectional_down.png'),
+          matchesDevToolsGolden(
+            '$relativeGoldenPath/arrow_unidirectional_down.png',
+          ),
         );
       }, skip: kIsWeb);
     });
@@ -78,7 +89,9 @@
         await tester.pumpWidget(widget);
         await expectLater(
           find.byWidget(widget),
-          matchesDevToolsGolden('goldens/arrow_bidirectional_horizontal.png'),
+          matchesDevToolsGolden(
+            '$relativeGoldenPath/arrow_bidirectional_horizontal.png',
+          ),
         );
       }, skip: kIsWeb);
       testWidgets('vertical', (WidgetTester tester) async {
@@ -86,7 +99,9 @@
         await tester.pumpWidget(widget);
         await expectLater(
           find.byWidget(widget),
-          matchesDevToolsGolden('goldens/arrow_bidirectional_vertical.png'),
+          matchesDevToolsGolden(
+            '$relativeGoldenPath/arrow_bidirectional_vertical.png',
+          ),
         );
       }, skip: kIsWeb);
     });

diff --git a/packages/devtools_app/test/inspector/layout_explorer/flex/flex_test.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/flex/flex_test.dart
similarity index 96%
rename from packages/devtools_app/test/inspector/layout_explorer/flex/flex_test.dart
rename to packages/devtools_app/test/screens/inspector/layout_explorer/flex/flex_test.dart
index f9055a4..f2e3a32 100644
--- a/packages/devtools_app/test/inspector/layout_explorer/flex/flex_test.dart
+++ b/packages/devtools_app/test/screens/inspector/layout_explorer/flex/flex_test.dart

@@ -12,12 +12,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../../test_infra/matchers/matchers.dart';
+import '../../../../test_infra/matchers/matchers.dart';
 
 // TODO(albertusangga): Re-enable tests in this files
 // https://github.com/flutter/devtools/issues/1403
 void main() {
   const windowSize = Size(1750, 1750);
+  const relativeGoldenPath =
+      '../../../../test_infra/goldens/inspector/layout_explorer/flex';
 
   Map<String, Object> buildDiagnosticsNodeJson(Axis axis) => jsonDecode('''
       {
@@ -264,7 +266,7 @@
     await tester.pumpAndSettle();
     await expectLater(
       find.byWidget(widget),
-      matchesDevToolsGolden('goldens/story_of_row_layout.png'),
+      matchesDevToolsGolden('$relativeGoldenPath/story_of_row_layout.png'),
     );
   }, skip: true);
 
@@ -284,7 +286,7 @@
     await pump(tester, widget);
     await expectLater(
       find.byWidget(widget),
-      matchesDevToolsGolden('goldens/story_of_column_layout.png'),
+      matchesDevToolsGolden('$relativeGoldenPath/story_of_column_layout.png'),
     );
   }, skip: true);
 }

diff --git a/packages/devtools_app/test/inspector/layout_explorer/inspector_data_models_test.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/inspector_data_models_test.dart
similarity index 100%
rename from packages/devtools_app/test/inspector/layout_explorer/inspector_data_models_test.dart
rename to packages/devtools_app/test/screens/inspector/layout_explorer/inspector_data_models_test.dart


diff --git a/packages/devtools_app/test/inspector/layout_explorer/layout_explorer_serialization_delegate.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/layout_explorer_serialization_delegate.dart
similarity index 100%
rename from packages/devtools_app/test/inspector/layout_explorer/layout_explorer_serialization_delegate.dart
rename to packages/devtools_app/test/screens/inspector/layout_explorer/layout_explorer_serialization_delegate.dart


diff --git a/packages/devtools_app/test/inspector/layout_explorer/layout_explorer_test_utils.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/layout_explorer_test_utils.dart
similarity index 100%
rename from packages/devtools_app/test/inspector/layout_explorer/layout_explorer_test_utils.dart
rename to packages/devtools_app/test/screens/inspector/layout_explorer/layout_explorer_test_utils.dart


diff --git a/packages/devtools_app/test/shared/widget_theme_test.dart b/packages/devtools_app/test/screens/inspector/layout_explorer/widget_theme_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/widget_theme_test.dart
rename to packages/devtools_app/test/screens/inspector/layout_explorer/widget_theme_test.dart


diff --git a/packages/devtools_app/test/inspector/utils/inspector_tree.dart b/packages/devtools_app/test/screens/inspector/utils/inspector_tree.dart
similarity index 100%
rename from packages/devtools_app/test/inspector/utils/inspector_tree.dart
rename to packages/devtools_app/test/screens/inspector/utils/inspector_tree.dart


diff --git a/packages/devtools_app/test/inspector_v2/diagnostics_test.dart b/packages/devtools_app/test/screens/inspector_v2/diagnostics_test.dart
similarity index 100%
rename from packages/devtools_app/test/inspector_v2/diagnostics_test.dart
rename to packages/devtools_app/test/screens/inspector_v2/diagnostics_test.dart


diff --git a/packages/devtools_app/test/inspector_v2/inspector_error_navigator_test.dart b/packages/devtools_app/test/screens/inspector_v2/inspector_error_navigator_test.dart
similarity index 100%
rename from packages/devtools_app/test/inspector_v2/inspector_error_navigator_test.dart
rename to packages/devtools_app/test/screens/inspector_v2/inspector_error_navigator_test.dart


diff --git a/packages/devtools_app/test/inspector_v2/inspector_integration_test.dart b/packages/devtools_app/test/screens/inspector_v2/inspector_integration_test.dart
similarity index 93%
rename from packages/devtools_app/test/inspector_v2/inspector_integration_test.dart
rename to packages/devtools_app/test/screens/inspector_v2/inspector_integration_test.dart
index 96b06e8..9dcb81d 100644
--- a/packages/devtools_app/test/inspector_v2/inspector_integration_test.dart
+++ b/packages/devtools_app/test/screens/inspector_v2/inspector_integration_test.dart

@@ -14,9 +14,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../test_infra/flutter_test_driver.dart' show FlutterRunConfiguration;
-import '../test_infra/flutter_test_environment.dart';
-import '../test_infra/matchers/matchers.dart';
+import '../../test_infra/flutter_test_driver.dart' show FlutterRunConfiguration;
+import '../../test_infra/flutter_test_environment.dart';
+import '../../test_infra/matchers/matchers.dart';
 
 // Note: This test uses packages/devtools_app/test/test_infra/fixtures/flutter_app
 // running on the flutter-tester device.
@@ -73,7 +73,7 @@
       await expectLater(
         find.byType(InspectorScreenBody),
         matchesDevToolsGolden(
-          '../test_infra/goldens/integration_inspector_v2_initial_load.png',
+          '../../test_infra/goldens/integration_inspector_v2_initial_load.png',
         ),
       );
     });
@@ -103,7 +103,7 @@
         await expectLater(
           find.byType(InspectorScreenBody),
           matchesDevToolsGolden(
-            '../test_infra/goldens/integration_inspector_v2_after_hot_restart.png',
+            '../../test_infra/goldens/integration_inspector_v2_after_hot_restart.png',
           ),
         );
       },
@@ -121,7 +121,7 @@
       await expectLater(
         find.byType(InspectorScreenBody),
         matchesDevToolsGolden(
-          '../test_infra/goldens/integration_inspector_v2_select_center.png',
+          '../../test_infra/goldens/integration_inspector_v2_select_center.png',
         ),
       );
 
@@ -159,7 +159,7 @@
         await expectLater(
           find.byType(InspectorScreenBody),
           matchesDevToolsGolden(
-            '../test_infra/goldens/integration_inspector_v2_implementation_widgets_expanded.png',
+            '../../test_infra/goldens/integration_inspector_v2_implementation_widgets_expanded.png',
           ),
         );
 
@@ -170,7 +170,7 @@
         await expectLater(
           find.byType(InspectorScreenBody),
           matchesDevToolsGolden(
-            '../test_infra/goldens/integration_inspector_v2_hideable_widget_selected.png',
+            '../../test_infra/goldens/integration_inspector_v2_hideable_widget_selected.png',
           ),
         );
 
@@ -184,7 +184,7 @@
         await expectLater(
           find.byType(InspectorScreenBody),
           matchesDevToolsGolden(
-            '../test_infra/goldens/integration_inspector_v2_implementation_widgets_collapsed.png',
+            '../../test_infra/goldens/integration_inspector_v2_implementation_widgets_collapsed.png',
           ),
         );
       },
@@ -216,7 +216,7 @@
       await expectLater(
         find.byType(InspectorScreenBody),
         matchesDevToolsGolden(
-          '../test_infra/goldens/integration_inspector_v2_hideable_widget_selected_from_search.png',
+          '../../test_infra/goldens/integration_inspector_v2_hideable_widget_selected_from_search.png',
         ),
       );
     });
@@ -248,7 +248,7 @@
     await expectLater(
       find.byType(InspectorScreenBody),
       matchesDevToolsGolden(
-        '../test_infra/goldens/integration_inspector_v2_implementation_widgets_hidden.png',
+        '../../test_infra/goldens/integration_inspector_v2_implementation_widgets_hidden.png',
       ),
     );
 
@@ -282,7 +282,7 @@
     await expectLater(
       find.byType(legacy.InspectorScreenBody),
       matchesDevToolsGolden(
-        '../test_infra/goldens/integration_inspector_v2_revert_to_legacy.png',
+        '../../test_infra/goldens/integration_inspector_v2_revert_to_legacy.png',
       ),
     );
   });
@@ -409,7 +409,7 @@
       await expectLater(
         find.byType(InspectorScreenBody),
         matchesDevToolsGolden(
-          '../test_infra/goldens/integration_inspector_v2_errors_1_initial_load.png',
+          '../../test_infra/goldens/integration_inspector_v2_errors_1_initial_load.png',
         ),
       );
 
@@ -421,7 +421,7 @@
       await expectLater(
         find.byType(InspectorScreenBody),
         matchesDevToolsGolden(
-          '../test_infra/goldens/integration_inspector_v2_errors_2_error_selected.png',
+          '../../test_infra/goldens/integration_inspector_v2_errors_2_error_selected.png',
         ),
       );
     });

diff --git a/packages/devtools_app/test/inspector_v2/inspector_screen_test.dart b/packages/devtools_app/test/screens/inspector_v2/inspector_screen_test.dart
similarity index 99%
rename from packages/devtools_app/test/inspector_v2/inspector_screen_test.dart
rename to packages/devtools_app/test/screens/inspector_v2/inspector_screen_test.dart
index e4145ab..b8bf8cb 100644
--- a/packages/devtools_app/test/inspector_v2/inspector_screen_test.dart
+++ b/packages/devtools_app/test/screens/inspector_v2/inspector_screen_test.dart

@@ -30,7 +30,7 @@
 import 'package:flutter_test/flutter_test.dart' hide Fake;
 import 'package:mockito/mockito.dart';
 
-import '../test_infra/flutter_test_storage.dart';
+import '../../test_infra/flutter_test_storage.dart';
 
 void main() {
   final screen = InspectorScreen();

diff --git a/packages/devtools_app/test/inspector_v2/inspector_tree_test.dart b/packages/devtools_app/test/screens/inspector_v2/inspector_tree_test.dart
similarity index 100%
rename from packages/devtools_app/test/inspector_v2/inspector_tree_test.dart
rename to packages/devtools_app/test/screens/inspector_v2/inspector_tree_test.dart


diff --git a/packages/devtools_app/test/inspector_v2/layout_explorer/flex/arrow_test.dart b/packages/devtools_app/test/screens/inspector_v2/layout_explorer/flex/arrow_test.dart
similarity index 78%
rename from packages/devtools_app/test/inspector_v2/layout_explorer/flex/arrow_test.dart
rename to packages/devtools_app/test/screens/inspector_v2/layout_explorer/flex/arrow_test.dart
index df427d2..e56710f 100644
--- a/packages/devtools_app/test/inspector_v2/layout_explorer/flex/arrow_test.dart
+++ b/packages/devtools_app/test/screens/inspector_v2/layout_explorer/flex/arrow_test.dart

@@ -7,9 +7,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../../test_infra/matchers/matchers.dart';
+import '../../../../test_infra/matchers/matchers.dart';
 
 void main() {
+  const relativeGoldenPath =
+      '../../../../test_infra/goldens/inspector_v2/layout_explorer/flex';
+
   group('Arrow Golden Tests', () {
     group('Unidirectional', () {
       Widget buildUnidirectionalArrowWrapper(ArrowType type) => Directionality(
@@ -30,7 +33,9 @@
         await tester.pumpWidget(widget);
         await expectLater(
           find.byWidget(widget),
-          matchesDevToolsGolden('goldens/arrow_unidirectional_left.png'),
+          matchesDevToolsGolden(
+            '$relativeGoldenPath/arrow_unidirectional_left.png',
+          ),
         );
       }, skip: kIsWeb);
       testWidgets('up', (WidgetTester tester) async {
@@ -38,7 +43,9 @@
         await tester.pumpWidget(widget);
         await expectLater(
           find.byWidget(widget),
-          matchesDevToolsGolden('goldens/arrow_unidirectional_up.png'),
+          matchesDevToolsGolden(
+            '$relativeGoldenPath/arrow_unidirectional_up.png',
+          ),
         );
       }, skip: kIsWeb);
       testWidgets('right', (WidgetTester tester) async {
@@ -46,7 +53,9 @@
         await tester.pumpWidget(widget);
         await expectLater(
           find.byWidget(widget),
-          matchesDevToolsGolden('goldens/arrow_unidirectional_right.png'),
+          matchesDevToolsGolden(
+            '$relativeGoldenPath/arrow_unidirectional_right.png',
+          ),
         );
       }, skip: kIsWeb);
       testWidgets('down', (WidgetTester tester) async {
@@ -54,7 +63,9 @@
         await tester.pumpWidget(widget);
         await expectLater(
           find.byWidget(widget),
-          matchesDevToolsGolden('goldens/arrow_unidirectional_down.png'),
+          matchesDevToolsGolden(
+            '$relativeGoldenPath/arrow_unidirectional_down.png',
+          ),
         );
       }, skip: kIsWeb);
     });
@@ -78,7 +89,9 @@
         await tester.pumpWidget(widget);
         await expectLater(
           find.byWidget(widget),
-          matchesDevToolsGolden('goldens/arrow_bidirectional_horizontal.png'),
+          matchesDevToolsGolden(
+            '$relativeGoldenPath/arrow_bidirectional_horizontal.png',
+          ),
         );
       }, skip: kIsWeb);
       testWidgets('vertical', (WidgetTester tester) async {
@@ -86,7 +99,9 @@
         await tester.pumpWidget(widget);
         await expectLater(
           find.byWidget(widget),
-          matchesDevToolsGolden('goldens/arrow_bidirectional_vertical.png'),
+          matchesDevToolsGolden(
+            '$relativeGoldenPath/arrow_bidirectional_vertical.png',
+          ),
         );
       }, skip: kIsWeb);
     });

diff --git a/packages/devtools_app/test/inspector_v2/layout_explorer/flex/flex_test.dart b/packages/devtools_app/test/screens/inspector_v2/layout_explorer/flex/flex_test.dart
similarity index 96%
rename from packages/devtools_app/test/inspector_v2/layout_explorer/flex/flex_test.dart
rename to packages/devtools_app/test/screens/inspector_v2/layout_explorer/flex/flex_test.dart
index adca15e..0a169f3 100644
--- a/packages/devtools_app/test/inspector_v2/layout_explorer/flex/flex_test.dart
+++ b/packages/devtools_app/test/screens/inspector_v2/layout_explorer/flex/flex_test.dart

@@ -12,12 +12,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../../test_infra/matchers/matchers.dart';
+import '../../../../test_infra/matchers/matchers.dart';
 
 // TODO(albertusangga): Re-enable tests in this files
 // https://github.com/flutter/devtools/issues/1403
 void main() {
   const windowSize = Size(1750, 1750);
+  const relativeGoldenPath =
+      '../../../../test_infra/goldens/inspector_v2/layout_explorer/flex';
 
   Map<String, Object> buildDiagnosticsNodeJson(Axis axis) => jsonDecode('''
       {
@@ -264,7 +266,7 @@
     await tester.pumpAndSettle();
     await expectLater(
       find.byWidget(widget),
-      matchesDevToolsGolden('goldens/story_of_row_layout.png'),
+      matchesDevToolsGolden('$relativeGoldenPath/story_of_row_layout.png'),
     );
   }, skip: true);
 
@@ -284,7 +286,7 @@
     await pump(tester, widget);
     await expectLater(
       find.byWidget(widget),
-      matchesDevToolsGolden('goldens/story_of_column_layout.png'),
+      matchesDevToolsGolden('$relativeGoldenPath/story_of_column_layout.png'),
     );
   }, skip: true);
 }

diff --git a/packages/devtools_app/test/inspector_v2/layout_explorer/inspector_data_models_test.dart b/packages/devtools_app/test/screens/inspector_v2/layout_explorer/inspector_data_models_test.dart
similarity index 100%
rename from packages/devtools_app/test/inspector_v2/layout_explorer/inspector_data_models_test.dart
rename to packages/devtools_app/test/screens/inspector_v2/layout_explorer/inspector_data_models_test.dart


diff --git a/packages/devtools_app/test/inspector_v2/layout_explorer/layout_explorer_serialization_delegate.dart b/packages/devtools_app/test/screens/inspector_v2/layout_explorer/layout_explorer_serialization_delegate.dart
similarity index 100%
rename from packages/devtools_app/test/inspector_v2/layout_explorer/layout_explorer_serialization_delegate.dart
rename to packages/devtools_app/test/screens/inspector_v2/layout_explorer/layout_explorer_serialization_delegate.dart


diff --git a/packages/devtools_app/test/inspector_v2/layout_explorer/layout_explorer_test_utils.dart b/packages/devtools_app/test/screens/inspector_v2/layout_explorer/layout_explorer_test_utils.dart
similarity index 100%
rename from packages/devtools_app/test/inspector_v2/layout_explorer/layout_explorer_test_utils.dart
rename to packages/devtools_app/test/screens/inspector_v2/layout_explorer/layout_explorer_test_utils.dart


diff --git a/packages/devtools_app/test/screens/inspector_v2/layout_explorer/widget_theme_test.dart b/packages/devtools_app/test/screens/inspector_v2/layout_explorer/widget_theme_test.dart
new file mode 100644
index 0000000..983d5dc
--- /dev/null
+++ b/packages/devtools_app/test/screens/inspector_v2/layout_explorer/widget_theme_test.dart

@@ -0,0 +1,22 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:devtools_app/src/screens/inspector_v2/layout_explorer/ui/widgets_theme.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  group('Test WidgetTheme', () {
+    test('Correct asset from widget with a type', () {
+      const widgetName = 'AnimatedBuilder<String>';
+      final theme = WidgetTheme.fromName(widgetName);
+      expect(theme.iconAsset, 'icons/inspector/widget_icons/animated.png');
+    });
+
+    test('Has default theme for custom widget', () {
+      const widgetName = 'CustomWidget';
+      final theme = WidgetTheme.fromName(widgetName);
+      expect(theme.color, WidgetTheme.otherWidgetColor);
+    });
+  });
+}

diff --git a/packages/devtools_app/test/inspector_v2/utils/inspector_tree.dart b/packages/devtools_app/test/screens/inspector_v2/utils/inspector_tree.dart
similarity index 100%
rename from packages/devtools_app/test/inspector_v2/utils/inspector_tree.dart
rename to packages/devtools_app/test/screens/inspector_v2/utils/inspector_tree.dart


diff --git a/packages/devtools_app/test/logging/logging_controller_test.dart b/packages/devtools_app/test/screens/logging/logging_controller_test.dart
similarity index 100%
rename from packages/devtools_app/test/logging/logging_controller_test.dart
rename to packages/devtools_app/test/screens/logging/logging_controller_test.dart


diff --git a/packages/devtools_app/test/logging/logging_screen_data_test.dart b/packages/devtools_app/test/screens/logging/logging_screen_data_test.dart
similarity index 100%
rename from packages/devtools_app/test/logging/logging_screen_data_test.dart
rename to packages/devtools_app/test/screens/logging/logging_screen_data_test.dart


diff --git a/packages/devtools_app/test/logging/logging_screen_test.dart b/packages/devtools_app/test/screens/logging/logging_screen_test.dart
similarity index 99%
rename from packages/devtools_app/test/logging/logging_screen_test.dart
rename to packages/devtools_app/test/screens/logging/logging_screen_test.dart
index 884c843..702f0fb 100644
--- a/packages/devtools_app/test/logging/logging_screen_test.dart
+++ b/packages/devtools_app/test/screens/logging/logging_screen_test.dart

@@ -20,7 +20,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
-import '../test_infra/utils/test_utils.dart';
+import '../../test_infra/utils/test_utils.dart';
 
 void main() {
   late LoggingScreen screen;

diff --git a/packages/devtools_app/test/logging/metadata_test.dart b/packages/devtools_app/test/screens/logging/metadata_test.dart
similarity index 98%
rename from packages/devtools_app/test/logging/metadata_test.dart
rename to packages/devtools_app/test/screens/logging/metadata_test.dart
index 40a73c9..495b32d 100644
--- a/packages/devtools_app/test/logging/metadata_test.dart
+++ b/packages/devtools_app/test/screens/logging/metadata_test.dart

@@ -12,7 +12,7 @@
 import 'package:logging/logging.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_infra/matchers/matchers.dart';
+import '../../test_infra/matchers/matchers.dart';
 
 void main() {
   const windowSize = Size(1000.0, 1000.0);

diff --git a/packages/devtools_app/test/memory/chart/chart_test.dart b/packages/devtools_app/test/screens/memory/chart/chart_test.dart
similarity index 97%
rename from packages/devtools_app/test/memory/chart/chart_test.dart
rename to packages/devtools_app/test/screens/memory/chart/chart_test.dart
index 17c9636..06f24ad 100644
--- a/packages/devtools_app/test/memory/chart/chart_test.dart
+++ b/packages/devtools_app/test/screens/memory/chart/chart_test.dart

@@ -16,8 +16,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../test_infra/matchers/matchers.dart';
-import '../../test_infra/test_data/memory.dart';
+import '../../../test_infra/matchers/matchers.dart';
+import '../../../test_infra/test_data/memory.dart';
 
 void main() {
   const windowSize = Size(2225.0, 1000.0);
@@ -267,7 +267,7 @@
       await expectLater(
         find.byKey(chartKey),
         matchesDevToolsGolden(
-          '../../test_infra/goldens/memory_chart_scaled_live.png',
+          '../../../test_infra/goldens/memory_chart_scaled_live.png',
         ),
       );
       // Await delay for golden comparison.
@@ -350,7 +350,7 @@
       await expectLater(
         find.byKey(chartKey),
         matchesDevToolsGolden(
-          '../../test_infra/goldens/memory_chart_scaled_all.png',
+          '../../../test_infra/goldens/memory_chart_scaled_all.png',
         ),
       );
       // Await delay for golden comparison.
@@ -390,7 +390,7 @@
       await expectLater(
         find.byKey(chartKey),
         matchesDevToolsGolden(
-          '../../test_infra/goldens/memory_chart_scaled_five_minute.png',
+          '../../../test_infra/goldens/memory_chart_scaled_five_minute.png',
         ),
       );
       // Await delay for golden comparison.
@@ -622,7 +622,7 @@
       await expectLater(
         find.byKey(chartKey),
         matchesDevToolsGolden(
-          '../../test_infra/goldens/memory_chart_fixed_live.png',
+          '../../../test_infra/goldens/memory_chart_fixed_live.png',
         ),
       );
       // Await delay for golden comparison.
@@ -727,7 +727,7 @@
       await expectLater(
         find.byKey(chartKey),
         matchesDevToolsGolden(
-          '../../test_infra/goldens/memory_chart_fixed_all.png',
+          '../../../test_infra/goldens/memory_chart_fixed_all.png',
         ),
       );
       // Await delay for golden comparison.
@@ -778,7 +778,7 @@
       await expectLater(
         find.byKey(chartKey),
         matchesDevToolsGolden(
-          '../../test_infra/goldens/memory_chart_fixed_five_minutes.png',
+          '../../../test_infra/goldens/memory_chart_fixed_five_minutes.png',
         ),
       );
       // Await delay for golden comparison.

diff --git a/packages/devtools_app/test/memory/chart/controller/chart_data_test.dart b/packages/devtools_app/test/screens/memory/chart/controller/chart_data_test.dart
similarity index 100%
rename from packages/devtools_app/test/memory/chart/controller/chart_data_test.dart
rename to packages/devtools_app/test/screens/memory/chart/controller/chart_data_test.dart


diff --git a/packages/devtools_app/test/memory/control/settings_dialog_test.dart b/packages/devtools_app/test/screens/memory/control/settings_dialog_test.dart
similarity index 86%
rename from packages/devtools_app/test/memory/control/settings_dialog_test.dart
rename to packages/devtools_app/test/screens/memory/control/settings_dialog_test.dart
index c84f8dc..66eeb79 100644
--- a/packages/devtools_app/test/memory/control/settings_dialog_test.dart
+++ b/packages/devtools_app/test/screens/memory/control/settings_dialog_test.dart

@@ -10,8 +10,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../test_infra/matchers/matchers.dart';
-import '../../test_infra/scenes/memory/default.dart';
+import '../../../test_infra/matchers/matchers.dart';
+import '../../../test_infra/scenes/memory/default.dart';
 
 void main() {
   late MemoryDefaultScene scene;
@@ -39,7 +39,7 @@
     await expectLater(
       find.byType(MemorySettingsDialog),
       matchesDevToolsGolden(
-        '../../test_infra/goldens/settings_dialog_default.png',
+        '../../../test_infra/goldens/settings_dialog_default.png',
       ),
     );
 
@@ -52,7 +52,7 @@
     await expectLater(
       find.byType(MemorySettingsDialog),
       matchesDevToolsGolden(
-        '../../test_infra/goldens/settings_dialog_modified.png',
+        '../../../test_infra/goldens/settings_dialog_modified.png',
       ),
     );
     expect(preferences.memory.androidCollectionEnabled.value, isTrue);
@@ -65,7 +65,7 @@
     await expectLater(
       find.byType(MemorySettingsDialog),
       matchesDevToolsGolden(
-        '../../test_infra/goldens/settings_dialog_modified.png',
+        '../../../test_infra/goldens/settings_dialog_modified.png',
       ),
     );
   });

diff --git a/packages/devtools_app/test/memory/diff/controller/diff_pane_controller_test.dart b/packages/devtools_app/test/screens/memory/diff/controller/diff_pane_controller_test.dart
similarity index 97%
rename from packages/devtools_app/test/memory/diff/controller/diff_pane_controller_test.dart
rename to packages/devtools_app/test/screens/memory/diff/controller/diff_pane_controller_test.dart
index 96b6097..8391ffd 100644
--- a/packages/devtools_app/test/memory/diff/controller/diff_pane_controller_test.dart
+++ b/packages/devtools_app/test/screens/memory/diff/controller/diff_pane_controller_test.dart

@@ -12,7 +12,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../../test_infra/scenes/memory/default.dart';
+import '../../../../test_infra/scenes/memory/default.dart';
 
 Future<void> pumpScene(WidgetTester tester, MemoryDefaultScene scene) async {
   await scene.pump(tester);

diff --git a/packages/devtools_app/test/memory/diff/controller/filter_test.dart b/packages/devtools_app/test/screens/memory/diff/controller/filter_test.dart
similarity index 100%
rename from packages/devtools_app/test/memory/diff/controller/filter_test.dart
rename to packages/devtools_app/test/screens/memory/diff/controller/filter_test.dart


diff --git a/packages/devtools_app/test/memory/diff/controller/heap_diff_test.dart b/packages/devtools_app/test/screens/memory/diff/controller/heap_diff_test.dart
similarity index 95%
rename from packages/devtools_app/test/memory/diff/controller/heap_diff_test.dart
rename to packages/devtools_app/test/screens/memory/diff/controller/heap_diff_test.dart
index 1ddc9bd..a7de109 100644
--- a/packages/devtools_app/test/memory/diff/controller/heap_diff_test.dart
+++ b/packages/devtools_app/test/screens/memory/diff/controller/heap_diff_test.dart

@@ -8,8 +8,8 @@
 import 'package:devtools_app/src/shared/memory/class_name.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../../test_infra/test_data/memory/heap/factories.dart';
-import '../../../test_infra/test_data/memory/heap/heap_graph_fakes.dart';
+import '../../../../test_infra/test_data/memory/heap/factories.dart';
+import '../../../../test_infra/test_data/memory/heap/heap_graph_fakes.dart';
 
 void main() {
   test(

diff --git a/packages/devtools_app/test/memory/diff/controller/memory_footprint_test.dart b/packages/devtools_app/test/screens/memory/diff/controller/memory_footprint_test.dart
similarity index 94%
rename from packages/devtools_app/test/memory/diff/controller/memory_footprint_test.dart
rename to packages/devtools_app/test/screens/memory/diff/controller/memory_footprint_test.dart
index 5826c6c..f65e7ee 100644
--- a/packages/devtools_app/test/memory/diff/controller/memory_footprint_test.dart
+++ b/packages/devtools_app/test/screens/memory/diff/controller/memory_footprint_test.dart

@@ -10,7 +10,7 @@
 import 'package:devtools_app/src/shared/memory/heap_data.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../../test_infra/test_data/memory/heap/heap_data.dart';
+import '../../../../test_infra/test_data/memory/heap/heap_data.dart';
 
 void main() {
   test(

diff --git a/packages/devtools_app/test/memory/diff/controller/snapshot_item_test.dart b/packages/devtools_app/test/screens/memory/diff/controller/snapshot_item_test.dart
similarity index 95%
rename from packages/devtools_app/test/memory/diff/controller/snapshot_item_test.dart
rename to packages/devtools_app/test/screens/memory/diff/controller/snapshot_item_test.dart
index 0a3c58e..93e87b4 100644
--- a/packages/devtools_app/test/memory/diff/controller/snapshot_item_test.dart
+++ b/packages/devtools_app/test/screens/memory/diff/controller/snapshot_item_test.dart

@@ -8,7 +8,7 @@
 import 'package:devtools_app/src/shared/primitives/encoding.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../../test_infra/test_data/memory/heap/heap_data.dart';
+import '../../../../test_infra/test_data/memory/heap/heap_data.dart';
 
 void main() {
   for (final encode in [false, true]) {

diff --git a/packages/devtools_app/test/memory/diff/widgets/class_filter_test.dart b/packages/devtools_app/test/screens/memory/diff/widgets/class_filter_test.dart
similarity index 92%
rename from packages/devtools_app/test/memory/diff/widgets/class_filter_test.dart
rename to packages/devtools_app/test/screens/memory/diff/widgets/class_filter_test.dart
index cfb5b1f..d36095d 100644
--- a/packages/devtools_app/test/memory/diff/widgets/class_filter_test.dart
+++ b/packages/devtools_app/test/screens/memory/diff/widgets/class_filter_test.dart

@@ -10,9 +10,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../../test_infra/matchers/matchers.dart';
-import '../../../test_infra/scenes/memory/diff_snapshot.dart';
-import '../../../test_infra/scenes/scene_test_extensions.dart';
+import '../../../../test_infra/matchers/matchers.dart';
+import '../../../../test_infra/scenes/memory/diff_snapshot.dart';
+import '../../../../test_infra/scenes/scene_test_extensions.dart';
 
 class _FilterTest {
   _FilterTest({required this.isDiff});
@@ -22,11 +22,11 @@
   String get name => isDiff ? 'diff' : 'single';
 
   String get sceneGolden =>
-      '../../../test_infra/goldens/memory_diff_snapshot_scene_$name.png';
+      '../../../../test_infra/goldens/memory_diff_snapshot_scene_$name.png';
   String snapshotGolden(ClassFilterType? type) =>
-      '../../../test_infra/goldens/memory_diff_snapshot_${type?.name ?? 'custom'}_$name.png';
+      '../../../../test_infra/goldens/memory_diff_snapshot_${type?.name ?? 'custom'}_$name.png';
   static String dialogGolden(ClassFilterType? type) =>
-      '../../../test_infra/goldens/memory_diff_filter_dialog_${type?.name ?? 'custom'}.png';
+      '../../../../test_infra/goldens/memory_diff_filter_dialog_${type?.name ?? 'custom'}.png';
 }
 
 final _tests = [_FilterTest(isDiff: false), _FilterTest(isDiff: true)];

diff --git a/packages/devtools_app/test/memory/diff/widgets/diff_pane_test.dart b/packages/devtools_app/test/screens/memory/diff/widgets/diff_pane_test.dart
similarity index 87%
rename from packages/devtools_app/test/memory/diff/widgets/diff_pane_test.dart
rename to packages/devtools_app/test/screens/memory/diff/widgets/diff_pane_test.dart
index c318141..971c04b 100644
--- a/packages/devtools_app/test/memory/diff/widgets/diff_pane_test.dart
+++ b/packages/devtools_app/test/screens/memory/diff/widgets/diff_pane_test.dart

@@ -10,8 +10,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../../test_infra/matchers/matchers.dart';
-import '../../../test_infra/scenes/memory/default.dart';
+import '../../../../test_infra/matchers/matchers.dart';
+import '../../../../test_infra/scenes/memory/default.dart';
 
 Future<void> pumpScene(WidgetTester tester, MemoryDefaultScene scene) async {
   await scene.pump(tester);
@@ -57,7 +57,7 @@
       await expectLater(
         find.byType(DiffPane),
         matchesDevToolsGolden(
-          '../../../test_infra/goldens/memory_diff_empty1.png',
+          '../../../../test_infra/goldens/memory_diff_empty1.png',
         ),
       );
 
@@ -70,7 +70,7 @@
       await expectLater(
         find.byType(DiffPane),
         matchesDevToolsGolden(
-          '../../../test_infra/goldens/memory_diff_three_snapshots1.png',
+          '../../../../test_infra/goldens/memory_diff_three_snapshots1.png',
         ),
       );
       expect(snapshots.value.length, equals(1 + 3));
@@ -78,7 +78,7 @@
       await expectLater(
         find.byType(DiffPane),
         matchesDevToolsGolden(
-          '../../../test_infra/goldens/memory_diff_selected_class.png',
+          '../../../../test_infra/goldens/memory_diff_selected_class.png',
         ),
       );
 
@@ -104,7 +104,7 @@
       await expectLater(
         find.byType(DiffPane),
         matchesDevToolsGolden(
-          '../../../test_infra/goldens/memory_diff_three_snapshots2.png',
+          '../../../../test_infra/goldens/memory_diff_three_snapshots2.png',
         ),
       );
       expect(snapshots.value.length, equals(1 + 3 - 1 + 1));
@@ -115,7 +115,7 @@
       await expectLater(
         find.byType(DiffPane),
         matchesDevToolsGolden(
-          '../../../test_infra/goldens/memory_diff_empty2.png',
+          '../../../../test_infra/goldens/memory_diff_empty2.png',
         ),
       );
       expect(snapshots.value.length, equals(1));

diff --git a/packages/devtools_app/test/memory/diff/widgets/paths_test.dart b/packages/devtools_app/test/screens/memory/diff/widgets/paths_test.dart
similarity index 93%
rename from packages/devtools_app/test/memory/diff/widgets/paths_test.dart
rename to packages/devtools_app/test/screens/memory/diff/widgets/paths_test.dart
index ec87945..0f589ce 100644
--- a/packages/devtools_app/test/memory/diff/widgets/paths_test.dart
+++ b/packages/devtools_app/test/screens/memory/diff/widgets/paths_test.dart

@@ -6,7 +6,7 @@
 import 'package:devtools_app/src/shared/memory/heap_data.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../../test_infra/scenes/memory/default.dart';
+import '../../../../test_infra/scenes/memory/default.dart';
 
 void main() {
   test('Many retaining paths do not jank UI.', () async {

diff --git a/packages/devtools_app/test/memory/framework/memory_controller_test.dart b/packages/devtools_app/test/screens/memory/framework/memory_controller_test.dart
similarity index 96%
rename from packages/devtools_app/test/memory/framework/memory_controller_test.dart
rename to packages/devtools_app/test/screens/memory/framework/memory_controller_test.dart
index f89d025..469c78a 100644
--- a/packages/devtools_app/test/memory/framework/memory_controller_test.dart
+++ b/packages/devtools_app/test/screens/memory/framework/memory_controller_test.dart

@@ -7,7 +7,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../test_infra/scenes/memory/default.dart';
+import '../../../test_infra/scenes/memory/default.dart';
 
 final _filter1 = ClassFilter(
   except: 'filter1',

diff --git a/packages/devtools_app/test/memory/framework/memory_screen_test.dart b/packages/devtools_app/test/screens/memory/framework/memory_screen_test.dart
similarity index 92%
rename from packages/devtools_app/test/memory/framework/memory_screen_test.dart
rename to packages/devtools_app/test/screens/memory/framework/memory_screen_test.dart
index f431335..35f40ae 100644
--- a/packages/devtools_app/test/memory/framework/memory_screen_test.dart
+++ b/packages/devtools_app/test/screens/memory/framework/memory_screen_test.dart

@@ -19,11 +19,11 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
-import '../../test_infra/matchers/matchers.dart';
-import '../../test_infra/test_data/memory.dart';
-import '../../test_infra/test_data/memory/offline/memory_offline_data.dart'
+import '../../../test_infra/matchers/matchers.dart';
+import '../../../test_infra/test_data/memory.dart';
+import '../../../test_infra/test_data/memory/offline/memory_offline_data.dart'
     as memory_offline;
-import '../../test_infra/test_data/memory_allocation.dart';
+import '../../../test_infra/test_data/memory_allocation.dart';
 
 void main() {
   late MemoryController controller;
@@ -142,7 +142,7 @@
         await expectLater(
           find.byType(MemoryScreenBody),
           matchesDevToolsGolden(
-            '../../test_infra/goldens/memory/load_offline_data_profile_tab.png',
+            '../../../test_infra/goldens/memory/load_offline_data_profile_tab.png',
           ),
         );
 
@@ -158,7 +158,7 @@
         // await expectLater(
         //   find.byType(MemoryScreenBody),
         //   matchesDevToolsGolden(
-        //     '../../test_infra/goldens/memory/load_offline_data_diff_tab.png',
+        //     '../../../test_infra/goldens/memory/load_offline_data_diff_tab.png',
         //   ),
         // );
         // Select a snapshot.
@@ -170,7 +170,7 @@
         // await expectLater(
         //   find.byType(MemoryScreenBody),
         //   matchesDevToolsGolden(
-        //     '../../test_infra/goldens/memory/load_offline_data_diff_tab_snapshot_selected.png',
+        //     '../../../test_infra/goldens/memory/load_offline_data_diff_tab_snapshot_selected.png',
         //   ),
         // );
 
@@ -195,7 +195,7 @@
         await expectLater(
           find.byType(MemoryScreenBody),
           matchesDevToolsGolden(
-            '../../test_infra/goldens/memory/load_offline_data_trace_tab.png',
+            '../../../test_infra/goldens/memory/load_offline_data_trace_tab.png',
           ),
         );
       });

diff --git a/packages/devtools_app/test/memory/framework/memory_service_test.dart b/packages/devtools_app/test/screens/memory/framework/memory_service_test.dart
similarity index 92%
rename from packages/devtools_app/test/memory/framework/memory_service_test.dart
rename to packages/devtools_app/test/screens/memory/framework/memory_service_test.dart
index 14f43f6..ddb274d 100644
--- a/packages/devtools_app/test/memory/framework/memory_service_test.dart
+++ b/packages/devtools_app/test/screens/memory/framework/memory_service_test.dart

@@ -6,8 +6,9 @@
 import 'package:devtools_app/src/screens/memory/shared/primitives/memory_timeline.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../test_infra/flutter_test_driver.dart' show FlutterRunConfiguration;
-import '../../test_infra/flutter_test_environment.dart';
+import '../../../test_infra/flutter_test_driver.dart'
+    show FlutterRunConfiguration;
+import '../../../test_infra/flutter_test_environment.dart';
 
 late MemoryController memoryController;
 

diff --git a/packages/devtools_app/test/memory/profile/allocation_profile_table_view_test.dart b/packages/devtools_app/test/screens/memory/profile/allocation_profile_table_view_test.dart
similarity index 99%
rename from packages/devtools_app/test/memory/profile/allocation_profile_table_view_test.dart
rename to packages/devtools_app/test/screens/memory/profile/allocation_profile_table_view_test.dart
index 424e74c..ff0cfb7 100644
--- a/packages/devtools_app/test/memory/profile/allocation_profile_table_view_test.dart
+++ b/packages/devtools_app/test/screens/memory/profile/allocation_profile_table_view_test.dart

@@ -15,7 +15,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../test_infra/scenes/memory/default.dart';
+import '../../../test_infra/scenes/memory/default.dart';
 
 void main() {
   late MemoryDefaultScene scene;

diff --git a/packages/devtools_app/test/memory/shared/heap/class_filter_test.dart b/packages/devtools_app/test/screens/memory/shared/heap/class_filter_test.dart
similarity index 100%
rename from packages/devtools_app/test/memory/shared/heap/class_filter_test.dart
rename to packages/devtools_app/test/screens/memory/shared/heap/class_filter_test.dart


diff --git a/packages/devtools_app/test/memory/shared/heap/heap_analyzer_golden_test.dart b/packages/devtools_app/test/screens/memory/shared/heap/heap_analyzer_golden_test.dart
similarity index 96%
rename from packages/devtools_app/test/memory/shared/heap/heap_analyzer_golden_test.dart
rename to packages/devtools_app/test/screens/memory/shared/heap/heap_analyzer_golden_test.dart
index ea45a77..4dc0bf2 100644
--- a/packages/devtools_app/test/memory/shared/heap/heap_analyzer_golden_test.dart
+++ b/packages/devtools_app/test/screens/memory/shared/heap/heap_analyzer_golden_test.dart

@@ -8,7 +8,7 @@
 import 'package:devtools_app/src/shared/memory/simple_items.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../../test_infra/test_data/memory/heap/heap_data.dart';
+import '../../../../test_infra/test_data/memory/heap/heap_data.dart';
 
 void main() {
   for (final t in goldenHeapTests) {

diff --git a/packages/devtools_app/test/memory/shared/heap/heap_analyzer_test.dart b/packages/devtools_app/test/screens/memory/shared/heap/heap_analyzer_test.dart
similarity index 98%
rename from packages/devtools_app/test/memory/shared/heap/heap_analyzer_test.dart
rename to packages/devtools_app/test/screens/memory/shared/heap/heap_analyzer_test.dart
index 922026d..74fd06b 100644
--- a/packages/devtools_app/test/memory/shared/heap/heap_analyzer_test.dart
+++ b/packages/devtools_app/test/screens/memory/shared/heap/heap_analyzer_test.dart

@@ -7,7 +7,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../../../test_infra/test_data/memory/heap/heap_graph_fakes.dart';
+import '../../../../test_infra/test_data/memory/heap/heap_graph_fakes.dart';
 
 void main() {
   for (final t in _sizeTests) {

diff --git a/packages/devtools_app/test/memory/shared/heap/heap_test.dart b/packages/devtools_app/test/screens/memory/shared/heap/heap_test.dart
similarity index 97%
rename from packages/devtools_app/test/memory/shared/heap/heap_test.dart
rename to packages/devtools_app/test/screens/memory/shared/heap/heap_test.dart
index 8154162..679f3ac 100644
--- a/packages/devtools_app/test/memory/shared/heap/heap_test.dart
+++ b/packages/devtools_app/test/screens/memory/shared/heap/heap_test.dart

@@ -7,7 +7,7 @@
 import 'package:devtools_app/src/shared/memory/heap_data.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../../test_infra/test_data/memory/heap/heap_graph_fakes.dart';
+import '../../../../test_infra/test_data/memory/heap/heap_graph_fakes.dart';
 
 class _ClassSizeTest {
   _ClassSizeTest({

diff --git a/packages/devtools_app/test/memory/shared/primitives/class_name_test.dart b/packages/devtools_app/test/screens/memory/shared/primitives/class_name_test.dart
similarity index 100%
rename from packages/devtools_app/test/memory/shared/primitives/class_name_test.dart
rename to packages/devtools_app/test/screens/memory/shared/primitives/class_name_test.dart


diff --git a/packages/devtools_app/test/memory/tracing/tracing_pane_controller_test.dart b/packages/devtools_app/test/screens/memory/tracing/tracing_pane_controller_test.dart
similarity index 100%
rename from packages/devtools_app/test/memory/tracing/tracing_pane_controller_test.dart
rename to packages/devtools_app/test/screens/memory/tracing/tracing_pane_controller_test.dart


diff --git a/packages/devtools_app/test/memory/tracing/tracing_view_test.dart b/packages/devtools_app/test/screens/memory/tracing/tracing_view_test.dart
similarity index 99%
rename from packages/devtools_app/test/memory/tracing/tracing_view_test.dart
rename to packages/devtools_app/test/screens/memory/tracing/tracing_view_test.dart
index 3267d48..20b748c 100644
--- a/packages/devtools_app/test/memory/tracing/tracing_view_test.dart
+++ b/packages/devtools_app/test/screens/memory/tracing/tracing_view_test.dart

@@ -18,8 +18,8 @@
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../../test_infra/scenes/memory/default.dart';
-import '../../test_infra/utils/test_utils.dart';
+import '../../../test_infra/scenes/memory/default.dart';
+import '../../../test_infra/utils/test_utils.dart';
 
 // TODO(bkonyi): add tests for multi-isolate support.
 // See https://github.com/flutter/devtools/issues/4537.

diff --git a/packages/devtools_app/test/network/har_network_test.dart b/packages/devtools_app/test/screens/network/har_network_test.dart
similarity index 97%
rename from packages/devtools_app/test/network/har_network_test.dart
rename to packages/devtools_app/test/screens/network/har_network_test.dart
index 0520c93..849ab88 100644
--- a/packages/devtools_app/test/network/har_network_test.dart
+++ b/packages/devtools_app/test/screens/network/har_network_test.dart

@@ -12,7 +12,7 @@
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
-  final file = File('test/network/sample_requests.json');
+  final file = File('test/test_infra/test_data/network/sample_requests.json');
   final fileContent = file.readAsStringSync();
   final jsonData = jsonDecode(fileContent) as Map<String, Object?>;
 

diff --git a/packages/devtools_app/test/network/network_controller_test.dart b/packages/devtools_app/test/screens/network/network_controller_test.dart
similarity index 100%
rename from packages/devtools_app/test/network/network_controller_test.dart
rename to packages/devtools_app/test/screens/network/network_controller_test.dart


diff --git a/packages/devtools_app/test/network/network_model_test.dart b/packages/devtools_app/test/screens/network/network_model_test.dart
similarity index 99%
rename from packages/devtools_app/test/network/network_model_test.dart
rename to packages/devtools_app/test/screens/network/network_model_test.dart
index 2257d83..d7a0d8a 100644
--- a/packages/devtools_app/test/network/network_model_test.dart
+++ b/packages/devtools_app/test/screens/network/network_model_test.dart

@@ -10,7 +10,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_infra/test_data/network.dart';
+import '../../test_infra/test_data/network.dart';
 import 'utils/network_test_utils.dart';
 
 void main() {

diff --git a/packages/devtools_app/test/network/network_profiler_test.dart b/packages/devtools_app/test/screens/network/network_profiler_test.dart
similarity index 99%
rename from packages/devtools_app/test/network/network_profiler_test.dart
rename to packages/devtools_app/test/screens/network/network_profiler_test.dart
index 410a78c..7ef9915 100644
--- a/packages/devtools_app/test/network/network_profiler_test.dart
+++ b/packages/devtools_app/test/screens/network/network_profiler_test.dart

@@ -18,7 +18,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_infra/test_data/network.dart';
+import '../../test_infra/test_data/network.dart';
 import 'utils/network_test_utils.dart';
 
 NetworkController controller = NetworkController();

diff --git a/packages/devtools_app/test/network/network_request_inspector_test.dart b/packages/devtools_app/test/screens/network/network_request_inspector_test.dart
similarity index 98%
rename from packages/devtools_app/test/network/network_request_inspector_test.dart
rename to packages/devtools_app/test/screens/network/network_request_inspector_test.dart
index f063621..ebd50aa 100644
--- a/packages/devtools_app/test/network/network_request_inspector_test.dart
+++ b/packages/devtools_app/test/screens/network/network_request_inspector_test.dart

@@ -15,8 +15,8 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_infra/test_data/network.dart';
-import '../test_infra/utils/test_utils.dart';
+import '../../test_infra/test_data/network.dart';
+import '../../test_infra/utils/test_utils.dart';
 
 void main() {
   group('NetworkRequestInspector', () {

diff --git a/packages/devtools_app/test/network/network_screen_test.dart b/packages/devtools_app/test/screens/network/network_screen_test.dart
similarity index 100%
rename from packages/devtools_app/test/network/network_screen_test.dart
rename to packages/devtools_app/test/screens/network/network_screen_test.dart


diff --git a/packages/devtools_app/test/network/network_table_test.dart b/packages/devtools_app/test/screens/network/network_table_test.dart
similarity index 98%
rename from packages/devtools_app/test/network/network_table_test.dart
rename to packages/devtools_app/test/screens/network/network_table_test.dart
index 46d125d..d12d1b6 100644
--- a/packages/devtools_app/test/network/network_table_test.dart
+++ b/packages/devtools_app/test/screens/network/network_table_test.dart

@@ -12,7 +12,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_infra/test_data/network.dart';
+import '../../test_infra/test_data/network.dart';
 
 import 'utils/network_test_utils.dart';
 

diff --git a/packages/devtools_app/test/network/utils/network_test_utils.dart b/packages/devtools_app/test/screens/network/utils/network_test_utils.dart
similarity index 94%
rename from packages/devtools_app/test/network/utils/network_test_utils.dart
rename to packages/devtools_app/test/screens/network/utils/network_test_utils.dart
index a04001f..b286f46 100644
--- a/packages/devtools_app/test/network/utils/network_test_utils.dart
+++ b/packages/devtools_app/test/screens/network/utils/network_test_utils.dart

@@ -4,7 +4,7 @@
 
 import 'package:vm_service/vm_service.dart';
 
-import '../../test_infra/test_data/network.dart';
+import '../../../test_infra/test_data/network.dart';
 
 SocketProfile loadSocketProfile() {
   return SocketProfile(

diff --git a/packages/devtools_app/test/performance/controls/enhance_tracing_test.dart b/packages/devtools_app/test/screens/performance/controls/enhance_tracing_test.dart
similarity index 100%
rename from packages/devtools_app/test/performance/controls/enhance_tracing_test.dart
rename to packages/devtools_app/test/screens/performance/controls/enhance_tracing_test.dart


diff --git a/packages/devtools_app/test/performance/controls/performance_controls_test.dart b/packages/devtools_app/test/screens/performance/controls/performance_controls_test.dart
similarity index 100%
rename from packages/devtools_app/test/performance/controls/performance_controls_test.dart
rename to packages/devtools_app/test/screens/performance/controls/performance_controls_test.dart


diff --git a/packages/devtools_app/test/performance/flutter_frames/flutter_frame_model_test.dart b/packages/devtools_app/test/screens/performance/flutter_frames/flutter_frame_model_test.dart
similarity index 95%
rename from packages/devtools_app/test/performance/flutter_frames/flutter_frame_model_test.dart
rename to packages/devtools_app/test/screens/performance/flutter_frames/flutter_frame_model_test.dart
index cc4d5c5..549767a 100644
--- a/packages/devtools_app/test/performance/flutter_frames/flutter_frame_model_test.dart
+++ b/packages/devtools_app/test/screens/performance/flutter_frames/flutter_frame_model_test.dart

@@ -5,7 +5,7 @@
 import 'package:devtools_app/devtools_app.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../test_infra/test_data/performance/sample_performance_data.dart';
+import '../../../test_infra/test_data/performance/sample_performance_data.dart';
 
 void main() {
   group('$FlutterFrame', () {

diff --git a/packages/devtools_app/test/performance/flutter_frames/flutter_frames_chart_test.dart b/packages/devtools_app/test/screens/performance/flutter_frames/flutter_frames_chart_test.dart
similarity index 99%
rename from packages/devtools_app/test/performance/flutter_frames/flutter_frames_chart_test.dart
rename to packages/devtools_app/test/screens/performance/flutter_frames/flutter_frames_chart_test.dart
index 15df620..b91af58 100644
--- a/packages/devtools_app/test/performance/flutter_frames/flutter_frames_chart_test.dart
+++ b/packages/devtools_app/test/screens/performance/flutter_frames/flutter_frames_chart_test.dart

@@ -14,7 +14,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../test_infra/test_data/performance/sample_performance_data.dart';
+import '../../../test_infra/test_data/performance/sample_performance_data.dart';
 
 void main() {
   late FlutterFramesController framesController;

diff --git a/packages/devtools_app/test/performance/flutter_frames/flutter_frames_controller_test.dart b/packages/devtools_app/test/screens/performance/flutter_frames/flutter_frames_controller_test.dart
similarity index 97%
rename from packages/devtools_app/test/performance/flutter_frames/flutter_frames_controller_test.dart
rename to packages/devtools_app/test/screens/performance/flutter_frames/flutter_frames_controller_test.dart
index 3c5587b..83c5c24 100644
--- a/packages/devtools_app/test/performance/flutter_frames/flutter_frames_controller_test.dart
+++ b/packages/devtools_app/test/screens/performance/flutter_frames/flutter_frames_controller_test.dart

@@ -12,7 +12,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
-import '../../test_infra/test_data/performance/sample_performance_data.dart';
+import '../../../test_infra/test_data/performance/sample_performance_data.dart';
 
 // TODO(kenz): add better test coverage for [FlutterFramesController].
 void main() {

diff --git a/packages/devtools_app/test/performance/frame_analysis/frame_analysis_model_test.dart b/packages/devtools_app/test/screens/performance/frame_analysis/frame_analysis_model_test.dart
similarity index 97%
rename from packages/devtools_app/test/performance/frame_analysis/frame_analysis_model_test.dart
rename to packages/devtools_app/test/screens/performance/frame_analysis/frame_analysis_model_test.dart
index 58bf887..935be34 100644
--- a/packages/devtools_app/test/performance/frame_analysis/frame_analysis_model_test.dart
+++ b/packages/devtools_app/test/screens/performance/frame_analysis/frame_analysis_model_test.dart

@@ -5,7 +5,7 @@
 import 'package:devtools_app/devtools_app.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../test_infra/test_data/performance/sample_performance_data.dart';
+import '../../../test_infra/test_data/performance/sample_performance_data.dart';
 
 void main() {
   group('FrameAnalysis', () {

diff --git a/packages/devtools_app/test/performance/frame_analysis/frame_analysis_test.dart b/packages/devtools_app/test/screens/performance/frame_analysis/frame_analysis_test.dart
similarity index 94%
rename from packages/devtools_app/test/performance/frame_analysis/frame_analysis_test.dart
rename to packages/devtools_app/test/screens/performance/frame_analysis/frame_analysis_test.dart
index 7d967a8..d3d2f89 100644
--- a/packages/devtools_app/test/performance/frame_analysis/frame_analysis_test.dart
+++ b/packages/devtools_app/test/screens/performance/frame_analysis/frame_analysis_test.dart

@@ -13,8 +13,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../test_infra/matchers/matchers.dart';
-import '../../test_infra/test_data/performance/sample_performance_data.dart';
+import '../../../test_infra/matchers/matchers.dart';
+import '../../../test_infra/test_data/performance/sample_performance_data.dart';
 
 // TODO(https://github.com/flutter/devtools/issues/4564): add tests here for
 // widget rebuild counts in the Frame Analysis view.
@@ -132,7 +132,7 @@
         await expectLater(
           find.byType(FrameTimeVisualizer),
           matchesDevToolsGolden(
-            '../../test_infra/goldens/performance/frame_analysis/frame_time_visualizer.png',
+            '../../../test_infra/goldens/performance/frame_analysis/frame_time_visualizer.png',
           ),
         );
       });
@@ -163,7 +163,7 @@
           await expectLater(
             find.byType(FrameTimeVisualizer),
             matchesDevToolsGolden(
-              '../../test_infra/goldens/performance/frame_analysis/frame_time_visualizer_icons_only.png',
+              '../../../test_infra/goldens/performance/frame_analysis/frame_time_visualizer_icons_only.png',
             ),
           );
         },
@@ -204,7 +204,7 @@
           await expectLater(
             find.byType(FrameTimeVisualizer),
             matchesDevToolsGolden(
-              '../../test_infra/goldens/performance/frame_analysis/frame_time_visualizer_with_shader_compilation.png',
+              '../../../test_infra/goldens/performance/frame_analysis/frame_time_visualizer_with_shader_compilation.png',
             ),
           );
         },

diff --git a/packages/devtools_app/test/performance/frame_analysis/frame_hints_test.dart b/packages/devtools_app/test/screens/performance/frame_analysis/frame_hints_test.dart
similarity index 99%
rename from packages/devtools_app/test/performance/frame_analysis/frame_hints_test.dart
rename to packages/devtools_app/test/screens/performance/frame_analysis/frame_hints_test.dart
index 7c538da..aabe2da 100644
--- a/packages/devtools_app/test/performance/frame_analysis/frame_hints_test.dart
+++ b/packages/devtools_app/test/screens/performance/frame_analysis/frame_hints_test.dart

@@ -13,7 +13,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
-import '../../test_infra/test_data/performance/sample_performance_data.dart';
+import '../../../test_infra/test_data/performance/sample_performance_data.dart';
 
 void main() {
   const windowSize = Size(4000.0, 1000.0);

diff --git a/packages/devtools_app/test/performance/performance_controller_test.dart b/packages/devtools_app/test/screens/performance/performance_controller_test.dart
similarity index 100%
rename from packages/devtools_app/test/performance/performance_controller_test.dart
rename to packages/devtools_app/test/screens/performance/performance_controller_test.dart


diff --git a/packages/devtools_app/test/performance/performance_model_test.dart b/packages/devtools_app/test/screens/performance/performance_model_test.dart
similarity index 96%
rename from packages/devtools_app/test/performance/performance_model_test.dart
rename to packages/devtools_app/test/screens/performance/performance_model_test.dart
index 177d49f..0b355c5 100644
--- a/packages/devtools_app/test/performance/performance_model_test.dart
+++ b/packages/devtools_app/test/screens/performance/performance_model_test.dart

@@ -5,7 +5,7 @@
 import 'package:devtools_app/devtools_app.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../test_infra/test_data/performance/sample_performance_data.dart';
+import '../../test_infra/test_data/performance/sample_performance_data.dart';
 
 void main() {
   group('$OfflinePerformanceData', () {

diff --git a/packages/devtools_app/test/performance/performance_screen_test.dart b/packages/devtools_app/test/screens/performance/performance_screen_test.dart
similarity index 99%
rename from packages/devtools_app/test/performance/performance_screen_test.dart
rename to packages/devtools_app/test/screens/performance/performance_screen_test.dart
index 9f48e29..a20d87e 100644
--- a/packages/devtools_app/test/performance/performance_screen_test.dart
+++ b/packages/devtools_app/test/screens/performance/performance_screen_test.dart

@@ -23,7 +23,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
-import '../test_infra/test_data/performance/sample_performance_data.dart';
+import '../../test_infra/test_data/performance/sample_performance_data.dart';
 
 void main() {
   const windowSize = Size(3000.0, 1000.0);

diff --git a/packages/devtools_app/test/shared/widget_rebuild_counts_test.dart b/packages/devtools_app/test/screens/performance/rebuild_stats/widget_rebuild_counts_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/widget_rebuild_counts_test.dart
rename to packages/devtools_app/test/screens/performance/rebuild_stats/widget_rebuild_counts_test.dart


diff --git a/packages/devtools_app/test/performance/tabbed_performance_view_test.dart b/packages/devtools_app/test/screens/performance/tabbed_performance_view_test.dart
similarity index 98%
rename from packages/devtools_app/test/performance/tabbed_performance_view_test.dart
rename to packages/devtools_app/test/screens/performance/tabbed_performance_view_test.dart
index d8d388b..26d87eb 100644
--- a/packages/devtools_app/test/performance/tabbed_performance_view_test.dart
+++ b/packages/devtools_app/test/screens/performance/tabbed_performance_view_test.dart

@@ -18,7 +18,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
-import '../test_infra/test_data/performance/sample_performance_data.dart';
+import '../../test_infra/test_data/performance/sample_performance_data.dart';
 
 void main() {
   late FakeServiceConnectionManager fakeServiceConnection;

diff --git a/packages/devtools_app/test/performance/timeline_events/perfetto/tracing_model_test.dart b/packages/devtools_app/test/screens/performance/timeline_events/perfetto/tracing_model_test.dart
similarity index 98%
rename from packages/devtools_app/test/performance/timeline_events/perfetto/tracing_model_test.dart
rename to packages/devtools_app/test/screens/performance/timeline_events/perfetto/tracing_model_test.dart
index de0b9bd..8ef3530 100644
--- a/packages/devtools_app/test/performance/timeline_events/perfetto/tracing_model_test.dart
+++ b/packages/devtools_app/test/screens/performance/timeline_events/perfetto/tracing_model_test.dart

@@ -10,7 +10,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:vm_service_protos/vm_service_protos.dart';
 
-import '../../../test_infra/test_data/performance/sample_performance_data.dart';
+import '../../../../test_infra/test_data/performance/sample_performance_data.dart';
 
 void main() {
   group('$PerfettoTrace', () {

diff --git a/packages/devtools_app/test/performance/timeline_events/timeline_event_processor_test.dart b/packages/devtools_app/test/screens/performance/timeline_events/timeline_event_processor_test.dart
similarity index 98%
rename from packages/devtools_app/test/performance/timeline_events/timeline_event_processor_test.dart
rename to packages/devtools_app/test/screens/performance/timeline_events/timeline_event_processor_test.dart
index 30a1508..a3a6144 100644
--- a/packages/devtools_app/test/performance/timeline_events/timeline_event_processor_test.dart
+++ b/packages/devtools_app/test/screens/performance/timeline_events/timeline_event_processor_test.dart

@@ -13,7 +13,7 @@
 import 'package:mockito/mockito.dart';
 import 'package:vm_service_protos/vm_service_protos.dart';
 
-import '../../test_infra/test_data/performance/sample_performance_data.dart';
+import '../../../test_infra/test_data/performance/sample_performance_data.dart';
 
 void main() {
   final originalTrackEventPackets = List.of(allTrackEventPackets);

diff --git a/packages/devtools_app/test/performance/timeline_events/timeline_events_controller_test.dart b/packages/devtools_app/test/screens/performance/timeline_events/timeline_events_controller_test.dart
similarity index 97%
rename from packages/devtools_app/test/performance/timeline_events/timeline_events_controller_test.dart
rename to packages/devtools_app/test/screens/performance/timeline_events/timeline_events_controller_test.dart
index f108276..30546f7 100644
--- a/packages/devtools_app/test/performance/timeline_events/timeline_events_controller_test.dart
+++ b/packages/devtools_app/test/screens/performance/timeline_events/timeline_events_controller_test.dart

@@ -11,7 +11,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
-import '../../test_infra/test_data/performance/sample_performance_data.dart';
+import '../../../test_infra/test_data/performance/sample_performance_data.dart';
 
 // TODO(kenz): add better test coverage for [TimelineEventsController].
 

diff --git a/packages/devtools_app/test/vm_developer/object_inspector/class_hierarchy_explorer_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/class_hierarchy_explorer_test.dart
similarity index 98%
rename from packages/devtools_app/test/vm_developer/object_inspector/class_hierarchy_explorer_test.dart
rename to packages/devtools_app/test/screens/vm_developer/object_inspector/class_hierarchy_explorer_test.dart
index a741576..a36caec 100644
--- a/packages/devtools_app/test/vm_developer/object_inspector/class_hierarchy_explorer_test.dart
+++ b/packages/devtools_app/test/screens/vm_developer/object_inspector/class_hierarchy_explorer_test.dart

@@ -12,7 +12,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../../test_infra/utils/tree_utils.dart';
+import '../../../test_infra/utils/tree_utils.dart';
 
 void main() {
   const windowSize = Size(2560.0, 1338.0);

diff --git a/packages/devtools_app/test/vm_developer/object_inspector/object_inspector_view_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/object_inspector_view_test.dart
similarity index 100%
rename from packages/devtools_app/test/vm_developer/object_inspector/object_inspector_view_test.dart
rename to packages/devtools_app/test/screens/vm_developer/object_inspector/object_inspector_view_test.dart


diff --git a/packages/devtools_app/test/vm_developer/object_inspector/object_viewport_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/object_viewport_test.dart
similarity index 100%
rename from packages/devtools_app/test/vm_developer/object_inspector/object_viewport_test.dart
rename to packages/devtools_app/test/screens/vm_developer/object_inspector/object_viewport_test.dart


diff --git a/packages/devtools_app/test/vm_developer/object_inspector/vm_class_display_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_class_display_test.dart
similarity index 100%
rename from packages/devtools_app/test/vm_developer/object_inspector/vm_class_display_test.dart
rename to packages/devtools_app/test/screens/vm_developer/object_inspector/vm_class_display_test.dart


diff --git a/packages/devtools_app/test/vm_developer/object_inspector/vm_code_display_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_code_display_test.dart
similarity index 100%
rename from packages/devtools_app/test/vm_developer/object_inspector/vm_code_display_test.dart
rename to packages/devtools_app/test/screens/vm_developer/object_inspector/vm_code_display_test.dart


diff --git a/packages/devtools_app/test/vm_developer/object_inspector/vm_developer_common_widgets_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_developer_common_widgets_test.dart
similarity index 100%
rename from packages/devtools_app/test/vm_developer/object_inspector/vm_developer_common_widgets_test.dart
rename to packages/devtools_app/test/screens/vm_developer/object_inspector/vm_developer_common_widgets_test.dart


diff --git a/packages/devtools_app/test/vm_developer/object_inspector/vm_field_display_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_field_display_test.dart
similarity index 100%
rename from packages/devtools_app/test/vm_developer/object_inspector/vm_field_display_test.dart
rename to packages/devtools_app/test/screens/vm_developer/object_inspector/vm_field_display_test.dart


diff --git a/packages/devtools_app/test/vm_developer/object_inspector/vm_function_display_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_function_display_test.dart
similarity index 100%
rename from packages/devtools_app/test/vm_developer/object_inspector/vm_function_display_test.dart
rename to packages/devtools_app/test/screens/vm_developer/object_inspector/vm_function_display_test.dart


diff --git a/packages/devtools_app/test/vm_developer/object_inspector/vm_ic_data_display_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_ic_data_display_test.dart
similarity index 100%
rename from packages/devtools_app/test/vm_developer/object_inspector/vm_ic_data_display_test.dart
rename to packages/devtools_app/test/screens/vm_developer/object_inspector/vm_ic_data_display_test.dart


diff --git a/packages/devtools_app/test/vm_developer/object_inspector/vm_library_display_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_library_display_test.dart
similarity index 100%
rename from packages/devtools_app/test/vm_developer/object_inspector/vm_library_display_test.dart
rename to packages/devtools_app/test/screens/vm_developer/object_inspector/vm_library_display_test.dart


diff --git a/packages/devtools_app/test/vm_developer/object_inspector/vm_object_pool_display_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_object_pool_display_test.dart
similarity index 100%
rename from packages/devtools_app/test/vm_developer/object_inspector/vm_object_pool_display_test.dart
rename to packages/devtools_app/test/screens/vm_developer/object_inspector/vm_object_pool_display_test.dart


diff --git a/packages/devtools_app/test/vm_developer/object_inspector/vm_script_display_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_script_display_test.dart
similarity index 100%
rename from packages/devtools_app/test/vm_developer/object_inspector/vm_script_display_test.dart
rename to packages/devtools_app/test/screens/vm_developer/object_inspector/vm_script_display_test.dart


diff --git a/packages/devtools_app/test/vm_developer/object_inspector/vm_simple_list_display_test.dart b/packages/devtools_app/test/screens/vm_developer/object_inspector/vm_simple_list_display_test.dart
similarity index 100%
rename from packages/devtools_app/test/vm_developer/object_inspector/vm_simple_list_display_test.dart
rename to packages/devtools_app/test/screens/vm_developer/object_inspector/vm_simple_list_display_test.dart


diff --git a/packages/devtools_app/test/vm_developer/vm_developer_test_utils.dart b/packages/devtools_app/test/screens/vm_developer/vm_developer_test_utils.dart
similarity index 100%
rename from packages/devtools_app/test/vm_developer/vm_developer_test_utils.dart
rename to packages/devtools_app/test/screens/vm_developer/vm_developer_test_utils.dart


diff --git a/packages/devtools_app/test/shared/connection_info_test.dart b/packages/devtools_app/test/service/connection_info_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/connection_info_test.dart
rename to packages/devtools_app/test/service/connection_info_test.dart


diff --git a/packages/devtools_app/test/shared/service_extension_widgets_test.dart b/packages/devtools_app/test/service/service_extension_widgets_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/service_extension_widgets_test.dart
rename to packages/devtools_app/test/service/service_extension_widgets_test.dart


diff --git a/packages/devtools_app/test/shared/timeline_streams_test.dart b/packages/devtools_app/test/service/timeline_streams_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/timeline_streams_test.dart
rename to packages/devtools_app/test/service/timeline_streams_test.dart


diff --git a/packages/devtools_app/test/shared/vm_flags_test.dart b/packages/devtools_app/test/service/vm_flags_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/vm_flags_test.dart
rename to packages/devtools_app/test/service/vm_flags_test.dart


diff --git a/packages/devtools_app/test/shared/analytics_prompt_test.dart b/packages/devtools_app/test/shared/analytics/analytics_prompt_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/analytics_prompt_test.dart
rename to packages/devtools_app/test/shared/analytics/analytics_prompt_test.dart


diff --git a/packages/devtools_app/test/shared/flame_chart_test.dart b/packages/devtools_app/test/shared/charts/flame_chart_test.dart
similarity index 99%
rename from packages/devtools_app/test/shared/flame_chart_test.dart
rename to packages/devtools_app/test/shared/charts/flame_chart_test.dart
index 8b1b466..52279ed 100644
--- a/packages/devtools_app/test/shared/flame_chart_test.dart
+++ b/packages/devtools_app/test/shared/charts/flame_chart_test.dart

@@ -16,7 +16,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
-import '../test_infra/test_data/cpu_profiler/cpu_profile.dart';
+import '../../test_infra/test_data/cpu_profiler/cpu_profile.dart';
 
 void main() {
   const defaultZoom = 1.0;

diff --git a/packages/devtools_app/test/shared/treemap_test.dart b/packages/devtools_app/test/shared/charts/treemap_test.dart
similarity index 94%
rename from packages/devtools_app/test/shared/treemap_test.dart
rename to packages/devtools_app/test/shared/charts/treemap_test.dart
index 876a725..b8a52aa 100644
--- a/packages/devtools_app/test/shared/treemap_test.dart
+++ b/packages/devtools_app/test/shared/charts/treemap_test.dart

@@ -15,11 +15,11 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:vm_snapshot_analysis/treemap.dart';
 
-import '../test_infra/matchers/matchers.dart';
-import '../test_infra/test_data/app_size/apk_analysis.dart';
-import '../test_infra/test_data/app_size/new_v8.dart';
-import '../test_infra/test_data/app_size/sizes.dart';
-import '../test_infra/test_data/app_size/small_sizes.dart';
+import '../../test_infra/matchers/matchers.dart';
+import '../../test_infra/test_data/app_size/apk_analysis.dart';
+import '../../test_infra/test_data/app_size/new_v8.dart';
+import '../../test_infra/test_data/app_size/sizes.dart';
+import '../../test_infra/test_data/app_size/small_sizes.dart';
 
 void main() {
   TreemapNode? root;
@@ -172,7 +172,7 @@
 
       await expectLater(
         find.byKey(treemapKey),
-        matchesDevToolsGolden('../test_infra/goldens/treemap_sizes.png'),
+        matchesDevToolsGolden('../../test_infra/goldens/treemap_sizes.png'),
       );
     }, skip: kIsWeb);
   });
@@ -192,7 +192,7 @@
 
       await expectLater(
         find.byKey(treemapKey),
-        matchesDevToolsGolden('../test_infra/goldens/treemap_v8.png'),
+        matchesDevToolsGolden('../../test_infra/goldens/treemap_v8.png'),
       );
       // Await delay for golden comparison.
       await tester.pumpAndSettle(const Duration(seconds: 2));
@@ -214,7 +214,7 @@
 
       await expectLater(
         find.byKey(treemapKey),
-        matchesDevToolsGolden('../test_infra/goldens/treemap_apk.png'),
+        matchesDevToolsGolden('../../test_infra/goldens/treemap_apk.png'),
       );
       // Await delay for golden comparison.
       await tester.pumpAndSettle(const Duration(seconds: 2));

diff --git a/packages/devtools_app/test/shared/dart_object_node_test.dart b/packages/devtools_app/test/shared/diagnostics/dart_object_node_test.dart
similarity index 97%
rename from packages/devtools_app/test/shared/dart_object_node_test.dart
rename to packages/devtools_app/test/shared/diagnostics/dart_object_node_test.dart
index 3aa661c..e368245 100644
--- a/packages/devtools_app/test/shared/dart_object_node_test.dart
+++ b/packages/devtools_app/test/shared/diagnostics/dart_object_node_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:flutter_test/flutter_test.dart';
 
-import '../test_infra/utils/variable_utils.dart';
+import '../../test_infra/utils/variable_utils.dart';
 
 void main() {
   setUp(() {

diff --git a/packages/devtools_app/test/shared/routing_test.dart b/packages/devtools_app/test/shared/framework/routing_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/routing_test.dart
rename to packages/devtools_app/test/shared/framework/routing_test.dart


diff --git a/packages/devtools_app/test/shared/screens_test.dart b/packages/devtools_app/test/shared/framework/screens_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/screens_test.dart
rename to packages/devtools_app/test/shared/framework/screens_test.dart


diff --git a/packages/devtools_app/test/shared/visible_screens_test.dart b/packages/devtools_app/test/shared/framework/visible_screens_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/visible_screens_test.dart
rename to packages/devtools_app/test/shared/framework/visible_screens_test.dart


diff --git a/packages/devtools_app/test/shared/banner_messages_test.dart b/packages/devtools_app/test/shared/managers/banner_messages_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/banner_messages_test.dart
rename to packages/devtools_app/test/shared/managers/banner_messages_test.dart


diff --git a/packages/devtools_app/test/shared/error_badge_manager_test.dart b/packages/devtools_app/test/shared/managers/error_badge_manager_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/error_badge_manager_test.dart
rename to packages/devtools_app/test/shared/managers/error_badge_manager_test.dart


diff --git a/packages/devtools_app/test/shared/survey_test.dart b/packages/devtools_app/test/shared/managers/survey_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/survey_test.dart
rename to packages/devtools_app/test/shared/managers/survey_test.dart


diff --git a/packages/devtools_app/test/shared/review_history_on_disconnect_test.dart b/packages/devtools_app/test/shared/offline/review_history_on_disconnect_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/review_history_on_disconnect_test.dart
rename to packages/devtools_app/test/shared/offline/review_history_on_disconnect_test.dart


diff --git a/packages/devtools_app/test/shared/preferences_controller_test.dart b/packages/devtools_app/test/shared/preferences/preferences_controller_test.dart
similarity index 99%
rename from packages/devtools_app/test/shared/preferences_controller_test.dart
rename to packages/devtools_app/test/shared/preferences/preferences_controller_test.dart
index d834fc4..b7e97f9 100644
--- a/packages/devtools_app/test/shared/preferences_controller_test.dart
+++ b/packages/devtools_app/test/shared/preferences/preferences_controller_test.dart

@@ -9,7 +9,7 @@
 import 'package:devtools_test/devtools_test.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../test_infra/flutter_test_storage.dart';
+import '../../test_infra/flutter_test_storage.dart';
 
 void main() {
   setGlobal(ServiceConnectionManager, FakeServiceConnectionManager());

diff --git a/packages/devtools_app/test/shared/enum_utils_test.dart b/packages/devtools_app/test/shared/primitives/enum_utils_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/enum_utils_test.dart
rename to packages/devtools_app/test/shared/primitives/enum_utils_test.dart


diff --git a/packages/devtools_app/test/shared/extent_delegate_list_view_test.dart b/packages/devtools_app/test/shared/primitives/extent_delegate_list_view_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/extent_delegate_list_view_test.dart
rename to packages/devtools_app/test/shared/primitives/extent_delegate_list_view_test.dart


diff --git a/packages/devtools_app/test/shared/extent_delegate_test.dart b/packages/devtools_app/test/shared/primitives/extent_delegate_test.dart
similarity index 98%
rename from packages/devtools_app/test/shared/extent_delegate_test.dart
rename to packages/devtools_app/test/shared/primitives/extent_delegate_test.dart
index fc6fbab..816c9a8 100644
--- a/packages/devtools_app/test/shared/extent_delegate_test.dart
+++ b/packages/devtools_app/test/shared/primitives/extent_delegate_test.dart

@@ -11,8 +11,8 @@
 import 'package:flutter/rendering.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../test_infra/utils/extent_delegate_utils.dart';
-import '../test_infra/utils/rendering_tester.dart';
+import '../../test_infra/utils/extent_delegate_utils.dart';
+import '../../test_infra/utils/rendering_tester.dart';
 
 void main() {
   TestRenderingFlutterBinding.ensureInitialized();

diff --git a/packages/devtools_app/test/shared/history_manager_test.dart b/packages/devtools_app/test/shared/primitives/history_manager_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/history_manager_test.dart
rename to packages/devtools_app/test/shared/primitives/history_manager_test.dart


diff --git a/packages/devtools_app/test/shared/linked_scroll_controller_test.dart b/packages/devtools_app/test/shared/primitives/linked_scroll_controller_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/linked_scroll_controller_test.dart
rename to packages/devtools_app/test/shared/primitives/linked_scroll_controller_test.dart


diff --git a/packages/devtools_app/test/shared/utils/list_queue_value_notifier_test.dart b/packages/devtools_app/test/shared/primitives/list_queue_value_notifier_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/utils/list_queue_value_notifier_test.dart
rename to packages/devtools_app/test/shared/primitives/list_queue_value_notifier_test.dart


diff --git a/packages/devtools_app/test/shared/math_utils_test.dart b/packages/devtools_app/test/shared/primitives/math_utils_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/math_utils_test.dart
rename to packages/devtools_app/test/shared/primitives/math_utils_test.dart


diff --git a/packages/devtools_app/test/shared/message_bus_test.dart b/packages/devtools_app/test/shared/primitives/message_bus_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/message_bus_test.dart
rename to packages/devtools_app/test/shared/primitives/message_bus_test.dart


diff --git a/packages/devtools_app/test/shared/query_parameters_test.dart b/packages/devtools_app/test/shared/primitives/query_parameters_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/query_parameters_test.dart
rename to packages/devtools_app/test/shared/primitives/query_parameters_test.dart


diff --git a/packages/devtools_app/test/shared/trees_test.dart b/packages/devtools_app/test/shared/primitives/trees_test.dart
similarity index 99%
rename from packages/devtools_app/test/shared/trees_test.dart
rename to packages/devtools_app/test/shared/primitives/trees_test.dart
index 744e0fa..c48400c 100644
--- a/packages/devtools_app/test/shared/trees_test.dart
+++ b/packages/devtools_app/test/shared/primitives/trees_test.dart

@@ -6,7 +6,7 @@
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
-  group('TreeNode', () {
+  group('$TreeNode', () {
     test('depth', () {
       expect(testTreeNode.depth, equals(4));
       expect(treeNode1.depth, equals(1));

diff --git a/packages/devtools_app/test/shared/url_utils_test.dart b/packages/devtools_app/test/shared/primitives/url_utils_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/url_utils_test.dart
rename to packages/devtools_app/test/shared/primitives/url_utils_test.dart


diff --git a/packages/devtools_app/test/shared/server_api_client_test.dart b/packages/devtools_app/test/shared/server/server_api_client_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/server_api_client_test.dart
rename to packages/devtools_app/test/shared/server/server_api_client_test.dart


diff --git a/packages/devtools_app/test/shared/json_to_service_cache_test.dart b/packages/devtools_app/test/shared/service/json_to_service_cache_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/json_to_service_cache_test.dart
rename to packages/devtools_app/test/shared/service/json_to_service_cache_test.dart


diff --git a/packages/devtools_app/test/shared/table_test.dart b/packages/devtools_app/test/shared/table/table_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/table_test.dart
rename to packages/devtools_app/test/shared/table/table_test.dart


diff --git a/packages/devtools_app/test/shared/auto_complete_test.dart b/packages/devtools_app/test/shared/ui/auto_complete_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/auto_complete_test.dart
rename to packages/devtools_app/test/shared/ui/auto_complete_test.dart


diff --git a/packages/devtools_app/test/shared/common_widgets_test.dart b/packages/devtools_app/test/shared/ui/common_widgets_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/common_widgets_test.dart
rename to packages/devtools_app/test/shared/ui/common_widgets_test.dart


diff --git a/packages/devtools_app/test/shared/editable_list_test.dart b/packages/devtools_app/test/shared/ui/editable_list_test.dart
similarity index 98%
rename from packages/devtools_app/test/shared/editable_list_test.dart
rename to packages/devtools_app/test/shared/ui/editable_list_test.dart
index d6d474b..8c491dd 100644
--- a/packages/devtools_app/test/shared/editable_list_test.dart
+++ b/packages/devtools_app/test/shared/ui/editable_list_test.dart

@@ -10,7 +10,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../test_infra/utils/test_utils.dart';
+import '../../test_infra/utils/test_utils.dart';
 
 void main() {
   const windowSize = Size(1000.0, 1000.0);

diff --git a/packages/devtools_app/test/shared/filter_test.dart b/packages/devtools_app/test/shared/ui/filter_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/filter_test.dart
rename to packages/devtools_app/test/shared/ui/filter_test.dart


diff --git a/packages/devtools_app/test/shared/hover_test.dart b/packages/devtools_app/test/shared/ui/hover_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/hover_test.dart
rename to packages/devtools_app/test/shared/ui/hover_test.dart


diff --git a/packages/devtools_app/test/shared/search_test.dart b/packages/devtools_app/test/shared/ui/search_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/search_test.dart
rename to packages/devtools_app/test/shared/ui/search_test.dart


diff --git a/packages/devtools_app/test/shared/ui_utils_test.dart b/packages/devtools_app/test/shared/ui/ui_utils_test.dart
similarity index 97%
rename from packages/devtools_app/test/shared/ui_utils_test.dart
rename to packages/devtools_app/test/shared/ui/ui_utils_test.dart
index 710a337..3099b81 100644
--- a/packages/devtools_app/test/shared/ui_utils_test.dart
+++ b/packages/devtools_app/test/shared/ui/ui_utils_test.dart

@@ -11,7 +11,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../test_infra/matchers/matchers.dart';
+import '../../test_infra/matchers/matchers.dart';
 
 void main() {
   setUp(() {
@@ -163,7 +163,7 @@
     });
   });
 
-  group('ScreenSize', () {
+  group('$ScreenSize', () {
     testWidgetsWithWindowSize(
       'handles screens with xxs width and xl height',
       const Size(250, 1000),
@@ -278,7 +278,7 @@
     await expectLater(
       find.byKey(root),
       matchesDevToolsGolden(
-        '../test_infra/goldens/offset_scrollbar_startup.png',
+        '../../test_infra/goldens/offset_scrollbar_startup.png',
       ),
     );
 
@@ -289,7 +289,7 @@
     await expectLater(
       find.byKey(root),
       matchesDevToolsGolden(
-        '../test_infra/goldens/offset_scrollbar_scrolled.png',
+        '../../test_infra/goldens/offset_scrollbar_scrolled.png',
       ),
     );
   });

diff --git a/packages/devtools_app/test/shared/vm_flag_widgets_test.dart b/packages/devtools_app/test/shared/ui/vm_flag_widgets_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/vm_flag_widgets_test.dart
rename to packages/devtools_app/test/shared/ui/vm_flag_widgets_test.dart


diff --git a/packages/devtools_app/test/shared/future_work_tracker_test.dart b/packages/devtools_app/test/shared/utils/future_work_tracker_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/future_work_tracker_test.dart
rename to packages/devtools_app/test/shared/utils/future_work_tracker_test.dart


diff --git a/packages/devtools_app/test/shared/utils_test.dart b/packages/devtools_app/test/shared/utils/utils_test.dart
similarity index 100%
rename from packages/devtools_app/test/shared/utils_test.dart
rename to packages/devtools_app/test/shared/utils/utils_test.dart


diff --git a/packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_bidirectional_horizontal.png b/packages/devtools_app/test/test_infra/goldens/inspector/layout_explorer/flex/arrow_bidirectional_horizontal.png
similarity index 100%
rename from packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_bidirectional_horizontal.png
rename to packages/devtools_app/test/test_infra/goldens/inspector/layout_explorer/flex/arrow_bidirectional_horizontal.png
Binary files differ

diff --git a/packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_bidirectional_vertical.png b/packages/devtools_app/test/test_infra/goldens/inspector/layout_explorer/flex/arrow_bidirectional_vertical.png
similarity index 100%
rename from packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_bidirectional_vertical.png
rename to packages/devtools_app/test/test_infra/goldens/inspector/layout_explorer/flex/arrow_bidirectional_vertical.png
Binary files differ

diff --git a/packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_unidirectional_down.png b/packages/devtools_app/test/test_infra/goldens/inspector/layout_explorer/flex/arrow_unidirectional_down.png
similarity index 100%
rename from packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_unidirectional_down.png
rename to packages/devtools_app/test/test_infra/goldens/inspector/layout_explorer/flex/arrow_unidirectional_down.png
Binary files differ

diff --git a/packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_unidirectional_left.png b/packages/devtools_app/test/test_infra/goldens/inspector/layout_explorer/flex/arrow_unidirectional_left.png
similarity index 100%
rename from packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_unidirectional_left.png
rename to packages/devtools_app/test/test_infra/goldens/inspector/layout_explorer/flex/arrow_unidirectional_left.png
Binary files differ

diff --git a/packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_unidirectional_right.png b/packages/devtools_app/test/test_infra/goldens/inspector/layout_explorer/flex/arrow_unidirectional_right.png
similarity index 100%
rename from packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_unidirectional_right.png
rename to packages/devtools_app/test/test_infra/goldens/inspector/layout_explorer/flex/arrow_unidirectional_right.png
Binary files differ

diff --git a/packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_unidirectional_up.png b/packages/devtools_app/test/test_infra/goldens/inspector/layout_explorer/flex/arrow_unidirectional_up.png
similarity index 100%
rename from packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_unidirectional_up.png
rename to packages/devtools_app/test/test_infra/goldens/inspector/layout_explorer/flex/arrow_unidirectional_up.png
Binary files differ

diff --git a/packages/devtools_app/test/inspector/layout_explorer/flex/goldens/story_of_column_layout.png b/packages/devtools_app/test/test_infra/goldens/inspector/layout_explorer/flex/story_of_column_layout.png
similarity index 100%
rename from packages/devtools_app/test/inspector/layout_explorer/flex/goldens/story_of_column_layout.png
rename to packages/devtools_app/test/test_infra/goldens/inspector/layout_explorer/flex/story_of_column_layout.png
Binary files differ

diff --git a/packages/devtools_app/test/inspector/layout_explorer/flex/goldens/story_of_row_layout.png b/packages/devtools_app/test/test_infra/goldens/inspector/layout_explorer/flex/story_of_row_layout.png
similarity index 100%
rename from packages/devtools_app/test/inspector/layout_explorer/flex/goldens/story_of_row_layout.png
rename to packages/devtools_app/test/test_infra/goldens/inspector/layout_explorer/flex/story_of_row_layout.png
Binary files differ

diff --git a/packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_bidirectional_horizontal.png b/packages/devtools_app/test/test_infra/goldens/inspector_v2/layout_explorer/flex/arrow_bidirectional_horizontal.png
similarity index 100%
copy from packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_bidirectional_horizontal.png
copy to packages/devtools_app/test/test_infra/goldens/inspector_v2/layout_explorer/flex/arrow_bidirectional_horizontal.png
Binary files differ

diff --git a/packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_bidirectional_vertical.png b/packages/devtools_app/test/test_infra/goldens/inspector_v2/layout_explorer/flex/arrow_bidirectional_vertical.png
similarity index 100%
copy from packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_bidirectional_vertical.png
copy to packages/devtools_app/test/test_infra/goldens/inspector_v2/layout_explorer/flex/arrow_bidirectional_vertical.png
Binary files differ

diff --git a/packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_unidirectional_down.png b/packages/devtools_app/test/test_infra/goldens/inspector_v2/layout_explorer/flex/arrow_unidirectional_down.png
similarity index 100%
copy from packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_unidirectional_down.png
copy to packages/devtools_app/test/test_infra/goldens/inspector_v2/layout_explorer/flex/arrow_unidirectional_down.png
Binary files differ

diff --git a/packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_unidirectional_left.png b/packages/devtools_app/test/test_infra/goldens/inspector_v2/layout_explorer/flex/arrow_unidirectional_left.png
similarity index 100%
copy from packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_unidirectional_left.png
copy to packages/devtools_app/test/test_infra/goldens/inspector_v2/layout_explorer/flex/arrow_unidirectional_left.png
Binary files differ

diff --git a/packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_unidirectional_right.png b/packages/devtools_app/test/test_infra/goldens/inspector_v2/layout_explorer/flex/arrow_unidirectional_right.png
similarity index 100%
copy from packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_unidirectional_right.png
copy to packages/devtools_app/test/test_infra/goldens/inspector_v2/layout_explorer/flex/arrow_unidirectional_right.png
Binary files differ

diff --git a/packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_unidirectional_up.png b/packages/devtools_app/test/test_infra/goldens/inspector_v2/layout_explorer/flex/arrow_unidirectional_up.png
similarity index 100%
copy from packages/devtools_app/test/inspector/layout_explorer/flex/goldens/arrow_unidirectional_up.png
copy to packages/devtools_app/test/test_infra/goldens/inspector_v2/layout_explorer/flex/arrow_unidirectional_up.png
Binary files differ

diff --git a/packages/devtools_app/test/inspector/layout_explorer/flex/goldens/story_of_column_layout.png b/packages/devtools_app/test/test_infra/goldens/inspector_v2/layout_explorer/flex/story_of_column_layout.png
similarity index 100%
copy from packages/devtools_app/test/inspector/layout_explorer/flex/goldens/story_of_column_layout.png
copy to packages/devtools_app/test/test_infra/goldens/inspector_v2/layout_explorer/flex/story_of_column_layout.png
Binary files differ

diff --git a/packages/devtools_app/test/inspector/layout_explorer/flex/goldens/story_of_row_layout.png b/packages/devtools_app/test/test_infra/goldens/inspector_v2/layout_explorer/flex/story_of_row_layout.png
similarity index 100%
copy from packages/devtools_app/test/inspector/layout_explorer/flex/goldens/story_of_row_layout.png
copy to packages/devtools_app/test/test_infra/goldens/inspector_v2/layout_explorer/flex/story_of_row_layout.png
Binary files differ

diff --git a/packages/devtools_app/test_infra/goldens/logging/metadata_chips.png b/packages/devtools_app/test/test_infra/goldens/logging/metadata_chips.png
similarity index 100%
rename from packages/devtools_app/test_infra/goldens/logging/metadata_chips.png
rename to packages/devtools_app/test/test_infra/goldens/logging/metadata_chips.png
Binary files differ

diff --git a/packages/devtools_app/test/test_infra/goldens/memory/load_offline_data_profile_tab.png b/packages/devtools_app/test/test_infra/goldens/memory/load_offline_data_profile_tab.png
index 8be673b..db0fb29 100644
--- a/packages/devtools_app/test/test_infra/goldens/memory/load_offline_data_profile_tab.png
+++ b/packages/devtools_app/test/test_infra/goldens/memory/load_offline_data_profile_tab.png
Binary files differ

diff --git a/packages/devtools_app/test/test_infra/scenes/standalone_ui/mock_editor_widget.dart b/packages/devtools_app/test/test_infra/scenes/standalone_ui/mock_editor_widget.dart
index 7db0edb..94f45df 100644
--- a/packages/devtools_app/test/test_infra/scenes/standalone_ui/mock_editor_widget.dart
+++ b/packages/devtools_app/test/test_infra/scenes/standalone_ui/mock_editor_widget.dart

@@ -6,7 +6,7 @@
 import 'dart:collection';
 import 'dart:convert';
 
-import 'package:devtools_app/src/utils/list_queue_value_notifier.dart';
+import 'package:devtools_app/src/shared/primitives/list_queue_value_notifier.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/material.dart';

diff --git a/packages/devtools_app/test/network/sample_requests.json b/packages/devtools_app/test/test_infra/test_data/network/sample_requests.json
similarity index 100%
rename from packages/devtools_app/test/network/sample_requests.json
rename to packages/devtools_app/test/test_infra/test_data/network/sample_requests.json


diff --git a/packages/devtools_app/test/test_infra/utils/variable_utils.dart b/packages/devtools_app/test/test_infra/utils/variable_utils.dart
index ccb4368..820cda6 100644
--- a/packages/devtools_app/test/test_infra/utils/variable_utils.dart
+++ b/packages/devtools_app/test/test_infra/utils/variable_utils.dart

@@ -7,7 +7,7 @@
 
 import 'package:vm_service/vm_service.dart';
 
-import '../../debugger/typed_data_variable_test.dart';
+import '../../screens/debugger/typed_data_variable_test.dart';
 
 void resetRef() {
   _refNumber = 0;

diff --git a/packages/devtools_test/lib/src/helpers/utils.dart b/packages/devtools_test/lib/src/helpers/utils.dart
index 3859f66..dad6852 100644
--- a/packages/devtools_test/lib/src/helpers/utils.dart
+++ b/packages/devtools_test/lib/src/helpers/utils.dart

@@ -14,7 +14,7 @@
 
 /// The tag to add to a test case to ensure it is run on each commit to the
 /// Flutter SDK.
-/// 
+///
 /// Before adding this tag, first check if the test is included in one of the
 /// tested subdirectories defined by tool/ci/flutter_customer_tests/test.sh. If
 /// it is, there is no need to add the tag to the individual test case since the
@@ -23,7 +23,7 @@
 
 /// The tag to add to a test case to ensure it is not run on each commit to the
 /// Flutter SDK.
-/// 
+///
 /// Before adding this tag, first check if the test is included in one of the
 /// tested subdirectories defined by tool/ci/flutter_customer_tests/test.sh. If
 /// it is not, there is no need to add this tag to the individual test case