diff --git a/src/BUILD.bazel b/graph_autodiff/BUILD.bazel
similarity index 75%
rename from src/BUILD.bazel
rename to graph_autodiff/BUILD.bazel
index 5ff22db..6d47991 100644
--- a/src/BUILD.bazel
+++ b/graph_autodiff/BUILD.bazel
@@ -25,3 +25,14 @@ proto_library(
     name = "graph_proto",
     srcs = ["graph.proto"],
 )
+
+cc_test(
+  name = "graph_autodiff_test",
+  size = "small",
+  srcs = ["graph_test.cpp"],
+  deps = [
+    "@abseil-cpp//absl/status:statusor",
+    "@googletest//:gtest_main",
+    "//graph_autodiff"
+  ],
+)
diff --git a/src/graph.cpp b/graph_autodiff/graph.cpp
similarity index 99%
rename from src/graph.cpp
rename to graph_autodiff/graph.cpp
index 0581292..0f128a4 100644
--- a/src/graph.cpp
+++ b/graph_autodiff/graph.cpp
@@ -14,7 +14,7 @@ under certain conditions: see LICENSE.
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "fmt/core.h"
-#include "src/graph.pb.h"
+#include "graph_autodiff/graph.pb.h"
 
 using namespace graph_autodiff;
 namespace gpb = graph_proto;
diff --git a/src/graph.h b/graph_autodiff/graph.h
similarity index 99%
rename from src/graph.h
rename to graph_autodiff/graph.h
index 167e9c4..983cf87 100644
--- a/src/graph.h
+++ b/graph_autodiff/graph.h
@@ -16,7 +16,7 @@ under certain conditions: see LICENSE.
 #include "absl/container/flat_hash_map.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-#include "src/graph.pb.h"
+#include "graph_autodiff/graph.pb.h"
 
 /* A note on the use of shared_ptr<const T>
 
diff --git a/src/graph.proto b/graph_autodiff/graph.proto
similarity index 100%
rename from src/graph.proto
rename to graph_autodiff/graph.proto
diff --git a/tests/test.cpp b/graph_autodiff/graph_test.cpp
similarity index 99%
rename from tests/test.cpp
rename to graph_autodiff/graph_test.cpp
index 6e7ce51..4b23d1b 100644
--- a/tests/test.cpp
+++ b/graph_autodiff/graph_test.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 
 #include "absl/status/statusor.h"
-#include "src/graph.h"
+#include "graph_autodiff/graph.h"
 
 using namespace graph_autodiff;
 
diff --git a/tests/BUILD.bazel b/tests/BUILD.bazel
deleted file mode 100644
index 97538f5..0000000
--- a/tests/BUILD.bazel
+++ /dev/null
@@ -1,10 +0,0 @@
-cc_test(
-  name = "test",
-  size = "small",
-  srcs = ["test.cpp"],
-  deps = [
-    "@abseil-cpp//absl/status:statusor",
-    "@googletest//:gtest_main",
-    "//src:graph_autodiff"
-  ],
-)
\ No newline at end of file