Merge pull request #571 from EarthyScience/jp/direct-stores

TheJeran · web-flow · commit bdd42f824bf8 · 2026-03-02T18:11:28.000+01:00
changed store paths
diff --git a/src/GlobalStates/index.ts b/src/GlobalStates/index.ts
diff --git a/src/components/LandingHome.tsx b/src/components/LandingHome.tsx
@@ -7,7 +7,8 @@ import { useEffect, useMemo } from 'react';
 import { PlotArea, Plot, LandingShapes } from '@/components/plots';
 import { MainPanel } from '@/components/ui';
 import { Loading, Navbar, Error as ErrorComponent } from '@/components/ui';
-import { useGlobalStore, useZarrStore } from '@/GlobalStates';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { useZarrStore } from '@/GlobalStates/ZarrStore';
 import { useShallow } from 'zustand/shallow';
 
 async function sendPing() {
diff --git a/src/components/plots/AnalysisInfo.tsx b/src/components/plots/AnalysisInfo.tsx
@@ -1,6 +1,8 @@
+'use client';
 import React, {useEffect, useMemo} from 'react'
 import './Plots.css'
-import { useAnalysisStore, useGlobalStore } from '@/GlobalStates'
+import { useAnalysisStore } from '@/GlobalStates/AnalysisStore';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
 import { useShallow } from 'zustand/shallow'
 import { parseLoc } from '@/utils/HelperFuncs'
 
diff --git a/src/components/plots/AnalysisWG.tsx b/src/components/plots/AnalysisWG.tsx
@@ -3,7 +3,9 @@ import { ArrayMinMax, GetCurrentArray } from '@/utils/HelperFuncs';
 import * as THREE from 'three';
 import React, { useEffect, useRef } from 'react';
 import { DataReduction, Convolve, Multivariate2D, Multivariate3D, CUMSUM3D, Convolve2D, CustomShader } from '../computation/webGPU';
-import { useGlobalStore, useAnalysisStore, usePlotStore } from '@/GlobalStates';
+import { useAnalysisStore } from '@/GlobalStates/AnalysisStore';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
 import { useShallow } from 'zustand/shallow';
 import { GetArray } from '../zarr/ZarrLoaderLRU';
 import { CreateTexture } from '../textures';
diff --git a/src/components/plots/AxisLines.tsx b/src/components/plots/AxisLines.tsx
@@ -1,6 +1,10 @@
 "use client";
 
-import { useAnalysisStore, useGlobalStore, useImageExportStore, usePlotStore, useZarrStore } from '@/GlobalStates'
+import { useAnalysisStore } from '@/GlobalStates/AnalysisStore';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
+import { useZarrStore } from '@/GlobalStates/ZarrStore';
+import { useImageExportStore } from '@/GlobalStates/ImageExportStore';
 import React, {useState, useMemo} from 'react'
 import { useShallow } from 'zustand/shallow'
 import { Text } from '@react-three/drei'
diff --git a/src/components/plots/CountryBorders.tsx b/src/components/plots/CountryBorders.tsx
@@ -1,6 +1,8 @@
 "use client";
 import React, {useEffect, useState, useMemo} from 'react'
-import { useAnalysisStore, useGlobalStore, usePlotStore } from '@/GlobalStates';
+import { useAnalysisStore } from '@/GlobalStates/AnalysisStore';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
 import * as THREE from 'three'
 import { useShallow } from 'zustand/shallow';
 import { useFrame } from '@react-three/fiber';
diff --git a/src/components/plots/DataCube.tsx b/src/components/plots/DataCube.tsx
@@ -1,7 +1,8 @@
 import {  useEffect, useMemo, useRef } from 'react'
 import * as THREE from 'three'
 import { vertexShader, fragmentShader, fragOpt, orthoVertex } from '@/components/textures/shaders';
-import { useGlobalStore, usePlotStore } from '@/GlobalStates';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
 import { useShallow } from 'zustand/shallow';
 import { invalidate, useFrame } from '@react-three/fiber';
 import { deg2rad } from '@/utils/HelperFuncs';
diff --git a/src/components/plots/FlatBlocks.tsx b/src/components/plots/FlatBlocks.tsx
@@ -1,5 +1,8 @@
 import React, { useEffect, useMemo } from 'react'
-import { useAnalysisStore, useErrorStore, useGlobalStore, usePlotStore } from '@/GlobalStates'
+import { useAnalysisStore } from '@/GlobalStates/AnalysisStore';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
+import { useErrorStore } from '@/GlobalStates/ErrorStore';
 import { useShallow } from 'zustand/shallow'
 import * as THREE from 'three'
 import { sphereBlocksFrag, flatBlocksVert, flatBlocksVert3D } from '../textures/shaders'
diff --git a/src/components/plots/FlatMap.tsx b/src/components/plots/FlatMap.tsx
@@ -2,7 +2,10 @@
 
 import React, {useMemo, useEffect, useRef, useState} from 'react'
 import * as THREE from 'three'
-import { useAnalysisStore, useGlobalStore, usePlotStore, useZarrStore } from '@/GlobalStates'
+import { useAnalysisStore } from '@/GlobalStates/AnalysisStore';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
+import { useZarrStore } from '@/GlobalStates/ZarrStore';
 import { vertShader } from '@/components/computation/shaders'
 import { flatFrag3D, fragmentFlat } from '../textures/shaders';
 import { useShallow } from 'zustand/shallow'
diff --git a/src/components/plots/KeyFramePreviewer.tsx b/src/components/plots/KeyFramePreviewer.tsx
@@ -1,5 +1,7 @@
 "use client";
-import { useGlobalStore, useImageExportStore, usePlotStore } from '@/GlobalStates'
+import { useImageExportStore } from '@/GlobalStates/ImageExportStore';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
 import { invalidate, useThree } from '@react-three/fiber';
 import React, { useEffect, useMemo, useRef } from 'react'
 import { useShallow } from 'zustand/shallow'
diff --git a/src/components/plots/MorphingPoints.tsx b/src/components/plots/MorphingPoints.tsx
@@ -7,7 +7,8 @@ import gsap from 'gsap';
 import vertexShader from '@/components/textures/shaders/LandingVertex.glsl'
 import fragmentShader from '@/components/textures/shaders/LandingFrag.glsl'
 import './Plots.css';
-import { useGlobalStore, usePlotStore } from '@/GlobalStates';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
 import { useShallow } from 'zustand/shallow';
 
 
diff --git a/src/components/plots/Plot.tsx b/src/components/plots/Plot.tsx
@@ -4,7 +4,10 @@ import * as THREE from 'three';
 import { PointCloud, UVCube, DataCube, FlatMap, Sphere, CountryBorders, AxisLines, SphereBlocks, FlatBlocks, KeyFramePreviewer } from '@/components/plots';
 import { Canvas, invalidate, useThree, useLoader } from '@react-three/fiber';
 import { CreateTexture } from '@/components/textures';
-import { useAnalysisStore, useGlobalStore, useImageExportStore, usePlotStore } from '@/GlobalStates';
+import { useAnalysisStore } from '@/GlobalStates/AnalysisStore';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
+import { useImageExportStore } from '@/GlobalStates/ImageExportStore';
 import { useShallow } from 'zustand/shallow';
 import { Navbar, Colorbar, ExportExtent, ShaderEditor, KeyFrames } from '../ui';
 import AnalysisInfo from './AnalysisInfo';
diff --git a/src/components/plots/PointCloud.tsx b/src/components/plots/PointCloud.tsx
@@ -1,7 +1,9 @@
 import * as THREE from 'three'
 import { useEffect, useMemo, useState, useRef } from 'react'
 import { pointFrag, pointVert } from '@/components/textures/shaders'
-import { useAnalysisStore, useGlobalStore, usePlotStore } from '@/GlobalStates';
+import { useAnalysisStore } from '@/GlobalStates/AnalysisStore';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
 import { useShallow } from 'zustand/shallow';
 import { parseUVCoords, getUnitAxis, GetTimeSeries, GetCurrentArray, deg2rad } from '@/utils/HelperFuncs';
 import { evaluate_cmap } from 'js-colormaps-es';
diff --git a/src/components/plots/Sphere.tsx b/src/components/plots/Sphere.tsx
@@ -1,6 +1,8 @@
 import React, {useRef, useMemo, useState, useEffect} from 'react'
 import * as THREE from 'three'
-import { useAnalysisStore, useGlobalStore, usePlotStore } from '@/GlobalStates'
+import { useAnalysisStore } from '@/GlobalStates/AnalysisStore';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
 import { useShallow } from 'zustand/shallow'
 import { sphereVertex, sphereVertexFlat, sphereFrag, flatSphereFrag } from '../textures/shaders'
 import { parseUVCoords, GetTimeSeries, GetCurrentArray, deg2rad } from '@/utils/HelperFuncs';
diff --git a/src/components/plots/SphereBlocks.tsx b/src/components/plots/SphereBlocks.tsx
@@ -1,5 +1,7 @@
 import React, { useEffect, useMemo } from 'react'
-import { useErrorStore, useGlobalStore, usePlotStore } from '@/GlobalStates'
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
+import { useErrorStore } from '@/GlobalStates/ErrorStore';
 import { useShallow } from 'zustand/shallow'
 import * as THREE from 'three'
 import { sphereBlocksVert, sphereBlocksVertFlat, sphereBlocksFrag } from '../textures/shaders'
diff --git a/src/components/plots/UVCube.tsx b/src/components/plots/UVCube.tsx
@@ -1,7 +1,9 @@
 import * as THREE from 'three'
 import { useMemo, useState, useEffect, useRef } from 'react';
 import { parseUVCoords, getUnitAxis, GetTimeSeries, GetCurrentArray } from '@/utils/HelperFuncs';
-import { useAnalysisStore, useGlobalStore, usePlotStore } from '@/GlobalStates';
+import { useAnalysisStore } from '@/GlobalStates/AnalysisStore';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
 import { useShallow } from 'zustand/shallow';
 import { evaluate_cmap } from 'js-colormaps-es';
 
diff --git a/src/components/plots/plotarea/FixedTicks.tsx b/src/components/plots/plotarea/FixedTicks.tsx
@@ -3,7 +3,8 @@ import { useThree, useFrame } from '@react-three/fiber'
 import { useState, useMemo, useEffect, useRef } from 'react'
 import { parseTimeUnit } from '@/utils/HelperFuncs'
 import { Fragment } from 'react'
-import { useGlobalStore, usePlotStore } from '@/GlobalStates'
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
 import { useShallow } from 'zustand/shallow'
 
 
diff --git a/src/components/plots/plotarea/LinePlot.tsx b/src/components/plots/plotarea/LinePlot.tsx
@@ -4,7 +4,7 @@ import { FixedTicks, ThickLine } from '@/components/plots'
 import {  RefObject, useEffect, useRef, useState } from 'react'
 import { ResizeBar, YScaler, XScaler, ShowLinePlot } from '@/components/ui'
 import './LinePlot.css'
-import { useGlobalStore } from '@/GlobalStates'
+import { useGlobalStore } from '@/GlobalStates/GlobalStore'
 import { useShallow } from 'zustand/shallow'
 import PlotLineOptions from '@/components/ui/LinePlotArea/PlotLineOptions'
 import { IoCloseCircleSharp } from "react-icons/io5";
diff --git a/src/components/plots/plotarea/PlotPoints.tsx b/src/components/plots/plotarea/PlotPoints.tsx
@@ -1,7 +1,8 @@
 import React, {useRef, useMemo, useEffect, useState} from 'react'
 import * as THREE from 'three'
 import { useFrame } from '@react-three/fiber'
-import { useGlobalStore, usePlotStore } from '@/GlobalStates'
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
 import { useShallow } from 'zustand/shallow'
 
 interface pointSetters{
diff --git a/src/components/plots/plotarea/ThickLine.tsx b/src/components/plots/plotarea/ThickLine.tsx
@@ -2,7 +2,8 @@
 
 import React, {useEffect, useMemo, useRef, useState} from 'react'
 import * as THREE from 'three'
-import { usePlotStore, useGlobalStore } from '@/GlobalStates'
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
 import { useShallow } from 'zustand/shallow'
 import vertexShader from '@/components/textures/shaders/thickLineVert.glsl'
 import { PlotPoints } from './PlotPoints';
diff --git a/src/components/textures/TextureMakers.tsx b/src/components/textures/TextureMakers.tsx
@@ -1,7 +1,7 @@
 //This File will have functions converting the array information into 2D or 3D textures that we will pass to the corresponding 2D or 3D object
 import * as THREE from 'three'
 import { ArrayMinMax, TypedArray, TypedArrayBufferLike  } from '@/utils/HelperFuncs';
-import { useGlobalStore } from '@/GlobalStates';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
 
 interface Array {
     data: TypedArray | TypedArrayBufferLike;
diff --git a/src/components/ui/Colorbar.tsx b/src/components/ui/Colorbar.tsx
@@ -4,7 +4,9 @@
 import { RxReset } from "react-icons/rx";
 import { FaPlus, FaMinus } from "react-icons/fa";
 import React, {useRef, useEffect, useMemo, useState} from 'react'
-import { useGlobalStore, usePlotStore, useAnalysisStore } from '@/GlobalStates'
+import { useAnalysisStore } from '@/GlobalStates/AnalysisStore';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
 import { useShallow } from 'zustand/shallow'
 import './css/Colorbar.css'
 import { linspace } from '@/utils/HelperFuncs';
diff --git a/src/components/ui/Elements/AxisBars.tsx b/src/components/ui/Elements/AxisBars.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import "../css/AxisBars.css"
-import { usePlotStore } from '@/GlobalStates'
+import { usePlotStore } from '@/GlobalStates/PlotStore'
 import { useShallow } from 'zustand/shallow'
 import * as THREE from 'three'
 
diff --git a/src/components/ui/Elements/Error.tsx b/src/components/ui/Elements/Error.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import '../css/Error.css'
-import { useErrorStore } from '@/GlobalStates'
+import { useErrorStore } from '@/GlobalStates/ErrorStore'
 import { ErrorList } from './ErrorList'
 import { useShallow } from 'zustand/shallow'
 import { Button } from '@/components/ui'
diff --git a/src/components/ui/Elements/Loading.tsx b/src/components/ui/Elements/Loading.tsx
@@ -1,4 +1,4 @@
-import { useGlobalStore } from "@/GlobalStates"
+import { useGlobalStore } from "@/GlobalStates/GlobalStore"
 import '../css/Loading.css'
 import { useShallow } from "zustand/shallow"
 
diff --git a/src/components/ui/ExportExtent.tsx b/src/components/ui/ExportExtent.tsx
@@ -1,4 +1,6 @@
-import { useGlobalStore, useImageExportStore } from '@/GlobalStates'
+import { useImageExportStore } from '@/GlobalStates/ImageExportStore';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+
 import React from 'react'
 import { useShallow } from 'zustand/shallow'
 
diff --git a/src/components/ui/Footer.tsx b/src/components/ui/Footer.tsx
@@ -2,7 +2,7 @@ import Image from "next/image";
 import { logoBGC_MPI, logoBGC, logoMPI } from "@/assets/index";
 
 import './css/Footer.css';
-import { useImageExportStore } from "@/GlobalStates";
+import { useImageExportStore } from "@/GlobalStates/ImageExportStore";
 import { useShallow } from "zustand/shallow";
 
 const Footer = () => {
diff --git a/src/components/ui/KeyFrames.tsx b/src/components/ui/KeyFrames.tsx
@@ -2,7 +2,8 @@
 import React, {useEffect, useRef, useState } from 'react'
 import { Button } from './button'
 import { ButtonGroup } from "@/components/ui/button-group"
-import { useImageExportStore, usePlotStore } from '@/GlobalStates'
+import { useImageExportStore } from '@/GlobalStates/ImageExportStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
 import { useShallow } from 'zustand/shallow'
 import { Slider } from './slider'
 import './css/KeyFrames.css'
diff --git a/src/components/ui/LinePlotArea/PlotLineOptions.tsx b/src/components/ui/LinePlotArea/PlotLineOptions.tsx
@@ -9,7 +9,7 @@ import {
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu"
-import { usePlotStore } from '@/GlobalStates'
+import { usePlotStore } from '@/GlobalStates/PlotStore'
 import { useShallow } from 'zustand/shallow'
 import { Slider } from "@/components/ui/slider"
 
diff --git a/src/components/ui/MainPanel/AdjustPlot.tsx b/src/components/ui/MainPanel/AdjustPlot.tsx
@@ -1,6 +1,8 @@
 "use client";
 import React, {useState, useEffect} from 'react'
-import { useAnalysisStore, useGlobalStore, usePlotStore } from '@/GlobalStates';
+import { useAnalysisStore } from '@/GlobalStates/AnalysisStore';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
 import '../css/MainPanel.css'
 import { useShallow } from 'zustand/shallow';
 import { SliderThumbs } from '@/components/ui/Widgets/SliderThumbs';
diff --git a/src/components/ui/MainPanel/AnalysisOptions.tsx b/src/components/ui/MainPanel/AnalysisOptions.tsx
@@ -1,7 +1,9 @@
 'use client';
 
 import React, { useEffect, useState, useRef } from 'react';
-import { useAnalysisStore, useGlobalStore, useZarrStore } from '@/GlobalStates';
+import { useAnalysisStore } from '@/GlobalStates/AnalysisStore';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { useZarrStore } from '@/GlobalStates/ZarrStore';
 import { useShallow } from 'zustand/shallow';
 import '../css/MainPanel.css';
 import { PiMathOperationsBold } from "react-icons/pi";
diff --git a/src/components/ui/MainPanel/Colormaps.tsx b/src/components/ui/MainPanel/Colormaps.tsx
@@ -2,7 +2,7 @@
 
 import React, {useEffect, useState} from 'react'
 import { GetColorMapTexture } from '@/components/textures';
-import { useGlobalStore } from '@/GlobalStates';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
 import { colormaps } from '@/components/textures';
 import { useShallow } from 'zustand/shallow';
 import { MdOutlineSwapVert } from "react-icons/md";
diff --git a/src/components/ui/MainPanel/Dataset.tsx b/src/components/ui/MainPanel/Dataset.tsx
@@ -1,7 +1,8 @@
 "use client";
 
 import React, { SetStateAction, useEffect, useState, ReactNode } from 'react';
-import { useGlobalStore, useZarrStore } from '@/GlobalStates';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { useZarrStore } from '@/GlobalStates/ZarrStore';
 import { useShallow } from 'zustand/shallow';
 import { Input } from '../input';
 import { Button } from '../button';
diff --git a/src/components/ui/MainPanel/LocalNetCDF.tsx b/src/components/ui/MainPanel/LocalNetCDF.tsx
@@ -1,7 +1,8 @@
 "use client";
 import React, {ChangeEvent, useState} from 'react'
 import { Input } from '../input'
-import { useGlobalStore, useZarrStore } from '@/GlobalStates';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { useZarrStore } from '@/GlobalStates/ZarrStore';
 import { NetCDF4 } from '@earthyscience/netcdf4-wasm';
 import {
   Alert,
@@ -45,7 +46,7 @@ const LocalNetCDF = ({ setOpenVariables}:LocalNCType) => {
           data.getFullMetadata()
         ])
         useGlobalStore.setState({variables: Object.keys(variables), zMeta: metadata, initStore:`local_${file.name}`})
-        useZarrStore.setState({ fetchNC:true, useNC: true, ncModule: data})
+        useZarrStore.setState({ useNC: true, ncModule: data})
         const titleDescription = {
           title: attrs.title?? file.name,
           description: attrs.history?? ''
diff --git a/src/components/ui/MainPanel/LocalZarr.tsx b/src/components/ui/MainPanel/LocalZarr.tsx
@@ -1,7 +1,8 @@
 "use client";
 import React, {useState, useEffect, ChangeEvent} from 'react'
 import * as zarr from 'zarrita'
-import { useZarrStore, useGlobalStore } from '@/GlobalStates';
+import { useZarrStore } from '@/GlobalStates/ZarrStore';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
 import { Input } from '../input';
 import ZarrParser from '@/components/zarr/ZarrParser';
 
diff --git a/src/components/ui/MainPanel/MetaDataInfo.tsx b/src/components/ui/MainPanel/MetaDataInfo.tsx
@@ -1,5 +1,8 @@
 import React, { useState, useMemo, useEffect } from "react"
-import { useCacheStore, useGlobalStore, usePlotStore, useZarrStore } from '@/GlobalStates'
+import { useCacheStore } from "@/GlobalStates/CacheStore";
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
+import { useZarrStore } from '@/GlobalStates/ZarrStore';
 import { useShallow } from 'zustand/shallow'
 import { SliderThumbs } from "@/components/ui/Widgets/SliderThumbs"
 import Metadata, { defaultAttributes, renderAttributes } from "@/components/ui/MetaData"
diff --git a/src/components/ui/MainPanel/PlayButton.tsx b/src/components/ui/MainPanel/PlayButton.tsx
@@ -1,5 +1,8 @@
 "use client";
-import { useCacheStore, useGlobalStore, usePlotStore, useZarrStore } from '@/GlobalStates'
+import { useCacheStore } from '@/GlobalStates/CacheStore';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
+import { useZarrStore } from '@/GlobalStates/ZarrStore';
 import {useEffect, useMemo, useState, useRef} from 'react'
 import { useShallow } from 'zustand/shallow'
 import '../css/MainPanel.css'
diff --git a/src/components/ui/MainPanel/PlotType.tsx b/src/components/ui/MainPanel/PlotType.tsx
@@ -2,7 +2,8 @@
 
 import React, { useEffect, useMemo, useState } from 'react'
 import '../css/MainPanel.css'
-import { useGlobalStore, usePlotStore } from '@/GlobalStates';
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
+import { usePlotStore } from '@/GlobalStates/PlotStore';
 import { useShallow } from 'zustand/shallow';
 import { PiSphereThin } from "react-icons/pi";
 import { CgMenuGridO } from "react-icons/cg";
diff --git a/src/components/ui/MainPanel/Variables.tsx b/src/components/ui/MainPanel/Variables.tsx
@@ -2,7 +2,7 @@
 
 import React, { useState, useEffect, useMemo } from "react";
 import { TbVariable } from "react-icons/tb";
-import { useGlobalStore, useZarrStore } from "@/GlobalStates";
+import { useGlobalStore } from '@/GlobalStates/GlobalStore';
 import { useShallow } from "zustand/shallow";
 import { Separator } from "@/components/ui/separator";
 import MetaDataInfo from "./MetaDataInfo";
diff --git a/src/components/ui/NavBar/ExportImageSettings.tsx b/src/components/ui/NavBar/ExportImageSettings.tsx
diff --git a/src/components/ui/NavBar/Navbar.tsx b/src/components/ui/NavBar/Navbar.tsx
diff --git a/src/components/ui/NavBar/PerformanceMode.tsx b/src/components/ui/NavBar/PerformanceMode.tsx
diff --git a/src/components/ui/NavBar/PlotLineButton.tsx b/src/components/ui/NavBar/PlotLineButton.tsx
diff --git a/src/components/ui/ShaderEditor.tsx b/src/components/ui/ShaderEditor.tsx
diff --git a/src/components/ui/VariablesTable.tsx b/src/components/ui/VariablesTable.tsx
diff --git a/src/components/zarr/GetMetadata.tsx b/src/components/zarr/GetMetadata.tsx
diff --git a/src/components/zarr/MetadataText.tsx b/src/components/zarr/MetadataText.tsx
diff --git a/src/components/zarr/NCGetters.ts b/src/components/zarr/NCGetters.ts
diff --git a/src/components/zarr/ZarrGetters.ts b/src/components/zarr/ZarrGetters.ts
diff --git a/src/components/zarr/ZarrLoaderLRU.ts b/src/components/zarr/ZarrLoaderLRU.ts
diff --git a/src/hooks/useCoordBounds.tsx b/src/hooks/useCoordBounds.tsx
diff --git a/src/hooks/useDataFetcher.tsx b/src/hooks/useDataFetcher.tsx
diff --git a/src/utils/ExportCanvas.tsx b/src/utils/ExportCanvas.tsx
diff --git a/src/utils/HelperFuncs.ts b/src/utils/HelperFuncs.ts
