Reorganises app file structure

frontend/src/app/App.tsx

@@ -1,18 +1,18 @@
-import ProgressBar from 'features/system/ProgressBar';
+import ProgressBar from 'features/system/components/ProgressBar';
-import SiteHeader from 'features/system/SiteHeader';
+import SiteHeader from 'features/system/components/SiteHeader';
-import Console from 'features/system/Console';
+import Console from 'features/system/components/Console';
 import { keepGUIAlive } from './utils';
-import InvokeTabs from 'features/tabs/InvokeTabs';
+import InvokeTabs from 'features/tabs/components/InvokeTabs';
 import ImageUploader from 'common/components/ImageUploader';
 import { RootState, useAppSelector } from 'app/store';
 
-import FloatingGalleryButton from 'features/tabs/FloatingGalleryButton';
+import FloatingGalleryButton from 'features/tabs/components/FloatingGalleryButton';
-import FloatingOptionsPanelButtons from 'features/tabs/FloatingOptionsPanelButtons';
+import FloatingOptionsPanelButtons from 'features/tabs/components/FloatingOptionsPanelButtons';
 import { createSelector } from '@reduxjs/toolkit';
-import { GalleryState } from 'features/gallery/gallerySlice';
+import { GalleryState } from 'features/gallery/store/gallerySlice';
-import { OptionsState } from 'features/options/optionsSlice';
+import { OptionsState } from 'features/options/store/optionsSlice';
-import { activeTabNameSelector } from 'features/options/optionsSelectors';
+import { activeTabNameSelector } from 'features/options/store/optionsSelectors';
-import { SystemState } from 'features/system/systemSlice';
+import { SystemState } from 'features/system/store/systemSlice';
 import _ from 'lodash';
 import { Model } from './invokeai';
 import useToastWatcher from 'features/system/hooks/useToastWatcher';

frontend/src/app/constants.ts

@@ -1,6 +1,6 @@
 // TODO: use Enums?
 
