diff --git a/src/lib.rs b/src/lib.rs
index b173980..3eec3e1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -43,6 +43,14 @@ pub use err::Error;
 
 pub mod config;
 mod err;
-mod event;
 pub mod request;
 pub mod response;
+
+/// A user ID.
+///
+/// Internally, Mastodon IDs are i64s, but are sent to clients as string because
+/// JavaScript numbers don't support i64s.  This newtype serializes to/from a string, but
+/// keeps the i64 as the "true" value for internal use.
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[doc(hidden)]
+pub struct Id(pub i64);
diff --git a/src/request.rs b/src/request.rs
index 89e5b95..fdae7db 100644
--- a/src/request.rs
+++ b/src/request.rs
@@ -3,16 +3,15 @@ mod postgres;
 mod query;
 mod timeline;
 
-pub mod err;
+mod err;
 mod subscription;
 
-pub(crate) use err::Error;
+pub use err::{Error, Timeline as TimelineErr};
 pub use subscription::{Blocks, Subscription};
-#[doc(hidden)]
 pub use timeline::Timeline;
 use timeline::{Content, Reach, Stream};
 
-use self::postgres::PgPool;
+pub use self::postgres::PgPool;
 use self::query::Query;
 use crate::config::Postgres;
 use warp::filters::BoxedFilter;
diff --git a/src/request/postgres.rs b/src/request/postgres.rs
index 18cd970..b6c621b 100644
--- a/src/request/postgres.rs
+++ b/src/request/postgres.rs
@@ -2,7 +2,7 @@
 use super::err;
 use super::timeline::{Scope, UserData};
 use crate::config;
-use crate::event::Id;
+use crate::Id;
 
 use ::postgres;
 use hashbrown::HashSet;
diff --git a/src/request/subscription.rs b/src/request/subscription.rs
index 3688166..3ee773e 100644
--- a/src/request/subscription.rs
+++ b/src/request/subscription.rs
@@ -8,7 +8,7 @@
 use super::postgres::PgPool;
 use super::query::Query;
 use super::{Content, Reach, Stream, Timeline};
-use crate::event::Id;
+use crate::Id;
 
 use hashbrown::HashSet;
 
diff --git a/src/request/timeline/inner.rs b/src/request/timeline/inner.rs
index 8bdf141..f77fa4b 100644
--- a/src/request/timeline/inner.rs
+++ b/src/request/timeline/inner.rs
@@ -1,5 +1,5 @@
 use super::Error;
-use crate::event::Id;
+use crate::Id;
 
 use hashbrown::HashSet;
 use std::convert::TryFrom;
diff --git a/src/response.rs b/src/response.rs
index 10d8fab..be209c3 100644
--- a/src/response.rs
+++ b/src/response.rs
@@ -1,9 +1,13 @@
 //! Stream the updates appropriate for a given `User`/`timeline` pair from Redis.
 
-pub use crate::event::Event;
+pub use event::Event;
 pub use redis::Manager as RedisManager;
 pub use stream::{Sse as SseStream, Ws as WsStream};
 
+pub(self) use event::err::Event as EventErr;
+pub(self) use event::Payload;
+
+pub(crate) mod event;
 mod redis;
 mod stream;
 
diff --git a/src/event.rs b/src/response/event.rs
similarity index 97%
rename from src/event.rs
rename to src/response/event.rs
index b28a1c7..4227124 100644
--- a/src/event.rs
+++ b/src/response/event.rs
@@ -1,12 +1,10 @@
 mod checked_event;
 mod dynamic_event;
-mod err;
-
-pub(crate) use checked_event::Id;
-pub(crate) use err::EventErr;
+pub mod err;
 
 use self::checked_event::CheckedEvent;
 use self::dynamic_event::{DynEvent, EventKind};
+use crate::Id;
 
 use hashbrown::HashSet;
 use serde::Serialize;
