diff --git a/app/lib/package/export_api_to_bucket.dart b/app/lib/package/api_export/export_api_to_bucket.dart
similarity index 96%
rename from app/lib/package/export_api_to_bucket.dart
rename to app/lib/package/api_export/export_api_to_bucket.dart
index c1f31aa040..a0d3be3328 100644
--- a/app/lib/package/export_api_to_bucket.dart
+++ b/app/lib/package/api_export/export_api_to_bucket.dart
@@ -11,14 +11,14 @@ import 'package:meta/meta.dart';
 import 'package:pool/pool.dart';
 import 'package:retry/retry.dart';
 
-import '../search/backend.dart';
-import '../shared/datastore.dart';
-import '../shared/storage.dart';
-import '../shared/versions.dart';
-import '../task/global_lock.dart';
-import 'api_export/exported_api.dart';
-import 'backend.dart';
-import 'models.dart';
+import '../../search/backend.dart';
+import '../../shared/datastore.dart';
+import '../../shared/storage.dart';
+import '../../shared/versions.dart';
+import '../../task/global_lock.dart';
+import '../backend.dart';
+import '../models.dart';
+import 'exported_api.dart';
 
 final Logger _logger = Logger('export_api_to_bucket');
 
diff --git a/app/lib/package/backend.dart b/app/lib/package/backend.dart
index e0bf66f8bf..4cfd0b2266 100644
--- a/app/lib/package/backend.dart
+++ b/app/lib/package/backend.dart
@@ -16,7 +16,7 @@ import 'package:gcloud/storage.dart';
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
 import 'package:pool/pool.dart';
-import 'package:pub_dev/package/export_api_to_bucket.dart';
+import 'package:pub_dev/package/api_export/export_api_to_bucket.dart';
 import 'package:pub_dev/service/async_queue/async_queue.dart';
 import 'package:pub_dev/service/rate_limit/rate_limit.dart';
 import 'package:pub_dev/shared/versions.dart';
diff --git a/app/lib/service/entrypoint/analyzer.dart b/app/lib/service/entrypoint/analyzer.dart
index 0476f8b9d1..7e4f22769c 100644
--- a/app/lib/service/entrypoint/analyzer.dart
+++ b/app/lib/service/entrypoint/analyzer.dart
@@ -7,7 +7,7 @@ import 'dart:async';
 import 'package:args/command_runner.dart';
 import 'package:gcloud/service_scope.dart';
 import 'package:logging/logging.dart';
-import 'package:pub_dev/package/export_api_to_bucket.dart';
+import 'package:pub_dev/package/api_export/export_api_to_bucket.dart';
 import 'package:pub_dev/search/backend.dart';
 import 'package:pub_dev/shared/configuration.dart';
 
diff --git a/app/lib/service/services.dart b/app/lib/service/services.dart
index 104a3d5420..1933f4558a 100644
--- a/app/lib/service/services.dart
+++ b/app/lib/service/services.dart
@@ -13,7 +13,7 @@ import 'package:gcloud/service_scope.dart';
 import 'package:gcloud/storage.dart';
 import 'package:googleapis_auth/auth_io.dart' as auth;
 import 'package:logging/logging.dart';
-import 'package:pub_dev/package/export_api_to_bucket.dart';
+import 'package:pub_dev/package/api_export/export_api_to_bucket.dart';
 import 'package:pub_dev/search/handlers.dart';
 import 'package:pub_dev/service/async_queue/async_queue.dart';
 import 'package:pub_dev/service/download_counts/backend.dart';
diff --git a/app/lib/tool/neat_task/pub_dev_tasks.dart b/app/lib/tool/neat_task/pub_dev_tasks.dart
index e50f784cb6..c521dcdc61 100644
--- a/app/lib/tool/neat_task/pub_dev_tasks.dart
+++ b/app/lib/tool/neat_task/pub_dev_tasks.dart
@@ -14,8 +14,8 @@ import '../../account/backend.dart';
 import '../../account/consent_backend.dart';
 import '../../admin/backend.dart';
 import '../../audit/backend.dart';
+import '../../package/api_export/export_api_to_bucket.dart';
 import '../../package/backend.dart';
-import '../../package/export_api_to_bucket.dart';
 import '../../search/backend.dart';
 import '../../service/download_counts/sync_download_counts.dart';
 import '../../service/email/backend.dart';
diff --git a/app/test/package/export_api_to_bucket_test.dart b/app/test/package/api_export/export_api_to_bucket_test.dart
similarity index 94%
rename from app/test/package/export_api_to_bucket_test.dart
rename to app/test/package/api_export/export_api_to_bucket_test.dart
index fffcd8dc9c..67018d26b9 100644
--- a/app/test/package/export_api_to_bucket_test.dart
+++ b/app/test/package/api_export/export_api_to_bucket_test.dart
@@ -7,15 +7,15 @@ import 'dart:io';
 
 import 'package:clock/clock.dart';
 import 'package:gcloud/storage.dart';
-import 'package:pub_dev/package/export_api_to_bucket.dart';
+import 'package:pub_dev/package/api_export/export_api_to_bucket.dart';
 import 'package:pub_dev/shared/configuration.dart';
 import 'package:pub_dev/shared/storage.dart';
 import 'package:pub_dev/shared/versions.dart';
 import 'package:test/test.dart';
 
-import '../shared/test_models.dart';
-import '../shared/test_services.dart';
-import 'backend_test_utils.dart';
+import '../../shared/test_models.dart';
+import '../../shared/test_services.dart';
+import '../backend_test_utils.dart';
 
 void main() {
   group('export API to bucket', () {