5 files changed, 7 insertions, 9 deletions
diff --git a/src/util/entities/Attachment.ts b/src/util/entities/Attachment.ts
index c6858eb8..9dc9c3ac 100644
--- a/src/util/entities/Attachment.ts
+++ b/src/util/entities/Attachment.ts
@@ -18,7 +18,7 @@
 
 import { BeforeRemove, Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
 import { URL } from "url";
-import { deleteFile } from "../util/cdn";
+import { deleteFile } from "../util";
 import { BaseClass } from "./BaseClass";
 import { getUrlSignature, NewUrlUserSignatureData, NewUrlSignatureData } from "../Signing";
 
diff --git a/src/util/entities/BaseClass.ts b/src/util/entities/BaseClass.ts
index ad8338e7..24a3aee1 100644
--- a/src/util/entities/BaseClass.ts
+++ b/src/util/entities/BaseClass.ts
@@ -17,10 +17,9 @@
 */
 
 import { BaseEntity, BeforeInsert, BeforeUpdate, Column, ColumnOptions, FindOptionsWhere, ObjectIdColumn, PrimaryColumn } from "typeorm";
-import { Snowflake } from "../util/Snowflake";
-import { getDatabase } from "../util/Database";
-import { OrmUtils } from "../imports/OrmUtils";
-import { annotationsKey, JsonNumber } from "../util/Decorators";
+import { Snowflake, getDatabase } from "../util";
+import { OrmUtils } from "../imports";
+import { annotationsKey } from "../util/Decorators";
 
 export class BaseClassWithoutId extends BaseEntity {
     private get construct() {
diff --git a/src/util/entities/ConnectedAccount.ts b/src/util/entities/ConnectedAccount.ts
index 7c5ffb55..6a5fed75 100644
--- a/src/util/entities/ConnectedAccount.ts
+++ b/src/util/entities/ConnectedAccount.ts
@@ -17,9 +17,9 @@
 */
 
 import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
-import { ConnectedAccountTokenData } from "../interfaces";
 import { BaseClass } from "./BaseClass";
 import { User } from "./User";
+import { ConnectedAccountTokenData } from "@spacebar/schemas";
 
 @Entity({
     name: "connected_accounts",
diff --git a/src/util/entities/Member.ts b/src/util/entities/Member.ts
index 401c51be..6d93cf5d 100644
--- a/src/util/entities/Member.ts
+++ b/src/util/entities/Member.ts
@@ -21,8 +21,7 @@ import { BeforeInsert, BeforeUpdate, Column, Entity, Index, JoinColumn, JoinTabl
 import { Ban, Channel, PublicGuildRelations } from ".";
 import { ReadyGuildDTO } from "../dtos";
 import { GuildCreateEvent, GuildDeleteEvent, GuildMemberAddEvent, GuildMemberRemoveEvent, GuildMemberUpdateEvent, MessageCreateEvent } from "../interfaces";
-import { Config, emitEvent } from "../util";
-import { DiscordApiErrors } from "../util/Constants";
+import { Config, emitEvent, DiscordApiErrors } from "../util";
 import { BaseClassWithoutId } from "./BaseClass";
 import { Guild } from "./Guild";
 import { Message } from "./Message";
diff --git a/src/util/entities/Message.ts b/src/util/entities/Message.ts
index bedd5aee..a4448a14 100644
--- a/src/util/entities/Message.ts
+++ b/src/util/entities/Message.ts
@@ -20,7 +20,7 @@ import { User } from "./User";
 import { Member } from "./Member";
 import { Role } from "./Role";
 import { Channel } from "./Channel";
-import { InteractionType } from "../interfaces/Interaction";
+import { InteractionType } from "../interfaces";
 import { Application } from "./Application";
 import { Column, CreateDateColumn, Entity, Index, JoinColumn, JoinTable, ManyToMany, ManyToOne, OneToMany, RelationId, FindOneOptions, Raw, Not, BaseEntity, In } from "typeorm";
 import { BaseClass } from "./BaseClass";