@@ -119,14 +117,14 @@ impl Event {
 }
 
 impl TryFrom<String> for Event {
-    type Error = EventErr;
+    type Error = err::Event;
 
     fn try_from(event_txt: String) -> Result<Event, Self::Error> {
         Event::try_from(event_txt.as_str())
     }
 }
 impl TryFrom<&str> for Event {
-    type Error = EventErr;
+    type Error = err::Event;
 
     fn try_from(event_txt: &str) -> Result<Event, Self::Error> {
         match serde_json::from_str(event_txt) {
diff --git a/src/event/checked_event.rs b/src/response/event/checked_event.rs
similarity index 98%
rename from src/event/checked_event.rs
rename to src/response/event/checked_event.rs
index 0c2d80c..b763c8b 100644
--- a/src/event/checked_event.rs
+++ b/src/response/event/checked_event.rs
@@ -13,7 +13,6 @@ mod visibility;
 
 pub(self) use super::Payload;
 pub(super) use announcement_reaction::AnnouncementReaction;
-pub(crate) use id::Id;
 pub(crate) use status::Status;
 
 use announcement::Announcement;
diff --git a/src/event/checked_event/account.rs b/src/response/event/checked_event/account.rs
similarity index 94%
rename from src/event/checked_event/account.rs
rename to src/response/event/checked_event/account.rs
index 0322cc3..0c00897 100644
--- a/src/event/checked_event/account.rs
+++ b/src/response/event/checked_event/account.rs
@@ -1,4 +1,5 @@
-use super::{emoji::Emoji, id::Id, visibility::Visibility};
+use super::{emoji::Emoji, visibility::Visibility};
+use crate::Id;
 use serde::{Deserialize, Serialize};
 
 #[serde(deny_unknown_fields)]
diff --git a/src/event/checked_event/announcement.rs b/src/response/event/checked_event/announcement.rs
similarity index 100%
rename from src/event/checked_event/announcement.rs
rename to src/response/event/checked_event/announcement.rs
diff --git a/src/event/checked_event/announcement_reaction.rs b/src/response/event/checked_event/announcement_reaction.rs
similarity index 100%
rename from src/event/checked_event/announcement_reaction.rs
rename to src/response/event/checked_event/announcement_reaction.rs
diff --git a/src/event/checked_event/conversation.rs b/src/response/event/checked_event/conversation.rs
similarity index 100%
rename from src/event/checked_event/conversation.rs
rename to src/response/event/checked_event/conversation.rs
diff --git a/src/event/checked_event/emoji.rs b/src/response/event/checked_event/emoji.rs
similarity index 100%
rename from src/event/checked_event/emoji.rs
rename to src/response/event/checked_event/emoji.rs
diff --git a/src/event/checked_event/id.rs b/src/response/event/checked_event/id.rs
similarity index 80%
rename from src/event/checked_event/id.rs
rename to src/response/event/checked_event/id.rs
index 0226e5d..73f7a0c 100644
--- a/src/event/checked_event/id.rs
+++ b/src/response/event/checked_event/id.rs
@@ -1,4 +1,5 @@
-use super::super::EventErr;
+use super::super::err;
+use crate::Id;
 
 use serde::{
     de::{self, Visitor},
@@ -7,19 +8,11 @@ use serde::{
 use serde_json::Value;
 use std::{convert::TryFrom, fmt, num::ParseIntError, str::FromStr};
 
-/// A user ID.
-///
-/// Internally, Mastodon IDs are i64s, but are sent to clients as string because
-/// JavaScript numbers don't support i64s.  This newtype serializes to/from a string, but
-/// keeps the i64 as the "true" value for internal use.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub struct Id(pub i64);
-
 impl TryFrom<&Value> for Id {
-    type Error = EventErr;
+    type Error = err::Event;
 
     fn try_from(v: &Value) -> Result<Self, Self::Error> {
-        Ok(v.as_str().ok_or(EventErr::DynParse)?.parse()?)
+        Ok(v.as_str().ok_or(err::Event::DynParse)?.parse()?)
     }
 }
 
diff --git a/src/event/checked_event/mention.rs b/src/response/event/checked_event/mention.rs
similarity index 92%
rename from src/event/checked_event/mention.rs
rename to src/response/event/checked_event/mention.rs
index e5e95f8..14c47ad 100644
--- a/src/event/checked_event/mention.rs
+++ b/src/response/event/checked_event/mention.rs
@@ -1,4 +1,4 @@
-use super::id::Id;
+use crate::Id;
 use serde::{Deserialize, Serialize};
 
 #[serde(deny_unknown_fields)]
diff --git a/src/event/checked_event/notification.rs b/src/response/event/checked_event/notification.rs
similarity index 100%
rename from src/event/checked_event/notification.rs
rename to src/response/event/checked_event/notification.rs
diff --git a/src/event/checked_event/status.rs b/src/response/event/checked_event/status.rs
similarity index 99%
rename from src/event/checked_event/status.rs
rename to src/response/event/checked_event/status.rs
index b14ddb1..684cf67 100644
--- a/src/event/checked_event/status.rs
+++ b/src/response/event/checked_event/status.rs
@@ -5,11 +5,11 @@ mod poll;
 
 use super::account::Account;
 use super::emoji::Emoji;
-use super::id::Id;
 use super::mention::Mention;
 use super::tag::Tag;
 use super::visibility::Visibility;
 use super::Payload;
+use crate::Id;
 use application::Application;
 use attachment::Attachment;
 use card::Card;
diff --git a/src/event/checked_event/status/application.rs b/src/response/event/checked_event/status/application.rs
similarity index 100%
rename from src/event/checked_event/status/application.rs
rename to src/response/event/checked_event/status/application.rs
diff --git a/src/event/checked_event/status/attachment.rs b/src/response/event/checked_event/status/attachment.rs
similarity index 100%
rename from src/event/checked_event/status/attachment.rs
rename to src/response/event/checked_event/status/attachment.rs
diff --git a/src/event/checked_event/status/card.rs b/src/response/event/checked_event/status/card.rs
similarity index 100%
rename from src/event/checked_event/status/card.rs
rename to src/response/event/checked_event/status/card.rs
diff --git a/src/event/checked_event/status/poll.rs b/src/response/event/checked_event/status/poll.rs
similarity index 100%
rename from src/event/checked_event/status/poll.rs
rename to src/response/event/checked_event/status/poll.rs
diff --git a/src/event/checked_event/tag.rs b/src/response/event/checked_event/tag.rs
similarity index 100%
rename from src/event/checked_event/tag.rs
rename to src/response/event/checked_event/tag.rs
diff --git a/src/event/checked_event/visibility.rs b/src/response/event/checked_event/visibility.rs
similarity index 100%
rename from src/event/checked_event/visibility.rs
rename to src/response/event/checked_event/visibility.rs
diff --git a/src/event/dynamic_event.rs b/src/response/event/dynamic_event.rs
similarity index 95%
rename from src/event/dynamic_event.rs
rename to src/response/event/dynamic_event.rs
index cfd8abf..9ab9db4 100644
--- a/src/event/dynamic_event.rs
+++ b/src/response/event/dynamic_event.rs
@@ -1,5 +1,6 @@
+use super::err;
 use super::Payload;
-use super::{EventErr, Id};
+use crate::Id;
 
 use std::convert::TryFrom;
 
@@ -38,7 +39,7 @@ pub(crate) struct DynStatus {
     pub(crate) boosted_user: Option<Id>,
 }
 
-type Result<T> = std::result::Result<T, EventErr>;
+type Result<T> = std::result::Result<T, err::Event>;
 
 impl DynEvent {
     pub(crate) fn set_update(self) -> Result<Self> {
@@ -52,13 +53,11 @@ impl DynEvent {
 }
 impl DynStatus {
     pub(crate) fn new(payload: &Value) -> Result<Self> {
-        use EventErr::*;
-
         Ok(Self {
             id: Id::try_from(&payload["account"]["id"])?,
             username: payload["account"]["acct"]
                 .as_str()
-                .ok_or(DynParse)?
+                .ok_or(err::Event::DynParse)?
                 .to_string(),
             language: payload["language"].as_str().map(String::from),
             mentioned_users: HashSet::new(),
diff --git a/src/event/err.rs b/src/response/event/err.rs
similarity index 76%
rename from src/event/err.rs
rename to src/response/event/err.rs
index c51b6a3..0c6ce42 100644
--- a/src/event/err.rs
+++ b/src/response/event/err.rs
@@ -1,17 +1,17 @@
 use std::{fmt, num::ParseIntError};
 
 #[derive(Debug)]
-pub enum EventErr {
+pub enum Event {
     SerdeParse(serde_json::Error),
     NonNumId(ParseIntError),
     DynParse,
 }
 
-impl std::error::Error for EventErr {}
+impl std::error::Error for Event {}
 
-impl fmt::Display for EventErr {
+impl fmt::Display for Event {
     fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-        use EventErr::*;
+        use Event::*;
         match self {
             SerdeParse(inner) => write!(f, "{}", inner),
             NonNumId(inner) => write!(f, "ID could not be parsed: {}", inner),
@@ -21,12 +21,12 @@ impl fmt::Display for EventErr {
     }
 }
 
-impl From<ParseIntError> for EventErr {
+impl From<ParseIntError> for Event {
     fn from(error: ParseIntError) -> Self {
         Self::NonNumId(error)
     }
 }
-impl From<serde_json::Error> for EventErr {
+impl From<serde_json::Error> for Event {
     fn from(error: serde_json::Error) -> Self {
         Self::SerdeParse(error)
     }
diff --git a/src/response/redis.rs b/src/response/redis.rs
index 196189c..db24126 100644
--- a/src/response/redis.rs
+++ b/src/response/redis.rs
@@ -2,6 +2,7 @@ mod connection;
 mod manager;
 mod msg;
 
+pub(self) use super::{Event, EventErr};
 pub(self) use connection::RedisConn;
 pub use manager::Error;
 pub use manager::Manager;
diff --git a/src/response/redis/connection.rs b/src/response/redis/connection.rs
index c99efb7..d24eff9 100644
--- a/src/response/redis/connection.rs
+++ b/src/response/redis/connection.rs
@@ -3,9 +3,9 @@ pub(crate) use err::RedisConnErr;
 
 use super::msg::{RedisParseErr, RedisParseOutput};
 use super::Error as ManagerErr;
+use super::Event;
 use super::RedisCmd;
 use crate::config::Redis;
-use crate::event::Event;
 use crate::request::Timeline;
 
 use futures::{Async, Poll};
diff --git a/src/response/redis/connection/err.rs b/src/response/redis/connection/err.rs
index 3b344c8..893dd30 100644
--- a/src/response/redis/connection/err.rs
+++ b/src/response/redis/connection/err.rs
@@ -9,7 +9,7 @@ pub enum RedisConnErr {
     IncorrectPassword(String),
     MissingPassword,
     NotRedis(String),
-    TimelineErr(request::err::Timeline),
+    TimelineErr(request::TimelineErr),
 }
 
 impl RedisConnErr {
@@ -57,8 +57,8 @@ impl fmt::Display for RedisConnErr {
     }
 }
 
-impl From<request::err::Timeline> for RedisConnErr {
-    fn from(e: request::err::Timeline) -> RedisConnErr {
+impl From<request::TimelineErr> for RedisConnErr {
+    fn from(e: request::TimelineErr) -> RedisConnErr {
         RedisConnErr::TimelineErr(e)
     }
 }
diff --git a/src/response/redis/manager.rs b/src/response/redis/manager.rs
index 1ecdcc4..b32eef2 100644
--- a/src/response/redis/manager.rs
+++ b/src/response/redis/manager.rs
@@ -4,11 +4,13 @@
 mod err;
 pub use err::Error;
 
+use super::Event;
 use super::{RedisCmd, RedisConn};
 use crate::config;
-use crate::event::Event;
 use crate::request::{Subscription, Timeline};
 
+pub(self) use super::EventErr;
+
 use futures::{Async, Stream as _Stream};
 use hashbrown::HashMap;
 use std::sync::{Arc, Mutex, MutexGuard, PoisonError};
diff --git a/src/response/redis/manager/err.rs b/src/response/redis/manager/err.rs
index c0207ff..8d6d4f2 100644
--- a/src/response/redis/manager/err.rs
+++ b/src/response/redis/manager/err.rs
@@ -1,7 +1,6 @@
 use super::super::{RedisConnErr, RedisParseErr};
-use crate::event::{Event, EventErr};
-use crate::request::err::Timeline as TimelineErr;
-use crate::request::Timeline;
+use super::{Event, EventErr};
+use crate::request::{Timeline, TimelineErr};
 
 use std::fmt;
 #[derive(Debug)]
diff --git a/src/response/stream.rs b/src/response/stream.rs
index 0e79589..453fb55 100644
--- a/src/response/stream.rs
+++ b/src/response/stream.rs
@@ -1,5 +1,7 @@
 pub use sse::Sse;
 pub use ws::Ws;
 
+pub(self) use super::{Event, Payload};
+
 mod sse;
 mod ws;
diff --git a/src/response/stream/sse.rs b/src/response/stream/sse.rs
index 6522003..d427440 100644
--- a/src/response/stream/sse.rs
+++ b/src/response/stream/sse.rs
@@ -1,4 +1,4 @@
-use crate::event::{Event, Payload};
+use super::{Event, Payload};
 use crate::request::{Subscription, Timeline};
 
 use futures::stream::Stream;
diff --git a/src/response/stream/ws.rs b/src/response/stream/ws.rs
index 139541e..ed51924 100644
--- a/src/response/stream/ws.rs
+++ b/src/response/stream/ws.rs
@@ -1,4 +1,4 @@
-use crate::event::{Event, Payload};
+use super::{Event, Payload};
 use crate::request::{Subscription, Timeline};
 
 use futures::{future::Future, stream::Stream};