diff --git a/tensorflow_privacy/privacy/BUILD b/tensorflow_privacy/privacy/BUILD
deleted file mode 100644
index e6d05e7..0000000
--- a/tensorflow_privacy/privacy/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
diff --git a/tensorflow_privacy/privacy/dp_query/BUILD b/tensorflow_privacy/privacy/dp_query/BUILD
deleted file mode 100644
index e4acd15..0000000
--- a/tensorflow_privacy/privacy/dp_query/BUILD
+++ /dev/null
@@ -1,172 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])  # Apache 2.0
-
-py_library(
-    name = "dp_query",
-    srcs = ["dp_query.py"],
-    deps = [
-        "//third_party/py/distutils",
-        "//third_party/py/tensorflow",
-    ],
-)
-
-py_library(
-    name = "gaussian_query",
-    srcs = ["gaussian_query.py"],
-    deps = [
-        ":dp_query",
-        ":normalized_query",
-        "//third_party/py/distutils",
-        "//third_party/py/tensorflow",
-    ],
-)
-
-py_test(
-    name = "gaussian_query_test",
-    size = "small",
-    srcs = ["gaussian_query_test.py"],
-    python_version = "PY3",
-    deps = [
-        ":gaussian_query",
-        ":test_utils",
-        "//learning/brain/public:disable_tf2",  # build_cleaner: keep; go/disable_tf2
-        "//third_party/py/absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//third_party/py/six",
-        "//third_party/py/tensorflow",
-    ],
-)
-
-py_library(
-    name = "no_privacy_query",
-    srcs = ["no_privacy_query.py"],
-    deps = [
-        ":dp_query",
-        "//third_party/py/distutils",
-        "//third_party/py/tensorflow",
-    ],
-)
-
-py_test(
-    name = "no_privacy_query_test",
-    size = "small",
-    srcs = ["no_privacy_query_test.py"],
-    python_version = "PY3",
-    deps = [
-        ":no_privacy_query",
-        ":test_utils",
-        "//learning/brain/public:disable_tf2",  # build_cleaner: keep; go/disable_tf2
-        "//third_party/py/absl/testing:parameterized",
-        "//third_party/py/tensorflow",
-    ],
-)
-
-py_library(
-    name = "normalized_query",
-    srcs = ["normalized_query.py"],
-    deps = [
-        ":dp_query",
-        "//third_party/py/distutils",
-        "//third_party/py/tensorflow",
-    ],
-)
-
-py_test(
-    name = "normalized_query_test",
-    size = "small",
-    srcs = ["normalized_query_test.py"],
-    python_version = "PY3",
-    deps = [
-        ":gaussian_query",
-        ":normalized_query",
-        ":test_utils",
-        "//learning/brain/public:disable_tf2",  # build_cleaner: keep; go/disable_tf2
-        "//third_party/py/tensorflow",
-    ],
-)
-
-py_library(
-    name = "nested_query",
-    srcs = ["nested_query.py"],
-    deps = [
-        ":dp_query",
-        "//third_party/py/tensorflow",
-        "//third_party/py/tree",
-    ],
-)
-
-py_test(
-    name = "nested_query_test",
-    size = "small",
-    srcs = ["nested_query_test.py"],
-    python_version = "PY3",
-    deps = [
-        ":gaussian_query",
-        ":nested_query",
-        ":test_utils",
-        "//learning/brain/public:disable_tf2",  # build_cleaner: keep; go/disable_tf2
-        "//third_party/py/absl/testing:parameterized",
-        "//third_party/py/distutils",
-        "//third_party/py/numpy",
-        "//third_party/py/tensorflow",
-    ],
-)
-
-py_library(
-    name = "quantile_adaptive_clip_sum_query",
-    srcs = ["quantile_adaptive_clip_sum_query.py"],
-    deps = [
-        ":dp_query",
-        ":gaussian_query",
-        ":normalized_query",
-        ":quantile_estimator_query",
-        "//third_party/py/tensorflow",
-    ],
-)
-
-py_test(
-    name = "quantile_adaptive_clip_sum_query_test",
-    srcs = ["quantile_adaptive_clip_sum_query_test.py"],
-    python_version = "PY3",
-    deps = [
-        ":quantile_adaptive_clip_sum_query",
-        ":test_utils",
-        "//learning/brain/public:disable_tf2",  # build_cleaner: keep; go/disable_tf2
-        "//third_party/py/absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//third_party/py/tensorflow",
-        "//third_party/py/tensorflow_privacy/privacy/analysis:privacy_ledger",
-    ],
-)
-
-py_library(
-    name = "quantile_estimator_query",
-    srcs = ["quantile_estimator_query.py"],
-    deps = [
-        ":dp_query",
-        ":gaussian_query",
-        ":no_privacy_query",
-        "//third_party/py/tensorflow",
-    ],
-)
-
-py_test(
-    name = "quantile_estimator_query_test",
-    srcs = ["quantile_estimator_query_test.py"],
-    python_version = "PY3",
-    deps = [
-        ":quantile_estimator_query",
-        ":test_utils",
-        "//learning/brain/public:disable_tf2",  # build_cleaner: keep; go/disable_tf2
-        "//third_party/py/absl/testing:parameterized",
-        "//third_party/py/numpy",
-        "//third_party/py/tensorflow",
-    ],
-)
-
-py_library(
-    name = "test_utils",
-    srcs = ["test_utils.py"],
-    deps = [],
-)
diff --git a/tensorflow_privacy/privacy/estimators/BUILD b/tensorflow_privacy/privacy/estimators/BUILD
deleted file mode 100644
index c8d64d9..0000000
--- a/tensorflow_privacy/privacy/estimators/BUILD
+++ /dev/null
@@ -1,125 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])  # Apache 2.0
-
-py_library(
-    name = "head_utils",
-    srcs = [
-        "head_utils.py",
-    ],
-    deps = [
-        ":binary_class_head",
-        ":multi_class_head",
-    ],
-)
-
-py_library(
-    name = "binary_class_head",
-    srcs = [
-        "binary_class_head.py",
-    ],
-    deps = [
-        "//third_party/py/tensorflow",
-        "//third_party/tensorflow/python:keras_lib",  # TODO(b/163395075): Remove when fixed.
-        "//third_party/tensorflow_estimator",
-    ],
-)
-
-py_library(
-    name = "multi_class_head",
-    srcs = [
-        "multi_class_head.py",
-    ],
-    deps = [
-        "//third_party/py/tensorflow",
-        "//third_party/tensorflow/python:keras_lib",  # TODO(b/163395075): Remove when fixed.
-        "//third_party/tensorflow_estimator",
-    ],
-)
-
-py_library(
-    name = "multi_label_head",
-    srcs = [
-        "multi_label_head.py",
-    ],
-    deps = [
-        "//third_party/py/tensorflow",
-        "//third_party/tensorflow/python:keras_lib",  # TODO(b/163395075): Remove when fixed.
-        "//third_party/tensorflow_estimator",
-    ],
-)
-
-py_library(
-    name = "dnn",
-    srcs = [
-        "dnn.py",
-    ],
-    deps = [
-        ":head_utils",
-        "//third_party/py/tensorflow",
-        "//third_party/tensorflow_estimator",
-    ],
-)
-
-py_library(
-    name = "test_utils",
-    srcs = [
-        "test_utils.py",
-    ],
-    deps = [
-        "//third_party/py/tensorflow",
-    ],
-)
-
-py_test(
-    name = "binary_class_head_test",
-    timeout = "long",
-    srcs = ["binary_class_head_test.py"],
-    python_version = "PY3",
-    deps = [
-        ":binary_class_head",
-        ":test_utils",
-        "//third_party/py/tensorflow",
-        "//third_party/py/tensorflow_privacy/privacy/optimizers:dp_optimizer_keras",
-    ],
-)
-
-py_test(
-    name = "multi_class_head_test",
-    timeout = "long",
-    srcs = ["multi_class_head_test.py"],
-    python_version = "PY3",
-    deps = [
-        ":multi_class_head",
-        ":test_utils",
-        "//third_party/py/tensorflow",
-        "//third_party/py/tensorflow_privacy/privacy/optimizers:dp_optimizer_keras",
-    ],
-)
-
-py_test(
-    name = "multi_label_head_test",
-    timeout = "long",
-    srcs = ["multi_label_head_test.py"],
-    python_version = "PY3",
-    deps = [
-        ":multi_label_head",
-        ":test_utils",
-        "//third_party/py/tensorflow",
-        "//third_party/py/tensorflow_privacy/privacy/optimizers:dp_optimizer_keras",
-    ],
-)
-
-py_test(
-    name = "dnn_test",
-    timeout = "long",
-    srcs = ["dnn_test.py"],
-    python_version = "PY3",
-    deps = [
-        ":dnn",
-        ":test_utils",
-        "//third_party/py/absl/testing:parameterized",
-        "//third_party/py/tensorflow",
-        "//third_party/py/tensorflow_privacy/privacy/optimizers:dp_optimizer_keras",
-    ],
-)
diff --git a/tensorflow_privacy/privacy/estimators/v1/BUILD b/tensorflow_privacy/privacy/estimators/v1/BUILD
deleted file mode 100644
index dda365e..0000000
--- a/tensorflow_privacy/privacy/estimators/v1/BUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-py_library(
-    name = "head",
-    srcs = [
-        "head.py",
-    ],
-    deps = [
-        "//third_party/py/tensorflow",
-        "//third_party/tensorflow_estimator",
-    ],
-)
-
-py_library(
-    name = "dnn",
-    srcs = [
-        "dnn.py",
-    ],
-    deps = [
-        ":head",
-        "//third_party/py/tensorflow",
-        "//third_party/tensorflow_estimator",
-    ],
-)
-
-py_test(
-    name = "head_test",
-    timeout = "long",
-    srcs = ["head_test.py"],
-    python_version = "PY3",
-    deps = [
-        ":head",
-        "//third_party/py/tensorflow",
-        "//third_party/py/tensorflow_privacy/privacy/estimators:test_utils",
-        "//third_party/py/tensorflow_privacy/privacy/optimizers:dp_optimizer",
-    ],
-)
-
-py_test(
-    name = "dnn_test",
-    timeout = "long",
-    srcs = ["dnn_test.py"],
-    python_version = "PY3",
-    deps = [
-        ":dnn",
-        "//third_party/py/tensorflow",
-        "//third_party/py/tensorflow_privacy/privacy/estimators:test_utils",
-        "//third_party/py/tensorflow_privacy/privacy/optimizers:dp_optimizer",
-    ],
-)
diff --git a/tensorflow_privacy/privacy/keras_models/BUILD b/tensorflow_privacy/privacy/keras_models/BUILD
deleted file mode 100644
index fdcb5c3..0000000
--- a/tensorflow_privacy/privacy/keras_models/BUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-py_library(
-    name = "dp_keras_model",
-    srcs = [
-        "dp_keras_model.py",
-    ],
-    deps = [
-        "//third_party/py/tensorflow",
-        "//third_party/tensorflow/compiler/jit:xla_cpu_jit",
-        "//third_party/tensorflow/compiler/jit:xla_gpu_jit",
-    ],
-)
-
-py_test(
-    name = "dp_keras_model_test",
-    srcs = ["dp_keras_model_test.py"],
-    python_version = "PY3",
-    deps = [
-        "//third_party/py/absl/testing:parameterized",
-        "//third_party/py/six",
-        "//third_party/py/tensorflow",
-        "//third_party/py/tensorflow_privacy/privacy/keras_models:dp_keras_model",
-    ],
-)