diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index 8dba0d1f0..216c54a8a 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -1,7 +1,7 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-ENVOY_COMMIT = "1c03ddcbd6feb5ad2507ce52d9aeaf52a3156554"  # June 1, 2021
-ENVOY_SHA = "c4fbbda0a434ba71f5859602f111fee1d8ea98c0d7ecee702ec8a620aa888744"
+ENVOY_COMMIT = "72bf41fb0ecc039f196be02f534bfc2c9c69f348"  # June 4, 2021
+ENVOY_SHA = "db07426cf02fa2f8ed9891e64adf67ced39e72cdcce9ba121d420b471cc96766"
 
 HDR_HISTOGRAM_C_VERSION = "0.11.2"  # October 12th, 2020
 HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"
diff --git a/docs/root/overview.md b/docs/root/overview.md
index 46cb147ce..f41e2a98f 100644
--- a/docs/root/overview.md
+++ b/docs/root/overview.md
@@ -58,7 +58,7 @@ back reports per phase.
 
 ## Key concept descriptions
 
-*The c++ interface definitions for the concepts below can be found [here](https://github.com/envoyproxy/nighthawk/tree/main/include/nighthawk)*.
+*The c++ interface definitions for the concepts below can be found [here](https://github.com/envoyproxy/nighthawk/tree/main/nighthawk)*.
 
 ### Process
 
diff --git a/include/nighthawk/adaptive_load/BUILD b/nighthawk/adaptive_load/BUILD
similarity index 72%
rename from include/nighthawk/adaptive_load/BUILD
rename to nighthawk/adaptive_load/BUILD
index fd658e9f0..8b8fb0457 100644
--- a/include/nighthawk/adaptive_load/BUILD
+++ b/nighthawk/adaptive_load/BUILD
@@ -18,9 +18,9 @@ envoy_basic_cc_library(
         ":config_validator",
         "//api/adaptive_load:adaptive_load_proto_cc_proto",
         "//api/client:grpc_service_lib",
-        "@envoy//include/envoy/common:base_includes",
-        "@envoy//include/envoy/common:time_interface",
-        "@envoy//include/envoy/config:typed_config_interface",
+        "@envoy//envoy/common:base_includes",
+        "@envoy//envoy/common:time_interface",
+        "@envoy//envoy/config:typed_config_interface",
         "@envoy//source/common/common:statusor_lib_with_external_headers",
     ],
 )
@@ -32,9 +32,9 @@ envoy_basic_cc_library(
     ],
     include_prefix = "nighthawk/adaptive_load",
     deps = [
-        "@envoy//include/envoy/common:base_includes",
-        "@envoy//include/envoy/common:time_interface",
-        "@envoy//include/envoy/config:typed_config_interface",
+        "@envoy//envoy/common:base_includes",
+        "@envoy//envoy/common:time_interface",
+        "@envoy//envoy/config:typed_config_interface",
         "@envoy//source/common/protobuf:protobuf_with_external_headers",
     ],
 )
@@ -48,8 +48,8 @@ envoy_basic_cc_library(
     deps = [
         ":config_validator",
         "//api/adaptive_load:adaptive_load_proto_cc_proto",
-        "@envoy//include/envoy/common:base_includes",
-        "@envoy//include/envoy/config:typed_config_interface",
+        "@envoy//envoy/common:base_includes",
+        "@envoy//envoy/config:typed_config_interface",
     ],
 )
 
@@ -62,8 +62,8 @@ envoy_basic_cc_library(
     deps = [
         ":metrics_plugin",
         "//api/adaptive_load:adaptive_load_proto_cc_proto",
-        "@envoy//include/envoy/common:base_includes",
-        "@envoy//include/envoy/config:typed_config_interface",
+        "@envoy//envoy/common:base_includes",
+        "@envoy//envoy/config:typed_config_interface",
         "@envoy//source/common/common:statusor_lib_with_external_headers",
     ],
 )
@@ -77,8 +77,8 @@ envoy_basic_cc_library(
     deps = [
         ":config_validator",
         "//api/adaptive_load:adaptive_load_proto_cc_proto",
-        "@envoy//include/envoy/common:base_includes",
-        "@envoy//include/envoy/config:typed_config_interface",
+        "@envoy//envoy/common:base_includes",
+        "@envoy//envoy/config:typed_config_interface",
         "@envoy//source/common/common:statusor_lib_with_external_headers",
     ],
 )
@@ -92,8 +92,8 @@ envoy_basic_cc_library(
     deps = [
         ":config_validator",
         "//api/adaptive_load:adaptive_load_proto_cc_proto",
-        "@envoy//include/envoy/common:base_includes",
-        "@envoy//include/envoy/config:typed_config_interface",
+        "@envoy//envoy/common:base_includes",
+        "@envoy//envoy/config:typed_config_interface",
     ],
 )
 
@@ -106,7 +106,7 @@ envoy_basic_cc_library(
     deps = [
         "//api/adaptive_load:adaptive_load_proto_cc_proto",
         "@com_google_absl//absl/status",
-        "@envoy//include/envoy/common:base_includes",
+        "@envoy//envoy/common:base_includes",
     ],
 )
 
@@ -119,7 +119,7 @@ envoy_basic_cc_library(
     deps = [
         ":config_validator",
         "//api/adaptive_load:adaptive_load_proto_cc_proto",
-        "@envoy//include/envoy/common:base_includes",
-        "@envoy//include/envoy/config:typed_config_interface",
+        "@envoy//envoy/common:base_includes",
+        "@envoy//envoy/config:typed_config_interface",
     ],
 )
diff --git a/include/nighthawk/adaptive_load/adaptive_load_controller.h b/nighthawk/adaptive_load/adaptive_load_controller.h
similarity index 97%
rename from include/nighthawk/adaptive_load/adaptive_load_controller.h
rename to nighthawk/adaptive_load/adaptive_load_controller.h
index e510ee3b6..5e487536c 100644
--- a/include/nighthawk/adaptive_load/adaptive_load_controller.h
+++ b/nighthawk/adaptive_load/adaptive_load_controller.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "envoy/common/pure.h"
-
+#include "external/envoy/envoy/common/pure.h"
 #include "external/envoy/source/common/common/statusor.h"
 
 #include "api/adaptive_load/adaptive_load.pb.h"
diff --git a/include/nighthawk/adaptive_load/config_validator.h b/nighthawk/adaptive_load/config_validator.h
similarity index 97%
rename from include/nighthawk/adaptive_load/config_validator.h
rename to nighthawk/adaptive_load/config_validator.h
index 9f8d2fe00..930cda5f2 100644
--- a/include/nighthawk/adaptive_load/config_validator.h
+++ b/nighthawk/adaptive_load/config_validator.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "envoy/common/pure.h"
-
+#include "external/envoy/envoy/common/pure.h"
 #include "external/envoy/source/common/protobuf/protobuf.h"
 
 #include "absl/status/status.h"
diff --git a/include/nighthawk/adaptive_load/input_variable_setter.h b/nighthawk/adaptive_load/input_variable_setter.h
similarity index 96%
rename from include/nighthawk/adaptive_load/input_variable_setter.h
rename to nighthawk/adaptive_load/input_variable_setter.h
index 2659a624b..6ece573af 100644
--- a/include/nighthawk/adaptive_load/input_variable_setter.h
+++ b/nighthawk/adaptive_load/input_variable_setter.h
@@ -2,11 +2,10 @@
 
 #pragma once
 
-#include "envoy/common/pure.h"
-#include "envoy/config/typed_config.h"
-
 #include "nighthawk/adaptive_load/config_validator.h"
 
+#include "external/envoy/envoy/common/pure.h"
+#include "external/envoy/envoy/config/typed_config.h"
 #include "external/envoy/source/common/protobuf/protobuf.h"
 
 #include "api/client/options.pb.h"
diff --git a/include/nighthawk/adaptive_load/metrics_evaluator.h b/nighthawk/adaptive_load/metrics_evaluator.h
similarity index 100%
rename from include/nighthawk/adaptive_load/metrics_evaluator.h
rename to nighthawk/adaptive_load/metrics_evaluator.h
diff --git a/include/nighthawk/adaptive_load/metrics_plugin.h b/nighthawk/adaptive_load/metrics_plugin.h
similarity index 95%
rename from include/nighthawk/adaptive_load/metrics_plugin.h
rename to nighthawk/adaptive_load/metrics_plugin.h
index 61a7e3579..d27d54f77 100644
--- a/include/nighthawk/adaptive_load/metrics_plugin.h
+++ b/nighthawk/adaptive_load/metrics_plugin.h
@@ -2,11 +2,10 @@
 
 #pragma once
 
-#include "envoy/common/pure.h"
-#include "envoy/config/typed_config.h"
-
 #include "nighthawk/adaptive_load/config_validator.h"
 
