diff --git a/perf_tests/test_2dhalo.cpp b/perf_tests/test_2dhalo.cpp
index 3c67e901..4cb4f324 100644
--- a/perf_tests/test_2dhalo.cpp
+++ b/perf_tests/test_2dhalo.cpp
@@ -16,7 +16,7 @@
 
 #include "test_utils.hpp"
 
-#include "KokkosComm.hpp"
+#include "KokkosComm/KokkosComm.hpp"
 
 #include <iostream>
 
diff --git a/perf_tests/test_main.cpp b/perf_tests/test_main.cpp
index 4a78cab0..cc087348 100644
--- a/perf_tests/test_main.cpp
+++ b/perf_tests/test_main.cpp
@@ -14,7 +14,7 @@
 //
 //@HEADER
 
-#include "mpi/impl/KokkosComm_include_mpi.hpp"
+#include "KokkosComm/mpi/impl/include_mpi.hpp"
 
 #include <Kokkos_Core.hpp>
 #include <benchmark/benchmark.h>
diff --git a/perf_tests/test_osu_latency.cpp b/perf_tests/test_osu_latency.cpp
index a6628ed0..e9ce1f0f 100644
--- a/perf_tests/test_osu_latency.cpp
+++ b/perf_tests/test_osu_latency.cpp
@@ -19,7 +19,7 @@
 // (NBCL), The Ohio State University.
 
 #include "test_utils.hpp"
