diff --git a/src/auto-imports.d.ts b/src/auto-imports.d.ts
index b197f295..c9ef679c 100644
--- a/src/auto-imports.d.ts
+++ b/src/auto-imports.d.ts
@@ -17,6 +17,8 @@ declare global {
   const acceptHMRUpdate: typeof import('pinia')['acceptHMRUpdate']
   const asyncComputed: typeof import('@vueuse/core')['asyncComputed']
   const autoResetRef: typeof import('@vueuse/core')['autoResetRef']
+  const binData: typeof import('./utils/charts/binCount')['binData']
+  const calculateDiff: typeof import('./utils/charts/areaPlotDataset')['calculateDiff']
   const computed: typeof import('vue')['computed']
   const computedAsync: typeof import('@vueuse/core')['computedAsync']
   const computedEager: typeof import('@vueuse/core')['computedEager']
@@ -36,6 +38,7 @@ declare global {
   const createTemplatePromise: typeof import('@vueuse/core')['createTemplatePromise']
   const createUnrefFn: typeof import('@vueuse/core')['createUnrefFn']
   const customRef: typeof import('vue')['customRef']
+  const dataZoomPartial: typeof import('./utils/charts/chartZoom')['dataZoomPartial']
   const dateFromString: typeof import('./utils/formatters/timeformat')['dateFromString']
   const dateStringToTimeRange: typeof import('./utils/formatters/timeformat')['dateStringToTimeRange']
   const debouncedRef: typeof import('@vueuse/core')['debouncedRef']
@@ -52,10 +55,17 @@ declare global {
   const formatPercent: typeof import('./utils/formatters/numberformat')['formatPercent']
   const formatPrice: typeof import('./utils/formatters/numberformat')['formatPrice']
   const formatPriceCurrency: typeof import('./utils/formatters/numberformat')['formatPriceCurrency']
+  const generateAreaCandleSeries: typeof import('./utils/charts/candleChartSeries')['generateAreaCandleSeries']
+  const generateCandleSeries: typeof import('./utils/charts/candleChartSeries')['generateCandleSeries']
+  const generateTradeSeries: typeof import('./utils/charts/tradeChartData')['generateTradeSeries']
   const getActivePinia: typeof import('pinia')['getActivePinia']
   const getCurrentInstance: typeof import('vue')['getCurrentInstance']
   const getCurrentScope: typeof import('vue')['getCurrentScope']
+  const getDiffColumnsFromPlotConfig: typeof import('./utils/charts/areaPlotDataset')['getDiffColumnsFromPlotConfig']
+  const getTradeEntries: typeof import('./utils/charts/tradeChartData')['getTradeEntries']
   const h: typeof import('vue')['h']
+  const heikinAshiDataset: typeof import('./utils/charts/heikinashi')['heikinAshiDataset']
+  const heikinashi: typeof import('./utils/charts/heikinashi')['default']
   const humanizeDurationFromSeconds: typeof import('./utils/formatters/timeformat')['humanizeDurationFromSeconds']
   const ignorableWatch: typeof import('@vueuse/core')['ignorableWatch']
   const initBots: typeof import('./stores/ftbotwrapper')['initBots']
@@ -361,6 +371,8 @@ declare module 'vue' {
     readonly acceptHMRUpdate: UnwrapRef<typeof import('pinia')['acceptHMRUpdate']>
     readonly asyncComputed: UnwrapRef<typeof import('@vueuse/core')['asyncComputed']>
     readonly autoResetRef: UnwrapRef<typeof import('@vueuse/core')['autoResetRef']>
+    readonly binData: UnwrapRef<typeof import('./utils/charts/binCount')['binData']>
+    readonly calculateDiff: UnwrapRef<typeof import('./utils/charts/areaPlotDataset')['calculateDiff']>
     readonly computed: UnwrapRef<typeof import('vue')['computed']>
     readonly computedAsync: UnwrapRef<typeof import('@vueuse/core')['computedAsync']>
     readonly computedEager: UnwrapRef<typeof import('@vueuse/core')['computedEager']>
@@ -380,6 +392,7 @@ declare module 'vue' {
     readonly createTemplatePromise: UnwrapRef<typeof import('@vueuse/core')['createTemplatePromise']>
     readonly createUnrefFn: UnwrapRef<typeof import('@vueuse/core')['createUnrefFn']>
     readonly customRef: UnwrapRef<typeof import('vue')['customRef']>
+    readonly dataZoomPartial: UnwrapRef<typeof import('./utils/charts/chartZoom')['dataZoomPartial']>
     readonly dateFromString: UnwrapRef<typeof import('./utils/formatters/timeformat')['dateFromString']>
     readonly dateStringToTimeRange: UnwrapRef<typeof import('./utils/formatters/timeformat')['dateStringToTimeRange']>
     readonly debouncedRef: UnwrapRef<typeof import('@vueuse/core')['debouncedRef']>
@@ -396,10 +409,16 @@ declare module 'vue' {
     readonly formatPercent: UnwrapRef<typeof import('./utils/formatters/numberformat')['formatPercent']>
     readonly formatPrice: UnwrapRef<typeof import('./utils/formatters/numberformat')['formatPrice']>
     readonly formatPriceCurrency: UnwrapRef<typeof import('./utils/formatters/numberformat')['formatPriceCurrency']>
+    readonly generateAreaCandleSeries: UnwrapRef<typeof import('./utils/charts/candleChartSeries')['generateAreaCandleSeries']>
+    readonly generateCandleSeries: UnwrapRef<typeof import('./utils/charts/candleChartSeries')['generateCandleSeries']>
+    readonly generateTradeSeries: UnwrapRef<typeof import('./utils/charts/tradeChartData')['generateTradeSeries']>
     readonly getActivePinia: UnwrapRef<typeof import('pinia')['getActivePinia']>
     readonly getCurrentInstance: UnwrapRef<typeof import('vue')['getCurrentInstance']>
     readonly getCurrentScope: UnwrapRef<typeof import('vue')['getCurrentScope']>
+    readonly getDiffColumnsFromPlotConfig: UnwrapRef<typeof import('./utils/charts/areaPlotDataset')['getDiffColumnsFromPlotConfig']>
+    readonly getTradeEntries: UnwrapRef<typeof import('./utils/charts/tradeChartData')['getTradeEntries']>
     readonly h: UnwrapRef<typeof import('vue')['h']>
+    readonly heikinAshiDataset: UnwrapRef<typeof import('./utils/charts/heikinashi')['heikinAshiDataset']>
     readonly humanizeDurationFromSeconds: UnwrapRef<typeof import('./utils/formatters/timeformat')['humanizeDurationFromSeconds']>
     readonly ignorableWatch: UnwrapRef<typeof import('@vueuse/core')['ignorableWatch']>
     readonly initBots: UnwrapRef<typeof import('./stores/ftbotwrapper')['initBots']>
@@ -697,6 +716,8 @@ declare module '@vue/runtime-core' {
     readonly acceptHMRUpdate: UnwrapRef<typeof import('pinia')['acceptHMRUpdate']>
     readonly asyncComputed: UnwrapRef<typeof import('@vueuse/core')['asyncComputed']>
     readonly autoResetRef: UnwrapRef<typeof import('@vueuse/core')['autoResetRef']>
+    readonly binData: UnwrapRef<typeof import('./utils/charts/binCount')['binData']>
+    readonly calculateDiff: UnwrapRef<typeof import('./utils/charts/areaPlotDataset')['calculateDiff']>
     readonly computed: UnwrapRef<typeof import('vue')['computed']>
     readonly computedAsync: UnwrapRef<typeof import('@vueuse/core')['computedAsync']>
     readonly computedEager: UnwrapRef<typeof import('@vueuse/core')['computedEager']>
@@ -716,6 +737,7 @@ declare module '@vue/runtime-core' {
     readonly createTemplatePromise: UnwrapRef<typeof import('@vueuse/core')['createTemplatePromise']>
     readonly createUnrefFn: UnwrapRef<typeof import('@vueuse/core')['createUnrefFn']>
     readonly customRef: UnwrapRef<typeof import('vue')['customRef']>
+    readonly dataZoomPartial: UnwrapRef<typeof import('./utils/charts/chartZoom')['dataZoomPartial']>
     readonly dateFromString: UnwrapRef<typeof import('./utils/formatters/timeformat')['dateFromString']>
     readonly dateStringToTimeRange: UnwrapRef<typeof import('./utils/formatters/timeformat')['dateStringToTimeRange']>
     readonly debouncedRef: UnwrapRef<typeof import('@vueuse/core')['debouncedRef']>
@@ -732,10 +754,16 @@ declare module '@vue/runtime-core' {
     readonly formatPercent: UnwrapRef<typeof import('./utils/formatters/numberformat')['formatPercent']>
     readonly formatPrice: UnwrapRef<typeof import('./utils/formatters/numberformat')['formatPrice']>
     readonly formatPriceCurrency: UnwrapRef<typeof import('./utils/formatters/numberformat')['formatPriceCurrency']>
+    readonly generateAreaCandleSeries: UnwrapRef<typeof import('./utils/charts/candleChartSeries')['generateAreaCandleSeries']>
+    readonly generateCandleSeries: UnwrapRef<typeof import('./utils/charts/candleChartSeries')['generateCandleSeries']>
+    readonly generateTradeSeries: UnwrapRef<typeof import('./utils/charts/tradeChartData')['generateTradeSeries']>
     readonly getActivePinia: UnwrapRef<typeof import('pinia')['getActivePinia']>
     readonly getCurrentInstance: UnwrapRef<typeof import('vue')['getCurrentInstance']>
     readonly getCurrentScope: UnwrapRef<typeof import('vue')['getCurrentScope']>
+    readonly getDiffColumnsFromPlotConfig: UnwrapRef<typeof import('./utils/charts/areaPlotDataset')['getDiffColumnsFromPlotConfig']>
+    readonly getTradeEntries: UnwrapRef<typeof import('./utils/charts/tradeChartData')['getTradeEntries']>
     readonly h: UnwrapRef<typeof import('vue')['h']>
+    readonly heikinAshiDataset: UnwrapRef<typeof import('./utils/charts/heikinashi')['heikinAshiDataset']>
     readonly humanizeDurationFromSeconds: UnwrapRef<typeof import('./utils/formatters/timeformat')['humanizeDurationFromSeconds']>
     readonly ignorableWatch: UnwrapRef<typeof import('@vueuse/core')['ignorableWatch']>
     readonly initBots: UnwrapRef<typeof import('./stores/ftbotwrapper')['initBots']>
diff --git a/src/components/charts/CandleChart.vue b/src/components/charts/CandleChart.vue
index 1ad63615..869f06d3 100644
--- a/src/components/charts/CandleChart.vue
+++ b/src/components/charts/CandleChart.vue
@@ -5,9 +5,6 @@
 </template>
 
 <script setup lang="ts">
-import { generateAreaCandleSeries, generateCandleSeries } from '@/shared/charts/candleChartSeries';
-import heikinashi from '@/shared/charts/heikinashi';
-import { generateTradeSeries } from '@/shared/charts/tradeChartData';
 import {
   ChartSliderPosition,
   ChartType,
@@ -19,8 +16,6 @@ import {
 
 import ECharts from 'vue-echarts';
 
-import { calculateDiff, getDiffColumnsFromPlotConfig } from '@/shared/charts/areaPlotDataset';
-import { dataZoomPartial } from '@/shared/charts/chartZoom';
 import { EChartsOption, ScatterSeriesOption } from 'echarts';
 import { BarChart, CandlestickChart, LineChart, ScatterChart } from 'echarts/charts';
 import {
diff --git a/src/components/charts/CumProfitChart.vue b/src/components/charts/CumProfitChart.vue
index 8ba5eaad..3019fe08 100644
--- a/src/components/charts/CumProfitChart.vue
+++ b/src/components/charts/CumProfitChart.vue
@@ -24,7 +24,6 @@ import {
 import { use } from 'echarts/core';
 import { CanvasRenderer } from 'echarts/renderers';
 
-import { dataZoomPartial } from '@/shared/charts/chartZoom';
 import { useSettingsStore } from '@/stores/settings';
 import {
   ClosedTrade,
diff --git a/src/components/charts/ProfitDistributionChart.vue b/src/components/charts/ProfitDistributionChart.vue
index e36aa887..5defa5e2 100644
--- a/src/components/charts/ProfitDistributionChart.vue
+++ b/src/components/charts/ProfitDistributionChart.vue
@@ -40,7 +40,6 @@ import {
 } from 'echarts/components';
 
 import { ClosedTrade } from '@/types';
-import { binData } from '@/shared/charts/binCount';
 import { useSettingsStore } from '@/stores/settings';
 
 use([
diff --git a/src/components/charts/TradesLogChart.vue b/src/components/charts/TradesLogChart.vue
index 71f591c5..c3f34e9e 100644
--- a/src/components/charts/TradesLogChart.vue
+++ b/src/components/charts/TradesLogChart.vue
@@ -27,7 +27,6 @@ import {
 import { ClosedTrade } from '@/types';
 import { useSettingsStore } from '@/stores/settings';
 
-import { dataZoomPartial } from '@/shared/charts/chartZoom';
 import { useColorStore } from '@/stores/colors';
 
 use([
diff --git a/src/shared/charts/areaPlotDataset.ts b/src/utils/charts/areaPlotDataset.ts
similarity index 100%
rename from src/shared/charts/areaPlotDataset.ts
rename to src/utils/charts/areaPlotDataset.ts
diff --git a/src/shared/charts/binCount.ts b/src/utils/charts/binCount.ts
similarity index 100%
rename from src/shared/charts/binCount.ts
rename to src/utils/charts/binCount.ts
diff --git a/src/shared/charts/candleChartSeries.ts b/src/utils/charts/candleChartSeries.ts
similarity index 100%
rename from src/shared/charts/candleChartSeries.ts
rename to src/utils/charts/candleChartSeries.ts
diff --git a/src/shared/charts/chartZoom.ts b/src/utils/charts/chartZoom.ts
similarity index 100%
rename from src/shared/charts/chartZoom.ts
rename to src/utils/charts/chartZoom.ts
diff --git a/src/shared/charts/heikinashi.ts b/src/utils/charts/heikinashi.ts
similarity index 96%
rename from src/shared/charts/heikinashi.ts
rename to src/utils/charts/heikinashi.ts
index 599f474e..6bee98a2 100644
--- a/src/shared/charts/heikinashi.ts
+++ b/src/utils/charts/heikinashi.ts
@@ -26,5 +26,3 @@ export function heikinAshiDataset(columns: string[], data: Array<number[]>): num
     return candle;
   });
 }
-
-export default heikinAshiDataset;
diff --git a/src/shared/charts/tradeChartData.ts b/src/utils/charts/tradeChartData.ts
similarity index 100%
rename from src/shared/charts/tradeChartData.ts
rename to src/utils/charts/tradeChartData.ts
diff --git a/tests/unit/bincount.spec.ts b/tests/unit/bincount.spec.ts
index 2042932f..6ecc9d1a 100644
--- a/tests/unit/bincount.spec.ts
+++ b/tests/unit/bincount.spec.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { binData } from '@/shared/charts/binCount';
+import { binData } from '@/utils/charts/binCount';
 
 describe('binCount.ts', () => {
   it('Bins data as expected', () => {