diff --git a/.gitignore b/.gitignore
index 5c036252..5bb4ce51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
-# Auto generated files
+.vscode*
 bazel*
+# Auto generated files
 build/*
 *.slo
 *.lo
diff --git a/BUILD b/BUILD
index 37657c4a..cf8033e7 100644
--- a/BUILD
+++ b/BUILD
@@ -5,57 +5,16 @@ cc_library(
     includes = ["include"],
 )
 
-cc_binary(
-  name="bench",
-  srcs=[
-    "bench/utils.h",
-    "bench/bench.cpp"
-  ],
-  includes=[
-    "bench"
-  ],
-  deps=[
-    ":headers"
-  ]
-)
 
-cc_binary(
-  name="async_bench",
-  srcs=[
-    "bench/utils.h",
-    "bench/async_bench.cpp"
-  ],
-  includes=[
-    "bench"
-  ],
-  deps=[
-    ":headers"
-  ]
+cc_library(
+    name = "spdlog",
+    visibility = ["//visibility:public"],
+    defines=[
+      "SPDLOG_COMPILED_LIB"
+    ],
+    srcs = ["src/spdlog.cpp"],
+    includes = ["include"],
 )
 
-cc_binary(
-  name="latency",
-  srcs=[
-    "bench/utils.h",
-    "bench/latency.cpp"
-  ],
-  includes=[
-    "bench"
-  ],
-  deps=[
-    ":headers"
-  ]
-)
 
-cc_binary(
-  name="example",
-  srcs=[
-    "example/example.cpp"
-  ],
-  includes=[
-    "bench"
-  ],
-  deps=[
-    ":headers"
-  ]
-)
\ No newline at end of file
+
diff --git a/bench/BUILD b/bench/BUILD
new file mode 100644
index 00000000..1799c36e
--- /dev/null
+++ b/bench/BUILD
@@ -0,0 +1,41 @@
+cc_binary(
+  name="bench",
+  srcs=[
+    "bench/utils.h",
+    "bench/bench.cpp"
+  ],
+  includes=[
+    "bench"
+  ],
+  deps=[
+    ":headers"
+  ]
+)
+
+cc_binary(
+  name="async_bench",
+  srcs=[
+    "bench/utils.h",
+    "bench/async_bench.cpp"
+  ],
+  includes=[
+    "bench"
+  ],
+  deps=[
+    ":headers"
+  ]
+)
+
+cc_binary(
+  name="latency",
+  srcs=[
+    "bench/utils.h",
+    "bench/latency.cpp"
+  ],
+  includes=[
+    "bench"
+  ],
+  deps=[
+    ":headers"
+  ]
+)
\ No newline at end of file
diff --git a/tests/BUILD b/tests/BUILD
new file mode 100644
index 00000000..de87d586
--- /dev/null
+++ b/tests/BUILD
@@ -0,0 +1,23 @@
+cc_test(
+  name="main",
+  srcs=glob([
+    "*.h*",
+    "utils.cpp",
+    "main.cpp",
+    "test_*.cpp"
+    ],
+    exclude=[
+      "test_systemd.cpp"
+    ]
+  ) + select({
+    "@bazel_tools//src/conditions:windows": [],
+    "@bazel_tools//src/conditions:darwin": [],
+    "//conditions:default": ["test_systemd.cpp"],
+  }),
+  includes=[
+    "tests"
+  ],
+  deps=[
+    "//:headers"
+  ]
+)