diff --git a/src/api/guilds/guilds.rs b/src/api/guilds/guilds.rs
index 00cbfc1..d1f03f0 100644
--- a/src/api/guilds/guilds.rs
+++ b/src/api/guilds/guilds.rs
@@ -6,11 +6,7 @@ use crate::api::limits::Limits;
 use crate::errors::InstanceServerError;
 use crate::instance::UserMeta;
 use crate::limit::LimitedRequester;
-use crate::types::Channel;
-use crate::types::ChannelCreateSchema;
-use crate::types::Guild;
-use crate::types::GuildCreateResponse;
-use crate::types::GuildCreateSchema;
+use crate::types::{Channel, ChannelCreateSchema, Guild, GuildCreateResponse, GuildCreateSchema};
 
 impl Guild {
     /// Creates a new guild with the given parameters.
diff --git a/src/api/schemas.rs b/src/api/schemas.rs
deleted file mode 100644
index fb1a14f..0000000
--- a/src/api/schemas.rs
+++ /dev/null
@@ -1,432 +0,0 @@
-use regex::Regex;
-use serde::{Deserialize, Serialize};
-
-use crate::errors::FieldFormatError;
-
-use super::{Channel, Embed};
-
-/**
-A struct that represents a well-formed email address.
- */
-#[derive(Clone, PartialEq, Eq, Debug)]
-pub struct AuthEmail {
-    pub email: String,
-}
-
-impl AuthEmail {
-    /**
-    Returns a new [`Result<AuthEmail, FieldFormatError>`].
-    ## Arguments
-    The email address you want to validate.
-    ## Errors
-    You will receive a [`FieldFormatError`], if:
-    - The email address is not in a valid format.
-
-     */
-    pub fn new(email: String) -> Result<AuthEmail, FieldFormatError> {
-        let regex = Regex::new(r"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$").unwrap();
-        if !regex.is_match(email.as_str()) {
-            return Err(FieldFormatError::EmailError);
-        }
-        Ok(AuthEmail { email })
-    }
-}
-
-/**
-A struct that represents a well-formed username.
-## Arguments
-Please use new() to create a new instance of this struct.
-## Errors
-You will receive a [`FieldFormatError`], if:
-- The username is not between 2 and 32 characters.
- */
-#[derive(Clone, PartialEq, Eq, Debug)]
-pub struct AuthUsername {
-    pub username: String,
-}
-
-impl AuthUsername {
-    /**
-    Returns a new [`Result<AuthUsername, FieldFormatError>`].
-    ## Arguments
-    The username you want to validate.
-    ## Errors
-    You will receive a [`FieldFormatError`], if:
-    - The username is not between 2 and 32 characters.
-     */
-    pub fn new(username: String) -> Result<AuthUsername, FieldFormatError> {
-        if username.len() < 2 || username.len() > 32 {
-            Err(FieldFormatError::UsernameError)
-        } else {
-            Ok(AuthUsername { username })
-        }
-    }
-}
-
-/**
-A struct that represents a well-formed password.
-## Arguments
-Please use new() to create a new instance of this struct.
-## Errors
-You will receive a [`FieldFormatError`], if:
-- The password is not between 1 and 72 characters.
- */
-#[derive(Clone, PartialEq, Eq, Debug)]
-pub struct AuthPassword {
-    pub password: String,
-}
-
-impl AuthPassword {
-    /**
-    Returns a new [`Result<AuthPassword, FieldFormatError>`].
-    ## Arguments
-    The password you want to validate.
-    ## Errors
-    You will receive a [`FieldFormatError`], if:
-    - The password is not between 1 and 72 characters.
-     */
-    pub fn new(password: String) -> Result<AuthPassword, FieldFormatError> {
-        if password.is_empty() || password.len() > 72 {
-            Err(FieldFormatError::PasswordError)
-        } else {
-            Ok(AuthPassword { password })
-        }
-    }
-}
-
-/**
-A struct that represents a well-formed register request.
-## Arguments
-Please use new() to create a new instance of this struct.
-## Errors
-You will receive a [`FieldFormatError`], if:
-- The username is not between 2 and 32 characters.
-- The password is not between 1 and 72 characters.
- */
-
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub struct RegisterSchema {
-    username: String,
-    password: Option<String>,
-    consent: bool,
-    email: Option<String>,
-    fingerprint: Option<String>,
-    invite: Option<String>,
-    date_of_birth: Option<String>,
-    gift_code_sku_id: Option<String>,
-    captcha_key: Option<String>,
-    promotional_email_opt_in: Option<bool>,
-}
-
-impl RegisterSchema {
-    /**
-    Returns a new [`Result<RegisterSchema, FieldFormatError>`].
-    ## Arguments
-    All but "String::username" and "bool::consent" are optional.
-
-    ## Errors
-    You will receive a [`FieldFormatError`], if:
-    - The username is less than 2 or more than 32 characters in length
-    - You supply a `password` which is less than 1 or more than 72 characters in length.
-
-    These constraints have been defined [in the Spacebar-API](https://docs.spacebar.chat/routes/)
-    */
-    pub fn new(
-        username: AuthUsername,
-        password: Option<AuthPassword>,
-        consent: bool,
-        email: Option<AuthEmail>,
-        fingerprint: Option<String>,
-        invite: Option<String>,
-        date_of_birth: Option<String>,
-        gift_code_sku_id: Option<String>,
-        captcha_key: Option<String>,
-        promotional_email_opt_in: Option<bool>,
-    ) -> Result<RegisterSchema, FieldFormatError> {
-        let username = username.username;
-
-        let email_addr;
-        if email.is_some() {
-            email_addr = Some(email.unwrap().email);
-        } else {
-            email_addr = None;
-        }
-
-        let has_password;
-        if password.is_some() {
-            has_password = Some(password.unwrap().password);
-        } else {
-            has_password = None;
-        }
-
-        if !consent {
-            return Err(FieldFormatError::ConsentError);
-        }
-
-        Ok(RegisterSchema {
-            username,
-            password: has_password,
-            consent,
-            email: email_addr,
-            fingerprint,
-            invite,
-            date_of_birth,
-            gift_code_sku_id,
-            captcha_key,
-            promotional_email_opt_in,
-        })
-    }
-}
-
-/**
-A struct that represents a well-formed login request.
-## Arguments
-Please use new() to create a new instance of this struct.
-## Errors
-You will receive a [`FieldFormatError`], if:
-- The username is not between 2 and 32 characters.
-- The password is not between 1 and 72 characters.
- */
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub struct LoginSchema {
-    login: String,
-    password: String,
-    undelete: Option<bool>,
-    captcha_key: Option<String>,
-    login_source: Option<String>,
-    gift_code_sku_id: Option<String>,
-}
-
-impl LoginSchema {
-    /**
-    Returns a new [`Result<LoginSchema, FieldFormatError>`].
-    ## Arguments
-    login: The username you want to login with.
-    password: The password you want to login with.
-    undelete: Honestly no idea what this is for.
-    captcha_key: The captcha key you want to login with.
-    login_source: The login source.
-    gift_code_sku_id: The gift code sku id.
-    ## Errors
-    You will receive a [`FieldFormatError`], if:
-    - The username is less than 2 or more than 32 characters in length
-    */
-    pub fn new(
-        login: AuthUsername,
-        password: String,
-        undelete: Option<bool>,
-        captcha_key: Option<String>,
-        login_source: Option<String>,
-        gift_code_sku_id: Option<String>,
-    ) -> Result<LoginSchema, FieldFormatError> {
-        let login = login.username;
-        Ok(LoginSchema {
-            login,
-            password,
-            undelete,
-            captcha_key,
-            login_source,
-            gift_code_sku_id,
-        })
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub struct TotpSchema {
-    code: String,
-    ticket: String,
-    gift_code_sku_id: Option<String>,
-    login_source: Option<String>,
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "snake_case")]
-pub struct MessageSendSchema {
-    #[serde(rename = "type")]
-    message_type: Option<i32>,
-    content: Option<String>,
-    nonce: Option<String>,
-    tts: Option<bool>,
-    embeds: Option<Vec<super::Embed>>,
-    allowed_mentions: Option<super::AllowedMention>,
-    message_reference: Option<super::MessageReference>,
-    components: Option<Vec<super::Component>>,
-    sticker_ids: Option<Vec<String>>,
-    pub attachments: Option<Vec<super::PartialDiscordFileAttachment>>,
-}
-
-// make a new() method for MessageSendSchema
-impl MessageSendSchema {
-    pub fn new(
-        message_type: Option<i32>,
-        content: Option<String>,
-        nonce: Option<String>,
-        tts: Option<bool>,
-        embeds: Option<Vec<Embed>>,
-        allowed_mentions: Option<super::AllowedMention>,
-        message_reference: Option<super::MessageReference>,
-        components: Option<Vec<super::Component>>,
-        sticker_ids: Option<Vec<String>>,
-        attachments: Option<Vec<super::PartialDiscordFileAttachment>>,
-    ) -> MessageSendSchema {
-        MessageSendSchema {
-            message_type,
-            content,
-            nonce,
-            tts,
-            embeds,
-            allowed_mentions,
-            message_reference,
-            components,
-            sticker_ids,
-            attachments,
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "snake_case")]
-pub struct GuildCreateSchema {
-    pub name: Option<String>,
-    pub region: Option<String>,
-    pub icon: Option<String>,
-    pub channels: Option<Vec<Channel>>,
-    pub guild_template_code: Option<String>,
-    pub system_channel_id: Option<String>,
-    pub rules_channel_id: Option<String>,
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "snake_case")]
-pub struct UserModifySchema {
-    pub username: Option<String>,
-    pub avatar: Option<String>,
-    pub bio: Option<String>,
-    pub accent_color: Option<u64>,
-    pub banner: Option<String>,
-    pub current_password: Option<String>,
-    pub new_password: Option<String>,
-    pub code: Option<String>,
-    pub email: Option<String>,
-    pub discriminator: Option<i16>,
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "snake_case")]
-// TODO: Implement in polyphony/types
-pub struct ChannelCreateSchema {
-    pub name: String,
-    #[serde(rename = "type")]
-    pub channel_type: Option<u8>,
-    pub topic: Option<String>,
-    pub icon: Option<String>,
-    pub bitrate: Option<i32>,
-    pub user_limit: Option<i32>,
-    pub rate_limit_per_user: Option<i32>,
-    pub position: Option<i32>,
-    pub permission_overwrites: Option<Vec<crate::api::types::PermissionOverwrite>>,
-    pub parent_id: Option<String>,
-    pub id: Option<String>,
-    pub nsfw: Option<bool>,
-    pub rtc_region: Option<String>,
-    pub default_auto_archive_duration: Option<i32>,
-    pub default_reaction_emoji: Option<String>,
-    pub flags: Option<i32>,
-    pub default_thread_rate_limit_per_user: Option<i32>,
-    pub video_quality_mode: Option<i32>,
-}
-
-// I know that some of these tests are... really really basic and unneccessary, but sometimes, I
-// just feel like writing tests, so there you go :) -@bitfl0wer
-#[cfg(test)]
-mod schemas_tests {
-    use super::*;
-    use crate::errors::FieldFormatError;
-
-    #[test]
-    fn password_too_short() {
-        assert_eq!(
-            AuthPassword::new("".to_string()),
-            Err(FieldFormatError::PasswordError)
-        );
-    }
-
-    #[test]
-    fn password_too_long() {
-        let mut long_pw = String::new();
-        for _ in 0..73 {
-            long_pw += "a";
-        }
-        assert_eq!(
-            AuthPassword::new(long_pw),
-            Err(FieldFormatError::PasswordError)
-        );
-    }
-
-    #[test]
-    fn username_too_short() {
-        assert_eq!(
-            AuthUsername::new("T".to_string()),
-            Err(FieldFormatError::UsernameError)
-        );
-    }
-
-    #[test]
-    fn username_too_long() {
-        let mut long_un = String::new();
-        for _ in 0..33 {
-            long_un += "a";
-        }
-        assert_eq!(
-            AuthUsername::new(long_un),
-            Err(FieldFormatError::UsernameError)
-        );
-    }
-
-    #[test]
-    fn consent_false() {
-        assert_eq!(
-            RegisterSchema::new(
-                AuthUsername::new("Test".to_string()).unwrap(),
-                None,
-                false,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-                None,
-            ),
-            Err(FieldFormatError::ConsentError)
-        );
-    }
-
-    #[test]
-    fn invalid_email() {
-        assert_eq!(
-            AuthEmail::new("p@p.p".to_string()),
-            Err(FieldFormatError::EmailError)
-        )
-    }
-
-    #[test]
-    fn valid_email() {
-        let reg = RegisterSchema::new(
-            AuthUsername::new("Testy".to_string()).unwrap(),
-            None,
-            true,
-            Some(AuthEmail::new("me@mail.de".to_string()).unwrap()),
-            None,
-            None,
-            None,
-            None,
-            None,
-            None,
-        );
-        assert_ne!(reg, Err(FieldFormatError::EmailError));
-    }
-}
diff --git a/src/api/types.rs b/src/api/types.rs
deleted file mode 100644
index f040dd2..0000000
--- a/src/api/types.rs
+++ /dev/null
@@ -1,1482 +0,0 @@
-/*
-To learn more about the types implemented here, please visit
-https://discord.com/developers/docs .
-I do not feel like re-documenting all of this, as everything is already perfectly explained there.
-*/
-
-use std::{cell::RefCell, rc::Rc};
-
-use chrono::{DateTime, Utc};
-use serde::{Deserialize, Serialize};
-use serde_json::from_value;
-
-use crate::{api::limits::Limits, instance::Instance};
-
-pub trait WebSocketEvent {}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct LoginResult {
-    pub token: String,
-    pub settings: UserSettings,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct UserSettings {
-    afk_timeout: i32,
-    allow_accessibility_detection: bool,
-    animate_emoji: bool,
-    animate_stickers: i32,
-    contact_sync_enabled: bool,
-    convert_emoticons: bool,
-    custom_status: Option<String>,
-    default_guilds_restricted: bool,
-    detect_platform_accounts: bool,
-    developer_mode: bool,
-    disable_games_tab: bool,
-    enable_tts_command: bool,
-    explicit_content_filter: i32,
-    friend_source_flags: FriendSourceFlags,
-    friend_discovery_flags: Option<i32>,
-    gateway_connected: bool,
-    gif_auto_play: bool,
-    guild_folders: Vec<GuildFolder>,
-    guild_positions: Vec<i64>,
-    inline_attachment_media: bool,
-    inline_embed_media: bool,
-    locale: String,
-    message_display_compact: bool,
-    native_phone_integration_enabled: bool,
-    render_embeds: bool,
-    render_reactions: bool,
-    restricted_guilds: Vec<i64>,
-    show_current_game: bool,
-    status: String,
-    stream_notifications_enabled: bool,
-    theme: String,
-    timezone_offset: i32,
-    //view_nsfw_guilds: bool,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct FriendSourceFlags {
-    all: Option<bool>,
-    mutual_friends: Option<bool>,
-    mutual_guilds: Option<bool>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct GuildFolder {
-    id: String,
-    guild_ids: Vec<i64>,
-    name: String,
-}
-
-/**
-Represents the result you get from GET: /api/instance/policies/.
-*/
-#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
-#[serde(rename_all = "camelCase")]
-pub struct InstancePolicies {
-    instance_name: String,
-    instance_description: Option<String>,
-    front_page: Option<String>,
-    tos_page: Option<String>,
-    correspondence_email: Option<String>,
-    correspondence_user_id: Option<String>,
-    image: Option<String>,
-    instance_id: Option<String>,
-}
-
-impl InstancePolicies {
-    pub fn new(
-        instance_name: String,
-        instance_description: Option<String>,
-        front_page: Option<String>,
-        tos_page: Option<String>,
-        correspondence_email: Option<String>,
-        correspondence_user_id: Option<String>,
-        image: Option<String>,
-        instance_id: Option<String>,
-    ) -> Self {
-        InstancePolicies {
-            instance_name,
-            instance_description,
-            front_page,
-            tos_page,
-            correspondence_email,
-            correspondence_user_id,
-            image,
-            instance_id,
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct ErrorResponse {
-    pub code: i32,
-    pub message: String,
-    pub errors: IntermittentError,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct IntermittentError {
-    #[serde(flatten)]
-    pub errors: std::collections::HashMap<String, ErrorField>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Default)]
-pub struct ErrorField {
-    #[serde(default)]
-    pub _errors: Vec<Error>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct Error {
-    pub message: String,
-    pub code: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Default)]
-pub struct UnavailableGuild {
-    id: String,
-    unavailable: bool,
-}
-
-/// See https://discord.com/developers/docs/resources/guild
-#[derive(Serialize, Deserialize, Debug, Default, Clone)]
-pub struct Guild {
-    pub id: String,
-    pub name: String,
-    pub icon: Option<String>,
-    pub icon_hash: Option<String>,
-    pub splash: Option<String>,
-    pub discovery_splash: Option<String>,
-    pub owner: Option<UserObject>,
-    pub owner_id: Option<String>,
-    pub permissions: Option<String>,
-    pub afk_channel_id: Option<String>,
-    pub afk_timeout: Option<u8>,
-    pub widget_enabled: Option<bool>,
-    pub widget_channel_id: Option<String>,
-    pub widget_channel: Option<Channel>,
-    pub verification_level: Option<u8>,
-    pub default_message_notifications: Option<u8>,
-    pub explicit_content_filter: Option<u8>,
-    pub roles: Vec<RoleObject>,
-    pub emojis: Vec<Emoji>,
-    pub features: Vec<String>,
-    pub application_id: Option<String>,
-    pub system_channel_id: Option<String>,
-    pub system_channel_flags: Option<u8>,
-    pub rules_channel_id: Option<String>,
-    pub rules_channel: Option<String>,
-    pub max_presences: Option<u64>,
-    pub max_members: Option<u64>,
-    pub vanity_url_code: Option<String>,
-    pub description: Option<String>,
-    pub banner: Option<String>,
-    pub premium_tier: Option<u8>,
-    pub premium_subscription_count: Option<u64>,
-    pub preferred_locale: Option<String>,
-    pub public_updates_channel_id: Option<String>,
-    pub public_updates_channel: Option<Channel>,
-    pub max_video_channel_users: Option<u8>,
-    pub max_stage_video_channel_users: Option<u8>,
-    pub approximate_member_count: Option<u64>,
-    pub approximate_presence_count: Option<u64>,
-    pub member_count: Option<u64>,
-    pub presence_count: Option<u64>,
-    pub welcome_screen: Option<WelcomeScreenObject>,
-    pub nsfw_level: u8,
-    pub nsfw: bool,
-    pub stickers: Option<Vec<Sticker>>,
-    pub premium_progress_bar_enabled: Option<bool>,
-    pub joined_at: String,
-    pub afk_channel: Option<Channel>,
-    pub bans: Option<Vec<GuildBan>>,
-    pub primary_category_id: Option<String>,
-    pub large: Option<bool>,
-    pub channels: Option<Vec<Channel>>,
-    pub template_id: Option<String>,
-    pub template: Option<GuildTemplate>,
-    pub invites: Option<Vec<GuildInvite>>,
-    pub voice_states: Option<Vec<VoiceState>>,
-    pub webhooks: Option<Vec<Webhook>>,
-    pub mfa_level: Option<u8>,
-    pub region: Option<String>,
-    pub unavailable: bool,
-    pub parent: Option<String>,
-}
-
-/// See https://docs.spacebar.chat/routes/#get-/guilds/-guild_id-/bans/-user-
-#[derive(Serialize, Deserialize, Debug, Default, Clone)]
-pub struct GuildBan {
-    pub id: String,
-    pub user_id: String,
-    pub guild_id: String,
-    pub executor_id: String,
-    pub reason: Option<String>,
-}
-
-/// See https://discord.com/developers/docs/topics/gateway-events#guild-create-guild-create-extra-fields
-/// This is like [Guild], expect it has extra fields
-#[derive(Serialize, Deserialize, Debug, Default, Clone)]
-pub struct GuildCreateGuild {
-    pub id: String,
-    pub name: String,
-    pub icon: Option<String>,
-    pub icon_hash: Option<String>,
-    pub splash: Option<String>,
-    pub discovery_splash: Option<String>,
-    pub owner: Option<bool>,
-    pub owner_id: String,
-    pub permissions: Option<String>,
-    pub afk_channel_id: Option<String>,
-    pub afk_timeout: u8,
-    pub widget_enabled: Option<bool>,
-    pub widget_channel_id: Option<String>,
-    pub verification_level: u8,
-    pub default_message_notifications: u8,
-    pub explicit_content_filter: u8,
-    pub roles: Vec<RoleObject>,
-    pub emojis: Vec<Emoji>,
-    pub features: Vec<String>,
-    pub mfa_level: u8,
-    pub application_id: Option<String>,
-    pub system_channel_id: Option<String>,
-    pub system_channel_flags: u8,
-    pub rules_channel_id: Option<String>,
-    pub max_presences: Option<u64>,
-    pub max_members: Option<u64>,
-    pub vanity_url_code: Option<String>,
-    pub description: Option<String>,
-    pub banner: Option<String>,
-    pub premium_tier: u8,
-    pub premium_subscription_count: Option<u64>,
-    pub preferred_locale: String,
-    pub public_updates_channel_id: Option<String>,
-    pub max_video_channel_users: Option<u8>,
-    pub max_stage_video_channel_users: Option<u8>,
-    pub approximate_member_count: Option<u64>,
-    pub approximate_presence_count: Option<u64>,
-    pub welcome_screen: Option<WelcomeScreenObject>,
-    pub nsfw_level: u8,
-    pub stickers: Option<Vec<Sticker>>,
-    pub premium_progress_bar_enabled: bool,
-    // ------ Extra Fields ------
-    pub joined_at: DateTime<Utc>,
-    pub large: bool,
-    pub unavailable: Option<bool>,
-    pub member_count: u64,
-    // to:do implement voice states
-    //pub voice_states: Vec<VoiceState>,
-    pub members: Vec<GuildMember>,
-    pub channels: Vec<Channel>,
-    pub threads: Vec<Channel>,
-    pub presences: Vec<PresenceUpdate>,
-    // to:do add stage instances
-    //pub stage_instances: Vec<StageInstance>,
-    // to:do add guild schedules events
-    //pub guild_scheduled_events: Vec<GuildScheduledEvent>
-}
-
-impl GuildCreateGuild {
-    /// Converts self to a [Guild], discarding the extra fields
-    pub fn to_guild(&self) -> Guild {
-        let as_value = serde_json::to_value(&self).unwrap();
-        return from_value(as_value).unwrap();
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Default, Clone)]
-pub struct WelcomeScreenObject {
-    pub description: Option<String>,
-    pub welcome_channels: Vec<WelcomeScreenChannel>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Default, Clone)]
-pub struct WelcomeScreenChannel {
-    pub channel_id: String,
-    pub description: String,
-    pub emoji_id: Option<String>,
-    pub emoji_name: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Default, Clone)]
-/// See https://discord.com/developers/docs/topics/permissions#role-object
-pub struct RoleObject {
-    pub id: String,
-    pub name: String,
-    pub color: f64,
-    pub hoist: bool,
-    pub icon: Option<String>,
-    pub unicode_emoji: Option<String>,
-    pub position: u16,
-    pub permissions: String,
-    pub managed: bool,
-    pub mentionable: bool,
-    // to:do add role tags https://discord.com/developers/docs/topics/permissions#role-object-role-tags-structure
-    //pub tags: Option<RoleTags>
-}
-
-#[derive(Serialize, Deserialize, Debug, Default, Clone, Eq, PartialEq)]
-pub struct UserObject {
-    pub id: String,
-    username: String,
-    discriminator: String,
-    avatar: Option<String>,
-    bot: bool,
-    system: Option<bool>,
-    mfa_enabled: Option<bool>,
-    accent_color: Option<String>,
-    locale: Option<String>,
-    verified: Option<bool>,
-    email: Option<String>,
-    flags: String,
-    premium_since: Option<String>,
-    premium_type: i8,
-    pronouns: Option<String>,
-    public_flags: Option<i8>,
-    banner: Option<String>,
-    bio: String,
-    theme_colors: Option<Vec<i32>>,
-    phone: Option<String>,
-    nsfw_allowed: bool,
-    premium: bool,
-    purchased_flags: i32,
-    premium_usage_flags: i32,
-    disabled: Option<bool>,
-}
-
-#[derive(Debug)]
-pub struct User {
-    pub belongs_to: Rc<RefCell<Instance>>,
-    pub token: String,
-    pub limits: Limits,
-    pub settings: UserSettings,
-    pub object: Option<UserObject>,
-}
-
-impl User {
-    pub fn token(&self) -> String {
-        self.token.clone()
-    }
-
-    pub fn set_token(&mut self, token: String) {
-        self.token = token;
-    }
-
-    pub fn new(
-        belongs_to: Rc<RefCell<Instance>>,
-        token: String,
-        limits: Limits,
-        settings: UserSettings,
-        object: Option<UserObject>,
-    ) -> User {
-        User {
-            belongs_to,
-            token,
-            limits,
-            settings,
-            object,
-        }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize, Default)]
-pub struct Message {
-    id: String,
-    pub channel_id: String,
-    author: UserObject,
-    content: String,
-    timestamp: String,
-    edited_timestamp: Option<String>,
-    tts: bool,
-    mention_everyone: bool,
-    mentions: Vec<UserObject>,
-    mention_roles: Vec<String>,
-    mention_channels: Option<Vec<ChannelMention>>,
-    pub attachments: Vec<DiscordFileAttachment>,
-    embeds: Vec<Embed>,
-    reactions: Option<Vec<Reaction>>,
-    nonce: Option<serde_json::Value>,
-    pinned: bool,
-    webhook_id: Option<String>,
-    #[serde(rename = "type")]
-    message_type: i32,
-    activity: Option<MessageActivity>,
-    application: Option<Application>,
-    application_id: Option<String>,
-    message_reference: Option<MessageReference>,
-    flags: Option<i32>,
-    referenced_message: Option<Box<Message>>,
-    interaction: Option<MessageInteraction>,
-    thread: Option<Channel>,
-    components: Option<Vec<Component>>,
-    sticker_items: Option<Vec<StickerItem>>,
-    stickers: Option<Vec<Sticker>>,
-    position: Option<i32>,
-    role_subscription_data: Option<RoleSubscriptionData>,
-}
-
-#[derive(Debug, Serialize, Deserialize, Default)]
-pub struct MessageCreate {
-    #[serde(flatten)]
-    message: Message,
-    guild_id: Option<String>,
-    member: Option<GuildMember>,
-    mentions: Vec<(UserObject, GuildMember)>, // Not sure if this is correct: https://discord.com/developers/docs/topics/gateway-events#message-create
-}
-
-impl WebSocketEvent for MessageCreate {}
-
-#[derive(Debug, Serialize, Deserialize, Default)]
-struct PartialMessage {
-    id: Option<String>,
-    channel_id: Option<String>,
-    author: Option<UserObject>,
-    content: Option<String>,
-    timestamp: Option<String>,
-    edited_timestamp: Option<String>,
-    tts: Option<bool>,
-    mention_everyone: Option<bool>,
-    mentions: Option<Vec<UserObject>>,
-    mention_roles: Option<Vec<String>>,
-    mention_channels: Option<Vec<ChannelMention>>,
-    attachments: Option<Vec<DiscordFileAttachment>>,
-    embeds: Option<Vec<Embed>>,
-    reactions: Option<Vec<Reaction>>,
-    nonce: Option<serde_json::Value>,
-    pinned: Option<bool>,
-    webhook_id: Option<String>,
-    #[serde(rename = "type")]
-    message_type: Option<i32>,
-    activity: Option<MessageActivity>,
-    application: Option<Application>,
-    application_id: Option<String>,
-    message_reference: Option<MessageReference>,
-    flags: Option<i32>,
-    referenced_message: Option<Box<Message>>,
-    interaction: Option<MessageInteraction>,
-    thread: Option<Channel>,
-    components: Option<Vec<Component>>,
-    sticker_items: Option<Vec<StickerItem>>,
-    stickers: Option<Vec<Sticker>>,
-    position: Option<i32>,
-    role_subscription_data: Option<RoleSubscriptionData>,
-    guild_id: Option<String>,
-    member: Option<GuildMember>,
-}
-
-#[derive(Debug, Serialize, Deserialize, Default)]
-pub struct MessageUpdate {
-    #[serde(flatten)]
-    message: PartialMessage,
-    guild_id: Option<String>,
-    member: Option<GuildMember>,
-    mentions: Vec<(UserObject, GuildMember)>, // Not sure if this is correct: https://discord.com/developers/docs/topics/gateway-events#message-create
-}
-
-impl WebSocketEvent for MessageUpdate {}
-
-#[derive(Debug, Serialize, Deserialize, Default)]
-pub struct MessageDelete {
-    id: String,
-    channel_id: String,
-    guild_id: Option<String>,
-}
-
-impl WebSocketEvent for MessageDelete {}
-
-#[derive(Debug, Serialize, Deserialize, Default)]
-pub struct MessageDeleteBulk {
-    ids: Vec<String>,
-    channel_id: String,
-    guild_id: Option<String>,
-}
-
-impl WebSocketEvent for MessageDeleteBulk {}
-
-#[derive(Debug, Serialize, Deserialize, Default)]
-pub struct MessageReactionAdd {
-    user_id: String,
-    channel_id: String,
-    message_id: String,
-    guild_id: Option<String>,
-    member: Option<GuildMember>,
-    emoji: Emoji,
-}
-
-impl WebSocketEvent for MessageReactionAdd {}
-
-#[derive(Debug, Serialize, Deserialize, Default)]
-pub struct MessageReactionRemove {
-    user_id: String,
-    channel_id: String,
-    message_id: String,
-    guild_id: Option<String>,
-    emoji: Emoji,
-}
-
-impl WebSocketEvent for MessageReactionRemove {}
-
-#[derive(Debug, Serialize, Deserialize, Default)]
-pub struct MessageReactionRemoveAll {
-    channel_id: String,
-    message_id: String,
-    guild_id: Option<String>,
-}
-
-impl WebSocketEvent for MessageReactionRemoveAll {}
-
-#[derive(Debug, Serialize, Deserialize, Default)]
-pub struct MessageReactionRemoveEmoji {
-    channel_id: String,
-    message_id: String,
-    guild_id: Option<String>,
-    emoji: Emoji,
-}
-
-impl WebSocketEvent for MessageReactionRemoveEmoji {}
-
-#[derive(Debug, Serialize, Deserialize)]
-struct ChannelMention {
-    id: String,
-    guild_id: String,
-    #[serde(rename = "type")]
-    channel_type: i32,
-    name: String,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-/**
-Represents an Embed. [See the Discord Documentation](https://discord.com/developers/docs/resources/channel#embed-object).
- */
-pub struct Embed {
-    title: Option<String>,
-    #[serde(rename = "type")]
-    embed_type: Option<String>,
-    description: Option<String>,
-    url: Option<String>,
-    timestamp: Option<String>,
-    color: Option<i32>,
-    footer: Option<EmbedFooter>,
-    image: Option<EmbedImage>,
-    thumbnail: Option<EmbedThumbnail>,
-    video: Option<EmbedVideo>,
-    provider: Option<EmbedProvider>,
-    author: Option<EmbedAuthor>,
-    fields: Option<Vec<EmbedField>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-struct EmbedFooter {
-    text: String,
-    icon_url: Option<String>,
-    proxy_icon_url: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-struct EmbedImage {
-    url: String,
-    proxy_url: String,
-    height: Option<i32>,
-    width: Option<i32>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-struct EmbedThumbnail {
-    url: String,
-    proxy_url: Option<String>,
-    height: Option<i32>,
-    width: Option<i32>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-struct EmbedVideo {
-    url: Option<String>,
-    proxy_url: Option<String>,
-    height: Option<i32>,
-    width: Option<i32>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-struct EmbedProvider {
-    name: Option<String>,
-    url: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-struct EmbedAuthor {
-    name: String,
-    url: Option<String>,
-    icon_url: Option<String>,
-    proxy_icon_url: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-
-struct EmbedField {
-    name: String,
-    value: String,
-    inline: Option<bool>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Reaction {
-    pub count: i32,
-    pub me: bool,
-    pub emoji: Emoji,
-}
-
-#[derive(Debug, Deserialize, Serialize, Default, Clone)]
-pub struct Emoji {
-    pub id: Option<u64>,
-    pub name: Option<String>,
-    pub roles: Option<Vec<u64>>,
-    pub user: Option<UserObject>,
-    pub require_colons: Option<bool>,
-    pub managed: Option<bool>,
-    pub animated: Option<bool>,
-    pub available: Option<bool>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct MessageActivity {
-    #[serde(rename = "type")]
-    pub activity_type: i64,
-    pub party_id: Option<String>,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-pub struct Application {
-    pub id: String,
-    pub name: String,
-    pub icon: Option<String>,
-    pub description: String,
-    pub rpc_origins: Option<Vec<String>>,
-    pub bot_public: bool,
-    pub bot_require_code_grant: bool,
-    pub terms_of_service_url: Option<String>,
-    pub privacy_policy_url: Option<String>,
-    pub owner: Option<UserObject>,
-    pub summary: String,
-    pub verify_key: String,
-    pub team: Option<Team>,
-    pub guild_id: Option<String>,
-    pub primary_sku_id: Option<String>,
-    pub slug: Option<String>,
-    pub cover_image: Option<String>,
-    pub flags: Option<i32>,
-    pub tags: Option<Vec<String>>,
-    pub install_params: Option<InstallParams>,
-    pub custom_install_url: Option<String>,
-    pub role_connections_verification_url: Option<String>,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-pub struct Team {
-    pub icon: Option<String>,
-    pub id: u64,
-    pub members: Vec<TeamMember>,
-    pub name: String,
-    pub owner_user_id: u64,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-pub struct TeamMember {
-    pub membership_state: u8,
-    pub permissions: Vec<String>,
-    pub team_id: u64,
-    pub user: UserObject,
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
-pub enum MembershipState {
-    Invited = 1,
-    Accepted = 2,
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct InstallParams {
-    pub scopes: Vec<String>,
-    pub permissions: String,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct MessageReference {
-    pub message_id: String,
-    pub channel_id: String,
-    pub guild_id: Option<String>,
-    pub fail_if_not_exists: Option<bool>,
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-pub struct MessageInteraction {
-    pub id: u64,
-    #[serde(rename = "type")]
-    pub interaction_type: u8,
-    pub name: String,
-    pub user: UserObject,
-    pub member: Option<GuildMember>,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone, Eq, PartialEq)]
-pub struct GuildMember {
-    pub user: Option<UserObject>,
-    pub nick: Option<String>,
-    pub avatar: Option<String>,
-    pub roles: Vec<String>,
-    pub joined_at: String,
-    pub premium_since: Option<String>,
-    pub deaf: bool,
-    pub mute: bool,
-    pub flags: i32,
-    pub pending: Option<bool>,
-    pub permissions: Option<String>,
-    pub communication_disabled_until: Option<String>,
-}
-
-#[derive(Default, Debug, Serialize, Deserialize, Clone, Eq, PartialEq)]
-pub struct Channel {
-    pub id: String,
-    #[serde(rename = "type")]
-    pub channel_type: i32,
-    pub guild_id: Option<String>,
-    pub position: Option<i32>,
-    pub permission_overwrites: Option<Vec<PermissionOverwrite>>,
-    pub name: Option<String>,
-    pub topic: Option<String>,
-    pub nsfw: Option<bool>,
-    pub last_message_id: Option<String>,
-    pub bitrate: Option<i32>,
-    pub user_limit: Option<i32>,
-    pub rate_limit_per_user: Option<i32>,
-    pub recipients: Option<Vec<UserObject>>,
-    pub icon: Option<String>,
-    pub owner_id: Option<String>,
-    pub application_id: Option<String>,
-    pub parent_id: Option<String>,
-    pub last_pin_timestamp: Option<String>,
-    pub rtc_region: Option<String>,
-    pub video_quality_mode: Option<i32>,
-    pub message_count: Option<i32>,
-    pub member_count: Option<i32>,
-    pub thread_metadata: Option<ThreadMetadata>,
-    pub member: Option<ThreadMember>,
-    pub default_auto_archive_duration: Option<i32>,
-    pub permissions: Option<String>,
-    pub flags: Option<i32>,
-    pub total_message_sent: Option<i32>,
-    pub available_tags: Option<Vec<Tag>>,
-    pub applied_tags: Option<Vec<String>>,
-    pub default_reaction_emoji: Option<DefaultReaction>,
-    pub default_thread_rate_limit_per_user: Option<i32>,
-    pub default_sort_order: Option<i32>,
-    pub default_forum_layout: Option<i32>,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone, Eq, PartialEq)]
-pub struct Tag {
-    pub id: u64,
-    pub name: String,
-    pub moderated: bool,
-    pub emoji_id: Option<u64>,
-    pub emoji_name: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)]
-pub struct PermissionOverwrite {
-    pub id: String,
-    #[serde(rename = "type")]
-    pub overwrite_type: u8,
-    pub allow: String,
-    pub deny: String,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone, Eq, PartialEq)]
-pub struct ThreadMetadata {
-    pub archived: bool,
-    pub auto_archive_duration: i32,
-    pub archive_timestamp: String,
-    pub locked: bool,
-    pub invitable: Option<bool>,
-    pub create_timestamp: Option<String>,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize, Clone, Eq, PartialEq)]
-pub struct ThreadMember {
-    pub id: Option<u64>,
-    pub user_id: Option<u64>,
-    pub join_timestamp: Option<String>,
-    pub flags: Option<u64>,
-    pub member: Option<GuildMember>,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize, Clone)]
-/// See https://discord.com/developers/docs/resources/guild#integration-object-integration-structure
-pub struct Integration {
-    pub id: String,
-    pub name: String,
-    #[serde(rename = "type")]
-    pub integration_type: String,
-    pub enabled: bool,
-    pub syncing: Option<bool>,
-    pub role_id: Option<String>,
-    pub enabled_emoticons: Option<bool>,
-    pub expire_behaviour: Option<u8>,
-    pub expire_grace_period: Option<u16>,
-    pub user: Option<UserObject>,
-    pub account: IntegrationAccount,
-    pub synced_at: Option<DateTime<Utc>>,
-    pub subscriber_count: Option<f64>,
-    pub revoked: Option<bool>,
-    pub application: Option<Application>,
-    pub scopes: Option<Vec<String>>,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize, Clone)]
-/// See https://discord.com/developers/docs/resources/guild#integration-account-object-integration-account-structure
-pub struct IntegrationAccount {
-    pub id: String,
-    pub name: String,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize, Clone)]
-/// See https://discord.com/developers/docs/resources/stage-instance#stage-instance-object
-pub struct StageInstance {
-    pub id: String,
-    pub guild_id: String,
-    pub channel_id: String,
-    pub topic: String,
-    pub privacy_level: u8,
-    pub discoverable_disabled: bool,
-    pub guild_scheduled_event_id: Option<String>,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone, Eq, PartialEq)]
-pub struct DefaultReaction {
-    pub emoji_id: Option<String>,
-    pub emoji_name: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub enum Component {
-    ActionRow = 1,
-    Button = 2,
-    StringSelect = 3,
-    TextInput = 4,
-    UserSelect = 5,
-    RoleSelect = 6,
-    MentionableSelect = 7,
-    ChannelSelect = 8,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct StickerItem {
-    pub id: u64,
-    pub name: String,
-    pub format_type: u8,
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct Sticker {
-    pub id: u64,
-    pub pack_id: Option<u64>,
-    pub name: String,
-    pub description: Option<String>,
-    pub tags: String,
-    pub asset: Option<String>,
-    #[serde(rename = "type")]
-    pub sticker_type: u8,
-    pub format_type: u8,
-    pub available: Option<bool>,
-    pub guild_id: Option<u64>,
-    pub user: Option<UserObject>,
-    pub sort_value: Option<u8>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct RoleSubscriptionData {
-    pub role_subscription_listing_id: u64,
-    pub tier_name: String,
-    pub total_months_subscribed: u32,
-    pub is_renewal: bool,
-}
-
-#[derive(Debug, Deserialize, Serialize, Default)]
-pub struct TypingStartEvent {
-    pub channel_id: String,
-    pub guild_id: Option<String>,
-    pub user_id: String,
-    pub timestamp: i64,
-    pub member: Option<GuildMember>,
-}
-
-impl WebSocketEvent for TypingStartEvent {}
-
-#[derive(Debug, Deserialize, Serialize, Default)]
-pub struct GatewayIdentifyPayload {
-    pub token: String,
-    pub properties: GatewayIdentifyConnectionProps,
-    pub compress: Option<bool>,
-    pub large_threshold: Option<i16>, //default: 50
-    pub shard: Option<Vec<(i32, i32)>>,
-    pub presence: Option<PresenceUpdate>,
-    pub intents: i32,
-}
-
-impl WebSocketEvent for GatewayIdentifyPayload {}
-
-#[derive(Debug, Deserialize, Serialize, Default)]
-pub struct GatewayIdentifyConnectionProps {
-    pub os: String,
-    pub browser: String,
-    pub device: String,
-}
-
-#[derive(Debug, Deserialize, Serialize, Default, Clone)]
-/// See https://discord.com/developers/docs/topics/gateway-events#presence-update-presence-update-event-fields
-pub struct PresenceUpdate {
-    pub user: UserObject,
-    pub guild_id: String,
-    pub status: String,
-    pub activities: Vec<Activity>,
-    pub client_status: ClientStatusObject,
-}
-
-#[derive(Debug, Deserialize, Serialize, Default, Clone)]
-/// See https://discord.com/developers/docs/topics/gateway-events#client-status-object
-pub struct ClientStatusObject {
-    pub desktop: Option<String>,
-    pub mobile: Option<String>,
-    pub web: Option<String>,
-}
-
-impl WebSocketEvent for PresenceUpdate {}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-pub struct Activity {
-    name: String,
-    #[serde(rename = "type")]
-    activity_type: i32,
-    url: Option<String>,
-    created_at: i64,
-    timestamps: Option<ActivityTimestamps>,
-    application_id: Option<String>,
-    details: Option<String>,
-    state: Option<String>,
-    emoji: Option<Emoji>,
-    party: Option<ActivityParty>,
-    assets: Option<ActivityAssets>,
-    secrets: Option<ActivitySecrets>,
-    instance: Option<bool>,
-    flags: Option<i32>,
-    buttons: Option<Vec<ActivityButton>>,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-struct ActivityTimestamps {
-    start: Option<i64>,
-    end: Option<i64>,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-struct ActivityParty {
-    id: Option<String>,
-    size: Option<Vec<(i32, i32)>>,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-struct ActivityAssets {
-    large_image: Option<String>,
-    large_text: Option<String>,
-    small_image: Option<String>,
-    small_text: Option<String>,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-struct ActivitySecrets {
-    join: Option<String>,
-    spectate: Option<String>,
-    #[serde(rename = "match")]
-    match_string: Option<String>,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-struct ActivityButton {
-    label: String,
-    url: String,
-}
-
-#[derive(Debug, Deserialize, Serialize, Default)]
-pub struct GatewayResume {
-    pub token: String,
-    pub session_id: String,
-    pub seq: String,
-}
-
-impl WebSocketEvent for GatewayResume {}
-
-#[derive(Debug, Deserialize, Serialize, Default)]
-pub struct GatewayReady {
-    pub v: u8,
-    pub user: UserObject,
-    pub guilds: Vec<UnavailableGuild>,
-    pub session_id: String,
-    pub resume_gateway_url: Option<String>,
-    pub shard: Option<(u64, u64)>,
-}
-
-impl WebSocketEvent for GatewayReady {}
-
-#[derive(Debug, Deserialize, Serialize, Default)]
-/// See https://discord.com/developers/docs/topics/gateway-events#request-guild-members-request-guild-members-structure
-pub struct GatewayRequestGuildMembers {
-    pub guild_id: String,
-    pub query: Option<String>,
-    pub limit: u64,
-    pub presence: Option<bool>,
-    pub user_ids: Option<String>,
-    pub nonce: Option<String>,
-}
-
-impl WebSocketEvent for GatewayRequestGuildMembers {}
-
-#[derive(Debug, Deserialize, Serialize, Default)]
-/// See https://discord.com/developers/docs/topics/gateway-events#update-voice-state-gateway-voice-state-update-structure
-pub struct GatewayVoiceStateUpdate {
-    pub guild_id: String,
-    pub channel_id: Option<String>,
-    pub self_mute: bool,
-    pub self_deaf: bool,
-}
-
-impl WebSocketEvent for GatewayVoiceStateUpdate {}
-
-#[derive(Debug, Default, Deserialize, Serialize)]
-pub struct GatewayHello {
-    pub op: i32,
-    pub d: HelloData,
-}
-
-impl WebSocketEvent for GatewayHello {}
-
-#[derive(Debug, Default, Deserialize, Serialize)]
-pub struct HelloData {
-    pub heartbeat_interval: u128,
-}
-
-impl WebSocketEvent for HelloData {}
-
-#[derive(Debug, Default, Deserialize, Serialize)]
-pub struct GatewayHeartbeat {
-    pub op: u8,
-    pub d: Option<u64>,
-}
-
-impl WebSocketEvent for GatewayHeartbeat {}
-
-#[derive(Debug, Default, Deserialize, Serialize)]
-pub struct GatewayHeartbeatAck {
-    pub op: i32,
-}
-
-impl WebSocketEvent for GatewayHeartbeatAck {}
-
-#[derive(Debug, Default, Deserialize, Serialize)]
-/// See https://discord.com/developers/docs/topics/gateway-events#channel-pins-update
-pub struct ChannelPinsUpdate {
-    pub guild_id: Option<String>,
-    pub channel_id: String,
-    pub last_pin_timestamp: Option<DateTime<Utc>>,
-}
-
-impl WebSocketEvent for ChannelPinsUpdate {}
-
-#[derive(Debug, Default, Deserialize, Serialize)]
-/// See https://discord.com/developers/docs/topics/gateway-events#guild-ban-add-guild-ban-add-event-fields
-pub struct GuildBanAdd {
-    pub guild_id: String,
-    pub user: UserObject,
-}
-
-impl WebSocketEvent for GuildBanAdd {}
-
-#[derive(Debug, Default, Deserialize, Serialize)]
-/// See https://discord.com/developers/docs/topics/gateway-events#guild-ban-remove
-pub struct GuildBanRemove {
-    pub guild_id: String,
-    pub user: UserObject,
-}
-
-impl WebSocketEvent for GuildBanRemove {}
-
-#[derive(Debug, Default, Deserialize, Serialize)]
-/// See https://discord.com/developers/docs/topics/gateway-events#user-update
-/// Not directly serialized, as the inner payload is the user object
-pub struct UserUpdate {
-    pub user: UserObject,
-}
-
-impl WebSocketEvent for UserUpdate {}
-
-#[derive(Debug, Default, Deserialize, Serialize)]
-/// See https://discord.com/developers/docs/topics/gateway-events#channel-create
-/// Not directly serialized, as the inner payload is a channel object
-pub struct ChannelCreate {
-    pub channel: Channel,
-}
-
-impl WebSocketEvent for ChannelCreate {}
-
-#[derive(Debug, Default, Deserialize, Serialize)]
-/// See https://discord.com/developers/docs/topics/gateway-events#channel-update
-/// Not directly serialized, as the inner payload is a channel object
-pub struct ChannelUpdate {
-    pub channel: Channel,
-}
-
-impl WebSocketEvent for ChannelUpdate {}
-
-#[derive(Debug, Default, Deserialize, Serialize)]
-/// See https://discord.com/developers/docs/topics/gateway-events#channel-delete
-/// Not directly serialized, as the inner payload is a channel object
-pub struct ChannelDelete {
-    pub channel: Channel,
-}
-
-impl WebSocketEvent for ChannelDelete {}
-
-#[derive(Debug, Default, Deserialize, Serialize)]
-/// See https://discord.com/developers/docs/topics/gateway-events#thread-create
-/// Not directly serialized, as the inner payload is a channel object
-pub struct ThreadCreate {
-    pub thread: Channel,
-}
-
-impl WebSocketEvent for ThreadCreate {}
-
-#[derive(Debug, Default, Deserialize, Serialize)]
-/// See https://discord.com/developers/docs/topics/gateway-events#thread-update
-/// Not directly serialized, as the inner payload is a channel object
-pub struct ThreadUpdate {
-    pub thread: Channel,
-}
-
-impl WebSocketEvent for ThreadUpdate {}
-
-#[derive(Debug, Default, Deserialize, Serialize)]
-/// See https://discord.com/developers/docs/topics/gateway-events#thread-delete
-/// Not directly serialized, as the inner payload is a channel object
-pub struct ThreadDelete {
-    pub thread: Channel,
-}
-
-impl WebSocketEvent for ThreadDelete {}
-
-#[derive(Debug, Default, Deserialize, Serialize)]
-/// See https://discord.com/developers/docs/topics/gateway-events#thread-list-sync
-pub struct ThreadListSync {
-    pub guild_id: String,
-    pub channel_ids: Option<Vec<String>>,
-    pub threads: Vec<Channel>,
-    pub members: Vec<ThreadMember>,
-}
-
-impl WebSocketEvent for ThreadListSync {}
-
-#[derive(Debug, Default, Deserialize, Serialize)]
-/// See https://discord.com/developers/docs/topics/gateway-events#thread-member-update
-/// The inner payload is a thread member object with an extra field.
-/// The extra field is a bit painful, because we can't just serialize a thread member object
-pub struct ThreadMemberUpdate {
-    pub id: Option<u64>,
-    pub user_id: Option<u64>,
-    pub join_timestamp: Option<String>,
-    pub flags: Option<u64>,
-    pub member: Option<GuildMember>,
-    pub guild_id: String,
-}
-
-impl ThreadMemberUpdate {
-    /// Convert self to a thread member, losing the added guild_id field
-    pub fn to_thread_member(&self) -> ThreadMember {
-        ThreadMember {
-            id: self.id,
-            user_id: self.user_id,
-            join_timestamp: self.join_timestamp.clone(),
-            flags: self.flags,
-            member: self.member.clone(),
-        }
-    }
-}
-
-impl WebSocketEvent for ThreadMemberUpdate {}
-
-#[derive(Debug, Default, Deserialize, Serialize)]
-/// See https://discord.com/developers/docs/topics/gateway-events#thread-members-update
-pub struct ThreadMembersUpdate {
-    pub id: String,
-    pub guild_id: String,
-    /// Capped at 50
-    pub member_count: u8,
-    pub added_members: Option<Vec<ThreadMember>>,
-    pub removed_members: Option<Vec<String>>,
-}
-
-impl WebSocketEvent for ThreadMembersUpdate {}
-
-#[derive(Debug, Deserialize, Serialize, Default)]
-/// See https://discord.com/developers/docs/topics/gateway-events#guild-create
-/// This one is particularly painful, it can be a Guild object with extra field or an unavailbile guild object
-pub struct GuildCreate {
-    pub d: GuildCreateDataOption,
-}
-
-#[derive(Debug, Deserialize, Serialize)]
-pub enum GuildCreateDataOption {
-    UnavailableGuild(UnavailableGuild),
-    Guild(Guild),
-}
-
-impl Default for GuildCreateDataOption {
-    fn default() -> Self {
-        GuildCreateDataOption::UnavailableGuild(UnavailableGuild::default())
-    }
-}
-impl WebSocketEvent for GuildCreate {}
-
-#[derive(Debug, Default, Deserialize, Serialize)]
-pub struct GatewayPayload {
-    pub op: u8,
-    pub d: Option<serde_json::Value>,
-    pub s: Option<u64>,
-    pub t: Option<String>,
-}
-
-impl WebSocketEvent for GatewayPayload {}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct DiscordFileAttachment {
-    pub id: i16,
-    pub filename: String,
-    description: Option<String>,
-    content_type: Option<String>,
-    size: i64,
-    url: String,
-    proxy_url: String,
-    height: Option<i32>,
-    width: Option<i32>,
-    ephemeral: Option<bool>,
-    duration_secs: Option<f32>,
-    waveform: Option<String>,
-    #[serde(skip_serializing)]
-    content: Vec<u8>,
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-
-pub struct PartialDiscordFileAttachment {
-    pub id: Option<i16>,
-    pub filename: String,
-    pub description: Option<String>,
-    pub content_type: Option<String>,
-    pub size: Option<i64>,
-    pub url: Option<String>,
-    pub proxy_url: Option<String>,
-    pub height: Option<i32>,
-    pub width: Option<i32>,
-    pub ephemeral: Option<bool>,
-    pub duration_secs: Option<f32>,
-    pub waveform: Option<String>,
-    #[serde(skip_serializing)]
-    pub content: Vec<u8>,
-}
-
-impl PartialDiscordFileAttachment {
-    /**
-    Moves `self.content` out of `self` and returns it.
-    # Returns
-    Vec<u8>
-     */
-    pub fn move_content(self) -> (Vec<u8>, PartialDiscordFileAttachment) {
-        let content = self.content;
-        let updated_struct = PartialDiscordFileAttachment {
-            id: self.id,
-            filename: self.filename,
-            description: self.description,
-            content_type: self.content_type,
-            size: self.size,
-            url: self.url,
-            proxy_url: self.proxy_url,
-            height: self.height,
-            width: self.width,
-            ephemeral: self.ephemeral,
-            duration_secs: self.duration_secs,
-            waveform: self.waveform,
-            content: Vec::new(),
-        };
-        (content, updated_struct)
-    }
-
-    pub fn move_filename(self) -> (String, PartialDiscordFileAttachment) {
-        let filename = self.filename;
-        let updated_struct = PartialDiscordFileAttachment {
-            id: self.id,
-            filename: String::new(),
-            description: self.description,
-            content_type: self.content_type,
-            size: self.size,
-            url: self.url,
-            proxy_url: self.proxy_url,
-            height: self.height,
-            width: self.width,
-
-            ephemeral: self.ephemeral,
-            duration_secs: self.duration_secs,
-            waveform: self.waveform,
-            content: self.content,
-        };
-        (filename, updated_struct)
-    }
-
-    pub fn move_content_type(self) -> (Option<String>, PartialDiscordFileAttachment) {
-        let content_type = self.content_type;
-        let updated_struct = PartialDiscordFileAttachment {
-            id: self.id,
-            filename: self.filename,
-            description: self.description,
-            content_type: None,
-            size: self.size,
-            url: self.url,
-            proxy_url: self.proxy_url,
-            height: self.height,
-            width: self.width,
-            ephemeral: self.ephemeral,
-            duration_secs: self.duration_secs,
-            waveform: self.waveform,
-            content: self.content,
-        };
-        (content_type, updated_struct)
-    }
-
-    pub fn set_id(&mut self, id: i16) {
-        self.id = Some(id);
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct AllowedMention {
-    parse: Vec<AllowedMentionType>,
-    roles: Vec<String>,
-    users: Vec<String>,
-    replied_user: bool,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum AllowedMentionType {
-    Roles,
-    Users,
-    Everyone,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Token {
-    pub token: String,
-}
-
-/// See https://docs.spacebar.chat/routes/#cmp--schemas-template
-#[derive(Serialize, Deserialize, Debug, Default, Clone)]
-pub struct GuildTemplate {
-    pub code: String,
-    pub name: String,
-    pub description: Option<String>,
-    pub usage_count: Option<u64>,
-    pub creator_id: String,
-    pub creator: UserObject,
-    pub created_at: DateTime<Utc>,
-    pub updated_at: DateTime<Utc>,
-    pub source_guild_id: String,
-    pub source_guild: Vec<Guild>, // Unsure how a {recursive: Guild} looks like, might be a Vec?
-    pub serialized_source_guild: Vec<Guild>,
-    id: String,
-}
-
-/// See https://docs.spacebar.chat/routes/#cmp--schemas-invite
-#[derive(Serialize, Deserialize, Debug, Default, Clone)]
-pub struct GuildInvite {
-    pub code: String,
-    pub temporary: Option<bool>,
-    pub uses: Option<i32>,
-    pub max_uses: Option<i32>,
-    pub max_age: Option<i32>,
-    pub created_at: DateTime<Utc>,
-    pub expires_at: Option<DateTime<Utc>>,
-    pub guild_id: String,
-    pub guild: Option<Guild>,
-    pub channel_id: String,
-    pub channel: Option<Channel>,
-    pub inviter_id: Option<String>,
-    pub inviter: Option<UserObject>,
-    pub target_user_id: Option<String>,
-    pub target_user: Option<String>,
-    pub target_user_type: Option<i32>,
-    pub vanity_url: Option<bool>,
-}
-
-/// See https://docs.spacebar.chat/routes/#cmp--schemas-voicestate
-#[derive(Serialize, Deserialize, Debug, Default, Clone)]
-pub struct VoiceState {
-    pub guild_id: String,
-    pub guild: Option<Guild>,
-    pub channel_id: String,
-    pub channel: Option<Channel>,
-    pub user_id: String,
-    pub user: Option<UserObject>,
-    pub member: Option<GuildMember>,
-    pub session_id: String,
-    pub token: String,
-    pub deaf: bool,
-    pub mute: bool,
-    pub self_deaf: bool,
-    pub self_mute: bool,
-    pub self_stream: Option<bool>,
-    pub self_video: bool,
-    pub suppress: bool,
-    pub request_to_speak_timestamp: Option<DateTime<Utc>>,
-    pub id: String,
-}
-
-/// See https://docs.spacebar.chat/routes/#cmp--schemas-webhook
-#[derive(Serialize, Deserialize, Debug, Default, Clone)]
-pub struct Webhook {
-    #[serde(rename = "type")]
-    pub webhook_type: i32,
-    pub name: String,
-    pub avatar: String,
-    pub token: String,
-    pub guild_id: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub guild: Option<Guild>,
-    pub channel_id: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub channel: Option<Channel>,
-    pub application_id: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub application: Option<Application>,
-    pub user_id: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub user: Option<UserObject>,
-    pub source_guild_id: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub source_guild: Option<Guild>,
-    pub id: String,
-}
-
-#[derive(Serialize, Deserialize, Debug, Default, Clone)]
-pub struct GuildCreateResponse {
-    pub id: String,
-}
diff --git a/src/gateway.rs b/src/gateway.rs
index 15b299e..a122d9b 100644
--- a/src/gateway.rs
+++ b/src/gateway.rs
@@ -1,41 +1,6 @@
 use crate::errors::ObserverError;
 use crate::gateway::events::Events;
-use crate::types::Channel;
-use crate::types::ChannelCreate;
-use crate::types::ChannelDelete;
-use crate::types::ChannelPinsUpdate;
-use crate::types::ChannelUpdate;
-use crate::types::GatewayHeartbeat;
-use crate::types::GatewayIdentifyPayload;
-use crate::types::GatewayPayload;
-use crate::types::GatewayReady;
-use crate::types::GatewayRequestGuildMembers;
-use crate::types::GatewayResume;
-use crate::types::GatewayVoiceStateUpdate;
-use crate::types::GuildBanAdd;
-use crate::types::GuildBanRemove;
-use crate::types::GuildCreate;
-use crate::types::HelloData;
-use crate::types::MessageCreate;
-use crate::types::MessageDelete;
-use crate::types::MessageDeleteBulk;
-use crate::types::MessageReactionAdd;
-use crate::types::MessageReactionRemove;
-use crate::types::MessageReactionRemoveAll;
-use crate::types::MessageReactionRemoveEmoji;
-use crate::types::MessageUpdate;
-use crate::types::PresenceUpdate;
-use crate::types::ThreadCreate;
-use crate::types::ThreadDelete;
-use crate::types::ThreadListSync;
-use crate::types::ThreadMemberUpdate;
-use crate::types::ThreadMembersUpdate;
-use crate::types::ThreadUpdate;
-use crate::types::TypingStartEvent;
-use crate::types::UnavailableGuild;
-use crate::types::User;
-use crate::types::UserUpdate;
-use crate::types::WebSocketEvent;
+use crate::types;
 use futures_util::stream::SplitSink;
 use futures_util::SinkExt;
 use futures_util::StreamExt;
@@ -75,7 +40,7 @@ pub struct GatewayHandle {
 impl GatewayHandle {
     /// Sends json to the gateway with an opcode
     async fn send_json_event(&self, op: u8, to_send: serde_json::Value) {
-        let gateway_payload = GatewayPayload {
+        let gateway_payload = types::GatewayPayload {
             op,
             d: Some(to_send),
             s: None,
@@ -90,7 +55,7 @@ impl GatewayHandle {
     }
 
     /// Sends an identify event to the gateway
-    pub async fn send_identify(&self, to_send: GatewayIdentifyPayload) {
+    pub async fn send_identify(&self, to_send: types::GatewayIdentifyPayload) {
         let to_send_value = serde_json::to_value(&to_send).unwrap();
 
         println!("GW: Sending Identify..");
@@ -99,7 +64,7 @@ impl GatewayHandle {
     }
 
     /// Sends a resume event to the gateway
-    pub async fn send_resume(&self, to_send: GatewayResume) {
+    pub async fn send_resume(&self, to_send: types::GatewayResume) {
         let to_send_value = serde_json::to_value(&to_send).unwrap();
 
         println!("GW: Sending Resume..");
@@ -108,7 +73,7 @@ impl GatewayHandle {
     }
 
     /// Sends an update presence event to the gateway
-    pub async fn send_update_presence(&self, to_send: PresenceUpdate) {
+    pub async fn send_update_presence(&self, to_send: types::PresenceUpdate) {
         let to_send_value = serde_json::to_value(&to_send).unwrap();
 
         println!("GW: Sending Presence Update..");
@@ -117,7 +82,7 @@ impl GatewayHandle {
     }
 
     /// Sends a Request Guild Members to the server
-    pub async fn send_request_guild_members(&self, to_send: GatewayRequestGuildMembers) {
+    pub async fn send_request_guild_members(&self, to_send: types::GatewayRequestGuildMembers) {
         let to_send_value = serde_json::to_value(&to_send).unwrap();
 
         println!("GW: Sending Request Guild Members..");
@@ -126,7 +91,7 @@ impl GatewayHandle {
     }
 
     /// Sends a Request Guild Members to the server
-    pub async fn send_update_voice_state(&self, to_send: GatewayVoiceStateUpdate) {
+    pub async fn send_update_voice_state(&self, to_send: types::GatewayVoiceStateUpdate) {
         let to_send_value = serde_json::to_value(&to_send).unwrap();
 
         println!("GW: Sending Voice State Update..");
@@ -180,7 +145,8 @@ impl Gateway {
         // Wait for the first hello and then spawn both tasks so we avoid nested tasks
         // This automatically spawns the heartbeat task, but from the main thread
         let msg = ws_rx.next().await.unwrap().unwrap();
-        let gateway_payload: GatewayPayload = serde_json::from_str(msg.to_text().unwrap()).unwrap();
+        let gateway_payload: types::GatewayPayload =
+            serde_json::from_str(msg.to_text().unwrap()).unwrap();
 
         if gateway_payload.op != 10 {
             println!("Recieved non hello on gateway init, what is happening?");
@@ -193,7 +159,8 @@ impl Gateway {
 
         println!("GW: Received Hello");
 
-        let gateway_hello: HelloData = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
+        let gateway_hello: types::HelloData =
+            serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
         gateway.heartbeat_handler = Some(HeartbeatHandler::new(
             gateway_hello.heartbeat_interval,
             shared_tx.clone(),
@@ -225,7 +192,7 @@ impl Gateway {
 
         let msg_string = msg.to_string();
 
-        let gateway_payload: GatewayPayload = serde_json::from_str(&msg_string).unwrap();
+        let gateway_payload: types::GatewayPayload = serde_json::from_str(&msg_string).unwrap();
 
         // See https://discord.com/developers/docs/topics/opcodes-and-status-codes#gateway-gateway-opcodes
         match gateway_payload.op {
@@ -239,7 +206,7 @@ impl Gateway {
                 // See https://discord.com/developers/docs/topics/gateway-events#receive-events
                 match gateway_payload_t.as_str() {
                     "READY" => {
-                        let _data: GatewayReady =
+                        let _data: types::GatewayReady =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
                     }
                     "RESUMED" => {}
@@ -249,9 +216,9 @@ impl Gateway {
                     "AUTO_MODERATION_RULE_DELETE" => {}
                     "AUTO_MODERATION_ACTION_EXECUTION" => {}
                     "CHANNEL_CREATE" => {
-                        let channel: Channel =
+                        let channel: types::Channel =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
-                        let new_data = ChannelCreate { channel };
+                        let new_data = types::ChannelCreate { channel };
                         self.events
                             .lock()
                             .await
@@ -261,9 +228,9 @@ impl Gateway {
                             .await;
                     }
                     "CHANNEL_UPDATE" => {
-                        let channel: Channel =
+                        let channel: types::Channel =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
-                        let new_data = ChannelUpdate { channel };
+                        let new_data = types::ChannelUpdate { channel };
                         self.events
                             .lock()
                             .await
@@ -273,9 +240,9 @@ impl Gateway {
                             .await;
                     }
                     "CHANNEL_DELETE" => {
-                        let channel: Channel =
+                        let channel: types::Channel =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
-                        let new_data = ChannelDelete { channel };
+                        let new_data = types::ChannelDelete { channel };
                         self.events
                             .lock()
                             .await
@@ -285,7 +252,7 @@ impl Gateway {
                             .await;
                     }
                     "CHANNEL_PINS_UPDATE" => {
-                        let new_data: ChannelPinsUpdate =
+                        let new_data: types::ChannelPinsUpdate =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
                         self.events
                             .lock()
@@ -296,9 +263,9 @@ impl Gateway {
                             .await;
                     }
                     "THREAD_CREATE" => {
-                        let thread: Channel =
+                        let thread: types::Channel =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
-                        let new_data = ThreadCreate { thread };
+                        let new_data = types::ThreadCreate { thread };
                         self.events
                             .lock()
                             .await
@@ -308,9 +275,9 @@ impl Gateway {
                             .await;
                     }
                     "THREAD_UPDATE" => {
-                        let thread: Channel =
+                        let thread: types::Channel =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
-                        let new_data = ThreadUpdate { thread };
+                        let new_data = types::ThreadUpdate { thread };
                         self.events
                             .lock()
                             .await
@@ -320,9 +287,9 @@ impl Gateway {
                             .await;
                     }
                     "THREAD_DELETE" => {
-                        let thread: Channel =
+                        let thread: types::Channel =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
-                        let new_data = ThreadDelete { thread };
+                        let new_data = types::ThreadDelete { thread };
                         self.events
                             .lock()
                             .await
@@ -332,7 +299,7 @@ impl Gateway {
                             .await;
                     }
                     "THREAD_LIST_SYNC" => {
-                        let new_data: ThreadListSync =
+                        let new_data: types::ThreadListSync =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
                         self.events
                             .lock()
@@ -343,7 +310,7 @@ impl Gateway {
                             .await;
                     }
                     "THREAD_MEMBER_UPDATE" => {
-                        let new_data: ThreadMemberUpdate =
+                        let new_data: types::ThreadMemberUpdate =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
                         self.events
                             .lock()
@@ -354,7 +321,7 @@ impl Gateway {
                             .await;
                     }
                     "THREAD_MEMBERS_UPDATE" => {
-                        let new_data: ThreadMembersUpdate =
+                        let new_data: types::ThreadMembersUpdate =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
                         self.events
                             .lock()
@@ -365,7 +332,8 @@ impl Gateway {
                             .await;
                     }
                     "GUILD_CREATE" => {
-                        let new_data: GuildCreate = serde_json::from_str(&msg_string).unwrap();
+                        let new_data: types::GuildCreate =
+                            serde_json::from_str(&msg_string).unwrap();
                         self.events
                             .lock()
                             .await
@@ -376,16 +344,16 @@ impl Gateway {
                     }
                     "GUILD_UPDATE" => {}
                     "GUILD_DELETE" => {
-                        let _new_data: UnavailableGuild =
+                        let _new_data: types::UnavailableGuild =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
                     }
                     "GUILD_AUDIT_LOG_ENTRY_CREATE" => {}
                     "GUILD_BAN_ADD" => {
-                        let _new_data: GuildBanAdd =
+                        let _new_data: types::GuildBanAdd =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
                     }
                     "GUILD_BAN_REMOVE" => {
-                        let _new_data: GuildBanRemove =
+                        let _new_data: types::GuildBanRemove =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
                     }
                     "GUILD_EMOJIS_UPDATE" => {}
@@ -410,7 +378,7 @@ impl Gateway {
                     "INVITE_CREATE" => {}
                     "INVITE_DELETE" => {}
                     "MESSAGE_CREATE" => {
-                        let new_data: MessageCreate =
+                        let new_data: types::MessageCreate =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
                         self.events
                             .lock()
@@ -421,7 +389,7 @@ impl Gateway {
                             .await;
                     }
                     "MESSAGE_UPDATE" => {
-                        let new_data: MessageUpdate =
+                        let new_data: types::MessageUpdate =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
                         self.events
                             .lock()
@@ -432,7 +400,7 @@ impl Gateway {
                             .await;
                     }
                     "MESSAGE_DELETE" => {
-                        let new_data: MessageDelete =
+                        let new_data: types::MessageDelete =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
                         self.events
                             .lock()
@@ -443,7 +411,7 @@ impl Gateway {
                             .await;
                     }
                     "MESSAGE_DELETE_BULK" => {
-                        let new_data: MessageDeleteBulk =
+                        let new_data: types::MessageDeleteBulk =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
                         self.events
                             .lock()
@@ -454,7 +422,7 @@ impl Gateway {
                             .await;
                     }
                     "MESSAGE_REACTION_ADD" => {
-                        let new_data: MessageReactionAdd =
+                        let new_data: types::MessageReactionAdd =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
                         self.events
                             .lock()
@@ -465,7 +433,7 @@ impl Gateway {
                             .await;
                     }
                     "MESSAGE_REACTION_REMOVE" => {
-                        let new_data: MessageReactionRemove =
+                        let new_data: types::MessageReactionRemove =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
                         self.events
                             .lock()
@@ -476,7 +444,7 @@ impl Gateway {
                             .await;
                     }
                     "MESSAGE_REACTION_REMOVE_ALL" => {
-                        let new_data: MessageReactionRemoveAll =
+                        let new_data: types::MessageReactionRemoveAll =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
                         self.events
                             .lock()
@@ -487,7 +455,7 @@ impl Gateway {
                             .await;
                     }
                     "MESSAGE_REACTION_REMOVE_EMOJI" => {
-                        let new_data: MessageReactionRemoveEmoji =
+                        let new_data: types::MessageReactionRemoveEmoji =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
                         self.events
                             .lock()
@@ -498,7 +466,7 @@ impl Gateway {
                             .await;
                     }
                     "PRESENCE_UPDATE" => {
-                        let new_data: PresenceUpdate =
+                        let new_data: types::PresenceUpdate =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
                         self.events
                             .lock()
@@ -514,7 +482,7 @@ impl Gateway {
                     // Not documented in discord docs, I assume this isnt for bots / apps but is for users?
                     "SESSIONS_REPLACE" => {}
                     "TYPING_START" => {
-                        let new_data: TypingStartEvent =
+                        let new_data: types::TypingStartEvent =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
                         self.events
                             .lock()
@@ -525,9 +493,9 @@ impl Gateway {
                             .await;
                     }
                     "USER_UPDATE" => {
-                        let user: User =
+                        let user: types::User =
                             serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
-                        let new_data = UserUpdate { user };
+                        let new_data = types::UserUpdate { user };
                         self.events
                             .lock()
                             .await
@@ -634,7 +602,7 @@ impl HeartbeatHandler {
                 if last_heartbeat.elapsed().as_millis() > heartbeat_interval {
                     println!("GW: Sending Heartbeat..");
 
-                    let heartbeat = GatewayHeartbeat {
+                    let heartbeat = types::GatewayHeartbeat {
                         op: 1,
                         d: last_seq_number,
                     };
@@ -674,7 +642,7 @@ Trait which defines the behaviour of an Observer. An Observer is an object which
 an Observable. The Observer is notified when the Observable's data changes.
 In this case, the Observable is a [`GatewayEvent`], which is a wrapper around a WebSocketEvent.
  */
-pub trait Observer<T: WebSocketEvent>: std::fmt::Debug {
+pub trait Observer<T: types::WebSocketEvent>: std::fmt::Debug {
     fn update(&self, data: &T);
 }
 
@@ -683,13 +651,13 @@ change in the WebSocketEvent. GatewayEvents are observable.
 */
 
 #[derive(Default, Debug)]
-pub struct GatewayEvent<T: WebSocketEvent> {
+pub struct GatewayEvent<T: types::WebSocketEvent> {
     observers: Vec<Arc<Mutex<dyn Observer<T> + Sync + Send>>>,
     pub event_data: T,
     pub is_observed: bool,
 }
 
-impl<T: WebSocketEvent> GatewayEvent<T> {
+impl<T: types::WebSocketEvent> GatewayEvent<T> {
     fn new(event_data: T) -> Self {
         Self {
             is_observed: false,
@@ -764,50 +732,50 @@ mod events {
         pub channel: Channel,
         pub thread: Thread,
         pub guild: Guild,
-        pub gateway_identify_payload: GatewayEvent<GatewayIdentifyPayload>,
-        pub gateway_resume: GatewayEvent<GatewayResume>,
+        pub gateway_identify_payload: GatewayEvent<types::GatewayIdentifyPayload>,
+        pub gateway_resume: GatewayEvent<types::GatewayResume>,
     }
 
     #[derive(Default, Debug)]
     pub struct Message {
-        pub create: GatewayEvent<MessageCreate>,
-        pub update: GatewayEvent<MessageUpdate>,
-        pub delete: GatewayEvent<MessageDelete>,
-        pub delete_bulk: GatewayEvent<MessageDeleteBulk>,
-        pub reaction_add: GatewayEvent<MessageReactionAdd>,
-        pub reaction_remove: GatewayEvent<MessageReactionRemove>,
-        pub reaction_remove_all: GatewayEvent<MessageReactionRemoveAll>,
-        pub reaction_remove_emoji: GatewayEvent<MessageReactionRemoveEmoji>,
+        pub create: GatewayEvent<types::MessageCreate>,
+        pub update: GatewayEvent<types::MessageUpdate>,
+        pub delete: GatewayEvent<types::MessageDelete>,
+        pub delete_bulk: GatewayEvent<types::MessageDeleteBulk>,
+        pub reaction_add: GatewayEvent<types::MessageReactionAdd>,
+        pub reaction_remove: GatewayEvent<types::MessageReactionRemove>,
+        pub reaction_remove_all: GatewayEvent<types::MessageReactionRemoveAll>,
+        pub reaction_remove_emoji: GatewayEvent<types::MessageReactionRemoveEmoji>,
     }
 
     #[derive(Default, Debug)]
     pub struct User {
-        pub update: GatewayEvent<UserUpdate>,
-        pub presence_update: GatewayEvent<PresenceUpdate>,
-        pub typing_start_event: GatewayEvent<TypingStartEvent>,
+        pub update: GatewayEvent<types::UserUpdate>,
+        pub presence_update: GatewayEvent<types::PresenceUpdate>,
+        pub typing_start_event: GatewayEvent<types::TypingStartEvent>,
     }
 
     #[derive(Default, Debug)]
     pub struct Channel {
-        pub create: GatewayEvent<ChannelCreate>,
-        pub update: GatewayEvent<ChannelUpdate>,
-        pub delete: GatewayEvent<ChannelDelete>,
-        pub pins_update: GatewayEvent<ChannelPinsUpdate>,
+        pub create: GatewayEvent<types::ChannelCreate>,
+        pub update: GatewayEvent<types::ChannelUpdate>,
+        pub delete: GatewayEvent<types::ChannelDelete>,
+        pub pins_update: GatewayEvent<types::ChannelPinsUpdate>,
     }
 
     #[derive(Default, Debug)]
     pub struct Thread {
-        pub create: GatewayEvent<ThreadCreate>,
-        pub update: GatewayEvent<ThreadUpdate>,
-        pub delete: GatewayEvent<ThreadDelete>,
-        pub list_sync: GatewayEvent<ThreadListSync>,
-        pub member_update: GatewayEvent<ThreadMemberUpdate>,
-        pub members_update: GatewayEvent<ThreadMembersUpdate>,
+        pub create: GatewayEvent<types::ThreadCreate>,
+        pub update: GatewayEvent<types::ThreadUpdate>,
+        pub delete: GatewayEvent<types::ThreadDelete>,
+        pub list_sync: GatewayEvent<types::ThreadListSync>,
+        pub member_update: GatewayEvent<types::ThreadMemberUpdate>,
+        pub members_update: GatewayEvent<types::ThreadMembersUpdate>,
     }
 
     #[derive(Default, Debug)]
     pub struct Guild {
-        pub create: GatewayEvent<GuildCreate>,
+        pub create: GatewayEvent<types::GuildCreate>,
         /*pub update: GatewayEvent<ThreadCreate>,
         pub delete: GatewayEvent<ThreadCreate>,
         pub audit_log_entry_create: GatewayEvent<ThreadCreate>,
@@ -837,21 +805,21 @@ mod example {
 
     #[derive(Debug)]
     struct Consumer;
-    impl Observer<GatewayResume> for Consumer {
-        fn update(&self, data: &GatewayResume) {
+    impl Observer<types::GatewayResume> for Consumer {
+        fn update(&self, data: &types::GatewayResume) {
             println!("{}", data.token)
         }
     }
 
     #[tokio::test]
     async fn test_observer_behaviour() {
-        let mut event = GatewayEvent::new(GatewayResume {
+        let mut event = GatewayEvent::new(types::GatewayResume {
             token: "start".to_string(),
             session_id: "start".to_string(),
             seq: "start".to_string(),
         });
 
-        let new_data = GatewayResume {
+        let new_data = types::GatewayResume {
             token: "token_3276ha37am3".to_string(),
             session_id: "89346671230".to_string(),
             seq: "3".to_string(),