+#include "external/envoy/envoy/common/pure.h"
+#include "external/envoy/envoy/config/typed_config.h"
 #include "external/envoy/source/common/common/statusor.h"
 
 namespace Nighthawk {
diff --git a/include/nighthawk/adaptive_load/scoring_function.h b/nighthawk/adaptive_load/scoring_function.h
similarity index 95%
rename from include/nighthawk/adaptive_load/scoring_function.h
rename to nighthawk/adaptive_load/scoring_function.h
index 591c4919c..b4038f452 100644
--- a/include/nighthawk/adaptive_load/scoring_function.h
+++ b/nighthawk/adaptive_load/scoring_function.h
@@ -2,11 +2,11 @@
 
 #pragma once
 
-#include "envoy/common/pure.h"
-#include "envoy/config/typed_config.h"
-
 #include "nighthawk/adaptive_load/config_validator.h"
 
+#include "external/envoy/envoy/common/pure.h"
+#include "external/envoy/envoy/config/typed_config.h"
+
 namespace Nighthawk {
 
 /**
diff --git a/include/nighthawk/adaptive_load/session_spec_proto_helper.h b/nighthawk/adaptive_load/session_spec_proto_helper.h
similarity index 96%
rename from include/nighthawk/adaptive_load/session_spec_proto_helper.h
rename to nighthawk/adaptive_load/session_spec_proto_helper.h
index a8850c6b9..3c5c20043 100644
--- a/include/nighthawk/adaptive_load/session_spec_proto_helper.h
+++ b/nighthawk/adaptive_load/session_spec_proto_helper.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "envoy/common/pure.h"
+#include "external/envoy/envoy/common/pure.h"
 
 #include "api/adaptive_load/adaptive_load.pb.h"
 
diff --git a/include/nighthawk/adaptive_load/step_controller.h b/nighthawk/adaptive_load/step_controller.h
similarity index 97%
rename from include/nighthawk/adaptive_load/step_controller.h
rename to nighthawk/adaptive_load/step_controller.h
index 7ccc61261..9450e28d6 100644
--- a/include/nighthawk/adaptive_load/step_controller.h
+++ b/nighthawk/adaptive_load/step_controller.h
@@ -2,11 +2,10 @@
 
 #pragma once
 
-#include "envoy/common/pure.h"
-#include "envoy/config/typed_config.h"
-
 #include "nighthawk/adaptive_load/config_validator.h"
 
+#include "external/envoy/envoy/common/pure.h"
+#include "external/envoy/envoy/config/typed_config.h"
 #include "external/envoy/source/common/common/statusor.h"
 #include "external/envoy/source/common/protobuf/protobuf.h"
 
diff --git a/include/nighthawk/client/BUILD b/nighthawk/client/BUILD
similarity index 78%
rename from include/nighthawk/client/BUILD
rename to nighthawk/client/BUILD
index 0e791fb6f..ca7b85158 100644
--- a/include/nighthawk/client/BUILD
+++ b/nighthawk/client/BUILD
@@ -16,8 +16,8 @@ envoy_basic_cc_library(
     include_prefix = "nighthawk/client",
     deps = [
         "//api/client:base_cc_proto",
-        "//include/nighthawk/common:base_includes",
-        "@envoy//include/envoy/common:time_interface",
+        "//nighthawk/common:base_includes",
+        "@envoy//envoy/common:time_interface",
         "@envoy//source/common/common:minimal_logger_lib_with_external_headers",
         "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto",
         "@envoy_api//envoy/config/metrics/v3:pkg_cc_proto",
@@ -38,10 +38,10 @@ envoy_basic_cc_library(
         ":output_collector_lib",
         ":output_formatter_lib",
         "//api/client:base_cc_proto",
-        "//include/nighthawk/common:base_includes",
-        "//include/nighthawk/common:request_source_lib",
-        "@envoy//include/envoy/common:base_includes",
-        "@envoy//include/envoy/http:conn_pool_interface_with_external_headers",
+        "//nighthawk/common:base_includes",
+        "//nighthawk/common:request_source_lib",
+        "@envoy//envoy/common:base_includes",
+        "@envoy//envoy/http:conn_pool_interface_with_external_headers",
         "@envoy//source/common/api:api_lib_with_external_headers",
         "@envoy//source/common/common:minimal_logger_lib_with_external_headers",
         "@envoy//source/common/common:non_copyable_with_external_headers",
@@ -59,8 +59,8 @@ envoy_basic_cc_library(
     include_prefix = "nighthawk/client",
     deps = [
         "//api/client:base_cc_proto",
-        "//include/nighthawk/common:base_includes",
-        "@envoy//include/envoy/common:base_includes",
+        "//nighthawk/common:base_includes",
+        "@envoy//envoy/common:base_includes",
     ],
 )
 
@@ -70,6 +70,6 @@ envoy_basic_cc_library(
     include_prefix = "nighthawk/client",
     deps = [
         "//api/client:base_cc_proto",
-        "@envoy//include/envoy/common:base_includes",
+        "@envoy//envoy/common:base_includes",
     ],
 )
diff --git a/include/nighthawk/client/benchmark_client.h b/nighthawk/client/benchmark_client.h
similarity index 92%
rename from include/nighthawk/client/benchmark_client.h
rename to nighthawk/client/benchmark_client.h
index cb0b555f6..5761028ad 100644
--- a/include/nighthawk/client/benchmark_client.h
+++ b/nighthawk/client/benchmark_client.h
@@ -3,14 +3,14 @@
 #include <functional>
 #include <memory>
 
-#include "envoy/http/header_map.h"
-#include "envoy/runtime/runtime.h"
-#include "envoy/stats/store.h"
-
 #include "nighthawk/common/operation_callback.h"
 #include "nighthawk/common/statistic.h"
 #include "nighthawk/common/uri.h"
 
+#include "external/envoy/envoy/http/header_map.h"
+#include "external/envoy/envoy/runtime/runtime.h"
+#include "external/envoy/envoy/stats/store.h"
+
 namespace Nighthawk {
 namespace Client {
 
diff --git a/include/nighthawk/client/client_worker.h b/nighthawk/client/client_worker.h
similarity index 92%
rename from include/nighthawk/client/client_worker.h
rename to nighthawk/client/client_worker.h
index ad234aa72..b4c5238ed 100644
--- a/include/nighthawk/client/client_worker.h
+++ b/nighthawk/client/client_worker.h
@@ -2,14 +2,14 @@
 
 #include <memory>
 
-#include "envoy/common/pure.h"
-#include "envoy/stats/store.h"
-
 #include "nighthawk/client/benchmark_client.h"
 #include "nighthawk/common/phase.h"
 #include "nighthawk/common/statistic.h"
 #include "nighthawk/common/worker.h"
 
+#include "external/envoy/envoy/common/pure.h"
+#include "external/envoy/envoy/stats/store.h"
+
 namespace Nighthawk {
 namespace Client {
 
diff --git a/include/nighthawk/client/factories.h b/nighthawk/client/factories.h
similarity index 90%
rename from include/nighthawk/client/factories.h
rename to nighthawk/client/factories.h
index cc743d36c..69caae2c3 100644
--- a/include/nighthawk/client/factories.h
+++ b/nighthawk/client/factories.h
@@ -2,12 +2,6 @@
 
 #include <memory>
 
-#include "envoy/api/api.h"
-#include "envoy/common/pure.h"
-#include "envoy/common/time.h"
-#include "envoy/event/dispatcher.h"
-#include "envoy/upstream/cluster_manager.h"
-
 #include "nighthawk/client/benchmark_client.h"
 #include "nighthawk/client/options.h"
 #include "nighthawk/client/output_formatter.h"
@@ -18,6 +12,12 @@
 #include "nighthawk/common/termination_predicate.h"
 #include "nighthawk/common/uri.h"
 
+#include "external/envoy/envoy/api/api.h"
+#include "external/envoy/envoy/common/pure.h"
+#include "external/envoy/envoy/common/time.h"
+#include "external/envoy/envoy/event/dispatcher.h"
+#include "external/envoy/envoy/upstream/cluster_manager.h"
+
 namespace Nighthawk {
 namespace Client {
 
diff --git a/include/nighthawk/client/options.h b/nighthawk/client/options.h
similarity index 97%
rename from include/nighthawk/client/options.h
rename to nighthawk/client/options.h
index 45b4e05ca..be3846bbc 100644
--- a/include/nighthawk/client/options.h
+++ b/nighthawk/client/options.h
@@ -5,14 +5,15 @@
 #include <memory>
 #include <string>
 
-#include "envoy/common/pure.h"
-#include "envoy/common/time.h"
 #include "envoy/config/cluster/v3/cluster.pb.h"
 #include "envoy/config/core/v3/base.pb.h"
 #include "envoy/config/metrics/v3/stats.pb.h"
 
 #include "nighthawk/common/termination_predicate.h"
 
+#include "external/envoy/envoy/common/pure.h"
+#include "external/envoy/envoy/common/time.h"
+
 #include "api/client/options.pb.h"
 
 #include "absl/types/optional.h"
diff --git a/include/nighthawk/client/output_collector.h b/nighthawk/client/output_collector.h
similarity index 94%
rename from include/nighthawk/client/output_collector.h
rename to nighthawk/client/output_collector.h
index bd457681e..b6c06600e 100644
--- a/include/nighthawk/client/output_collector.h
+++ b/nighthawk/client/output_collector.h
@@ -2,11 +2,11 @@
 
 #include <memory>
 
-#include "envoy/common/pure.h"
-#include "envoy/common/time.h"
-
 #include "nighthawk/common/statistic.h"
 
+#include "external/envoy/envoy/common/pure.h"
+#include "external/envoy/envoy/common/time.h"
+
 #include "absl/types/optional.h"
 
 namespace Nighthawk {
diff --git a/include/nighthawk/client/output_formatter.h b/nighthawk/client/output_formatter.h
similarity index 94%
rename from include/nighthawk/client/output_formatter.h
rename to nighthawk/client/output_formatter.h
index cd0eab433..85e2333e2 100644
--- a/include/nighthawk/client/output_formatter.h
+++ b/nighthawk/client/output_formatter.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "envoy/common/pure.h"
+#include "external/envoy/envoy/common/pure.h"
 
 #include "api/client/output.pb.validate.h"
 
diff --git a/include/nighthawk/client/process.h b/nighthawk/client/process.h
similarity index 100%
rename from include/nighthawk/client/process.h
rename to nighthawk/client/process.h
diff --git a/include/nighthawk/common/BUILD b/nighthawk/common/BUILD
similarity index 89%
rename from include/nighthawk/common/BUILD
rename to nighthawk/common/BUILD
index 1bf10fea4..bd6883432 100644
--- a/include/nighthawk/common/BUILD
+++ b/nighthawk/common/BUILD
@@ -29,7 +29,7 @@ envoy_basic_cc_library(
     deps = [
         ":request_lib",
         "//api/client:base_cc_proto",
-        "@envoy//include/envoy/upstream:cluster_manager_interface_with_external_headers",
+        "@envoy//envoy/upstream:cluster_manager_interface_with_external_headers",
         "@envoy//source/common/common:minimal_logger_lib",
         "@envoy//source/common/common:non_copyable_with_external_headers",
         "@envoy//source/common/common:statusor_lib_with_external_headers",
@@ -47,7 +47,7 @@ envoy_basic_cc_library(
     deps = [
         "//api/client:base_cc_proto",
         "//api/client:grpc_service_lib",
-        "@envoy//include/envoy/common:base_includes",
+        "@envoy//envoy/common:base_includes",
         "@envoy//source/common/common:assert_lib_with_external_headers",
         "@envoy//source/common/common:statusor_lib_with_external_headers",
         "@envoy//source/common/protobuf:protobuf_with_external_headers",
@@ -84,7 +84,7 @@ envoy_basic_cc_library(
     ],
     include_prefix = "nighthawk/common",
     deps = [
-        "@envoy//include/envoy/common:base_includes",
-        "@envoy//include/envoy/common:time_interface",
+        "@envoy//envoy/common:base_includes",
+        "@envoy//envoy/common:time_interface",
     ],
 )
diff --git a/include/nighthawk/common/exception.h b/nighthawk/common/exception.h
similarity index 100%
rename from include/nighthawk/common/exception.h
rename to nighthawk/common/exception.h
diff --git a/include/nighthawk/common/factories.h b/nighthawk/common/factories.h
similarity index 87%
rename from include/nighthawk/common/factories.h
rename to nighthawk/common/factories.h
index c93097b79..313cea399 100644
--- a/include/nighthawk/common/factories.h
+++ b/nighthawk/common/factories.h
@@ -2,19 +2,19 @@
 
 #include <memory>
 
-#include "envoy/api/api.h"
-#include "envoy/common/pure.h"
-#include "envoy/common/time.h"
-#include "envoy/event/dispatcher.h"
-#include "envoy/stats/symbol_table.h"
-#include "envoy/upstream/cluster_manager.h"
-
 #include "nighthawk/common/platform_util.h"
 #include "nighthawk/common/request_source.h"
 #include "nighthawk/common/sequencer.h"
 #include "nighthawk/common/statistic.h"
 #include "nighthawk/common/termination_predicate.h"
 
+#include "external/envoy/envoy/api/api.h"
+#include "external/envoy/envoy/common/pure.h"
+#include "external/envoy/envoy/common/time.h"
+#include "external/envoy/envoy/event/dispatcher.h"
+#include "external/envoy/envoy/stats/symbol_table.h"
+#include "external/envoy/envoy/upstream/cluster_manager.h"
+
 namespace Nighthawk {
 
 class SequencerFactory {
@@ -64,7 +64,7 @@ class NighthawkStatsSinkFactory : public Envoy::Config::TypedFactory {
    * should throw an EnvoyException. The returned pointer should always be
    * valid.
    * @param symbol_table supplies the symbol_table instance. For the definition
-   * of SymbolTable, see envoy/include/envoy/stats/symbol_table.h.
+   * of SymbolTable, see envoy/envoy/stats/symbol_table.h.
    */
   virtual std::unique_ptr<Envoy::Stats::Sink>
   createStatsSink(Envoy::Stats::SymbolTable& symbol_table) PURE;
diff --git a/include/nighthawk/common/nighthawk_service_client.h b/nighthawk/common/nighthawk_service_client.h
similarity index 96%
rename from include/nighthawk/common/nighthawk_service_client.h
rename to nighthawk/common/nighthawk_service_client.h
index e49ecf654..0d6201df4 100644
--- a/include/nighthawk/common/nighthawk_service_client.h
+++ b/nighthawk/common/nighthawk_service_client.h
@@ -1,6 +1,5 @@
 #pragma once
-#include "envoy/common/pure.h"
-
+#include "external/envoy/envoy/common/pure.h"
 #include "external/envoy/source/common/common/statusor.h"
 #include "external/envoy/source/common/protobuf/protobuf.h"
 
diff --git a/include/nighthawk/common/operation_callback.h b/nighthawk/common/operation_callback.h
similarity index 100%
rename from include/nighthawk/common/operation_callback.h
rename to nighthawk/common/operation_callback.h
diff --git a/include/nighthawk/common/phase.h b/nighthawk/common/phase.h
similarity index 97%
rename from include/nighthawk/common/phase.h
rename to nighthawk/common/phase.h
index bcbed7cf6..8e78bd09c 100644
--- a/include/nighthawk/common/phase.h
+++ b/nighthawk/common/phase.h
@@ -3,10 +3,10 @@
 
 #include <memory>
 
-#include "envoy/common/pure.h"
-
 #include "nighthawk/common/sequencer.h"
 
+#include "external/envoy/envoy/common/pure.h"
+
 namespace Nighthawk {
 
 /**
diff --git a/include/nighthawk/common/platform_util.h b/nighthawk/common/platform_util.h
similarity index 92%
rename from include/nighthawk/common/platform_util.h
rename to nighthawk/common/platform_util.h
index 9175fdbfe..9e11c9cdc 100644
--- a/include/nighthawk/common/platform_util.h
+++ b/nighthawk/common/platform_util.h
@@ -3,7 +3,7 @@
 #include <chrono>
 #include <memory>
 
-#include "envoy/common/pure.h"
+#include "external/envoy/envoy/common/pure.h"
 
 namespace Nighthawk {
 
diff --git a/include/nighthawk/common/rate_limiter.h b/nighthawk/common/rate_limiter.h
similarity index 94%
rename from include/nighthawk/common/rate_limiter.h
rename to nighthawk/common/rate_limiter.h
index 0c2eadad8..cefd559ed 100644
--- a/include/nighthawk/common/rate_limiter.h
+++ b/nighthawk/common/rate_limiter.h
@@ -3,8 +3,8 @@
 #include <chrono>
 #include <memory>
 
-#include "envoy/common/pure.h"
-#include "envoy/common/time.h"
+#include "external/envoy/envoy/common/pure.h"
+#include "external/envoy/envoy/common/time.h"
 
 #include "absl/types/optional.h"
 
diff --git a/include/nighthawk/common/request.h b/nighthawk/common/request.h
similarity index 91%
rename from include/nighthawk/common/request.h
rename to nighthawk/common/request.h
index d123b8736..85682313b 100644
--- a/include/nighthawk/common/request.h
+++ b/nighthawk/common/request.h
@@ -2,7 +2,7 @@
 
 #include <functional>
 
-#include "envoy/http/header_map.h"
+#include "external/envoy/envoy/http/header_map.h"
 
 namespace Nighthawk {
 
diff --git a/include/nighthawk/common/request_source.h b/nighthawk/common/request_source.h
similarity index 93%
rename from include/nighthawk/common/request_source.h
rename to nighthawk/common/request_source.h
index 0ad12b12c..6af158383 100644
--- a/include/nighthawk/common/request_source.h
+++ b/nighthawk/common/request_source.h
@@ -2,10 +2,10 @@
 
 #include <functional>
 
-#include "envoy/http/header_map.h"
-
 #include "nighthawk/common/request.h"
 
+#include "external/envoy/envoy/http/header_map.h"
+
 namespace Nighthawk {
 
 using RequestGenerator = std::function<RequestPtr()>;
diff --git a/include/nighthawk/common/request_stream_grpc_client.h b/nighthawk/common/request_stream_grpc_client.h
similarity index 100%
rename from include/nighthawk/common/request_stream_grpc_client.h
rename to nighthawk/common/request_stream_grpc_client.h
diff --git a/include/nighthawk/common/sequencer.h b/nighthawk/common/sequencer.h
similarity index 97%
rename from include/nighthawk/common/sequencer.h
rename to nighthawk/common/sequencer.h
index 56e177032..d32f3d201 100644
--- a/include/nighthawk/common/sequencer.h
+++ b/nighthawk/common/sequencer.h
@@ -4,12 +4,12 @@
 #include <functional>
 #include <memory>
 
-#include "envoy/common/pure.h"
-
 #include "nighthawk/common/operation_callback.h"
 #include "nighthawk/common/rate_limiter.h"
 #include "nighthawk/common/statistic.h"
 
+#include "external/envoy/envoy/common/pure.h"
+
 namespace Nighthawk {
 
 using SequencerTarget = std::function<bool(OperationCallback)>;
diff --git a/include/nighthawk/common/statistic.h b/nighthawk/common/statistic.h
similarity index 97%
rename from include/nighthawk/common/statistic.h
rename to nighthawk/common/statistic.h
index b7508e15f..139ffd186 100644
--- a/include/nighthawk/common/statistic.h
+++ b/nighthawk/common/statistic.h
@@ -4,9 +4,8 @@
 #include <memory>
 #include <string>
 
-#include "envoy/common/exception.h"
-#include "envoy/common/pure.h"
-
+#include "external/envoy/envoy/common/exception.h"
+#include "external/envoy/envoy/common/pure.h"
 #include "external/envoy/source/common/common/non_copyable.h"
 
 #include "api/client/output.pb.h"
diff --git a/include/nighthawk/common/stopwatch.h b/nighthawk/common/stopwatch.h
similarity index 83%
rename from include/nighthawk/common/stopwatch.h
rename to nighthawk/common/stopwatch.h
index 87177962a..d92d0ae90 100644
--- a/include/nighthawk/common/stopwatch.h
+++ b/nighthawk/common/stopwatch.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "envoy/common/pure.h"
-#include "envoy/common/time.h"
+#include "external/envoy/envoy/common/pure.h"
+#include "external/envoy/envoy/common/time.h"
 
 namespace Nighthawk {
 
diff --git a/include/nighthawk/common/termination_predicate.h b/nighthawk/common/termination_predicate.h
similarity index 97%
rename from include/nighthawk/common/termination_predicate.h
rename to nighthawk/common/termination_predicate.h
index 732b2687a..2532cb888 100644
--- a/include/nighthawk/common/termination_predicate.h
+++ b/nighthawk/common/termination_predicate.h
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "envoy/common/pure.h"
+#include "external/envoy/envoy/common/pure.h"
 
 namespace Nighthawk {
 
diff --git a/include/nighthawk/common/uri.h b/nighthawk/common/uri.h
similarity index 100%
rename from include/nighthawk/common/uri.h
rename to nighthawk/common/uri.h
diff --git a/include/nighthawk/common/worker.h b/nighthawk/common/worker.h
similarity index 94%
rename from include/nighthawk/common/worker.h
rename to nighthawk/common/worker.h
index 2249bf8d5..40216d2a0 100644
--- a/include/nighthawk/common/worker.h
+++ b/nighthawk/common/worker.h
@@ -2,10 +2,10 @@
 
 #include <memory>
 
-#include "envoy/common/pure.h"
-
 #include "nighthawk/common/statistic.h"
 
+#include "external/envoy/envoy/common/pure.h"
+
 namespace Nighthawk {
 
 /**
diff --git a/include/nighthawk/distributor/BUILD b/nighthawk/distributor/BUILD
similarity index 92%
rename from include/nighthawk/distributor/BUILD
rename to nighthawk/distributor/BUILD
index f3f84e34f..e94459ad4 100644
--- a/include/nighthawk/distributor/BUILD
+++ b/nighthawk/distributor/BUILD
@@ -17,7 +17,7 @@ envoy_basic_cc_library(
     deps = [
         "//api/distributor:distributor_cc_proto",
         "//api/distributor:distributor_grpc_lib",
-        "@envoy//include/envoy/common:base_includes",
+        "@envoy//envoy/common:base_includes",
         "@envoy//source/common/common:assert_lib_with_external_headers",
         "@envoy//source/common/common:statusor_lib_with_external_headers",
         "@envoy//source/common/protobuf:protobuf_with_external_headers",
diff --git a/include/nighthawk/distributor/nighthawk_distributor_client.h b/nighthawk/distributor/nighthawk_distributor_client.h
similarity index 95%
rename from include/nighthawk/distributor/nighthawk_distributor_client.h
rename to nighthawk/distributor/nighthawk_distributor_client.h
index 3efb3d9a0..b1c1d6e56 100644
--- a/include/nighthawk/distributor/nighthawk_distributor_client.h
+++ b/nighthawk/distributor/nighthawk_distributor_client.h
@@ -1,6 +1,5 @@
 #pragma once
-#include "envoy/common/pure.h"
-
+#include "external/envoy/envoy/common/pure.h"
 #include "external/envoy/source/common/common/statusor.h"
 #include "external/envoy/source/common/protobuf/protobuf.h"
 
diff --git a/include/nighthawk/request_source/BUILD b/nighthawk/request_source/BUILD
similarity index 74%
rename from include/nighthawk/request_source/BUILD
rename to nighthawk/request_source/BUILD
index 7185a6dae..13ac165e2 100644
--- a/include/nighthawk/request_source/BUILD
+++ b/nighthawk/request_source/BUILD
@@ -16,9 +16,9 @@ envoy_basic_cc_library(
     include_prefix = "nighthawk/request_source",
     deps = [
         "//api/request_source:request_source_plugin_cc_proto",
-        "//include/nighthawk/common:request_source_lib",
-        "@envoy//include/envoy/common:base_includes",
-        "@envoy//include/envoy/config:typed_config_interface",
+        "//nighthawk/common:request_source_lib",
+        "@envoy//envoy/common:base_includes",
+        "@envoy//envoy/config:typed_config_interface",
         "@envoy//source/common/api:api_lib_with_external_headers",
     ],
 )
diff --git a/include/nighthawk/request_source/request_source_plugin_config_factory.h b/nighthawk/request_source/request_source_plugin_config_factory.h
similarity index 92%
rename from include/nighthawk/request_source/request_source_plugin_config_factory.h
rename to nighthawk/request_source/request_source_plugin_config_factory.h
index 3feccffc9..8b98101c9 100644
--- a/include/nighthawk/request_source/request_source_plugin_config_factory.h
+++ b/nighthawk/request_source/request_source_plugin_config_factory.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "envoy/api/api.h"
-#include "envoy/common/pure.h"
-#include "envoy/config/typed_config.h"
-
 #include "nighthawk/common/request_source.h"
 
+#include "external/envoy/envoy/api/api.h"
+#include "external/envoy/envoy/common/pure.h"
+#include "external/envoy/envoy/config/typed_config.h"
+
 namespace Nighthawk {
 
 // A factory that must be implemented for each RequestSourcePlugin. It instantiates the specific
diff --git a/include/nighthawk/sink/BUILD b/nighthawk/sink/BUILD
similarity index 94%
rename from include/nighthawk/sink/BUILD
rename to nighthawk/sink/BUILD
index f1f1cda7a..682c64e99 100644
--- a/include/nighthawk/sink/BUILD
+++ b/nighthawk/sink/BUILD
@@ -17,7 +17,7 @@ envoy_basic_cc_library(
     deps = [
         "//api/sink:sink_cc_proto",
         "//api/sink:sink_grpc_lib",
-        "@envoy//include/envoy/common:base_includes",
+        "@envoy//envoy/common:base_includes",
         "@envoy//source/common/common:assert_lib_with_external_headers",
         "@envoy//source/common/common:statusor_lib_with_external_headers",
         "@envoy//source/common/protobuf:protobuf_with_external_headers",
diff --git a/include/nighthawk/sink/nighthawk_sink_client.h b/nighthawk/sink/nighthawk_sink_client.h
similarity index 96%
rename from include/nighthawk/sink/nighthawk_sink_client.h
rename to nighthawk/sink/nighthawk_sink_client.h
index fae300db7..036adef66 100644
--- a/include/nighthawk/sink/nighthawk_sink_client.h
+++ b/nighthawk/sink/nighthawk_sink_client.h
@@ -1,6 +1,5 @@
 #pragma once
-#include "envoy/common/pure.h"
-
+#include "external/envoy/envoy/common/pure.h"
 #include "external/envoy/source/common/common/statusor.h"
 #include "external/envoy/source/common/protobuf/protobuf.h"
 
diff --git a/include/nighthawk/sink/sink.h b/nighthawk/sink/sink.h
similarity index 96%
rename from include/nighthawk/sink/sink.h
rename to nighthawk/sink/sink.h
index 10eeb6ce2..0564d938a 100644
--- a/include/nighthawk/sink/sink.h
+++ b/nighthawk/sink/sink.h
@@ -3,8 +3,7 @@
 
 #include <vector>
 
-#include "envoy/common/pure.h"
-
+#include "external/envoy/envoy/common/pure.h"
 #include "external/envoy/source/common/common/statusor.h"
 
 #include "api/client/service.grpc.pb.h"
diff --git a/source/adaptive_load/BUILD b/source/adaptive_load/BUILD
index 037be6011..a469ebbf4 100644
--- a/source/adaptive_load/BUILD
+++ b/source/adaptive_load/BUILD
@@ -23,12 +23,12 @@ envoy_cc_library(
         ":plugin_loader",
         "//api/adaptive_load:adaptive_load_proto_cc_proto",
         "//api/client:base_cc_proto",
-        "//include/nighthawk/adaptive_load:adaptive_load_controller",
-        "//include/nighthawk/adaptive_load:metrics_evaluator",
-        "//include/nighthawk/adaptive_load:scoring_function",
-        "//include/nighthawk/adaptive_load:session_spec_proto_helper",
-        "//include/nighthawk/adaptive_load:step_controller",
-        "//include/nighthawk/common:nighthawk_service_client",
+        "//nighthawk/adaptive_load:adaptive_load_controller",
+        "//nighthawk/adaptive_load:metrics_evaluator",
+        "//nighthawk/adaptive_load:scoring_function",
+        "//nighthawk/adaptive_load:session_spec_proto_helper",
+        "//nighthawk/adaptive_load:step_controller",
+        "//nighthawk/common:nighthawk_service_client",
         "@envoy//source/common/protobuf:utility_lib_with_external_headers",
     ],
 )
@@ -73,7 +73,7 @@ envoy_cc_library(
     repository = "@envoy",
     visibility = ["//visibility:public"],
     deps = [
-        "//include/nighthawk/adaptive_load:config_validator",
+        "//nighthawk/adaptive_load:config_validator",
         "@envoy//source/common/config:utility_lib_with_external_headers",
         "@envoy//source/common/protobuf:protobuf_with_external_headers",
     ],
@@ -90,7 +90,7 @@ envoy_cc_library(
     repository = "@envoy",
     visibility = ["//visibility:public"],
     deps = [
-        "//include/nighthawk/adaptive_load:input_variable_setter",
+        "//nighthawk/adaptive_load:input_variable_setter",
         "@envoy//source/common/config:utility_lib_with_external_headers",
         "@envoy//source/common/protobuf:protobuf_with_external_headers",
     ],
@@ -111,9 +111,9 @@ envoy_cc_library(
         ":plugin_loader",
         "//api/adaptive_load:adaptive_load_proto_cc_proto",
         "//api/client:base_cc_proto",
-        "//include/nighthawk/adaptive_load:adaptive_load_controller",
-        "//include/nighthawk/adaptive_load:metrics_evaluator",
-        "//include/nighthawk/adaptive_load:scoring_function",
+        "//nighthawk/adaptive_load:adaptive_load_controller",
+        "//nighthawk/adaptive_load:metrics_evaluator",
+        "//nighthawk/adaptive_load:scoring_function",
     ],
 )
 
@@ -128,7 +128,7 @@ envoy_cc_library(
     repository = "@envoy",
     visibility = ["//visibility:public"],
     deps = [
-        "//include/nighthawk/adaptive_load:metrics_plugin",
+        "//nighthawk/adaptive_load:metrics_plugin",
         "@envoy//source/common/common:assert_lib_with_external_headers",
         "@envoy//source/common/common:minimal_logger_lib_with_external_headers",
         "@envoy//source/common/config:utility_lib_with_external_headers",
@@ -147,10 +147,10 @@ envoy_cc_library(
     repository = "@envoy",
     visibility = ["//visibility:public"],
     deps = [
-        "//include/nighthawk/adaptive_load:input_variable_setter",
-        "//include/nighthawk/adaptive_load:metrics_plugin",
-        "//include/nighthawk/adaptive_load:scoring_function",
-        "//include/nighthawk/adaptive_load:step_controller",
+        "//nighthawk/adaptive_load:input_variable_setter",
+        "//nighthawk/adaptive_load:metrics_plugin",
+        "//nighthawk/adaptive_load:scoring_function",
+        "//nighthawk/adaptive_load:step_controller",
         "//source/common:nighthawk_common_lib",
         "@envoy//source/common/config:utility_lib_with_external_headers",
     ],
@@ -167,7 +167,7 @@ envoy_cc_library(
     repository = "@envoy",
     visibility = ["//visibility:public"],
     deps = [
-        "//include/nighthawk/adaptive_load:scoring_function",
+        "//nighthawk/adaptive_load:scoring_function",
         "@envoy//source/common/config:utility_lib_with_external_headers",
         "@envoy//source/common/protobuf:protobuf_with_external_headers",
     ],
@@ -186,10 +186,10 @@ envoy_cc_library(
     deps = [
         ":metrics_plugin_impl",
         ":plugin_loader",
-        "//include/nighthawk/adaptive_load:metrics_plugin",
-        "//include/nighthawk/adaptive_load:scoring_function",
-        "//include/nighthawk/adaptive_load:session_spec_proto_helper",
-        "//include/nighthawk/adaptive_load:step_controller",
+        "//nighthawk/adaptive_load:metrics_plugin",
+        "//nighthawk/adaptive_load:scoring_function",
+        "//nighthawk/adaptive_load:session_spec_proto_helper",
+        "//nighthawk/adaptive_load:step_controller",
         "@envoy//source/common/config:utility_lib_with_external_headers",
         "@envoy//source/common/protobuf:protobuf_with_external_headers",
     ],
@@ -208,8 +208,8 @@ envoy_cc_library(
     deps = [
         ":input_variable_setter_impl",
         ":plugin_loader",
-        "//include/nighthawk/adaptive_load:input_variable_setter",
-        "//include/nighthawk/adaptive_load:step_controller",
+        "//nighthawk/adaptive_load:input_variable_setter",
+        "//nighthawk/adaptive_load:step_controller",
         "@envoy//source/common/common:assert_lib_with_external_headers",
         "@envoy//source/common/config:utility_lib_with_external_headers",
         "@envoy//source/common/protobuf:protobuf_with_external_headers",
diff --git a/source/adaptive_load/adaptive_load_client_main.cc b/source/adaptive_load/adaptive_load_client_main.cc
index ccd9c7c94..3a94053de 100644
--- a/source/adaptive_load/adaptive_load_client_main.cc
+++ b/source/adaptive_load/adaptive_load_client_main.cc
@@ -1,15 +1,14 @@
-#include "adaptive_load/adaptive_load_client_main.h"
+#include "source/adaptive_load/adaptive_load_client_main.h"
 
 #include <cstring>
 #include <memory>
 #include <string>
 #include <utility>
 
-#include "envoy/common/exception.h"
-
 #include "nighthawk/adaptive_load/adaptive_load_controller.h"
 #include "nighthawk/common/exception.h"
 
+#include "external/envoy/envoy/common/exception.h"
 #include "external/envoy/source/common/grpc/google_grpc_utils.h"
 #include "external/envoy/source/common/protobuf/protobuf.h"
 
@@ -17,8 +16,8 @@
 #include "api/client/service.grpc.pb.h"
 #include "api/client/service.pb.h"
 
-#include "common/utility.h"
-#include "common/version_info.h"
+#include "source/common/utility.h"
+#include "source/common/version_info.h"
 
 #include "fmt/ranges.h"
 #include "google/rpc/status.pb.h"
diff --git a/source/adaptive_load/adaptive_load_client_main.h b/source/adaptive_load/adaptive_load_client_main.h
index 1e4dc4ab4..dc7c3b94e 100644
--- a/source/adaptive_load/adaptive_load_client_main.h
+++ b/source/adaptive_load/adaptive_load_client_main.h
@@ -1,10 +1,9 @@
 #pragma once
 
-#include "envoy/common/time.h"
-#include "envoy/filesystem/filesystem.h"
-
 #include "nighthawk/adaptive_load/adaptive_load_controller.h"
 
+#include "external/envoy/envoy/common/time.h"
+#include "external/envoy/envoy/filesystem/filesystem.h"
 #include "external/envoy/source/common/common/logger.h"
 
 namespace Nighthawk {
diff --git a/source/adaptive_load/adaptive_load_controller_impl.cc b/source/adaptive_load/adaptive_load_controller_impl.cc
index 58119b5ac..b6e2f26a0 100644
--- a/source/adaptive_load/adaptive_load_controller_impl.cc
+++ b/source/adaptive_load/adaptive_load_controller_impl.cc
@@ -1,8 +1,7 @@
-#include "adaptive_load/adaptive_load_controller_impl.h"
+#include "source/adaptive_load/adaptive_load_controller_impl.h"
 
 #include <chrono>
 
-#include "envoy/common/exception.h"
 #include "envoy/config/core/v3/base.pb.h"
 
 #include "nighthawk/adaptive_load/adaptive_load_controller.h"
@@ -10,6 +9,7 @@
 #include "nighthawk/adaptive_load/scoring_function.h"
 #include "nighthawk/adaptive_load/step_controller.h"
 
+#include "external/envoy/envoy/common/exception.h"
 #include "external/envoy/source/common/common/logger.h"
 #include "external/envoy/source/common/common/statusor.h"
 #include "external/envoy/source/common/protobuf/protobuf.h"
@@ -22,12 +22,13 @@
 #include "api/client/output.pb.h"
 #include "api/client/service.grpc.pb.h"
 
+#include "source/adaptive_load/metrics_plugin_impl.h"
+#include "source/adaptive_load/plugin_loader.h"
+
 #include "absl/container/flat_hash_map.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-#include "adaptive_load/metrics_plugin_impl.h"
-#include "adaptive_load/plugin_loader.h"
 
 namespace Nighthawk {
 
diff --git a/source/adaptive_load/adaptive_load_controller_impl.h b/source/adaptive_load/adaptive_load_controller_impl.h
index 4dc073892..4eb8f0ea4 100644
--- a/source/adaptive_load/adaptive_load_controller_impl.h
+++ b/source/adaptive_load/adaptive_load_controller_impl.h
@@ -1,11 +1,11 @@
-#include "envoy/common/time.h"
-
 #include "nighthawk/adaptive_load/adaptive_load_controller.h"
 #include "nighthawk/adaptive_load/metrics_evaluator.h"
 #include "nighthawk/adaptive_load/session_spec_proto_helper.h"
 #include "nighthawk/adaptive_load/step_controller.h"
 #include "nighthawk/common/nighthawk_service_client.h"
 
+#include "external/envoy/envoy/common/time.h"
+
 namespace Nighthawk {
 
 class AdaptiveLoadControllerImpl : public AdaptiveLoadController {
diff --git a/source/adaptive_load/config_validator_impl.cc b/source/adaptive_load/config_validator_impl.cc
index 91c933297..4cabf31db 100644
--- a/source/adaptive_load/config_validator_impl.cc
+++ b/source/adaptive_load/config_validator_impl.cc
@@ -1,4 +1,4 @@
-#include "adaptive_load/config_validator_impl.h"
+#include "source/adaptive_load/config_validator_impl.h"
 
 namespace Nighthawk {
 
diff --git a/source/adaptive_load/input_variable_setter_impl.cc b/source/adaptive_load/input_variable_setter_impl.cc
index a730b0ff4..7be83cbcd 100644
--- a/source/adaptive_load/input_variable_setter_impl.cc
+++ b/source/adaptive_load/input_variable_setter_impl.cc
@@ -1,4 +1,4 @@
-#include "adaptive_load/input_variable_setter_impl.h"
+#include "source/adaptive_load/input_variable_setter_impl.h"
 
 #include <limits>
 
diff --git a/source/adaptive_load/input_variable_setter_impl.h b/source/adaptive_load/input_variable_setter_impl.h
index 4e2475401..ed106e636 100644
--- a/source/adaptive_load/input_variable_setter_impl.h
+++ b/source/adaptive_load/input_variable_setter_impl.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "envoy/registry/registry.h"
-
 #include "nighthawk/adaptive_load/input_variable_setter.h"
 
+#include "external/envoy/envoy/registry/registry.h"
+
 #include "api/adaptive_load/input_variable_setter_impl.pb.h"
 
 namespace Nighthawk {
diff --git a/source/adaptive_load/metrics_evaluator_impl.cc b/source/adaptive_load/metrics_evaluator_impl.cc
index 54378edfa..bed9f34c1 100644
--- a/source/adaptive_load/metrics_evaluator_impl.cc
+++ b/source/adaptive_load/metrics_evaluator_impl.cc
@@ -1,11 +1,11 @@
-#include "adaptive_load/metrics_evaluator_impl.h"
+#include "source/adaptive_load/metrics_evaluator_impl.h"
 
 #include <utility>
 
 #include "api/adaptive_load/metric_spec.pb.h"
 
-#include "adaptive_load/metrics_plugin_impl.h"
-#include "adaptive_load/plugin_loader.h"
+#include "source/adaptive_load/metrics_plugin_impl.h"
+#include "source/adaptive_load/plugin_loader.h"
 
 namespace Nighthawk {
 
diff --git a/source/adaptive_load/metrics_plugin_impl.cc b/source/adaptive_load/metrics_plugin_impl.cc
index 0c67b201e..e58bf2bca 100644
--- a/source/adaptive_load/metrics_plugin_impl.cc
+++ b/source/adaptive_load/metrics_plugin_impl.cc
@@ -1,9 +1,8 @@
-#include "adaptive_load/metrics_plugin_impl.h"
+#include "source/adaptive_load/metrics_plugin_impl.h"
 
 #include <cmath>
 
-#include "envoy/registry/registry.h"
-
+#include "external/envoy/envoy/registry/registry.h"
 #include "external/envoy/source/common/common/assert.h"
 #include "external/envoy/source/common/protobuf/protobuf.h"
 
diff --git a/source/adaptive_load/scoring_function_impl.cc b/source/adaptive_load/scoring_function_impl.cc
index 2a628012b..344e0e298 100644
--- a/source/adaptive_load/scoring_function_impl.cc
+++ b/source/adaptive_load/scoring_function_impl.cc
@@ -1,4 +1,4 @@
-#include "adaptive_load/scoring_function_impl.h"
+#include "source/adaptive_load/scoring_function_impl.h"
 
 #include <cmath>
 
diff --git a/source/adaptive_load/scoring_function_impl.h b/source/adaptive_load/scoring_function_impl.h
index 94bfe88d9..49c6f2861 100644
--- a/source/adaptive_load/scoring_function_impl.h
+++ b/source/adaptive_load/scoring_function_impl.h
@@ -1,10 +1,10 @@
 // Implementations of ScoringFunction plugins and corresponding factories.
 #pragma once
 
-#include "envoy/registry/registry.h"
-
 #include "nighthawk/adaptive_load/scoring_function.h"
 
+#include "external/envoy/envoy/registry/registry.h"
+
 #include "api/adaptive_load/scoring_function_impl.pb.h"
 
 namespace Nighthawk {
diff --git a/source/adaptive_load/session_spec_proto_helper_impl.cc b/source/adaptive_load/session_spec_proto_helper_impl.cc
index 47d9d5d52..2ad046a0a 100644
--- a/source/adaptive_load/session_spec_proto_helper_impl.cc
+++ b/source/adaptive_load/session_spec_proto_helper_impl.cc
@@ -1,4 +1,4 @@
-#include "adaptive_load/session_spec_proto_helper_impl.h"
+#include "source/adaptive_load/session_spec_proto_helper_impl.h"
 
 #include "nighthawk/adaptive_load/metrics_plugin.h"
 #include "nighthawk/adaptive_load/step_controller.h"
@@ -7,12 +7,13 @@
 #include "api/adaptive_load/adaptive_load.pb.validate.h"
 #include "api/adaptive_load/metric_spec.pb.h"
 
+#include "source/adaptive_load/metrics_plugin_impl.h"
+#include "source/adaptive_load/plugin_loader.h"
+
 #include "absl/container/flat_hash_map.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
-#include "adaptive_load/metrics_plugin_impl.h"
-#include "adaptive_load/plugin_loader.h"
 
 namespace Nighthawk {
 
diff --git a/source/adaptive_load/step_controller_impl.cc b/source/adaptive_load/step_controller_impl.cc
index 94ab8bcac..0ffb230f8 100644
--- a/source/adaptive_load/step_controller_impl.cc
+++ b/source/adaptive_load/step_controller_impl.cc
@@ -1,4 +1,4 @@
-#include "adaptive_load/step_controller_impl.h"
+#include "source/adaptive_load/step_controller_impl.h"
 
 #include <memory>
 
@@ -9,8 +9,8 @@
 #include "api/adaptive_load/metric_spec.pb.h"
 #include "api/adaptive_load/step_controller_impl.pb.h"
 
-#include "adaptive_load/input_variable_setter_impl.h"
-#include "adaptive_load/plugin_loader.h"
+#include "source/adaptive_load/input_variable_setter_impl.h"
+#include "source/adaptive_load/plugin_loader.h"
 
 namespace Nighthawk {
 
diff --git a/source/adaptive_load/step_controller_impl.h b/source/adaptive_load/step_controller_impl.h
index 44bd854aa..8f250f6d8 100644
--- a/source/adaptive_load/step_controller_impl.h
+++ b/source/adaptive_load/step_controller_impl.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "envoy/registry/registry.h"
-
 #include "nighthawk/adaptive_load/input_variable_setter.h"
 #include "nighthawk/adaptive_load/step_controller.h"
 
+#include "external/envoy/envoy/registry/registry.h"
+
 #include "api/adaptive_load/adaptive_load.pb.h"
 #include "api/adaptive_load/benchmark_result.pb.h"
 #include "api/adaptive_load/step_controller_impl.pb.h"
diff --git a/source/client/BUILD b/source/client/BUILD
index fa2bebcf3..45523ba1e 100644
--- a/source/client/BUILD
+++ b/source/client/BUILD
@@ -20,7 +20,7 @@ envoy_cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":output_formatter_impl_lib",
-        "//include/nighthawk/client:options_lib",
+        "//nighthawk/client:options_lib",
         "@envoy//source/common/protobuf:message_validator_lib_with_external_headers",
         "@envoy//source/common/protobuf:utility_lib_with_external_headers",
         "@envoy//source/server:options_lib_with_external_headers",
@@ -62,8 +62,8 @@ envoy_cc_library(
         ":output_collector_impl_lib",
         ":output_formatter_impl_lib",
         "//api/client:base_cc_proto",
-        "//include/nighthawk/client:client_includes",
-        "//include/nighthawk/common:base_includes",
+        "//nighthawk/client:client_includes",
+        "//nighthawk/common:base_includes",
         "//source/common:request_source_impl_lib",
         "//source/common:nighthawk_common_lib",
         "//source/common:nighthawk_service_client_impl",
@@ -107,8 +107,8 @@ envoy_cc_library(
         "@envoy//source/extensions/transport_sockets/tls:context_lib_with_external_headers",
         "@envoy//source/server:server_lib_with_external_headers",
         "@envoy//source/server/config_validation:admin_lib_with_external_headers",
-        "@envoy//include/envoy/http:protocol_interface_with_external_headers",
-        "@envoy//include/envoy/network:address_interface",
+        "@envoy//envoy/http:protocol_interface_with_external_headers",
+        "@envoy//envoy/network:address_interface",
         "@envoy//source/common/common:statusor_lib_with_external_headers",
         "@envoy//source/common/router:context_lib_with_external_headers",
     ] + select({
@@ -131,8 +131,8 @@ envoy_cc_library(
     visibility = ["//visibility:public"],
     deps = [
         "//api/client:base_cc_proto",
-        "//include/nighthawk/client:client_includes",
-        "//include/nighthawk/common:base_includes",
+        "//nighthawk/client:client_includes",
+        "//nighthawk/common:base_includes",
         "//source/common:nighthawk_common_lib",
         "@envoy//source/common/protobuf:utility_lib_with_external_headers",
     ],
@@ -151,7 +151,7 @@ envoy_cc_library(
     deps = [
         "//api/client:base_cc_proto",
         "//api/client/transform:transform_cc_proto",
-        "//include/nighthawk/client:client_includes",
+        "//nighthawk/client:client_includes",
         "//source/common:nighthawk_common_lib",
         "@com_google_googletest//:gtest",
         "@envoy//source/common/network:utility_lib_with_external_headers",
diff --git a/source/client/benchmark_client_impl.cc b/source/client/benchmark_client_impl.cc
index faa564583..fb2ae0523 100644
--- a/source/client/benchmark_client_impl.cc
+++ b/source/client/benchmark_client_impl.cc
@@ -1,16 +1,15 @@
-#include "client/benchmark_client_impl.h"
-
-#include "envoy/event/dispatcher.h"
-#include "envoy/thread_local/thread_local.h"
+#include "source/client/benchmark_client_impl.h"
 
 #include "nighthawk/common/statistic.h"
 
+#include "external/envoy/envoy/event/dispatcher.h"
+#include "external/envoy/envoy/thread_local/thread_local.h"
 #include "external/envoy/source/common/http/header_map_impl.h"
 #include "external/envoy/source/common/http/headers.h"
 #include "external/envoy/source/common/http/utility.h"
 #include "external/envoy/source/common/network/utility.h"
 
-#include "client/stream_decoder.h"
+#include "source/client/stream_decoder.h"
 
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_split.h"
diff --git a/source/client/benchmark_client_impl.h b/source/client/benchmark_client_impl.h
index 442217b28..d5c66ecb3 100644
--- a/source/client/benchmark_client_impl.h
+++ b/source/client/benchmark_client_impl.h
@@ -1,19 +1,18 @@
 #pragma once
 
-#include "envoy/api/api.h"
-#include "envoy/event/dispatcher.h"
-#include "envoy/http/conn_pool.h"
-#include "envoy/network/address.h"
-#include "envoy/runtime/runtime.h"
-#include "envoy/stats/scope.h"
-#include "envoy/stats/store.h"
-#include "envoy/upstream/upstream.h"
-
 #include "nighthawk/client/benchmark_client.h"
 #include "nighthawk/common/request_source.h"
 #include "nighthawk/common/sequencer.h"
 #include "nighthawk/common/statistic.h"
 
+#include "external/envoy/envoy/api/api.h"
+#include "external/envoy/envoy/event/dispatcher.h"
+#include "external/envoy/envoy/http/conn_pool.h"
+#include "external/envoy/envoy/network/address.h"
+#include "external/envoy/envoy/runtime/runtime.h"
+#include "external/envoy/envoy/stats/scope.h"
+#include "external/envoy/envoy/stats/store.h"
+#include "external/envoy/envoy/upstream/upstream.h"
 #include "external/envoy/source/common/common/logger.h"
 #include "external/envoy/source/common/common/random_generator.h"
 #include "external/envoy/source/common/http/http1/conn_pool.h"
@@ -22,9 +21,8 @@
 
 #include "api/client/options.pb.h"
 
-#include "common/statistic_impl.h"
-
-#include "client/stream_decoder.h"
+#include "source/client/stream_decoder.h"
+#include "source/common/statistic_impl.h"
 
 namespace Nighthawk {
 namespace Client {
@@ -138,8 +136,13 @@ class BenchmarkClientHttpImpl : public BenchmarkClient,
   Envoy::Http::ConnectionPool::Instance* pool() {
     auto proto = use_h2_ ? Envoy::Http::Protocol::Http2 : Envoy::Http::Protocol::Http11;
     const auto thread_local_cluster = cluster_manager_->getThreadLocalCluster(cluster_name_);
-    return thread_local_cluster->httpConnPool(Envoy::Upstream::ResourcePriority::Default, proto,
-                                              nullptr);
+    absl::optional<Envoy::Upstream::HttpPoolData> pool_data = thread_local_cluster->httpConnPool(
+        Envoy::Upstream::ResourcePriority::Default, proto, nullptr);
+    if (pool_data.has_value()) {
+      return pool_data->pool();
+    } else {
+      return nullptr;
+    }
   }
 
 private:
diff --git a/source/client/client.cc b/source/client/client.cc
index 19e11b29e..bdaa8d45a 100644
--- a/source/client/client.cc
+++ b/source/client/client.cc
@@ -1,4 +1,4 @@
-#include "client/client.h"
+#include "source/client/client.h"
 
 #include <grpc++/grpc++.h>
 
@@ -8,10 +8,9 @@
 #include <memory>
 #include <random>
 
-#include "envoy/stats/store.h"
-
 #include "nighthawk/client/output_collector.h"
 
+#include "external/envoy/envoy/stats/store.h"
 #include "external/envoy/source/common/common/cleanup.h"
 #include "external/envoy/source/common/event/dispatcher_impl.h"
 #include "external/envoy/source/common/event/real_time_system.h"
@@ -22,17 +21,16 @@
 #include "api/client/output.pb.h"
 #include "api/client/service.grpc.pb.h"
 
-#include "common/frequency.h"
-#include "common/signal_handler.h"
-#include "common/uri_impl.h"
-#include "common/utility.h"
-
-#include "client/client_worker_impl.h"
-#include "client/factories_impl.h"
-#include "client/options_impl.h"
-#include "client/output_collector_impl.h"
-#include "client/process_impl.h"
-#include "client/remote_process_impl.h"
+#include "source/client/client_worker_impl.h"
+#include "source/client/factories_impl.h"
+#include "source/client/options_impl.h"
+#include "source/client/output_collector_impl.h"
+#include "source/client/process_impl.h"
+#include "source/client/remote_process_impl.h"
+#include "source/common/frequency.h"
+#include "source/common/signal_handler.h"
+#include "source/common/uri_impl.h"
+#include "source/common/utility.h"
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
diff --git a/source/client/client.h b/source/client/client.h
index dc71566c5..e850e360f 100644
--- a/source/client/client.h
+++ b/source/client/client.h
@@ -1,14 +1,13 @@
 #pragma once
 
-#include "envoy/network/address.h"
-#include "envoy/stats/store.h"
-
 #include "nighthawk/client/client_worker.h"
 #include "nighthawk/client/factories.h"
 #include "nighthawk/client/options.h"
 #include "nighthawk/client/output_collector.h"
 #include "nighthawk/common/statistic.h"
 
+#include "external/envoy/envoy/network/address.h"
+#include "external/envoy/envoy/stats/store.h"
 #include "external/envoy/source/common/common/logger.h"
 
 #include "process_impl.h"
diff --git a/source/client/client_worker_impl.cc b/source/client/client_worker_impl.cc
index a5d456763..b64315c0d 100644
--- a/source/client/client_worker_impl.cc
+++ b/source/client/client_worker_impl.cc
@@ -1,11 +1,11 @@
-#include "client/client_worker_impl.h"
+#include "source/client/client_worker_impl.h"
 
 #include "external/envoy/source/common/stats/symbol_table_impl.h"
 
-#include "common/cached_time_source_impl.h"
-#include "common/phase_impl.h"
-#include "common/termination_predicate_impl.h"
-#include "common/utility.h"
+#include "source/common/cached_time_source_impl.h"
+#include "source/common/phase_impl.h"
+#include "source/common/termination_predicate_impl.h"
+#include "source/common/utility.h"
 
 namespace Nighthawk {
 namespace Client {
diff --git a/source/client/client_worker_impl.h b/source/client/client_worker_impl.h
index 41b2660bc..8c6e5ffe8 100644
--- a/source/client/client_worker_impl.h
+++ b/source/client/client_worker_impl.h
@@ -2,12 +2,6 @@
 
 #include <vector>
 
-#include "envoy/api/api.h"
-#include "envoy/event/dispatcher.h"
-#include "envoy/stats/store.h"
-#include "envoy/thread_local/thread_local.h"
-#include "envoy/upstream/cluster_manager.h"
-
 #include "nighthawk/client/benchmark_client.h"
 #include "nighthawk/client/client_worker.h"
 #include "nighthawk/client/factories.h"
@@ -17,7 +11,13 @@
 #include "nighthawk/common/sequencer.h"
 #include "nighthawk/common/termination_predicate.h"
 
-#include "common/worker_impl.h"
+#include "external/envoy/envoy/api/api.h"
+#include "external/envoy/envoy/event/dispatcher.h"
+#include "external/envoy/envoy/stats/store.h"
+#include "external/envoy/envoy/thread_local/thread_local.h"
+#include "external/envoy/envoy/upstream/cluster_manager.h"
+
+#include "source/common/worker_impl.h"
 
 namespace Nighthawk {
 namespace Client {
diff --git a/source/client/factories_impl.cc b/source/client/factories_impl.cc
index 2031658c4..cdbaa196f 100644
--- a/source/client/factories_impl.cc
+++ b/source/client/factories_impl.cc
@@ -1,23 +1,21 @@
-#include "client/factories_impl.h"
+#include "source/client/factories_impl.h"
 
 #include "external/envoy/source/common/http/header_map_impl.h"
 
 #include "api/client/options.pb.h"
 
-#include "common/platform_util_impl.h"
-#include "common/rate_limiter_impl.h"
-#include "common/request_source_impl.h"
-#include "common/sequencer_impl.h"
-#include "common/statistic_impl.h"
-#include "common/termination_predicate_impl.h"
-#include "common/uri_impl.h"
-#include "common/utility.h"
-
-#include "client/benchmark_client_impl.h"
-#include "client/output_collector_impl.h"
-#include "client/output_formatter_impl.h"
-
-#include "request_source/request_options_list_plugin_impl.h"
+#include "source/client/benchmark_client_impl.h"
+#include "source/client/output_collector_impl.h"
+#include "source/client/output_formatter_impl.h"
+#include "source/common/platform_util_impl.h"
+#include "source/common/rate_limiter_impl.h"
+#include "source/common/request_source_impl.h"
+#include "source/common/sequencer_impl.h"
+#include "source/common/statistic_impl.h"
+#include "source/common/termination_predicate_impl.h"
+#include "source/common/uri_impl.h"
+#include "source/common/utility.h"
+#include "source/request_source/request_options_list_plugin_impl.h"
 
 using namespace std::chrono_literals;
 
diff --git a/source/client/factories_impl.h b/source/client/factories_impl.h
index 2932a72bf..00c568b19 100644
--- a/source/client/factories_impl.h
+++ b/source/client/factories_impl.h
@@ -1,18 +1,17 @@
 #pragma once
 
-#include "envoy/api/api.h"
-#include "envoy/event/dispatcher.h"
-#include "envoy/upstream/cluster_manager.h"
-
 #include "nighthawk/client/factories.h"
 #include "nighthawk/common/factories.h"
 #include "nighthawk/common/termination_predicate.h"
 #include "nighthawk/common/uri.h"
 
+#include "external/envoy/envoy/api/api.h"
+#include "external/envoy/envoy/event/dispatcher.h"
+#include "external/envoy/envoy/upstream/cluster_manager.h"
 #include "external/envoy/source/common/common/statusor.h"
 #include "external/envoy/source/common/config/utility.h"
 
-#include "common/platform_util_impl.h"
+#include "source/common/platform_util_impl.h"
 
 namespace Nighthawk {
 namespace Client {
diff --git a/source/client/flush_worker_impl.cc b/source/client/flush_worker_impl.cc
index d369a74ae..661afcc69 100644
--- a/source/client/flush_worker_impl.cc
+++ b/source/client/flush_worker_impl.cc
@@ -1,9 +1,9 @@
-#include "client/flush_worker_impl.h"
+#include "source/client/flush_worker_impl.h"
 
 #include "external/envoy/source/common/stats/symbol_table_impl.h"
 #include "external/envoy/source/server/server.h"
 
-#include "common/utility.h"
+#include "source/common/utility.h"
 
 namespace Nighthawk {
 namespace Client {
diff --git a/source/client/flush_worker_impl.h b/source/client/flush_worker_impl.h
index 8317d6358..2452aabb0 100644
--- a/source/client/flush_worker_impl.h
+++ b/source/client/flush_worker_impl.h
@@ -4,13 +4,13 @@
 
 #include <vector>
 
-#include "envoy/api/api.h"
-#include "envoy/event/dispatcher.h"
-#include "envoy/stats/sink.h"
-#include "envoy/stats/store.h"
-#include "envoy/thread_local/thread_local.h"
+#include "external/envoy/envoy/api/api.h"
+#include "external/envoy/envoy/event/dispatcher.h"
+#include "external/envoy/envoy/stats/sink.h"
+#include "external/envoy/envoy/stats/store.h"
+#include "external/envoy/envoy/thread_local/thread_local.h"
 
-#include "common/worker_impl.h"
+#include "source/common/worker_impl.h"
 
 namespace Nighthawk {
 namespace Client {
@@ -26,9 +26,9 @@ class FlushWorkerImpl : public WorkerImpl {
   // variables stats_sinks_ and stats_flush_interval_.
   // @param stats_flush_interval time interval between each flush.
   // @param api supplies the Api instance for WorkerImpl's constructor. See
-  // envoy/include/envoy/api/api.h for its definition.
+  // envoy/envoy/api/api.h for its definition.
   // @param tls supplies the ThreadLocal::Instance for WorkerImpl's constructor.
-  // See envoy/include/envoy/thread_local/thread_local.h for its definition.
+  // See envoy/envoy/thread_local/thread_local.h for its definition.
   // @param store supplies the stats store instance for WorkerImpl's constructor.
   // @param stats_sinks list of configured stats sinks where the stats will be
   // flushed to.
diff --git a/source/client/options_impl.cc b/source/client/options_impl.cc
index 548d1c6c2..3615703ef 100644
--- a/source/client/options_impl.cc
+++ b/source/client/options_impl.cc
@@ -1,15 +1,14 @@
-#include "client/options_impl.h"
+#include "source/client/options_impl.h"
 
 #include "external/envoy/source/common/protobuf/message_validator_impl.h"
 #include "external/envoy/source/common/protobuf/utility.h"
 
 #include "api/client/options.pb.validate.h"
 
-#include "common/uri_impl.h"
-#include "common/utility.h"
-#include "common/version_info.h"
-
-#include "client/output_formatter_impl.h"
+#include "source/client/output_formatter_impl.h"
+#include "source/common/uri_impl.h"
+#include "source/common/utility.h"
+#include "source/common/version_info.h"
 
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_split.h"
diff --git a/source/client/output_collector_impl.cc b/source/client/output_collector_impl.cc
index b6749f0c9..257eb9cef 100644
--- a/source/client/output_collector_impl.cc
+++ b/source/client/output_collector_impl.cc
@@ -1,4 +1,4 @@
-#include "client/output_collector_impl.h"
+#include "source/client/output_collector_impl.h"
 
 #include <google/protobuf/util/time_util.h>
 
@@ -7,7 +7,7 @@
 
 #include "external/envoy/source/common/protobuf/utility.h"
 
-#include "common/version_info.h"
+#include "source/common/version_info.h"
 
 namespace Nighthawk {
 namespace Client {
diff --git a/source/client/output_collector_impl.h b/source/client/output_collector_impl.h
index ccc9d5bae..e42dbd12c 100644
--- a/source/client/output_collector_impl.h
+++ b/source/client/output_collector_impl.h
@@ -2,11 +2,11 @@
 
 #include <cstdint>
 
-#include "envoy/common/time.h"
-
 #include "nighthawk/client/options.h"
 #include "nighthawk/client/output_collector.h"
 
+#include "external/envoy/envoy/common/time.h"
+
 namespace Nighthawk {
 namespace Client {
 
diff --git a/source/client/output_formatter_impl.cc b/source/client/output_formatter_impl.cc
index d8df09bae..1e70fbc16 100644
--- a/source/client/output_formatter_impl.cc
+++ b/source/client/output_formatter_impl.cc
@@ -1,4 +1,4 @@
-#include "client/output_formatter_impl.h"
+#include "source/client/output_formatter_impl.h"
 
 #include <google/protobuf/util/time_util.h>
 
@@ -12,7 +12,7 @@
 
 #include "api/client/transform/fortio.pb.h"
 
-#include "common/version_info.h"
+#include "source/common/version_info.h"
 
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
diff --git a/source/client/output_formatter_impl.h b/source/client/output_formatter_impl.h
index 1ad9168c5..2ccd7c54b 100644
--- a/source/client/output_formatter_impl.h
+++ b/source/client/output_formatter_impl.h
@@ -2,11 +2,10 @@
 
 #include <cstdint>
 
-#include "envoy/common/time.h"
-
 #include "nighthawk/client/output_formatter.h"
 
 #include "external/com_google_googletest/googletest/include/gtest/gtest_prod.h"
+#include "external/envoy/envoy/common/time.h"
 #include "external/envoy/source/common/protobuf/protobuf.h"
 
 #include "api/client/output.pb.h"
diff --git a/source/client/output_transform_main.cc b/source/client/output_transform_main.cc
index b5eb20b80..09b44d9d8 100644
--- a/source/client/output_transform_main.cc
+++ b/source/client/output_transform_main.cc
@@ -1,4 +1,4 @@
-#include "client/output_transform_main.h"
+#include "source/client/output_transform_main.h"
 
 #include "nighthawk/common/exception.h"
 
@@ -6,13 +6,12 @@
 
 #include "api/client/service.pb.h"
 
-#include "common/utility.h"
-#include "common/version_info.h"
-
-#include "client/factories_impl.h"
-#include "client/options_impl.h"
-#include "client/output_collector_impl.h"
-#include "client/output_formatter_impl.h"
+#include "source/client/factories_impl.h"
+#include "source/client/options_impl.h"
+#include "source/client/output_collector_impl.h"
+#include "source/client/output_formatter_impl.h"
+#include "source/common/utility.h"
+#include "source/common/version_info.h"
 
 #include "absl/strings/strip.h"
 #include "fmt/ranges.h"
diff --git a/source/client/process_impl.cc b/source/client/process_impl.cc
index ea530c17c..1ec23a99b 100644
--- a/source/client/process_impl.cc
+++ b/source/client/process_impl.cc
@@ -1,4 +1,4 @@
-#include "client/process_impl.h"
+#include "source/client/process_impl.h"
 
 #include <sys/file.h>
 
@@ -8,14 +8,13 @@
 #include <memory>
 #include <random>
 
-#include "envoy/network/address.h"
-#include "envoy/server/filter_config.h"
-#include "envoy/stats/sink.h"
-#include "envoy/stats/store.h"
-
 #include "nighthawk/client/output_collector.h"
 #include "nighthawk/common/factories.h"
 
+#include "external/envoy/envoy/network/address.h"
+#include "external/envoy/envoy/server/filter_config.h"
+#include "external/envoy/envoy/stats/sink.h"
+#include "external/envoy/envoy/stats/store.h"
 #include "external/envoy/source/common/api/api_impl.h"
 #include "external/envoy/source/common/common/cleanup.h"
 #include "external/envoy/source/common/config/utility.h"
@@ -44,16 +43,16 @@
 #include "api/client/options.pb.h"
 #include "api/client/output.pb.h"
 
-#include "common/frequency.h"
-#include "common/uri_impl.h"
-#include "common/utility.h"
+#include "source/common/frequency.h"
+#include "source/common/uri_impl.h"
+#include "source/common/utility.h"
 
-#include "client/benchmark_client_impl.h"
-#include "client/client.h"
-#include "client/client_worker_impl.h"
-#include "client/factories_impl.h"
-#include "client/options_impl.h"
-#include "client/sni_utility.h"
+#include "source/client/benchmark_client_impl.h"
+#include "source/client/client.h"
+#include "source/client/client_worker_impl.h"
+#include "source/client/factories_impl.h"
+#include "source/client/options_impl.h"
+#include "source/client/sni_utility.h"
 
 using namespace std::chrono_literals;
 
@@ -516,11 +515,12 @@ bool ProcessImpl::runInternal(OutputCollector& collector, const std::vector<UriP
     };
     const Envoy::OptionsImpl envoy_options(
         /* args = */ {"process_impl"}, hot_restart_version_cb, spdlog::level::info);
+    envoy::config::core::v3::DnsResolverOptions dns_resolver_options;
     cluster_manager_factory_ = std::make_unique<ClusterManagerFactory>(
         admin_, Envoy::Runtime::LoaderSingleton::get(), store_root_, tls_,
-        dispatcher_->createDnsResolver({}, false), *ssl_context_manager_, *dispatcher_,
-        *local_info_, secret_manager_, validation_context_, *api_, http_context_, grpc_context_,
-        router_context_, access_log_manager_, *singleton_manager_, envoy_options);
+        dispatcher_->createDnsResolver({}, dns_resolver_options), *ssl_context_manager_,
+        *dispatcher_, *local_info_, secret_manager_, validation_context_, *api_, http_context_,
+        grpc_context_, router_context_, access_log_manager_, *singleton_manager_, envoy_options);
     cluster_manager_factory_->setConnectionReuseStrategy(
         options_.h1ConnectionReuseStrategy() == nighthawk::client::H1ConnectionReuseStrategy::LRU
             ? Http1PoolImpl::ConnectionReuseStrategy::LRU
diff --git a/source/client/process_impl.h b/source/client/process_impl.h
index 81684815b..56263ee1f 100644
--- a/source/client/process_impl.h
+++ b/source/client/process_impl.h
@@ -2,11 +2,6 @@
 
 #include <map>
 
-#include "envoy/api/api.h"
-#include "envoy/network/address.h"
-#include "envoy/stats/store.h"
-#include "envoy/tracing/http_tracer.h"
-
 #include "nighthawk/client/client_worker.h"
 #include "nighthawk/client/factories.h"
 #include "nighthawk/client/options.h"
@@ -14,6 +9,10 @@
 #include "nighthawk/client/process.h"
 #include "nighthawk/common/statistic.h"
 
+#include "external/envoy/envoy/api/api.h"
+#include "external/envoy/envoy/network/address.h"
+#include "external/envoy/envoy/stats/store.h"
+#include "external/envoy/envoy/tracing/http_tracer.h"
 #include "external/envoy/source/common/access_log/access_log_manager_impl.h"
 #include "external/envoy/source/common/common/logger.h"
 #include "external/envoy/source/common/common/random_generator.h"
@@ -33,9 +32,9 @@
 #include "external/envoy/source/server/config_validation/admin.h"
 #include "external/envoy_api/envoy/config/bootstrap/v3/bootstrap.pb.h"
 
-#include "client/benchmark_client_impl.h"
-#include "client/factories_impl.h"
-#include "client/flush_worker_impl.h"
+#include "source/client/benchmark_client_impl.h"
+#include "source/client/factories_impl.h"
+#include "source/client/flush_worker_impl.h"
 
 namespace Nighthawk {
 namespace Client {
diff --git a/source/client/remote_process_impl.cc b/source/client/remote_process_impl.cc
index d69922eb4..d1c9ef220 100644
--- a/source/client/remote_process_impl.cc
+++ b/source/client/remote_process_impl.cc
@@ -1,4 +1,4 @@
-#include "client/remote_process_impl.h"
+#include "source/client/remote_process_impl.h"
 
 #include <grpc++/grpc++.h>
 
@@ -9,10 +9,9 @@
 #include "api/client/options.pb.h"
 #include "api/client/output.pb.h"
 
-#include "common/nighthawk_service_client_impl.h"
-#include "common/uri_impl.h"
-
-#include "client/options_impl.h"
+#include "source/client/options_impl.h"
+#include "source/common/nighthawk_service_client_impl.h"
+#include "source/common/uri_impl.h"
 
 namespace Nighthawk {
 namespace Client {
diff --git a/source/client/service_impl.cc b/source/client/service_impl.cc
index 31b965105..ee41074a0 100644
--- a/source/client/service_impl.cc
+++ b/source/client/service_impl.cc
@@ -1,14 +1,13 @@
-#include "client/service_impl.h"
+#include "source/client/service_impl.h"
 
 #include <grpc++/grpc++.h>
 
 #include "envoy/config/core/v3/base.pb.h"
 
-#include "common/request_source_impl.h"
-
-#include "client/client.h"
-#include "client/options_impl.h"
-#include "client/output_collector_impl.h"
+#include "source/client/client.h"
+#include "source/client/options_impl.h"
+#include "source/client/output_collector_impl.h"
+#include "source/common/request_source_impl.h"
 
 namespace Nighthawk {
 namespace Client {
diff --git a/source/client/service_main.cc b/source/client/service_main.cc
index 185c1826f..e3ebda38f 100644
--- a/source/client/service_main.cc
+++ b/source/client/service_main.cc
@@ -1,14 +1,13 @@
-#include "client/service_main.h"
+#include "source/client/service_main.h"
 
 #include <fstream>
 #include <iostream>
 
 #include "nighthawk/common/exception.h"
 
-#include "common/utility.h"
-#include "common/version_info.h"
-
-#include "client/service_impl.h"
+#include "source/client/service_impl.h"
+#include "source/common/utility.h"
+#include "source/common/version_info.h"
 
 #include "absl/strings/strip.h"
 #include "tclap/CmdLine.h"
diff --git a/source/client/service_main.h b/source/client/service_main.h
index 1620051b3..150abae81 100644
--- a/source/client/service_main.h
+++ b/source/client/service_main.h
@@ -12,9 +12,8 @@
 
 #include "api/client/service.pb.h"
 
-#include "common/signal_handler.h"
-
-#include "client/service_impl.h"
+#include "source/client/service_impl.h"
+#include "source/common/signal_handler.h"
 
 #include "tclap/CmdLine.h"
 
diff --git a/source/client/sni_utility.cc b/source/client/sni_utility.cc
index 9a89e5e51..341bff293 100644
--- a/source/client/sni_utility.cc
+++ b/source/client/sni_utility.cc
@@ -1,4 +1,4 @@
-#include "client/sni_utility.h"
+#include "source/client/sni_utility.h"
 
 #include "absl/strings/strip.h"
 
diff --git a/source/client/sni_utility.h b/source/client/sni_utility.h
index 22ab4e8a8..6e6dd5b39 100644
--- a/source/client/sni_utility.h
+++ b/source/client/sni_utility.h
@@ -5,7 +5,7 @@
 
 #include "nighthawk/common/uri.h"
 
-#include "external/envoy/include/envoy/http/protocol.h"
+#include "external/envoy/envoy/http/protocol.h"
 
 namespace Nighthawk {
 namespace Client {
diff --git a/source/client/stream_decoder.cc b/source/client/stream_decoder.cc
index 28ff80ca9..a2e3e2dfe 100644
--- a/source/client/stream_decoder.cc
+++ b/source/client/stream_decoder.cc
@@ -1,4 +1,4 @@
-#include "client/stream_decoder.h"
+#include "source/client/stream_decoder.h"
 
 #include <memory>
 
diff --git a/source/client/stream_decoder.h b/source/client/stream_decoder.h
index a5c33978b..f13c42d4f 100644
--- a/source/client/stream_decoder.h
+++ b/source/client/stream_decoder.h
@@ -2,16 +2,15 @@
 
 #include <functional>
 
-#include "envoy/common/time.h"
-#include "envoy/event/deferred_deletable.h"
-#include "envoy/event/dispatcher.h"
-#include "envoy/http/conn_pool.h"
-#include "envoy/server/tracer_config.h"
-
 #include "nighthawk/common/operation_callback.h"
 #include "nighthawk/common/request_source.h"
 #include "nighthawk/common/statistic.h"
 
+#include "external/envoy/envoy/common/time.h"
+#include "external/envoy/envoy/event/deferred_deletable.h"
+#include "external/envoy/envoy/event/dispatcher.h"
+#include "external/envoy/envoy/http/conn_pool.h"
+#include "external/envoy/envoy/server/tracer_config.h"
 #include "external/envoy/source/common/common/random_generator.h"
 #include "external/envoy/source/common/http/header_map_impl.h"
 #include "external/envoy/source/common/stream_info/stream_info_impl.h"
diff --git a/source/common/BUILD b/source/common/BUILD
index 3df97e2bd..3f22d5e1f 100644
--- a/source/common/BUILD
+++ b/source/common/BUILD
@@ -21,7 +21,7 @@ envoy_cc_library(
     deps = [
         "//api/client:base_cc_proto",
         "//api/client:grpc_service_lib",
-        "//include/nighthawk/common:nighthawk_service_client",
+        "//nighthawk/common:nighthawk_service_client",
         "@envoy//source/common/common:assert_lib_with_external_headers",
         "@envoy//source/common/common:statusor_lib_with_external_headers",
         "@envoy//source/common/protobuf:protobuf_with_external_headers",
@@ -37,7 +37,7 @@ envoy_cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":nighthawk_common_lib",
-        "//include/nighthawk/common:request_lib",
+        "//nighthawk/common:request_lib",
     ],
 )
 
@@ -50,11 +50,11 @@ envoy_cc_library(
         ":request_impl_lib",
         "//api/client:base_cc_proto",
         "//api/request_source:grpc_request_source_service_lib",
-        "//include/nighthawk/common:base_includes",
-        "//include/nighthawk/common:request_lib",
-        "@envoy//include/envoy/grpc:async_client_interface_with_external_headers",
-        "@envoy//include/envoy/grpc:async_client_manager_interface_with_external_headers",
-        "@envoy//include/envoy/upstream:cluster_manager_interface_with_external_headers",
+        "//nighthawk/common:base_includes",
+        "//nighthawk/common:request_lib",
+        "@envoy//envoy/grpc:async_client_interface_with_external_headers",
+        "@envoy//envoy/grpc:async_client_manager_interface_with_external_headers",
+        "@envoy//envoy/upstream:cluster_manager_interface_with_external_headers",
         "@envoy//source/common/common:assert_lib_with_external_headers",
         "@envoy//source/common/common:minimal_logger_lib_with_external_headers",
         "@envoy//source/common/grpc:typed_async_client_lib_with_external_headers",
@@ -79,7 +79,7 @@ envoy_cc_library(
         ":nighthawk_common_lib",
         ":request_impl_lib",
         ":request_stream_grpc_client_lib",
-        "//include/nighthawk/common:request_source_lib",
+        "//nighthawk/common:request_source_lib",
     ],
 )
 
@@ -103,8 +103,8 @@ envoy_cc_library(
     repository = "@envoy",
     visibility = ["//visibility:public"],
     deps = [
-        "//include/nighthawk/common:stopwatch_lib",
-        "@envoy//include/envoy/common:time_interface",
+        "//nighthawk/common:stopwatch_lib",
+        "@envoy//envoy/common:time_interface",
         "@envoy//source/common/common:lock_guard_lib_with_external_headers",
         "@envoy//source/common/common:thread_lib_with_external_headers",
     ],
@@ -144,9 +144,9 @@ envoy_cc_library(
     deps = [
         "//api/client:base_cc_proto",
         "//api/client:grpc_service_lib",
-        "//include/nighthawk/client:client_includes",
-        "//include/nighthawk/common:base_includes",
         "//internal_proto/statistic:statistic_cc_proto",
+        "//nighthawk/client:client_includes",
+        "//nighthawk/common:base_includes",
         "@com_google_absl//absl/random",
         "@com_google_absl//absl/strings",
         "@dep_hdrhistogram_c//:hdrhistogram_c",
diff --git a/source/common/cached_time_source_impl.h b/source/common/cached_time_source_impl.h
index 41ccd3e9d..ca7e9cf9e 100644
--- a/source/common/cached_time_source_impl.h
+++ b/source/common/cached_time_source_impl.h
@@ -2,8 +2,8 @@
 
 #include <cstdint>
 
-#include "envoy/common/time.h"
-#include "envoy/event/dispatcher.h"
+#include "external/envoy/envoy/common/time.h"
+#include "external/envoy/envoy/event/dispatcher.h"
 
 namespace Nighthawk {
 
diff --git a/source/common/nighthawk_service_client_impl.cc b/source/common/nighthawk_service_client_impl.cc
index 1c73c904c..0707c44bc 100644
--- a/source/common/nighthawk_service_client_impl.cc
+++ b/source/common/nighthawk_service_client_impl.cc
@@ -1,4 +1,4 @@
-#include "common/nighthawk_service_client_impl.h"
+#include "source/common/nighthawk_service_client_impl.h"
 
 #include "external/envoy/source/common/common/assert.h"
 
diff --git a/source/common/phase_impl.cc b/source/common/phase_impl.cc
index 058d155f7..ab8e543e5 100644
--- a/source/common/phase_impl.cc
+++ b/source/common/phase_impl.cc
@@ -1,4 +1,4 @@
-#include "common/phase_impl.h"
+#include "source/common/phase_impl.h"
 
 namespace Nighthawk {
 
diff --git a/source/common/phase_impl.h b/source/common/phase_impl.h
index 1b40164c3..11c1be879 100644
--- a/source/common/phase_impl.h
+++ b/source/common/phase_impl.h
@@ -1,10 +1,9 @@
 
 #pragma once
 
-#include "envoy/common/time.h"
-
 #include "nighthawk/common/phase.h"
 
+#include "external/envoy/envoy/common/time.h"
 #include "external/envoy/source/common/common/logger.h"
 
 #include "absl/types/optional.h"
diff --git a/source/common/rate_limiter_impl.cc b/source/common/rate_limiter_impl.cc
index 15f1fd71b..a0d8f46dd 100644
--- a/source/common/rate_limiter_impl.cc
+++ b/source/common/rate_limiter_impl.cc
@@ -1,4 +1,4 @@
-#include "common/rate_limiter_impl.h"
+#include "source/common/rate_limiter_impl.h"
 
 #include "nighthawk/common/exception.h"
 
diff --git a/source/common/rate_limiter_impl.h b/source/common/rate_limiter_impl.h
index 1d22e5a43..499c741aa 100644
--- a/source/common/rate_limiter_impl.h
+++ b/source/common/rate_limiter_impl.h
@@ -3,13 +3,12 @@
 #include <list>
 #include <random>
 
-#include "envoy/common/time.h"
-
 #include "nighthawk/common/rate_limiter.h"
 
+#include "external/envoy/envoy/common/time.h"
 #include "external/envoy/source/common/common/logger.h"
 
-#include "common/frequency.h"
+#include "source/common/frequency.h"
 
 #include "absl/random/random.h"
 #include "absl/random/zipf_distribution.h"
diff --git a/source/common/request_impl.h b/source/common/request_impl.h
index 930175dc5..0fb85dcb2 100644
--- a/source/common/request_impl.h
+++ b/source/common/request_impl.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "envoy/http/header_map.h"
-
 #include "nighthawk/common/request.h"
 
+#include "external/envoy/envoy/http/header_map.h"
+
 namespace Nighthawk {
 
 class RequestImpl : public Request {
diff --git a/source/common/request_source_impl.cc b/source/common/request_source_impl.cc
index c6cea672e..545603649 100644
--- a/source/common/request_source_impl.cc
+++ b/source/common/request_source_impl.cc
@@ -1,10 +1,10 @@
-#include "common/request_source_impl.h"
+#include "source/common/request_source_impl.h"
 
 #include <chrono>
 
 #include "external/envoy/source/common/common/assert.h"
 
-#include "common/request_impl.h"
+#include "source/common/request_impl.h"
 
 namespace Nighthawk {
 
diff --git a/source/common/request_source_impl.h b/source/common/request_source_impl.h
index 7017eae36..6ac1c90fa 100644
--- a/source/common/request_source_impl.h
+++ b/source/common/request_source_impl.h
@@ -1,13 +1,12 @@
 #pragma once
 
-#include "envoy/http/header_map.h"
-
 #include "nighthawk/common/request.h"
 #include "nighthawk/common/request_source.h"
 
+#include "external/envoy/envoy/http/header_map.h"
 #include "external/envoy/source/common/common/logger.h"
 
-#include "common/request_stream_grpc_client_impl.h"
+#include "source/common/request_stream_grpc_client_impl.h"
 
 namespace Nighthawk {
 
diff --git a/source/common/request_stream_grpc_client_impl.cc b/source/common/request_stream_grpc_client_impl.cc
index 31db65a69..764fe665c 100644
--- a/source/common/request_stream_grpc_client_impl.cc
+++ b/source/common/request_stream_grpc_client_impl.cc
@@ -1,18 +1,18 @@
-#include "common/request_stream_grpc_client_impl.h"
+#include "source/common/request_stream_grpc_client_impl.h"
 
 #include <string>
 
 #include "envoy/api/v2/core/base.pb.h"
 #include "envoy/config/core/v3/base.pb.h"
-#include "envoy/stats/scope.h"
 
+#include "external/envoy/envoy/stats/scope.h"
 #include "external/envoy/source/common/common/assert.h"
 #include "external/envoy/source/common/http/header_map_impl.h"
 #include "external/envoy/source/common/http/headers.h"
 
 #include "api/request_source/service.pb.h"
 
-#include "common/request_impl.h"
+#include "source/common/request_impl.h"
 
 namespace Nighthawk {
 
diff --git a/source/common/request_stream_grpc_client_impl.h b/source/common/request_stream_grpc_client_impl.h
index 36425b266..7fd3d8bc1 100644
--- a/source/common/request_stream_grpc_client_impl.h
+++ b/source/common/request_stream_grpc_client_impl.h
@@ -3,14 +3,13 @@
 #include <queue>
 #include <string>
 
-#include "envoy/grpc/async_client.h"
-#include "envoy/grpc/async_client_manager.h"
-#include "envoy/stats/scope.h"
-#include "envoy/upstream/cluster_manager.h"
-
 #include "nighthawk/common/request.h"
 #include "nighthawk/common/request_stream_grpc_client.h"
 
+#include "external/envoy/envoy/grpc/async_client.h"
+#include "external/envoy/envoy/grpc/async_client_manager.h"
+#include "external/envoy/envoy/stats/scope.h"
+#include "external/envoy/envoy/upstream/cluster_manager.h"
 #include "external/envoy/source/common/common/logger.h"
 #include "external/envoy/source/common/grpc/typed_async_client.h"
 #include "external/envoy/source/common/http/header_map_impl.h"
diff --git a/source/common/sequencer_impl.cc b/source/common/sequencer_impl.cc
index 1dd9eec51..cb3092502 100644
--- a/source/common/sequencer_impl.cc
+++ b/source/common/sequencer_impl.cc
@@ -1,4 +1,4 @@
-#include "common/sequencer_impl.h"
+#include "source/common/sequencer_impl.h"
 
 #include "nighthawk/common/exception.h"
 #include "nighthawk/common/platform_util.h"
diff --git a/source/common/sequencer_impl.h b/source/common/sequencer_impl.h
index 40f245d98..d0fa69d3a 100644
--- a/source/common/sequencer_impl.h
+++ b/source/common/sequencer_impl.h
@@ -1,15 +1,14 @@
 #pragma once
 
-#include "envoy/common/pure.h"
-#include "envoy/common/time.h"
-#include "envoy/event/dispatcher.h"
-
 #include "nighthawk/common/platform_util.h"
 #include "nighthawk/common/rate_limiter.h"
 #include "nighthawk/common/sequencer.h"
 #include "nighthawk/common/statistic.h"
 #include "nighthawk/common/termination_predicate.h"
 
+#include "external/envoy/envoy/common/pure.h"
+#include "external/envoy/envoy/common/time.h"
+#include "external/envoy/envoy/event/dispatcher.h"
 #include "external/envoy/source/common/common/logger.h"
 
 namespace Nighthawk {
diff --git a/source/common/signal_handler.cc b/source/common/signal_handler.cc
index 59c86bc11..b94477aa2 100644
--- a/source/common/signal_handler.cc
+++ b/source/common/signal_handler.cc
@@ -1,4 +1,4 @@
-#include "common/signal_handler.h"
+#include "source/common/signal_handler.h"
 
 #include <csignal>
 
diff --git a/source/common/statistic_impl.cc b/source/common/statistic_impl.cc
index e44eb999c..b86167cf7 100644
--- a/source/common/statistic_impl.cc
+++ b/source/common/statistic_impl.cc
@@ -1,4 +1,4 @@
-#include "common/statistic_impl.h"
+#include "source/common/statistic_impl.h"
 
 #include <cmath>
 #include <cstdio>
diff --git a/source/common/statistic_impl.h b/source/common/statistic_impl.h
index 0158d3bb5..a767b9f03 100644
--- a/source/common/statistic_impl.h
+++ b/source/common/statistic_impl.h
@@ -9,7 +9,7 @@
 #include "external/envoy/source/common/common/logger.h"
 #include "external/envoy/source/common/stats/histogram_impl.h"
 
-#include "common/frequency.h"
+#include "source/common/frequency.h"
 
 namespace Nighthawk {
 
diff --git a/source/common/termination_predicate_impl.cc b/source/common/termination_predicate_impl.cc
index d32f2006b..a85dbb5fb 100644
--- a/source/common/termination_predicate_impl.cc
+++ b/source/common/termination_predicate_impl.cc
@@ -1,4 +1,4 @@
-#include "common/termination_predicate_impl.h"
+#include "source/common/termination_predicate_impl.h"
 
 #include <iostream>
 
diff --git a/source/common/termination_predicate_impl.h b/source/common/termination_predicate_impl.h
index c1c761345..d4f1812ca 100644
--- a/source/common/termination_predicate_impl.h
+++ b/source/common/termination_predicate_impl.h
@@ -1,10 +1,10 @@
 #include <chrono>
 
-#include "envoy/common/time.h"
-#include "envoy/stats/store.h"
-
 #include "nighthawk/common/termination_predicate.h"
 
+#include "external/envoy/envoy/common/time.h"
+#include "external/envoy/envoy/stats/store.h"
+
 namespace Nighthawk {
 
 class TerminationPredicateBaseImpl : public TerminationPredicate {
diff --git a/source/common/thread_safe_monotonic_time_stopwatch.cc b/source/common/thread_safe_monotonic_time_stopwatch.cc
index e1048f1c5..85f061306 100644
--- a/source/common/thread_safe_monotonic_time_stopwatch.cc
+++ b/source/common/thread_safe_monotonic_time_stopwatch.cc
@@ -1,4 +1,4 @@
-#include "common/thread_safe_monotonic_time_stopwatch.h"
+#include "source/common/thread_safe_monotonic_time_stopwatch.h"
 
 namespace Nighthawk {
 
diff --git a/source/common/uri_impl.cc b/source/common/uri_impl.cc
index 02a33bfb6..1805cd330 100644
--- a/source/common/uri_impl.cc
+++ b/source/common/uri_impl.cc
@@ -1,9 +1,9 @@
-#include "common/uri_impl.h"
+#include "source/common/uri_impl.h"
 
 #include "external/envoy/source/common/http/utility.h"
 #include "external/envoy/source/common/network/utility.h"
 
-#include "common/utility.h"
+#include "source/common/utility.h"
 
 #include "absl/strings/match.h"
 #include "absl/strings/str_replace.h"
@@ -62,7 +62,8 @@ UriImpl::UriImpl(absl::string_view uri, absl::string_view default_scheme)
 
 bool UriImpl::performDnsLookup(Envoy::Event::Dispatcher& dispatcher,
                                const Envoy::Network::DnsLookupFamily dns_lookup_family) {
-  auto dns_resolver = dispatcher.createDnsResolver({}, false);
+  envoy::config::core::v3::DnsResolverOptions dns_resolver_options;
+  auto dns_resolver = dispatcher.createDnsResolver({}, dns_resolver_options);
   std::string hostname = std::string(hostWithoutPort());
 
   if (!hostname.empty() && hostname[0] == '[' && hostname[hostname.size() - 1] == ']') {
diff --git a/source/common/uri_impl.h b/source/common/uri_impl.h
index 2a9a0bb4a..3eab108a5 100644
--- a/source/common/uri_impl.h
+++ b/source/common/uri_impl.h
@@ -2,11 +2,10 @@
 
 #include <string>
 
-#include "envoy/stats/store.h"
-
 #include "nighthawk/common/exception.h"
 #include "nighthawk/common/uri.h"
 
+#include "external/envoy/envoy/stats/store.h"
 #include "external/envoy/source/common/common/logger.h"
 #include "external/envoy/source/common/network/dns_impl.h"
 #include "external/envoy/source/common/network/utility.h"
diff --git a/source/common/utility.cc b/source/common/utility.cc
index 2e9430309..8efcc03e7 100644
--- a/source/common/utility.cc
+++ b/source/common/utility.cc
@@ -1,4 +1,4 @@
-#include "common/utility.h"
+#include "source/common/utility.h"
 
 #include "nighthawk/common/exception.h"
 
diff --git a/source/common/utility.h b/source/common/utility.h
index 346382dfa..36aad070d 100644
--- a/source/common/utility.h
+++ b/source/common/utility.h
@@ -2,10 +2,9 @@
 
 #include <string>
 
-#include "envoy/stats/store.h"
-
 #include "nighthawk/common/exception.h"
 
+#include "external/envoy/envoy/stats/store.h"
 #include "external/envoy/source/common/network/dns_impl.h"
 
 #include "api/client/options.pb.h"
diff --git a/source/common/version_info.cc b/source/common/version_info.cc
index 220af5c25..3e7efb86d 100644
--- a/source/common/version_info.cc
+++ b/source/common/version_info.cc
@@ -1,4 +1,4 @@
-#include "common/version_info.h"
+#include "source/common/version_info.h"
 
 #include <string>
 
diff --git a/source/common/worker_impl.cc b/source/common/worker_impl.cc
index 021a65f35..5914e24d4 100644
--- a/source/common/worker_impl.cc
+++ b/source/common/worker_impl.cc
@@ -1,7 +1,7 @@
-#include "common/worker_impl.h"
+#include "source/common/worker_impl.h"
 
-#include "envoy/runtime/runtime.h"
-#include "envoy/thread_local/thread_local.h"
+#include "external/envoy/envoy/runtime/runtime.h"
+#include "external/envoy/envoy/thread_local/thread_local.h"
 
 namespace Nighthawk {
 
diff --git a/source/common/worker_impl.h b/source/common/worker_impl.h
index 25090dc26..b7cda449c 100644
--- a/source/common/worker_impl.h
+++ b/source/common/worker_impl.h
@@ -3,12 +3,11 @@
 #include <future>
 #include <thread>
 
-#include "envoy/api/api.h"
-#include "envoy/common/time.h"
-#include "envoy/stats/store.h"
-
 #include "nighthawk/common/worker.h"
 
+#include "external/envoy/envoy/api/api.h"
+#include "external/envoy/envoy/common/time.h"
+#include "external/envoy/envoy/stats/store.h"
 #include "external/envoy/source/common/common/lock_guard.h"
 #include "external/envoy/source/common/common/logger.h"
 #include "external/envoy/source/common/common/thread.h"
diff --git a/source/distributor/BUILD b/source/distributor/BUILD
index 0d66a4bef..dc10e3fa9 100644
--- a/source/distributor/BUILD
+++ b/source/distributor/BUILD
@@ -19,7 +19,7 @@ envoy_cc_library(
     repository = "@envoy",
     visibility = ["//visibility:public"],
     deps = [
-        "//include/nighthawk/distributor:nighthawk_distributor_client",
+        "//nighthawk/distributor:nighthawk_distributor_client",
     ],
 )
 
@@ -35,7 +35,7 @@ envoy_cc_library(
     visibility = ["//visibility:public"],
     deps = [
         "//api/distributor:distributor_grpc_lib",
-        "//include/nighthawk/common:nighthawk_service_client",
+        "//nighthawk/common:nighthawk_service_client",
         "@com_github_grpc_grpc//:grpc++",
         "@envoy//source/common/common:assert_lib_with_external_headers",
         "@envoy//source/common/common:minimal_logger_lib_with_external_headers",
diff --git a/source/distributor/nighthawk_distributor_client_impl.cc b/source/distributor/nighthawk_distributor_client_impl.cc
index 2274d06c8..5e43b6cb5 100644
--- a/source/distributor/nighthawk_distributor_client_impl.cc
+++ b/source/distributor/nighthawk_distributor_client_impl.cc
@@ -1,4 +1,4 @@
-#include "distributor/nighthawk_distributor_client_impl.h"
+#include "source/distributor/nighthawk_distributor_client_impl.h"
 
 #include "external/envoy/source/common/common/assert.h"
 
diff --git a/source/distributor/service_impl.cc b/source/distributor/service_impl.cc
index 0ec4d63f8..1b167a4ea 100644
--- a/source/distributor/service_impl.cc
+++ b/source/distributor/service_impl.cc
@@ -1,4 +1,4 @@
-#include "distributor/service_impl.h"
+#include "source/distributor/service_impl.h"
 
 #include <grpc++/grpc++.h>
 
diff --git a/source/exe/adaptive_load_client_main_entry.cc b/source/exe/adaptive_load_client_main_entry.cc
index 67d45b434..7512af6a2 100644
--- a/source/exe/adaptive_load_client_main_entry.cc
+++ b/source/exe/adaptive_load_client_main_entry.cc
@@ -6,13 +6,13 @@
 #include "external/envoy/source/common/event/real_time_system.h"
 #include "external/envoy/source/exe/platform_impl.h"
 
-#include "common/nighthawk_service_client_impl.h"
+#include "source/adaptive_load/adaptive_load_client_main.h"
+#include "source/adaptive_load/adaptive_load_controller_impl.h"
+#include "source/adaptive_load/metrics_evaluator_impl.h"
+#include "source/adaptive_load/session_spec_proto_helper_impl.h"
+#include "source/common/nighthawk_service_client_impl.h"
 
 #include "absl/debugging/symbolize.h"
-#include "adaptive_load/adaptive_load_client_main.h"
-#include "adaptive_load/adaptive_load_controller_impl.h"
-#include "adaptive_load/metrics_evaluator_impl.h"
-#include "adaptive_load/session_spec_proto_helper_impl.h"
 
 // NOLINT(namespace-nighthawk)
 
diff --git a/source/exe/client_main_entry.cc b/source/exe/client_main_entry.cc
index 9019d4060..503a6339d 100644
--- a/source/exe/client_main_entry.cc
+++ b/source/exe/client_main_entry.cc
@@ -1,6 +1,6 @@
 #include "nighthawk/common/exception.h"
 
-#include "client/client.h"
+#include "source/client/client.h"
 
 #include "absl/debugging/symbolize.h"
 
diff --git a/source/exe/output_transform_main_entry.cc b/source/exe/output_transform_main_entry.cc
index 3894f726b..5ab8282b0 100644
--- a/source/exe/output_transform_main_entry.cc
+++ b/source/exe/output_transform_main_entry.cc
@@ -2,7 +2,7 @@
 
 #include "nighthawk/common/exception.h"
 
-#include "client/output_transform_main.h"
+#include "source/client/output_transform_main.h"
 
 #include "absl/debugging/symbolize.h"
 
diff --git a/source/exe/service_main_entry.cc b/source/exe/service_main_entry.cc
index eda0c2c86..372d3016e 100644
--- a/source/exe/service_main_entry.cc
+++ b/source/exe/service_main_entry.cc
@@ -1,6 +1,6 @@
 #include "nighthawk/common/exception.h"
 
-#include "client/service_main.h"
+#include "source/client/service_main.h"
 
 #include "absl/debugging/symbolize.h"
 
diff --git a/source/request_source/BUILD b/source/request_source/BUILD
index 9fdbf5151..8ff80d791 100644
--- a/source/request_source/BUILD
+++ b/source/request_source/BUILD
@@ -19,7 +19,7 @@ envoy_cc_library(
     repository = "@envoy",
     visibility = ["//visibility:public"],
     deps = [
-        "//include/nighthawk/request_source:request_source_plugin_config_factory_lib",
+        "//nighthawk/request_source:request_source_plugin_config_factory_lib",
         "//source/common:nighthawk_common_lib",
         "//source/common:request_impl_lib",
         "//source/common:request_source_impl_lib",
diff --git a/source/request_source/request_options_list_plugin_impl.cc b/source/request_source/request_options_list_plugin_impl.cc
index acc459e3c..0ce9e7d51 100644
--- a/source/request_source/request_options_list_plugin_impl.cc
+++ b/source/request_source/request_options_list_plugin_impl.cc
@@ -1,4 +1,4 @@
-#include "request_source/request_options_list_plugin_impl.h"
+#include "source/request_source/request_options_list_plugin_impl.h"
 
 #include "external/envoy/source/common/protobuf/message_validator_impl.h"
 #include "external/envoy/source/common/protobuf/utility.h"
@@ -6,8 +6,8 @@
 
 #include "api/client/options.pb.h"
 
-#include "common/request_impl.h"
-#include "common/request_source_impl.h"
+#include "source/common/request_impl.h"
+#include "source/common/request_source_impl.h"
 
 namespace Nighthawk {
 std::string FileBasedOptionsListRequestSourceFactory::name() const {
diff --git a/source/request_source/request_options_list_plugin_impl.h b/source/request_source/request_options_list_plugin_impl.h
index 8de3d7ef9..072023732 100644
--- a/source/request_source/request_options_list_plugin_impl.h
+++ b/source/request_source/request_options_list_plugin_impl.h
@@ -1,17 +1,16 @@
 // Implementations of RequestSourceConfigFactories that make a OptionsListRequestSource.
 #pragma once
 
-#include "envoy/registry/registry.h"
-
 #include "nighthawk/request_source/request_source_plugin_config_factory.h"
 
+#include "external/envoy/envoy/registry/registry.h"
 #include "external/envoy/source/common/common/lock_guard.h"
 #include "external/envoy/source/common/common/thread.h"
 
 #include "api/client/options.pb.h"
 #include "api/request_source/request_source_plugin.pb.h"
 
-#include "common/uri_impl.h"
+#include "source/common/uri_impl.h"
 
 namespace Nighthawk {
 
diff --git a/source/server/BUILD b/source/server/BUILD
index c0af0f63e..ac11d0352 100644
--- a/source/server/BUILD
+++ b/source/server/BUILD
@@ -32,7 +32,7 @@ envoy_cc_library(
     deps = [
         ":well_known_headers_lib",
         "//api/server:response_options_proto_cc_proto",
-        "@envoy//include/envoy/server:filter_config_interface_with_external_headers",
+        "@envoy//envoy/server:filter_config_interface_with_external_headers",
         "@envoy//source/common/common:statusor_lib_with_external_headers",
         "@envoy//source/common/protobuf:message_validator_lib_with_external_headers",
         "@envoy//source/common/protobuf:utility_lib_with_external_headers",
@@ -87,7 +87,7 @@ envoy_cc_library(
     repository = "@envoy",
     deps = [
         ":http_test_server_filter_lib",
-        "@envoy//include/envoy/server:filter_config_interface_with_external_headers",
+        "@envoy//envoy/server:filter_config_interface_with_external_headers",
     ],
 )
 
@@ -97,7 +97,7 @@ envoy_cc_library(
     repository = "@envoy",
     deps = [
         ":http_dynamic_delay_filter_lib",
-        "@envoy//include/envoy/server:filter_config_interface_with_external_headers",
+        "@envoy//envoy/server:filter_config_interface_with_external_headers",
     ],
 )
 
@@ -107,6 +107,6 @@ envoy_cc_library(
     repository = "@envoy",
     deps = [
         ":http_time_tracking_filter_lib",
-        "@envoy//include/envoy/server:filter_config_interface_with_external_headers",
+        "@envoy//envoy/server:filter_config_interface_with_external_headers",
     ],
 )
diff --git a/source/server/configuration.cc b/source/server/configuration.cc
index ca17b6f46..e9a06828d 100644
--- a/source/server/configuration.cc
+++ b/source/server/configuration.cc
@@ -1,4 +1,4 @@
-#include "server/configuration.h"
+#include "source/server/configuration.h"
 
 #include <string>
 
diff --git a/source/server/configuration.h b/source/server/configuration.h
index 81aaf50da..ff2d4ae5d 100644
--- a/source/server/configuration.h
+++ b/source/server/configuration.h
@@ -4,7 +4,8 @@
 
 #include "envoy/api/v2/core/base.pb.h"
 #include "envoy/config/core/v3/base.pb.h"
-#include "envoy/http/header_map.h"
+
+#include "external/envoy/envoy/http/header_map.h"
 
 #include "api/server/response_options.pb.h"
 
diff --git a/source/server/http_dynamic_delay_filter.cc b/source/server/http_dynamic_delay_filter.cc
index 9536b8434..5d0de46fb 100644
--- a/source/server/http_dynamic_delay_filter.cc
+++ b/source/server/http_dynamic_delay_filter.cc
@@ -1,11 +1,11 @@
-#include "server/http_dynamic_delay_filter.h"
+#include "source/server/http_dynamic_delay_filter.h"
 
 #include <string>
 
-#include "envoy/server/filter_config.h"
+#include "external/envoy/envoy/server/filter_config.h"
 
-#include "server/configuration.h"
-#include "server/well_known_headers.h"
+#include "source/server/configuration.h"
+#include "source/server/well_known_headers.h"
 
 #include "absl/strings/str_cat.h"
 
diff --git a/source/server/http_dynamic_delay_filter.h b/source/server/http_dynamic_delay_filter.h
index 654a3d752..ae5c51e08 100644
--- a/source/server/http_dynamic_delay_filter.h
+++ b/source/server/http_dynamic_delay_filter.h
@@ -3,13 +3,12 @@
 #include <atomic>
 #include <string>
 
-#include "envoy/server/filter_config.h"
-
+#include "external/envoy/envoy/server/filter_config.h"
 #include "external/envoy/source/extensions/filters/http/fault/fault_filter.h"
 
 #include "api/server/response_options.pb.h"
 
-#include "server/http_filter_config_base.h"
+#include "source/server/http_filter_config_base.h"
 
 namespace Nighthawk {
 namespace Server {
diff --git a/source/server/http_dynamic_delay_filter_config.cc b/source/server/http_dynamic_delay_filter_config.cc
index 87cda255b..c56468ee8 100644
--- a/source/server/http_dynamic_delay_filter_config.cc
+++ b/source/server/http_dynamic_delay_filter_config.cc
@@ -1,14 +1,13 @@
 #include <string>
 
-#include "envoy/registry/registry.h"
-
+#include "external/envoy/envoy/registry/registry.h"
 #include "external/envoy/source/common/protobuf/message_validator_impl.h"
 
 #include "api/server/response_options.pb.h"
 #include "api/server/response_options.pb.validate.h"
 
-#include "server/configuration.h"
-#include "server/http_dynamic_delay_filter.h"
+#include "source/server/configuration.h"
+#include "source/server/http_dynamic_delay_filter.h"
 
 namespace Nighthawk {
 namespace Server {
diff --git a/source/server/http_filter_config_base.cc b/source/server/http_filter_config_base.cc
index 0c8396139..1d2fc09fb 100644
--- a/source/server/http_filter_config_base.cc
+++ b/source/server/http_filter_config_base.cc
@@ -1,6 +1,6 @@
-#include "server/http_filter_config_base.h"
+#include "source/server/http_filter_config_base.h"
 
-#include "server/well_known_headers.h"
+#include "source/server/well_known_headers.h"
 
 namespace Nighthawk {
 namespace Server {
diff --git a/source/server/http_filter_config_base.h b/source/server/http_filter_config_base.h
index 7569df17a..4e4e7bc69 100644
--- a/source/server/http_filter_config_base.h
+++ b/source/server/http_filter_config_base.h
@@ -2,13 +2,12 @@
 
 #include <string>
 
-#include "envoy/server/filter_config.h"
-
+#include "external/envoy/envoy/server/filter_config.h"
 #include "external/envoy/source/common/common/statusor.h"
 
 #include "api/server/response_options.pb.h"
 
-#include "server/configuration.h"
+#include "source/server/configuration.h"
 
 #include "absl/status/status.h"
 
diff --git a/source/server/http_test_server_filter.cc b/source/server/http_test_server_filter.cc
index bac840bc1..932606554 100644
--- a/source/server/http_test_server_filter.cc
+++ b/source/server/http_test_server_filter.cc
@@ -1,11 +1,11 @@
-#include "server/http_test_server_filter.h"
+#include "source/server/http_test_server_filter.h"
 
 #include <string>
 
-#include "envoy/server/filter_config.h"
+#include "external/envoy/envoy/server/filter_config.h"
 
-#include "server/configuration.h"
-#include "server/well_known_headers.h"
+#include "source/server/configuration.h"
+#include "source/server/well_known_headers.h"
 
 #include "absl/strings/numbers.h"
 
diff --git a/source/server/http_test_server_filter.h b/source/server/http_test_server_filter.h
index 16f3e378e..d01305841 100644
--- a/source/server/http_test_server_filter.h
+++ b/source/server/http_test_server_filter.h
@@ -2,11 +2,11 @@
 
 #include <string>
 
-#include "envoy/server/filter_config.h"
+#include "external/envoy/envoy/server/filter_config.h"
 
 #include "api/server/response_options.pb.h"
 
-#include "server/http_filter_config_base.h"
+#include "source/server/http_filter_config_base.h"
 
 namespace Nighthawk {
 namespace Server {
diff --git a/source/server/http_test_server_filter_config.cc b/source/server/http_test_server_filter_config.cc
index 5a9754d9d..bfe448e72 100644
--- a/source/server/http_test_server_filter_config.cc
+++ b/source/server/http_test_server_filter_config.cc
@@ -1,14 +1,13 @@
 #include <string>
 
-#include "envoy/registry/registry.h"
-
+#include "external/envoy/envoy/registry/registry.h"
 #include "external/envoy/source/common/protobuf/message_validator_impl.h"
 
 #include "api/server/response_options.pb.h"
 #include "api/server/response_options.pb.validate.h"
 
-#include "server/configuration.h"
-#include "server/http_test_server_filter.h"
+#include "source/server/configuration.h"
+#include "source/server/http_test_server_filter.h"
 
 namespace Nighthawk {
 namespace Server {
diff --git a/source/server/http_time_tracking_filter.cc b/source/server/http_time_tracking_filter.cc
index a6d787f02..a17597adb 100644
--- a/source/server/http_time_tracking_filter.cc
+++ b/source/server/http_time_tracking_filter.cc
@@ -1,13 +1,12 @@
-#include "server/http_time_tracking_filter.h"
+#include "source/server/http_time_tracking_filter.h"
 
 #include <string>
 
-#include "envoy/server/filter_config.h"
+#include "external/envoy/envoy/server/filter_config.h"
 
-#include "common/thread_safe_monotonic_time_stopwatch.h"
-
-#include "server/configuration.h"
-#include "server/well_known_headers.h"
+#include "source/common/thread_safe_monotonic_time_stopwatch.h"
+#include "source/server/configuration.h"
+#include "source/server/well_known_headers.h"
 
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_cat.h"
diff --git a/source/server/http_time_tracking_filter.h b/source/server/http_time_tracking_filter.h
index 6f08b42f5..bda379bbe 100644
--- a/source/server/http_time_tracking_filter.h
+++ b/source/server/http_time_tracking_filter.h
@@ -2,16 +2,15 @@
 
 #include <string>
 
-#include "envoy/common/time.h"
-#include "envoy/server/filter_config.h"
-
 #include "nighthawk/common/stopwatch.h"
 
+#include "external/envoy/envoy/common/time.h"
+#include "external/envoy/envoy/server/filter_config.h"
 #include "external/envoy/source/extensions/filters/http/common/pass_through_filter.h"
 
 #include "api/server/response_options.pb.h"
 
-#include "server/http_filter_config_base.h"
+#include "source/server/http_filter_config_base.h"
 
 namespace Nighthawk {
 namespace Server {
diff --git a/source/server/http_time_tracking_filter_config.cc b/source/server/http_time_tracking_filter_config.cc
index e9e3e38d0..4f97c26cf 100644
--- a/source/server/http_time_tracking_filter_config.cc
+++ b/source/server/http_time_tracking_filter_config.cc
@@ -1,14 +1,13 @@
 #include <string>
 
-#include "envoy/registry/registry.h"
-
+#include "external/envoy/envoy/registry/registry.h"
 #include "external/envoy/source/common/protobuf/message_validator_impl.h"
 
 #include "api/server/response_options.pb.h"
 #include "api/server/response_options.pb.validate.h"
 
-#include "server/configuration.h"
-#include "server/http_time_tracking_filter.h"
+#include "source/server/configuration.h"
+#include "source/server/http_time_tracking_filter.h"
 
 namespace Nighthawk {
 namespace Server {
diff --git a/source/server/well_known_headers.h b/source/server/well_known_headers.h
index e64eb6c82..b78c7e73f 100644
--- a/source/server/well_known_headers.h
+++ b/source/server/well_known_headers.h
@@ -2,8 +2,7 @@
 
 #include <string>
 
-#include "envoy/http/header_map.h"
-
+#include "external/envoy/envoy/http/header_map.h"
 #include "external/envoy/source/common/singleton/const_singleton.h"
 
 namespace Nighthawk {
diff --git a/source/sink/BUILD b/source/sink/BUILD
index 9212985ee..337a95682 100644
--- a/source/sink/BUILD
+++ b/source/sink/BUILD
@@ -19,7 +19,7 @@ envoy_cc_library(
     repository = "@envoy",
     visibility = ["//visibility:public"],
     deps = [
-        "//include/nighthawk/sink:nighthawk_sink_client",
+        "//nighthawk/sink:nighthawk_sink_client",
     ],
 )
 
@@ -34,7 +34,7 @@ envoy_cc_library(
     repository = "@envoy",
     visibility = ["//visibility:public"],
     deps = [
-        "//include/nighthawk/sink:sink_lib",
+        "//nighthawk/sink:sink_lib",
         "@envoy//source/common/common:minimal_logger_lib_with_external_headers",
         "@envoy//source/common/common:random_generator_lib_with_external_headers",
     ],
diff --git a/source/sink/nighthawk_sink_client_impl.cc b/source/sink/nighthawk_sink_client_impl.cc
index 8a643b4a6..e5777314f 100644
--- a/source/sink/nighthawk_sink_client_impl.cc
+++ b/source/sink/nighthawk_sink_client_impl.cc
@@ -1,4 +1,4 @@
-#include "sink/nighthawk_sink_client_impl.h"
+#include "source/sink/nighthawk_sink_client_impl.h"
 
 #include "external/envoy/source/common/common/assert.h"
 
diff --git a/source/sink/service_impl.cc b/source/sink/service_impl.cc
index 63dbc96ac..db5d5ba0b 100644
--- a/source/sink/service_impl.cc
+++ b/source/sink/service_impl.cc
@@ -1,4 +1,4 @@
-#include "sink/service_impl.h"
+#include "source/sink/service_impl.h"
 
 #include <grpc++/grpc++.h>
 
@@ -6,8 +6,8 @@
 
 #include "external/envoy/source/common/common/assert.h"
 
-#include "sink/nighthawk_sink_client_impl.h"
-#include "sink/sink_impl.h"
+#include "source/sink/nighthawk_sink_client_impl.h"
+#include "source/sink/sink_impl.h"
 
 namespace Nighthawk {
 
@@ -98,7 +98,7 @@ absl::Status mergeOutput(const nighthawk::client::Output& input_to_merge,
 }
 
 absl::StatusOr<nighthawk::client::ExecutionResponse>
-mergeExecutionResponses(absl::string_view requested_execution_id,
+mergeExecutionResponses(const std::string& requested_execution_id,
                         const std::vector<nighthawk::client::ExecutionResponse>& responses) {
   if (responses.size() == 0) {
     return absl::Status(absl::StatusCode::kNotFound, "No results");
@@ -106,7 +106,7 @@ mergeExecutionResponses(absl::string_view requested_execution_id,
 
   nighthawk::client::ExecutionResponse aggregated_response;
   nighthawk::client::Output aggregated_output;
-  aggregated_response.mutable_execution_id()->assign(requested_execution_id);
+  aggregated_response.set_execution_id(requested_execution_id);
   for (const nighthawk::client::ExecutionResponse& execution_response : responses) {
     if (execution_response.execution_id() != requested_execution_id) {
       return absl::Status(absl::StatusCode::kInternal,
diff --git a/source/sink/service_impl.h b/source/sink/service_impl.h
index d56cdbfbc..bec9e0a4b 100644
--- a/source/sink/service_impl.h
+++ b/source/sink/service_impl.h
@@ -27,7 +27,7 @@ namespace Nighthawk {
  * status in case sanity checks failed.
  */
 absl::StatusOr<nighthawk::client::ExecutionResponse>
-mergeExecutionResponses(absl::string_view execution_id,
+mergeExecutionResponses(const std::string& execution_id,
                         const std::vector<nighthawk::client::ExecutionResponse>& responses);
 
 /**
diff --git a/source/sink/sink_impl.cc b/source/sink/sink_impl.cc
index f7e9715d6..30a0ba91d 100644
--- a/source/sink/sink_impl.cc
+++ b/source/sink/sink_impl.cc
@@ -1,4 +1,4 @@
-#include "sink/sink_impl.h"
+#include "source/sink/sink_impl.h"
 
 #include <array>
 #include <filesystem>
diff --git a/test/adaptive_load/BUILD b/test/adaptive_load/BUILD
index 902e744b0..e254dfc3d 100644
--- a/test/adaptive_load/BUILD
+++ b/test/adaptive_load/BUILD
@@ -32,7 +32,7 @@ envoy_cc_test(
     repository = "@envoy",
     deps = [
         ":minimal_output",
-        "//include/nighthawk/adaptive_load:adaptive_load_controller",
+        "//nighthawk/adaptive_load:adaptive_load_controller",
         "//source/adaptive_load:adaptive_load_client_main",
         "//test/mocks/adaptive_load:mock_adaptive_load_controller",
         "//test/test_common:environment_lib",
@@ -50,8 +50,8 @@ envoy_cc_test(
     deps = [
         ":minimal_output",
         "//api/client:grpc_service_lib",
-        "//include/nighthawk/adaptive_load:input_variable_setter",
-        "//include/nighthawk/adaptive_load:step_controller",
+        "//nighthawk/adaptive_load:input_variable_setter",
+        "//nighthawk/adaptive_load:step_controller",
         "//source/adaptive_load:adaptive_load_controller_impl",
         "//source/adaptive_load:scoring_function_impl",
         "//source/adaptive_load:session_spec_proto_helper_impl",
diff --git a/test/adaptive_load/adaptive_load_client_main_test.cc b/test/adaptive_load/adaptive_load_client_main_test.cc
index 3ecef25bd..b904edb01 100644
--- a/test/adaptive_load/adaptive_load_client_main_test.cc
+++ b/test/adaptive_load/adaptive_load_client_main_test.cc
@@ -1,9 +1,8 @@
-#include "envoy/api/io_error.h"
-#include "envoy/filesystem/filesystem.h"
-
 #include "nighthawk/adaptive_load/adaptive_load_controller.h"
 #include "nighthawk/common/exception.h"
 
+#include "external/envoy/envoy/api/io_error.h"
+#include "external/envoy/envoy/filesystem/filesystem.h"
 #include "external/envoy/test/mocks/filesystem/mocks.h"
 #include "external/envoy/test/test_common/file_system_for_test.h"
 #include "external/envoy/test/test_common/utility.h"
@@ -11,12 +10,13 @@
 #include "api/adaptive_load/adaptive_load.pb.h"
 #include "api/adaptive_load/benchmark_result.pb.h"
 
+#include "source/adaptive_load/adaptive_load_client_main.h"
+
 #include "test/adaptive_load/minimal_output.h"
 #include "test/mocks/adaptive_load/mock_adaptive_load_controller.h"
 #include "test/test_common/environment.h"
 
 #include "absl/strings/string_view.h"
-#include "adaptive_load/adaptive_load_client_main.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
@@ -297,7 +297,7 @@ TEST(AdaptiveLoadClientMainTest, WritesOutputProtoToFile) {
   EXPECT_CALL(*mock_file, write_(_))
       .WillRepeatedly(Invoke(
           [&actual_outfile_contents](absl::string_view data) -> Envoy::Api::IoCallSizeResult {
-            actual_outfile_contents += data;
+            actual_outfile_contents += std::string(data);
             return Envoy::Api::IoCallSizeResult(
                 static_cast<ssize_t>(data.length()),
                 Envoy::Api::IoErrorPtr(nullptr, [](Envoy::Api::IoError*) {}));
diff --git a/test/adaptive_load/adaptive_load_controller_test.cc b/test/adaptive_load/adaptive_load_controller_test.cc
index 7c0320848..bad5ccf7f 100644
--- a/test/adaptive_load/adaptive_load_controller_test.cc
+++ b/test/adaptive_load/adaptive_load_controller_test.cc
@@ -1,7 +1,6 @@
 #include <chrono>
 
 #include "envoy/config/core/v3/base.pb.h"
-#include "envoy/registry/registry.h"
 
 #include "nighthawk/adaptive_load/adaptive_load_controller.h"
 #include "nighthawk/adaptive_load/input_variable_setter.h"
@@ -10,6 +9,7 @@
 #include "nighthawk/adaptive_load/scoring_function.h"
 #include "nighthawk/adaptive_load/step_controller.h"
 
+#include "external/envoy/envoy/registry/registry.h"
 #include "external/envoy/source/common/common/statusor.h"
 #include "external/envoy/source/common/config/utility.h"
 #include "external/envoy/source/common/protobuf/protobuf.h"
@@ -27,6 +27,12 @@
 #include "api/client/service.pb.h"
 #include "api/client/service_mock.grpc.pb.h"
 
+#include "source/adaptive_load/adaptive_load_controller_impl.h"
+#include "source/adaptive_load/metrics_plugin_impl.h"
+#include "source/adaptive_load/plugin_loader.h"
+#include "source/adaptive_load/scoring_function_impl.h"
+#include "source/adaptive_load/session_spec_proto_helper_impl.h"
+
 #include "test/adaptive_load/fake_plugins/fake_step_controller/fake_step_controller.h"
 #include "test/common/fake_time_source.h"
 #include "test/mocks/adaptive_load/mock_metrics_evaluator.h"
@@ -36,11 +42,6 @@
 #include "absl/container/flat_hash_map.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_join.h"
-#include "adaptive_load/adaptive_load_controller_impl.h"
-#include "adaptive_load/metrics_plugin_impl.h"
-#include "adaptive_load/plugin_loader.h"
-#include "adaptive_load/scoring_function_impl.h"
-#include "adaptive_load/session_spec_proto_helper_impl.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/test/adaptive_load/fake_plugins/fake_input_variable_setter/BUILD b/test/adaptive_load/fake_plugins/fake_input_variable_setter/BUILD
index 29d6a1381..7c3945cf1 100644
--- a/test/adaptive_load/fake_plugins/fake_input_variable_setter/BUILD
+++ b/test/adaptive_load/fake_plugins/fake_input_variable_setter/BUILD
@@ -34,7 +34,7 @@ envoy_cc_test_library(
     deps = [
         ":fake_input_variable_setter_proto_cc_proto",
         "//api/client:grpc_service_lib",
-        "//include/nighthawk/adaptive_load:input_variable_setter",
+        "//nighthawk/adaptive_load:input_variable_setter",
         "@envoy//source/common/common:assert_lib_with_external_headers",
         "@envoy//source/common/common:statusor_lib_with_external_headers",
         "@envoy//source/common/config:utility_lib_with_external_headers",
diff --git a/test/adaptive_load/fake_plugins/fake_input_variable_setter/fake_input_variable_setter.h b/test/adaptive_load/fake_plugins/fake_input_variable_setter/fake_input_variable_setter.h
index 5f3b75d97..236455afd 100644
--- a/test/adaptive_load/fake_plugins/fake_input_variable_setter/fake_input_variable_setter.h
+++ b/test/adaptive_load/fake_plugins/fake_input_variable_setter/fake_input_variable_setter.h
@@ -1,10 +1,10 @@
 
 #pragma once
 
-#include "envoy/registry/registry.h"
-
 #include "nighthawk/adaptive_load/input_variable_setter.h"
 
+#include "external/envoy/envoy/registry/registry.h"
+
 #include "api/client/options.pb.h"
 
 #include "test/adaptive_load/fake_plugins/fake_input_variable_setter/fake_input_variable_setter.pb.h"
diff --git a/test/adaptive_load/fake_plugins/fake_input_variable_setter/fake_input_variable_setter_test.cc b/test/adaptive_load/fake_plugins/fake_input_variable_setter/fake_input_variable_setter_test.cc
index f0b8a6a2e..85d6f61ce 100644
--- a/test/adaptive_load/fake_plugins/fake_input_variable_setter/fake_input_variable_setter_test.cc
+++ b/test/adaptive_load/fake_plugins/fake_input_variable_setter/fake_input_variable_setter_test.cc
@@ -1,13 +1,13 @@
-#include "envoy/registry/registry.h"
-
+#include "external/envoy/envoy/registry/registry.h"
 #include "external/envoy/source/common/config/utility.h"
 
 #include "api/adaptive_load/benchmark_result.pb.h"
 #include "api/client/options.pb.h"
 
+#include "source/adaptive_load/plugin_loader.h"
+
 #include "test/adaptive_load/fake_plugins/fake_input_variable_setter/fake_input_variable_setter.h"
 
-#include "adaptive_load/plugin_loader.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/test/adaptive_load/fake_plugins/fake_metrics_plugin/BUILD b/test/adaptive_load/fake_plugins/fake_metrics_plugin/BUILD
index c3ef7d364..24cfcfb51 100644
--- a/test/adaptive_load/fake_plugins/fake_metrics_plugin/BUILD
+++ b/test/adaptive_load/fake_plugins/fake_metrics_plugin/BUILD
@@ -33,7 +33,7 @@ envoy_cc_test_library(
     repository = "@envoy",
     deps = [
         ":fake_metrics_plugin_proto_cc_proto",
-        "//include/nighthawk/adaptive_load:metrics_plugin",
+        "//nighthawk/adaptive_load:metrics_plugin",
         "@envoy//source/common/common:assert_lib_with_external_headers",
         "@envoy//source/common/common:statusor_lib_with_external_headers",
         "@envoy//source/common/config:utility_lib_with_external_headers",
diff --git a/test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin.cc b/test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin.cc
index 1f1c6e694..c097af132 100644
--- a/test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin.cc
+++ b/test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin.cc
@@ -1,6 +1,6 @@
 #include "test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin.h"
 
-#include "envoy/common/exception.h"
+#include "external/envoy/envoy/common/exception.h"
 
 #include "api/adaptive_load/benchmark_result.pb.h"
 
diff --git a/test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin.h b/test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin.h
index 96c2e4446..91b84bec6 100644
--- a/test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin.h
+++ b/test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "envoy/registry/registry.h"
-
 #include "nighthawk/adaptive_load/metrics_plugin.h"
 
+#include "external/envoy/envoy/registry/registry.h"
+
 #include "api/client/options.pb.h"
 
 #include "test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin.pb.h"
diff --git a/test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin_test.cc b/test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin_test.cc
index 7b7ec0255..e44c804f2 100644
--- a/test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin_test.cc
+++ b/test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin_test.cc
@@ -1,14 +1,14 @@
-#include "envoy/registry/registry.h"
-
+#include "external/envoy/envoy/registry/registry.h"
 #include "external/envoy/source/common/config/utility.h"
 
 #include "api/adaptive_load/benchmark_result.pb.h"
 #include "api/client/options.pb.h"
 
+#include "source/adaptive_load/plugin_loader.h"
+
 #include "test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin.h"
 #include "test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin.pb.h"
 
-#include "adaptive_load/plugin_loader.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/test/adaptive_load/fake_plugins/fake_step_controller/BUILD b/test/adaptive_load/fake_plugins/fake_step_controller/BUILD
index aaad4aebb..561740c0e 100644
--- a/test/adaptive_load/fake_plugins/fake_step_controller/BUILD
+++ b/test/adaptive_load/fake_plugins/fake_step_controller/BUILD
@@ -34,8 +34,8 @@ envoy_cc_test_library(
     deps = [
         ":fake_step_controller_proto_cc_proto",
         "//api/client:grpc_service_lib",
-        "//include/nighthawk/adaptive_load:input_variable_setter",
-        "//include/nighthawk/adaptive_load:step_controller",
+        "//nighthawk/adaptive_load:input_variable_setter",
+        "//nighthawk/adaptive_load:step_controller",
         "@envoy//source/common/common:assert_lib_with_external_headers",
         "@envoy//source/common/common:statusor_lib_with_external_headers",
         "@envoy//source/common/config:utility_lib_with_external_headers",
diff --git a/test/adaptive_load/fake_plugins/fake_step_controller/fake_step_controller.h b/test/adaptive_load/fake_plugins/fake_step_controller/fake_step_controller.h
index c22f72826..07fd54f1e 100644
--- a/test/adaptive_load/fake_plugins/fake_step_controller/fake_step_controller.h
+++ b/test/adaptive_load/fake_plugins/fake_step_controller/fake_step_controller.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "envoy/registry/registry.h"
-
 #include "nighthawk/adaptive_load/step_controller.h"
 
+#include "external/envoy/envoy/registry/registry.h"
+
 #include "api/client/options.pb.h"
 #include "api/client/service.grpc.pb.h"
 
diff --git a/test/adaptive_load/fake_plugins/fake_step_controller/fake_step_controller_test.cc b/test/adaptive_load/fake_plugins/fake_step_controller/fake_step_controller_test.cc
index da9648a7f..82cac6cab 100644
--- a/test/adaptive_load/fake_plugins/fake_step_controller/fake_step_controller_test.cc
+++ b/test/adaptive_load/fake_plugins/fake_step_controller/fake_step_controller_test.cc
@@ -1,13 +1,13 @@
-#include "envoy/registry/registry.h"
-
+#include "external/envoy/envoy/registry/registry.h"
 #include "external/envoy/source/common/config/utility.h"
 
 #include "api/adaptive_load/benchmark_result.pb.h"
 #include "api/client/options.pb.h"
 
+#include "source/adaptive_load/plugin_loader.h"
+
 #include "test/adaptive_load/fake_plugins/fake_step_controller/fake_step_controller.h"
 
-#include "adaptive_load/plugin_loader.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/test/adaptive_load/input_variable_setter_test.cc b/test/adaptive_load/input_variable_setter_test.cc
index 7d0117ebf..c18fb3cee 100644
--- a/test/adaptive_load/input_variable_setter_test.cc
+++ b/test/adaptive_load/input_variable_setter_test.cc
@@ -1,6 +1,7 @@
 #include "external/envoy/source/common/config/utility.h"
 
-#include "adaptive_load/input_variable_setter_impl.h"
+#include "source/adaptive_load/input_variable_setter_impl.h"
+
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/test/adaptive_load/metrics_evaluator_test.cc b/test/adaptive_load/metrics_evaluator_test.cc
index 1bf632400..b3056ac3b 100644
--- a/test/adaptive_load/metrics_evaluator_test.cc
+++ b/test/adaptive_load/metrics_evaluator_test.cc
@@ -5,10 +5,11 @@
 #include "api/adaptive_load/scoring_function_impl.pb.h"
 #include "api/client/service.pb.h"
 
+#include "source/adaptive_load/metrics_evaluator_impl.h"
+
 #include "test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin.h"
 #include "test/adaptive_load/minimal_output.h"
 
-#include "adaptive_load/metrics_evaluator_impl.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/test/adaptive_load/metrics_plugin_test.cc b/test/adaptive_load/metrics_plugin_test.cc
index 8f8bce002..1b85b09eb 100644
--- a/test/adaptive_load/metrics_plugin_test.cc
+++ b/test/adaptive_load/metrics_plugin_test.cc
@@ -2,9 +2,10 @@
 
 #include "external/envoy/source/common/config/utility.h"
 
+#include "source/adaptive_load/metrics_plugin_impl.h"
+
 #include "test/adaptive_load/minimal_output.h"
 
-#include "adaptive_load/metrics_plugin_impl.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/test/adaptive_load/minimal_output.h b/test/adaptive_load/minimal_output.h
index 1ccb1aa62..39b295694 100644
--- a/test/adaptive_load/minimal_output.h
+++ b/test/adaptive_load/minimal_output.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "envoy/common/time.h"
+#include "external/envoy/envoy/common/time.h"
 
 #include "api/client/output.pb.h"
 
diff --git a/test/adaptive_load/plugin_loader_test.cc b/test/adaptive_load/plugin_loader_test.cc
index c5622e008..fc3c31e78 100644
--- a/test/adaptive_load/plugin_loader_test.cc
+++ b/test/adaptive_load/plugin_loader_test.cc
@@ -1,19 +1,20 @@
 #include "envoy/config/core/v3/base.pb.h"
-#include "envoy/registry/registry.h"
 
 #include "nighthawk/adaptive_load/input_variable_setter.h"
 #include "nighthawk/adaptive_load/metrics_plugin.h"
 #include "nighthawk/adaptive_load/scoring_function.h"
 #include "nighthawk/adaptive_load/step_controller.h"
 
+#include "external/envoy/envoy/registry/registry.h"
 #include "external/envoy/source/common/config/utility.h"
 
 #include "api/adaptive_load/benchmark_result.pb.h"
 #include "api/adaptive_load/scoring_function_impl.pb.h"
 #include "api/client/options.pb.h"
 
+#include "source/adaptive_load/plugin_loader.h"
+
 #include "absl/status/status.h"
-#include "adaptive_load/plugin_loader.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/test/adaptive_load/scoring_function_test.cc b/test/adaptive_load/scoring_function_test.cc
index c5eeb3a01..eeb0cb5ef 100644
--- a/test/adaptive_load/scoring_function_test.cc
+++ b/test/adaptive_load/scoring_function_test.cc
@@ -1,10 +1,10 @@
 #include <cmath>
 
-#include "envoy/common/exception.h"
-
+#include "external/envoy/envoy/common/exception.h"
 #include "external/envoy/source/common/config/utility.h"
 
-#include "adaptive_load/scoring_function_impl.h"
+#include "source/adaptive_load/scoring_function_impl.h"
+
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/test/adaptive_load/session_spec_proto_helper_test.cc b/test/adaptive_load/session_spec_proto_helper_test.cc
index 55c9a8dbd..25e7c96e1 100644
--- a/test/adaptive_load/session_spec_proto_helper_test.cc
+++ b/test/adaptive_load/session_spec_proto_helper_test.cc
@@ -1,15 +1,15 @@
-#include "envoy/registry/registry.h"
-
+#include "external/envoy/envoy/registry/registry.h"
 #include "external/envoy/source/common/config/utility.h"
 
 #include "api/adaptive_load/adaptive_load.pb.h"
 #include "api/adaptive_load/metric_spec.pb.h"
 #include "api/client/options.pb.h"
 
+#include "source/adaptive_load/plugin_loader.h"
+#include "source/adaptive_load/session_spec_proto_helper_impl.h"
+
 #include "test/adaptive_load/fake_plugins/fake_metrics_plugin/fake_metrics_plugin.h"
 
-#include "adaptive_load/plugin_loader.h"
-#include "adaptive_load/session_spec_proto_helper_impl.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
diff --git a/test/adaptive_load/step_controller_test.cc b/test/adaptive_load/step_controller_test.cc
index 678846b75..28fc97602 100644
--- a/test/adaptive_load/step_controller_test.cc
+++ b/test/adaptive_load/step_controller_test.cc
@@ -1,7 +1,6 @@
-#include "envoy/registry/registry.h"
-
 #include "nighthawk/adaptive_load/input_variable_setter.h"
 
+#include "external/envoy/envoy/registry/registry.h"
 #include "external/envoy/source/common/config/utility.h"
 
 #include "api/adaptive_load/benchmark_result.pb.h"
@@ -9,8 +8,9 @@
 #include "api/adaptive_load/step_controller_impl.pb.h"
 #include "api/client/options.pb.h"
 
-#include "adaptive_load/plugin_loader.h"
-#include "adaptive_load/step_controller_impl.h"
+#include "source/adaptive_load/plugin_loader.h"
+#include "source/adaptive_load/step_controller_impl.h"
+
 #include "fake_plugins/fake_input_variable_setter/fake_input_variable_setter.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/benchmark_http_client_test.cc b/test/benchmark_http_client_test.cc
index b473db323..ba5266de7 100644
--- a/test/benchmark_http_client_test.cc
+++ b/test/benchmark_http_client_test.cc
@@ -13,12 +13,11 @@
 #include "external/envoy/test/mocks/upstream/mocks.h"
 #include "external/envoy/test/test_common/network_utility.h"
 
-#include "common/request_impl.h"
-#include "common/statistic_impl.h"
-#include "common/uri_impl.h"
-#include "common/utility.h"
-
-#include "client/benchmark_client_impl.h"
+#include "source/client/benchmark_client_impl.h"
+#include "source/common/request_impl.h"
+#include "source/common/statistic_impl.h"
+#include "source/common/uri_impl.h"
+#include "source/common/utility.h"
 
 #include "gtest/gtest.h"
 
@@ -55,6 +54,7 @@ class BenchmarkClientHttpTest : public Test {
       : api_(Envoy::Api::createApiForTest(time_system_)),
         dispatcher_(api_->allocateDispatcher("test_thread")),
         cluster_manager_(std::make_unique<Envoy::Upstream::MockClusterManager>()),
+        pool_data_([]() {}, &pool_),
         cluster_info_(std::make_unique<Envoy::Upstream::MockClusterInfo>()),
         http_tracer_(std::make_unique<Envoy::Tracing::MockHttpTracer>()), response_code_("200"),
         statistic_(std::make_unique<StreamingStatistic>(), std::make_unique<StreamingStatistic>(),
@@ -70,7 +70,7 @@ class BenchmarkClientHttpTest : public Test {
     EXPECT_CALL(cluster_manager(), getThreadLocalCluster(_))
         .WillRepeatedly(Return(&thread_local_cluster_));
     EXPECT_CALL(thread_local_cluster_, info()).WillRepeatedly(Return(cluster_info_));
-    EXPECT_CALL(thread_local_cluster_, httpConnPool(_, _, _)).WillRepeatedly(Return(&pool_));
+    EXPECT_CALL(thread_local_cluster_, httpConnPool(_, _, _)).WillRepeatedly(Return(pool_data_));
 
     auto& tracer = static_cast<Envoy::Tracing::MockHttpTracer&>(*http_tracer_);
     EXPECT_CALL(tracer, startSpan_(_, _, _, _))
@@ -206,6 +206,7 @@ class BenchmarkClientHttpTest : public Test {
   std::unique_ptr<Client::BenchmarkClientHttpImpl> client_;
   Envoy::Upstream::ClusterManagerPtr cluster_manager_;
   Envoy::Http::ConnectionPool::MockInstance pool_;
+  Envoy::Upstream::HttpPoolData pool_data_;
   Envoy::ProcessWide process_wide;
   std::vector<Envoy::Http::ResponseDecoder*> decoders_;
   NiceMock<Envoy::Http::MockRequestEncoder> stream_encoder_;
diff --git a/test/client/utility.h b/test/client/utility.h
index 908712cff..0700643f6 100644
--- a/test/client/utility.h
+++ b/test/client/utility.h
@@ -3,7 +3,7 @@
 #include <memory>
 #include <vector>
 
-#include "client/options_impl.h"
+#include "source/client/options_impl.h"
 
 #include "absl/strings/string_view.h"
 
diff --git a/test/client_test.cc b/test/client_test.cc
index 549c065e7..9ecf4b6ff 100644
--- a/test/client_test.cc
+++ b/test/client_test.cc
@@ -3,7 +3,7 @@
 #include "external/envoy/test/test_common/environment.h"
 #include "external/envoy/test/test_common/utility.h"
 
-#include "client/client.h"
+#include "source/client/client.h"
 
 #include "test/client/utility.h"
 
diff --git a/test/client_worker_test.cc b/test/client_worker_test.cc
index e143b9635..c40522df9 100644
--- a/test/client_worker_test.cc
+++ b/test/client_worker_test.cc
@@ -1,8 +1,7 @@
 #include <functional>
 #include <thread>
 
-#include "envoy/upstream/cluster_manager.h"
-
+#include "external/envoy/envoy/upstream/cluster_manager.h"
 #include "external/envoy/source/common/common/random_generator.h"
 #include "external/envoy/source/common/runtime/runtime_impl.h"
 #include "external/envoy/source/common/stats/isolated_store_impl.h"
@@ -11,9 +10,8 @@
 #include "external/envoy/test/mocks/thread_local/mocks.h"
 #include "external/envoy/test/test_common/simulated_time_system.h"
 
-#include "common/statistic_impl.h"
-
-#include "client/client_worker_impl.h"
+#include "source/client/client_worker_impl.h"
+#include "source/common/statistic_impl.h"
 
 #include "test/mocks/client/mock_benchmark_client.h"
 #include "test/mocks/client/mock_benchmark_client_factory.h"
diff --git a/test/common/fake_time_source.h b/test/common/fake_time_source.h
index c28e045e8..855f51eb9 100644
--- a/test/common/fake_time_source.h
+++ b/test/common/fake_time_source.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "envoy/common/time.h"
+#include "external/envoy/envoy/common/time.h"
 
 namespace Nighthawk {
 /**
diff --git a/test/common/nighthawk_service_client_test.cc b/test/common/nighthawk_service_client_test.cc
index ed3c0a34c..358366334 100644
--- a/test/common/nighthawk_service_client_test.cc
+++ b/test/common/nighthawk_service_client_test.cc
@@ -4,7 +4,7 @@
 #include "api/client/service.grpc.pb.h"
 #include "api/client/service_mock.grpc.pb.h"
 
-#include "common/nighthawk_service_client_impl.h"
+#include "source/common/nighthawk_service_client_impl.h"
 
 #include "grpcpp/test/mock_stream.h"
 
diff --git a/test/common/signal_handler_test.cc b/test/common/signal_handler_test.cc
index cabb2251b..53cfb72c6 100644
--- a/test/common/signal_handler_test.cc
+++ b/test/common/signal_handler_test.cc
@@ -1,7 +1,7 @@
 #include <csignal>
 #include <future>
 
-#include "common/signal_handler.h"
+#include "source/common/signal_handler.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/distributor/distributor_service_test.cc b/test/distributor/distributor_service_test.cc
index 8e03eaafe..c7403b345 100644
--- a/test/distributor/distributor_service_test.cc
+++ b/test/distributor/distributor_service_test.cc
@@ -6,9 +6,8 @@
 
 #include "api/distributor/distributor.pb.h"
 
-#include "common/nighthawk_service_client_impl.h"
-
-#include "distributor/service_impl.h"
+#include "source/common/nighthawk_service_client_impl.h"
+#include "source/distributor/service_impl.h"
 
 #include "test/mocks/common/mock_nighthawk_service_client.h"
 
diff --git a/test/distributor/nighthawk_distributor_client_test.cc b/test/distributor/nighthawk_distributor_client_test.cc
index 8912faf9c..75e35b743 100644
--- a/test/distributor/nighthawk_distributor_client_test.cc
+++ b/test/distributor/nighthawk_distributor_client_test.cc
@@ -4,7 +4,7 @@
 #include "api/distributor/distributor.grpc.pb.h"
 #include "api/distributor/distributor_mock.grpc.pb.h"
 
-#include "distributor/nighthawk_distributor_client_impl.h"
+#include "source/distributor/nighthawk_distributor_client_impl.h"
 
 #include "grpcpp/test/mock_stream.h"
 
diff --git a/test/factories_test.cc b/test/factories_test.cc
index b1f9cec12..040f4e3f3 100644
--- a/test/factories_test.cc
+++ b/test/factories_test.cc
@@ -4,9 +4,8 @@
 #include "external/envoy/test/test_common/simulated_time_system.h"
 #include "external/envoy/test/test_common/utility.h"
 
-#include "common/request_source_impl.h"
-
-#include "client/factories_impl.h"
+#include "source/client/factories_impl.h"
+#include "source/common/request_source_impl.h"
 
 #include "test/mocks/client/mock_benchmark_client.h"
 #include "test/mocks/client/mock_options.h"
diff --git a/test/flush_worker_test.cc b/test/flush_worker_test.cc
index d9d2be38b..80014efca 100644
--- a/test/flush_worker_test.cc
+++ b/test/flush_worker_test.cc
@@ -11,7 +11,7 @@
 #include "external/envoy/test/mocks/stats/mocks.h"
 #include "external/envoy/test/mocks/thread_local/mocks.h"
 
-#include "client/flush_worker_impl.h"
+#include "source/client/flush_worker_impl.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/frequency_test.cc b/test/frequency_test.cc
index 6c3be3777..a0fb67afe 100644
--- a/test/frequency_test.cc
+++ b/test/frequency_test.cc
@@ -1,4 +1,4 @@
-#include "common/frequency.h"
+#include "source/common/frequency.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/mocks/adaptive_load/BUILD b/test/mocks/adaptive_load/BUILD
index 44402c141..895993ac4 100644
--- a/test/mocks/adaptive_load/BUILD
+++ b/test/mocks/adaptive_load/BUILD
@@ -14,7 +14,7 @@ envoy_cc_mock(
     hdrs = ["mock_adaptive_load_controller.h"],
     repository = "@envoy",
     deps = [
-        "//include/nighthawk/adaptive_load:adaptive_load_controller",
+        "//nighthawk/adaptive_load:adaptive_load_controller",
     ],
 )
 
@@ -24,7 +24,7 @@ envoy_cc_mock(
     hdrs = ["mock_metrics_evaluator.h"],
     repository = "@envoy",
     deps = [
-        "//include/nighthawk/adaptive_load:metrics_evaluator",
+        "//nighthawk/adaptive_load:metrics_evaluator",
     ],
 )
 
@@ -34,6 +34,6 @@ envoy_cc_mock(
     hdrs = ["mock_session_spec_proto_helper.h"],
     repository = "@envoy",
     deps = [
-        "//include/nighthawk/adaptive_load:session_spec_proto_helper",
+        "//nighthawk/adaptive_load:session_spec_proto_helper",
     ],
 )
diff --git a/test/mocks/client/BUILD b/test/mocks/client/BUILD
index b4736a835..d130745b0 100644
--- a/test/mocks/client/BUILD
+++ b/test/mocks/client/BUILD
@@ -14,7 +14,7 @@ envoy_cc_mock(
     hdrs = ["mock_options.h"],
     repository = "@envoy",
     deps = [
-        "//include/nighthawk/client:client_includes",
+        "//nighthawk/client:client_includes",
         "@envoy//source/common/protobuf:message_validator_lib_with_external_headers",
     ],
 )
@@ -25,7 +25,7 @@ envoy_cc_mock(
     hdrs = ["mock_benchmark_client.h"],
     repository = "@envoy",
     deps = [
-        "//include/nighthawk/client:client_includes",
+        "//nighthawk/client:client_includes",
     ],
 )
 
@@ -35,6 +35,6 @@ envoy_cc_mock(
     hdrs = ["mock_benchmark_client_factory.h"],
     repository = "@envoy",
     deps = [
-        "//include/nighthawk/client:client_includes",
+        "//nighthawk/client:client_includes",
     ],
 )
diff --git a/test/mocks/client/mock_benchmark_client_factory.h b/test/mocks/client/mock_benchmark_client_factory.h
index bddf91eb1..9a57052f6 100644
--- a/test/mocks/client/mock_benchmark_client_factory.h
+++ b/test/mocks/client/mock_benchmark_client_factory.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "envoy/api/api.h"
-#include "envoy/event/dispatcher.h"
-#include "envoy/upstream/cluster_manager.h"
-
 #include "nighthawk/client/factories.h"
 
+#include "external/envoy/envoy/api/api.h"
+#include "external/envoy/envoy/event/dispatcher.h"
+#include "external/envoy/envoy/upstream/cluster_manager.h"
+
 #include "gmock/gmock.h"
 
 namespace Nighthawk {
diff --git a/test/mocks/common/BUILD b/test/mocks/common/BUILD
index 9770301ae..397c7b8ea 100644
--- a/test/mocks/common/BUILD
+++ b/test/mocks/common/BUILD
@@ -14,7 +14,7 @@ envoy_cc_mock(
     hdrs = ["mock_nighthawk_service_client.h"],
     repository = "@envoy",
     deps = [
-        "//include/nighthawk/common:nighthawk_service_client",
+        "//nighthawk/common:nighthawk_service_client",
     ],
 )
 
@@ -24,7 +24,7 @@ envoy_cc_mock(
     hdrs = ["mock_rate_limiter.h"],
     repository = "@envoy",
     deps = [
-        "//include/nighthawk/common:base_includes",
+        "//nighthawk/common:base_includes",
     ],
 )
 
@@ -34,7 +34,7 @@ envoy_cc_mock(
     hdrs = ["mock_sequencer.h"],
     repository = "@envoy",
     deps = [
-        "//include/nighthawk/common:base_includes",
+        "//nighthawk/common:base_includes",
     ],
 )
 
@@ -44,7 +44,7 @@ envoy_cc_mock(
     hdrs = ["mock_sequencer_factory.h"],
     repository = "@envoy",
     deps = [
-        "//include/nighthawk/common:base_includes",
+        "//nighthawk/common:base_includes",
     ],
 )
 
@@ -54,7 +54,7 @@ envoy_cc_mock(
     hdrs = ["mock_termination_predicate.h"],
     repository = "@envoy",
     deps = [
-        "//include/nighthawk/common:base_includes",
+        "//nighthawk/common:base_includes",
     ],
 )
 
@@ -64,7 +64,7 @@ envoy_cc_mock(
     hdrs = ["mock_termination_predicate_factory.h"],
     repository = "@envoy",
     deps = [
-        "//include/nighthawk/common:base_includes",
+        "//nighthawk/common:base_includes",
     ],
 )
 
@@ -74,7 +74,7 @@ envoy_cc_mock(
     hdrs = ["mock_platform_util.h"],
     repository = "@envoy",
     deps = [
-        "//include/nighthawk/common:base_includes",
+        "//nighthawk/common:base_includes",
     ],
 )
 
@@ -84,7 +84,7 @@ envoy_cc_mock(
     hdrs = ["mock_request_source.h"],
     repository = "@envoy",
     deps = [
-        "//include/nighthawk/common:base_includes",
+        "//nighthawk/common:base_includes",
     ],
 )
 
@@ -94,6 +94,6 @@ envoy_cc_mock(
     hdrs = ["mock_request_source_factory.h"],
     repository = "@envoy",
     deps = [
-        "//include/nighthawk/common:base_includes",
+        "//nighthawk/common:base_includes",
     ],
 )
diff --git a/test/mocks/sink/BUILD b/test/mocks/sink/BUILD
index 5cb644514..1c1014c31 100644
--- a/test/mocks/sink/BUILD
+++ b/test/mocks/sink/BUILD
@@ -14,6 +14,6 @@ envoy_cc_mock(
     hdrs = ["mock_sink.h"],
     repository = "@envoy",
     deps = [
-        "//include/nighthawk/sink:sink_lib",
+        "//nighthawk/sink:sink_lib",
     ],
 )
diff --git a/test/options_test.cc b/test/options_test.cc
index 73a06ef92..d110d25f2 100644
--- a/test/options_test.cc
+++ b/test/options_test.cc
@@ -1,6 +1,6 @@
 #include "external/envoy/test/test_common/utility.h"
 
-#include "client/options_impl.h"
+#include "source/client/options_impl.h"
 
 #include "test/client/utility.h"
 #include "test/test_common/environment.h"
diff --git a/test/output_formatter_test.cc b/test/output_formatter_test.cc
index 6c720ea29..743cc6822 100644
--- a/test/output_formatter_test.cc
+++ b/test/output_formatter_test.cc
@@ -10,11 +10,10 @@
 #include "api/client/options.pb.h"
 #include "api/client/output.pb.h"
 
-#include "common/statistic_impl.h"
-#include "common/version_info.h"
-
-#include "client/output_collector_impl.h"
-#include "client/output_formatter_impl.h"
+#include "source/client/output_collector_impl.h"
+#include "source/client/output_formatter_impl.h"
+#include "source/common/statistic_impl.h"
+#include "source/common/version_info.h"
 
 #include "test_common/environment.h"
 
diff --git a/test/output_transform_main_test.cc b/test/output_transform_main_test.cc
index 14710e322..244884883 100644
--- a/test/output_transform_main_test.cc
+++ b/test/output_transform_main_test.cc
@@ -6,8 +6,8 @@
 
 #include "api/client/service.pb.h"
 
-#include "client/output_formatter_impl.h"
-#include "client/output_transform_main.h"
+#include "source/client/output_formatter_impl.h"
+#include "source/client/output_transform_main.h"
 
 #include "absl/strings/match.h"
 #include "gtest/gtest.h"
diff --git a/test/platform_util_test.cc b/test/platform_util_test.cc
index 777235161..32d0dd70c 100644
--- a/test/platform_util_test.cc
+++ b/test/platform_util_test.cc
@@ -1,6 +1,6 @@
 #include <chrono>
 
-#include "common/platform_util_impl.h"
+#include "source/common/platform_util_impl.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/process_test.cc b/test/process_test.cc
index 3b49916aa..76696a9a7 100644
--- a/test/process_test.cc
+++ b/test/process_test.cc
@@ -10,11 +10,10 @@
 #include "external/envoy/test/test_common/simulated_time_system.h"
 #include "external/envoy/test/test_common/utility.h"
 
-#include "common/uri_impl.h"
-
-#include "client/options_impl.h"
-#include "client/output_collector_impl.h"
-#include "client/process_impl.h"
+#include "source/client/options_impl.h"
+#include "source/client/output_collector_impl.h"
+#include "source/client/process_impl.h"
+#include "source/common/uri_impl.h"
 
 #include "test/client/utility.h"
 
diff --git a/test/rate_limiter_test.cc b/test/rate_limiter_test.cc
index 98f253365..963d12f7f 100644
--- a/test/rate_limiter_test.cc
+++ b/test/rate_limiter_test.cc
@@ -5,8 +5,8 @@
 
 #include "external/envoy/test/test_common/simulated_time_system.h"
 
-#include "common/frequency.h"
-#include "common/rate_limiter_impl.h"
+#include "source/common/frequency.h"
+#include "source/common/rate_limiter_impl.h"
 
 #include "test/mocks/common/mock_rate_limiter.h"
 
diff --git a/test/request_generator_test.cc b/test/request_generator_test.cc
index a61ccd3f8..2699fa8c9 100644
--- a/test/request_generator_test.cc
+++ b/test/request_generator_test.cc
@@ -2,7 +2,7 @@
 
 #include "external/envoy/test/test_common/utility.h"
 
-#include "common/request_source_impl.h"
+#include "source/common/request_source_impl.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/request_source/BUILD b/test/request_source/BUILD
index 27f619734..fcfb7a35b 100644
--- a/test/request_source/BUILD
+++ b/test/request_source/BUILD
@@ -26,7 +26,7 @@ envoy_cc_test_library(
     ],
     repository = "@envoy",
     deps = [
-        "//include/nighthawk/request_source:request_source_plugin_config_factory_lib",
+        "//nighthawk/request_source:request_source_plugin_config_factory_lib",
         "//source/common:nighthawk_common_lib",
         "//source/common:request_impl_lib",
         "//source/common:request_source_impl_lib",
diff --git a/test/request_source/request_source_plugin_test.cc b/test/request_source/request_source_plugin_test.cc
index 04140a92a..5f6d8d769 100644
--- a/test/request_source/request_source_plugin_test.cc
+++ b/test/request_source/request_source_plugin_test.cc
@@ -1,12 +1,11 @@
-#include "envoy/common/exception.h"
-
+#include "external/envoy/envoy/common/exception.h"
 #include "external/envoy/source/common/config/utility.h"
 #include "external/envoy/test/mocks/api/mocks.h"
 #include "external/envoy/test/mocks/stats/mocks.h"
 #include "external/envoy/test/test_common/file_system_for_test.h"
 #include "external/envoy/test/test_common/utility.h"
 
-#include "request_source/request_options_list_plugin_impl.h"
+#include "source/request_source/request_options_list_plugin_impl.h"
 
 #include "test/request_source/stub_plugin_impl.h"
 #include "test/test_common/environment.h"
@@ -23,9 +22,9 @@ using nighthawk::request_source::StubPluginConfig;
 using ::testing::NiceMock;
 using ::testing::Test;
 nighthawk::request_source::FileBasedOptionsListRequestSourceConfig
-MakeFileBasedPluginConfigWithTestYaml(absl::string_view request_file) {
+MakeFileBasedPluginConfigWithTestYaml(const std::string& request_file) {
   nighthawk::request_source::FileBasedOptionsListRequestSourceConfig config;
-  config.mutable_file_path()->assign(request_file);
+  config.set_file_path(request_file);
   config.mutable_max_file_size()->set_value(4000);
   return config;
 }
diff --git a/test/request_source/stub_plugin_impl.cc b/test/request_source/stub_plugin_impl.cc
index 7ca882263..cb2f436a9 100644
--- a/test/request_source/stub_plugin_impl.cc
+++ b/test/request_source/stub_plugin_impl.cc
@@ -6,8 +6,8 @@
 
 #include "api/client/options.pb.h"
 
-#include "common/request_impl.h"
-#include "common/request_source_impl.h"
+#include "source/common/request_impl.h"
+#include "source/common/request_source_impl.h"
 
 namespace Nighthawk {
 
diff --git a/test/request_source/stub_plugin_impl.h b/test/request_source/stub_plugin_impl.h
index b45e64c9e..66923d23f 100644
--- a/test/request_source/stub_plugin_impl.h
+++ b/test/request_source/stub_plugin_impl.h
@@ -2,14 +2,14 @@
 // functionality for testing purposes.
 #pragma once
 
-#include "envoy/registry/registry.h"
-
 #include "nighthawk/request_source/request_source_plugin_config_factory.h"
 
+#include "external/envoy/envoy/registry/registry.h"
+
 #include "api/client/options.pb.h"
 #include "api/request_source/request_source_plugin.pb.h"
 
-#include "common/uri_impl.h"
+#include "source/common/uri_impl.h"
 
 namespace Nighthawk {
 
diff --git a/test/request_stream_grpc_client_test.cc b/test/request_stream_grpc_client_test.cc
index b78b32f32..1cab8512f 100644
--- a/test/request_stream_grpc_client_test.cc
+++ b/test/request_stream_grpc_client_test.cc
@@ -5,8 +5,8 @@
 
 #include "api/request_source/service.pb.h"
 
-#include "common/request_impl.h"
-#include "common/request_stream_grpc_client_impl.h"
+#include "source/common/request_impl.h"
+#include "source/common/request_stream_grpc_client_impl.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/sequencer_test.cc b/test/sequencer_test.cc
index b87f1730f..96da3e4f1 100644
--- a/test/sequencer_test.cc
+++ b/test/sequencer_test.cc
@@ -9,9 +9,9 @@
 #include "external/envoy/test/mocks/event/mocks.h"
 #include "external/envoy/test/test_common/simulated_time_system.h"
 
-#include "common/rate_limiter_impl.h"
-#include "common/sequencer_impl.h"
-#include "common/statistic_impl.h"
+#include "source/common/rate_limiter_impl.h"
+#include "source/common/sequencer_impl.h"
+#include "source/common/statistic_impl.h"
 
 #include "test/mocks/common/mock_platform_util.h"
 #include "test/mocks/common/mock_rate_limiter.h"
diff --git a/test/server/configuration_test.cc b/test/server/configuration_test.cc
index f0c1d9458..4290c6aaf 100644
--- a/test/server/configuration_test.cc
+++ b/test/server/configuration_test.cc
@@ -5,7 +5,7 @@
 
 #include "api/server/response_options.pb.validate.h"
 
-#include "server/configuration.h"
+#include "source/server/configuration.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/server/http_dynamic_delay_filter_integration_test.cc b/test/server/http_dynamic_delay_filter_integration_test.cc
index 05964b581..5f5d1ceec 100644
--- a/test/server/http_dynamic_delay_filter_integration_test.cc
+++ b/test/server/http_dynamic_delay_filter_integration_test.cc
@@ -2,8 +2,8 @@
 
 #include "api/server/response_options.pb.h"
 
-#include "server/configuration.h"
-#include "server/http_dynamic_delay_filter.h"
+#include "source/server/configuration.h"
+#include "source/server/http_dynamic_delay_filter.h"
 
 #include "test/server/http_filter_integration_test_base.h"
 
diff --git a/test/server/http_filter_base_test.cc b/test/server/http_filter_base_test.cc
index 3dec16a27..23eeacf35 100644
--- a/test/server/http_filter_base_test.cc
+++ b/test/server/http_filter_base_test.cc
@@ -1,6 +1,6 @@
-#include "server/http_dynamic_delay_filter.h"
-#include "server/http_test_server_filter.h"
-#include "server/http_time_tracking_filter.h"
+#include "source/server/http_dynamic_delay_filter.h"
+#include "source/server/http_test_server_filter.h"
+#include "source/server/http_time_tracking_filter.h"
 
 #include "test/server/http_filter_integration_test_base.h"
 
diff --git a/test/server/http_filter_integration_test_base.cc b/test/server/http_filter_integration_test_base.cc
index a05e6bd45..6de0c3a73 100644
--- a/test/server/http_filter_integration_test_base.cc
+++ b/test/server/http_filter_integration_test_base.cc
@@ -1,6 +1,6 @@
 #include "test/server/http_filter_integration_test_base.h"
 
-#include "server/well_known_headers.h"
+#include "source/server/well_known_headers.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/server/http_test_server_filter_integration_test.cc b/test/server/http_test_server_filter_integration_test.cc
index 752697513..69ddd1264 100644
--- a/test/server/http_test_server_filter_integration_test.cc
+++ b/test/server/http_test_server_filter_integration_test.cc
@@ -1,8 +1,8 @@
 #include "api/server/response_options.pb.h"
 #include "api/server/response_options.pb.validate.h"
 
-#include "server/configuration.h"
-#include "server/http_test_server_filter.h"
+#include "source/server/configuration.h"
+#include "source/server/http_test_server_filter.h"
 
 #include "test/server/http_filter_integration_test_base.h"
 
diff --git a/test/server/http_time_tracking_filter_integration_test.cc b/test/server/http_time_tracking_filter_integration_test.cc
index c49c343f4..7ea03f46f 100644
--- a/test/server/http_time_tracking_filter_integration_test.cc
+++ b/test/server/http_time_tracking_filter_integration_test.cc
@@ -5,8 +5,8 @@
 #include "api/server/response_options.pb.h"
 #include "api/server/response_options.pb.validate.h"
 
-#include "server/configuration.h"
-#include "server/http_time_tracking_filter.h"
+#include "source/server/configuration.h"
+#include "source/server/http_time_tracking_filter.h"
 
 #include "test/server/http_filter_integration_test_base.h"
 
diff --git a/test/service_main_test.cc b/test/service_main_test.cc
index b36d3db18..b22f75ef6 100644
--- a/test/service_main_test.cc
+++ b/test/service_main_test.cc
@@ -6,7 +6,7 @@
 #include "external/envoy/test/test_common/network_utility.h"
 #include "external/envoy/test/test_common/utility.h"
 
-#include "client/service_main.h"
+#include "source/client/service_main.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/service_test.cc b/test/service_test.cc
index 3350d2dbb..06ddadc3e 100644
--- a/test/service_test.cc
+++ b/test/service_test.cc
@@ -10,7 +10,7 @@
 
 #include "api/client/service.pb.h"
 
-#include "client/service_impl.h"
+#include "source/client/service_impl.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/sink/nighthawk_sink_client_test.cc b/test/sink/nighthawk_sink_client_test.cc
index a7160b943..c5939379b 100644
--- a/test/sink/nighthawk_sink_client_test.cc
+++ b/test/sink/nighthawk_sink_client_test.cc
@@ -4,7 +4,7 @@
 #include "api/sink/sink.grpc.pb.h"
 #include "api/sink/sink_mock.grpc.pb.h"
 
-#include "sink/nighthawk_sink_client_impl.h"
+#include "source/sink/nighthawk_sink_client_impl.h"
 
 #include "grpcpp/test/mock_stream.h"
 
diff --git a/test/sink/sink_service_test.cc b/test/sink/sink_service_test.cc
index e6512d3fa..173a80ab5 100644
--- a/test/sink/sink_service_test.cc
+++ b/test/sink/sink_service_test.cc
@@ -8,7 +8,7 @@
 
 #include "api/sink/sink.pb.h"
 
-#include "sink/service_impl.h"
+#include "source/sink/service_impl.h"
 
 #include "test/mocks/sink/mock_sink.h"
 
diff --git a/test/sink/sink_test.cc b/test/sink/sink_test.cc
index 534c93da2..a1bbe0f63 100644
--- a/test/sink/sink_test.cc
+++ b/test/sink/sink_test.cc
@@ -3,7 +3,7 @@
 
 #include "external/envoy/source/common/common/random_generator.h"
 
-#include "sink/sink_impl.h"
+#include "source/sink/sink_impl.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
diff --git a/test/sni_utility_test.cc b/test/sni_utility_test.cc
index 4cbae3b2a..380c6a018 100644
--- a/test/sni_utility_test.cc
+++ b/test/sni_utility_test.cc
@@ -1,8 +1,7 @@
 #include "external/envoy/test/test_common/utility.h"
 
-#include "common/uri_impl.h"
-
-#include "client/sni_utility.h"
+#include "source/client/sni_utility.h"
+#include "source/common/uri_impl.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/statistic_test.cc b/test/statistic_test.cc
index a26461608..15a97632f 100644
--- a/test/statistic_test.cc
+++ b/test/statistic_test.cc
@@ -11,7 +11,7 @@
 #include "external/envoy/test/test_common/file_system_for_test.h"
 #include "external/envoy/test/test_common/utility.h"
 
-#include "common/statistic_impl.h"
+#include "source/common/statistic_impl.h"
 
 #include "test/test_common/environment.h"
 
diff --git a/test/stopwatch_test.cc b/test/stopwatch_test.cc
index e7d2b030e..2fb5c016b 100644
--- a/test/stopwatch_test.cc
+++ b/test/stopwatch_test.cc
@@ -6,7 +6,7 @@
 #include "external/envoy/test/test_common/simulated_time_system.h"
 #include "external/envoy/test/test_common/utility.h"
 
-#include "common/thread_safe_monotonic_time_stopwatch.h"
+#include "source/common/thread_safe_monotonic_time_stopwatch.h"
 
 #include "test/common/fake_time_source.h"
 
diff --git a/test/stream_decoder_test.cc b/test/stream_decoder_test.cc
index 8614f4f32..05c4293c5 100644
--- a/test/stream_decoder_test.cc
+++ b/test/stream_decoder_test.cc
@@ -8,9 +8,8 @@
 #include "external/envoy/test/mocks/http/mocks.h"
 #include "external/envoy/test/mocks/stream_info/mocks.h"
 
-#include "common/statistic_impl.h"
-
-#include "client/stream_decoder.h"
+#include "source/client/stream_decoder.h"
+#include "source/common/statistic_impl.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/termination_predicate_test.cc b/test/termination_predicate_test.cc
index 4ab0bab53..1fb9a4af6 100644
--- a/test/termination_predicate_test.cc
+++ b/test/termination_predicate_test.cc
@@ -5,7 +5,7 @@
 #include "external/envoy/test/test_common/simulated_time_system.h"
 #include "external/envoy/test/test_common/utility.h"
 
-#include "common/termination_predicate_impl.h"
+#include "source/common/termination_predicate_impl.h"
 
 #include "gtest/gtest.h"
 
diff --git a/test/utility_test.cc b/test/utility_test.cc
index 82c5d3324..e9f1a1d13 100644
--- a/test/utility_test.cc
+++ b/test/utility_test.cc
@@ -4,8 +4,8 @@
 #include "external/envoy/source/common/stats/isolated_store_impl.h"
 #include "external/envoy/test/test_common/utility.h"
 
-#include "common/uri_impl.h"
-#include "common/utility.h"
+#include "source/common/uri_impl.h"
+#include "source/common/utility.h"
 
 #include "test/test_common/environment.h"
 
diff --git a/test/worker_test.cc b/test/worker_test.cc
index b0fb2a280..8eb86a46f 100644
--- a/test/worker_test.cc
+++ b/test/worker_test.cc
@@ -7,7 +7,7 @@
 #include "external/envoy/test/mocks/protobuf/mocks.h"
 #include "external/envoy/test/mocks/thread_local/mocks.h"
 
-#include "common/worker_impl.h"
+#include "source/common/worker_impl.h"
 
 #include "gtest/gtest.h"