-#include "KokkosComm.hpp"
+#include "KokkosComm/KokkosComm.hpp"
 
 template <typename Space, typename View>
 void osu_latency_Kokkos_Comm_sendrecv(benchmark::State &, MPI_Comm, KokkosComm::Handle<> &h, const View &v) {
diff --git a/perf_tests/test_sendrecv.cpp b/perf_tests/test_sendrecv.cpp
index 11fb220e..c81ae24f 100644
--- a/perf_tests/test_sendrecv.cpp
+++ b/perf_tests/test_sendrecv.cpp
@@ -16,7 +16,7 @@
 
 #include "test_utils.hpp"
 
-#include "KokkosComm.hpp"
+#include "KokkosComm/KokkosComm.hpp"
 
 template <KokkosComm::mpi::CommunicationMode Mode, typename Space, typename View>
 void send_recv(benchmark::State &, MPI_Comm comm, const Space &space, int rank, const View &v) {
diff --git a/perf_tests/test_utils.hpp b/perf_tests/test_utils.hpp
index 5df3b826..c022f91c 100644
--- a/perf_tests/test_utils.hpp
+++ b/perf_tests/test_utils.hpp
@@ -20,7 +20,7 @@
 
 #include <benchmark/benchmark.h>
 
-#include "mpi/impl/KokkosComm_include_mpi.hpp"
+#include "KokkosComm/mpi/impl/include_mpi.hpp"
 
 // F is a function that takes (state, MPI_Comm, args...)
 template <typename F, typename... Args>
diff --git a/src/KokkosComm.hpp b/src/KokkosComm/KokkosComm.hpp
similarity index 61%
rename from src/KokkosComm.hpp
rename to src/KokkosComm/KokkosComm.hpp
index cdb33a43..b69f58bc 100644
--- a/src/KokkosComm.hpp
+++ b/src/KokkosComm/KokkosComm.hpp
@@ -16,28 +16,28 @@
 
 #pragma once
 
-#include "KokkosComm_fwd.hpp"
+#include "fwd.hpp"
 
 // transport declarations
 // TODO: could probably be moved to a per-transport file to be included
 #if defined(KOKKOSCOMM_ENABLE_MPI)
-#include "mpi/KokkosComm_mpi.hpp"
-#include "mpi/KokkosComm_mpi_send.hpp"
-#include "mpi/KokkosComm_mpi_allgather.hpp"
-#include "mpi/KokkosComm_mpi_alltoall.hpp"
-#include "mpi/KokkosComm_mpi_barrier.hpp"
-#include "mpi/KokkosComm_mpi_handle.hpp"
-#include "mpi/KokkosComm_mpi_irecv.hpp"
-#include "mpi/KokkosComm_mpi_isend.hpp"
-#include "mpi/KokkosComm_mpi_recv.hpp"
-#include "mpi/KokkosComm_mpi_reduce.hpp"
+#include "mpi/mpi.hpp"
+#include "mpi/send.hpp"
+#include "mpi/allgather.hpp"
+#include "mpi/alltoall.hpp"
+#include "mpi/barrier.hpp"
+#include "mpi/handle.hpp"
+#include "mpi/irecv.hpp"
+#include "mpi/isend.hpp"
+#include "mpi/recv.hpp"
+#include "mpi/reduce.hpp"
 #else
 #error at least one transport must be defined
 #endif
 
-#include "KokkosComm_concepts.hpp"
-#include "KokkosComm_point_to_point.hpp"
-#include "KokkosComm_collective.hpp"
+#include "concepts.hpp"
+#include "point_to_point.hpp"
+#include "collective.hpp"
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/KokkosComm_collective.hpp b/src/KokkosComm/collective.hpp
similarity index 93%
rename from src/KokkosComm_collective.hpp
rename to src/KokkosComm/collective.hpp
index 3e2f6e6a..c7125c0c 100644
--- a/src/KokkosComm_collective.hpp
+++ b/src/KokkosComm/collective.hpp
@@ -20,8 +20,8 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "KokkosComm_fwd.hpp"
-#include "KokkosComm_concepts.hpp"
+#include "fwd.hpp"
+#include "concepts.hpp"
 
 namespace KokkosComm {
 
diff --git a/src/KokkosComm_comm_modes.hpp b/src/KokkosComm/comm_modes.hpp
similarity index 100%
rename from src/KokkosComm_comm_modes.hpp
rename to src/KokkosComm/comm_modes.hpp
diff --git a/src/KokkosComm_concepts.hpp b/src/KokkosComm/concepts.hpp
similarity index 100%
rename from src/KokkosComm_concepts.hpp
rename to src/KokkosComm/concepts.hpp
diff --git a/src/KokkosComm_fwd.hpp b/src/KokkosComm/fwd.hpp
similarity index 97%
rename from src/KokkosComm_fwd.hpp
rename to src/KokkosComm/fwd.hpp
index 354056b1..0bd3c255 100644
--- a/src/KokkosComm_fwd.hpp
+++ b/src/KokkosComm/fwd.hpp
@@ -18,7 +18,7 @@
 
 #include <vector>
 
-#include "KokkosComm_concepts.hpp"
+#include "concepts.hpp"
 #include "KokkosComm_config.hpp"
 
 namespace KokkosComm {
diff --git a/src/impl/KokkosComm_contiguous.hpp b/src/KokkosComm/impl/KokkosComm_contiguous.hpp
similarity index 97%
rename from src/impl/KokkosComm_contiguous.hpp
rename to src/KokkosComm/impl/KokkosComm_contiguous.hpp
index 65ff9cfd..4caa7f10 100644
--- a/src/impl/KokkosComm_contiguous.hpp
+++ b/src/KokkosComm/impl/KokkosComm_contiguous.hpp
@@ -20,8 +20,8 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "KokkosComm_concepts.hpp"
-#include "KokkosComm_traits.hpp"
+#include "concepts.hpp"
+#include "traits.hpp"
 
 namespace KokkosComm::Impl {
 
diff --git a/src/mpi/KokkosComm_mpi_allgather.hpp b/src/KokkosComm/mpi/allgather.hpp
similarity index 95%
rename from src/mpi/KokkosComm_mpi_allgather.hpp
rename to src/KokkosComm/mpi/allgather.hpp
index f248d058..f3e930dc 100644
--- a/src/mpi/KokkosComm_mpi_allgather.hpp
+++ b/src/KokkosComm/mpi/allgather.hpp
@@ -18,10 +18,10 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "KokkosComm_traits.hpp"
-#include "impl/KokkosComm_pack_traits.hpp"
-#include "impl/KokkosComm_include_mpi.hpp"
-#include "impl/KokkosComm_types.hpp"
+#include "KokkosComm/traits.hpp"
+#include "impl/pack_traits.hpp"
+#include "impl/include_mpi.hpp"
+#include "impl/types.hpp"
 
 namespace KokkosComm::mpi {
 
diff --git a/src/mpi/KokkosComm_mpi_alltoall.hpp b/src/KokkosComm/mpi/alltoall.hpp
similarity index 96%
rename from src/mpi/KokkosComm_mpi_alltoall.hpp
rename to src/KokkosComm/mpi/alltoall.hpp
index a2bdf7d3..b2b29512 100644
--- a/src/mpi/KokkosComm_mpi_alltoall.hpp
+++ b/src/KokkosComm/mpi/alltoall.hpp
@@ -36,10 +36,10 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "KokkosComm_traits.hpp"
-#include "impl/KokkosComm_pack_traits.hpp"
-#include "impl/KokkosComm_include_mpi.hpp"
-#include "impl/KokkosComm_types.hpp"
+#include "KokkosComm/traits.hpp"
+#include "impl/pack_traits.hpp"
+#include "impl/include_mpi.hpp"
+#include "impl/types.hpp"
 
 namespace KokkosComm::Impl {
 template <KokkosExecutionSpace ExecSpace, KokkosView SendView, KokkosView RecvView>
diff --git a/src/mpi/KokkosComm_mpi_barrier.hpp b/src/KokkosComm/mpi/barrier.hpp
similarity index 96%
rename from src/mpi/KokkosComm_mpi_barrier.hpp
rename to src/KokkosComm/mpi/barrier.hpp
index 58beb4bd..736f5c86 100644
--- a/src/mpi/KokkosComm_mpi_barrier.hpp
+++ b/src/KokkosComm/mpi/barrier.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "KokkosComm_concepts.hpp"
+#include "KokkosComm/concepts.hpp"
 
 namespace KokkosComm {
 
diff --git a/src/mpi/KokkosComm_mpi_commmode.hpp b/src/KokkosComm/mpi/commmode.hpp
similarity index 100%
rename from src/mpi/KokkosComm_mpi_commmode.hpp
rename to src/KokkosComm/mpi/commmode.hpp
diff --git a/src/mpi/KokkosComm_mpi_handle.hpp b/src/KokkosComm/mpi/handle.hpp
similarity index 95%
rename from src/mpi/KokkosComm_mpi_handle.hpp
rename to src/KokkosComm/mpi/handle.hpp
index b4633da4..192beeb5 100644
--- a/src/mpi/KokkosComm_mpi_handle.hpp
+++ b/src/KokkosComm/mpi/handle.hpp
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include "KokkosComm_fwd.hpp"
+#include "KokkosComm/fwd.hpp"
 
-#include "KokkosComm_mpi_req.hpp"
+#include "req.hpp"
 
 namespace KokkosComm {
 
diff --git a/src/mpi/impl/KokkosComm_include_mpi.hpp b/src/KokkosComm/mpi/impl/include_mpi.hpp
similarity index 100%
rename from src/mpi/impl/KokkosComm_include_mpi.hpp
rename to src/KokkosComm/mpi/impl/include_mpi.hpp
diff --git a/src/mpi/impl/KokkosComm_pack_traits.hpp b/src/KokkosComm/mpi/impl/pack_traits.hpp
similarity index 90%
rename from src/mpi/impl/KokkosComm_pack_traits.hpp
rename to src/KokkosComm/mpi/impl/pack_traits.hpp
index 8f1610c3..e5c8c0cb 100644
--- a/src/mpi/impl/KokkosComm_pack_traits.hpp
+++ b/src/KokkosComm/mpi/impl/pack_traits.hpp
@@ -16,10 +16,10 @@
 
 #pragma once
 
-#include "KokkosComm_traits.hpp"
-#include "KokkosComm_concepts.hpp"
+#include "KokkosComm/traits.hpp"
+#include "KokkosComm/concepts.hpp"
 
-#include "KokkosComm_packer.hpp"
+#include "packer.hpp"
 
 namespace KokkosComm {
 
diff --git a/src/mpi/impl/KokkosComm_packer.hpp b/src/KokkosComm/mpi/impl/packer.hpp
similarity index 96%
rename from src/mpi/impl/KokkosComm_packer.hpp
rename to src/KokkosComm/mpi/impl/packer.hpp
index 56d43c88..e972d6ad 100644
--- a/src/mpi/impl/KokkosComm_packer.hpp
+++ b/src/KokkosComm/mpi/impl/packer.hpp
@@ -16,10 +16,10 @@
 
 #pragma once
 
-#include "KokkosComm_concepts.hpp"
-#include "KokkosComm_traits.hpp"
-#include "KokkosComm_types.hpp"
-#include "KokkosComm_include_mpi.hpp"
+#include "KokkosComm/concepts.hpp"
+#include "KokkosComm/traits.hpp"
+#include "types.hpp"
+#include "include_mpi.hpp"
 
 // todo: redo this using KokkosComm_contiguous
 
diff --git a/src/mpi/impl/KokkosComm_tags.hpp b/src/KokkosComm/mpi/impl/tags.hpp
similarity index 100%
rename from src/mpi/impl/KokkosComm_tags.hpp
rename to src/KokkosComm/mpi/impl/tags.hpp
diff --git a/src/mpi/impl/KokkosComm_types.hpp b/src/KokkosComm/mpi/impl/types.hpp
similarity index 99%
rename from src/mpi/impl/KokkosComm_types.hpp
rename to src/KokkosComm/mpi/impl/types.hpp
index 4e46ce70..a2b798db 100644
--- a/src/mpi/impl/KokkosComm_types.hpp
+++ b/src/KokkosComm/mpi/impl/types.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "KokkosComm_include_mpi.hpp"
+#include "include_mpi.hpp"
 
 #include <Kokkos_Core.hpp>
 
diff --git a/src/mpi/KokkosComm_mpi_irecv.hpp b/src/KokkosComm/mpi/irecv.hpp
similarity index 97%
rename from src/mpi/KokkosComm_mpi_irecv.hpp
rename to src/KokkosComm/mpi/irecv.hpp
index 1881957c..cd167a9c 100644
--- a/src/mpi/KokkosComm_mpi_irecv.hpp
+++ b/src/KokkosComm/mpi/irecv.hpp
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "KokkosComm_mpi.hpp"
-#include "impl/KokkosComm_tags.hpp"
+#include "mpi.hpp"
+#include "impl/tags.hpp"
 
 namespace KokkosComm {
 
diff --git a/src/mpi/KokkosComm_mpi_isend.hpp b/src/KokkosComm/mpi/isend.hpp
similarity index 95%
rename from src/mpi/KokkosComm_mpi_isend.hpp
rename to src/KokkosComm/mpi/isend.hpp
index ef8f542d..09b301b7 100644
--- a/src/mpi/KokkosComm_mpi_isend.hpp
+++ b/src/KokkosComm/mpi/isend.hpp
@@ -16,12 +16,12 @@
 
 #pragma once
 
-#include "KokkosComm_traits.hpp"
+#include "KokkosComm/traits.hpp"
 
-#include "KokkosComm_mpi.hpp"
-#include "impl/KokkosComm_types.hpp"
-#include "impl/KokkosComm_tags.hpp"
-#include "KokkosComm_mpi_commmode.hpp"
+#include "mpi.hpp"
+#include "impl/types.hpp"
+#include "impl/tags.hpp"
+#include "commmode.hpp"
 
 namespace KokkosComm {
 
diff --git a/src/mpi/KokkosComm_mpi.hpp b/src/KokkosComm/mpi/mpi.hpp
similarity index 93%
rename from src/mpi/KokkosComm_mpi.hpp
rename to src/KokkosComm/mpi/mpi.hpp
index c6db892a..9a484db1 100644
--- a/src/mpi/KokkosComm_mpi.hpp
+++ b/src/KokkosComm/mpi/mpi.hpp
@@ -18,8 +18,8 @@
 
 #include <type_traits>
 
-#include "KokkosComm_concepts.hpp"
-#include "impl/KokkosComm_include_mpi.hpp"
+#include "../concepts.hpp"
+#include "impl/include_mpi.hpp"
 
 namespace KokkosComm {
 
diff --git a/src/mpi/KokkosComm_mpi_recv.hpp b/src/KokkosComm/mpi/recv.hpp
similarity index 93%
rename from src/mpi/KokkosComm_mpi_recv.hpp
rename to src/KokkosComm/mpi/recv.hpp
index d04d9625..10a9c97a 100644
--- a/src/mpi/KokkosComm_mpi_recv.hpp
+++ b/src/KokkosComm/mpi/recv.hpp
@@ -18,10 +18,10 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "KokkosComm_concepts.hpp"
-#include "KokkosComm_traits.hpp"
-#include "impl/KokkosComm_pack_traits.hpp"
-#include "impl/KokkosComm_include_mpi.hpp"
+#include "KokkosComm/concepts.hpp"
+#include "KokkosComm/traits.hpp"
+#include "impl/pack_traits.hpp"
+#include "impl/include_mpi.hpp"
 
 namespace KokkosComm::mpi {
 
diff --git a/src/mpi/KokkosComm_mpi_reduce.hpp b/src/KokkosComm/mpi/reduce.hpp
similarity index 95%
rename from src/mpi/KokkosComm_mpi_reduce.hpp
rename to src/KokkosComm/mpi/reduce.hpp
index 1bc95ad5..056a2f03 100644
--- a/src/mpi/KokkosComm_mpi_reduce.hpp
+++ b/src/KokkosComm/mpi/reduce.hpp
@@ -18,10 +18,10 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "KokkosComm_traits.hpp"
-#include "impl/KokkosComm_pack_traits.hpp"
-#include "impl/KokkosComm_include_mpi.hpp"
-#include "impl/KokkosComm_types.hpp"
+#include "KokkosComm/traits.hpp"
+#include "impl/pack_traits.hpp"
+#include "impl/include_mpi.hpp"
+#include "impl/types.hpp"
 
 namespace KokkosComm::mpi {
 
diff --git a/src/mpi/KokkosComm_mpi_req.hpp b/src/KokkosComm/mpi/req.hpp
similarity index 97%
rename from src/mpi/KokkosComm_mpi_req.hpp
rename to src/KokkosComm/mpi/req.hpp
index 1e027b2e..72d4b1cb 100644
--- a/src/mpi/KokkosComm_mpi_req.hpp
+++ b/src/KokkosComm/mpi/req.hpp
@@ -20,9 +20,9 @@
 #include <utility>
 #include <functional>
 
-#include "KokkosComm_fwd.hpp"
+#include "KokkosComm/fwd.hpp"
 
-#include "KokkosComm_mpi.hpp"
+#include "mpi.hpp"
 
 namespace KokkosComm {
 
diff --git a/src/mpi/KokkosComm_mpi_send.hpp b/src/KokkosComm/mpi/send.hpp
similarity index 96%
rename from src/mpi/KokkosComm_mpi_send.hpp
rename to src/KokkosComm/mpi/send.hpp
index 3ac1a4c3..70a05f17 100644
--- a/src/mpi/KokkosComm_mpi_send.hpp
+++ b/src/KokkosComm/mpi/send.hpp
@@ -18,9 +18,9 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "KokkosComm_mpi_commmode.hpp"
-#include "impl/KokkosComm_pack_traits.hpp"
-#include "impl/KokkosComm_include_mpi.hpp"
+#include "commmode.hpp"
+#include "impl/pack_traits.hpp"
+#include "impl/include_mpi.hpp"
 
 namespace KokkosComm::mpi {
 
diff --git a/src/KokkosComm_point_to_point.hpp b/src/KokkosComm/point_to_point.hpp
similarity index 96%
rename from src/KokkosComm_point_to_point.hpp
rename to src/KokkosComm/point_to_point.hpp
index e53b7181..64486d91 100644
--- a/src/KokkosComm_point_to_point.hpp
+++ b/src/KokkosComm/point_to_point.hpp
@@ -18,8 +18,8 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "KokkosComm_fwd.hpp"
-#include "KokkosComm_concepts.hpp"
+#include "fwd.hpp"
+#include "concepts.hpp"
 
 namespace KokkosComm {
 
diff --git a/src/KokkosComm_traits.hpp b/src/KokkosComm/traits.hpp
similarity index 96%
rename from src/KokkosComm_traits.hpp
rename to src/KokkosComm/traits.hpp
index 2b18b1d4..55cba517 100644
--- a/src/KokkosComm_traits.hpp
+++ b/src/KokkosComm/traits.hpp
@@ -15,14 +15,14 @@
 //@HEADER
 
 /*! \brief Defines a common interface for Kokkos::View-like types
-    \file KokkosComm_traits.hpp
+    \file traits.hpp
 */
 
 #pragma once
 
 #include <type_traits>
 
-#include "KokkosComm_concepts.hpp"
+#include "concepts.hpp"
 
 namespace KokkosComm {
 
diff --git a/unit_tests/mpi/test_allgather.cpp b/unit_tests/mpi/test_allgather.cpp
index 18e0cedb..a7798abb 100644
--- a/unit_tests/mpi/test_allgather.cpp
+++ b/unit_tests/mpi/test_allgather.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "KokkosComm.hpp"
+#include "KokkosComm/KokkosComm.hpp"
 
 namespace {
 
diff --git a/unit_tests/mpi/test_alltoall.cpp b/unit_tests/mpi/test_alltoall.cpp
index db0103c2..da074c6d 100644
--- a/unit_tests/mpi/test_alltoall.cpp
+++ b/unit_tests/mpi/test_alltoall.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "KokkosComm.hpp"
+#include "KokkosComm/KokkosComm.hpp"
 
 namespace {
 
diff --git a/unit_tests/mpi/test_isendrecv.cpp b/unit_tests/mpi/test_isendrecv.cpp
index bc03ef8f..c74179bb 100644
--- a/unit_tests/mpi/test_isendrecv.cpp
+++ b/unit_tests/mpi/test_isendrecv.cpp
@@ -17,7 +17,7 @@
 #include <gtest/gtest.h>
 #include <type_traits>
 
-#include "KokkosComm.hpp"
+#include "KokkosComm/KokkosComm.hpp"
 
 namespace {
 
diff --git a/unit_tests/mpi/test_reduce.cpp b/unit_tests/mpi/test_reduce.cpp
index 6eafcd48..82db420a 100644
--- a/unit_tests/mpi/test_reduce.cpp
+++ b/unit_tests/mpi/test_reduce.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "KokkosComm.hpp"
+#include "KokkosComm/KokkosComm.hpp"
 
 namespace {
 
diff --git a/unit_tests/mpi/test_sendrecv.cpp b/unit_tests/mpi/test_sendrecv.cpp
index 19a9e455..c0031bba 100644
--- a/unit_tests/mpi/test_sendrecv.cpp
+++ b/unit_tests/mpi/test_sendrecv.cpp
@@ -17,7 +17,7 @@
 #include <gtest/gtest.h>
 #include <type_traits>
 
-#include "KokkosComm.hpp"
+#include "KokkosComm/KokkosComm.hpp"
 
 namespace {
 
diff --git a/unit_tests/test_barrier.cpp b/unit_tests/test_barrier.cpp
index 11c9c42e..c3d57f30 100644
--- a/unit_tests/test_barrier.cpp
+++ b/unit_tests/test_barrier.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "KokkosComm.hpp"
+#include "KokkosComm/KokkosComm.hpp"
 
 namespace {
 
diff --git a/unit_tests/test_main.cpp b/unit_tests/test_main.cpp
index 680e322b..de3bd1ac 100644
--- a/unit_tests/test_main.cpp
+++ b/unit_tests/test_main.cpp
@@ -23,7 +23,7 @@
 #include <KokkosComm_config.hpp>
 #include <Kokkos_Core.hpp>
 
-#include "mpi/impl/KokkosComm_include_mpi.hpp"
+#include "KokkosComm/mpi/impl/include_mpi.hpp"
 
 class MpiEnvironment : public ::testing::Environment {
  public:
diff --git a/unit_tests/test_sendrecv.cpp b/unit_tests/test_sendrecv.cpp
index ac18e63a..dc779297 100644
--- a/unit_tests/test_sendrecv.cpp
+++ b/unit_tests/test_sendrecv.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "KokkosComm.hpp"
+#include "KokkosComm/KokkosComm.hpp"
 
 #include "view_builder.hpp"