diff --git a/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_screen.dart b/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_screen.dart
index 4f979d148eb..87105a807b4 100644
--- a/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_screen.dart
+++ b/packages/devtools_app/lib/src/screens/deep_link_validation/deep_links_screen.dart
@@ -11,7 +11,7 @@ import '../../shared/utils.dart';
 import 'deep_link_list_view.dart';
 import 'deep_links_controller.dart';
 import 'deep_links_model.dart';
-import 'select_project_view.dart';
+import 'project_root_selection/select_project_view.dart';
 
 class DeepLinksScreen extends Screen {
   DeepLinksScreen() : super.fromMetaData(ScreenMetaData.deepLinks);
diff --git a/packages/devtools_app/lib/src/shared/directory_picker.dart b/packages/devtools_app/lib/src/screens/deep_link_validation/project_root_selection/root_selector.dart
similarity index 96%
rename from packages/devtools_app/lib/src/shared/directory_picker.dart
rename to packages/devtools_app/lib/src/screens/deep_link_validation/project_root_selection/root_selector.dart
index f160365af78..48e015d284b 100644
--- a/packages/devtools_app/lib/src/shared/directory_picker.dart
+++ b/packages/devtools_app/lib/src/screens/deep_link_validation/project_root_selection/root_selector.dart
@@ -6,10 +6,8 @@ import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/material.dart';
 
-import 'common_widgets.dart';
-import 'primitives/utils.dart';
-
-// TODO(kenz): move this file into the deep links screen directory.
+import '../../../shared/common_widgets.dart';
+import '../../../shared/primitives/utils.dart';
 
 class ProjectRootTextField extends StatefulWidget {
   const ProjectRootTextField({
diff --git a/packages/devtools_app/lib/src/screens/deep_link_validation/select_project_view.dart b/packages/devtools_app/lib/src/screens/deep_link_validation/project_root_selection/select_project_view.dart
similarity index 92%
rename from packages/devtools_app/lib/src/screens/deep_link_validation/select_project_view.dart
rename to packages/devtools_app/lib/src/screens/deep_link_validation/project_root_selection/select_project_view.dart
index 6d372beeef1..da8179d20ef 100644
--- a/packages/devtools_app/lib/src/screens/deep_link_validation/select_project_view.dart
+++ b/packages/devtools_app/lib/src/screens/deep_link_validation/project_root_selection/select_project_view.dart
@@ -7,15 +7,15 @@ import 'dart:async';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:flutter/material.dart';
 
-import '../../shared/analytics/analytics.dart' as ga;
-import '../../shared/analytics/constants.dart' as gac;
-import '../../shared/directory_picker.dart';
-import '../../shared/globals.dart';
-import '../../shared/primitives/utils.dart';
-import '../../shared/server/server.dart' as server;
-import '../../shared/utils.dart';
-import 'deep_links_controller.dart';
-import 'deep_links_model.dart';
+import '../../../shared/analytics/analytics.dart' as ga;
+import '../../../shared/analytics/constants.dart' as gac;
+import '../../../shared/globals.dart';
+import '../../../shared/primitives/utils.dart';
+import '../../../shared/server/server.dart' as server;
+import '../../../shared/utils.dart';
+import '../deep_links_controller.dart';
+import '../deep_links_model.dart';
+import 'root_selector.dart';
 
 const _kLinearProgressIndicatorWidth = 280.0;
 
diff --git a/packages/devtools_app/test/deep_link_vlidation/deep_links_screen_test.dart b/packages/devtools_app/test/deep_link_vlidation/deep_links_screen_test.dart
index a3885b85018..35566145af0 100644
--- a/packages/devtools_app/test/deep_link_vlidation/deep_links_screen_test.dart
+++ b/packages/devtools_app/test/deep_link_vlidation/deep_links_screen_test.dart
@@ -6,9 +6,9 @@ import 'package:devtools_app/devtools_app.dart';
 import 'package:devtools_app/src/screens/deep_link_validation/deep_link_list_view.dart';
 import 'package:devtools_app/src/screens/deep_link_validation/deep_links_model.dart';
 import 'package:devtools_app/src/screens/deep_link_validation/deep_links_services.dart';
-import 'package:devtools_app/src/screens/deep_link_validation/select_project_view.dart';
+import 'package:devtools_app/src/screens/deep_link_validation/project_root_selection/root_selector.dart';
+import 'package:devtools_app/src/screens/deep_link_validation/project_root_selection/select_project_view.dart';
 import 'package:devtools_app/src/screens/deep_link_validation/validation_details_view.dart';
-import 'package:devtools_app/src/shared/directory_picker.dart';
 import 'package:devtools_app_shared/service.dart';
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';