diff --git a/Android.bp b/Android.bp
index 52e65e5..d63f697 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4547,15 +4547,17 @@
     "src/trace_processor/forwarding_trace_parser.cc",
     "src/trace_processor/ftrace_descriptors.cc",
     "src/trace_processor/ftrace_utils.cc",
-    "src/trace_processor/fuchsia_provider_view.cc",
-    "src/trace_processor/fuchsia_trace_parser.cc",
-    "src/trace_processor/fuchsia_trace_tokenizer.cc",
-    "src/trace_processor/fuchsia_trace_utils.cc",
     "src/trace_processor/graphics_event_parser.cc",
     "src/trace_processor/gzip_trace_parser.cc",
     "src/trace_processor/heap_graph_tracker.cc",
     "src/trace_processor/heap_profile_allocation_table.cc",
     "src/trace_processor/heap_profile_tracker.cc",
+    "src/trace_processor/importers/fuchsia/fuchsia_provider_view.cc",
+    "src/trace_processor/importers/fuchsia/fuchsia_trace_parser.cc",
+    "src/trace_processor/importers/fuchsia/fuchsia_trace_tokenizer.cc",
+    "src/trace_processor/importers/fuchsia/fuchsia_trace_utils.cc",
+    "src/trace_processor/importers/systrace/systrace_parser.cc",
+    "src/trace_processor/importers/systrace/systrace_trace_parser.cc",
     "src/trace_processor/instants_table.cc",
     "src/trace_processor/metadata_table.cc",
     "src/trace_processor/process_table.cc",
@@ -4579,8 +4581,6 @@
     "src/trace_processor/storage_schema.cc",
     "src/trace_processor/storage_table.cc",
     "src/trace_processor/syscall_tracker.cc",
-    "src/trace_processor/systrace_parser.cc",
-    "src/trace_processor/systrace_trace_parser.cc",
     "src/trace_processor/thread_table.cc",
     "src/trace_processor/trace_processor.cc",
     "src/trace_processor/trace_processor_context.cc",
@@ -4654,8 +4654,9 @@
     "src/trace_processor/filtered_row_index_unittest.cc",
     "src/trace_processor/forwarding_trace_parser_unittest.cc",
     "src/trace_processor/ftrace_utils_unittest.cc",
-    "src/trace_processor/fuchsia_trace_utils_unittest.cc",
     "src/trace_processor/heap_profile_tracker_unittest.cc",
+    "src/trace_processor/importers/fuchsia/fuchsia_trace_utils_unittest.cc",
+    "src/trace_processor/importers/systrace/systrace_parser_unittest.cc",
     "src/trace_processor/metadata_table_unittest.cc",
     "src/trace_processor/null_term_string_view_unittest.cc",
     "src/trace_processor/process_table_unittest.cc",
@@ -4666,7 +4667,6 @@
     "src/trace_processor/span_join_operator_table_unittest.cc",
     "src/trace_processor/string_pool_unittest.cc",
     "src/trace_processor/syscall_tracker_unittest.cc",
-    "src/trace_processor/systrace_parser_unittest.cc",
     "src/trace_processor/thread_table_unittest.cc",
     "src/trace_processor/trace_sorter_unittest.cc",
   ],