diff --git a/.gitignore b/.gitignore
index a821aa9..8e9f02c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 
-/target
+target/
 **/*.rs.bk
 Cargo.lock
diff --git a/src/client.rs b/src/client.rs
index 898f694..29b810a 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -2,7 +2,7 @@ use std::io::Result;
 use connection::Connection;
 use models::{Handshake, OpCode};
 #[cfg(feature = "rich_presence")]
-use models::{SetActivityArgs, SetActivity};
+use rich_presence::{SetActivityArgs, SetActivity};
 
 #[derive(Debug)]
 pub struct Client<T>
diff --git a/src/lib.rs b/src/lib.rs
index af15655..663fae0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -14,10 +14,14 @@ mod macros;
 mod utils;
 mod connection;
 mod models;
+mod rich_presence;
+
 pub mod client;
 
 pub use client::Client;
-pub use models::prelude;
+
+#[cfg(feature = "rich_presence")]
+pub use rich_presence::*;
 
 #[cfg(unix)]
 pub use connection::UnixConnection;
diff --git a/src/models/mod.rs b/src/models/mod.rs
index 1126b14..a71fd92 100644
--- a/src/models/mod.rs
+++ b/src/models/mod.rs
@@ -1,24 +1,10 @@
 mod message;
 mod command;
 mod handshake;
-#[cfg(feature = "rich_presence")]
-mod set_activity;
 
 use serde::Serialize;
 pub use self::message::{Message, OpCode};
 pub use self::command::Command;
 pub use self::handshake::Handshake;
-#[cfg(feature = "rich_presence")]
-pub use self::set_activity::*;
 
 pub trait Payload: Serialize {}
-
-pub mod prelude {
-    pub use super::set_activity::{
-        SetActivity,
-        SetActivityAssets,
-        SetActivityParty,
-        SetActivitySecrets,
-        SetActivityTimestamps
-    };
-}
diff --git a/src/rich_presence/mod.rs b/src/rich_presence/mod.rs
new file mode 100644
index 0000000..3452b11
--- /dev/null
+++ b/src/rich_presence/mod.rs
@@ -0,0 +1,5 @@
+#![cfg(feature = "rich_presence")]
+
+mod set_activity;
+
+pub use self::set_activity::*;
diff --git a/src/models/set_activity.rs b/src/rich_presence/set_activity.rs
similarity index 100%
rename from src/models/set_activity.rs
rename to src/rich_presence/set_activity.rs