diff --git a/tonic-build/src/client.rs b/tonic-build/src/client.rs
index f78aeb4..ed330b4 100644
--- a/tonic-build/src/client.rs
+++ b/tonic-build/src/client.rs
@@ -13,7 +13,7 @@ pub(crate) fn generate(service: &Service, proto: &str) -> TokenStream {
         }
 
         impl<T> #service_ident<T>
-        where T: tonic::client::GrpcService<tonic::BoxBody>,
+        where T: tonic::client::GrpcService<tonic::body::BoxBody>,
               T::ResponseBody: Body + HttpBody + Send + 'static,
               T::Error: Into<StdError>,
               <T::ResponseBody as HttpBody>::Error: Into<StdError> + Send,
diff --git a/tonic-build/src/service.rs b/tonic-build/src/service.rs
index dc37d8a..924f27d 100644
--- a/tonic-build/src/service.rs
+++ b/tonic-build/src/service.rs
@@ -53,7 +53,7 @@ pub(crate) fn generate(service: &Service, proto_path: &str) -> TokenStream {
         }
 
         impl<T: #server_trait> Service<http::Request<HyperBody>> for #server_service<T> {
-            type Response = http::Response<tonic::BoxBody>;
+            type Response = http::Response<tonic::body::BoxBody>;
             type Error = Never;
             type Future = BoxFuture<Self::Response, Self::Error>;
 
diff --git a/tonic/src/codec/decode.rs b/tonic/src/codec/decode.rs
index 7c72b0b..658032d 100644
--- a/tonic/src/codec/decode.rs
+++ b/tonic/src/codec/decode.rs
@@ -1,5 +1,5 @@
 use super::Decoder;
-use crate::{metadata::MetadataMap, BoxBody, Code, Status};
+use crate::{metadata::MetadataMap, body::BoxBody, Code, Status};
 use bytes::{Buf, BufMut, Bytes, BytesMut, IntoBuf};
 use futures_core::Stream;
 use futures_util::{future, ready};
diff --git a/tonic/src/lib.rs b/tonic/src/lib.rs
index 6241f24..dd4951b 100644
--- a/tonic/src/lib.rs
+++ b/tonic/src/lib.rs
@@ -46,8 +46,6 @@ mod response;
 mod status;
 
 pub use async_trait::async_trait;
-#[doc(inline, hidden)]
-pub use body::BoxBody;
 #[doc(inline)]
 pub use codec::Streaming;
 pub use request::Request;
diff --git a/tonic/src/server/grpc.rs b/tonic/src/server/grpc.rs
index a34c0b4..6e6368d 100644
--- a/tonic/src/server/grpc.rs
+++ b/tonic/src/server/grpc.rs
@@ -1,7 +1,7 @@
 use crate::{
     codec::{encode_server, Codec, Streaming},
     server::{ClientStreamingService, ServerStreamingService, StreamingService, UnaryService},
-    BoxBody, Code, Request, Response, Status,
+    body::BoxBody, Code, Request, Response, Status,
 };
 use bytes::Bytes;
 use futures_core::TryStream;
diff --git a/tonic/src/transport/channel.rs b/tonic/src/transport/channel.rs
index 95c3b32..72c6c21 100644
--- a/tonic/src/transport/channel.rs
+++ b/tonic/src/transport/channel.rs
@@ -2,7 +2,7 @@ use super::{
     service::{BoxService, Connection, ServiceList},
     Endpoint,
 };
-use crate::{client::GrpcService, BoxBody};
+use crate::{body::BoxBody, client::GrpcService};
 use futures_util::try_future::{MapErr, TryFutureExt};
 use http::Uri;
 use hyper::{Request, Response};
diff --git a/tonic/src/transport/server.rs b/tonic/src/transport/server.rs
index a4fe504..ce1bd10 100644
--- a/tonic/src/transport/server.rs
+++ b/tonic/src/transport/server.rs
@@ -2,7 +2,7 @@ use super::{
     service::{layer_fn, BoxedIo},
     tls::{Cert, TlsAcceptor},
 };
-use crate::BoxBody;
+use crate::body::BoxBody;
 use futures_core::Stream;
 use futures_util::{ready, try_future::MapErr, TryFutureExt, TryStreamExt};
 use http::{Request, Response};
diff --git a/tonic/src/transport/service/connection.rs b/tonic/src/transport/service/connection.rs
index d3a514b..1008a9c 100644
--- a/tonic/src/transport/service/connection.rs
+++ b/tonic/src/transport/service/connection.rs
@@ -1,5 +1,5 @@
 use super::{layer::ServiceBuilderExt, AddOrigin, Connector};
-use crate::{transport::Endpoint, BoxBody};
+use crate::{body::BoxBody, transport::Endpoint};
 use hyper::client::conn::Builder;
 use hyper::client::service::Connect as HyperConnect;
 use std::{