moves all source files to private_join_and_compute subfolder. Credit to efoxepstein

83 files changed, 280 insertions, 281 deletions

diff --git a/README.md b/README.md
index ce7d82f..c76fb89 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ private-join-and-compute folder.)
 Next, generate some dummy data to run the protocol on:
 
 ```shell
-bazel-bin/generate_dummy_data --server_data_file=/tmp/dummy_server_data.csv \
+bazel-bin/private_join_and_compute/generate_dummy_data --server_data_file=/tmp/dummy_server_data.csv \
 --client_data_file=/tmp/dummy_client_data.csv
 ```
 
@@ -76,7 +76,7 @@ also change the size of the dummy data generated using additional flags. For
 example:
 
 ```shell
-bazel-bin/generate_dummy_data \
+bazel-bin/private_join_and_compute/generate_dummy_data \
 --server_data_file=/tmp/dummy_server_data.csv \
 --client_data_file=/tmp/dummy_client_data.csv --server_data_size=1000 \
 --client_data_size=1000 --intersection_size=200 --max_associated_value=100
@@ -85,7 +85,7 @@ bazel-bin/generate_dummy_data \
 Once you've generated dummy data, you can start the server as follows:
 
 ```shell
-bazel-bin/server --server_data_file=/tmp/dummy_server_data.csv
+bazel-bin/private_join_and_compute/server --server_data_file=/tmp/dummy_server_data.csv
 ```
 
 The server will load data from the specified file, and wait for a connection
@@ -96,7 +96,7 @@ Create a new terminal and navigate to the private-join-and-compute folder. Once
 there, run the following command to start the client:
 
 ```shell
