From 5a295cdadc68c2e5aff2c4f2058c9cee3599edff Mon Sep 17 00:00:00 2001
From: Dave Walker <david.walker5@icloud.com>
Date: Sun, 3 Dec 2023 06:39:34 +0000
Subject: [PATCH] Restructure components folder

---
 .../components/{ => albums}/albumEditor.js    |  6 ++--
 .../{ => albums}/albumEditor.module.css       |  0
 .../components/{ => albums}/albumList.js      |  0
 .../{ => albums}/albumList.module.css         |  0
 .../{ => albums}/albumPurchaseDetails.js      |  4 +--
 .../albumPurchaseDetails.module.css           |  0
 .../components/{ => albums}/albumRow.js       |  4 +--
 .../{ => albums}/albumWishListActionIcon.js   |  0
 .../{ => albums}/deleteAlbumActionIcon.js     |  0
 src/music-catalogue-ui/components/app.js      |  2 +-
 .../components/{ => artists}/artistEditor.js  |  2 +-
 .../{ => artists}/artistEditor.module.css     |  0
 .../components/{ => artists}/artistFilter.js  |  0
 .../{ => artists}/artistFilter.module.css     |  0
 .../{ => artists}/artistFilterBar.js          |  0
 .../components/{ => artists}/artistList.js    |  0
 .../{ => artists}/artistList.module.css       |  0
 .../components/{ => artists}/artistRow.js     |  0
 .../{ => artists}/deleteArtistActionIcon.js   |  0
 .../{ => common}/catalogueSelector.js         |  0
 .../{ => common}/catalogueSelector.module.css |  0
 .../{ => common}/currencyFormatter.js         |  2 +-
 .../{ => common}/dateAndTimeFormatter.js      |  2 +-
 .../components/{ => common}/dateFormatter.js  |  2 +-
 .../components/{ => common}/formInputField.js |  0
 .../{ => common}/formInputField.module.css    |  0
 .../components/{ => common}/locationMap.js    |  0
 .../{ => common}/locationMap.module.css       |  0
 .../components/componentPicker.js             | 36 +++++++++----------
 .../{ => dataexchange}/export.module.css      |  0
 .../{ => dataexchange}/exportCatalogue.js     |  2 +-
 .../components/{ => genres}/genreList.js      |  0
 .../components/{ => genres}/genreRow.js       |  0
 .../components/{ => genres}/genreSelector.js  |  0
 .../components/{ => login}/login.js           |  0
 .../components/{ => login}/login.module.css   |  0
 src/music-catalogue-ui/components/menuBar.js  | 18 ++++++++--
 .../{ => reports}/artistStatisticsReport.js   |  4 +--
 .../{ => reports}/artistStatisticsRow.js      |  2 +-
 .../{ => reports}/genreStatisticsReport.js    |  2 +-
 .../{ => reports}/genreStatisticsRow.js       |  2 +-
 .../{ => reports}/jobStatusReport.js          |  2 +-
 .../components/{ => reports}/jobStatusRow.js  |  2 +-
 .../{ => reports}/monthlySpendReport.js       |  2 +-
 .../{ => reports}/monthlySpendReportRow.js    |  2 +-
 .../{ => reports}/reportExportControls.js     |  2 +-
 .../{ => reports}/reports.module.css          |  0
 .../{ => reports}/retailerStatisticsReport.js |  4 +--
 .../{ => reports}/retailerStatisticsRow.js    |  2 +-
 .../deleteRetailerActionIcon.js               |  0
 .../{ => retailers}/retailerDetails.js        |  2 +-
 .../retailerDetails.module.css                |  0
 .../{ => retailers}/retailerEditor.js         |  2 +-
 .../{ => retailers}/retailerEditor.module.css |  0
 .../{ => retailers}/retailerList.js           |  0
 .../{ => retailers}/retailerList.module.css   |  0
 .../components/{ => retailers}/retailerRow.js |  0
 .../{ => retailers}/retailerSelector.js       |  0
 .../components/{ => search}/lookupAlbum.js    |  0
 .../{ => search}/lookupAlbum.module.css       |  0
 .../{ => tracks}/deleteTrackActionIcon.js     |  0
 .../components/{ => tracks}/trackEditor.js    |  2 +-
 .../{ => tracks}/trackEditor.module.css       |  0
 .../components/{ => tracks}/trackList.js      |  0
 .../{ => tracks}/trackList.module.css         |  0
 .../components/{ => tracks}/trackRow.js       |  0
 .../{ => tracks}/trackRow.module.css          |  0
 src/music-catalogue-ui/helpers/apiAlbums.js   |  2 +-
 src/music-catalogue-ui/helpers/apiArtists.js  |  2 +-
 .../helpers/apiAuthenticate.js                |  2 +-
 .../helpers/apiDataExchange.js                |  2 +-
 src/music-catalogue-ui/helpers/apiGenres.js   |  2 +-
 src/music-catalogue-ui/helpers/apiReports.js  |  2 +-
 .../helpers/apiRetailers.js                   |  2 +-
 src/music-catalogue-ui/helpers/apiSecrets.js  |  2 +-
 src/music-catalogue-ui/helpers/apiTracks.js   |  2 +-
 src/music-catalogue-ui/helpers/geocoder.js    |  2 +-
 77 files changed, 72 insertions(+), 60 deletions(-)
 rename src/music-catalogue-ui/components/{ => albums}/albumEditor.js (96%)
 rename src/music-catalogue-ui/components/{ => albums}/albumEditor.module.css (100%)
 rename src/music-catalogue-ui/components/{ => albums}/albumList.js (100%)
 rename src/music-catalogue-ui/components/{ => albums}/albumList.module.css (100%)
 rename src/music-catalogue-ui/components/{ => albums}/albumPurchaseDetails.js (98%)
 rename src/music-catalogue-ui/components/{ => albums}/albumPurchaseDetails.module.css (100%)
 rename src/music-catalogue-ui/components/{ => albums}/albumRow.js (96%)
 rename src/music-catalogue-ui/components/{ => albums}/albumWishListActionIcon.js (100%)
 rename src/music-catalogue-ui/components/{ => albums}/deleteAlbumActionIcon.js (100%)
 rename src/music-catalogue-ui/components/{ => artists}/artistEditor.js (98%)
 rename src/music-catalogue-ui/components/{ => artists}/artistEditor.module.css (100%)
 rename src/music-catalogue-ui/components/{ => artists}/artistFilter.js (100%)
 rename src/music-catalogue-ui/components/{ => artists}/artistFilter.module.css (100%)
 rename src/music-catalogue-ui/components/{ => artists}/artistFilterBar.js (100%)
 rename src/music-catalogue-ui/components/{ => artists}/artistList.js (100%)
 rename src/music-catalogue-ui/components/{ => artists}/artistList.module.css (100%)
 rename src/music-catalogue-ui/components/{ => artists}/artistRow.js (100%)
 rename src/music-catalogue-ui/components/{ => artists}/deleteArtistActionIcon.js (100%)
 rename src/music-catalogue-ui/components/{ => common}/catalogueSelector.js (100%)
 rename src/music-catalogue-ui/components/{ => common}/catalogueSelector.module.css (100%)
 rename src/music-catalogue-ui/components/{ => common}/currencyFormatter.js (94%)
 rename src/music-catalogue-ui/components/{ => common}/dateAndTimeFormatter.js (94%)
 rename src/music-catalogue-ui/components/{ => common}/dateFormatter.js (93%)
 rename src/music-catalogue-ui/components/{ => common}/formInputField.js (100%)
 rename src/music-catalogue-ui/components/{ => common}/formInputField.module.css (100%)
 rename src/music-catalogue-ui/components/{ => common}/locationMap.js (100%)
 rename src/music-catalogue-ui/components/{ => common}/locationMap.module.css (100%)
 rename src/music-catalogue-ui/components/{ => dataexchange}/export.module.css (100%)
 rename src/music-catalogue-ui/components/{ => dataexchange}/exportCatalogue.js (97%)
 rename src/music-catalogue-ui/components/{ => genres}/genreList.js (100%)
 rename src/music-catalogue-ui/components/{ => genres}/genreRow.js (100%)
 rename src/music-catalogue-ui/components/{ => genres}/genreSelector.js (100%)
 rename src/music-catalogue-ui/components/{ => login}/login.js (100%)
 rename src/music-catalogue-ui/components/{ => login}/login.module.css (100%)
 rename src/music-catalogue-ui/components/{ => reports}/artistStatisticsReport.js (97%)
 rename src/music-catalogue-ui/components/{ => reports}/artistStatisticsRow.js (87%)
 rename src/music-catalogue-ui/components/{ => reports}/genreStatisticsReport.js (98%)
 rename src/music-catalogue-ui/components/{ => reports}/genreStatisticsRow.js (88%)
 rename src/music-catalogue-ui/components/{ => reports}/jobStatusReport.js (97%)
 rename src/music-catalogue-ui/components/{ => reports}/jobStatusRow.js (87%)
 rename src/music-catalogue-ui/components/{ => reports}/monthlySpendReport.js (97%)
 rename src/music-catalogue-ui/components/{ => reports}/monthlySpendReportRow.js (87%)
 rename src/music-catalogue-ui/components/{ => reports}/reportExportControls.js (95%)
 rename src/music-catalogue-ui/components/{ => reports}/reports.module.css (100%)
 rename src/music-catalogue-ui/components/{ => reports}/retailerStatisticsReport.js (97%)
 rename src/music-catalogue-ui/components/{ => reports}/retailerStatisticsRow.js (88%)
 rename src/music-catalogue-ui/components/{ => retailers}/deleteRetailerActionIcon.js (100%)
 rename src/music-catalogue-ui/components/{ => retailers}/retailerDetails.js (98%)
 rename src/music-catalogue-ui/components/{ => retailers}/retailerDetails.module.css (100%)
 rename src/music-catalogue-ui/components/{ => retailers}/retailerEditor.js (99%)
 rename src/music-catalogue-ui/components/{ => retailers}/retailerEditor.module.css (100%)
 rename src/music-catalogue-ui/components/{ => retailers}/retailerList.js (100%)
 rename src/music-catalogue-ui/components/{ => retailers}/retailerList.module.css (100%)
 rename src/music-catalogue-ui/components/{ => retailers}/retailerRow.js (100%)
 rename src/music-catalogue-ui/components/{ => retailers}/retailerSelector.js (100%)
 rename src/music-catalogue-ui/components/{ => search}/lookupAlbum.js (100%)
 rename src/music-catalogue-ui/components/{ => search}/lookupAlbum.module.css (100%)
 rename src/music-catalogue-ui/components/{ => tracks}/deleteTrackActionIcon.js (100%)
 rename src/music-catalogue-ui/components/{ => tracks}/trackEditor.js (98%)
 rename src/music-catalogue-ui/components/{ => tracks}/trackEditor.module.css (100%)
 rename src/music-catalogue-ui/components/{ => tracks}/trackList.js (100%)
 rename src/music-catalogue-ui/components/{ => tracks}/trackList.module.css (100%)
 rename src/music-catalogue-ui/components/{ => tracks}/trackRow.js (100%)
 rename src/music-catalogue-ui/components/{ => tracks}/trackRow.module.css (100%)

