diff --git a/src/api/nitro/room/widgets/handlers/RoomWidgetInfostandHandler.ts b/src/api/nitro/room/widgets/handlers/RoomWidgetInfostandHandler.ts
index e411ca17..a2caa560 100644
--- a/src/api/nitro/room/widgets/handlers/RoomWidgetInfostandHandler.ts
+++ b/src/api/nitro/room/widgets/handlers/RoomWidgetInfostandHandler.ts
@@ -1,10 +1,10 @@
 import { IFurnitureData, NitroEvent, ObjectDataFactory, PetFigureData, PetRespectComposer, PetSupplementComposer, PetType, RoomControllerLevel, RoomModerationSettings, RoomObjectCategory, RoomObjectOperationType, RoomObjectType, RoomObjectVariable, RoomSessionPetInfoUpdateEvent, RoomSessionUserBadgesEvent, RoomSessionUserFigureUpdateEvent, RoomTradingLevelEnum, RoomUnitDropHandItemComposer, RoomUnitGiveHandItemComposer, RoomUnitGiveHandItemPetComposer, RoomUserData, RoomWidgetEnum, RoomWidgetEnumItemExtradataParameter, Vector3d } from '@nitrots/nitro-renderer';
 import { SendMessageComposer } from '../../..';
 import { GetNitroInstance, GetRoomEngine, GetSessionDataManager, IsOwnerOfFurniture } from '../../../..';
+import { PetSupplementEnum } from '../../../../../components/room/widgets/avatar-info/common/PetSupplementEnum';
 import { FriendsSendFriendRequestEvent, HelpReportUserEvent, InventoryTradeRequestEvent, WiredSelectObjectEvent } from '../../../../../events';
 import { DispatchUiEvent } from '../../../../../hooks';
 import { FriendsHelper } from '../../../../../views/friends/common/FriendsHelper';
-import { PetSupplementEnum } from '../../../../../views/room/widgets/avatar-info/common/PetSupplementEnum';
 import { LocalizeText } from '../../../../utils/LocalizeText';
 import { RoomWidgetObjectNameEvent, RoomWidgetUpdateChatInputContentEvent, RoomWidgetUpdateEvent, RoomWidgetUpdateInfostandFurniEvent, RoomWidgetUpdateInfostandPetEvent, RoomWidgetUpdateInfostandRentableBotEvent, RoomWidgetUpdateInfostandUserEvent } from '../events';
 import { RoomWidgetChangeMottoMessage, RoomWidgetFurniActionMessage, RoomWidgetMessage, RoomWidgetRoomObjectMessage, RoomWidgetUserActionMessage } from '../messages';
diff --git a/src/components/index.scss b/src/components/index.scss
index 490d615f..108da37c 100644
--- a/src/components/index.scss
+++ b/src/components/index.scss
@@ -12,6 +12,7 @@
 @import './navigator/NavigatorView';
 @import './purse/PurseView';
 @import './right-side/RightSideView';
+@import './room/RoomView';
 @import './toolbar/ToolbarView';
 @import './user-profile/UserProfileVew';
 @import './user-settings/UserSettingsView';
diff --git a/src/components/main/MainView.tsx b/src/components/main/MainView.tsx
index 2aa7d0fb..ca2cc7ad 100644
--- a/src/components/main/MainView.tsx
+++ b/src/components/main/MainView.tsx
@@ -21,7 +21,7 @@ import { InventoryView } from '../inventory/InventoryView';
 import { ModToolsView } from '../mod-tools/ModToolsView';
 import { NavigatorView } from '../navigator/NavigatorView';
 import { RightSideView } from '../right-side/RightSideView';
-import { RoomHostView } from '../room-host/RoomHostView';
+import { RoomHostView } from '../room/RoomHostView';
 import { ToolbarView } from '../toolbar/ToolbarView';
 import { UserProfileView } from '../user-profile/UserProfileView';
 import { UserSettingsView } from '../user-settings/UserSettingsView';
diff --git a/src/views/room/RoomColorView.tsx b/src/components/room/RoomColorView.tsx
similarity index 100%
rename from src/views/room/RoomColorView.tsx
rename to src/components/room/RoomColorView.tsx
diff --git a/src/views/room/RoomContext.tsx b/src/components/room/RoomContext.tsx
similarity index 100%
rename from src/views/room/RoomContext.tsx
rename to src/components/room/RoomContext.tsx
diff --git a/src/components/room-host/RoomHostView.tsx b/src/components/room/RoomHostView.tsx
similarity index 97%
rename from src/components/room-host/RoomHostView.tsx
rename to src/components/room/RoomHostView.tsx
index 73749a44..42979d29 100644
--- a/src/components/room-host/RoomHostView.tsx
+++ b/src/components/room/RoomHostView.tsx
@@ -3,7 +3,7 @@ import { FC, useCallback, useState } from 'react';
 import { GetRoomSession, SetActiveRoomId, StartRoomSession } from '../../api';
 import { Base, TransitionAnimation, TransitionAnimationTypes } from '../../common';
 import { UseRoomEngineEvent, UseRoomSessionManagerEvent } from '../../hooks';