-bazel-bin/client --client_data_file=/tmp/dummy_client_data.csv
+bazel-bin/private_join_and_compute/client --client_data_file=/tmp/dummy_client_data.csv
 ```
 
 The client will connect to the server and execute the steps of the protocol
diff --git a/BUILD b/private_join_and_compute/BUILD
index b5fd2a9..466edc6 100644
--- a/BUILD
+++ b/private_join_and_compute/BUILD
@@ -40,7 +40,7 @@ cc_library(
     hdrs = ["message_sink.h"],
     deps = [
         ":private_join_and_compute_proto",
-        "//util:status_includes",
+        "//private_join_and_compute/util:status_includes",
         "@com_google_absl//absl/memory",
     ],
 )
@@ -51,7 +51,7 @@ cc_library(
     deps = [
         ":message_sink",
         ":private_join_and_compute_proto",
-        "//util:status_includes",
+        "//private_join_and_compute/util:status_includes",
     ],
 )
 
@@ -65,10 +65,10 @@ cc_library(
         ":private_intersection_sum_proto",
         ":private_join_and_compute_proto",
         ":protocol_client",
-        "//crypto:bn_util",
-        "//crypto:ec_commutative_cipher",
-        "//crypto:paillier",
-        "//util:status_includes",
+        "//private_join_and_compute/crypto:bn_util",
+        "//private_join_and_compute/crypto:ec_commutative_cipher",
+        "//private_join_and_compute/crypto:paillier",
+        "//private_join_and_compute/util:status_includes",
         "@com_google_absl//absl/memory",
     ],
 )
@@ -79,7 +79,7 @@ cc_library(
     deps = [
         ":message_sink",
         ":private_join_and_compute_proto",
-        "//util:status_includes",
+        "//private_join_and_compute/util:status_includes",
     ],
 )
 
@@ -93,10 +93,10 @@ cc_library(
         ":private_intersection_sum_proto",
         ":private_join_and_compute_proto",
         ":protocol_server",
-        "//crypto:bn_util",
-        "//crypto:ec_commutative_cipher",
-        "//crypto:paillier",
-        "//util:status_includes",
+        "//private_join_and_compute/crypto:bn_util",
+        "//private_join_and_compute/crypto:ec_commutative_cipher",
+        "//private_join_and_compute/crypto:paillier",
+        "//private_join_and_compute/util:status_includes",
         "@com_google_absl//absl/memory",
     ],
 )
@@ -107,8 +107,8 @@ cc_library(
     hdrs = ["data_util.h"],
     deps = [
         ":match_proto",
-        "//crypto:bn_util",
-        "//util:status_includes",
+        "//private_join_and_compute/crypto:bn_util",
+        "//private_join_and_compute/util:status_includes",
         "@com_google_absl//absl/memory",
         "@com_google_absl//absl/strings",
     ],
@@ -134,7 +134,7 @@ cc_library(
         ":message_sink",
         ":private_join_and_compute_proto",
         ":protocol_server",
-        "//util:status_includes",
+        "//private_join_and_compute/util:status_includes",
         "@com_github_grpc_grpc//:grpc++",
     ],
 )
diff --git a/client.cc b/private_join_and_compute/client.cc
index f793d87..736c03f 100644
--- a/client.cc
+++ b/private_join_and_compute/client.cc
@@ -21,8 +21,6 @@
 #include "absl/flags/parse.h"
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
-#include "client_impl.h"
-#include "data_util.h"
 #include "include/grpc/grpc_security_constants.h"
 #include "include/grpcpp/channel.h"
 #include "include/grpcpp/client_context.h"
@@ -30,10 +28,12 @@
 #include "include/grpcpp/grpcpp.h"
 #include "include/grpcpp/security/credentials.h"
 #include "include/grpcpp/support/status.h"
-#include "private_join_and_compute.grpc.pb.h"
-#include "private_join_and_compute.pb.h"
-#include "protocol_client.h"
-#include "util/status.inc"
+#include "private_join_and_compute/client_impl.h"
+#include "private_join_and_compute/data_util.h"
+#include "private_join_and_compute/private_join_and_compute.grpc.pb.h"
+#include "private_join_and_compute/private_join_and_compute.pb.h"
+#include "private_join_and_compute/protocol_client.h"
+#include "private_join_and_compute/util/status.inc"
 
 ABSL_FLAG(std::string, port, "0.0.0.0:10501",
           "Port on which to contact server");
diff --git a/client_impl.cc b/private_join_and_compute/client_impl.cc
index bddcd0e..dde1d07 100644
--- a/client_impl.cc
+++ b/private_join_and_compute/client_impl.cc
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "client_impl.h"
+#include "private_join_and_compute/client_impl.h"
 
 #include <algorithm>
 #include <iterator>
diff --git a/client_impl.h b/private_join_and_compute/client_impl.h
index 58abfa3..a0a03bf 100644
--- a/client_impl.h
+++ b/private_join_and_compute/client_impl.h
@@ -16,15 +16,15 @@
 #ifndef OPEN_SOURCE_PRIVATE_INTERSECTION_SUM_CLIENT_IMPL_H_
 #define OPEN_SOURCE_PRIVATE_INTERSECTION_SUM_CLIENT_IMPL_H_
 
-#include "crypto/context.h"
-#include "crypto/ec_commutative_cipher.h"
-#include "crypto/paillier.h"
-#include "match.pb.h"
-#include "message_sink.h"
-#include "private_intersection_sum.pb.h"
-#include "private_join_and_compute.pb.h"
-#include "protocol_client.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/context.h"
+#include "private_join_and_compute/crypto/ec_commutative_cipher.h"
+#include "private_join_and_compute/crypto/paillier.h"
+#include "private_join_and_compute/match.pb.h"
+#include "private_join_and_compute/message_sink.h"
+#include "private_join_and_compute/private_intersection_sum.pb.h"
+#include "private_join_and_compute/private_join_and_compute.pb.h"
+#include "private_join_and_compute/protocol_client.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/BUILD b/private_join_and_compute/crypto/BUILD
index cc6d749..c9244c8 100644
--- a/crypto/BUILD
+++ b/private_join_and_compute/crypto/BUILD
@@ -48,9 +48,9 @@ cc_library(
         "context.h",
     ],
     deps = [
-        "//crypto:openssl_includes",
-        "//crypto:openssl_init",
-        "//util:status_includes",
+        ":openssl_includes",
+        ":openssl_init",
+        "//private_join_and_compute/util:status_includes",
         "@com_github_glog_glog//:glog",
         "@com_google_absl//absl/base",
         "@com_google_absl//absl/flags:flag",
@@ -87,8 +87,8 @@ cc_library(
     ],
     deps = [
         ":bn_util",
-        "//crypto:openssl_includes",
-        "//util:status_includes",
+        ":openssl_includes",
+        "//private_join_and_compute/util:status_includes",
         "@com_github_glog_glog//:glog",
         "@com_google_absl//absl/base",
         "@com_google_absl//absl/strings",
@@ -106,7 +106,7 @@ cc_library(
     deps = [
         ":bn_util",
         ":ec_util",
-        "//util:status_includes",
+        "//private_join_and_compute/util:status_includes",
         "@com_github_glog_glog//:glog",
         "@com_google_absl//absl/memory",
     ],
@@ -124,7 +124,7 @@ cc_library(
         ":bn_util",
         ":ec_util",
         ":elgamal",
-        "//util:status_includes",
+        "//private_join_and_compute/util:status_includes",
         "@com_github_glog_glog//:glog",
         "@com_google_absl//absl/strings",
     ],
@@ -142,7 +142,7 @@ cc_library(
         ":bn_util",
         ":ec_commutative_cipher",
         ":ec_util",
-        "//util:status_includes",
+        "//private_join_and_compute/util:status_includes",
         "@com_github_glog_glog//:glog",
         "@com_google_absl//absl/strings",
     ],
@@ -160,7 +160,7 @@ cc_library(
         ":bn_util",
         ":ec_util",
         ":elgamal",
-        "//util:status_includes",
+        "//private_join_and_compute/util:status_includes",
         "@com_github_glog_glog//:glog",
         "@com_google_absl//absl/base",
         "@com_google_absl//absl/strings",
@@ -178,7 +178,7 @@ cc_library(
     deps = [
         ":bn_util",
         ":mont_mul",
-        "//util:status_includes",
+        "//private_join_and_compute/util:status_includes",
         "@com_github_glog_glog//:glog",
         "@com_google_absl//absl/base",
         "@com_google_absl//absl/strings",
@@ -217,7 +217,7 @@ cc_library(
         ":fixed_base_exp",
         ":paillier_proto",
         ":two_modulus_crt",
-        "//util:status_includes",
+        "//private_join_and_compute/util:status_includes",
         "@com_github_glog_glog//:glog",
         "@com_google_absl//absl/base",
         "@com_google_absl//absl/container:node_hash_map",
@@ -237,7 +237,7 @@ cc_library(
         ":bn_util",
         ":ec_util",
         ":elgamal",
-        "//util:status_includes",
+        "//private_join_and_compute/util:status_includes",
         "@com_google_absl//absl/strings",
     ],
 )
diff --git a/crypto/LICENSE b/private_join_and_compute/crypto/LICENSE
index 7a4a3ea..7a4a3ea 100644
--- a/crypto/LICENSE
+++ b/private_join_and_compute/crypto/LICENSE
diff --git a/crypto/big_num.cc b/private_join_and_compute/crypto/big_num.cc
index aef9167..9bb97ab 100644
--- a/crypto/big_num.cc
+++ b/private_join_and_compute/crypto/big_num.cc
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-#include "crypto/big_num.h"
+#include "private_join_and_compute/crypto/big_num.h"
 
 #include <cmath>
 #include <vector>
 
 #define GLOG_NO_ABBREVIATED_SEVERITIES
 #include "absl/strings/string_view.h"
-#include "crypto/context.h"
-#include "crypto/openssl.inc"
 #include "glog/logging.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/context.h"
+#include "private_join_and_compute/crypto/openssl.inc"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/big_num.h b/private_join_and_compute/crypto/big_num.h
index aed2b8f..86db1d7 100644
--- a/crypto/big_num.h
+++ b/private_join_and_compute/crypto/big_num.h
@@ -23,8 +23,8 @@
 #include <string>
 
 #include "absl/strings/string_view.h"
-#include "crypto/openssl.inc"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/openssl.inc"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/commutative_elgamal.cc b/private_join_and_compute/crypto/commutative_elgamal.cc
index f2b05d0..dc2f494 100644
--- a/crypto/commutative_elgamal.cc
+++ b/private_join_and_compute/crypto/commutative_elgamal.cc
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-#include "crypto/commutative_elgamal.h"
+#include "private_join_and_compute/crypto/commutative_elgamal.h"
 
 #include <memory>
 
 #define GLOG_NO_ABBREVIATED_SEVERITIES
 #include "absl/strings/string_view.h"
-#include "crypto/big_num.h"
-#include "crypto/ec_group.h"
-#include "crypto/ec_point.h"
-#include "crypto/elgamal.h"
 #include "glog/logging.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/big_num.h"
+#include "private_join_and_compute/crypto/ec_group.h"
+#include "private_join_and_compute/crypto/ec_point.h"
+#include "private_join_and_compute/crypto/elgamal.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/commutative_elgamal.h b/private_join_and_compute/crypto/commutative_elgamal.h
index 3f46f87..fc5fab8 100644
--- a/crypto/commutative_elgamal.h
+++ b/private_join_and_compute/crypto/commutative_elgamal.h
@@ -19,8 +19,8 @@
 #include <string>
 
 #include "absl/strings/string_view.h"
-#include "crypto/elgamal.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/elgamal.h"
+#include "private_join_and_compute/util/status.inc"
 
 // Defines functions to generate ElGamal public/private keys, and
 // to encrypt/decrypt messages using those keys.
diff --git a/crypto/context.cc b/private_join_and_compute/crypto/context.cc
index 84f7170..da12718 100644
--- a/crypto/context.cc
+++ b/private_join_and_compute/crypto/context.cc
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "crypto/context.h"
+#include "private_join_and_compute/crypto/context.h"
 
 #include <math.h>
 
@@ -23,8 +23,8 @@
 #define GLOG_NO_ABBREVIATED_SEVERITIES
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-#include "crypto/openssl_init.h"
 #include "glog/logging.h"
+#include "private_join_and_compute/crypto/openssl_init.h"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/context.h b/private_join_and_compute/crypto/context.h
index cc013ad..aace769 100644
--- a/crypto/context.h
+++ b/private_join_and_compute/crypto/context.h
@@ -23,9 +23,9 @@
 
 #define GLOG_NO_ABBREVIATED_SEVERITIES
 #include "absl/strings/string_view.h"
-#include "crypto/big_num.h"
-#include "crypto/openssl.inc"
 #include "glog/logging.h"
+#include "private_join_and_compute/crypto/big_num.h"
+#include "private_join_and_compute/crypto/openssl.inc"
 
 #define CRYPTO_CHECK(expr) CHECK(expr) << OpenSSLErrorString();
 
diff --git a/crypto/ec_commutative_cipher.cc b/private_join_and_compute/crypto/ec_commutative_cipher.cc
index a7c2ccc..4a368f7 100644
--- a/crypto/ec_commutative_cipher.cc
+++ b/private_join_and_compute/crypto/ec_commutative_cipher.cc
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-#include "crypto/ec_commutative_cipher.h"
+#include "private_join_and_compute/crypto/ec_commutative_cipher.h"
 
 #include <utility>
 
-#include "crypto/elgamal.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/elgamal.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/ec_commutative_cipher.h b/private_join_and_compute/crypto/ec_commutative_cipher.h
index 0c03a4b..7142784 100644
--- a/crypto/ec_commutative_cipher.h
+++ b/private_join_and_compute/crypto/ec_commutative_cipher.h
@@ -21,11 +21,11 @@
 
 #include "absl/base/port.h"
 #include "absl/strings/string_view.h"
-#include "crypto/big_num.h"
-#include "crypto/context.h"
-#include "crypto/ec_group.h"
-#include "crypto/ec_point.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/big_num.h"
+#include "private_join_and_compute/crypto/context.h"
+#include "private_join_and_compute/crypto/ec_group.h"
+#include "private_join_and_compute/crypto/ec_point.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/ec_group.cc b/private_join_and_compute/crypto/ec_group.cc
index 7ba31f6..83cac71 100644
--- a/crypto/ec_group.cc
+++ b/private_join_and_compute/crypto/ec_group.cc
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "crypto/ec_group.h"
+#include "private_join_and_compute/crypto/ec_group.h"
 
 #include <algorithm>
 #include <utility>
@@ -21,10 +21,10 @@
 #define GLOG_NO_ABBREVIATED_SEVERITIES
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-#include "crypto/ec_point.h"
-#include "crypto/openssl.inc"
 #include "glog/logging.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/ec_point.h"
+#include "private_join_and_compute/crypto/openssl.inc"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/ec_group.h b/private_join_and_compute/crypto/ec_group.h
index 77fd296..3c8eb07 100644
--- a/crypto/ec_group.h
+++ b/private_join_and_compute/crypto/ec_group.h
@@ -20,10 +20,10 @@
 #include <string>
 
 #include "absl/strings/string_view.h"
-#include "crypto/big_num.h"
-#include "crypto/context.h"
-#include "crypto/openssl.inc"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/big_num.h"
+#include "private_join_and_compute/crypto/context.h"
+#include "private_join_and_compute/crypto/openssl.inc"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/ec_key.proto b/private_join_and_compute/crypto/ec_key.proto
index 1c895ef..1c895ef 100644
--- a/crypto/ec_key.proto
+++ b/private_join_and_compute/crypto/ec_key.proto
diff --git a/crypto/ec_point.cc b/private_join_and_compute/crypto/ec_point.cc
index 230c2a8..e1fe8a4 100644
--- a/crypto/ec_point.cc
+++ b/private_join_and_compute/crypto/ec_point.cc
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-#include "crypto/ec_point.h"
+#include "private_join_and_compute/crypto/ec_point.h"
 
 #include <vector>
 
 #define GLOG_NO_ABBREVIATED_SEVERITIES
 #include "absl/strings/str_cat.h"
-#include "crypto/big_num.h"
-#include "crypto/context.h"
-#include "crypto/openssl.inc"
 #include "glog/logging.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/big_num.h"
+#include "private_join_and_compute/crypto/context.h"
+#include "private_join_and_compute/crypto/openssl.inc"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/ec_point.h b/private_join_and_compute/crypto/ec_point.h
index a1f3ebe..1dba45c 100644
--- a/crypto/ec_point.h
+++ b/private_join_and_compute/crypto/ec_point.h
@@ -19,8 +19,8 @@
 #include <memory>
 #include <string>
 
-#include "crypto/openssl.inc"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/openssl.inc"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/ec_point_util.cc b/private_join_and_compute/crypto/ec_point_util.cc
index 83e8669..54bbfb9 100644
--- a/crypto/ec_point_util.cc
+++ b/private_join_and_compute/crypto/ec_point_util.cc
@@ -13,18 +13,18 @@
  * limitations under the License.
  */
 
-#include "crypto/ec_point_util.h"
+#include "private_join_and_compute/crypto/ec_point_util.h"
 
 #include <memory>
 #include <string>
 
 #include "absl/strings/string_view.h"
-#include "crypto/big_num.h"
-#include "crypto/context.h"
-#include "crypto/ec_commutative_cipher.h"
-#include "crypto/ec_group.h"
-#include "crypto/ec_point.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/big_num.h"
+#include "private_join_and_compute/crypto/context.h"
+#include "private_join_and_compute/crypto/ec_commutative_cipher.h"
+#include "private_join_and_compute/crypto/ec_group.h"
+#include "private_join_and_compute/crypto/ec_point.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/ec_point_util.h b/private_join_and_compute/crypto/ec_point_util.h
index 3fde09b..318df61 100644
--- a/crypto/ec_point_util.h
+++ b/private_join_and_compute/crypto/ec_point_util.h
@@ -21,12 +21,12 @@
 
 #include "absl/base/port.h"
 #include "absl/strings/string_view.h"
-#include "crypto/big_num.h"
-#include "crypto/context.h"
-#include "crypto/ec_commutative_cipher.h"
-#include "crypto/ec_group.h"
-#include "crypto/ec_point.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/big_num.h"
+#include "private_join_and_compute/crypto/context.h"
+#include "private_join_and_compute/crypto/ec_commutative_cipher.h"
+#include "private_join_and_compute/crypto/ec_group.h"
+#include "private_join_and_compute/crypto/ec_point.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/elgamal.cc b/private_join_and_compute/crypto/elgamal.cc
index 582199b..1f76571 100644
--- a/crypto/elgamal.cc
+++ b/private_join_and_compute/crypto/elgamal.cc
@@ -13,17 +13,17 @@
  * limitations under the License.
  */
 
-#include "crypto/elgamal.h"
+#include "private_join_and_compute/crypto/elgamal.h"
 
 #include <vector>
 
 #define GLOG_NO_ABBREVIATED_SEVERITIES
 #include "absl/memory/memory.h"
-#include "crypto/big_num.h"
-#include "crypto/ec_group.h"
-#include "crypto/ec_point.h"
 #include "glog/logging.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/big_num.h"
+#include "private_join_and_compute/crypto/ec_group.h"
+#include "private_join_and_compute/crypto/ec_point.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/elgamal.h b/private_join_and_compute/crypto/elgamal.h
index 06ccb0a..b9e0d97 100644
--- a/crypto/elgamal.h
+++ b/private_join_and_compute/crypto/elgamal.h
@@ -38,9 +38,9 @@
 
 #include <vector>
 
-#include "crypto/ec_group.h"
-#include "crypto/ec_point.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/ec_group.h"
+#include "private_join_and_compute/crypto/ec_point.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/elgamal.proto b/private_join_and_compute/crypto/elgamal.proto
index 227e37d..227e37d 100644
--- a/crypto/elgamal.proto
+++ b/private_join_and_compute/crypto/elgamal.proto
diff --git a/crypto/fixed_base_exp.cc b/private_join_and_compute/crypto/fixed_base_exp.cc
index d092afd..aaab816 100644
--- a/crypto/fixed_base_exp.cc
+++ b/private_join_and_compute/crypto/fixed_base_exp.cc
@@ -24,17 +24,17 @@
 // is actually slower on all possible parameters due to the overhead of
 // transposing the two dimensional bit representation of the exponent.
 
-#include "crypto/fixed_base_exp.h"
+#include "private_join_and_compute/crypto/fixed_base_exp.h"
 
 #include <vector>
 
 #define GLOG_NO_ABBREVIATED_SEVERITIES
 #include "absl/flags/flag.h"
-#include "crypto/big_num.h"
-#include "crypto/context.h"
-#include "crypto/mont_mul.h"
 #include "glog/logging.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/big_num.h"
+#include "private_join_and_compute/crypto/context.h"
+#include "private_join_and_compute/crypto/mont_mul.h"
+#include "private_join_and_compute/util/status.inc"
 
 ABSL_FLAG(bool, two_k_ary_exp, false,
           "Whether to use 2^k-ary fixed based exponentiation.");
diff --git a/crypto/fixed_base_exp.h b/private_join_and_compute/crypto/fixed_base_exp.h
index 4484de4..bb5e4a9 100644
--- a/crypto/fixed_base_exp.h
+++ b/private_join_and_compute/crypto/fixed_base_exp.h
@@ -21,9 +21,9 @@
 #define CRYPTO_FIXED_BASE_H_
 
 #include "absl/flags/declare.h"
-#include "crypto/big_num.h"
-#include "crypto/context.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/big_num.h"
+#include "private_join_and_compute/crypto/context.h"
+#include "private_join_and_compute/util/status.inc"
 
 // Declared for test-only.
 ABSL_DECLARE_FLAG(bool, two_k_ary_exp);
diff --git a/crypto/mont_mul.cc b/private_join_and_compute/crypto/mont_mul.cc
index 48299f0..66528b0 100644
--- a/crypto/mont_mul.cc
+++ b/private_join_and_compute/crypto/mont_mul.cc
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-#include "crypto/mont_mul.h"
+#include "private_join_and_compute/crypto/mont_mul.h"
 
 #include <algorithm>
 
 #define GLOG_NO_ABBREVIATED_SEVERITIES
-#include "crypto/openssl.inc"
 #include "glog/logging.h"
+#include "private_join_and_compute/crypto/openssl.inc"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/mont_mul.h b/private_join_and_compute/crypto/mont_mul.h
index b1aa035..b072bc5 100644
--- a/crypto/mont_mul.h
+++ b/private_join_and_compute/crypto/mont_mul.h
@@ -30,9 +30,9 @@
 #include <string>
 
 #include "absl/strings/string_view.h"
-#include "crypto/big_num.h"
-#include "crypto/context.h"
-#include "crypto/openssl.inc"
+#include "private_join_and_compute/crypto/big_num.h"
+#include "private_join_and_compute/crypto/context.h"
+#include "private_join_and_compute/crypto/openssl.inc"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/openssl.inc b/private_join_and_compute/crypto/openssl.inc
index 01cd341..01cd341 100644
--- a/crypto/openssl.inc
+++ b/private_join_and_compute/crypto/openssl.inc
diff --git a/crypto/openssl_init.cc b/private_join_and_compute/crypto/openssl_init.cc
index a63ffaf..8385345 100644
--- a/crypto/openssl_init.cc
+++ b/private_join_and_compute/crypto/openssl_init.cc
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-#include "crypto/openssl_init.h"
+#include "private_join_and_compute/crypto/openssl_init.h"
 
-#include "crypto/openssl.inc"
+#include "private_join_and_compute/crypto/openssl.inc"
 
 #if !defined(OPENSSL_IS_BORINGSSL)
 #include <pthread.h>
diff --git a/crypto/openssl_init.h b/private_join_and_compute/crypto/openssl_init.h
index 653a8ad..653a8ad 100644
--- a/crypto/openssl_init.h
+++ b/private_join_and_compute/crypto/openssl_init.h
diff --git a/crypto/paillier.cc b/private_join_and_compute/crypto/paillier.cc
index 59fb291..f3ec680 100644
--- a/crypto/paillier.cc
+++ b/private_join_and_compute/crypto/paillier.cc
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "crypto/paillier.h"
+#include "private_join_and_compute/crypto/paillier.h"
 
 #include <stddef.h>
 
@@ -23,12 +23,12 @@
 #define GLOG_NO_ABBREVIATED_SEVERITIES
 #include "absl/container/node_hash_map.h"
 #include "absl/memory/memory.h"
-#include "crypto/big_num.h"
-#include "crypto/context.h"
-#include "crypto/fixed_base_exp.h"
-#include "crypto/two_modulus_crt.h"
 #include "glog/logging.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/big_num.h"
+#include "private_join_and_compute/crypto/context.h"
+#include "private_join_and_compute/crypto/fixed_base_exp.h"
+#include "private_join_and_compute/crypto/two_modulus_crt.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/paillier.h b/private_join_and_compute/crypto/paillier.h
index cc725af..e6df3ba 100644
--- a/crypto/paillier.h
+++ b/private_join_and_compute/crypto/paillier.h
@@ -58,10 +58,10 @@
 #include <string>
 #include <vector>
 
-#include "crypto/big_num.h"
-#include "crypto/context.h"
-#include "crypto/paillier.pb.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/big_num.h"
+#include "private_join_and_compute/crypto/context.h"
+#include "private_join_and_compute/crypto/paillier.pb.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/paillier.proto b/private_join_and_compute/crypto/paillier.proto
index 474343b..474343b 100644
--- a/crypto/paillier.proto
+++ b/private_join_and_compute/crypto/paillier.proto
diff --git a/crypto/shanks_discrete_log.cc b/private_join_and_compute/crypto/shanks_discrete_log.cc
index c8722fe..2c1e5ec 100644
--- a/crypto/shanks_discrete_log.cc
+++ b/private_join_and_compute/crypto/shanks_discrete_log.cc
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-#include "crypto/shanks_discrete_log.h"
+#include "private_join_and_compute/crypto/shanks_discrete_log.h"
 
 #include <utility>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
-#include "util/status.inc"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/shanks_discrete_log.h b/private_join_and_compute/crypto/shanks_discrete_log.h
index 970cbc7..b1829aa 100644
--- a/crypto/shanks_discrete_log.h
+++ b/private_join_and_compute/crypto/shanks_discrete_log.h
@@ -30,10 +30,10 @@
 #include <map>
 
 #include "absl/status/statusor.h"
-#include "crypto/big_num.h"
-#include "crypto/ec_group.h"
-#include "crypto/ec_point.h"
-#include "crypto/elgamal.h"
+#include "private_join_and_compute/crypto/big_num.h"
+#include "private_join_and_compute/crypto/ec_group.h"
+#include "private_join_and_compute/crypto/ec_point.h"
+#include "private_join_and_compute/crypto/elgamal.h"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/two_modulus_crt.cc b/private_join_and_compute/crypto/two_modulus_crt.cc
index 5c79154..4a41354 100644
--- a/crypto/two_modulus_crt.cc
+++ b/private_join_and_compute/crypto/two_modulus_crt.cc
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "crypto/two_modulus_crt.h"
+#include "private_join_and_compute/crypto/two_modulus_crt.h"
 
 namespace private_join_and_compute {
 
diff --git a/crypto/two_modulus_crt.h b/private_join_and_compute/crypto/two_modulus_crt.h
index c63aca2..75b25d3 100644
--- a/crypto/two_modulus_crt.h
+++ b/private_join_and_compute/crypto/two_modulus_crt.h
@@ -19,7 +19,7 @@
 #ifndef CRYPTO_TWO_MODULUS_CRT_H_
 #define CRYPTO_TWO_MODULUS_CRT_H_
 
-#include "crypto/big_num.h"
+#include "private_join_and_compute/crypto/big_num.h"
 
 namespace private_join_and_compute {
 
diff --git a/data_util.cc b/private_join_and_compute/data_util.cc
index 15fc00a..7fa40d0 100644
--- a/data_util.cc
+++ b/private_join_and_compute/data_util.cc
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "data_util.h"
+#include "private_join_and_compute/data_util.h"
 
 #include <algorithm>
 #include <fstream>
@@ -24,8 +24,8 @@
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_replace.h"
-#include "crypto/context.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/context.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 namespace {
diff --git a/data_util.h b/private_join_and_compute/data_util.h
index ab96afa..be1a477 100644
--- a/data_util.h
+++ b/private_join_and_compute/data_util.h
@@ -22,9 +22,9 @@
 #include <string>
 
 #include "absl/strings/string_view.h"
-#include "crypto/context.h"
-#include "match.pb.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/context.h"
+#include "private_join_and_compute/match.pb.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/generate_dummy_data.cc b/private_join_and_compute/generate_dummy_data.cc
index 525fe1e..44370f3 100644
--- a/generate_dummy_data.cc
+++ b/private_join_and_compute/generate_dummy_data.cc
@@ -19,8 +19,8 @@
 #include "absl/flags/parse.h"
 #define GLOG_NO_ABBREVIATED_SEVERITIES
 #include "absl/flags/flag.h"
-#include "data_util.h"
 #include "glog/logging.h"
+#include "private_join_and_compute/data_util.h"
 
 // Flags defining the size of data to generate for the client and server, bounds
 // on the associated values, and where the write the outputs.
diff --git a/match.proto b/private_join_and_compute/match.proto
index f5a6cf6..f5a6cf6 100644
--- a/match.proto
+++ b/private_join_and_compute/match.proto
diff --git a/message_sink.h b/private_join_and_compute/message_sink.h
index 24fc719..9391a9b 100644
--- a/message_sink.h
+++ b/private_join_and_compute/message_sink.h
@@ -17,8 +17,8 @@
 #define OPEN_SOURCE_MESSAGE_SINK_H_
 
 #include "absl/memory/memory.h"
-#include "private_join_and_compute.pb.h"
-#include "util/status.inc"
+#include "private_join_and_compute/private_join_and_compute.pb.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/private_intersection_sum.proto b/private_join_and_compute/private_intersection_sum.proto
index 65039a5..079bc74 100644
--- a/private_intersection_sum.proto
+++ b/private_join_and_compute/private_intersection_sum.proto
@@ -17,7 +17,7 @@ syntax = "proto2";
 
 package private_join_and_compute;
 
-import "match.proto";
+import "private_join_and_compute/match.proto";
 
 // Client Messages
 
diff --git a/private_join_and_compute.proto b/private_join_and_compute/private_join_and_compute.proto
index ea36c9c..7bd7c0a 100644
--- a/private_join_and_compute.proto
+++ b/private_join_and_compute/private_join_and_compute.proto
@@ -17,7 +17,7 @@ syntax = "proto2";
 
 package private_join_and_compute;
 
-import "private_intersection_sum.proto";
+import "private_join_and_compute/private_intersection_sum.proto";
 
 message ClientMessage {
   oneof client_message_oneof {
diff --git a/private_join_and_compute_rpc_impl.cc b/private_join_and_compute/private_join_and_compute_rpc_impl.cc
index bdcbd64..51bbd05 100644
--- a/private_join_and_compute_rpc_impl.cc
+++ b/private_join_and_compute/private_join_and_compute_rpc_impl.cc
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-#include "private_join_and_compute_rpc_impl.h"
+#include "private_join_and_compute/private_join_and_compute_rpc_impl.h"
 
-#include "util/status.inc"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/private_join_and_compute_rpc_impl.h b/private_join_and_compute/private_join_and_compute_rpc_impl.h
index 5ae4bde..c122f73 100644
--- a/private_join_and_compute_rpc_impl.h
+++ b/private_join_and_compute/private_join_and_compute_rpc_impl.h
@@ -19,9 +19,9 @@
 #include "include/grpcpp/grpcpp.h"
 #include "include/grpcpp/server_context.h"
 #include "include/grpcpp/support/status.h"
-#include "private_join_and_compute.grpc.pb.h"
-#include "private_join_and_compute.pb.h"
-#include "protocol_server.h"
+#include "private_join_and_compute/private_join_and_compute.grpc.pb.h"
+#include "private_join_and_compute/private_join_and_compute.pb.h"
+#include "private_join_and_compute/protocol_server.h"
 
 namespace private_join_and_compute {
 
diff --git a/protocol_client.h b/private_join_and_compute/protocol_client.h
index f4db997..b5e77d2 100644
--- a/protocol_client.h
+++ b/private_join_and_compute/protocol_client.h
@@ -16,9 +16,9 @@
 #ifndef OPEN_SOURCE_PROTOCOL_CLIENT_H_
 #define OPEN_SOURCE_PROTOCOL_CLIENT_H_
 
-#include "message_sink.h"
-#include "private_join_and_compute.pb.h"
-#include "util/status.inc"
+#include "private_join_and_compute/message_sink.h"
+#include "private_join_and_compute/private_join_and_compute.pb.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/protocol_server.h b/private_join_and_compute/protocol_server.h
index 7784e19..033c85a 100644
--- a/protocol_server.h
+++ b/private_join_and_compute/protocol_server.h
@@ -16,9 +16,9 @@
 #ifndef OPEN_SOURCE_PROTOCOL_SERVER_H_
 #define OPEN_SOURCE_PROTOCOL_SERVER_H_
 
-#include "message_sink.h"
-#include "private_join_and_compute.pb.h"
-#include "util/status.inc"
+#include "private_join_and_compute/message_sink.h"
+#include "private_join_and_compute/private_join_and_compute.pb.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/server.cc b/private_join_and_compute/server.cc
index 8a59472..592924b 100644
--- a/server.cc
+++ b/private_join_and_compute/server.cc
@@ -21,17 +21,17 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "absl/memory/memory.h"
-#include "data_util.h"
 #include "include/grpc/grpc_security_constants.h"
 #include "include/grpcpp/grpcpp.h"
 #include "include/grpcpp/security/server_credentials.h"
 #include "include/grpcpp/server_builder.h"
 #include "include/grpcpp/server_context.h"
 #include "include/grpcpp/support/status.h"
-#include "private_join_and_compute.grpc.pb.h"
-#include "private_join_and_compute_rpc_impl.h"
-#include "protocol_server.h"
-#include "server_impl.h"
+#include "private_join_and_compute/data_util.h"
+#include "private_join_and_compute/private_join_and_compute.grpc.pb.h"
+#include "private_join_and_compute/private_join_and_compute_rpc_impl.h"
+#include "private_join_and_compute/protocol_server.h"
+#include "private_join_and_compute/server_impl.h"
 
 ABSL_FLAG(std::string, port, "0.0.0.0:10501", "Port on which to listen");
 ABSL_FLAG(std::string, server_data_file, "",
diff --git a/server_impl.cc b/private_join_and_compute/server_impl.cc
index d0b0484..e33148f 100644
--- a/server_impl.cc
+++ b/private_join_and_compute/server_impl.cc
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-#include "server_impl.h"
+#include "private_join_and_compute/server_impl.h"
 
 #include <algorithm>
 
 #include "absl/memory/memory.h"
-#include "crypto/ec_commutative_cipher.h"
-#include "crypto/paillier.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/ec_commutative_cipher.h"
+#include "private_join_and_compute/crypto/paillier.h"
+#include "private_join_and_compute/util/status.inc"
 
 using ::private_join_and_compute::BigNum;
 using ::private_join_and_compute::ECCommutativeCipher;
diff --git a/server_impl.h b/private_join_and_compute/server_impl.h
index 43917d1..fb39326 100644
--- a/server_impl.h
+++ b/private_join_and_compute/server_impl.h
@@ -16,15 +16,15 @@
 #ifndef OPEN_SOURCE_PRIVATE_INTERSECTION_SUM_SERVER_IMPL_H_
 #define OPEN_SOURCE_PRIVATE_INTERSECTION_SUM_SERVER_IMPL_H_
 
-#include "crypto/context.h"
-#include "crypto/ec_commutative_cipher.h"
-#include "crypto/paillier.h"
-#include "match.pb.h"
-#include "message_sink.h"
-#include "private_intersection_sum.pb.h"
-#include "private_join_and_compute.pb.h"
-#include "protocol_server.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/context.h"
+#include "private_join_and_compute/crypto/ec_commutative_cipher.h"
+#include "private_join_and_compute/crypto/paillier.h"
+#include "private_join_and_compute/match.pb.h"
+#include "private_join_and_compute/message_sink.h"
+#include "private_join_and_compute/private_intersection_sum.pb.h"
+#include "private_join_and_compute/private_join_and_compute.pb.h"
+#include "private_join_and_compute/protocol_server.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/util/BUILD b/private_join_and_compute/util/BUILD
index 744e52f..0497033 100644
--- a/util/BUILD
+++ b/private_join_and_compute/util/BUILD
@@ -133,7 +133,7 @@ cc_test(
         ":recordio",
         ":status_includes",
         ":status_testing_includes",
-        "//crypto:bn_util",
+        "//private_join_and_compute/crypto:bn_util",
         "@com_github_google_googletest//:gtest_main",
         "@com_google_absl//absl/random",
         "@com_google_absl//absl/strings",
@@ -144,8 +144,8 @@ cc_library(
     name = "process_record_file_parameters",
     hdrs = ["process_record_file_parameters.h"],
     deps = [
-        "//crypto:ec_commutative_cipher",
-        "//crypto:openssl_includes",
+        "//private_join_and_compute/crypto:ec_commutative_cipher",
+        "//private_join_and_compute/crypto:openssl_includes",
     ],
 )
 
@@ -185,10 +185,10 @@ cc_library(
     srcs = ["elgamal_proto_util.cc"],
     hdrs = ["elgamal_proto_util.h"],
     deps = [
-        "//crypto:bn_util",
-        "//crypto:ec_util",
-        "//crypto:elgamal",
-        "//crypto:elgamal_proto",
+        "//private_join_and_compute/crypto:bn_util",
+        "//private_join_and_compute/crypto:ec_util",
+        "//private_join_and_compute/crypto:elgamal",
+        "//private_join_and_compute/crypto:elgamal_proto",
     ],
 )
 
@@ -201,9 +201,9 @@ cc_library(
         ":proto_util",
         ":recordio",
         ":status_includes",
-        "//crypto:bn_util",
-        "//crypto:ec_util",
-        "//crypto:elgamal_proto",
+        "//private_join_and_compute/crypto:bn_util",
+        "//private_join_and_compute/crypto:ec_util",
+        "//private_join_and_compute/crypto:elgamal_proto",
     ],
 )
 
@@ -215,9 +215,9 @@ cc_library(
         ":proto_util",
         ":recordio",
         ":status_includes",
-        "//crypto:bn_util",
-        "//crypto:ec_key_proto",
-        "//crypto:ec_util",
+        "//private_join_and_compute/crypto:bn_util",
+        "//private_join_and_compute/crypto:ec_key_proto",
+        "//private_join_and_compute/crypto:ec_util",
         "@com_google_absl//absl/strings",
     ],
 )
@@ -238,13 +238,13 @@ cc_test(
     deps = [
         ":elgamal_key_util",
         ":elgamal_proto_util",
-        ":openssl_includes",
         ":proto_util",
         ":status_testing_includes",
-        "//crypto:bn_util",
-        "//crypto:ec_util",
-        "//crypto:elgamal",
-        "//crypto:elgamal_proto",
+        "//private_join_and_compute/crypto:bn_util",
+        "//private_join_and_compute/crypto:ec_util",
+        "//private_join_and_compute/crypto:elgamal",
+        "//private_join_and_compute/crypto:elgamal_proto",
+        "//private_join_and_compute/crypto:openssl_includes",
         "@com_github_google_googletest//:gtest_main",
     ],
 )
@@ -254,12 +254,12 @@ cc_test(
     srcs = ["ec_key_util_test.cc"],
     deps = [
         ":ec_key_util",
-        ":openssl_includes",
         ":proto_util",
         ":status_testing_includes",
-        "//crypto:bn_util",
-        "//crypto:ec_key_proto",
-        "//crypto:ec_util",
+        "//private_join_and_compute/crypto:bn_util",
+        "//private_join_and_compute/crypto:ec_key_proto",
+        "//private_join_and_compute/crypto:ec_util",
+        "//private_join_and_compute/crypto:openssl_includes",
         "@com_github_google_googletest//:gtest_main",
     ],
 )
diff --git a/util/LICENSE b/private_join_and_compute/util/LICENSE
index 7a4a3ea..7a4a3ea 100644
--- a/util/LICENSE
+++ b/private_join_and_compute/util/LICENSE
diff --git a/util/ec_key_util.cc b/private_join_and_compute/util/ec_key_util.cc
index 7147448..dbcddd2 100644
--- a/util/ec_key_util.cc
+++ b/private_join_and_compute/util/ec_key_util.cc
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-#include "util/ec_key_util.h"
+#include "private_join_and_compute/util/ec_key_util.h"
 
 #include "absl/strings/str_cat.h"
-#include "crypto/ec_group.h"
-#include "util/proto_util.h"
-#include "util/recordio.h"
+#include "private_join_and_compute/crypto/ec_group.h"
+#include "private_join_and_compute/util/proto_util.h"
+#include "private_join_and_compute/util/recordio.h"
 
 namespace private_join_and_compute::ec_key_util {
 
diff --git a/util/ec_key_util.h b/private_join_and_compute/util/ec_key_util.h
index 393d396..8852591 100644
--- a/util/ec_key_util.h
+++ b/private_join_and_compute/util/ec_key_util.h
@@ -16,10 +16,10 @@
 #ifndef UTIL_EC_KEY_UTIL_H_
 #define UTIL_EC_KEY_UTIL_H_
 
-#include "crypto/big_num.h"
-#include "crypto/context.h"
-#include "crypto/ec_key.pb.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/big_num.h"
+#include "private_join_and_compute/crypto/context.h"
+#include "private_join_and_compute/crypto/ec_key.pb.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute::ec_key_util {
 
diff --git a/util/ec_key_util_test.cc b/private_join_and_compute/util/ec_key_util_test.cc
index 6f33a64..40bdddf 100644
--- a/util/ec_key_util_test.cc
+++ b/private_join_and_compute/util/ec_key_util_test.cc
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "util/ec_key_util.h"
+#include "private_join_and_compute/util/ec_key_util.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
@@ -22,12 +22,12 @@
 #include <memory>
 #include <string>
 
-#include "crypto/context.h"
-#include "crypto/ec_group.h"
-#include "crypto/ec_key.pb.h"
-#include "crypto/openssl.inc"
-#include "util/proto_util.h"
-#include "util/status_testing.inc"
+#include "private_join_and_compute/crypto/context.h"
+#include "private_join_and_compute/crypto/ec_group.h"
+#include "private_join_and_compute/crypto/ec_key.pb.h"
+#include "private_join_and_compute/crypto/openssl.inc"
+#include "private_join_and_compute/util/proto_util.h"
+#include "private_join_and_compute/util/status_testing.inc"
 
 namespace private_join_and_compute::ec_key_util {
 namespace {
diff --git a/util/elgamal_key_util.cc b/private_join_and_compute/util/elgamal_key_util.cc
index 055f7a0..3af97da 100644
--- a/util/elgamal_key_util.cc
+++ b/private_join_and_compute/util/elgamal_key_util.cc
@@ -13,19 +13,19 @@
  * limitations under the License.
  */
 
-#include "util/elgamal_key_util.h"
+#include "private_join_and_compute/util/elgamal_key_util.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
-#include "crypto/context.h"
-#include "crypto/ec_point.h"
-#include "crypto/elgamal.pb.h"
-#include "util/elgamal_proto_util.h"
-#include "util/proto_util.h"
-#include "util/recordio.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/context.h"
+#include "private_join_and_compute/crypto/ec_point.h"
+#include "private_join_and_compute/crypto/elgamal.pb.h"
+#include "private_join_and_compute/util/elgamal_proto_util.h"
+#include "private_join_and_compute/util/proto_util.h"
+#include "private_join_and_compute/util/recordio.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute::elgamal_key_util {
 namespace {
diff --git a/util/elgamal_key_util.h b/private_join_and_compute/util/elgamal_key_util.h
index 1bc1616..65e8f15 100644
--- a/util/elgamal_key_util.h
+++ b/private_join_and_compute/util/elgamal_key_util.h
@@ -19,8 +19,8 @@
 #include <memory>
 #include <string>
 
-#include "crypto/elgamal.pb.h"
-#include "util/status.inc"
+#include "private_join_and_compute/crypto/elgamal.pb.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute::elgamal_key_util {
 
diff --git a/util/elgamal_key_util_test.cc b/private_join_and_compute/util/elgamal_key_util_test.cc
index 8295933..7693de5 100644
--- a/util/elgamal_key_util_test.cc
+++ b/private_join_and_compute/util/elgamal_key_util_test.cc
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "util/elgamal_key_util.h"
+#include "private_join_and_compute/util/elgamal_key_util.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
@@ -21,14 +21,14 @@
 #include <filesystem>
 #include <memory>
 
-#include "crypto/context.h"
-#include "crypto/ec_group.h"
-#include "crypto/elgamal.h"
-#include "crypto/elgamal.pb.h"
-#include "crypto/openssl.inc"
-#include "util/elgamal_proto_util.h"
-#include "util/proto_util.h"
-#include "util/status_testing.inc"
+#include "private_join_and_compute/crypto/context.h"
+#include "private_join_and_compute/crypto/ec_group.h"
+#include "private_join_and_compute/crypto/elgamal.h"
+#include "private_join_and_compute/crypto/elgamal.pb.h"
+#include "private_join_and_compute/crypto/openssl.inc"
+#include "private_join_and_compute/util/elgamal_proto_util.h"
+#include "private_join_and_compute/util/proto_util.h"
+#include "private_join_and_compute/util/status_testing.inc"
 
 namespace private_join_and_compute::elgamal_key_util {
 namespace {
diff --git a/util/elgamal_proto_util.cc b/private_join_and_compute/util/elgamal_proto_util.cc
index 9498969..3ab8f1d 100644
--- a/util/elgamal_proto_util.cc
+++ b/private_join_and_compute/util/elgamal_proto_util.cc
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "util/elgamal_proto_util.h"
+#include "private_join_and_compute/util/elgamal_proto_util.h"
 
 namespace private_join_and_compute::elgamal_proto_util {
 
diff --git a/util/elgamal_proto_util.h b/private_join_and_compute/util/elgamal_proto_util.h
index 2fe57bd..2cd5d85 100644
--- a/util/elgamal_proto_util.h
+++ b/private_join_and_compute/util/elgamal_proto_util.h
@@ -19,10 +19,10 @@
 #ifndef UTIL_ELGAMAL_PROTO_UTIL_H_
 #define UTIL_ELGAMAL_PROTO_UTIL_H_
 
-#include "crypto/context.h"
-#include "crypto/ec_group.h"
-#include "crypto/elgamal.h"
-#include "crypto/elgamal.pb.h"
+#include "private_join_and_compute/crypto/context.h"
+#include "private_join_and_compute/crypto/ec_group.h"
+#include "private_join_and_compute/crypto/elgamal.h"
+#include "private_join_and_compute/crypto/elgamal.pb.h"
 
 namespace private_join_and_compute::elgamal_proto_util {
 
diff --git a/util/elgamal_proto_util_test.cc b/private_join_and_compute/util/elgamal_proto_util_test.cc
index f3ddaf8..33628c2 100644
--- a/util/elgamal_proto_util_test.cc
+++ b/private_join_and_compute/util/elgamal_proto_util_test.cc
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-#include "util/elgamal_proto_util.h"
+#include "private_join_and_compute/util/elgamal_proto_util.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include <utility>
 
-#include "util/status_testing.inc"
+#include "private_join_and_compute/util/status_testing.inc"
 
 namespace private_join_and_compute::elgamal_proto_util {
 namespace {
diff --git a/util/file.cc b/private_join_and_compute/util/file.cc
index dae55be..f695d9b 100644
--- a/util/file.cc
+++ b/private_join_and_compute/util/file.cc
@@ -15,7 +15,7 @@
 
 // Common implementations.
 
-#include "util/file.h"
+#include "private_join_and_compute/util/file.h"
 
 #include <sstream>
 
diff --git a/util/file.h b/private_join_and_compute/util/file.h
index 95fe415..184281f 100644
--- a/util/file.h
+++ b/private_join_and_compute/util/file.h
@@ -18,7 +18,7 @@
 
 #include <string>
 
-#include "util/status.inc"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/util/file_posix.cc b/private_join_and_compute/util/file_posix.cc
index 4e3f22e..90fd301 100644
--- a/util/file_posix.cc
+++ b/private_join_and_compute/util/file_posix.cc
@@ -18,8 +18,8 @@
 #include <stdlib.h>
 
 #include "absl/strings/str_cat.h"
-#include "util/file.h"
-#include "util/status.inc"
+#include "private_join_and_compute/util/file.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 namespace {
diff --git a/util/file_test.cc b/private_join_and_compute/util/file_test.cc
index 37b86e8..0abac87 100644
--- a/util/file_test.cc
+++ b/private_join_and_compute/util/file_test.cc
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-#include "util/file.h"
+#include "private_join_and_compute/util/file.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "util/status.inc"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 namespace {
diff --git a/util/file_test.proto b/private_join_and_compute/util/file_test.proto
index 3bf8e96..3bf8e96 100644
--- a/util/file_test.proto
+++ b/private_join_and_compute/util/file_test.proto
diff --git a/util/process_record_file_parameters.h b/private_join_and_compute/util/process_record_file_parameters.h
index f612ba3..f612ba3 100644
--- a/util/process_record_file_parameters.h
+++ b/private_join_and_compute/util/process_record_file_parameters.h
diff --git a/util/process_record_file_util.h b/private_join_and_compute/util/process_record_file_util.h
index dbb8bcf..632a155 100644
--- a/util/process_record_file_util.h
+++ b/private_join_and_compute/util/process_record_file_util.h
@@ -22,10 +22,10 @@
 #include <string>
 
 #include "absl/strings/string_view.h"
-#include "util/process_record_file_parameters.h"
-#include "util/proto_util.h"
-#include "util/recordio.h"
-#include "util/status.inc"
+#include "private_join_and_compute/util/process_record_file_parameters.h"
+#include "private_join_and_compute/util/proto_util.h"
+#include "private_join_and_compute/util/recordio.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute::util::process_file_util {
 
diff --git a/util/process_record_file_util_test.cc b/private_join_and_compute/util/process_record_file_util_test.cc
index ecf2fcf..f3a4e43 100644
--- a/util/process_record_file_util_test.cc
+++ b/private_join_and_compute/util/process_record_file_util_test.cc
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "util/process_record_file_util.h"
+#include "private_join_and_compute/util/process_record_file_util.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
@@ -23,10 +23,10 @@
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-#include "util/process_record_file_parameters.h"
-#include "util/proto/test.pb.h"
-#include "util/proto_util.h"
-#include "util/status_testing.inc"
+#include "private_join_and_compute/util/process_record_file_parameters.h"
+#include "private_join_and_compute/util/proto_util.h"
+#include "private_join_and_compute/util/status_testing.inc"
+#include "private_join_and_compute/util/test.pb.h"
 
 namespace private_join_and_compute::util::process_file_util {
 namespace {
diff --git a/util/proto_util.h b/private_join_and_compute/util/proto_util.h
index 5749863..ea28d87 100644
--- a/util/proto_util.h
+++ b/private_join_and_compute/util/proto_util.h
@@ -22,9 +22,9 @@
 #include <string>
 
 #include "absl/strings/string_view.h"
+#include "private_join_and_compute/util/recordio.h"
+#include "private_join_and_compute/util/status.inc"
 #include "src/google/protobuf/message_lite.h"
-#include "util/recordio.h"
-#include "util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/util/proto_util_test.cc b/private_join_and_compute/util/proto_util_test.cc
index 2234357..a11c965 100644
--- a/util/proto_util_test.cc
+++ b/private_join_and_compute/util/proto_util_test.cc
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "util/proto_util.h"
+#include "private_join_and_compute/util/proto_util.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
@@ -21,8 +21,8 @@
 #include <filesystem>
 #include <string>
 
-#include "util/file_test.pb.h"
-#include "util/status_testing.inc"
+#include "private_join_and_compute/util/file_test.pb.h"
+#include "private_join_and_compute/util/status_testing.inc"
 
 namespace private_join_and_compute {
 
@@ -40,8 +40,7 @@ TEST(ProtoUtilsTest, ConvertsToAndFrom) {
 }
 
 TEST(ProtoUtilsTest, ReadWriteToFile) {
-  std::filesystem::path temp_dir(::testing::TempDir());
-  std::string filename = (temp_dir / "proto_file").string();
+  std::string filename = ::testing::TempDir() + "/proto_file";
 
   TestProto expected_test_proto;
   expected_test_proto.set_record("data");
diff --git a/util/recordio.cc b/private_join_and_compute/util/recordio.cc
index a0dcfaf..53f8440 100644
--- a/util/recordio.cc
+++ b/private_join_and_compute/util/recordio.cc
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "util/recordio.h"
+#include "private_join_and_compute/util/recordio.h"
 
 #include <algorithm>
 #include <functional>
@@ -30,9 +30,9 @@
 #include "absl/strings/string_view.h"
 #include "absl/synchronization/mutex.h"
 #include "glog/logging.h"
+#include "private_join_and_compute/util/status.inc"
 #include "src/google/protobuf/io/coded_stream.h"
 #include "src/google/protobuf/io/zero_copy_stream_impl_lite.h"
-#include "util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/util/recordio.h b/private_join_and_compute/util/recordio.h
index 019f69d..ab42495 100644
--- a/util/recordio.h
+++ b/private_join_and_compute/util/recordio.h
@@ -39,8 +39,8 @@
 
 #include "absl/memory/memory.h"
 #include "absl/strings/string_view.h"
-#include "util/file.h"
-#include "util/status.inc"
+#include "private_join_and_compute/util/file.h"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 
diff --git a/util/recordio_test.cc b/private_join_and_compute/util/recordio_test.cc
index fb86b4f..eb234c8 100644
--- a/util/recordio_test.cc
+++ b/private_join_and_compute/util/recordio_test.cc
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "util/recordio.h"
+#include "private_join_and_compute/util/recordio.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
@@ -23,11 +23,11 @@
 #include "absl/random/random.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-#include "crypto/context.h"
-#include "util/file_test.pb.h"
-#include "util/proto_util.h"
-#include "util/status.inc"
-#include "util/status_testing.inc"
+#include "private_join_and_compute/crypto/context.h"
+#include "private_join_and_compute/util/file_test.pb.h"
+#include "private_join_and_compute/util/proto_util.h"
+#include "private_join_and_compute/util/status.inc"
+#include "private_join_and_compute/util/status_testing.inc"
 
 namespace private_join_and_compute {
 namespace {
diff --git a/util/status.inc b/private_join_and_compute/util/status.inc
index e645841..415707a 100644
--- a/util/status.inc
+++ b/private_join_and_compute/util/status.inc
@@ -16,7 +16,7 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 
-#include "util/status_macros.h"
+#include "private_join_and_compute/util/status_macros.h"
 
 namespace private_join_and_compute {
 // Aliases StatusCode to be compatible with our code.
diff --git a/util/status_macros.h b/private_join_and_compute/util/status_macros.h
index accafd8..accafd8 100644
--- a/util/status_macros.h
+++ b/private_join_and_compute/util/status_macros.h
diff --git a/util/status_matchers.h b/private_join_and_compute/util/status_matchers.h
index 84a5f3f..f0e5d85 100644
--- a/util/status_matchers.h
+++ b/private_join_and_compute/util/status_matchers.h
@@ -34,7 +34,7 @@
 
 #include <gmock/gmock.h>
 
-#include "util/status.inc"
+#include "private_join_and_compute/util/status.inc"
 
 namespace private_join_and_compute {
 namespace testing {
diff --git a/util/status_testing.h b/private_join_and_compute/util/status_testing.h
index 0a8d533..f61c453 100644
--- a/util/status_testing.h
+++ b/private_join_and_compute/util/status_testing.h
@@ -34,7 +34,7 @@
 
 #include <gmock/gmock.h>
 
-#include "util/status.inc"
+#include "private_join_and_compute/util/status.inc"
 
 #ifndef GTEST_HAS_STATUS_MATCHERS
 
diff --git a/util/status_testing.inc b/private_join_and_compute/util/status_testing.inc
index 1f07284..5bc5960 100644
--- a/util/status_testing.inc
+++ b/private_join_and_compute/util/status_testing.inc
@@ -13,5 +13,5 @@
  * limitations under the License.
  */
 
-#include "util/status_matchers.h"
-#include "util/status_testing.h"
+#include "private_join_and_compute/util/status_matchers.h"
+#include "private_join_and_compute/util/status_testing.h"
diff --git a/util/test.proto b/private_join_and_compute/util/test.proto
index 9d4258c..9d4258c 100644
--- a/util/test.proto
+++ b/private_join_and_compute/util/test.proto