diff --git a/packages/biscuit/structures/GuildEmoji.ts b/packages/biscuit/structures/GuildEmoji.ts
index 56027c5..26e8216 100644
--- a/packages/biscuit/structures/GuildEmoji.ts
+++ b/packages/biscuit/structures/GuildEmoji.ts
@@ -2,8 +2,8 @@ import type { Model } from "./Base.ts";
 import type { Snowflake } from "../Snowflake.ts";
 import type { Session } from "../Session.ts";
 import type { DiscordEmoji } from "../../discordeno/mod.ts";
-import type { ModifyGuildEmoji } from "./guilds/Guild.ts";
-import Guild from "./guilds/Guild.ts";
+import type { ModifyGuildEmoji } from "./guilds.ts";
+import Guild from "./guilds.ts";
 import Emoji from "./Emoji.ts";
 import User from "./User.ts";
 import * as Routes from "../Routes.ts";
diff --git a/packages/biscuit/structures/Invite.ts b/packages/biscuit/structures/Invite.ts
index 4bf1b61..24c9119 100644
--- a/packages/biscuit/structures/Invite.ts
+++ b/packages/biscuit/structures/Invite.ts
@@ -14,9 +14,8 @@ import type {
 import { TargetTypes } from "../../discordeno/mod.ts";
 import { GuildChannel } from "./channels.ts";
 import { Member } from "./Member.ts";
-import InviteGuild from "./guilds/InviteGuild.ts";
+import { InviteGuild, Guild } from "./guilds.ts";
 import User from "./User.ts";
-import Guild from "./guilds/Guild.ts";
 import Application from "./Application.ts";
 
 export interface InviteStageInstance {
diff --git a/packages/biscuit/structures/Member.ts b/packages/biscuit/structures/Member.ts
index 3b711e9..644fbd9 100644
--- a/packages/biscuit/structures/Member.ts
+++ b/packages/biscuit/structures/Member.ts
@@ -3,10 +3,10 @@ import type { Snowflake } from "../Snowflake.ts";
 import type { Session } from "../Session.ts";
 import type { DiscordMemberWithUser } from "../../discordeno/mod.ts";
 import type { ImageFormat, ImageSize } from "../Util.ts";
-import type { CreateGuildBan, ModifyGuildMember } from "./guilds/Guild.ts";
+import type { CreateGuildBan, ModifyGuildMember } from "./guilds.ts";
 import Util from "../Util.ts";
 import User from "./User.ts";
-import Guild from "./guilds/Guild.ts";
+import Guild from "./guilds.ts";
 import * as Routes from "../Routes.ts";
 
 /**
diff --git a/packages/biscuit/structures/Role.ts b/packages/biscuit/structures/Role.ts
index b0057cd..671e2d2 100644
--- a/packages/biscuit/structures/Role.ts
+++ b/packages/biscuit/structures/Role.ts
@@ -4,7 +4,7 @@ import type { Session } from "../Session.ts";
 import { Snowflake } from "../Snowflake.ts";
 import Permissions from "./Permissions.ts";
 import Util from "../Util.ts";
-import Guild, { type ModifyGuildRole } from "./guilds/Guild.ts";
+import { Guild, ModifyGuildRole } from "./guilds.ts";
 
 export class Role implements Model {
     constructor(session: Session, data: DiscordRole, guildId: Snowflake) {