diff --git a/src/App.js b/src/App.js
index ba81f18..7b7dfdd 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,15 +1,14 @@
 /*import logo from './logo.svg';*/
 import "./App.css";
-import BaseInput from "./BaseInput.js";
+
+import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
 import { useState, useRef, useEffect } from "react";
 import { Grid, Box, Button } from "@mui/material";
-import PickDate from "./PickDate.js";
-import ConcertList from "./ConcertList.js";
+import TaleSetup from "./Setup/TaleSetup.js";
 import SharePage from "./SharePage.js";
 import html2canvas from "html2canvas";
 import canvas2image from "@reglendo/canvas2image";
-import GetSpotifyPlaylistArtistsWithShows from "./GetSpotifyPlaylistArtistsWithShows.js";
-import YourSpotifyArtistsWithShows from "./YourSpotifyArtistsWithShows.js";
+
 
 function App() {
   let cachedStartDate = localStorage.getItem("startDate");
@@ -102,62 +101,30 @@ function App() {
         columnSpacing={{ xs: 1, sm: 2, md: 3, lg: 10, xl: 3 }}
         alignItems="flex-start"
       >
-        <Grid direction={"column"} xs={10} sm={10} md={10} lg={2} xl={2}>
-          <Box>
-            <img src={window.location.origin + "/Taver.png"} alt="Taver" />
-          </Box>
-          <PickDate
-            updateStartDateInParent={setStartDate}
-            updateEndDateInParent={setEndDate}
-            artistName={artistName}
-            newArtistList={setArtistList}
-            openDialog={setOpenDialog}
-          />
-          <p />
-          <BaseInput
-            setConcerts={setConcerts}
-            setUserLocation={setUserLocation}
-            setMapStyle={setMapStyle}
-            setAllConcerts={setAllConcerts}
-            startDate={startDate}
-            endDate={endDate}
-            concerts={concerts}
-            allConcerts={allConcerts}
-            userLocation={userLocation}
-            updateArtistNameInParent={(value) => setArtistName(value)}
-            newArtistList={setArtistList}
-            artistListFromParent={artistList}
-            followedArtists={followedArtists}
-            setFollowedArtists={setFollowedArtists}
-            artistWishlist={artistWishlist}
-            setArtistWishlist={setArtistWishlist}
-            openDialogFromParent={openDialog}
-            closeDialog={() => {
-              setOpenDialog(false);
-            }}
-            ref={childRef}
-          />
-          <GetSpotifyPlaylistArtistsWithShows
-            followedArtists={followedArtists}
-            setFollowedArtists={setFollowedArtists}
-            startDate={startDate}
-            endDate={endDate}
-            setIsRequestTriggered={setIsRequestTriggered}
-          />
-          <YourSpotifyArtistsWithShows
-            artists={followedArtists}
-            onChildClick={handleChildClick}
-            isRequestTriggered={isRequestTriggered}
-          />
-          <ConcertList
-            setConcerts={setConcerts}
-            setAllConcerts={setAllConcerts}
-            artistWishlist={artistWishlist}
-            setArtistWishlist={setArtistWishlist}
-            concerts={concerts}
-            triggerReEvaluation={triggerReEvaluation}
-          />
-        </Grid>
+        <TaleSetup setStartDate={setStartDate}
+          setEndDate={setEndDate}
+          setArtistList={setArtistList}
+          setOpenDialog={setOpenDialog}
+          setConcerts={setConcerts}
+          setUserLocation={setUserLocation}
+          setMapStyle={setMapStyle}
+          setAllConcerts={setAllConcerts}
+          setArtistName={setArtistName}
+          setFollowedArtists={setFollowedArtists}
+          setArtistWishlist={setArtistList}
+          setIsRequestTriggered={setIsRequestTriggered}
+          startDate={startDate}
+          endDate={endDate}
+          concerts={concerts}
+          artistName={artistName}
+          allConcerts={allConcerts}
+          userLocation={userLocation}
+          artistList={artistList}
+          followedArtists={followedArtists}
+          artistWishlist={artistWishlist}
+          openDialog={openDialog}
+          triggerReEvaluation={triggerReEvaluation}
+          isRequestTriggered={isRequestTriggered} />
         <Grid item xs={10} sm={10} md={10} lg={7} xl={8} direction={"row"}>
           <div id="sharepage">
             <SharePage
diff --git a/src/ArtistChoiceList.js b/src/Setup/ArtistChoiceList.js
similarity index 89%
rename from src/ArtistChoiceList.js
rename to src/Setup/ArtistChoiceList.js
index 9a378df..0f5cf55 100644
--- a/src/ArtistChoiceList.js
+++ b/src/Setup/ArtistChoiceList.js
@@ -3,6 +3,8 @@ import { List, ListItem, ListItemButton, ListItemAvatar, ListItemText, Avatar }
 
 const ArtistChoiceList = ({ artists, onArtistClick }) => {
   const text = { color: 'red' }
+
+
   return (
     <List>
       {artists.map((artist, index) => (
@@ -11,11 +13,10 @@ const ArtistChoiceList = ({ artists, onArtistClick }) => {
             <ListItemAvatar>
               <Avatar
                 alt={`${artist.name}`}
-                src={`${artist.images[1].url}`}
+                src={artist.images && artist.images.length > 1 ? artist.images[1].url : ''}
               />
             </ListItemAvatar>
             <ListItemText
-
               primary={`${artist.name}`}
               secondary={`${artist.gigCount} Gig(s)`}
               secondaryTypographyProps={{ style: text }}
diff --git a/src/ArtistsCarrousel.js b/src/Setup/ArtistsCarrousel.js
similarity index 100%
rename from src/ArtistsCarrousel.js
rename to src/Setup/ArtistsCarrousel.js
diff --git a/src/BaseInput.js b/src/Setup/BaseInput.js
similarity index 99%
rename from src/BaseInput.js
rename to src/Setup/BaseInput.js
index 87cbbe0..c866892 100644
--- a/src/BaseInput.js
+++ b/src/Setup/BaseInput.js
@@ -101,7 +101,6 @@ const BaseInput = forwardRef(({ setConcerts,
   startDate,
   setAllConcerts,
   endDate,
-  concerts,
   allConcerts,
   userLocation,
   updateArtistNameInParent,
diff --git a/src/ConcertList.js b/src/Setup/ConcertList.js
similarity index 100%
rename from src/ConcertList.js
rename to src/Setup/ConcertList.js
diff --git a/src/DismissButton.js b/src/Setup/DismissButton.js
similarity index 100%
rename from src/DismissButton.js
rename to src/Setup/DismissButton.js
diff --git a/src/FetchArtist.js b/src/Setup/FetchArtist.js
similarity index 100%
rename from src/FetchArtist.js
rename to src/Setup/FetchArtist.js
diff --git a/src/GetSpotifyPlaylistArtistsWithShows.js b/src/Setup/GetSpotifyPlaylistArtistsWithShows.js
similarity index 100%
rename from src/GetSpotifyPlaylistArtistsWithShows.js
rename to src/Setup/GetSpotifyPlaylistArtistsWithShows.js
diff --git a/src/PickDate.js b/src/Setup/PickDate.js
similarity index 100%
rename from src/PickDate.js
rename to src/Setup/PickDate.js
diff --git a/src/Setup/TaleSetup.js b/src/Setup/TaleSetup.js
new file mode 100644
index 0000000..97a4208
--- /dev/null
+++ b/src/Setup/TaleSetup.js
@@ -0,0 +1,102 @@
+import BaseInput from "./BaseInput.js";
+import GetSpotifyPlaylistArtistsWithShows from "./GetSpotifyPlaylistArtistsWithShows.js";
+import YourSpotifyArtistsWithShows from "./YourSpotifyArtistsWithShows.js";
+import PickDate from "./PickDate.js";
+import ConcertList from "./ConcertList.js";
+import {useRef } from "react";
+import { Grid, Box } from "@mui/material";
+
+
+
+const TaleSetup = ({ setStartDate,
+    setEndDate,
+    setArtistList,
+    setOpenDialog,
+    setConcerts,
+    setUserLocation,
+    setMapStyle,
+    setAllConcerts,
+    setArtistName,
+    setFollowedArtists,
+    setArtistWishlist,
+    setIsRequestTriggered,
+    startDate,
+    endDate,
+    concerts,
+    artistName,
+    allConcerts,
+    userLocation,
+    artistList,
+    followedArtists,
+    artistWishlist,
+    openDialog,
+    isRequestTriggered
+}) => {
+
+
+    const childRef = useRef();
+    const handleChildClick = (artistName) => {
+        childRef.current.handleRequestFromParent(artistName);
+    };
+    const triggerReEvaluation = (updatedArtistWishlist) => {
+        console.log("trigger re-evaluation");
+        childRef.current.handleReEvaluation(updatedArtistWishlist);
+    }
+
+    return (<Grid direction={"column"} xs={10} sm={10} md={10} lg={2} xl={2}>
+        <Box>
+            <img src={window.location.origin + "/Taver.png"} alt="Taver" />
+        </Box>
+        <PickDate
+            updateStartDateInParent={setStartDate}
+            updateEndDateInParent={setEndDate}
+            artistName={artistName}
+            newArtistList={setArtistList}
+            openDialog={setOpenDialog}
+        />
+        <p />
+        <BaseInput
+            setConcerts={setConcerts}
+            setUserLocation={setUserLocation}
+            setMapStyle={setMapStyle}
+            setAllConcerts={setAllConcerts}
+            startDate={startDate}
+            endDate={endDate}
+            allConcerts={allConcerts}
+            userLocation={userLocation}
+            updateArtistNameInParent={(value) => setArtistName(value)}
+            newArtistList={setArtistList}
+            artistListFromParent={artistList}
+            followedArtists={followedArtists}
+            setFollowedArtists={setFollowedArtists}
+            artistWishlist={artistWishlist}
+            setArtistWishlist={setArtistWishlist}
+            openDialogFromParent={openDialog}
+            closeDialog={() => {
+                setOpenDialog(false);
+            }}
+            ref={childRef}
+        />
+        <GetSpotifyPlaylistArtistsWithShows
+            followedArtists={followedArtists}
+            setFollowedArtists={setFollowedArtists}
+            startDate={startDate}
+            endDate={endDate}
+            setIsRequestTriggered={setIsRequestTriggered}
+        />
+        <YourSpotifyArtistsWithShows
+            artists={followedArtists}
+            onChildClick={handleChildClick}
+            isRequestTriggered={isRequestTriggered}
+        />
+        <ConcertList
+            setConcerts={setConcerts}
+            setAllConcerts={setAllConcerts}
+            artistWishlist={artistWishlist}
+            setArtistWishlist={setArtistWishlist}
+            concerts={concerts}
+            triggerReEvaluation={triggerReEvaluation}
+        />
+    </Grid>);
+};
+export default TaleSetup;
\ No newline at end of file
diff --git a/src/YourSpotifyArtistsWithShows.js b/src/Setup/YourSpotifyArtistsWithShows.js
similarity index 100%
rename from src/YourSpotifyArtistsWithShows.js
rename to src/Setup/YourSpotifyArtistsWithShows.js