diff --git a/aos/linux_code/logging/BUILD b/aos/linux_code/logging/BUILD
index fbd153f..a35cd0e 100644
--- a/aos/linux_code/logging/BUILD
+++ b/aos/linux_code/logging/BUILD
@@ -1,60 +1,72 @@
 package(default_visibility = ['//visibility:public'])
 
 cc_library(
-  name = 'linux_interface',
+  name = 'log_replay',
   srcs = [
-    'linux_interface.cc',
+    'log_replay.cc',
+  ],
+  hdrs = [
+    'log_replay.h',
   ],
   deps = [
-    '//aos/linux_code:complex_thread_local',
-    '//aos/common:die',
-    '//aos/common/libc:aos_strerror',
-  ],
-)
-
-cc_library(
-  name = 'linux_logging',
-  srcs = [
-    'linux_logging.cc',
-  ],
-  deps = [
+    ':binary_log_file',
+    '//aos/common:queues',
+    '//aos/common/logging',
     '//aos/linux_code/ipc_lib:queue',
+  ],
+)
+
+cc_binary(
+  name = 'binary_log_writer',
+  srcs = [
+    'binary_log_writer.cc',
+  ],
+  deps = [
+    '//aos/common/logging',
+    '//aos/linux_code:init',
+    '//aos/linux_code:configuration',
+    '//aos/common:die',
+    ':binary_log_file',
+    '//aos/common:queue_types',
+  ],
+)
+
+cc_binary(
+  name = 'log_streamer',
+  srcs = [
+    'log_streamer.cc',
+  ],
+  deps = [
+    '//aos/common/logging',
+    '//aos/linux_code:init',
     '//aos/common:time',
+    '//aos/linux_code/ipc_lib:queue',
   ],
 )
 
-cc_test(
-  name = 'logging_impl_test',
+cc_binary(
+  name = 'log_displayer',
   srcs = [
-    'logging_impl_test.cc',
+    'log_displayer.cc',
   ],
   deps = [
-    '//third_party/gtest',
-    '//aos/common/logging:logging',
+    '//aos/common/logging',
+    '//aos/linux_code:init',
+    ':binary_log_file',
+    '//aos/common:queue_types',
+    '//aos/linux_code:configuration',
   ],
 )
 
 cc_library(
-  name = 'queue_logging',
+  name = 'binary_log_file',
   srcs = [
-    'queue_logging.cc',
+    'binary_log_file.cc',
+  ],
+  hdrs = [
+    'binary_log_file.h',
   ],
   deps = [
-    '//aos/common/logging:logging',
-    '//aos/common:die',
-    '//aos/common:queue_types',
-  ],
-)
-
-cc_library(
-  name = 'matrix_logging',
-  srcs = [
-    'matrix_logging.cc',
-  ],
-  deps = [
-    '//aos/common/logging:logging',
-    '//aos/common:die',
-    '//aos/common:queue_types',
-    '//third_party/eigen',
+    '//aos/common/logging',
   ],
 )