diff --git a/src/nitro/communication/messages/incoming/user/PetRespectNoficationEvent.ts b/src/nitro/communication/messages/incoming/user/PetRespectNoficationEvent.ts
index 4415ec2a..e785dd7a 100644
--- a/src/nitro/communication/messages/incoming/user/PetRespectNoficationEvent.ts
+++ b/src/nitro/communication/messages/incoming/user/PetRespectNoficationEvent.ts
@@ -1,6 +1,6 @@
-import { PetRespectNotificationParser } from '../..';
 import { IMessageEvent } from '../../../../../core/communication/messages/IMessageEvent';
 import { MessageEvent } from '../../../../../core/communication/messages/MessageEvent';
+import { PetRespectNotificationParser } from '../../parser/user/PetRespectNotificationParser';
 
 export class PetRespectNoficationEvent extends MessageEvent implements IMessageEvent
 {
diff --git a/src/nitro/communication/messages/parser/handshake/NoobnessLevelMessageParser.ts b/src/nitro/communication/messages/parser/handshake/NoobnessLevelMessageParser.ts
index c51b85de..5d6c9ceb 100644
--- a/src/nitro/communication/messages/parser/handshake/NoobnessLevelMessageParser.ts
+++ b/src/nitro/communication/messages/parser/handshake/NoobnessLevelMessageParser.ts
@@ -1,4 +1,5 @@
-import { IMessageDataWrapper, IMessageParser } from '../../../../../core';
+import { IMessageDataWrapper } from '../../../../../core/communication/messages/IMessageDataWrapper';
+import { IMessageParser } from '../../../../../core/communication/messages/IMessageParser';
 
 export class NoobnessLevelMessageParser implements IMessageParser
 {
diff --git a/src/nitro/communication/messages/parser/room/data/RoomInfoParser.ts b/src/nitro/communication/messages/parser/room/data/RoomInfoParser.ts
index 0d2305f4..bbd25e13 100644
--- a/src/nitro/communication/messages/parser/room/data/RoomInfoParser.ts
+++ b/src/nitro/communication/messages/parser/room/data/RoomInfoParser.ts
@@ -1,4 +1,5 @@
-import { IMessageDataWrapper, IMessageParser } from '../../../../../../core';
+import { IMessageParser } from '../../../../../../././core/communication/messages/IMessageParser';
+import { IMessageDataWrapper } from '../../../../../../core/communication/messages/IMessageDataWrapper';
 import { RoomChatSettings } from './RoomChatSettings';
 import { RoomDataParser } from './RoomDataParser';
 import { RoomModerationSettings } from './RoomModerationSettings';
diff --git a/src/nitro/communication/messages/parser/user/PetRespectNotificationParser.ts b/src/nitro/communication/messages/parser/user/PetRespectNotificationParser.ts
index 6832e872..dea61d13 100644
--- a/src/nitro/communication/messages/parser/user/PetRespectNotificationParser.ts
+++ b/src/nitro/communication/messages/parser/user/PetRespectNotificationParser.ts
@@ -1,6 +1,6 @@
-import { PetData } from '..';
-import { PetType } from '../../../..';
 import { IMessageDataWrapper, IMessageParser } from '../../../../../core';
+import { PetType } from '../../../../avatar/pets/PetType';
+import { PetData } from '../inventory/pets/PetData';
 
 export class PetRespectNotificationParser implements IMessageParser
 {
diff --git a/src/nitro/session/handler/RoomChatHandler.ts b/src/nitro/session/handler/RoomChatHandler.ts
index 3931c5b7..596251f8 100644
--- a/src/nitro/session/handler/RoomChatHandler.ts
+++ b/src/nitro/session/handler/RoomChatHandler.ts
@@ -1,4 +1,3 @@
-import { PetSupplementedNotificationEvent, PetSupplementTypeEnum } from '../..';
 import { IConnection } from '../../../core/communication/connections/IConnection';
 import { FloodControlEvent } from '../../communication/messages/incoming/room/unit/chat/FloodControlEvent';
 import { RemainingMuteEvent } from '../../communication/messages/incoming/room/unit/chat/RemainingMuteEvent';
@@ -7,6 +6,8 @@ import { RoomUnitChatShoutEvent } from '../../communication/messages/incoming/ro
 import { RoomUnitChatWhisperEvent } from '../../communication/messages/incoming/room/unit/chat/RoomUnitChatWhisperEvent';
 import { RoomUnitHandItemReceivedEvent } from '../../communication/messages/incoming/room/unit/RoomUnitHandItemReceivedEvent';
 import { PetRespectNoficationEvent } from '../../communication/messages/incoming/user/PetRespectNoficationEvent';
+import { PetSupplementedNotificationEvent } from '../../communication/messages/incoming/user/PetSupplementedNotificationEvent';
+import { PetSupplementTypeEnum } from '../../communication/messages/incoming/user/PetSupplementTypeEnum';
 import { RespectReceivedEvent } from '../../communication/messages/incoming/user/RespectReceivedEvent';
 import { SystemChatStyleEnum } from '../../ui/widget/enums/SystemChatStyleEnum';
 import { RoomSessionChatEvent } from '../events/RoomSessionChatEvent';