diff --git a/src/nitro/communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent.ts
index 350a4bf6..fcfdf849 100644
--- a/src/nitro/communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent.ts
+++ b/src/nitro/communication/messages/incoming/sound/JukeboxPlayListFullMessageEvent.ts
@@ -1,4 +1,5 @@
-import { IMessageEvent, MessageEvent } from '../../../../../core';
+import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent';
+import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
 import { JukeboxPlayListFullMessageParser } from '../../parser';
 
 export class JukeboxPlayListFullMessageEvent extends MessageEvent implements IMessageEvent
diff --git a/src/nitro/communication/messages/incoming/sound/JukeboxSongDisksMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/JukeboxSongDisksMessageEvent.ts
index dc383a5e..48ace66a 100644
--- a/src/nitro/communication/messages/incoming/sound/JukeboxSongDisksMessageEvent.ts
+++ b/src/nitro/communication/messages/incoming/sound/JukeboxSongDisksMessageEvent.ts
@@ -1,4 +1,5 @@
-import { IMessageEvent, MessageEvent } from '../../../../../core';
+import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent';
+import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
 import { JukeboxSongDisksMessageParser } from '../../parser';
 
 export class JukeboxSongDisksMessageEvent extends MessageEvent implements IMessageEvent
diff --git a/src/nitro/communication/messages/incoming/sound/NowPlayingMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/NowPlayingMessageEvent.ts
index d8756b4e..ae016990 100644
--- a/src/nitro/communication/messages/incoming/sound/NowPlayingMessageEvent.ts
+++ b/src/nitro/communication/messages/incoming/sound/NowPlayingMessageEvent.ts
@@ -1,4 +1,5 @@
-import { IMessageEvent, MessageEvent } from '../../../../../core';
+import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent';
+import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
 import { NowPlayingMessageParser } from '../../parser';
 
 export class NowPlayingMessageEvent extends MessageEvent implements IMessageEvent
diff --git a/src/nitro/communication/messages/incoming/sound/OfficialSongIdMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/OfficialSongIdMessageEvent.ts
index 01524c21..883f53c0 100644
--- a/src/nitro/communication/messages/incoming/sound/OfficialSongIdMessageEvent.ts
+++ b/src/nitro/communication/messages/incoming/sound/OfficialSongIdMessageEvent.ts
@@ -1,4 +1,5 @@
-import { IMessageEvent, MessageEvent } from '../../../../../core';
+import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent';
+import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
 import { OfficialSongIdMessageParser } from '../../parser';
 
 export class OfficialSongIdMessageEvent extends MessageEvent implements IMessageEvent
diff --git a/src/nitro/communication/messages/incoming/sound/PlayListMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/PlayListMessageEvent.ts
index 27eb5279..21d35432 100644
--- a/src/nitro/communication/messages/incoming/sound/PlayListMessageEvent.ts
+++ b/src/nitro/communication/messages/incoming/sound/PlayListMessageEvent.ts
@@ -1,4 +1,5 @@
-import { IMessageEvent, MessageEvent } from '../../../../../core';
+import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent';
+import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
 import { PlayListMessageParser } from '../../parser';
 
 export class PlayListMessageEvent extends MessageEvent implements IMessageEvent
diff --git a/src/nitro/communication/messages/incoming/sound/PlayListSongAddedMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/PlayListSongAddedMessageEvent.ts
index 7ce8fc79..dea1784d 100644
--- a/src/nitro/communication/messages/incoming/sound/PlayListSongAddedMessageEvent.ts
+++ b/src/nitro/communication/messages/incoming/sound/PlayListSongAddedMessageEvent.ts
@@ -1,4 +1,5 @@
-import { IMessageEvent, MessageEvent } from '../../../../../core';
+import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent';
+import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
 import { PlayListSongAddedMessageParser } from '../../parser';
 
 export class PlayListSongAddedMessageEvent extends MessageEvent implements IMessageEvent
diff --git a/src/nitro/communication/messages/incoming/sound/TraxSongInfoMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/TraxSongInfoMessageEvent.ts
index 80c1b83b..8685aa8e 100644
--- a/src/nitro/communication/messages/incoming/sound/TraxSongInfoMessageEvent.ts
+++ b/src/nitro/communication/messages/incoming/sound/TraxSongInfoMessageEvent.ts
@@ -1,4 +1,5 @@
-import { IMessageEvent, MessageEvent } from '../../../../../core';
+import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent';
+import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
 import { TraxSongInfoMessageParser } from '../../parser';
 
 export class TraxSongInfoMessageEvent extends MessageEvent implements IMessageEvent
diff --git a/src/nitro/communication/messages/incoming/sound/UserSongDisksInventoryMessageEvent.ts b/src/nitro/communication/messages/incoming/sound/UserSongDisksInventoryMessageEvent.ts
index 006912ca..6a58eae0 100644
--- a/src/nitro/communication/messages/incoming/sound/UserSongDisksInventoryMessageEvent.ts
+++ b/src/nitro/communication/messages/incoming/sound/UserSongDisksInventoryMessageEvent.ts
@@ -1,4 +1,5 @@
-import { IMessageEvent, MessageEvent } from '../../../../../core';
+import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent';
+import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
 import { UserSongDisksInventoryMessageParser } from '../../parser';
 
 export class UserSongDisksInventoryMessageEvent extends MessageEvent implements IMessageEvent