-import { RoomView } from '../../views/room/RoomView';
+import { RoomView } from './RoomView';
 
 export const RoomHostView: FC<{}> = props =>
 {
diff --git a/src/views/room/RoomView.scss b/src/components/room/RoomView.scss
similarity index 100%
rename from src/views/room/RoomView.scss
rename to src/components/room/RoomView.scss
diff --git a/src/views/room/RoomView.tsx b/src/components/room/RoomView.tsx
similarity index 100%
rename from src/views/room/RoomView.tsx
rename to src/components/room/RoomView.tsx
diff --git a/src/views/room/widgets/RoomWidgets.scss b/src/components/room/widgets/RoomWidgets.scss
similarity index 100%
rename from src/views/room/widgets/RoomWidgets.scss
rename to src/components/room/widgets/RoomWidgets.scss
diff --git a/src/views/room/widgets/RoomWidgetsView.tsx b/src/components/room/widgets/RoomWidgetsView.tsx
similarity index 99%
rename from src/views/room/widgets/RoomWidgetsView.tsx
rename to src/components/room/widgets/RoomWidgetsView.tsx
index 0dea7dd6..9316e4a2 100644
--- a/src/views/room/widgets/RoomWidgetsView.tsx
+++ b/src/components/room/widgets/RoomWidgetsView.tsx
@@ -3,8 +3,8 @@ import { FC, useCallback } from 'react';
 import { CanManipulateFurniture, GetRoomEngine, GetSessionDataManager, IsFurnitureSelectionDisabled, LocalizeText, ProcessRoomObjectOperation, RoomWidgetFurniToWidgetMessage, RoomWidgetUpdateRoomEngineEvent, RoomWidgetUpdateRoomObjectEvent } from '../../../api';
 import { FriendRequestEvent } from '../../../events';
 import { UseRoomEngineEvent, UseRoomSessionManagerEvent, UseUiEvent } from '../../../hooks';
-import { NotificationAlertType } from '../../notification-center/common/NotificationAlertType';
-import { NotificationUtilities } from '../../notification-center/common/NotificationUtilities';
+import { NotificationAlertType } from '../../../views/notification-center/common/NotificationAlertType';
+import { NotificationUtilities } from '../../../views/notification-center/common/NotificationUtilities';
 import { useRoomContext } from '../RoomContext';
 import { AvatarInfoWidgetView } from './avatar-info/AvatarInfoWidgetView';
 import { ChatInputView } from './chat-input/ChatInputView';
diff --git a/src/views/room/widgets/avatar-info/AvatarInfoRentableBotChatView.tsx b/src/components/room/widgets/avatar-info/AvatarInfoRentableBotChatView.tsx
similarity index 100%
rename from src/views/room/widgets/avatar-info/AvatarInfoRentableBotChatView.tsx
rename to src/components/room/widgets/avatar-info/AvatarInfoRentableBotChatView.tsx
diff --git a/src/views/room/widgets/avatar-info/AvatarInfoUseProductConfirmView.tsx b/src/components/room/widgets/avatar-info/AvatarInfoUseProductConfirmView.tsx
similarity index 98%
rename from src/views/room/widgets/avatar-info/AvatarInfoUseProductConfirmView.tsx
rename to src/components/room/widgets/avatar-info/AvatarInfoUseProductConfirmView.tsx
index 603cbe59..5306a722 100644
--- a/src/views/room/widgets/avatar-info/AvatarInfoUseProductConfirmView.tsx
+++ b/src/components/room/widgets/avatar-info/AvatarInfoUseProductConfirmView.tsx
@@ -2,8 +2,8 @@ import { IFurnitureData, PetCustomPart, PetFigureData, RoomObjectCategory, RoomO
 import { FC, useCallback, useEffect, useMemo, useState } from 'react';
 import { GetFurnitureDataForRoomObject, GetRoomEngine, LocalizeText, RoomWidgetUseProductMessage, UseProductItem } from '../../../../api';
 import { Base, Button, Column, Flex, NitroCardContentView, NitroCardHeaderView, NitroCardView, Text } from '../../../../common';
-import { FurniCategory } from '../../../../components/inventory/common/FurniCategory';
-import { PetImageView } from '../../../shared/pet-image/PetImageView';
+import { PetImageView } from '../../../../views/shared/pet-image/PetImageView';
+import { FurniCategory } from '../../../inventory/common/FurniCategory';
 import { useRoomContext } from '../../RoomContext';
 
 interface AvatarInfoUseProductConfirmViewProps
diff --git a/src/views/room/widgets/avatar-info/AvatarInfoUseProductView.tsx b/src/components/room/widgets/avatar-info/AvatarInfoUseProductView.tsx
similarity index 98%
rename from src/views/room/widgets/avatar-info/AvatarInfoUseProductView.tsx
rename to src/components/room/widgets/avatar-info/AvatarInfoUseProductView.tsx
index 07d2b4a0..0eb74ed2 100644
--- a/src/views/room/widgets/avatar-info/AvatarInfoUseProductView.tsx
+++ b/src/components/room/widgets/avatar-info/AvatarInfoUseProductView.tsx
@@ -1,7 +1,7 @@
 import { RoomObjectCategory, RoomObjectType } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useEffect, useState } from 'react';
 import { GetFurnitureDataForRoomObject, LocalizeText, UseProductItem } from '../../../../api';
-import { FurniCategory } from '../../../../components/inventory/common/FurniCategory';
+import { FurniCategory } from '../../../inventory/common/FurniCategory';
 import { useRoomContext } from '../../RoomContext';
 import { ContextMenuHeaderView } from '../context-menu/ContextMenuHeaderView';
 import { ContextMenuListItemView } from '../context-menu/ContextMenuListItemView';
diff --git a/src/views/room/widgets/avatar-info/AvatarInfoWidgetAvatarView.tsx b/src/components/room/widgets/avatar-info/AvatarInfoWidgetAvatarView.tsx
similarity index 100%
rename from src/views/room/widgets/avatar-info/AvatarInfoWidgetAvatarView.tsx
rename to src/components/room/widgets/avatar-info/AvatarInfoWidgetAvatarView.tsx
diff --git a/src/views/room/widgets/avatar-info/AvatarInfoWidgetDecorateView.tsx b/src/components/room/widgets/avatar-info/AvatarInfoWidgetDecorateView.tsx
similarity index 100%
rename from src/views/room/widgets/avatar-info/AvatarInfoWidgetDecorateView.tsx
rename to src/components/room/widgets/avatar-info/AvatarInfoWidgetDecorateView.tsx
diff --git a/src/views/room/widgets/avatar-info/AvatarInfoWidgetNameView.tsx b/src/components/room/widgets/avatar-info/AvatarInfoWidgetNameView.tsx
similarity index 100%
rename from src/views/room/widgets/avatar-info/AvatarInfoWidgetNameView.tsx
rename to src/components/room/widgets/avatar-info/AvatarInfoWidgetNameView.tsx
diff --git a/src/views/room/widgets/avatar-info/AvatarInfoWidgetOwnAvatarView.tsx b/src/components/room/widgets/avatar-info/AvatarInfoWidgetOwnAvatarView.tsx
similarity index 100%
rename from src/views/room/widgets/avatar-info/AvatarInfoWidgetOwnAvatarView.tsx
rename to src/components/room/widgets/avatar-info/AvatarInfoWidgetOwnAvatarView.tsx
diff --git a/src/views/room/widgets/avatar-info/AvatarInfoWidgetOwnPetView.tsx b/src/components/room/widgets/avatar-info/AvatarInfoWidgetOwnPetView.tsx
similarity index 100%
rename from src/views/room/widgets/avatar-info/AvatarInfoWidgetOwnPetView.tsx
rename to src/components/room/widgets/avatar-info/AvatarInfoWidgetOwnPetView.tsx
diff --git a/src/views/room/widgets/avatar-info/AvatarInfoWidgetPetView.tsx b/src/components/room/widgets/avatar-info/AvatarInfoWidgetPetView.tsx
similarity index 100%
rename from src/views/room/widgets/avatar-info/AvatarInfoWidgetPetView.tsx
rename to src/components/room/widgets/avatar-info/AvatarInfoWidgetPetView.tsx
diff --git a/src/views/room/widgets/avatar-info/AvatarInfoWidgetRentableBotView.tsx b/src/components/room/widgets/avatar-info/AvatarInfoWidgetRentableBotView.tsx
similarity index 100%
rename from src/views/room/widgets/avatar-info/AvatarInfoWidgetRentableBotView.tsx
rename to src/components/room/widgets/avatar-info/AvatarInfoWidgetRentableBotView.tsx
diff --git a/src/views/room/widgets/avatar-info/AvatarInfoWidgetView.scss b/src/components/room/widgets/avatar-info/AvatarInfoWidgetView.scss
similarity index 100%
rename from src/views/room/widgets/avatar-info/AvatarInfoWidgetView.scss
rename to src/components/room/widgets/avatar-info/AvatarInfoWidgetView.scss
diff --git a/src/views/room/widgets/avatar-info/AvatarInfoWidgetView.tsx b/src/components/room/widgets/avatar-info/AvatarInfoWidgetView.tsx
similarity index 100%
rename from src/views/room/widgets/avatar-info/AvatarInfoWidgetView.tsx
rename to src/components/room/widgets/avatar-info/AvatarInfoWidgetView.tsx
diff --git a/src/views/room/widgets/avatar-info/common/BotSkillsEnum.ts b/src/components/room/widgets/avatar-info/common/BotSkillsEnum.ts
similarity index 100%
rename from src/views/room/widgets/avatar-info/common/BotSkillsEnum.ts
rename to src/components/room/widgets/avatar-info/common/BotSkillsEnum.ts
diff --git a/src/views/room/widgets/avatar-info/common/PetSupplementEnum.ts b/src/components/room/widgets/avatar-info/common/PetSupplementEnum.ts
similarity index 100%
rename from src/views/room/widgets/avatar-info/common/PetSupplementEnum.ts
rename to src/components/room/widgets/avatar-info/common/PetSupplementEnum.ts
diff --git a/src/views/room/widgets/chat-input/ChatInputStyleSelectorView.tsx b/src/components/room/widgets/chat-input/ChatInputStyleSelectorView.tsx
similarity index 100%
rename from src/views/room/widgets/chat-input/ChatInputStyleSelectorView.tsx
rename to src/components/room/widgets/chat-input/ChatInputStyleSelectorView.tsx
diff --git a/src/views/room/widgets/chat-input/ChatInputView.scss b/src/components/room/widgets/chat-input/ChatInputView.scss
similarity index 100%
rename from src/views/room/widgets/chat-input/ChatInputView.scss
rename to src/components/room/widgets/chat-input/ChatInputView.scss
diff --git a/src/views/room/widgets/chat-input/ChatInputView.tsx b/src/components/room/widgets/chat-input/ChatInputView.tsx
similarity index 100%
rename from src/views/room/widgets/chat-input/ChatInputView.tsx
rename to src/components/room/widgets/chat-input/ChatInputView.tsx
diff --git a/src/views/room/widgets/chat/ChatWidgetMessageView.tsx b/src/components/room/widgets/chat/ChatWidgetMessageView.tsx
similarity index 100%
rename from src/views/room/widgets/chat/ChatWidgetMessageView.tsx
rename to src/components/room/widgets/chat/ChatWidgetMessageView.tsx
diff --git a/src/views/room/widgets/chat/ChatWidgetView.scss b/src/components/room/widgets/chat/ChatWidgetView.scss
similarity index 100%
rename from src/views/room/widgets/chat/ChatWidgetView.scss
rename to src/components/room/widgets/chat/ChatWidgetView.scss
diff --git a/src/views/room/widgets/chat/ChatWidgetView.tsx b/src/components/room/widgets/chat/ChatWidgetView.tsx
similarity index 100%
rename from src/views/room/widgets/chat/ChatWidgetView.tsx
rename to src/components/room/widgets/chat/ChatWidgetView.tsx
diff --git a/src/views/room/widgets/chat/common/ChatBubbleMessage.ts b/src/components/room/widgets/chat/common/ChatBubbleMessage.ts
similarity index 100%
rename from src/views/room/widgets/chat/common/ChatBubbleMessage.ts
rename to src/components/room/widgets/chat/common/ChatBubbleMessage.ts
diff --git a/src/views/room/widgets/choosers/ChooserWidgetView.scss b/src/components/room/widgets/choosers/ChooserWidgetView.scss
similarity index 100%
rename from src/views/room/widgets/choosers/ChooserWidgetView.scss
rename to src/components/room/widgets/choosers/ChooserWidgetView.scss
diff --git a/src/views/room/widgets/choosers/ChooserWidgetView.tsx b/src/components/room/widgets/choosers/ChooserWidgetView.tsx
similarity index 100%
rename from src/views/room/widgets/choosers/ChooserWidgetView.tsx
rename to src/components/room/widgets/choosers/ChooserWidgetView.tsx
diff --git a/src/views/room/widgets/choosers/FurniChooserWidgetView.tsx b/src/components/room/widgets/choosers/FurniChooserWidgetView.tsx
similarity index 100%
rename from src/views/room/widgets/choosers/FurniChooserWidgetView.tsx
rename to src/components/room/widgets/choosers/FurniChooserWidgetView.tsx
diff --git a/src/views/room/widgets/choosers/UserChooserWidgetView.tsx b/src/components/room/widgets/choosers/UserChooserWidgetView.tsx
similarity index 100%
rename from src/views/room/widgets/choosers/UserChooserWidgetView.tsx
rename to src/components/room/widgets/choosers/UserChooserWidgetView.tsx
diff --git a/src/views/room/widgets/context-menu/ContextMenu.scss b/src/components/room/widgets/context-menu/ContextMenu.scss
similarity index 100%
rename from src/views/room/widgets/context-menu/ContextMenu.scss
rename to src/components/room/widgets/context-menu/ContextMenu.scss
diff --git a/src/views/room/widgets/context-menu/ContextMenuHeaderView.tsx b/src/components/room/widgets/context-menu/ContextMenuHeaderView.tsx
similarity index 100%
rename from src/views/room/widgets/context-menu/ContextMenuHeaderView.tsx
rename to src/components/room/widgets/context-menu/ContextMenuHeaderView.tsx
diff --git a/src/views/room/widgets/context-menu/ContextMenuListItemView.tsx b/src/components/room/widgets/context-menu/ContextMenuListItemView.tsx
similarity index 100%
rename from src/views/room/widgets/context-menu/ContextMenuListItemView.tsx
rename to src/components/room/widgets/context-menu/ContextMenuListItemView.tsx
diff --git a/src/views/room/widgets/context-menu/ContextMenuListView.tsx b/src/components/room/widgets/context-menu/ContextMenuListView.tsx
similarity index 100%
rename from src/views/room/widgets/context-menu/ContextMenuListView.tsx
rename to src/components/room/widgets/context-menu/ContextMenuListView.tsx
diff --git a/src/views/room/widgets/context-menu/ContextMenuView.tsx b/src/components/room/widgets/context-menu/ContextMenuView.tsx
similarity index 100%
rename from src/views/room/widgets/context-menu/ContextMenuView.tsx
rename to src/components/room/widgets/context-menu/ContextMenuView.tsx
diff --git a/src/views/room/widgets/doorbell/DoorbellWidgetView.tsx b/src/components/room/widgets/doorbell/DoorbellWidgetView.tsx
similarity index 100%
rename from src/views/room/widgets/doorbell/DoorbellWidgetView.tsx
rename to src/components/room/widgets/doorbell/DoorbellWidgetView.tsx
diff --git a/src/views/room/widgets/friend-request/FriendRequestDialogView.scss b/src/components/room/widgets/friend-request/FriendRequestDialogView.scss
similarity index 100%
rename from src/views/room/widgets/friend-request/FriendRequestDialogView.scss
rename to src/components/room/widgets/friend-request/FriendRequestDialogView.scss
diff --git a/src/views/room/widgets/friend-request/FriendRequestDialogView.tsx b/src/components/room/widgets/friend-request/FriendRequestDialogView.tsx
similarity index 100%
rename from src/views/room/widgets/friend-request/FriendRequestDialogView.tsx
rename to src/components/room/widgets/friend-request/FriendRequestDialogView.tsx
diff --git a/src/views/room/widgets/friend-request/FriendRequestWidgetView.tsx b/src/components/room/widgets/friend-request/FriendRequestWidgetView.tsx
similarity index 100%
rename from src/views/room/widgets/friend-request/FriendRequestWidgetView.tsx
rename to src/components/room/widgets/friend-request/FriendRequestWidgetView.tsx
diff --git a/src/views/room/widgets/furniture/FurnitureWidgets.scss b/src/components/room/widgets/furniture/FurnitureWidgets.scss
similarity index 100%
rename from src/views/room/widgets/furniture/FurnitureWidgets.scss
rename to src/components/room/widgets/furniture/FurnitureWidgets.scss
diff --git a/src/views/room/widgets/furniture/FurnitureWidgetsView.tsx b/src/components/room/widgets/furniture/FurnitureWidgetsView.tsx
similarity index 100%
rename from src/views/room/widgets/furniture/FurnitureWidgetsView.tsx
rename to src/components/room/widgets/furniture/FurnitureWidgetsView.tsx
diff --git a/src/views/room/widgets/furniture/background-color/FurnitureBackgroundColorView.tsx b/src/components/room/widgets/furniture/background-color/FurnitureBackgroundColorView.tsx
similarity index 100%
rename from src/views/room/widgets/furniture/background-color/FurnitureBackgroundColorView.tsx
rename to src/components/room/widgets/furniture/background-color/FurnitureBackgroundColorView.tsx
diff --git a/src/views/room/widgets/furniture/badge-display/FurnitureBadgeDisplayView.tsx b/src/components/room/widgets/furniture/badge-display/FurnitureBadgeDisplayView.tsx
similarity index 100%
rename from src/views/room/widgets/furniture/badge-display/FurnitureBadgeDisplayView.tsx
rename to src/components/room/widgets/furniture/badge-display/FurnitureBadgeDisplayView.tsx
diff --git a/src/views/room/widgets/furniture/context-menu/EffectBoxConfirmView.tsx b/src/components/room/widgets/furniture/context-menu/EffectBoxConfirmView.tsx
similarity index 100%
rename from src/views/room/widgets/furniture/context-menu/EffectBoxConfirmView.tsx
rename to src/components/room/widgets/furniture/context-menu/EffectBoxConfirmView.tsx
diff --git a/src/views/room/widgets/furniture/context-menu/FurnitureContextMenuView.tsx b/src/components/room/widgets/furniture/context-menu/FurnitureContextMenuView.tsx
similarity index 100%
rename from src/views/room/widgets/furniture/context-menu/FurnitureContextMenuView.tsx
rename to src/components/room/widgets/furniture/context-menu/FurnitureContextMenuView.tsx
diff --git a/src/views/room/widgets/furniture/context-menu/MonsterPlantSeedConfirmView.tsx b/src/components/room/widgets/furniture/context-menu/MonsterPlantSeedConfirmView.tsx
similarity index 97%
rename from src/views/room/widgets/furniture/context-menu/MonsterPlantSeedConfirmView.tsx
rename to src/components/room/widgets/furniture/context-menu/MonsterPlantSeedConfirmView.tsx
index 91a63b03..2c040ef2 100644
--- a/src/views/room/widgets/furniture/context-menu/MonsterPlantSeedConfirmView.tsx
+++ b/src/components/room/widgets/furniture/context-menu/MonsterPlantSeedConfirmView.tsx
@@ -2,7 +2,7 @@ import { IFurnitureData, RoomObjectCategory } from '@nitrots/nitro-renderer';
 import { FC, useEffect, useState } from 'react';
 import { GetFurnitureDataForRoomObject, LocalizeText, RoomWidgetUseProductMessage } from '../../../../../api';
 import { Base, Button, Column, Flex, NitroCardContentView, NitroCardHeaderView, NitroCardView, Text } from '../../../../../common';
-import { FurniCategory } from '../../../../../components/inventory/common/FurniCategory';
+import { FurniCategory } from '../../../../inventory/common/FurniCategory';
 import { useRoomContext } from '../../../RoomContext';
 
 interface MonsterPlantSeedConfirmViewProps
diff --git a/src/views/room/widgets/furniture/context-menu/PurchasableClothingConfirmView.tsx b/src/components/room/widgets/furniture/context-menu/PurchasableClothingConfirmView.tsx
similarity index 93%
rename from src/views/room/widgets/furniture/context-menu/PurchasableClothingConfirmView.tsx
rename to src/components/room/widgets/furniture/context-menu/PurchasableClothingConfirmView.tsx
index b58c0f28..4e3144b8 100644
--- a/src/views/room/widgets/furniture/context-menu/PurchasableClothingConfirmView.tsx
+++ b/src/components/room/widgets/furniture/context-menu/PurchasableClothingConfirmView.tsx
@@ -2,9 +2,9 @@ import { RedeemItemClothingComposer, RoomObjectCategory, UserFigureComposer } fr
 import { FC, useEffect, useState } from 'react';
 import { GetAvatarRenderManager, GetConnection, GetFurnitureDataForRoomObject, GetSessionDataManager, LocalizeText } from '../../../../../api';
 import { Base, Button, Column, Flex, NitroCardContentView, NitroCardHeaderView, NitroCardView, Text } from '../../../../../common';
-import { FigureData } from '../../../../../components/avatar-editor/common/FigureData';
-import { FurniCategory } from '../../../../../components/inventory/common/FurniCategory';
-import { AvatarImageView } from '../../../../shared/avatar-image/AvatarImageView';
+import { AvatarImageView } from '../../../../../views/shared/avatar-image/AvatarImageView';
+import { FigureData } from '../../../../avatar-editor/common/FigureData';
+import { FurniCategory } from '../../../../inventory/common/FurniCategory';
 import { useRoomContext } from '../../../RoomContext';
 
 interface PurchasableClothingConfirmViewProps
diff --git a/src/views/room/widgets/furniture/custom-stack-height/FurnitureCustomStackHeightView.tsx b/src/components/room/widgets/furniture/custom-stack-height/FurnitureCustomStackHeightView.tsx
similarity index 100%
rename from src/views/room/widgets/furniture/custom-stack-height/FurnitureCustomStackHeightView.tsx
rename to src/components/room/widgets/furniture/custom-stack-height/FurnitureCustomStackHeightView.tsx
diff --git a/src/views/room/widgets/furniture/dimmer/DimmerFurnitureWidgetPresetItem.ts b/src/components/room/widgets/furniture/dimmer/DimmerFurnitureWidgetPresetItem.ts
similarity index 100%
rename from src/views/room/widgets/furniture/dimmer/DimmerFurnitureWidgetPresetItem.ts
rename to src/components/room/widgets/furniture/dimmer/DimmerFurnitureWidgetPresetItem.ts
diff --git a/src/views/room/widgets/furniture/dimmer/FurnitureDimmerView.tsx b/src/components/room/widgets/furniture/dimmer/FurnitureDimmerView.tsx
similarity index 100%
rename from src/views/room/widgets/furniture/dimmer/FurnitureDimmerView.tsx
rename to src/components/room/widgets/furniture/dimmer/FurnitureDimmerView.tsx
diff --git a/src/views/room/widgets/furniture/exchange-credit/FurnitureExchangeCreditView.tsx b/src/components/room/widgets/furniture/exchange-credit/FurnitureExchangeCreditView.tsx
similarity index 100%
rename from src/views/room/widgets/furniture/exchange-credit/FurnitureExchangeCreditView.tsx
rename to src/components/room/widgets/furniture/exchange-credit/FurnitureExchangeCreditView.tsx
diff --git a/src/views/room/widgets/furniture/external-image/FurnitureExternalImageView.tsx b/src/components/room/widgets/furniture/external-image/FurnitureExternalImageView.tsx
similarity index 100%
rename from src/views/room/widgets/furniture/external-image/FurnitureExternalImageView.tsx
rename to src/components/room/widgets/furniture/external-image/FurnitureExternalImageView.tsx
diff --git a/src/views/room/widgets/furniture/friend-furni/FriendFurniLockData.ts b/src/components/room/widgets/furniture/friend-furni/FriendFurniLockData.ts
similarity index 100%
rename from src/views/room/widgets/furniture/friend-furni/FriendFurniLockData.ts
rename to src/components/room/widgets/furniture/friend-furni/FriendFurniLockData.ts
diff --git a/src/views/room/widgets/furniture/friend-furni/FurnitureFriendFurniView.scss b/src/components/room/widgets/furniture/friend-furni/FurnitureFriendFurniView.scss
similarity index 100%
rename from src/views/room/widgets/furniture/friend-furni/FurnitureFriendFurniView.scss
rename to src/components/room/widgets/furniture/friend-furni/FurnitureFriendFurniView.scss
diff --git a/src/views/room/widgets/furniture/friend-furni/FurnitureFriendFurniView.tsx b/src/components/room/widgets/furniture/friend-furni/FurnitureFriendFurniView.tsx
similarity index 98%
rename from src/views/room/widgets/furniture/friend-furni/FurnitureFriendFurniView.tsx
rename to src/components/room/widgets/furniture/friend-furni/FurnitureFriendFurniView.tsx
index a04deeaf..0a5bdc44 100644
--- a/src/views/room/widgets/furniture/friend-furni/FurnitureFriendFurniView.tsx
+++ b/src/components/room/widgets/furniture/friend-furni/FurnitureFriendFurniView.tsx
@@ -3,7 +3,7 @@ import { FC, useCallback, useState } from 'react';
 import { GetRoomEngine, GetRoomSession, LocalizeText, RoomWidgetUpdateRoomObjectEvent } from '../../../../../api';
 import { DraggableWindow, NitroCardContentView, NitroCardHeaderView, NitroCardView } from '../../../../../common';
 import { UseEventDispatcherHook, UseMessageEventHook, UseRoomEngineEvent } from '../../../../../hooks';
-import { AvatarImageView } from '../../../../shared/avatar-image/AvatarImageView';
+import { AvatarImageView } from '../../../../../views/shared/avatar-image/AvatarImageView';
 import { useRoomContext } from '../../../RoomContext';
 import { FurnitureEngravingLockData } from './FriendFurniLockData';
 
diff --git a/src/views/room/widgets/furniture/gift-opening/FurnitureGiftOpeningView.tsx b/src/components/room/widgets/furniture/gift-opening/FurnitureGiftOpeningView.tsx
similarity index 99%
rename from src/views/room/widgets/furniture/gift-opening/FurnitureGiftOpeningView.tsx
rename to src/components/room/widgets/furniture/gift-opening/FurnitureGiftOpeningView.tsx
index 8202ba62..f481e8d1 100644
--- a/src/views/room/widgets/furniture/gift-opening/FurnitureGiftOpeningView.tsx
+++ b/src/components/room/widgets/furniture/gift-opening/FurnitureGiftOpeningView.tsx
@@ -2,9 +2,9 @@ import { RoomObjectCategory, RoomObjectOperationType } from '@nitrots/nitro-rend
 import { FC, useCallback, useMemo, useState } from 'react';
 import { CreateLinkEvent, GetRoomEngine, GetSessionDataManager, LocalizeText, RoomWidgetPresentOpenMessage, RoomWidgetUpdatePresentDataEvent, RoomWidgetUpdateRoomObjectEvent } from '../../../../../api';
 import { Button, Column, Flex, LayoutGiftTagView, NitroCardContentView, NitroCardHeaderView, NitroCardView, Text } from '../../../../../common';
-import { ProductTypeEnum } from '../../../../../components/catalog/common/ProductTypeEnum';
 import { BatchUpdates } from '../../../../../hooks';
 import { UseEventDispatcherHook } from '../../../../../hooks/events/UseEventDispatcherHook';
+import { ProductTypeEnum } from '../../../../catalog/common/ProductTypeEnum';
 import { useRoomContext } from '../../../RoomContext';
 
 const FLOOR: string = 'floor';
diff --git a/src/views/room/widgets/furniture/high-score/FurnitureHighScoreView.scss b/src/components/room/widgets/furniture/high-score/FurnitureHighScoreView.scss
similarity index 100%
rename from src/views/room/widgets/furniture/high-score/FurnitureHighScoreView.scss
rename to src/components/room/widgets/furniture/high-score/FurnitureHighScoreView.scss
diff --git a/src/views/room/widgets/furniture/high-score/FurnitureHighScoreView.tsx b/src/components/room/widgets/furniture/high-score/FurnitureHighScoreView.tsx
similarity index 100%
rename from src/views/room/widgets/furniture/high-score/FurnitureHighScoreView.tsx
rename to src/components/room/widgets/furniture/high-score/FurnitureHighScoreView.tsx
diff --git a/src/views/room/widgets/furniture/manipulation-menu/FurnitureManipulationMenuView.scss b/src/components/room/widgets/furniture/manipulation-menu/FurnitureManipulationMenuView.scss
similarity index 100%
rename from src/views/room/widgets/furniture/manipulation-menu/FurnitureManipulationMenuView.scss
rename to src/components/room/widgets/furniture/manipulation-menu/FurnitureManipulationMenuView.scss
diff --git a/src/views/room/widgets/furniture/manipulation-menu/FurnitureManipulationMenuView.tsx b/src/components/room/widgets/furniture/manipulation-menu/FurnitureManipulationMenuView.tsx
similarity index 100%
rename from src/views/room/widgets/furniture/manipulation-menu/FurnitureManipulationMenuView.tsx
rename to src/components/room/widgets/furniture/manipulation-menu/FurnitureManipulationMenuView.tsx
diff --git a/src/views/room/widgets/furniture/mannequin/FurnitureMannequinData.ts b/src/components/room/widgets/furniture/mannequin/FurnitureMannequinData.ts
similarity index 100%
rename from src/views/room/widgets/furniture/mannequin/FurnitureMannequinData.ts
rename to src/components/room/widgets/furniture/mannequin/FurnitureMannequinData.ts
diff --git a/src/views/room/widgets/furniture/mannequin/FurnitureMannequinPreviewView.tsx b/src/components/room/widgets/furniture/mannequin/FurnitureMannequinPreviewView.tsx
similarity index 87%
rename from src/views/room/widgets/furniture/mannequin/FurnitureMannequinPreviewView.tsx
rename to src/components/room/widgets/furniture/mannequin/FurnitureMannequinPreviewView.tsx
index a9dfa6ad..f30d0824 100644
--- a/src/views/room/widgets/furniture/mannequin/FurnitureMannequinPreviewView.tsx
+++ b/src/components/room/widgets/furniture/mannequin/FurnitureMannequinPreviewView.tsx
@@ -1,6 +1,6 @@
 import { FC } from 'react';
 import { Base, LayoutCurrencyIcon } from '../../../../../common';
-import { AvatarImageView } from '../../../../shared/avatar-image/AvatarImageView';
+import { AvatarImageView } from '../../../../../views/shared/avatar-image/AvatarImageView';
 
 interface FurnitureMannequinPreviewViewProps
 {
diff --git a/src/views/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx b/src/components/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx
similarity index 99%
rename from src/views/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx
rename to src/components/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx
index a1e0861d..37e24b50 100644
--- a/src/views/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx
+++ b/src/components/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx
@@ -3,7 +3,7 @@ import { FC, KeyboardEvent, useCallback, useEffect, useState } from 'react';
 import { GetAvatarRenderManager, GetSessionDataManager, LocalizeText, RoomWidgetUpdateMannequinEvent, SendMessageComposer } from '../../../../../api';
 import { Base, Button, Column, Flex, LayoutCurrencyIcon, NitroCardContentView, NitroCardHeaderView, NitroCardView, Text } from '../../../../../common';
 import { BatchUpdates, UseEventDispatcherHook } from '../../../../../hooks';
-import { AvatarImageView } from '../../../../shared/avatar-image/AvatarImageView';
+import { AvatarImageView } from '../../../../../views/shared/avatar-image/AvatarImageView';
 import { useRoomContext } from '../../../RoomContext';
 
 const MODE_NONE: number = -1;
diff --git a/src/views/room/widgets/furniture/stickie/FurnitureStickieData.ts b/src/components/room/widgets/furniture/stickie/FurnitureStickieData.ts
similarity index 100%
rename from src/views/room/widgets/furniture/stickie/FurnitureStickieData.ts
rename to src/components/room/widgets/furniture/stickie/FurnitureStickieData.ts
diff --git a/src/views/room/widgets/furniture/stickie/FurnitureStickieUtils.ts b/src/components/room/widgets/furniture/stickie/FurnitureStickieUtils.ts
similarity index 100%
rename from src/views/room/widgets/furniture/stickie/FurnitureStickieUtils.ts
rename to src/components/room/widgets/furniture/stickie/FurnitureStickieUtils.ts
diff --git a/src/views/room/widgets/furniture/stickie/FurnitureStickieView.scss b/src/components/room/widgets/furniture/stickie/FurnitureStickieView.scss
similarity index 100%
rename from src/views/room/widgets/furniture/stickie/FurnitureStickieView.scss
rename to src/components/room/widgets/furniture/stickie/FurnitureStickieView.scss
diff --git a/src/views/room/widgets/furniture/stickie/FurnitureStickieView.tsx b/src/components/room/widgets/furniture/stickie/FurnitureStickieView.tsx
similarity index 100%
rename from src/views/room/widgets/furniture/stickie/FurnitureStickieView.tsx
rename to src/components/room/widgets/furniture/stickie/FurnitureStickieView.tsx
diff --git a/src/views/room/widgets/furniture/trophy/FurnitureTrophyData.ts b/src/components/room/widgets/furniture/trophy/FurnitureTrophyData.ts
similarity index 100%
rename from src/views/room/widgets/furniture/trophy/FurnitureTrophyData.ts
rename to src/components/room/widgets/furniture/trophy/FurnitureTrophyData.ts
diff --git a/src/views/room/widgets/furniture/trophy/FurnitureTrophyView.tsx b/src/components/room/widgets/furniture/trophy/FurnitureTrophyView.tsx
similarity index 100%
rename from src/views/room/widgets/furniture/trophy/FurnitureTrophyView.tsx
rename to src/components/room/widgets/furniture/trophy/FurnitureTrophyView.tsx
diff --git a/src/views/room/widgets/furniture/youtube-tv/FurnitureYoutubeDisplayView.scss b/src/components/room/widgets/furniture/youtube-tv/FurnitureYoutubeDisplayView.scss
similarity index 100%
rename from src/views/room/widgets/furniture/youtube-tv/FurnitureYoutubeDisplayView.scss
rename to src/components/room/widgets/furniture/youtube-tv/FurnitureYoutubeDisplayView.scss
diff --git a/src/views/room/widgets/furniture/youtube-tv/FurnitureYoutubeDisplayView.tsx b/src/components/room/widgets/furniture/youtube-tv/FurnitureYoutubeDisplayView.tsx
similarity index 100%
rename from src/views/room/widgets/furniture/youtube-tv/FurnitureYoutubeDisplayView.tsx
rename to src/components/room/widgets/furniture/youtube-tv/FurnitureYoutubeDisplayView.tsx
diff --git a/src/views/room/widgets/furniture/youtube-tv/utils/YoutubeVideoPlaybackStateEnum.ts b/src/components/room/widgets/furniture/youtube-tv/utils/YoutubeVideoPlaybackStateEnum.ts
similarity index 100%
rename from src/views/room/widgets/furniture/youtube-tv/utils/YoutubeVideoPlaybackStateEnum.ts
rename to src/components/room/widgets/furniture/youtube-tv/utils/YoutubeVideoPlaybackStateEnum.ts
diff --git a/src/views/room/widgets/infostand/InfoStandWidgetBotView.tsx b/src/components/room/widgets/infostand/InfoStandWidgetBotView.tsx
similarity index 96%
rename from src/views/room/widgets/infostand/InfoStandWidgetBotView.tsx
rename to src/components/room/widgets/infostand/InfoStandWidgetBotView.tsx
index 41220732..7369d301 100644
--- a/src/views/room/widgets/infostand/InfoStandWidgetBotView.tsx
+++ b/src/components/room/widgets/infostand/InfoStandWidgetBotView.tsx
@@ -2,7 +2,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { FC } from 'react';
 import { LocalizeText, RoomWidgetUpdateInfostandUserEvent } from '../../../../api';
 import { Column, Flex, LayoutBadgeImageView, Text } from '../../../../common';
-import { AvatarImageView } from '../../../shared/avatar-image/AvatarImageView';
+import { AvatarImageView } from '../../../../views/shared/avatar-image/AvatarImageView';
 
 interface InfoStandWidgetBotViewProps
 {
diff --git a/src/views/room/widgets/infostand/InfoStandWidgetFurniView.tsx b/src/components/room/widgets/infostand/InfoStandWidgetFurniView.tsx
similarity index 99%
rename from src/views/room/widgets/infostand/InfoStandWidgetFurniView.tsx
rename to src/components/room/widgets/infostand/InfoStandWidgetFurniView.tsx
index 4b85b1b7..5b73cab6 100644
--- a/src/views/room/widgets/infostand/InfoStandWidgetFurniView.tsx
+++ b/src/components/room/widgets/infostand/InfoStandWidgetFurniView.tsx
@@ -4,7 +4,7 @@ import { FC, useCallback, useEffect, useState } from 'react';
 import { CreateLinkEvent, GetGroupInformation, GetRoomEngine, LocalizeText, RoomWidgetFurniActionMessage, RoomWidgetUpdateInfostandFurniEvent, SendMessageComposer } from '../../../../api';
 import { Button, Column, Flex, LayoutBadgeImageView, LayoutRarityLevelView, Text, UserProfileIconView } from '../../../../common';
 import { BatchUpdates, UseMessageEventHook } from '../../../../hooks';
-import { LimitedEditionCompactPlateView } from '../../../shared/limited-edition/LimitedEditionCompactPlateView';
+import { LimitedEditionCompactPlateView } from '../../../../views/shared/limited-edition/LimitedEditionCompactPlateView';
 import { useRoomContext } from '../../RoomContext';
 
 interface InfoStandWidgetFurniViewProps
diff --git a/src/views/room/widgets/infostand/InfoStandWidgetPetView.tsx b/src/components/room/widgets/infostand/InfoStandWidgetPetView.tsx
similarity index 98%
rename from src/views/room/widgets/infostand/InfoStandWidgetPetView.tsx
rename to src/components/room/widgets/infostand/InfoStandWidgetPetView.tsx
index 244332d5..0ff4dc5c 100644
--- a/src/views/room/widgets/infostand/InfoStandWidgetPetView.tsx
+++ b/src/components/room/widgets/infostand/InfoStandWidgetPetView.tsx
@@ -2,7 +2,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { FC } from 'react';
 import { LocalizeText, RoomWidgetUpdateInfostandPetEvent } from '../../../../api';
 import { Base, Column, Flex, Text, UserProfileIconView } from '../../../../common';
-import { PetImageView } from '../../../shared/pet-image/PetImageView';
+import { PetImageView } from '../../../../views/shared/pet-image/PetImageView';
 
 interface InfoStandWidgetPetViewProps
 {
diff --git a/src/views/room/widgets/infostand/InfoStandWidgetRentableBotView.tsx b/src/components/room/widgets/infostand/InfoStandWidgetRentableBotView.tsx
similarity index 97%
rename from src/views/room/widgets/infostand/InfoStandWidgetRentableBotView.tsx
rename to src/components/room/widgets/infostand/InfoStandWidgetRentableBotView.tsx
index d2e5b319..12f56403 100644
--- a/src/views/room/widgets/infostand/InfoStandWidgetRentableBotView.tsx
+++ b/src/components/room/widgets/infostand/InfoStandWidgetRentableBotView.tsx
@@ -3,7 +3,7 @@ import { BotRemoveComposer } from '@nitrots/nitro-renderer';
 import { FC, useMemo } from 'react';
 import { LocalizeText, RoomWidgetUpdateInfostandRentableBotEvent, SendMessageComposer } from '../../../../api';
 import { Button, Column, Flex, LayoutBadgeImageView, Text, UserProfileIconView } from '../../../../common';
-import { AvatarImageView } from '../../../shared/avatar-image/AvatarImageView';
+import { AvatarImageView } from '../../../../views/shared/avatar-image/AvatarImageView';
 import { BotSkillsEnum } from '../avatar-info/common/BotSkillsEnum';
 
 interface InfoStandWidgetRentableBotViewProps
diff --git a/src/views/room/widgets/infostand/InfoStandWidgetUserRelationshipsView.tsx b/src/components/room/widgets/infostand/InfoStandWidgetUserRelationshipsView.tsx
similarity index 100%
rename from src/views/room/widgets/infostand/InfoStandWidgetUserRelationshipsView.tsx
rename to src/components/room/widgets/infostand/InfoStandWidgetUserRelationshipsView.tsx
diff --git a/src/views/room/widgets/infostand/InfoStandWidgetUserView.tsx b/src/components/room/widgets/infostand/InfoStandWidgetUserView.tsx
similarity index 98%
rename from src/views/room/widgets/infostand/InfoStandWidgetUserView.tsx
rename to src/components/room/widgets/infostand/InfoStandWidgetUserView.tsx
index f7ccd8a5..ef0aac7f 100644
--- a/src/views/room/widgets/infostand/InfoStandWidgetUserView.tsx
+++ b/src/components/room/widgets/infostand/InfoStandWidgetUserView.tsx
@@ -4,7 +4,7 @@ import { FC, FocusEvent, KeyboardEvent, useCallback, useEffect, useState } from
 import { GetConfiguration, GetGroupInformation, LocalizeText, RoomWidgetChangeMottoMessage, RoomWidgetUpdateInfostandUserEvent, SendMessageComposer } from '../../../../api';
 import { Base, Column, Flex, LayoutBadgeImageView, Text, UserProfileIconView } from '../../../../common';
 import { BatchUpdates, UseEventDispatcherHook, UseMessageEventHook } from '../../../../hooks';
-import { AvatarImageView } from '../../../shared/avatar-image/AvatarImageView';
+import { AvatarImageView } from '../../../../views/shared/avatar-image/AvatarImageView';
 import { useRoomContext } from '../../RoomContext';
 import { InfoStandWidgetUserRelationshipsView } from './InfoStandWidgetUserRelationshipsView';
 
diff --git a/src/views/room/widgets/infostand/InfoStandWidgetView.scss b/src/components/room/widgets/infostand/InfoStandWidgetView.scss
similarity index 100%
rename from src/views/room/widgets/infostand/InfoStandWidgetView.scss
rename to src/components/room/widgets/infostand/InfoStandWidgetView.scss
diff --git a/src/views/room/widgets/infostand/InfoStandWidgetView.tsx b/src/components/room/widgets/infostand/InfoStandWidgetView.tsx
similarity index 100%
rename from src/views/room/widgets/infostand/InfoStandWidgetView.tsx
rename to src/components/room/widgets/infostand/InfoStandWidgetView.tsx
diff --git a/src/views/room/widgets/object-location/ObjectLocationView.tsx b/src/components/room/widgets/object-location/ObjectLocationView.tsx
similarity index 100%
rename from src/views/room/widgets/object-location/ObjectLocationView.tsx
rename to src/components/room/widgets/object-location/ObjectLocationView.tsx
diff --git a/src/views/room/widgets/room-thumbnail/RoomThumbnailWidgetView.tsx b/src/components/room/widgets/room-thumbnail/RoomThumbnailWidgetView.tsx
similarity index 100%
rename from src/views/room/widgets/room-thumbnail/RoomThumbnailWidgetView.tsx
rename to src/components/room/widgets/room-thumbnail/RoomThumbnailWidgetView.tsx
diff --git a/src/views/room/widgets/room-tools/RoomToolsWidgetView.tsx b/src/components/room/widgets/room-tools/RoomToolsWidgetView.tsx
similarity index 100%
rename from src/views/room/widgets/room-tools/RoomToolsWidgetView.tsx
rename to src/components/room/widgets/room-tools/RoomToolsWidgetView.tsx
diff --git a/src/views/room/widgets/user-location/UserLocationView.tsx b/src/components/room/widgets/user-location/UserLocationView.tsx
similarity index 100%
rename from src/views/room/widgets/user-location/UserLocationView.tsx
rename to src/components/room/widgets/user-location/UserLocationView.tsx
diff --git a/src/views/room/widgets/word-quiz/WordQuizQuestionView.tsx b/src/components/room/widgets/word-quiz/WordQuizQuestionView.tsx
similarity index 100%
rename from src/views/room/widgets/word-quiz/WordQuizQuestionView.tsx
rename to src/components/room/widgets/word-quiz/WordQuizQuestionView.tsx
diff --git a/src/views/room/widgets/word-quiz/WordQuizVoteView.tsx b/src/components/room/widgets/word-quiz/WordQuizVoteView.tsx
similarity index 100%
rename from src/views/room/widgets/word-quiz/WordQuizVoteView.tsx
rename to src/components/room/widgets/word-quiz/WordQuizVoteView.tsx
diff --git a/src/views/room/widgets/word-quiz/WordQuizWidgetView.tsx b/src/components/room/widgets/word-quiz/WordQuizWidgetView.tsx
similarity index 100%
rename from src/views/room/widgets/word-quiz/WordQuizWidgetView.tsx
rename to src/components/room/widgets/word-quiz/WordQuizWidgetView.tsx
diff --git a/src/views/room/widgets/word-quiz/common/VoteValue.ts b/src/components/room/widgets/word-quiz/common/VoteValue.ts
similarity index 100%
rename from src/views/room/widgets/word-quiz/common/VoteValue.ts
rename to src/components/room/widgets/word-quiz/common/VoteValue.ts
diff --git a/src/views/Styles.scss b/src/views/Styles.scss
index 52fbdfd8..a9770cba 100644
--- a/src/views/Styles.scss
+++ b/src/views/Styles.scss
@@ -2,7 +2,6 @@
 @import "./friends/FriendsView";
 @import "./hotel-view/HotelView";
 @import "./notification-center/NotificationCenterView";
-@import "./room/RoomView";
 @import "./floorplan-editor/FloorplanEditorView";
 @import "./nitropedia/NitropediaView";
 @import "./hc-center/HcCenterView.scss";