diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b36d99e..c1e09e6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Changed
 * [#408](https://github.com/shlinkio/shlink-web-client/issues/408) Updated to Chart.js 3.5
+* [#486](https://github.com/shlinkio/shlink-web-client/issues/486) Refactored components used to render visits charts, making them easier to maintain and understand.
 
 ### Deprecated
 * *Nothing*
diff --git a/src/visits/VisitsStats.tsx b/src/visits/VisitsStats.tsx
index 0a5e77ff..ca255348 100644
--- a/src/visits/VisitsStats.tsx
+++ b/src/visits/VisitsStats.tsx
@@ -15,7 +15,7 @@ import { ShlinkApiError } from '../api/ShlinkApiError';
 import { Settings } from '../settings/reducers/settings';
 import { SelectedServer } from '../servers/data';
 import { supportsBotVisits } from '../utils/helpers/features';
-import LineChartCard from './helpers/LineChartCard';
+import LineChartCard from './charts/LineChartCard';
 import VisitsTable from './VisitsTable';
 import { NormalizedOrphanVisit, NormalizedVisit, VisitsFilter, VisitsInfo, VisitsParams } from './types';
 import OpenMapModalBtn from './helpers/OpenMapModalBtn';
diff --git a/src/visits/helpers/LineChartCard.scss b/src/visits/charts/LineChartCard.scss
similarity index 100%
rename from src/visits/helpers/LineChartCard.scss
rename to src/visits/charts/LineChartCard.scss
diff --git a/src/visits/helpers/LineChartCard.tsx b/src/visits/charts/LineChartCard.tsx
similarity index 100%
rename from src/visits/helpers/LineChartCard.tsx
rename to src/visits/charts/LineChartCard.tsx
diff --git a/test/visits/VisitsStats.test.tsx b/test/visits/VisitsStats.test.tsx
index c9c4f169..5056a516 100644
--- a/test/visits/VisitsStats.test.tsx
+++ b/test/visits/VisitsStats.test.tsx
@@ -4,7 +4,7 @@ import { Mock } from 'ts-mockery';
 import VisitStats from '../../src/visits/VisitsStats';
 import Message from '../../src/utils/Message';
 import { Visit, VisitsInfo } from '../../src/visits/types';
-import LineChartCard from '../../src/visits/helpers/LineChartCard';
+import LineChartCard from '../../src/visits/charts/LineChartCard';
 import VisitsTable from '../../src/visits/VisitsTable';
 import { Result } from '../../src/utils/Result';
 import { Settings } from '../../src/settings/reducers/settings';
diff --git a/test/visits/helpers/LineChartCard.test.tsx b/test/visits/charts/LineChartCard.test.tsx
similarity index 98%
rename from test/visits/helpers/LineChartCard.test.tsx
rename to test/visits/charts/LineChartCard.test.tsx
index 0ef89866..5e83c54d 100644
--- a/test/visits/helpers/LineChartCard.test.tsx
+++ b/test/visits/charts/LineChartCard.test.tsx
@@ -3,7 +3,7 @@ import { CardHeader, DropdownItem } from 'reactstrap';
 import { Line } from 'react-chartjs-2';
 import { formatISO, subDays, subMonths, subYears } from 'date-fns';
 import { Mock } from 'ts-mockery';
-import LineChartCard from '../../../src/visits/helpers/LineChartCard';
+import LineChartCard from '../../../src/visits/charts/LineChartCard';
 import ToggleSwitch from '../../../src/utils/ToggleSwitch';
 import { NormalizedVisit } from '../../../src/visits/types';
 import { prettify } from '../../../src/utils/helpers/numbers';