diff --git a/src/music-catalogue-ui/components/albumEditor.js b/src/music-catalogue-ui/components/albums/albumEditor.js
similarity index 96%
rename from src/music-catalogue-ui/components/albumEditor.js
rename to src/music-catalogue-ui/components/albums/albumEditor.js
index a6cdce6..e93f501 100644
--- a/src/music-catalogue-ui/components/albumEditor.js
+++ b/src/music-catalogue-ui/components/albums/albumEditor.js
@@ -1,11 +1,9 @@
 import styles from "./albumEditor.module.css";
 import pages from "@/helpers/navigation";
-import catalogues from "@/helpers/catalogues";
-import FormInputField from "./formInputField";
-import CatalogueSelector from "./catalogueSelector";
+import FormInputField from "../common/formInputField";
 import { apiCreateAlbum, apiUpdateAlbum } from "@/helpers/apiAlbums";
 import { useState, useCallback } from "react";
-import GenreSelector from "./genreSelector";
+import GenreSelector from "../genres/genreSelector";
 
 /**
  * Component to render an album editor, excluding purchase details that are
diff --git a/src/music-catalogue-ui/components/albumEditor.module.css b/src/music-catalogue-ui/components/albums/albumEditor.module.css
similarity index 100%
rename from src/music-catalogue-ui/components/albumEditor.module.css
rename to src/music-catalogue-ui/components/albums/albumEditor.module.css
diff --git a/src/music-catalogue-ui/components/albumList.js b/src/music-catalogue-ui/components/albums/albumList.js
similarity index 100%
rename from src/music-catalogue-ui/components/albumList.js
rename to src/music-catalogue-ui/components/albums/albumList.js
diff --git a/src/music-catalogue-ui/components/albumList.module.css b/src/music-catalogue-ui/components/albums/albumList.module.css
similarity index 100%
rename from src/music-catalogue-ui/components/albumList.module.css
rename to src/music-catalogue-ui/components/albums/albumList.module.css
diff --git a/src/music-catalogue-ui/components/albumPurchaseDetails.js b/src/music-catalogue-ui/components/albums/albumPurchaseDetails.js
similarity index 98%
rename from src/music-catalogue-ui/components/albumPurchaseDetails.js
rename to src/music-catalogue-ui/components/albums/albumPurchaseDetails.js
index df2d4f2..6477ca1 100644
--- a/src/music-catalogue-ui/components/albumPurchaseDetails.js
+++ b/src/music-catalogue-ui/components/albums/albumPurchaseDetails.js
@@ -2,10 +2,10 @@ import styles from "./albumPurchaseDetails.module.css";
 import DatePicker from "react-datepicker";
 import { useState, useCallback } from "react";
 import CurrencyInput from "react-currency-input-field";
-import config from "../config.json";
+import config from "@/config.json";
 import pages from "@/helpers/navigation";
 import { apiSetAlbumPurchaseDetails } from "@/helpers/apiAlbums";
-import RetailerSelector from "./retailerSelector";
+import RetailerSelector from "../retailers/retailerSelector";
 
 /**
  * Form to set the album purchase details for an album
diff --git a/src/music-catalogue-ui/components/albumPurchaseDetails.module.css b/src/music-catalogue-ui/components/albums/albumPurchaseDetails.module.css
similarity index 100%
rename from src/music-catalogue-ui/components/albumPurchaseDetails.module.css
rename to src/music-catalogue-ui/components/albums/albumPurchaseDetails.module.css
diff --git a/src/music-catalogue-ui/components/albumRow.js b/src/music-catalogue-ui/components/albums/albumRow.js
similarity index 96%
rename from src/music-catalogue-ui/components/albumRow.js
rename to src/music-catalogue-ui/components/albums/albumRow.js
index 3d7e27d..300671e 100644
--- a/src/music-catalogue-ui/components/albumRow.js
+++ b/src/music-catalogue-ui/components/albums/albumRow.js
@@ -1,8 +1,8 @@
 import pages from "@/helpers/navigation";
 import DeleteAlbumActionIcon from "./deleteAlbumActionIcon";
 import AlbumWishListActionIcon from "./albumWishListActionIcon";
-import CurrencyFormatter from "./currencyFormatter";
-import DateFormatter from "./dateFormatter";
+import CurrencyFormatter from "../common/currencyFormatter";
+import DateFormatter from "../common/dateFormatter";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faCoins, faPenToSquare } from "@fortawesome/free-solid-svg-icons";
 import { useCallback } from "react";
diff --git a/src/music-catalogue-ui/components/albumWishListActionIcon.js b/src/music-catalogue-ui/components/albums/albumWishListActionIcon.js
similarity index 100%
rename from src/music-catalogue-ui/components/albumWishListActionIcon.js
rename to src/music-catalogue-ui/components/albums/albumWishListActionIcon.js
diff --git a/src/music-catalogue-ui/components/deleteAlbumActionIcon.js b/src/music-catalogue-ui/components/albums/deleteAlbumActionIcon.js
similarity index 100%
rename from src/music-catalogue-ui/components/deleteAlbumActionIcon.js
rename to src/music-catalogue-ui/components/albums/deleteAlbumActionIcon.js
diff --git a/src/music-catalogue-ui/components/app.js b/src/music-catalogue-ui/components/app.js
index 765f939..1f004ab 100644
--- a/src/music-catalogue-ui/components/app.js
+++ b/src/music-catalogue-ui/components/app.js
@@ -1,5 +1,5 @@
 import React, { useCallback, useState } from "react";
-import Login from "./login";
+import Login from "./login/login";
 import pages from "@/helpers/navigation";
 import ComponentPicker from "./componentPicker";
 import { apiClearToken } from "@/helpers/apiToken";
diff --git a/src/music-catalogue-ui/components/artistEditor.js b/src/music-catalogue-ui/components/artists/artistEditor.js
similarity index 98%
rename from src/music-catalogue-ui/components/artistEditor.js
rename to src/music-catalogue-ui/components/artists/artistEditor.js
index f80168d..b4686d8 100644
--- a/src/music-catalogue-ui/components/artistEditor.js
+++ b/src/music-catalogue-ui/components/artists/artistEditor.js
@@ -1,6 +1,6 @@
 import styles from "./artistEditor.module.css";
 import pages from "@/helpers/navigation";
-import FormInputField from "./formInputField";
+import FormInputField from "../common/formInputField";
 import { useState, useCallback } from "react";
 import { apiCreateArtist, apiUpdateArtist } from "@/helpers/apiArtists";
 
diff --git a/src/music-catalogue-ui/components/artistEditor.module.css b/src/music-catalogue-ui/components/artists/artistEditor.module.css
similarity index 100%
rename from src/music-catalogue-ui/components/artistEditor.module.css
rename to src/music-catalogue-ui/components/artists/artistEditor.module.css
diff --git a/src/music-catalogue-ui/components/artistFilter.js b/src/music-catalogue-ui/components/artists/artistFilter.js
similarity index 100%
rename from src/music-catalogue-ui/components/artistFilter.js
rename to src/music-catalogue-ui/components/artists/artistFilter.js
diff --git a/src/music-catalogue-ui/components/artistFilter.module.css b/src/music-catalogue-ui/components/artists/artistFilter.module.css
similarity index 100%
rename from src/music-catalogue-ui/components/artistFilter.module.css
rename to src/music-catalogue-ui/components/artists/artistFilter.module.css
diff --git a/src/music-catalogue-ui/components/artistFilterBar.js b/src/music-catalogue-ui/components/artists/artistFilterBar.js
similarity index 100%
rename from src/music-catalogue-ui/components/artistFilterBar.js
rename to src/music-catalogue-ui/components/artists/artistFilterBar.js
diff --git a/src/music-catalogue-ui/components/artistList.js b/src/music-catalogue-ui/components/artists/artistList.js
similarity index 100%
rename from src/music-catalogue-ui/components/artistList.js
rename to src/music-catalogue-ui/components/artists/artistList.js
diff --git a/src/music-catalogue-ui/components/artistList.module.css b/src/music-catalogue-ui/components/artists/artistList.module.css
similarity index 100%
rename from src/music-catalogue-ui/components/artistList.module.css
rename to src/music-catalogue-ui/components/artists/artistList.module.css
diff --git a/src/music-catalogue-ui/components/artistRow.js b/src/music-catalogue-ui/components/artists/artistRow.js
similarity index 100%
rename from src/music-catalogue-ui/components/artistRow.js
rename to src/music-catalogue-ui/components/artists/artistRow.js
diff --git a/src/music-catalogue-ui/components/deleteArtistActionIcon.js b/src/music-catalogue-ui/components/artists/deleteArtistActionIcon.js
similarity index 100%
rename from src/music-catalogue-ui/components/deleteArtistActionIcon.js
rename to src/music-catalogue-ui/components/artists/deleteArtistActionIcon.js
diff --git a/src/music-catalogue-ui/components/catalogueSelector.js b/src/music-catalogue-ui/components/common/catalogueSelector.js
similarity index 100%
rename from src/music-catalogue-ui/components/catalogueSelector.js
rename to src/music-catalogue-ui/components/common/catalogueSelector.js
diff --git a/src/music-catalogue-ui/components/catalogueSelector.module.css b/src/music-catalogue-ui/components/common/catalogueSelector.module.css
similarity index 100%
rename from src/music-catalogue-ui/components/catalogueSelector.module.css
rename to src/music-catalogue-ui/components/common/catalogueSelector.module.css
diff --git a/src/music-catalogue-ui/components/currencyFormatter.js b/src/music-catalogue-ui/components/common/currencyFormatter.js
similarity index 94%
rename from src/music-catalogue-ui/components/currencyFormatter.js
rename to src/music-catalogue-ui/components/common/currencyFormatter.js
index 1b39915..9ab8fac 100644
--- a/src/music-catalogue-ui/components/currencyFormatter.js
+++ b/src/music-catalogue-ui/components/common/currencyFormatter.js
@@ -1,4 +1,4 @@
-import config from "../config.json";
+import config from "@/config.json";
 
 /**
  * Format a value as currency using the locale from the config file
diff --git a/src/music-catalogue-ui/components/dateAndTimeFormatter.js b/src/music-catalogue-ui/components/common/dateAndTimeFormatter.js
similarity index 94%
rename from src/music-catalogue-ui/components/dateAndTimeFormatter.js
rename to src/music-catalogue-ui/components/common/dateAndTimeFormatter.js
index c9dba7f..72d2ba2 100644
--- a/src/music-catalogue-ui/components/dateAndTimeFormatter.js
+++ b/src/music-catalogue-ui/components/common/dateAndTimeFormatter.js
@@ -1,4 +1,4 @@
-import config from "../config.json";
+import config from "@/config.json";
 
 /**
  * Format a value as a date and time using the locale from the config file
diff --git a/src/music-catalogue-ui/components/dateFormatter.js b/src/music-catalogue-ui/components/common/dateFormatter.js
similarity index 93%
rename from src/music-catalogue-ui/components/dateFormatter.js
rename to src/music-catalogue-ui/components/common/dateFormatter.js
index 9e76394..fa9227a 100644
--- a/src/music-catalogue-ui/components/dateFormatter.js
+++ b/src/music-catalogue-ui/components/common/dateFormatter.js
@@ -1,4 +1,4 @@
-import config from "../config.json";
+import config from "@/config.json";
 
 /**
  * Format a value as a date using the locale from the config file
diff --git a/src/music-catalogue-ui/components/formInputField.js b/src/music-catalogue-ui/components/common/formInputField.js
similarity index 100%
rename from src/music-catalogue-ui/components/formInputField.js
rename to src/music-catalogue-ui/components/common/formInputField.js
diff --git a/src/music-catalogue-ui/components/formInputField.module.css b/src/music-catalogue-ui/components/common/formInputField.module.css
similarity index 100%
rename from src/music-catalogue-ui/components/formInputField.module.css
rename to src/music-catalogue-ui/components/common/formInputField.module.css
diff --git a/src/music-catalogue-ui/components/locationMap.js b/src/music-catalogue-ui/components/common/locationMap.js
similarity index 100%
rename from src/music-catalogue-ui/components/locationMap.js
rename to src/music-catalogue-ui/components/common/locationMap.js
diff --git a/src/music-catalogue-ui/components/locationMap.module.css b/src/music-catalogue-ui/components/common/locationMap.module.css
similarity index 100%
rename from src/music-catalogue-ui/components/locationMap.module.css
rename to src/music-catalogue-ui/components/common/locationMap.module.css
diff --git a/src/music-catalogue-ui/components/componentPicker.js b/src/music-catalogue-ui/components/componentPicker.js
index d107954..6006afb 100644
--- a/src/music-catalogue-ui/components/componentPicker.js
+++ b/src/music-catalogue-ui/components/componentPicker.js
@@ -1,22 +1,22 @@
 import pages from "@/helpers/navigation";
-import ArtistList from "./artistList";
-import AlbumList from "./albumList";
-import TrackList from "./trackList";
-import LookupAlbum from "./lookupAlbum";
-import ExportCatalogue from "./exportCatalogue";
-import GenreStatusReport from "./genreStatisticsReport";
-import JobStatusReport from "./jobStatusReport";
-import AlbumPurchaseDetails from "./albumPurchaseDetails";
-import ArtistStatisticsReport from "./artistStatisticsReport";
-import MonthlySpendReport from "./monthlySpendReport";
-import GenreList from "./genreList";
-import RetailerList from "./retailerList";
-import RetailerDetails from "./retailerDetails";
-import RetailerEditor from "./retailerEditor";
-import TrackEditor from "./trackEditor";
-import AlbumEditor from "./albumEditor";
-import ArtistEditor from "./artistEditor";
-import RetailerStatisticsReport from "./retailerStatisticsReport";
+import ArtistList from "./artists/artistList";
+import AlbumList from "./albums/albumList";
+import TrackList from "./tracks/trackList";
+import LookupAlbum from "./search/lookupAlbum";
+import ExportCatalogue from "./dataexchange/exportCatalogue";
+import GenreStatusReport from "./reports/genreStatisticsReport";
+import JobStatusReport from "./reports/jobStatusReport";
+import AlbumPurchaseDetails from "./albums/albumPurchaseDetails";
+import ArtistStatisticsReport from "./reports/artistStatisticsReport";
+import MonthlySpendReport from "./reports/monthlySpendReport";
+import GenreList from "./genres/genreList";
+import RetailerList from "./retailers/retailerList";
+import RetailerDetails from "./retailers/retailerDetails";
+import RetailerEditor from "./retailers/retailerEditor";
+import TrackEditor from "./tracks/trackEditor";
+import AlbumEditor from "./albums/albumEditor";
+import ArtistEditor from "./artists/artistEditor";
+import RetailerStatisticsReport from "./reports/retailerStatisticsReport";
 
 /**
  * Component using the current context to select and render the current page
diff --git a/src/music-catalogue-ui/components/export.module.css b/src/music-catalogue-ui/components/dataexchange/export.module.css
similarity index 100%
rename from src/music-catalogue-ui/components/export.module.css
rename to src/music-catalogue-ui/components/dataexchange/export.module.css
diff --git a/src/music-catalogue-ui/components/exportCatalogue.js b/src/music-catalogue-ui/components/dataexchange/exportCatalogue.js
similarity index 97%
rename from src/music-catalogue-ui/components/exportCatalogue.js
rename to src/music-catalogue-ui/components/dataexchange/exportCatalogue.js
index 4e95acb..d17fff4 100644
--- a/src/music-catalogue-ui/components/exportCatalogue.js
+++ b/src/music-catalogue-ui/components/dataexchange/exportCatalogue.js
@@ -1,7 +1,7 @@
 import styles from "./export.module.css";
 import { useCallback, useState } from "react";
 import { apiRequestCatalogueExport } from "@/helpers/apiDataExchange";
-import FormInputField from "./formInputField";
+import FormInputField from "../common/formInputField";
 
 /**
  * Component to prompt for an export file name and request an export of the catalogue
diff --git a/src/music-catalogue-ui/components/genreList.js b/src/music-catalogue-ui/components/genres/genreList.js
similarity index 100%
rename from src/music-catalogue-ui/components/genreList.js
rename to src/music-catalogue-ui/components/genres/genreList.js
diff --git a/src/music-catalogue-ui/components/genreRow.js b/src/music-catalogue-ui/components/genres/genreRow.js
similarity index 100%
rename from src/music-catalogue-ui/components/genreRow.js
rename to src/music-catalogue-ui/components/genres/genreRow.js
diff --git a/src/music-catalogue-ui/components/genreSelector.js b/src/music-catalogue-ui/components/genres/genreSelector.js
similarity index 100%
rename from src/music-catalogue-ui/components/genreSelector.js
rename to src/music-catalogue-ui/components/genres/genreSelector.js
diff --git a/src/music-catalogue-ui/components/login.js b/src/music-catalogue-ui/components/login/login.js
similarity index 100%
rename from src/music-catalogue-ui/components/login.js
rename to src/music-catalogue-ui/components/login/login.js
diff --git a/src/music-catalogue-ui/components/login.module.css b/src/music-catalogue-ui/components/login/login.module.css
similarity index 100%
rename from src/music-catalogue-ui/components/login.module.css
rename to src/music-catalogue-ui/components/login/login.module.css
diff --git a/src/music-catalogue-ui/components/menuBar.js b/src/music-catalogue-ui/components/menuBar.js
index c8b771d..beea1ae 100644
--- a/src/music-catalogue-ui/components/menuBar.js
+++ b/src/music-catalogue-ui/components/menuBar.js
@@ -53,10 +53,24 @@ const MenuBar = ({ navigate, logout }) => {
         <a onClick={() => navigate({ page: pages.export })}>Export</a>
         <a href="#">Import</a>
         <a onClick={() => navigate({ page: pages.lookup })}>Search</a>
-
         <div className={styles.dropdown}>
           <button className={styles.dropbtn}>
-            Browse
+            Equipment
+            <div className={styles.dropdownArrowContainer}>
+              <FontAwesomeIcon icon={faCaretDown} />
+            </div>
+          </button>
+          <div className={styles.dropdownContent}>
+            <a>Equipment</a>
+            <a>Wish List</a>
+            <a>Equipment Types</a>
+            <a>Manufacturers</a>
+            <a onClick={() => navigate({ page: pages.retailers })}>Retailers</a>
+          </div>
+        </div>
+        <div className={styles.dropdown}>
+          <button className={styles.dropbtn}>
+            Music
             <div className={styles.dropdownArrowContainer}>
               <FontAwesomeIcon icon={faCaretDown} />
             </div>
diff --git a/src/music-catalogue-ui/components/artistStatisticsReport.js b/src/music-catalogue-ui/components/reports/artistStatisticsReport.js
similarity index 97%
rename from src/music-catalogue-ui/components/artistStatisticsReport.js
rename to src/music-catalogue-ui/components/reports/artistStatisticsReport.js
index 69c41b6..d6715ae 100644
--- a/src/music-catalogue-ui/components/artistStatisticsReport.js
+++ b/src/music-catalogue-ui/components/reports/artistStatisticsReport.js
@@ -1,12 +1,12 @@
 import React, { useCallback, useState } from "react";
-import styles from "./reports.module.css";
+import styles from "@/components/reports/reports.module.css";
 import catalogues from "@/helpers/catalogues";
 import "react-datepicker/dist/react-datepicker.css";
 import { apiArtistStatisticsReport } from "@/helpers/apiReports";
 import ArtistStatisticsRow from "./artistStatisticsRow";
 import ReportExportControls from "./reportExportControls";
 import { apiRequestAristStatisticsExport } from "@/helpers/apiDataExchange";
-import CatalogueSelector from "./catalogueSelector";
+import CatalogueSelector from "../common/catalogueSelector";
 
 /**
  * Component to display the artist statistics report page and its results
diff --git a/src/music-catalogue-ui/components/artistStatisticsRow.js b/src/music-catalogue-ui/components/reports/artistStatisticsRow.js
similarity index 87%
rename from src/music-catalogue-ui/components/artistStatisticsRow.js
rename to src/music-catalogue-ui/components/reports/artistStatisticsRow.js
index 06ea366..1405891 100644
--- a/src/music-catalogue-ui/components/artistStatisticsRow.js
+++ b/src/music-catalogue-ui/components/reports/artistStatisticsRow.js
@@ -1,4 +1,4 @@
-import CurrencyFormatter from "./currencyFormatter";
+import CurrencyFormatter from "../common/currencyFormatter";
 
 /**
  * Component to render a row containing the details for a single artist statistics record
diff --git a/src/music-catalogue-ui/components/genreStatisticsReport.js b/src/music-catalogue-ui/components/reports/genreStatisticsReport.js
similarity index 98%
rename from src/music-catalogue-ui/components/genreStatisticsReport.js
rename to src/music-catalogue-ui/components/reports/genreStatisticsReport.js
index 8aa650b..4da2436 100644
--- a/src/music-catalogue-ui/components/genreStatisticsReport.js
+++ b/src/music-catalogue-ui/components/reports/genreStatisticsReport.js
@@ -6,7 +6,7 @@ import { apiGenreStatisticsReport } from "@/helpers/apiReports";
 import GenreStatisticsRow from "./genreStatisticsRow";
 import ReportExportControls from "./reportExportControls";
 import { apiRequestGenreStatisticsExport } from "@/helpers/apiDataExchange";
-import CatalogueSelector from "./catalogueSelector";
+import CatalogueSelector from "../common/catalogueSelector";
 
 /**
  * Component to display the genre statistics report page and its results
diff --git a/src/music-catalogue-ui/components/genreStatisticsRow.js b/src/music-catalogue-ui/components/reports/genreStatisticsRow.js
similarity index 88%
rename from src/music-catalogue-ui/components/genreStatisticsRow.js
rename to src/music-catalogue-ui/components/reports/genreStatisticsRow.js
index 362ce8b..93e9414 100644
--- a/src/music-catalogue-ui/components/genreStatisticsRow.js
+++ b/src/music-catalogue-ui/components/reports/genreStatisticsRow.js
@@ -1,4 +1,4 @@
-import CurrencyFormatter from "./currencyFormatter";
+import CurrencyFormatter from "../common/currencyFormatter";
 
 /**
  * Component to render a row containing the details for a single genre statistics record
diff --git a/src/music-catalogue-ui/components/jobStatusReport.js b/src/music-catalogue-ui/components/reports/jobStatusReport.js
similarity index 97%
rename from src/music-catalogue-ui/components/jobStatusReport.js
rename to src/music-catalogue-ui/components/reports/jobStatusReport.js
index 6eb5578..b3fb4b5 100644
--- a/src/music-catalogue-ui/components/jobStatusReport.js
+++ b/src/music-catalogue-ui/components/reports/jobStatusReport.js
@@ -1,5 +1,5 @@
 import React, { useCallback, useState } from "react";
-import styles from "./reports.module.css";
+import styles from "@/components/reports/reports.module.css";
 import DatePicker from "react-datepicker";
 import "react-datepicker/dist/react-datepicker.css";
 import { apiJobStatusReport } from "@/helpers/apiReports";
diff --git a/src/music-catalogue-ui/components/jobStatusRow.js b/src/music-catalogue-ui/components/reports/jobStatusRow.js
similarity index 87%
rename from src/music-catalogue-ui/components/jobStatusRow.js
rename to src/music-catalogue-ui/components/reports/jobStatusRow.js
index 9ce6438..571512a 100644
--- a/src/music-catalogue-ui/components/jobStatusRow.js
+++ b/src/music-catalogue-ui/components/reports/jobStatusRow.js
@@ -1,4 +1,4 @@
-import DateAndTimeFormatter from "./dateAndTimeFormatter";
+import DateAndTimeFormatter from "../common/dateAndTimeFormatter";
 
 /**
  * Component to render a row containing the details of a single job status record
diff --git a/src/music-catalogue-ui/components/monthlySpendReport.js b/src/music-catalogue-ui/components/reports/monthlySpendReport.js
similarity index 97%
rename from src/music-catalogue-ui/components/monthlySpendReport.js
rename to src/music-catalogue-ui/components/reports/monthlySpendReport.js
index b2a8125..45397e7 100644
--- a/src/music-catalogue-ui/components/monthlySpendReport.js
+++ b/src/music-catalogue-ui/components/reports/monthlySpendReport.js
@@ -1,5 +1,5 @@
 import React, { useState, useCallback } from "react";
-import styles from "./reports.module.css";
+import styles from "@/components/reports/reports.module.css";
 import useMonthlySpend from "@/hooks/useMonthlySpend";
 import MonthlySpendReportRow from "./monthlySpendReportRow";
 import ReportExportControls from "./reportExportControls";
diff --git a/src/music-catalogue-ui/components/monthlySpendReportRow.js b/src/music-catalogue-ui/components/reports/monthlySpendReportRow.js
similarity index 87%
rename from src/music-catalogue-ui/components/monthlySpendReportRow.js
rename to src/music-catalogue-ui/components/reports/monthlySpendReportRow.js
index 3b606f8..bb583e2 100644
--- a/src/music-catalogue-ui/components/monthlySpendReportRow.js
+++ b/src/music-catalogue-ui/components/reports/monthlySpendReportRow.js
@@ -1,4 +1,4 @@
-import CurrencyFormatter from "./currencyFormatter";
+import CurrencyFormatter from "../common/currencyFormatter";
 
 /**
  * Component to render a row containing the details for a single monthly spending record
diff --git a/src/music-catalogue-ui/components/reportExportControls.js b/src/music-catalogue-ui/components/reports/reportExportControls.js
similarity index 95%
rename from src/music-catalogue-ui/components/reportExportControls.js
rename to src/music-catalogue-ui/components/reports/reportExportControls.js
index 7061aed..0adc91c 100644
--- a/src/music-catalogue-ui/components/reportExportControls.js
+++ b/src/music-catalogue-ui/components/reports/reportExportControls.js
@@ -1,4 +1,4 @@
-import styles from "./reports.module.css";
+import styles from "@/components/reports/reports.module.css";
 import { useState } from "react";
 
 /**
diff --git a/src/music-catalogue-ui/components/reports.module.css b/src/music-catalogue-ui/components/reports/reports.module.css
similarity index 100%
rename from src/music-catalogue-ui/components/reports.module.css
rename to src/music-catalogue-ui/components/reports/reports.module.css
diff --git a/src/music-catalogue-ui/components/retailerStatisticsReport.js b/src/music-catalogue-ui/components/reports/retailerStatisticsReport.js
similarity index 97%
rename from src/music-catalogue-ui/components/retailerStatisticsReport.js
rename to src/music-catalogue-ui/components/reports/retailerStatisticsReport.js
index c7ce347..56f4ba1 100644
--- a/src/music-catalogue-ui/components/retailerStatisticsReport.js
+++ b/src/music-catalogue-ui/components/reports/retailerStatisticsReport.js
@@ -1,12 +1,12 @@
 import React, { useCallback, useState } from "react";
-import styles from "./reports.module.css";
+import styles from "@/components/reports/reports.module.css";
 import catalogues from "@/helpers/catalogues";
 import "react-datepicker/dist/react-datepicker.css";
 import { apiRetailerStatisticsReport } from "@/helpers/apiReports";
 import RetailerStatisticsRow from "./retailerStatisticsRow";
 import ReportExportControls from "./reportExportControls";
 import { apiRequestRetailerStatisticsExport } from "@/helpers/apiDataExchange";
-import CatalogueSelector from "./catalogueSelector";
+import CatalogueSelector from "../common/catalogueSelector";
 
 /**
  * Component to display the retailer statistics report page and its results
diff --git a/src/music-catalogue-ui/components/retailerStatisticsRow.js b/src/music-catalogue-ui/components/reports/retailerStatisticsRow.js
similarity index 88%
rename from src/music-catalogue-ui/components/retailerStatisticsRow.js
rename to src/music-catalogue-ui/components/reports/retailerStatisticsRow.js
index f9bab0b..d6351bb 100644
--- a/src/music-catalogue-ui/components/retailerStatisticsRow.js
+++ b/src/music-catalogue-ui/components/reports/retailerStatisticsRow.js
@@ -1,4 +1,4 @@
-import CurrencyFormatter from "./currencyFormatter";
+import CurrencyFormatter from "../common/currencyFormatter";
 
 /**
  * Component to render a row containing the details for a single retailer statistics record
diff --git a/src/music-catalogue-ui/components/deleteRetailerActionIcon.js b/src/music-catalogue-ui/components/retailers/deleteRetailerActionIcon.js
similarity index 100%
rename from src/music-catalogue-ui/components/deleteRetailerActionIcon.js
rename to src/music-catalogue-ui/components/retailers/deleteRetailerActionIcon.js
diff --git a/src/music-catalogue-ui/components/retailerDetails.js b/src/music-catalogue-ui/components/retailers/retailerDetails.js
similarity index 98%
rename from src/music-catalogue-ui/components/retailerDetails.js
rename to src/music-catalogue-ui/components/retailers/retailerDetails.js
index aacafc1..a1fd2c5 100644
--- a/src/music-catalogue-ui/components/retailerDetails.js
+++ b/src/music-catalogue-ui/components/retailers/retailerDetails.js
@@ -1,5 +1,5 @@
 import pages from "@/helpers/navigation";
-import LocationMap from "./locationMap";
+import LocationMap from "../common/locationMap";
 import styles from "./retailerDetails.module.css";
 
 /**
diff --git a/src/music-catalogue-ui/components/retailerDetails.module.css b/src/music-catalogue-ui/components/retailers/retailerDetails.module.css
similarity index 100%
rename from src/music-catalogue-ui/components/retailerDetails.module.css
rename to src/music-catalogue-ui/components/retailers/retailerDetails.module.css
diff --git a/src/music-catalogue-ui/components/retailerEditor.js b/src/music-catalogue-ui/components/retailers/retailerEditor.js
similarity index 99%
rename from src/music-catalogue-ui/components/retailerEditor.js
rename to src/music-catalogue-ui/components/retailers/retailerEditor.js
index 2cdd555..c85674c 100644
--- a/src/music-catalogue-ui/components/retailerEditor.js
+++ b/src/music-catalogue-ui/components/retailers/retailerEditor.js
@@ -2,7 +2,7 @@ import styles from "./retailerEditor.module.css";
 import pages from "@/helpers/navigation";
 import { useState, useCallback } from "react";
 import { apiCreateRetailer, apiUpdateRetailer } from "@/helpers/apiRetailers";
-import FormInputField from "./formInputField";
+import FormInputField from "../common/formInputField";
 import { geocodeAddress } from "@/helpers/geocoder";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faGlobe } from "@fortawesome/free-solid-svg-icons";
diff --git a/src/music-catalogue-ui/components/retailerEditor.module.css b/src/music-catalogue-ui/components/retailers/retailerEditor.module.css
similarity index 100%
rename from src/music-catalogue-ui/components/retailerEditor.module.css
rename to src/music-catalogue-ui/components/retailers/retailerEditor.module.css
diff --git a/src/music-catalogue-ui/components/retailerList.js b/src/music-catalogue-ui/components/retailers/retailerList.js
similarity index 100%
rename from src/music-catalogue-ui/components/retailerList.js
rename to src/music-catalogue-ui/components/retailers/retailerList.js
diff --git a/src/music-catalogue-ui/components/retailerList.module.css b/src/music-catalogue-ui/components/retailers/retailerList.module.css
similarity index 100%
rename from src/music-catalogue-ui/components/retailerList.module.css
rename to src/music-catalogue-ui/components/retailers/retailerList.module.css
diff --git a/src/music-catalogue-ui/components/retailerRow.js b/src/music-catalogue-ui/components/retailers/retailerRow.js
similarity index 100%
rename from src/music-catalogue-ui/components/retailerRow.js
rename to src/music-catalogue-ui/components/retailers/retailerRow.js
diff --git a/src/music-catalogue-ui/components/retailerSelector.js b/src/music-catalogue-ui/components/retailers/retailerSelector.js
similarity index 100%
rename from src/music-catalogue-ui/components/retailerSelector.js
rename to src/music-catalogue-ui/components/retailers/retailerSelector.js
diff --git a/src/music-catalogue-ui/components/lookupAlbum.js b/src/music-catalogue-ui/components/search/lookupAlbum.js
similarity index 100%
rename from src/music-catalogue-ui/components/lookupAlbum.js
rename to src/music-catalogue-ui/components/search/lookupAlbum.js
diff --git a/src/music-catalogue-ui/components/lookupAlbum.module.css b/src/music-catalogue-ui/components/search/lookupAlbum.module.css
similarity index 100%
rename from src/music-catalogue-ui/components/lookupAlbum.module.css
rename to src/music-catalogue-ui/components/search/lookupAlbum.module.css
diff --git a/src/music-catalogue-ui/components/deleteTrackActionIcon.js b/src/music-catalogue-ui/components/tracks/deleteTrackActionIcon.js
similarity index 100%
rename from src/music-catalogue-ui/components/deleteTrackActionIcon.js
rename to src/music-catalogue-ui/components/tracks/deleteTrackActionIcon.js
diff --git a/src/music-catalogue-ui/components/trackEditor.js b/src/music-catalogue-ui/components/tracks/trackEditor.js
similarity index 98%
rename from src/music-catalogue-ui/components/trackEditor.js
rename to src/music-catalogue-ui/components/tracks/trackEditor.js
index 7b013bf..dce5ee5 100644
--- a/src/music-catalogue-ui/components/trackEditor.js
+++ b/src/music-catalogue-ui/components/tracks/trackEditor.js
@@ -1,6 +1,6 @@
 import styles from "./trackEditor.module.css";
 import pages from "@/helpers/navigation";
-import FormInputField from "./formInputField";
+import FormInputField from "../common/formInputField";
 import { useState, useCallback } from "react";
 import { apiCreateTrack, apiUpdateTrack } from "@/helpers/apiTracks";
 
diff --git a/src/music-catalogue-ui/components/trackEditor.module.css b/src/music-catalogue-ui/components/tracks/trackEditor.module.css
similarity index 100%
rename from src/music-catalogue-ui/components/trackEditor.module.css
rename to src/music-catalogue-ui/components/tracks/trackEditor.module.css
diff --git a/src/music-catalogue-ui/components/trackList.js b/src/music-catalogue-ui/components/tracks/trackList.js
similarity index 100%
rename from src/music-catalogue-ui/components/trackList.js
rename to src/music-catalogue-ui/components/tracks/trackList.js
diff --git a/src/music-catalogue-ui/components/trackList.module.css b/src/music-catalogue-ui/components/tracks/trackList.module.css
similarity index 100%
rename from src/music-catalogue-ui/components/trackList.module.css
rename to src/music-catalogue-ui/components/tracks/trackList.module.css
diff --git a/src/music-catalogue-ui/components/trackRow.js b/src/music-catalogue-ui/components/tracks/trackRow.js
similarity index 100%
rename from src/music-catalogue-ui/components/trackRow.js
rename to src/music-catalogue-ui/components/tracks/trackRow.js
diff --git a/src/music-catalogue-ui/components/trackRow.module.css b/src/music-catalogue-ui/components/tracks/trackRow.module.css
similarity index 100%
rename from src/music-catalogue-ui/components/trackRow.module.css
rename to src/music-catalogue-ui/components/tracks/trackRow.module.css
diff --git a/src/music-catalogue-ui/helpers/apiAlbums.js b/src/music-catalogue-ui/helpers/apiAlbums.js
index 24219c6..b79ae8a 100644
--- a/src/music-catalogue-ui/helpers/apiAlbums.js
+++ b/src/music-catalogue-ui/helpers/apiAlbums.js
@@ -1,4 +1,4 @@
-import config from "../config.json";
+import config from "@/config.json";
 import { apiReadResponseData } from "./apiUtils";
 import { apiGetPostHeaders, apiGetHeaders } from "./apiHeaders";
 
diff --git a/src/music-catalogue-ui/helpers/apiArtists.js b/src/music-catalogue-ui/helpers/apiArtists.js
index 9c4ebde..660f1a1 100644
--- a/src/music-catalogue-ui/helpers/apiArtists.js
+++ b/src/music-catalogue-ui/helpers/apiArtists.js
@@ -1,4 +1,4 @@
-import config from "../config.json";
+import config from "@/config.json";
 import { apiReadResponseData } from "./apiUtils";
 import { apiGetHeaders, apiGetPostHeaders } from "./apiHeaders";
 
diff --git a/src/music-catalogue-ui/helpers/apiAuthenticate.js b/src/music-catalogue-ui/helpers/apiAuthenticate.js
index c19a506..54b4b89 100644
--- a/src/music-catalogue-ui/helpers/apiAuthenticate.js
+++ b/src/music-catalogue-ui/helpers/apiAuthenticate.js
@@ -1,4 +1,4 @@
-import config from "../config.json";
+import config from "@/config.json";
 
 /**
  * Authenticate with the Music Catalogue REST API
diff --git a/src/music-catalogue-ui/helpers/apiDataExchange.js b/src/music-catalogue-ui/helpers/apiDataExchange.js
index 06f3b9b..020fc7d 100644
--- a/src/music-catalogue-ui/helpers/apiDataExchange.js
+++ b/src/music-catalogue-ui/helpers/apiDataExchange.js
@@ -1,4 +1,4 @@
-import config from "../config.json";
+import config from "@/config.json";
 import { apiGetPostHeaders } from "./apiHeaders";
 
 /**
diff --git a/src/music-catalogue-ui/helpers/apiGenres.js b/src/music-catalogue-ui/helpers/apiGenres.js
index 928d1b5..6c77797 100644
--- a/src/music-catalogue-ui/helpers/apiGenres.js
+++ b/src/music-catalogue-ui/helpers/apiGenres.js
@@ -1,4 +1,4 @@
-import config from "../config.json";
+import config from "@/config.json";
 import { apiReadResponseData } from "./apiUtils";
 import { apiGetPostHeaders } from "./apiHeaders";
 
diff --git a/src/music-catalogue-ui/helpers/apiReports.js b/src/music-catalogue-ui/helpers/apiReports.js
index 9337094..29ae1a6 100644
--- a/src/music-catalogue-ui/helpers/apiReports.js
+++ b/src/music-catalogue-ui/helpers/apiReports.js
@@ -1,4 +1,4 @@
-import config from "../config.json";
+import config from "@/config.json";
 import { apiGetHeaders } from "./apiHeaders";
 import { apiReadResponseData, apiFormatDateTime } from "./apiUtils";
 
diff --git a/src/music-catalogue-ui/helpers/apiRetailers.js b/src/music-catalogue-ui/helpers/apiRetailers.js
index 98ea926..6870b76 100644
--- a/src/music-catalogue-ui/helpers/apiRetailers.js
+++ b/src/music-catalogue-ui/helpers/apiRetailers.js
@@ -1,4 +1,4 @@
-import config from "../config.json";
+import config from "@/config.json";
 import { apiReadResponseData } from "./apiUtils";
 import { apiGetPostHeaders, apiGetHeaders } from "./apiHeaders";
 
diff --git a/src/music-catalogue-ui/helpers/apiSecrets.js b/src/music-catalogue-ui/helpers/apiSecrets.js
index 497e1c4..428e572 100644
--- a/src/music-catalogue-ui/helpers/apiSecrets.js
+++ b/src/music-catalogue-ui/helpers/apiSecrets.js
@@ -1,4 +1,4 @@
-import config from "../config.json";
+import config from "@/config.json";
 import { apiGetHeaders } from "./apiHeaders";
 
 /**
diff --git a/src/music-catalogue-ui/helpers/apiTracks.js b/src/music-catalogue-ui/helpers/apiTracks.js
index aedd1d2..8c7a72a 100644
--- a/src/music-catalogue-ui/helpers/apiTracks.js
+++ b/src/music-catalogue-ui/helpers/apiTracks.js
@@ -1,4 +1,4 @@
-import config from "../config.json";
+import config from "@/config.json";
 import { apiReadResponseData } from "./apiUtils";
 import { apiGetPostHeaders, apiGetHeaders } from "./apiHeaders";
 
diff --git a/src/music-catalogue-ui/helpers/geocoder.js b/src/music-catalogue-ui/helpers/geocoder.js
index 33154e3..38630c8 100644
--- a/src/music-catalogue-ui/helpers/geocoder.js
+++ b/src/music-catalogue-ui/helpers/geocoder.js
@@ -1,5 +1,5 @@
 import secrets from "@/helpers/secrets";
-import config from "../config.json";
+import config from "@/config.json";
 import { setDefaults, geocode, RequestType } from "react-geocode";
 import { getStorageValue } from "./storage";