diff --git a/gateway/gateway_manager.ts b/gateway/gateway_manager.ts
index 7623042e7..412f913a5 100644
--- a/gateway/gateway_manager.ts
+++ b/gateway/gateway_manager.ts
@@ -1,4 +1,3 @@
-import { GatewayIntents, GatewayPayload, StatusUpdate } from "../types/mod.ts";
 import { Collection } from "../util/collection.ts";
 import { safeRequestsPerShard } from "./safeRequestsPerShard.ts";
 import { closeWS } from "./closeWs.ts";
@@ -21,6 +20,9 @@ import { prepareBuckets, spawnShards } from "./spawnShards.ts";
 import { stopGateway } from "./stopGateway.ts";
 import { tellWorkerToIdentify } from "./tellWorkerToIdentify.ts";
 import { DiscordenoShard } from "./shard.ts";
+import { GatewayIntents } from "../types/gateway/gatewayIntents.ts";
+import { StatusUpdate } from "../types/gateway/statusUpdate.ts";
+import { GatewayPayload } from "../types/gateway/gatewayPayload.ts";
 
 /** Create a new Gateway Manager.
  *
diff --git a/transformers/integration.ts b/transformers/integration.ts
index f97820e38..d18fee8ce 100644
--- a/transformers/integration.ts
+++ b/transformers/integration.ts
@@ -1,6 +1,6 @@
 import { Bot } from "../bot.ts";
 import { IntegrationCreateUpdate } from "../types/integrations/integrationCreateUpdate.ts";
-import { IntegrationExpireBehaviors } from "../types/mod.ts";
+import { IntegrationExpireBehaviors } from "../types/integrations/integrationExpireBehaviors.ts";
 import { SnakeCasedPropertiesDeep } from "../types/util.ts";
 import { DiscordenoUser } from "./member.ts";
 
diff --git a/transformers/interaction.ts b/transformers/interaction.ts
index 3446883b0..cd80fd6d1 100644
--- a/transformers/interaction.ts
+++ b/transformers/interaction.ts
@@ -1,14 +1,12 @@
 import { Bot } from "../bot.ts";
 import { ChannelTypes } from "../types/channels/channelTypes.ts";
-import {
-  Attachment,
-  Interaction,
-  InteractionDataOption,
-  InteractionDataResolved,
-  InteractionTypes,
-  MessageComponents,
-  MessageComponentTypes,
-} from "../types/mod.ts";
+import { InteractionDataOption } from "../types/interactions/commands/applicationCommandInteractionDataOption.ts";
+import { InteractionDataResolved } from "../types/interactions/commands/applicationCommandInteractionDataResolved.ts";
+import { Interaction } from "../types/interactions/interaction.ts";
+import { InteractionTypes } from "../types/interactions/interactionTypes.ts";
+import { Attachment } from "../types/messages/attachment.ts";
+import { MessageComponents } from "../types/messages/components/messageComponents.ts";
+import { MessageComponentTypes } from "../types/messages/components/messageComponentTypes.ts";
 import { SnakeCasedPropertiesDeep } from "../types/util.ts";
 import { Collection } from "../util/collection.ts";
 import { DiscordenoAttachment } from "./attachment.ts";
diff --git a/transformers/invite.ts b/transformers/invite.ts
index c22f416a0..8653acda0 100644
--- a/transformers/invite.ts
+++ b/transformers/invite.ts
@@ -1,5 +1,6 @@
 import { Bot } from "../bot.ts";
-import { InviteCreate, TargetTypes } from "../types/mod.ts";
+import { InviteCreate } from "../types/invites/inviteCreate.ts";
+import { TargetTypes } from "../types/invites/targetTypes.ts";
 import { SnakeCasedPropertiesDeep } from "../types/util.ts";
 import { DiscordenoApplication } from "./application.ts";
 import { DiscordenoUser } from "./member.ts";
diff --git a/transformers/role.ts b/transformers/role.ts
index 0901fe12b..97e48849b 100644
--- a/transformers/role.ts
+++ b/transformers/role.ts
@@ -1,5 +1,5 @@
 import { Bot } from "../bot.ts";
-import { Role } from "../types/mod.ts";
+import { Role } from "../types/permissions/role.ts";
 import { SnakeCasedPropertiesDeep } from "../types/util.ts";
 
 export function transformRole(
diff --git a/types/interactions/commands/applicationCommandInteractionData.ts b/types/interactions/commands/applicationCommandInteractionData.ts
index a7a755039..1e8e7c814 100644
--- a/types/interactions/commands/applicationCommandInteractionData.ts
+++ b/types/interactions/commands/applicationCommandInteractionData.ts
@@ -1,7 +1,12 @@
-import { Channel, Message, MessageComponents, MessageComponentTypes, Role, User } from "../../mod.ts";
 import { InteractionGuildMember } from "../interactionGuildMember.ts";
 import { InteractionDataOption } from "./applicationCommandInteractionDataOption.ts";
 import { Attachment } from "../../messages/attachment.ts";
+import { MessageComponentTypes } from "../../messages/components/messageComponentTypes.ts";
+import { MessageComponents } from "../../messages/components/messageComponents.ts";
+import { Message } from "../../messages/message.ts";
+import { User } from "../../users/user.ts";
+import { Role } from "../../permissions/role.ts";
+import { Channel } from "../../channels/channel.ts";
 
 export interface InteractionData {
   /** The type of component */
diff --git a/types/interactions/commands/applicationCommandInteractionDataOption.ts b/types/interactions/commands/applicationCommandInteractionDataOption.ts
index 6d90ab07a..b3eac68fd 100644
--- a/types/interactions/commands/applicationCommandInteractionDataOption.ts
+++ b/types/interactions/commands/applicationCommandInteractionDataOption.ts
@@ -1,4 +1,6 @@
-import { Channel, GuildMember, Role } from "../../mod.ts";
+import { Channel } from "../../channels/channel.ts";
+import { GuildMember } from "../../members/guildMember.ts";
+import { Role } from "../../permissions/role.ts";
 import { ApplicationCommandOptionTypes } from "./applicationCommandOptionTypes.ts";
 
 export type InteractionDataOption = {