diff --git a/packages/ia-components/.storybook/config.js b/packages/ia-components/.storybook/config.js
index 50f78e596..addddd8f4 100644
--- a/packages/ia-components/.storybook/config.js
+++ b/packages/ia-components/.storybook/config.js
@@ -6,6 +6,7 @@ import { withTests } from '@storybook/addon-jest';
 import results from '../jest-test-utils/jest-test-results.json';
 
 import style from './archive-cf7f2eh.less'
+import styles from './theatre-styling.less'
 
 /**
  * pick all *.stories.js files within the ia-components directory
diff --git a/packages/ia-components/sandbox/theatres/with-youtube-spotify/utils/data-for-stories/theatre-styling.less b/packages/ia-components/.storybook/theatre-styling.less
similarity index 100%
rename from packages/ia-components/sandbox/theatres/with-youtube-spotify/utils/data-for-stories/theatre-styling.less
rename to packages/ia-components/.storybook/theatre-styling.less
diff --git a/packages/ia-components/index.js b/packages/ia-components/index.js
index f62a67687..bb05a148a 100644
--- a/packages/ia-components/index.js
+++ b/packages/ia-components/index.js
@@ -9,8 +9,8 @@ export { default as IAUXExampleComponent } from './live/example-react-component/
 export { default as HorizontalRadioGroup } from './sandbox/selectors/horizontal-radio-group/horizontal-radio-group';
 export { default as FlexboxPagination } from './sandbox/pagination/pagination-with-flexbox';
 
-export { default as TheatreTrackList } from './sandbox/theatres/components/track-list/track-list';
-export { default as TheatreAudioPlayer } from './sandbox/theatres/components/audio-player/audio-player-main';
+export { default as TheatreTrackList } from './sandbox/track-lists/track-list';
+export { default as TheatreAudioPlayer } from './sandbox/audio-players/audio-player-main';
 export { default as AudioPlayerWithYoutubeSpotify } from './sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify-main';
 export { default as AnchorDetails } from './sandbox/AnchorDetails';
 // sandbox tiles
@@ -24,4 +24,4 @@ export { default as DetailsActionButtons } from './sandbox/details/DetailsAction
 export { default as DetailsDownloadOptions } from './sandbox/details/DetailsDownloadOptions';
 export { default as DetailsFlags } from './sandbox/details/DetailsFlags';
 export { AnchorModalGo, ButtonModalGo } from './sandbox/details/ModalGo';
-export { default as Tabby} from './sandbox/details/Tabby';
+export { default as Tabby } from './sandbox/details/Tabby';
diff --git a/packages/ia-components/index.less b/packages/ia-components/index.less
index 5b86f7a42..de1e35fca 100644
--- a/packages/ia-components/index.less
+++ b/packages/ia-components/index.less
@@ -3,7 +3,7 @@
 @import './live/example-react-component/styles.less';
 
 @import './sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify.less';
-@import './sandbox/theatres/components/track-list/track-list.less';
-@import './sandbox/theatres/components/audio-player/audio-player.less';
+@import './sandbox/track-lists/track-list.less';
+@import './sandbox/audio-players/audio-player.less';
 @import './sandbox/selectors/horizontal-radio-group/horizontal-radio-group.less';
-@import './sandbox/pagination/pagination.less';
\ No newline at end of file
+@import './sandbox/pagination/pagination.less';
diff --git a/packages/ia-components/sandbox/theatres/components/audio-player/players_by_type/archive-audio-jwplayer-wrapper.jsx b/packages/ia-components/sandbox/audio-players/archive-audio-jwplayer-wrapper.jsx
similarity index 100%
rename from packages/ia-components/sandbox/theatres/components/audio-player/players_by_type/archive-audio-jwplayer-wrapper.jsx
rename to packages/ia-components/sandbox/audio-players/archive-audio-jwplayer-wrapper.jsx
diff --git a/packages/ia-components/sandbox/theatres/components/audio-player/audio-player-main.jsx b/packages/ia-components/sandbox/audio-players/audio-player-main.jsx
similarity index 94%
rename from packages/ia-components/sandbox/theatres/components/audio-player/audio-player-main.jsx
rename to packages/ia-components/sandbox/audio-players/audio-player-main.jsx
index 067cdbfea..e7c8089f2 100644
--- a/packages/ia-components/sandbox/theatres/components/audio-player/audio-player-main.jsx
+++ b/packages/ia-components/sandbox/audio-players/audio-player-main.jsx
@@ -1,9 +1,9 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import ArchiveAudioPlayer from './players_by_type/archive-audio-jwplayer-wrapper';
-import ThirdPartyEmbeddedPlayer from './players_by_type/third-party-embed';
-import { HorizontalRadioGroup } from '../../../../index';
-import BookReaderWrapper from '../../../bookreader-component/bookreader-wrapper-main';
+import ArchiveAudioPlayer from './archive-audio-jwplayer-wrapper';
+import ThirdPartyEmbeddedPlayer from './third-party-embed';
+import { HorizontalRadioGroup } from '../../index';
+import BookReaderWrapper from '../bookreader-component/bookreader-wrapper-main';
 
 /**
  * Draw background photo
@@ -124,7 +124,7 @@ export default class TheatreAudioPlayer extends Component {
       options.push({
         value: 'liner-notes',
         label: customSourceLabels.linerNotes,
-      });;
+      });
     }
     return (
       <HorizontalRadioGroup
diff --git a/packages/ia-components/sandbox/theatres/components/audio-player/audio-player.less b/packages/ia-components/sandbox/audio-players/audio-player.less
similarity index 100%
rename from packages/ia-components/sandbox/theatres/components/audio-player/audio-player.less
rename to packages/ia-components/sandbox/audio-players/audio-player.less
diff --git a/packages/ia-components/sandbox/theatres/components/audio-player/audio-player.stories.js b/packages/ia-components/sandbox/audio-players/audio-player.stories.js
similarity index 100%
rename from packages/ia-components/sandbox/theatres/components/audio-player/audio-player.stories.js
rename to packages/ia-components/sandbox/audio-players/audio-player.stories.js
diff --git a/packages/ia-components/sandbox/theatres/components/audio-player/audio-player.test.js b/packages/ia-components/sandbox/audio-players/audio-player.test.js
similarity index 100%
rename from packages/ia-components/sandbox/theatres/components/audio-player/audio-player.test.js
rename to packages/ia-components/sandbox/audio-players/audio-player.test.js
diff --git a/packages/ia-components/sandbox/theatres/components/audio-player/players_by_type/third-party-embed.jsx b/packages/ia-components/sandbox/audio-players/third-party-embed.jsx
similarity index 100%
rename from packages/ia-components/sandbox/theatres/components/audio-player/players_by_type/third-party-embed.jsx
rename to packages/ia-components/sandbox/audio-players/third-party-embed.jsx
diff --git a/packages/ia-components/sandbox/theatres/with-youtube-spotify/utils/data-for-stories/album-private-with-spotify-youtube.js b/packages/ia-components/sandbox/data-for-stories/album-private-with-spotify-youtube.js
similarity index 100%
rename from packages/ia-components/sandbox/theatres/with-youtube-spotify/utils/data-for-stories/album-private-with-spotify-youtube.js
rename to packages/ia-components/sandbox/data-for-stories/album-private-with-spotify-youtube.js
diff --git a/packages/ia-components/sandbox/theatres/components/svgs/ia-logo-white-icon.js b/packages/ia-components/sandbox/svgs/ia-logo-white-icon.js
similarity index 100%
rename from packages/ia-components/sandbox/theatres/components/svgs/ia-logo-white-icon.js
rename to packages/ia-components/sandbox/svgs/ia-logo-white-icon.js
diff --git a/packages/ia-components/sandbox/theatres/components/svgs/icon-booklet.js b/packages/ia-components/sandbox/svgs/icon-booklet.js
similarity index 100%
rename from packages/ia-components/sandbox/theatres/components/svgs/icon-booklet.js
rename to packages/ia-components/sandbox/svgs/icon-booklet.js
diff --git a/packages/ia-components/sandbox/theatres/components/svgs/spotify-logo-icon.js b/packages/ia-components/sandbox/svgs/spotify-logo-icon.js
similarity index 100%
rename from packages/ia-components/sandbox/theatres/components/svgs/spotify-logo-icon.js
rename to packages/ia-components/sandbox/svgs/spotify-logo-icon.js
diff --git a/packages/ia-components/sandbox/theatres/components/svgs/youtube-logo-icon.js b/packages/ia-components/sandbox/svgs/youtube-logo-icon.js
similarity index 100%
rename from packages/ia-components/sandbox/theatres/components/svgs/youtube-logo-icon.js
rename to packages/ia-components/sandbox/svgs/youtube-logo-icon.js
diff --git a/packages/ia-components/sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify-main.jsx b/packages/ia-components/sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify-main.jsx
index cb4b9a71e..0bc7c490d 100644
--- a/packages/ia-components/sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify-main.jsx
+++ b/packages/ia-components/sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify-main.jsx
@@ -5,10 +5,10 @@ import { find, flatten, head } from 'lodash';
 import flattenAlbumData from './utils/flatten-album-data';
 import getTrackListBySource from './utils/get-track-list-by-source';
 
-import YoutubeIcon from '../components/svgs/youtube-logo-icon';
-import SpotifyIcon from '../components/svgs/spotify-logo-icon';
-import ArchiveIcon from '../components/svgs/ia-logo-white-icon';
-import BookletIcon from '../components/svgs/icon-booklet';
+import YoutubeIcon from '../../svgs/youtube-logo-icon';
+import SpotifyIcon from '../../svgs/spotify-logo-icon';
+import ArchiveIcon from '../../svgs/ia-logo-white-icon';
+import BookletIcon from '../../svgs/icon-booklet';
 import { HorizontalRadioGroup, TheatreAudioPlayer, TheatreTrackList } from '../../../index';
 
 /**
diff --git a/packages/ia-components/sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify.stories.js b/packages/ia-components/sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify.stories.js
index a5df9dfb6..3be3d7a6f 100644
--- a/packages/ia-components/sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify.stories.js
+++ b/packages/ia-components/sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify.stories.js
@@ -2,10 +2,10 @@ import React, { Component } from 'react';
 import { storiesOf } from '@storybook/react';
 import axios from 'axios';
 
-import albumData from './utils/data-for-stories/album-private-with-spotify-youtube';
+import albumData from '../../data-for-stories/album-private-with-spotify-youtube';
 import AudioPlayerWithYoutubeSpotify from './audio-with-youtube-spotify-main';
 import style from './audio-with-youtube-spotify.less';
-import styles from './utils/data-for-stories/theatre-styling.less';
+// import styles from '../../../.storybook/theatre-styling.less';
 
 const { itemInfo, jwplayerPlaylist, linerNotes } = albumData;
 
diff --git a/packages/ia-components/sandbox/theatres/with-youtube-spotify/utils/flatten-album-data.test.js b/packages/ia-components/sandbox/theatres/with-youtube-spotify/utils/flatten-album-data.test.js
index 8bdaef274..77c811b33 100644
--- a/packages/ia-components/sandbox/theatres/with-youtube-spotify/utils/flatten-album-data.test.js
+++ b/packages/ia-components/sandbox/theatres/with-youtube-spotify/utils/flatten-album-data.test.js
@@ -1,7 +1,7 @@
 import assert from 'assert';
 
 import flattenAlbumData from './flatten-album-data';
-import albumData from './data-for-stories/album-private-with-spotify-youtube';
+import albumData from '../../../data-for-stories/album-private-with-spotify-youtube';
 
 const { itemInfo } = albumData;
 
diff --git a/packages/ia-components/sandbox/theatres/components/track-list/track-list.jsx b/packages/ia-components/sandbox/track-lists/track-list.jsx
similarity index 96%
rename from packages/ia-components/sandbox/theatres/components/track-list/track-list.jsx
rename to packages/ia-components/sandbox/track-lists/track-list.jsx
index 4968d4047..383b5d7f5 100644
--- a/packages/ia-components/sandbox/theatres/components/track-list/track-list.jsx
+++ b/packages/ia-components/sandbox/track-lists/track-list.jsx
@@ -1,6 +1,6 @@
 import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
-import { FlexboxPagination } from '../../../..';
+import { FlexboxPagination } from '../..';
 
 /**
  * Creates the track title to display based on track object
@@ -125,7 +125,7 @@ TheatreTrackList.defaultProps = {
 TheatreTrackList.propTypes = {
   onSelected: PropTypes.func.isRequired,
   selectedTrack: PropTypes.number.isRequired,
-  tracks: PropTypes.array,
+  tracks: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])),
   displayTrackNumbers: PropTypes.bool,
   creator: PropTypes.string,
 };
diff --git a/packages/ia-components/sandbox/theatres/components/track-list/track-list.less b/packages/ia-components/sandbox/track-lists/track-list.less
similarity index 96%
rename from packages/ia-components/sandbox/theatres/components/track-list/track-list.less
rename to packages/ia-components/sandbox/track-lists/track-list.less
index 883f7c968..3406c4b46 100644
--- a/packages/ia-components/sandbox/theatres/components/track-list/track-list.less
+++ b/packages/ia-components/sandbox/track-lists/track-list.less
@@ -1,11 +1,11 @@
-@import '../../../../variables.less';
+@import '../../variables.less';
 
 .audio-track-list {
   position: relative;
   // split overflow declaration needed for Safari
   overflow-x: hidden;
   overflow-y: auto;
-  
+
   .page-buttons {
     .pagination-button {
       border-color: #fff;
@@ -34,7 +34,7 @@
     &.selected {
       border-color:#00A1DD;
       border-radius: .5rem;
-  
+
       &:focus {
         outline: none;
       }
diff --git a/packages/ia-components/sandbox/theatres/components/track-list/track-list.stories.js b/packages/ia-components/sandbox/track-lists/track-list.stories.js
similarity index 77%
rename from packages/ia-components/sandbox/theatres/components/track-list/track-list.stories.js
rename to packages/ia-components/sandbox/track-lists/track-list.stories.js
index 6c34012d1..53d8af852 100644
--- a/packages/ia-components/sandbox/theatres/components/track-list/track-list.stories.js
+++ b/packages/ia-components/sandbox/track-lists/track-list.stories.js
@@ -1,11 +1,11 @@
-import style from './track-list.less';
 import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { text, number } from '@storybook/addon-knobs';
+import style from './track-list.less';
 import TrackList from './track-list';
 
- storiesOf('Theatres', module)
-  .addWithJSX('Tract List', () => {
+storiesOf('Theatres', module)
+  .addWithJSX('Track List', () => {
     const tracks = [
       {
         source: 'derivative',
@@ -29,11 +29,14 @@ import TrackList from './track-list';
         trackNumber: 1
       }
     ];
-    
-     return <TrackList 
-                selectedTrack={1}
-                tracks={tracks}
-                displayTrackNumbers={true}
-                creator="Willie Nelson"
-                onSelected={()=>{alert('track clicked')}}/>
+
+    return (
+      <TrackList
+        selectedTrack={1}
+        tracks={tracks}
+        displayTrackNumbers
+        creator="Willie Nelson"
+        onSelected={() => { alert('Track clicked'); }}
+      />
+    );
   })
diff --git a/packages/ia-components/sandbox/theatres/components/track-list/track-list.test.js b/packages/ia-components/sandbox/track-lists/track-list.test.js
similarity index 100%
rename from packages/ia-components/sandbox/theatres/components/track-list/track-list.test.js
rename to packages/ia-components/sandbox/track-lists/track-list.test.js