More restructuring

src/views/catalog/CatalogMessageHandler.tsx

@@ -6,10 +6,10 @@ import { CatalogPurchaseSoldOutEvent } from '../../events/catalog/CatalogPurchas
 import { dispatchUiEvent } from '../../hooks/events/ui/ui-event';
 import { CreateMessageHook } from '../../hooks/messages/message-event';
 import { CatalogMessageHandlerProps } from './CatalogMessageHandler.types';
+import { CatalogPetPalette } from './common/CatalogPetPalette';
+import { SubscriptionInfo } from './common/SubscriptionInfo';
 import { useCatalogContext } from './context/CatalogContext';
 import { CatalogActions } from './reducers/CatalogReducer';
-import { CatalogPetPalette } from './utils/CatalogPetPalette';
-import { SubscriptionInfo } from './utils/SubscriptionInfo';
 
 export const CatalogMessageHandler: FC<CatalogMessageHandlerProps> = props =>
 {

src/views/catalog/reducers/CatalogReducer.tsx

@@ -1,8 +1,8 @@
 import { CatalogClubOfferData, CatalogGroupData, CatalogPageOfferData, ICatalogPageData, ICatalogPageParser } from 'nitro-renderer';
 import { Reducer } from 'react';
-import { CatalogPetPalette } from '../utils/CatalogPetPalette';
+import { CatalogPetPalette } from '../common/CatalogPetPalette';
-import { ICatalogOffers, ICatalogSearchResult, SetOffersToNodes } from '../utils/CatalogUtilities';
+import { ICatalogOffers, ICatalogSearchResult, SetOffersToNodes } from '../common/CatalogUtilities';
-import { SubscriptionInfo } from '../utils/SubscriptionInfo';
+import { SubscriptionInfo } from '../common/SubscriptionInfo';
 
 export interface ICatalogState
 {

src/views/catalog/views/page/CatalogPageView.tsx

@@ -1,9 +1,9 @@
 import { Vector3d } from 'nitro-renderer';
 import { FC, useEffect } from 'react';
 import { GetAvatarRenderManager, GetFurnitureDataForProductOffer, GetSessionDataManager } from '../../../../api';
+import { FurniCategory } from '../../common/FurniCategory';
+import { ProductTypeEnum } from '../../common/ProductTypeEnum';
 import { useCatalogContext } from '../../context/CatalogContext';
-import { FurniCategory } from '../../enums/FurniCategory';
-import { ProductTypeEnum } from '../../enums/ProductTypeEnum';
 import { CatalogPageViewProps } from './CatalogPageView.types';
 import { GetCatalogLayout } from './layout/GetCatalogLayout';
 import { CatalogLayoutSearchResultView } from './search-result/CatalogLayoutSearchResultView';

src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.tsx

@@ -1,8 +1,8 @@
 import { FC } from 'react';
 import { LimitedEditionCompletePlateView } from '../../../../../shared/limited-edition/complete-plate/LimitedEditionCompletePlateView';
-import { RoomPreviewerView } from '../../../../../room-previewer/RoomPreviewerView';
+import { RoomPreviewerView } from '../../../../../shared/room-previewer/RoomPreviewerView';
+import { GetCatalogPageImage, GetCatalogPageText, GetOfferName } from '../../../../common/CatalogUtilities';
 import { useCatalogContext } from '../../../../context/CatalogContext';
-import { GetCatalogPageImage, GetCatalogPageText, GetOfferName } from '../../../../utils/CatalogUtilities';
 import { CatalogPageOffersView } from '../../offers/CatalogPageOffersView';
 import { CatalogPurchaseView } from '../../purchase/CatalogPurchaseView';
 import { CatalogLayoutDefaultViewProps } from './CatalogLayoutDefaultView.types';

src/views/catalog/views/page/layout/guild-custom-furni/CatalogLayoutGuildCustomFurniView.tsx

@@ -2,9 +2,9 @@ import { CatalogGroupsComposer } from 'nitro-renderer';
 import { FC, useEffect } from 'react';
 import { SendMessageHook } from '../../../../../../hooks/messages';
 import { LocalizeText } from '../../../../../../utils/LocalizeText';
-import { RoomPreviewerView } from '../../../../../room-previewer/RoomPreviewerView';
+import { RoomPreviewerView } from '../../../../../shared/room-previewer/RoomPreviewerView';
+import { GetOfferName } from '../../../../common/CatalogUtilities';
 import { useCatalogContext } from '../../../../context/CatalogContext';
-import { GetOfferName } from '../../../../utils/CatalogUtilities';
 import { CatalogPageOffersView } from '../../offers/CatalogPageOffersView';
 import { CatalogPurchaseView } from '../../purchase/CatalogPurchaseView';
 import { CatalogLayoutGuildCustomFurniViewProps } from './CatalogLayoutGuildCustomFurniView.types';

src/views/catalog/views/page/layout/guild-forum/CatalogLayoutGuildForumView.tsx

@@ -2,9 +2,9 @@ import { CatalogGroupsComposer } from 'nitro-renderer';
 import { FC, useEffect } from 'react';
 import { SendMessageHook } from '../../../../../../hooks/messages';
 import { LocalizeText } from '../../../../../../utils/LocalizeText';
+import { GetCatalogPageText } from '../../../../common/CatalogUtilities';
 import { useCatalogContext } from '../../../../context/CatalogContext';
 import { CatalogActions } from '../../../../reducers/CatalogReducer';
-import { GetCatalogPageText } from '../../../../utils/CatalogUtilities';
 import { CatalogLayoutGuildForumViewProps } from './CatalogLayoutGuildForumView.types';
 
 export const CatalogLayouGuildForumView: FC<CatalogLayoutGuildForumViewProps> = props =>

src/views/catalog/views/page/layout/info-loyalty/CatalogLayoutInfoLoyaltyView.tsx

@@ -1,5 +1,5 @@
 import { FC } from 'react';
-import { GetCatalogPageText } from '../../../../utils/CatalogUtilities';
+import { GetCatalogPageText } from '../../../../common/CatalogUtilities';
 import { CatalogLayoutInfoLoyaltyViewProps } from './CatalogLayoutInfoLoyaltyView.types';
 
 export const CatalogLayoutInfoLoyaltyView: FC<CatalogLayoutInfoLoyaltyViewProps> = props =>

src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx

@@ -3,11 +3,11 @@ import { FC, useEffect, useMemo, useState } from 'react';
 import { GetProductDataForLocalization } from '../../../../../../api/nitro/session/GetProductDataForLocalization';
 import { SendMessageHook } from '../../../../../../hooks/messages/message-event';
 import { LocalizeText } from '../../../../../../utils/LocalizeText';
-import { RoomPreviewerView } from '../../../../../room-previewer/RoomPreviewerView';
 import { PetImageView } from '../../../../../shared/pet-image/PetImageView';
+import { RoomPreviewerView } from '../../../../../shared/room-previewer/RoomPreviewerView';
+import { GetCatalogPageImage, GetCatalogPageText, GetPetAvailableColors, GetPetIndexFromLocalization } from '../../../../common/CatalogUtilities';
 import { useCatalogContext } from '../../../../context/CatalogContext';
 import { CatalogActions } from '../../../../reducers/CatalogReducer';
-import { GetCatalogPageImage, GetCatalogPageText, GetPetAvailableColors, GetPetIndexFromLocalization } from '../../../../utils/CatalogUtilities';
 import { CatalogLayoutPetViewProps } from './CatalogLayoutPetView.types';
 import { CatalogLayoutPetPurchaseView } from './purchase/CatalogLayoutPetPurchaseView';
 

src/views/catalog/views/page/layout/pets2/CatalogLayoutPets2View.tsx

@@ -1,5 +1,5 @@
 import { FC } from 'react';
-import { GetCatalogPageImage, GetCatalogPageText } from '../../../../utils/CatalogUtilities';
+import { GetCatalogPageImage, GetCatalogPageText } from '../../../../common/CatalogUtilities';
 import { CatalogLayoutPets2ViewProps } from './CatalogLayoutPets2View.types';
 
 export const CatalogLayoutPets2View: FC<CatalogLayoutPets2ViewProps> = props =>

src/views/catalog/views/page/layout/pets3/CatalogLayoutPets3View.tsx

@@ -1,5 +1,5 @@
 import { FC } from 'react';
-import { GetCatalogPageImage, GetCatalogPageText } from '../../../../utils/CatalogUtilities';
+import { GetCatalogPageImage, GetCatalogPageText } from '../../../../common/CatalogUtilities';
 import { CatalogLayoutPets3ViewProps } from './CatalogLayoutPets3View.types';
 
 export const CatalogLayoutPets3View: FC<CatalogLayoutPets3ViewProps> = props =>

src/views/catalog/views/page/layout/single-bundle/CatalogLayoutSingleBundleView.tsx

@@ -1,6 +1,6 @@
 import { FC } from 'react';
+import { GetCatalogPageImage, GetCatalogPageText } from '../../../../common/CatalogUtilities';
 import { useCatalogContext } from '../../../../context/CatalogContext';
-import { GetCatalogPageImage, GetCatalogPageText } from '../../../../utils/CatalogUtilities';
 import { CatalogProductView } from '../../product/CatalogProductView';
 import { CatalogPurchaseView } from '../../purchase/CatalogPurchaseView';
 import { CatalogLayoutSingleBundleViewProps } from './CatalogLayoutSingleBundleView.types';

src/views/catalog/views/page/layout/spaces-new/CatalogLayoutSpacesView.tsx

@@ -2,10 +2,10 @@ import { CatalogPageOfferData, IFurnitureData } from 'nitro-renderer';
 import { FC, useEffect, useState } from 'react';
 import { GetSessionDataManager } from '../../../../../../api';
 import { LocalizeText } from '../../../../../../utils/LocalizeText';
-import { RoomPreviewerView } from '../../../../../room-previewer/RoomPreviewerView';
+import { RoomPreviewerView } from '../../../../../shared/room-previewer/RoomPreviewerView';
+import { GetCatalogPageImage, GetCatalogPageText, GetOfferName } from '../../../../common/CatalogUtilities';
+import { ProductTypeEnum } from '../../../../common/ProductTypeEnum';
 import { useCatalogContext } from '../../../../context/CatalogContext';
-import { ProductTypeEnum } from '../../../../enums/ProductTypeEnum';
-import { GetCatalogPageImage, GetCatalogPageText, GetOfferName } from '../../../../utils/CatalogUtilities';
 import { CatalogPageOffersView } from '../../offers/CatalogPageOffersView';
 import { CatalogPurchaseView } from '../../purchase/CatalogPurchaseView';
 import { CatalogLayoutSpacesViewProps } from './CatalogLayoutSpacesView.types';

src/views/catalog/views/page/layout/trophies/CatalogLayoutTrophiesView.tsx

@@ -1,7 +1,7 @@
 import { FC, useState } from 'react';
-import { RoomPreviewerView } from '../../../../../room-previewer/RoomPreviewerView';
+import { RoomPreviewerView } from '../../../../../shared/room-previewer/RoomPreviewerView';
+import { GetOfferName } from '../../../../common/CatalogUtilities';
 import { useCatalogContext } from '../../../../context/CatalogContext';
-import { GetOfferName } from '../../../../utils/CatalogUtilities';
 import { CatalogPageOffersView } from '../../offers/CatalogPageOffersView';
 import { CatalogPurchaseView } from '../../purchase/CatalogPurchaseView';
 import { CatalogLayoutTrophiesViewProps } from './CatalogLayoutTrophiesView.types';

src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx

@@ -3,8 +3,8 @@ import { FC, useCallback, useEffect, useMemo } from 'react';
 import { SendMessageHook } from '../../../../../../hooks/messages/message-event';
 import { LocalizeText } from '../../../../../../utils/LocalizeText';
 import { CurrencyIcon } from '../../../../../shared/currency-icon/CurrencyIcon';
+import { GetCatalogPageImage } from '../../../../common/CatalogUtilities';
 import { useCatalogContext } from '../../../../context/CatalogContext';
-import { GetCatalogPageImage } from '../../../../utils/CatalogUtilities';
 import { CatalogLayoutVipBuyViewProps } from './CatalogLayoutVipBuyView.types';
 
 export const CatalogLayoutVipBuyView: FC<CatalogLayoutVipBuyViewProps> = props =>

src/views/catalog/views/page/product/CatalogProductView.tsx

@@ -4,7 +4,7 @@ import { GetRoomEngine, GetSessionDataManager } from '../../../../../api';
 import { GetConfiguration } from '../../../../../utils/GetConfiguration';
 import { AvatarImageView } from '../../../../shared/avatar-image/AvatarImageView';
 import { LimitedEditionStyledNumberView } from '../../../../shared/limited-edition/styled-number/LimitedEditionStyledNumberView';
-import { ProductTypeEnum } from '../../../enums/ProductTypeEnum';
+import { ProductTypeEnum } from '../../../common/ProductTypeEnum';
 import { CatalogProductViewProps } from './CatalogProductView.types';
 
 export const CatalogProductView: FC<CatalogProductViewProps> = props =>

src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.tsx

@@ -5,7 +5,7 @@ import { useUiEvent } from '../../../../../../hooks/events/ui/ui-event';
 import { SendMessageHook } from '../../../../../../hooks/messages/message-event';
 import { LoadingSpinnerView } from '../../../../../../layout';
 import { LocalizeText } from '../../../../../../utils/LocalizeText';
-import { GetCurrencyAmount } from '../../../../../purse/utils/CurrencyHelper';
+import { GetCurrencyAmount } from '../../../../../purse/common/CurrencyHelper';
 import { CatalogPurchaseButtonViewProps, CatalogPurchaseState } from './CatalogPurchaseButtonView.types';
 
 export const CatalogPurchaseButtonView: FC<CatalogPurchaseButtonViewProps> = props =>

src/views/catalog/views/page/search-result/CatalogLayoutSearchResultView.tsx

@@ -1,8 +1,8 @@
 import { FC } from 'react';
-import { RoomPreviewerView } from '../../../../room-previewer/RoomPreviewerView';
 import { LimitedEditionCompletePlateView } from '../../../../shared/limited-edition/complete-plate/LimitedEditionCompletePlateView';
+import { RoomPreviewerView } from '../../../../shared/room-previewer/RoomPreviewerView';
+import { GetOfferName } from '../../../common/CatalogUtilities';
 import { useCatalogContext } from '../../../context/CatalogContext';
-import { GetOfferName } from '../../../utils/CatalogUtilities';
 import { CatalogPurchaseView } from '../purchase/CatalogPurchaseView';
 import { CatalogLayoutSearchResultViewProps } from './CatalogLayoutSearchResultView.types';
 import { CatalogSearchResultOffersView } from './offers/CatalogSearchResultOffersView';

src/views/catalog/views/search/CatalogSearchView.tsx

@@ -2,9 +2,9 @@ import { ICatalogPageData, IFurnitureData } from 'nitro-renderer';
 import { FC, useCallback, useEffect, useState } from 'react';
 import { GetSessionDataManager } from '../../../../api';
 import { LocalizeText } from '../../../../utils/LocalizeText';
+import { GetOfferNodes } from '../../common/CatalogUtilities';
 import { useCatalogContext } from '../../context/CatalogContext';
 import { CatalogActions } from '../../reducers/CatalogReducer';
-import { GetOfferNodes } from '../../utils/CatalogUtilities';
 import { CatalogSearchViewProps } from './CatalogSearchView.types';
 
 export const CatalogSearchView: FC<CatalogSearchViewProps> = props =>

src/views/inventory/InventoryMessageHandler.tsx

@@ -1,14 +1,14 @@
 import { BadgesEvent, BotAddedToInventoryEvent, BotInventoryMessageEvent, BotRemovedFromInventoryEvent, FurnitureListAddOrUpdateEvent, FurnitureListEvent, FurnitureListInvalidateEvent, FurnitureListItemParser, FurnitureListRemovedEvent, FurniturePostItPlacedEvent, PetAddedToInventoryEvent, PetData, PetInventoryEvent, PetRemovedFromInventory } from 'nitro-renderer';
 import { FC, useCallback } from 'react';
 import { CreateMessageHook } from '../../hooks/messages/message-event';
+import { mergeFurniFragments } from './common/FurnitureUtilities';
+import { mergePetFragments } from './common/PetUtilities';
 import { useInventoryContext } from './context/InventoryContext';
 import { InventoryMessageHandlerProps } from './InventoryMessageHandler.types';
 import { InventoryBadgeActions } from './reducers/InventoryBadgeReducer';
 import { InventoryBotActions } from './reducers/InventoryBotReducer';
 import { InventoryFurnitureActions } from './reducers/InventoryFurnitureReducer';
 import { InventoryPetActions } from './reducers/InventoryPetReducer';
-import { mergeFurniFragments } from './utils/FurnitureUtilities';
-import { mergePetFragments } from './utils/PetUtilities';
 
 let furniMsgFragments: Map<number, FurnitureListItemParser>[] = null;
 let petMsgFragments: Map<number, PetData>[] = null;

src/views/inventory/InventoryView.tsx

@@ -7,6 +7,7 @@ import { useRoomSessionManagerEvent } from '../../hooks/events/nitro/session/roo
 import { useUiEvent } from '../../hooks/events/ui/ui-event';
 import { NitroCardContentView, NitroCardHeaderView, NitroCardTabsItemView, NitroCardTabsView, NitroCardView } from '../../layout';
 import { LocalizeText } from '../../utils/LocalizeText';
+import { isObjectMoverRequested, setObjectMoverRequested } from './common/InventoryUtilities';
 import { InventoryContextProvider } from './context/InventoryContext';
 import { InventoryMessageHandler } from './InventoryMessageHandler';
 import { InventoryTabs, InventoryViewProps } from './InventoryView.types';
@@ -14,7 +15,6 @@ import { initialInventoryBadge, InventoryBadgeReducer } from './reducers/Invento
 import { initialInventoryBot, InventoryBotReducer } from './reducers/InventoryBotReducer';
 import { initialInventoryFurniture, InventoryFurnitureReducer } from './reducers/InventoryFurnitureReducer';
 import { initialInventoryPet, InventoryPetReducer } from './reducers/InventoryPetReducer';
-import { isObjectMoverRequested, setObjectMoverRequested } from './utils/InventoryUtilities';
 import { InventoryBadgeView } from './views/badge/InventoryBadgeView';
 import { InventoryBotView } from './views/bot/InventoryBotView';
 import { InventoryFurnitureView } from './views/furniture/InventoryFurnitureView';

src/views/inventory/reducers/InventoryBotReducer.tsx

@@ -1,7 +1,7 @@
 import { BotData } from 'nitro-renderer';
 import { Reducer } from 'react';
-import { BotItem } from '../utils/BotItem';
+import { BotItem } from '../common/BotItem';
-import { addSingleBotItem, processBotFragment, removeBotItemById } from '../utils/BotUtilities';
+import { addSingleBotItem, processBotFragment, removeBotItemById } from '../common/BotUtilities';
 
 export interface IInventoryBotState
 {

src/views/inventory/reducers/InventoryFurnitureReducer.tsx

@@ -1,8 +1,8 @@
 import { FurnitureListItemParser } from 'nitro-renderer';
 import { Reducer } from 'react';
-import { FurnitureItem } from '../utils/FurnitureItem';
+import { FurnitureItem } from '../common/FurnitureItem';
-import { addFurnitureItem, processFurniFragment, removeFurniItemById } from '../utils/FurnitureUtilities';
+import { addFurnitureItem, processFurniFragment, removeFurniItemById } from '../common/FurnitureUtilities';
-import { GroupItem } from '../utils/GroupItem';
+import { GroupItem } from '../common/GroupItem';
 
 export interface IInventoryFurnitureState
 {

src/views/inventory/reducers/InventoryPetReducer.tsx

@@ -1,7 +1,7 @@
 import { PetData } from 'nitro-renderer';
 import { Reducer } from 'react';
-import { PetItem } from '../utils/PetItem';
+import { PetItem } from '../common/PetItem';
-import { addSinglePetItem, processPetFragment, removePetItemById } from '../utils/PetUtilities';
+import { addSinglePetItem, processPetFragment, removePetItemById } from '../common/PetUtilities';
 
 export interface IInventoryPetState
 {

src/views/inventory/views/bot/InventoryBotView.tsx

@@ -3,10 +3,10 @@ import { FC, useEffect } from 'react';
 import { GetRoomEngine } from '../../../../api';
 import { SendMessageHook } from '../../../../hooks/messages/message-event';
 import { LocalizeText } from '../../../../utils/LocalizeText';
-import { RoomPreviewerView } from '../../../room-previewer/RoomPreviewerView';
+import { RoomPreviewerView } from '../../../shared/room-previewer/RoomPreviewerView';
+import { attemptBotPlacement } from '../../common/BotUtilities';
 import { useInventoryContext } from '../../context/InventoryContext';
 import { InventoryBotActions } from '../../reducers/InventoryBotReducer';
-import { attemptBotPlacement } from '../../utils/BotUtilities';
 import { InventoryBotViewProps } from './InventoryBotView.types';
 import { InventoryBotResultsView } from './results/InventoryBotResultsView';
 

src/views/inventory/views/bot/item/InventoryBotItemView.tsx

@@ -1,9 +1,9 @@
 import { MouseEventType } from 'nitro-renderer';
 import { FC, MouseEvent, useCallback, useState } from 'react';
 import { AvatarImageView } from '../../../../shared/avatar-image/AvatarImageView';
+import { attemptBotPlacement } from '../../../common/BotUtilities';
 import { useInventoryContext } from '../../../context/InventoryContext';
 import { InventoryBotActions } from '../../../reducers/InventoryBotReducer';
-import { attemptBotPlacement } from '../../../utils/BotUtilities';
 import { InventoryBotItemViewProps } from './InventoryBotItemView.types';
 
 export const InventoryBotItemView: FC<InventoryBotItemViewProps> = props =>

src/views/inventory/views/bot/item/InventoryBotItemView.types.ts

@@ -1,4 +1,4 @@
-import { BotItem } from '../../../utils/BotItem';
+import { BotItem } from '../../../common/BotItem';
 
 export interface InventoryBotItemViewProps
 {

src/views/inventory/views/bot/results/InventoryBotResultsView.types.ts

@@ -1,4 +1,4 @@
-import { BotItem } from '../../../utils/BotItem';
+import { BotItem } from '../../../common/BotItem';
 
 export interface InventoryBotResultsViewProps
 {

src/views/inventory/views/furniture/InventoryFurnitureView.tsx

@@ -3,13 +3,13 @@ import { FC, useEffect, useState } from 'react';
 import { GetRoomEngine } from '../../../../api';
 import { SendMessageHook } from '../../../../hooks/messages/message-event';
 import { LocalizeText } from '../../../../utils/LocalizeText';
-import { RoomPreviewerView } from '../../../room-previewer/RoomPreviewerView';
 import { LimitedEditionCompactPlateView } from '../../../shared/limited-edition/compact-plate/LimitedEditionCompactPlateView';
+import { RoomPreviewerView } from '../../../shared/room-previewer/RoomPreviewerView';
+import { FurniCategory } from '../../common/FurniCategory';
+import { attemptItemPlacement } from '../../common/FurnitureUtilities';
+import { GroupItem } from '../../common/GroupItem';
 import { useInventoryContext } from '../../context/InventoryContext';
 import { InventoryFurnitureActions } from '../../reducers/InventoryFurnitureReducer';
-import { FurniCategory } from '../../utils/FurniCategory';
-import { attemptItemPlacement } from '../../utils/FurnitureUtilities';
-import { GroupItem } from '../../utils/GroupItem';
 import { InventoryFurnitureViewProps } from './InventoryFurnitureView.types';
 import { InventoryFurnitureResultsView } from './results/InventoryFurnitureResultsView';
 import { InventoryFurnitureSearchView } from './search/InventoryFurnitureSearchView';

src/views/inventory/views/furniture/item/InventoryFurnitureItemView.tsx

@@ -1,9 +1,9 @@
 import { MouseEventType } from 'nitro-renderer';
 import { FC, MouseEvent, useCallback, useState } from 'react';
 import { LimitedEditionStyledNumberView } from '../../../../shared/limited-edition/styled-number/LimitedEditionStyledNumberView';
+import { attemptItemPlacement } from '../../../common/FurnitureUtilities';
 import { useInventoryContext } from '../../../context/InventoryContext';
 import { InventoryFurnitureActions } from '../../../reducers/InventoryFurnitureReducer';
-import { attemptItemPlacement } from '../../../utils/FurnitureUtilities';
 import { InventoryFurnitureItemViewProps } from './InventoryFurnitureItemView.types';
 
 export const InventoryFurnitureItemView: FC<InventoryFurnitureItemViewProps> = props =>

src/views/inventory/views/furniture/item/InventoryFurnitureItemView.types.ts

@@ -1,4 +1,4 @@
-import { GroupItem } from '../../../utils/GroupItem';
+import { GroupItem } from '../../../common/GroupItem';
 
 export interface InventoryFurnitureItemViewProps
 {

src/views/inventory/views/furniture/results/InventoryFurnitureResultsView.types.ts

@@ -1,4 +1,4 @@
-import { GroupItem } from '../../../utils/GroupItem';
+import { GroupItem } from '../../../common/GroupItem';
 
 export interface InventoryFurnitureResultsViewProps
 {

src/views/inventory/views/furniture/search/InventoryFurnitureSearchView.types.ts

@@ -1,5 +1,5 @@
 import { Dispatch, SetStateAction } from 'react';
-import { GroupItem } from '../../../utils/GroupItem';
+import { GroupItem } from '../../../common/GroupItem';
 
 export interface InventoryFurnitureSearchViewProps
 {

src/views/inventory/views/pet/InventoryPetView.tsx

@@ -3,10 +3,10 @@ import { FC, useEffect } from 'react';
 import { GetRoomEngine } from '../../../../api';
 import { SendMessageHook } from '../../../../hooks/messages/message-event';
 import { LocalizeText } from '../../../../utils/LocalizeText';
-import { RoomPreviewerView } from '../../../room-previewer/RoomPreviewerView';
+import { RoomPreviewerView } from '../../../shared/room-previewer/RoomPreviewerView';
+import { attemptPetPlacement } from '../../common/PetUtilities';
 import { useInventoryContext } from '../../context/InventoryContext';
 import { InventoryPetActions } from '../../reducers/InventoryPetReducer';
-import { attemptPetPlacement } from '../../utils/PetUtilities';
 import { InventoryPetViewProps } from './InventoryPetView.types';
 import { InventoryPetResultsView } from './results/InventoryPetResultsView';
 

src/views/inventory/views/pet/item/InventoryPetItemView.tsx

@@ -1,9 +1,9 @@
 import { MouseEventType } from 'nitro-renderer';
 import { FC, MouseEvent, useCallback, useState } from 'react';
 import { PetImageView } from '../../../../shared/pet-image/PetImageView';
+import { attemptPetPlacement } from '../../../common/PetUtilities';
 import { useInventoryContext } from '../../../context/InventoryContext';
 import { InventoryPetActions } from '../../../reducers/InventoryPetReducer';
-import { attemptPetPlacement } from '../../../utils/PetUtilities';
 import { InventoryPetItemViewProps } from './InventoryPetItemView.types';
 
 export const InventoryPetItemView: FC<InventoryPetItemViewProps> = props =>

src/views/inventory/views/pet/item/InventoryPetItemView.types.ts

@@ -1,4 +1,4 @@
-import { PetItem } from '../../../utils/PetItem';
+import { PetItem } from '../../../common/PetItem';
 
 export interface InventoryPetItemViewProps
 {

src/views/inventory/views/pet/results/InventoryPetResultsView.types.ts

@@ -1,4 +1,4 @@
-import { PetItem } from '../../../utils/PetItem';
+import { PetItem } from '../../../common/PetItem';
 
 export interface InventoryPetResultsViewProps
 {

src/views/purse/PurseMessageHandler.tsx

@@ -1,10 +1,10 @@
 import { UserCreditsEvent, UserCurrencyEvent, UserCurrencyUpdateEvent } from 'nitro-renderer';
 import { FC, useCallback } from 'react';
 import { CreateMessageHook } from '../../hooks/messages/message-event';
+import { Currency } from './common/Currency';
 import { usePurseContext } from './context/PurseContext';
 import { PurseMessageHandlerProps } from './PurseMessageHandler.types';
 import { PurseActions } from './reducers/PurseReducer';
-import { Currency } from './utils/Currency';
  
 export const PurseMessageHandler: FC<PurseMessageHandlerProps> = props =>
 {

src/views/purse/PurseView.tsx

@@ -4,12 +4,12 @@ import { NotificationCenterEvent } from '../../events';
 import { dispatchUiEvent } from '../../hooks/events';
 import { SendMessageHook } from '../../hooks/messages/message-event';
 import { GetConfiguration } from '../../utils/GetConfiguration';
+import { SetLastCurrencies } from './common/CurrencyHelper';
 import { PurseContextProvider } from './context/PurseContext';
 import { CurrencyView } from './currency/CurrencyView';
 import { PurseMessageHandler } from './PurseMessageHandler';
 import { PurseViewProps } from './PurseView.types';
 import { initialPurse, PurseReducer } from './reducers/PurseReducer';
-import { SetLastCurrencies } from './utils/CurrencyHelper';
 
 export const PurseView: FC<PurseViewProps> = props =>
 {

src/views/purse/currency/CurrencyView.types.ts

@@ -1,4 +1,4 @@
-import { Currency } from '../utils/Currency';
+import { Currency } from '../common/Currency';
 
 export interface CurrencyViewProps
 {

src/views/purse/reducers/PurseReducer.tsx

@@ -1,5 +1,5 @@
 import { Reducer } from 'react';
-import { Currency } from '../utils/Currency';
+import { Currency } from '../common/Currency';
 
 export interface IPurseState
 {

src/views/shared/furni-image/FurniImageView.tsx

@@ -2,7 +2,7 @@ import { IGetImageListener, ImageResult, TextureUtils, Vector3d } from 'nitro-re
 import { RenderTexture } from 'pixi.js';
 import { FC, useCallback, useEffect, useState } from 'react';
 import { GetRoomEngine } from '../../../api';
-import { ProductTypeEnum } from '../../catalog/enums/ProductTypeEnum';
+import { ProductTypeEnum } from '../../catalog/common/ProductTypeEnum';
 import { FurniImageViewProps } from './FurniImageView.types';
 
 export const FurniImageView: FC<FurniImageViewProps> = props =>