diff --git a/src/index.ts b/src/index.ts
index 8a434e46..e507efd9 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,121 +1,30 @@
-import { checkToken } from "./util/checkToken";
-import Config, { DefaultOptions } from "./util/Config";
-import db from "./util/Database";
+export * from "./util/checkToken";
+
+export * as Constants from "./util/Constants";
+export * from "./models/Channel";
+export * from "./models/Emoji";
+export * from "./models/Guild";
+export * from "./models/Invite";
+export * from "./models/Member";
+export * from "./models/Role";
+export * from "./models/User";
+export * from "./models/Activity";
+export * from "./models/Application";
+export * from "./models/Interaction";
+export * from "./models/Message";
+export * from "./models/Status";
+export * from "./models/VoiceState";
-import * as Constants from "./util/Constants";
-import {
- Channel,
- ChannelType,
- DMChannel,
- GuildChannel,
- ReadState,
- TextBasedChannel,
- TextChannel,
- VoiceChannel,
-} from "./models/Channel";
-import { Emoji } from "./models/Emoji";
-import { Guild } from "./models/Guild";
-import { Invite } from "./models/Invite";
-import { Member, MuteConfig, PublicMember, UserGuildSettings } from "./models/Member";
-import { Role } from "./models/Role";
-import { User, ConnectedAccount, PublicUser, Relationship, UserSettings } from "./models/User";
-import { Activity, ActivityType, Presence } from "./models/Activity";
-import {
- ApplicationCommand,
- ApplicationCommandInteractionData,
- ApplicationCommandInteractionDataOption,
- ApplicationCommandOption,
- ApplicationCommandOptionChoice,
- ApplicationCommandOptionType,
-} from "./models/Application";
-import { ApplicationCommandPayload, EVENT, Event, MessagePayload } from "./models/Event";
-import {
- Interaction,
- InteractionApplicationCommandCallbackData,
- InteractionResponseType,
- InteractionType,
-} from "./models/Interaction";
-import {
- AllowedMentions,
- Attachment,
- Embed,
- EmbedImage,
- Message,
- MessageType,
- PartialEmoji,
- Reaction,
-} from "./models/Message";
-import { ClientStatus, Status } from "./models/Status";
-import { VoiceState } from "./models/VoiceState";
+export * from "./util/String";
+export * from "./util/BitField";
+export * from "./util/Intents";
+export * from "./util/MessageFlags";
+export * from "./util/Permissions";
+export * from "./util/Snowflake";
+export * from "./util/UserFlags";
+export * from "./models/Event";
-import { trimSpecial } from "./util/String";
-import { BitField } from "./util/BitField";
-import { Intents } from "./util/Intents";
-import { MessageFlags } from "./util/MessageFlags";
-import { Permissions } from "./util/Permissions";
-import { Snowflake } from "./util/Snowflake";
-import { UserFlags } from "./util/UserFlags";
+import Config, { DefaultOptions } from "./util/Config";
+import db from "./util/Database";
-export {
- trimSpecial,
- checkToken,
- Config,
- Constants,
- db,
- Activity,
- ActivityType,
- Presence,
- BitField,
- DefaultOptions,
- Permissions,
- VoiceState,
- Snowflake,
- Intents,
- Channel,
- ChannelType,
- DMChannel,
- GuildChannel,
- ReadState,
- TextBasedChannel,
- TextChannel,
- VoiceChannel,
- Emoji,
- Guild,
- Invite,
- Member,
- ClientStatus,
- Status,
- MuteConfig,
- PublicMember,
- UserGuildSettings,
- Role,
- User,
- UserFlags,
- UserSettings,
- ConnectedAccount,
- PublicUser,
- Relationship,
- EVENT,
- Event,
- MessageType,
- Message,
- MessageFlags,
- MessagePayload,
- AllowedMentions,
- Attachment,
- Embed,
- EmbedImage,
- PartialEmoji,
- Reaction,
- Interaction,
- InteractionApplicationCommandCallbackData,
- InteractionResponseType,
- InteractionType,
- ApplicationCommand,
- ApplicationCommandPayload,
- ApplicationCommandInteractionData,
- ApplicationCommandInteractionDataOption,
- ApplicationCommandOption,
- ApplicationCommandOptionChoice,
- ApplicationCommandOptionType,
-};
+export { Config, db, DefaultOptions };
diff --git a/src/models/Event.ts b/src/models/Event.ts
index 34c330d3..d22c00ad 100644
--- a/src/models/Event.ts
+++ b/src/models/Event.ts
@@ -1,10 +1,9 @@
import { ConnectedAccount, User, UserSettings } from "./User";
import { DMChannel, Channel } from "./Channel";
import { Guild } from "./Guild";
-import { Member, PublicMember, UserGuildSettings } from "./Member";
+import { PublicMember, UserGuildSettings } from "./Member";
import { Emoji } from "./Emoji";
-import { ClientStatus, Status } from "./Status";
-import { Activity, Presence } from "./Activity";
+import { Presence } from "./Activity";
import { Role } from "./Role";
import { Invite } from "./Invite";
import { Message, PartialEmoji } from "./Message";
|