diff --git a/src/components/inventory/context/InventoryContext.tsx b/src/components/inventory/InventoryContext.tsx
similarity index 74%
rename from src/components/inventory/context/InventoryContext.tsx
rename to src/components/inventory/InventoryContext.tsx
index 4f0a627a..b30e81bc 100644
--- a/src/components/inventory/context/InventoryContext.tsx
+++ b/src/components/inventory/InventoryContext.tsx
@@ -1,9 +1,9 @@
 import { createContext, Dispatch, FC, ProviderProps, useContext } from 'react';
-import { IUnseenItemTracker } from '../common/unseen/IUnseenItemTracker';
-import { IInventoryBadgeAction, IInventoryBadgeState } from '../reducers/InventoryBadgeReducer';
-import { IInventoryBotAction, IInventoryBotState } from '../reducers/InventoryBotReducer';
-import { IInventoryFurnitureAction, IInventoryFurnitureState } from '../reducers/InventoryFurnitureReducer';
-import { IInventoryPetAction, IInventoryPetState } from '../reducers/InventoryPetReducer';
+import { IUnseenItemTracker } from './common/unseen/IUnseenItemTracker';
+import { IInventoryBadgeAction, IInventoryBadgeState } from './reducers/InventoryBadgeReducer';
+import { IInventoryBotAction, IInventoryBotState } from './reducers/InventoryBotReducer';
+import { IInventoryFurnitureAction, IInventoryFurnitureState } from './reducers/InventoryFurnitureReducer';
+import { IInventoryPetAction, IInventoryPetState } from './reducers/InventoryPetReducer';
 
 export interface IInventoryContext
 {
diff --git a/src/components/inventory/InventoryMessageHandler.tsx b/src/components/inventory/InventoryMessageHandler.tsx
index 0dafc71d..e313bc7b 100644
--- a/src/components/inventory/InventoryMessageHandler.tsx
+++ b/src/components/inventory/InventoryMessageHandler.tsx
@@ -10,7 +10,7 @@ import { mergeFurniFragments } from './common/FurnitureUtilities';
 import { mergePetFragments } from './common/PetUtilities';
 import { TradeState } from './common/TradeState';
 import { TradeUserData } from './common/TradeUserData';
-import { useInventoryContext } from './context/InventoryContext';
+import { useInventoryContext } from './InventoryContext';
 import { InventoryBadgeActions } from './reducers/InventoryBadgeReducer';
 import { InventoryBotActions } from './reducers/InventoryBotReducer';
 import { InventoryFurnitureActions } from './reducers/InventoryFurnitureReducer';
diff --git a/src/components/inventory/InventoryView.tsx b/src/components/inventory/InventoryView.tsx
index f7bc7162..e9aac871 100644
--- a/src/components/inventory/InventoryView.tsx
+++ b/src/components/inventory/InventoryView.tsx
@@ -12,7 +12,7 @@ import { TradeState } from './common/TradeState';
 import { IUnseenItemTracker } from './common/unseen/IUnseenItemTracker';
 import { UnseenItemCategory } from './common/unseen/UnseenItemCategory';
 import { UnseenItemTracker } from './common/unseen/UnseenItemTracker';
-import { InventoryContextProvider } from './context/InventoryContext';
+import { InventoryContextProvider } from './InventoryContext';
 import { InventoryMessageHandler } from './InventoryMessageHandler';
 import { initialInventoryBadge, InventoryBadgeReducer } from './reducers/InventoryBadgeReducer';
 import { initialInventoryBot, InventoryBotReducer } from './reducers/InventoryBotReducer';
diff --git a/src/components/inventory/views/badge/InventoryBadgeItemView.tsx b/src/components/inventory/views/badge/InventoryBadgeItemView.tsx
index fb279cda..2d179d52 100644
--- a/src/components/inventory/views/badge/InventoryBadgeItemView.tsx
+++ b/src/components/inventory/views/badge/InventoryBadgeItemView.tsx
@@ -2,7 +2,7 @@ import { MouseEventType } from '@nitrots/nitro-renderer';
 import { FC, MouseEvent } from 'react';
 import { LayoutGridItem } from '../../../../common/layout/LayoutGridItem';
 import { BadgeImageView } from '../../../../views/shared/badge-image/BadgeImageView';
-import { useInventoryContext } from '../../context/InventoryContext';
+import { useInventoryContext } from '../../InventoryContext';
 import { InventoryBadgeActions } from '../../reducers/InventoryBadgeReducer';
 
 export interface InventoryBadgeItemViewProps
diff --git a/src/components/inventory/views/badge/InventoryBadgeView.tsx b/src/components/inventory/views/badge/InventoryBadgeView.tsx
index 3fb20a0b..085af1e3 100644
--- a/src/components/inventory/views/badge/InventoryBadgeView.tsx
+++ b/src/components/inventory/views/badge/InventoryBadgeView.tsx
@@ -8,7 +8,7 @@ import { Grid } from '../../../../common/Grid';
 import { Text } from '../../../../common/Text';
 import { SendMessageHook } from '../../../../hooks/messages/message-event';
 import { BadgeImageView } from '../../../../views/shared/badge-image/BadgeImageView';
-import { useInventoryContext } from '../../context/InventoryContext';
+import { useInventoryContext } from '../../InventoryContext';
 import { InventoryBadgeActions } from '../../reducers/InventoryBadgeReducer';
 import { InventoryBadgeItemView } from './InventoryBadgeItemView';
 
diff --git a/src/components/inventory/views/bot/InventoryBotItemView.tsx b/src/components/inventory/views/bot/InventoryBotItemView.tsx
index 2fd9c894..ee7c3682 100644
--- a/src/components/inventory/views/bot/InventoryBotItemView.tsx
+++ b/src/components/inventory/views/bot/InventoryBotItemView.tsx
@@ -4,7 +4,7 @@ import { LayoutGridItem } from '../../../../common/layout/LayoutGridItem';
 import { AvatarImageView } from '../../../../views/shared/avatar-image/AvatarImageView';
 import { BotItem } from '../../common/BotItem';
 import { attemptBotPlacement } from '../../common/BotUtilities';
-import { useInventoryContext } from '../../context/InventoryContext';
+import { useInventoryContext } from '../../InventoryContext';
 import { InventoryBotActions } from '../../reducers/InventoryBotReducer';
 
 export interface InventoryBotItemViewProps
diff --git a/src/components/inventory/views/bot/InventoryBotView.tsx b/src/components/inventory/views/bot/InventoryBotView.tsx
index 6fe2c04c..eff4a3c7 100644
--- a/src/components/inventory/views/bot/InventoryBotView.tsx
+++ b/src/components/inventory/views/bot/InventoryBotView.tsx
@@ -8,7 +8,7 @@ import { Text } from '../../../../common/Text';
 import { SendMessageHook } from '../../../../hooks/messages/message-event';
 import { RoomPreviewerView } from '../../../../views/shared/room-previewer/RoomPreviewerView';
 import { attemptBotPlacement } from '../../common/BotUtilities';
-import { useInventoryContext } from '../../context/InventoryContext';
+import { useInventoryContext } from '../../InventoryContext';
 import { InventoryBotActions } from '../../reducers/InventoryBotReducer';
 import { InventoryCategoryEmptyView } from '../category-empty/InventoryCategoryEmptyView';
 import { InventoryBotItemView } from './InventoryBotItemView';
diff --git a/src/components/inventory/views/furniture/InventoryFurnitureItemView.tsx b/src/components/inventory/views/furniture/InventoryFurnitureItemView.tsx
index 988955e8..0d25ce86 100644
--- a/src/components/inventory/views/furniture/InventoryFurnitureItemView.tsx
+++ b/src/components/inventory/views/furniture/InventoryFurnitureItemView.tsx
@@ -3,7 +3,7 @@ import { FC, MouseEvent, useEffect, useState } from 'react';
 import { LayoutGridItem } from '../../../../common/layout/LayoutGridItem';
 import { attemptItemPlacement } from '../../common/FurnitureUtilities';
 import { GroupItem } from '../../common/GroupItem';
-import { useInventoryContext } from '../../context/InventoryContext';
+import { useInventoryContext } from '../../InventoryContext';
 import { InventoryFurnitureActions } from '../../reducers/InventoryFurnitureReducer';
 
 export interface InventoryFurnitureItemViewProps
diff --git a/src/components/inventory/views/furniture/InventoryFurnitureView.tsx b/src/components/inventory/views/furniture/InventoryFurnitureView.tsx
index 38c6abe3..7e6c0894 100644
--- a/src/components/inventory/views/furniture/InventoryFurnitureView.tsx
+++ b/src/components/inventory/views/furniture/InventoryFurnitureView.tsx
@@ -12,7 +12,7 @@ import { RoomPreviewerView } from '../../../../views/shared/room-previewer/RoomP
 import { FurniCategory } from '../../common/FurniCategory';
 import { attemptItemPlacement, attemptPlaceMarketplaceOffer } from '../../common/FurnitureUtilities';
 import { GroupItem } from '../../common/GroupItem';
-import { useInventoryContext } from '../../context/InventoryContext';
+import { useInventoryContext } from '../../InventoryContext';
 import { InventoryFurnitureActions } from '../../reducers/InventoryFurnitureReducer';
 import { InventoryCategoryEmptyView } from '../category-empty/InventoryCategoryEmptyView';
 import { InventoryFurnitureItemView } from './InventoryFurnitureItemView';
diff --git a/src/components/inventory/views/pet/InventoryPetItemView.tsx b/src/components/inventory/views/pet/InventoryPetItemView.tsx
index 8f56d00d..22b5bd94 100644
--- a/src/components/inventory/views/pet/InventoryPetItemView.tsx
+++ b/src/components/inventory/views/pet/InventoryPetItemView.tsx
@@ -4,7 +4,7 @@ import { LayoutGridItem } from '../../../../common/layout/LayoutGridItem';
 import { PetImageView } from '../../../../views/shared/pet-image/PetImageView';
 import { PetItem } from '../../common/PetItem';
 import { attemptPetPlacement } from '../../common/PetUtilities';
-import { useInventoryContext } from '../../context/InventoryContext';
+import { useInventoryContext } from '../../InventoryContext';
 import { InventoryPetActions } from '../../reducers/InventoryPetReducer';
 
 export interface InventoryPetItemViewProps
diff --git a/src/components/inventory/views/pet/InventoryPetView.tsx b/src/components/inventory/views/pet/InventoryPetView.tsx
index 91486b95..50bd8e71 100644
--- a/src/components/inventory/views/pet/InventoryPetView.tsx
+++ b/src/components/inventory/views/pet/InventoryPetView.tsx
@@ -8,7 +8,7 @@ import { Text } from '../../../../common/Text';
 import { SendMessageHook } from '../../../../hooks/messages/message-event';
 import { RoomPreviewerView } from '../../../../views/shared/room-previewer/RoomPreviewerView';
 import { attemptPetPlacement } from '../../common/PetUtilities';
-import { useInventoryContext } from '../../context/InventoryContext';
+import { useInventoryContext } from '../../InventoryContext';
 import { InventoryPetActions } from '../../reducers/InventoryPetReducer';
 import { InventoryCategoryEmptyView } from '../category-empty/InventoryCategoryEmptyView';
 import { InventoryPetItemView } from './InventoryPetItemView';
diff --git a/src/components/inventory/views/trade/InventoryTradeView.tsx b/src/components/inventory/views/trade/InventoryTradeView.tsx
index df705d65..f85a81f9 100644
--- a/src/components/inventory/views/trade/InventoryTradeView.tsx
+++ b/src/components/inventory/views/trade/InventoryTradeView.tsx
@@ -17,7 +17,7 @@ import { GroupItem } from '../../common/GroupItem';
 import { IFurnitureItem } from '../../common/IFurnitureItem';
 import { TradeState } from '../../common/TradeState';
 import { _Str_16998 } from '../../common/TradingUtilities';
-import { useInventoryContext } from '../../context/InventoryContext';
+import { useInventoryContext } from '../../InventoryContext';
 import { InventoryFurnitureActions } from '../../reducers/InventoryFurnitureReducer';
 import { InventoryFurnitureSearchView } from '../furniture/InventoryFurnitureSearchView';