-import { InProgressImageType } from 'features/system/systemSlice';
+import { InProgressImageType } from 'features/system/store/systemSlice';
 
 // Valid samplers
 export const SAMPLERS: Array<string> = [

frontend/src/app/invokeai.d.ts

@@ -12,8 +12,8 @@
  * 'gfpgan'.
  */
 
-import { Category as GalleryCategory } from 'features/gallery/gallerySlice';
+import { Category as GalleryCategory } from 'features/gallery/store/gallerySlice';
-import { InvokeTabName } from 'features/tabs/InvokeTabs';
+import { InvokeTabName } from 'features/tabs/components/InvokeTabs';
 import { IRect } from 'konva/lib/types';
 
 /**

frontend/src/app/selectors/readinessSelector.ts

@@ -1,9 +1,9 @@
 import { createSelector } from '@reduxjs/toolkit';
 import _ from 'lodash';
 import { RootState } from 'app/store';
-import { activeTabNameSelector } from 'features/options/optionsSelectors';
+import { activeTabNameSelector } from 'features/options/store/optionsSelectors';
-import { OptionsState } from 'features/options/optionsSlice';
+import { OptionsState } from 'features/options/store/optionsSlice';
-import { SystemState } from 'features/system/systemSlice';
+import { SystemState } from 'features/system/store/systemSlice';
 import { validateSeedWeights } from 'common/util/seedWeightPairs';
 import { initialCanvasImageSelector } from 'features/canvas/store/canvasSelectors';
 

frontend/src/app/socketio/actions.ts

@@ -1,6 +1,6 @@
 import { createAction } from '@reduxjs/toolkit';
-import { GalleryCategory } from 'features/gallery/gallerySlice';
+import { GalleryCategory } from 'features/gallery/store/gallerySlice';
-import { InvokeTabName } from 'features/tabs/InvokeTabs';
+import { InvokeTabName } from 'features/tabs/components/InvokeTabs';
 import * as InvokeAI from 'app/invokeai';
 
 

frontend/src/app/socketio/emitters.ts

@@ -9,16 +9,16 @@ import {
   GalleryCategory,
   GalleryState,
   removeImage,
-} from 'features/gallery/gallerySlice';
+} from 'features/gallery/store/gallerySlice';
-import { OptionsState } from 'features/options/optionsSlice';
+import { OptionsState } from 'features/options/store/optionsSlice';
 import {
   addLogEntry,
   generationRequested,
   modelChangeRequested,
   setCurrentStatus,
   setIsProcessing,
-} from 'features/system/systemSlice';
+} from 'features/system/store/systemSlice';
-import { InvokeTabName } from 'features/tabs/InvokeTabs';
+import { InvokeTabName } from 'features/tabs/components/InvokeTabs';
 import * as InvokeAI from 'app/invokeai';
 import { RootState } from 'app/store';
 

frontend/src/app/socketio/listeners.ts

@@ -15,7 +15,7 @@ import {
   errorOccurred,
   setModelList,
   setIsCancelable,
-} from 'features/system/systemSlice';
+} from 'features/system/store/systemSlice';
 
 import {
   addGalleryImages,
@@ -24,20 +24,20 @@ import {
   GalleryState,
   removeImage,
   setIntermediateImage,
-} from 'features/gallery/gallerySlice';
+} from 'features/gallery/store/gallerySlice';
 
 import {
   clearInitialImage,
   setInitialImage,
   setMaskPath,
-} from 'features/options/optionsSlice';
+} from 'features/options/store/optionsSlice';
 import {
   requestImages,
   requestNewImages,
   requestSystemConfig,
 } from './actions';
 import { addImageToStagingArea } from 'features/canvas/store/canvasSlice';
-import { tabMap } from 'features/tabs/InvokeTabs';
+import { tabMap } from 'features/tabs/components/InvokeTabs';
 
 /**
  * Returns an object containing listener callbacks for socketio events.

frontend/src/app/store.ts

@@ -7,9 +7,9 @@ import storage from 'redux-persist/lib/storage'; // defaults to localStorage for
 
 import { getPersistConfig } from 'redux-deep-persist';
 
-import optionsReducer from 'features/options/optionsSlice';
+import optionsReducer from 'features/options/store/optionsSlice';
-import galleryReducer from 'features/gallery/gallerySlice';
+import galleryReducer from 'features/gallery/store/gallerySlice';
-import systemReducer from 'features/system/systemSlice';
+import systemReducer from 'features/system/store/systemSlice';
 import canvasReducer from 'features/canvas/store/canvasSlice';
 
 import { socketioMiddleware } from './socketio/middleware';

frontend/src/common/components/GuidePopover.tsx

@@ -5,7 +5,7 @@ import {
   PopoverTrigger,
   Box,
 } from '@chakra-ui/react';
-import { SystemState } from 'features/system/systemSlice';
+import { SystemState } from 'features/system/store/systemSlice';
 import { useAppSelector } from 'app/store';
 import { RootState } from 'app/store';
 import { createSelector } from '@reduxjs/toolkit';

frontend/src/common/components/ImageUploader.tsx

@@ -11,10 +11,10 @@ import { useToast } from '@chakra-ui/react';
 // import { uploadImage } from 'app/socketio/actions';
 import { UploadImagePayload } from 'app/invokeai';
 import { ImageUploaderTriggerContext } from 'app/contexts/ImageUploaderTriggerContext';
-import { activeTabNameSelector } from 'features/options/optionsSelectors';
+import { activeTabNameSelector } from 'features/options/store/optionsSelectors';
-import { tabDict } from 'features/tabs/InvokeTabs';
+import { tabDict } from 'features/tabs/components/InvokeTabs';
 import ImageUploadOverlay from './ImageUploadOverlay';
-import { uploadImage } from 'features/gallery/util/uploadImage';
+import { uploadImage } from 'features/gallery/store/thunks/uploadImage';
 
 type ImageUploaderProps = {
   children: ReactNode;

frontend/src/common/util/parameterTranslation.ts

@@ -1,10 +1,10 @@
 import { NUMPY_RAND_MAX, NUMPY_RAND_MIN } from 'app/constants';
-import { OptionsState } from 'features/options/optionsSlice';
+import { OptionsState } from 'features/options/store/optionsSlice';
-import { SystemState } from 'features/system/systemSlice';
+import { SystemState } from 'features/system/store/systemSlice';
 
 import { stringToSeedWeightsArray } from './seedWeightPairs';
 import randomInt from './randomInt';
-import { InvokeTabName } from 'features/tabs/InvokeTabs';
+import { InvokeTabName } from 'features/tabs/components/InvokeTabs';
 import {
   CanvasState,
   isCanvasMaskLine,

frontend/src/features/canvas/components/IAICanvasIntermediateImage.tsx

@@ -1,6 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { RootState, useAppSelector } from 'app/store';
-import { GalleryState } from 'features/gallery/gallerySlice';
+import { GalleryState } from 'features/gallery/store/gallerySlice';
 import { ImageConfig } from 'konva/lib/shapes/Image';
 import _ from 'lodash';
 import { useEffect, useState } from 'react';

frontend/src/features/canvas/components/IAICanvasResizer.tsx

@@ -1,7 +1,7 @@
 import { Spinner } from '@chakra-ui/react';
 import { useLayoutEffect, useRef } from 'react';
 import { useAppDispatch, useAppSelector } from 'app/store';
-import { activeTabNameSelector } from 'features/options/optionsSelectors';
+import { activeTabNameSelector } from 'features/options/store/optionsSelectors';
 import {
   resizeAndScaleCanvas,
   resizeCanvas,

frontend/src/features/canvas/components/IAICanvasToolbar/IAICanvasRedoButton.tsx

@@ -3,7 +3,7 @@ import { useHotkeys } from 'react-hotkeys-hook';
 import { FaRedo } from 'react-icons/fa';
 import { useAppDispatch, useAppSelector } from 'app/store';
 import IAIIconButton from 'common/components/IAIIconButton';
-import { activeTabNameSelector } from 'features/options/optionsSelectors';
+import { activeTabNameSelector } from 'features/options/store/optionsSelectors';
 import { canvasSelector } from 'features/canvas/store/canvasSelectors';
 
 import _ from 'lodash';

frontend/src/features/canvas/components/IAICanvasToolbar/IAICanvasToolbar.tsx

@@ -32,7 +32,7 @@ import {
 } from 'features/canvas/store/canvasSelectors';
 import { useHotkeys } from 'react-hotkeys-hook';
 import { getCanvasBaseLayer } from 'features/canvas/util/konvaInstanceProvider';
-import { systemSelector } from 'features/system/systemSelectors';
+import { systemSelector } from 'features/system/store/systemSelectors';
 
 export const selector = createSelector(
   [canvasSelector, isStagingSelector, systemSelector],

frontend/src/features/canvas/components/IAICanvasToolbar/IAICanvasUndoButton.tsx

@@ -6,7 +6,7 @@ import IAIIconButton from 'common/components/IAIIconButton';
 import { canvasSelector } from 'features/canvas/store/canvasSelectors';
 
 import _ from 'lodash';
-import { activeTabNameSelector } from 'features/options/optionsSelectors';
+import { activeTabNameSelector } from 'features/options/store/optionsSelectors';
 import { undo } from 'features/canvas/store/canvasSlice';
 
 const canvasUndoSelector = createSelector(

frontend/src/features/canvas/hooks/useCanvasHotkeys.ts

@@ -1,7 +1,7 @@
 import { createSelector } from '@reduxjs/toolkit';
 import _ from 'lodash';
 import { useHotkeys } from 'react-hotkeys-hook';
-import { activeTabNameSelector } from 'features/options/optionsSelectors';
+import { activeTabNameSelector } from 'features/options/store/optionsSelectors';
 import {
   setShouldShowBoundingBox,
   setTool,

frontend/src/features/canvas/hooks/useCanvasMouseDown.ts

@@ -1,6 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { useAppDispatch, useAppSelector } from 'app/store';
-import { activeTabNameSelector } from 'features/options/optionsSelectors';
+import { activeTabNameSelector } from 'features/options/store/optionsSelectors';
 import Konva from 'konva';
 import { KonvaEventObject } from 'konva/lib/Node';
 import _ from 'lodash';

frontend/src/features/canvas/hooks/useCanvasMouseEnter.ts

@@ -1,6 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { useAppDispatch, useAppSelector } from 'app/store';
-import { activeTabNameSelector } from 'features/options/optionsSelectors';
+import { activeTabNameSelector } from 'features/options/store/optionsSelectors';
 import Konva from 'konva';
 import { KonvaEventObject } from 'konva/lib/Node';
 import _ from 'lodash';

frontend/src/features/canvas/hooks/useCanvasMouseMove.ts

@@ -1,6 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { useAppDispatch, useAppSelector } from 'app/store';
-import { activeTabNameSelector } from 'features/options/optionsSelectors';
+import { activeTabNameSelector } from 'features/options/store/optionsSelectors';
 import Konva from 'konva';
 import { Vector2d } from 'konva/lib/types';
 import _ from 'lodash';

frontend/src/features/canvas/hooks/useCanvasMouseUp.ts

@@ -1,6 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { useAppDispatch, useAppSelector } from 'app/store';
-import { activeTabNameSelector } from 'features/options/optionsSelectors';
+import { activeTabNameSelector } from 'features/options/store/optionsSelectors';
 import Konva from 'konva';
 import _ from 'lodash';
 import { MutableRefObject, useCallback } from 'react';

frontend/src/features/canvas/store/thunks/mergeAndUploadCanvas.ts

@@ -6,8 +6,8 @@ import layerToDataURL from '../../util/layerToDataURL';
 import downloadFile from '../../util/downloadFile';
 import copyImage from '../../util/copyImage';
 import { getCanvasBaseLayer } from '../../util/konvaInstanceProvider';
-import { addToast } from 'features/system/systemSlice';
+import { addToast } from 'features/system/store/systemSlice';
-import { addImage } from 'features/gallery/gallerySlice';
+import { addImage } from 'features/gallery/store/gallerySlice';
 import { setMergedCanvas } from '../canvasSlice';
 
 type MergeAndUploadCanvasConfig = {

frontend/src/features/gallery/components/CurrentImageButtons.tsx

@@ -12,14 +12,14 @@ import {
   setPrompt,
   setSeed,
   setShouldShowImageDetails,
-} from 'features/options/optionsSlice';
+} from 'features/options/store/optionsSlice';
 import DeleteImageModal from './DeleteImageModal';
-import { SystemState } from 'features/system/systemSlice';
+import { SystemState } from 'features/system/store/systemSlice';
 import IAIButton from 'common/components/IAIButton';
 import { runESRGAN, runFacetool } from 'app/socketio/actions';
 import IAIIconButton from 'common/components/IAIIconButton';
-import UpscaleOptions from 'features/options/AdvancedOptions/Upscale/UpscaleOptions';
+import UpscaleOptions from 'features/options/components/AdvancedOptions/Upscale/UpscaleOptions';
-import FaceRestoreOptions from 'features/options/AdvancedOptions/FaceRestore/FaceRestoreOptions';
+import FaceRestoreOptions from 'features/options/components/AdvancedOptions/FaceRestore/FaceRestoreOptions';
 import { useHotkeys } from 'react-hotkeys-hook';
 import { ButtonGroup, Link, useToast } from '@chakra-ui/react';
 import {
@@ -39,8 +39,8 @@ import {
   setDoesCanvasNeedScaling,
   setInitialCanvasImage,
 } from 'features/canvas/store/canvasSlice';
-import { GalleryState } from './gallerySlice';
+import { GalleryState } from 'features/gallery/store/gallerySlice';
-import { activeTabNameSelector } from 'features/options/optionsSelectors';
+import { activeTabNameSelector } from 'features/options/store/optionsSelectors';
 import IAIPopover from 'common/components/IAIPopover';
 
 const systemSelector = createSelector(

frontend/src/features/gallery/components/CurrentImageDisplay.scss

@@ -1,4 +1,4 @@
-@use '../../styles/Mixins/' as *;
+@use '../../../styles/Mixins/' as *;
 
 .current-image-area {
   display: flex;

frontend/src/features/gallery/components/CurrentImageDisplay.tsx

@@ -2,11 +2,11 @@ import { RootState, useAppSelector } from 'app/store';
 import CurrentImageButtons from './CurrentImageButtons';
 import { MdPhoto } from 'react-icons/md';
 import CurrentImagePreview from './CurrentImagePreview';
-import { GalleryState } from './gallerySlice';
+import { GalleryState } from 'features/gallery/store/gallerySlice';
-import { OptionsState } from 'features/options/optionsSlice';
+import { OptionsState } from 'features/options/store/optionsSlice';
 import _ from 'lodash';
 import { createSelector } from '@reduxjs/toolkit';
-import { activeTabNameSelector } from 'features/options/optionsSelectors';
+import { activeTabNameSelector } from 'features/options/store/optionsSelectors';
 
 export const currentImageDisplaySelector = createSelector(
   [

frontend/src/features/gallery/components/CurrentImagePreview.tsx

@@ -7,10 +7,10 @@ import {
   GalleryState,
   selectNextImage,
   selectPrevImage,
-} from './gallerySlice';
+} from 'features/gallery/store/gallerySlice';
 import { createSelector } from '@reduxjs/toolkit';
 import _ from 'lodash';
-import { OptionsState, setIsLightBoxOpen } from 'features/options/optionsSlice';
+import { OptionsState, setIsLightBoxOpen } from 'features/options/store/optionsSlice';
 import ImageMetadataViewer from './ImageMetaDataViewer/ImageMetadataViewer';
 
 export const imagesSelector = createSelector(

frontend/src/features/gallery/components/DeleteImageModal.tsx

@@ -25,7 +25,7 @@ import {
 import { useAppDispatch, useAppSelector } from 'app/store';
 import { deleteImage } from 'app/socketio/actions';
 import { RootState } from 'app/store';
-import { setShouldConfirmOnDelete, SystemState } from 'features/system/systemSlice';
+import { setShouldConfirmOnDelete, SystemState } from 'features/system/store/systemSlice';
 import * as InvokeAI from 'app/invokeai';
 import { useHotkeys } from 'react-hotkeys-hook';
 import _ from 'lodash';

frontend/src/features/gallery/components/HoverableImage.tsx

@@ -7,7 +7,7 @@ import {
   useToast,
 } from '@chakra-ui/react';
 import { useAppDispatch, useAppSelector } from 'app/store';
-import { setCurrentImage } from './gallerySlice';
+import { setCurrentImage } from 'features/gallery/store/gallerySlice';
 import { FaCheck, FaTrashAlt } from 'react-icons/fa';
 import DeleteImageModal from './DeleteImageModal';
 import { memo, useState } from 'react';
@@ -19,7 +19,7 @@ import {
   setIsLightBoxOpen,
   setPrompt,
   setSeed,
-} from 'features/options/optionsSlice';
+} from 'features/options/store/optionsSlice';
 import * as InvokeAI from 'app/invokeai';
 import * as ContextMenu from '@radix-ui/react-context-menu';
 import {
@@ -28,7 +28,7 @@ import {
   setDoesCanvasNeedScaling,
   setInitialCanvasImage,
 } from 'features/canvas/store/canvasSlice';
-import { hoverableImageSelector } from './gallerySliceSelectors';
+import { hoverableImageSelector } from 'features/gallery/store/gallerySliceSelectors';
 import { getCanvasBaseLayer } from 'features/canvas/util/konvaInstanceProvider';
 
 interface HoverableImageProps {

frontend/src/features/gallery/components/ImageGallery.scss

@@ -1,4 +1,4 @@
-@use '../../styles/Mixins/' as *;
+@use '../../../styles/Mixins/' as *;
 
 .image-gallery-wrapper-enter {
   transform: translateX(150%);

frontend/src/features/gallery/components/ImageGallery.tsx

@@ -25,13 +25,13 @@ import {
   setShouldAutoSwitchToNewImages,
   setShouldHoldGalleryOpen,
   setShouldPinGallery,
-} from './gallerySlice';
+} from 'features/gallery/store/gallerySlice';
 import HoverableImage from './HoverableImage';
-import { setShouldShowGallery } from 'features/gallery/gallerySlice';
+import { setShouldShowGallery } from 'features/gallery/store/gallerySlice';
 import { ButtonGroup, useToast } from '@chakra-ui/react';
 import { CSSTransition } from 'react-transition-group';
 import { Direction } from 're-resizable/lib/resizer';
-import { imageGallerySelector } from './gallerySliceSelectors';
+import { imageGallerySelector } from 'features/gallery/store/gallerySliceSelectors';
 import { FaImage, FaUser, FaWrench } from 'react-icons/fa';
 import IAIPopover from 'common/components/IAIPopover';
 import IAISlider from 'common/components/IAISlider';

frontend/src/features/gallery/components/ImageMetaDataViewer/ImageMetadataViewer.scss

@@ -1,4 +1,4 @@
-@use '../../../styles/Mixins/' as *;
+@use '../../../../styles/Mixins/' as *;
 
 .image-metadata-viewer {
   position: absolute;

frontend/src/features/gallery/components/ImageMetaDataViewer/ImageMetadataViewer.tsx

@@ -33,7 +33,7 @@ import {
   setWidth,
   setInitialImage,
   setShouldShowImageDetails,
-} from 'features/options/optionsSlice';
+} from 'features/options/store/optionsSlice';
 import promptToString from 'common/util/promptToString';
 import { seedWeightsToString } from 'common/util/seedWeightPairs';
 import { FaCopy } from 'react-icons/fa';

frontend/src/features/gallery/store/gallerySlice.ts

@@ -3,7 +3,7 @@ import type { PayloadAction } from '@reduxjs/toolkit';
 import _, { clamp } from 'lodash';
 import * as InvokeAI from 'app/invokeai';
 import { IRect } from 'konva/lib/types';
-import { InvokeTabName } from 'features/tabs/InvokeTabs';
+import { InvokeTabName } from 'features/tabs/components/InvokeTabs';
 
 export type GalleryCategory = 'user' | 'result';
 

frontend/src/features/gallery/store/gallerySliceSelectors.ts

@@ -1,8 +1,8 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { RootState } from 'app/store';
-import { activeTabNameSelector } from 'features/options/optionsSelectors';
+import { activeTabNameSelector } from 'features/options/store/optionsSelectors';
-import { OptionsState } from 'features/options/optionsSlice';
+import { OptionsState } from 'features/options/store/optionsSlice';
-import { SystemState } from 'features/system/systemSlice';
+import { SystemState } from 'features/system/store/systemSlice';
 import { GalleryState } from './gallerySlice';
 import _ from 'lodash';
 

frontend/src/features/gallery/store/thunks/uploadImage.ts

@@ -2,9 +2,9 @@ import { AnyAction, ThunkAction } from '@reduxjs/toolkit';
 import { RootState } from 'app/store';
 import * as InvokeAI from 'app/invokeai';
 import { v4 as uuidv4 } from 'uuid';
-import { activeTabNameSelector } from 'features/options/optionsSelectors';
+import { activeTabNameSelector } from 'features/options/store/optionsSelectors';
 import { setInitialCanvasImage } from 'features/canvas/store/canvasSlice';
-import { setInitialImage } from 'features/options/optionsSlice';
+import { setInitialImage } from 'features/options/store/optionsSlice';
 import { addImage } from '../gallerySlice';
 
 type UploadImageConfig = {

frontend/src/features/lightbox/components/Lightbox.scss

@@ -1,4 +1,4 @@
-@use '../../styles/Mixins/' as *;
+@use '../../../styles/Mixins/' as *;
 
 .lightbox-container {
   width: 100%;

frontend/src/features/lightbox/components/Lightbox.tsx

@@ -1,15 +1,15 @@
 import { IconButton } from '@chakra-ui/react';
 import { RootState, useAppDispatch, useAppSelector } from 'app/store';
 import IAIIconButton from 'common/components/IAIIconButton';
-import CurrentImageButtons from 'features/gallery/CurrentImageButtons';
+import CurrentImageButtons from 'features/gallery/components/CurrentImageButtons';
-import { imagesSelector } from 'features/gallery/CurrentImagePreview';
+import { imagesSelector } from 'features/gallery/components/CurrentImagePreview';
 import {
   selectNextImage,
   selectPrevImage,
-} from 'features/gallery/gallerySlice';
+} from 'features/gallery/store/gallerySlice';
-import ImageGallery from 'features/gallery/ImageGallery';
+import ImageGallery from 'features/gallery/components/ImageGallery';
-import ImageMetadataViewer from 'features/gallery/ImageMetaDataViewer/ImageMetadataViewer';
+import ImageMetadataViewer from 'features/gallery/components/ImageMetaDataViewer/ImageMetadataViewer';
-import { setIsLightBoxOpen } from 'features/options/optionsSlice';
+import { setIsLightBoxOpen } from 'features/options/store/optionsSlice';
 import React, { useState } from 'react';
 import { useHotkeys } from 'react-hotkeys-hook';
 import { BiExit } from 'react-icons/bi';

frontend/src/features/options/components/AccordionItems/AdvancedSettings.scss

@@ -1,4 +1,4 @@
-@use '../../../styles/Mixins/' as *;
+@use '../../../../styles/Mixins/' as *;
 
 .advanced-settings {
   display: grid;

frontend/src/features/options/components/AdvancedOptions/FaceRestore/FaceRestoreHeader.tsx

@@ -6,7 +6,7 @@ import {
   useAppSelector,
 } from 'app/store';
 import IAISwitch from 'common/components/IAISwitch';
-import { setShouldRunFacetool } from 'features/options/optionsSlice';
+import { setShouldRunFacetool } from 'features/options/store/optionsSlice';
 
 export default function FaceRestoreHeader() {
   const isGFPGANAvailable = useAppSelector(

frontend/src/features/options/components/AdvancedOptions/FaceRestore/FaceRestoreOptions.tsx

@@ -9,11 +9,11 @@ import {
   setCodeformerFidelity,
   setFacetoolStrength,
   setFacetoolType,
-} from 'features/options/optionsSlice';
+} from 'features/options/store/optionsSlice';
 
 import { createSelector } from '@reduxjs/toolkit';
 import { isEqual } from 'lodash';
-import { SystemState } from 'features/system/systemSlice';
+import { SystemState } from 'features/system/store/systemSlice';
 import IAINumberInput from 'common/components/IAINumberInput';
 import IAISelect from 'common/components/IAISelect';
 import { FACETOOL_TYPES } from 'app/constants';

frontend/src/features/options/components/AdvancedOptions/ImageToImage/ImageFit.tsx

@@ -5,7 +5,7 @@ import {
   useAppSelector,
 } from 'app/store';
 import IAISwitch from 'common/components/IAISwitch';
-import { setShouldFitToWidthHeight } from 'features/options/optionsSlice';
+import { setShouldFitToWidthHeight } from 'features/options/store/optionsSlice';
 
 export default function ImageFit() {
   const dispatch = useAppDispatch();

frontend/src/features/options/components/AdvancedOptions/ImageToImage/ImageToImageStrength.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { RootState, useAppDispatch, useAppSelector } from 'app/store';
 import IAISlider from 'common/components/IAISlider';
-import { setImg2imgStrength } from 'features/options/optionsSlice';
+import { setImg2imgStrength } from 'features/options/store/optionsSlice';
 
 interface ImageToImageStrengthProps {
   label?: string;

frontend/src/features/options/components/AdvancedOptions/Inpainting/InpaintReplace.tsx

@@ -1,9 +1,9 @@
 import React, { ChangeEvent } from 'react';
-import { useAppDispatch, useAppSelector } from '../../../../app/store';
+import { useAppDispatch, useAppSelector } from '../../../../../app/store';
 import _ from 'lodash';
 import { createSelector } from '@reduxjs/toolkit';
-import IAISwitch from '../../../../common/components/IAISwitch';
+import IAISwitch from '../../../../../common/components/IAISwitch';
-import IAISlider from '../../../../common/components/IAISlider';
+import IAISlider from '../../../../../common/components/IAISlider';
 import { Flex } from '@chakra-ui/react';
 import {
   setInpaintReplace,

frontend/src/features/options/components/AdvancedOptions/Output/HiresOptions.tsx

@@ -6,7 +6,7 @@ import {
   useAppSelector,
 } from 'app/store';
 import IAISwitch from 'common/components/IAISwitch';
-import { setHiresFix } from 'features/options/optionsSlice';
+import { setHiresFix } from 'features/options/store/optionsSlice';
 
 /**
  * Hires Fix Toggle

frontend/src/features/options/components/AdvancedOptions/Output/SeamlessOptions.tsx

@@ -6,7 +6,7 @@ import {
   useAppSelector,
 } from 'app/store';
 import IAISwitch from 'common/components/IAISwitch';
-import { setSeamless } from 'features/options/optionsSlice';
+import { setSeamless } from 'features/options/store/optionsSlice';
 
 /**
  * Seamless tiling toggle

frontend/src/features/options/components/AdvancedOptions/Seed/Perlin.tsx

@@ -5,7 +5,7 @@ import {
   useAppSelector,
 } from 'app/store';
 import IAINumberInput from 'common/components/IAINumberInput';
-import { setPerlin } from 'features/options/optionsSlice';
+import { setPerlin } from 'features/options/store/optionsSlice';
 
 export default function Perlin() {
   const dispatch = useAppDispatch();

frontend/src/features/options/components/AdvancedOptions/Seed/RandomizeSeed.tsx

@@ -6,7 +6,7 @@ import {
   useAppSelector,
 } from 'app/store';
 import IAISwitch from 'common/components/IAISwitch';
-import { setShouldRandomizeSeed } from 'features/options/optionsSlice';
+import { setShouldRandomizeSeed } from 'features/options/store/optionsSlice';
 
 export default function RandomizeSeed() {
   const dispatch = useAppDispatch();

frontend/src/features/options/components/AdvancedOptions/Seed/Seed.tsx

@@ -6,7 +6,7 @@ import {
   useAppSelector,
 } from 'app/store';
 import IAINumberInput from 'common/components/IAINumberInput';
-import { setSeed } from 'features/options/optionsSlice';
+import { setSeed } from 'features/options/store/optionsSlice';
 
 export default function Seed() {
   const seed = useAppSelector((state: RootState) => state.options.seed);

frontend/src/features/options/components/AdvancedOptions/Seed/ShuffleSeed.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import { NUMPY_RAND_MAX, NUMPY_RAND_MIN } from 'app/constants';
 import { RootState, useAppDispatch, useAppSelector } from 'app/store';
 import randomInt from 'common/util/randomInt';
-import { setSeed } from 'features/options/optionsSlice';
+import { setSeed } from 'features/options/store/optionsSlice';
 
 export default function ShuffleSeed() {
   const dispatch = useAppDispatch();

frontend/src/features/options/components/AdvancedOptions/Seed/Threshold.tsx

@@ -5,7 +5,7 @@ import {
   useAppSelector,
 } from 'app/store';
 import IAINumberInput from 'common/components/IAINumberInput';
-import { setThreshold } from 'features/options/optionsSlice';
+import { setThreshold } from 'features/options/store/optionsSlice';
 
 export default function Threshold() {
   const dispatch = useAppDispatch();

frontend/src/features/options/components/AdvancedOptions/Upscale/UpscaleHeader.tsx

@@ -6,7 +6,7 @@ import {
   useAppSelector,
 } from 'app/store';
 import IAISwitch from 'common/components/IAISwitch';
-import { setShouldRunESRGAN } from 'features/options/optionsSlice';
+import { setShouldRunESRGAN } from 'features/options/store/optionsSlice';
 
 export default function UpscaleHeader() {
   const isESRGANAvailable = useAppSelector(

frontend/src/features/options/components/AdvancedOptions/Upscale/UpscaleOptions.tsx

@@ -6,12 +6,12 @@ import {
   setUpscalingStrength,
   UpscalingLevel,
   OptionsState,
-} from 'features/options/optionsSlice';
+} from 'features/options/store/optionsSlice';
 
 import { UPSCALING_LEVELS } from 'app/constants';
 import { createSelector } from '@reduxjs/toolkit';
 import { isEqual } from 'lodash';
-import { SystemState } from 'features/system/systemSlice';
+import { SystemState } from 'features/system/store/systemSlice';
 import { ChangeEvent } from 'react';
 import IAINumberInput from 'common/components/IAINumberInput';
 import IAISelect from 'common/components/IAISelect';

frontend/src/features/options/components/AdvancedOptions/Variations/GenerateVariations.tsx

@@ -5,7 +5,7 @@ import {
   useAppSelector,
 } from 'app/store';
 import IAISwitch from 'common/components/IAISwitch';
-import { setShouldGenerateVariations } from 'features/options/optionsSlice';
+import { setShouldGenerateVariations } from 'features/options/store/optionsSlice';
 
 export default function GenerateVariations() {
   const shouldGenerateVariations = useAppSelector(

frontend/src/features/options/components/AdvancedOptions/Variations/SeedWeights.tsx

@@ -6,7 +6,7 @@ import {
 } from 'app/store';
 import IAIInput from 'common/components/IAIInput';
 import { validateSeedWeights } from 'common/util/seedWeightPairs';
-import { setSeedWeights } from 'features/options/optionsSlice';
+import { setSeedWeights } from 'features/options/store/optionsSlice';
 
 export default function SeedWeights() {
   const seedWeights = useAppSelector(

frontend/src/features/options/components/AdvancedOptions/Variations/VariationAmount.tsx

@@ -5,7 +5,7 @@ import {
   useAppSelector,
 } from 'app/store';
 import IAINumberInput from 'common/components/IAINumberInput';
-import { setVariationAmount } from 'features/options/optionsSlice';
+import { setVariationAmount } from 'features/options/store/optionsSlice';
 
 export default function VariationAmount() {
   const variationAmount = useAppSelector(

frontend/src/features/options/components/MainOptions/MainAdvancedOptionsCheckbox.tsx

@@ -1,7 +1,7 @@
 import React, { ChangeEvent } from 'react';
 import { RootState, useAppDispatch, useAppSelector } from 'app/store';
 import IAICheckbox from 'common/components/IAICheckbox';
-import { setShowAdvancedOptions } from 'features/options/optionsSlice';
+import { setShowAdvancedOptions } from 'features/options/store/optionsSlice';
 
 export default function MainAdvancedOptionsCheckbox() {
   const showAdvancedOptions = useAppSelector(

frontend/src/features/options/components/MainOptions/MainCFGScale.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { RootState, useAppDispatch, useAppSelector } from 'app/store';
 import IAINumberInput from 'common/components/IAINumberInput';
-import { setCfgScale } from 'features/options/optionsSlice';
+import { setCfgScale } from 'features/options/store/optionsSlice';
 import { inputWidth } from './MainOptions';
 
 export default function MainCFGScale() {

frontend/src/features/options/components/MainOptions/MainHeight.tsx

@@ -2,8 +2,8 @@ import React, { ChangeEvent } from 'react';
 import { HEIGHTS } from 'app/constants';
 import { RootState, useAppDispatch, useAppSelector } from 'app/store';
 import IAISelect from 'common/components/IAISelect';
-import { activeTabNameSelector } from 'features/options/optionsSelectors';
+import { activeTabNameSelector } from 'features/options/store/optionsSelectors';
-import { setHeight } from 'features/options/optionsSlice';
+import { setHeight } from 'features/options/store/optionsSlice';
 
 export default function MainHeight() {
   const height = useAppSelector((state: RootState) => state.options.height);

frontend/src/features/options/components/MainOptions/MainIterations.tsx

@@ -3,8 +3,8 @@ import _ from 'lodash';
 import React from 'react';
 import { RootState, useAppDispatch, useAppSelector } from 'app/store';
 import IAINumberInput from 'common/components/IAINumberInput';
-import { mayGenerateMultipleImagesSelector } from 'features/options/optionsSelectors';
+import { mayGenerateMultipleImagesSelector } from 'features/options/store/optionsSelectors';
-import { OptionsState, setIterations } from 'features/options/optionsSlice';
+import { OptionsState, setIterations } from 'features/options/store/optionsSlice';
 import { inputWidth } from './MainOptions';
 
 const mainIterationsSelector = createSelector(

frontend/src/features/options/components/MainOptions/MainOptions.scss

@@ -1,4 +1,4 @@
-@use '../../../styles/Mixins/' as *;
+@use '../../../../styles/Mixins/' as *;
 
 .main-options {
   display: grid;

frontend/src/features/options/components/MainOptions/MainSampler.tsx

@@ -2,7 +2,7 @@ import React, { ChangeEvent } from 'react';
 import { SAMPLERS } from 'app/constants';
 import { RootState, useAppDispatch, useAppSelector } from 'app/store';
 import IAISelect from 'common/components/IAISelect';
-import { setSampler } from 'features/options/optionsSlice';
+import { setSampler } from 'features/options/store/optionsSlice';
 
 export default function MainSampler() {
   const sampler = useAppSelector((state: RootState) => state.options.sampler);

frontend/src/features/options/components/MainOptions/MainSteps.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { RootState, useAppDispatch, useAppSelector } from 'app/store';
 import IAINumberInput from 'common/components/IAINumberInput';
-import { setSteps } from 'features/options/optionsSlice';
+import { setSteps } from 'features/options/store/optionsSlice';
 import { inputWidth } from './MainOptions';
 
 export default function MainSteps() {

frontend/src/features/options/components/MainOptions/MainWidth.tsx

@@ -2,8 +2,8 @@ import React, { ChangeEvent } from 'react';
 import { WIDTHS } from 'app/constants';
 import { RootState, useAppDispatch, useAppSelector } from 'app/store';
 import IAISelect from 'common/components/IAISelect';
-import { activeTabNameSelector } from 'features/options/optionsSelectors';
+import { activeTabNameSelector } from 'features/options/store/optionsSelectors';
-import { setWidth } from 'features/options/optionsSlice';
+import { setWidth } from 'features/options/store/optionsSlice';
 
 export default function MainWidth() {
   const width = useAppSelector((state: RootState) => state.options.width);

frontend/src/features/options/components/OptionsAccordion.tsx

@@ -1,6 +1,6 @@
 import { Accordion, ExpandedIndex } from '@chakra-ui/react';
 import { RootState, useAppDispatch, useAppSelector } from 'app/store';
-import { setOpenAccordions } from 'features/system/systemSlice';
+import { setOpenAccordions } from 'features/system/store/systemSlice';
 import InvokeAccordionItem, {
   InvokeAccordionItemProps,
 } from './AccordionItems/InvokeAccordionItem';

frontend/src/features/options/components/ProcessButtons/CancelButton.tsx

@@ -6,7 +6,7 @@ import IAIIconButton, {
 } from 'common/components/IAIIconButton';
 import { useHotkeys } from 'react-hotkeys-hook';
 import { createSelector } from '@reduxjs/toolkit';
-import { SystemState } from 'features/system/systemSlice';
+import { SystemState } from 'features/system/store/systemSlice';
 import _ from 'lodash';
 
 const cancelButtonSelector = createSelector(

frontend/src/features/options/components/ProcessButtons/InvokeButton.tsx

@@ -9,7 +9,7 @@ import IAIIconButton, {
   IAIIconButtonProps,
 } from 'common/components/IAIIconButton';
 import IAIPopover from 'common/components/IAIPopover';
-import { activeTabNameSelector } from 'features/options/optionsSelectors';
+import { activeTabNameSelector } from 'features/options/store/optionsSelectors';
 
 interface InvokeButton
   extends Omit<IAIButtonProps | IAIIconButtonProps, 'aria-label'> {

frontend/src/features/options/components/ProcessButtons/Loopback.tsx

@@ -2,7 +2,7 @@ import { createSelector } from '@reduxjs/toolkit';
 import { FaRecycle } from 'react-icons/fa';
 import { RootState, useAppDispatch, useAppSelector } from 'app/store';
 import IAIIconButton from 'common/components/IAIIconButton';
-import { OptionsState, setShouldLoopback } from 'features/options/optionsSlice';
+import { OptionsState, setShouldLoopback } from 'features/options/store/optionsSlice';
 
 const loopbackSelector = createSelector(
   (state: RootState) => state.options,

frontend/src/features/options/components/ProcessButtons/ProcessButtons.scss

@@ -1,4 +1,4 @@
-@use '../../../styles/Mixins/' as *;
+@use '../../../../styles/Mixins/' as *;
 
 .process-buttons {
   display: flex;

frontend/src/features/options/components/PromptInput/PromptInput.tsx

@@ -3,11 +3,11 @@ import { ChangeEvent, KeyboardEvent, useRef } from 'react';
 import { RootState, useAppDispatch, useAppSelector } from 'app/store';
 import { generateImage } from 'app/socketio/actions';
 
-import { OptionsState, setPrompt } from 'features/options/optionsSlice';
+import { OptionsState, setPrompt } from 'features/options/store/optionsSlice';
 import { createSelector } from '@reduxjs/toolkit';
 import _ from 'lodash';
 import { useHotkeys } from 'react-hotkeys-hook';
-import { activeTabNameSelector } from 'features/options/optionsSelectors';
+import { activeTabNameSelector } from 'features/options/store/optionsSelectors';
 import { readinessSelector } from 'app/selectors/readinessSelector';
 
 const promptInputSelector = createSelector(

frontend/src/features/options/store/optionsSelectors.ts

@@ -1,7 +1,7 @@
 import { createSelector } from '@reduxjs/toolkit';
 import _ from 'lodash';
 import { RootState } from 'app/store';
-import { tabMap } from 'features/tabs/InvokeTabs';
+import { tabMap } from 'features/tabs/components/InvokeTabs';
 import { OptionsState } from './optionsSlice';
 
 export const activeTabNameSelector = createSelector(

frontend/src/features/options/store/optionsSlice.ts

@@ -4,7 +4,7 @@ import * as InvokeAI from 'app/invokeai';
 import promptToString from 'common/util/promptToString';
 import { seedWeightsToString } from 'common/util/seedWeightPairs';
 import { FACETOOL_TYPES } from 'app/constants';
-import { InvokeTabName, tabMap } from 'features/tabs/InvokeTabs';
+import { InvokeTabName, tabMap } from 'features/tabs/components/InvokeTabs';
 
 export type UpscalingLevel = 2 | 4;
 

frontend/src/features/system/components/Console.tsx

@@ -1,7 +1,7 @@
 import { IconButton, Tooltip } from '@chakra-ui/react';
 import { useAppDispatch, useAppSelector } from 'app/store';
 import { RootState } from 'app/store';
-import { errorSeen, setShouldShowLogViewer, SystemState } from './systemSlice';
+import { errorSeen, setShouldShowLogViewer, SystemState } from 'features/system/store/systemSlice';
 import { useLayoutEffect, useRef, useState } from 'react';
 import { FaAngleDoubleDown, FaCode, FaMinus } from 'react-icons/fa';
 import { createSelector } from '@reduxjs/toolkit';

frontend/src/features/system/components/HotkeysModal/HotkeysModal.scss

@@ -1,4 +1,4 @@
-@use '../../../styles/Mixins/' as *;
+@use '../../../../styles/Mixins/' as *;
 
 .hotkeys-modal {
   width: 36rem;

frontend/src/features/system/components/Modal.scss

@@ -1,4 +1,4 @@
-@use '../../styles/Mixins/' as *;
+@use '../../../styles/Mixins/' as *;
 
 .modal {
   background-color: var(--background-color-secondary);

frontend/src/features/system/components/ProgressBar.scss

@@ -1,4 +1,4 @@
-@use '../../styles/Mixins/' as *;
+@use '../../../styles/Mixins/' as *;
 
 .progress-bar {
   background-color: var(--root-bg-color);