diff --git a/packages/fakeyou/src/jobs/JobStates.ts b/packages/components/src/jobs/JobStates.ts
similarity index 100%
rename from packages/fakeyou/src/jobs/JobStates.ts
rename to packages/components/src/jobs/JobStates.ts
diff --git a/packages/fakeyou/src/jobs/TtsInferenceJobs.ts b/packages/components/src/jobs/TtsInferenceJobs.ts
similarity index 100%
rename from packages/fakeyou/src/jobs/TtsInferenceJobs.ts
rename to packages/components/src/jobs/TtsInferenceJobs.ts
diff --git a/packages/fakeyou/src/jobs/TtsModelUploadJobs.ts b/packages/components/src/jobs/TtsModelUploadJobs.ts
similarity index 100%
rename from packages/fakeyou/src/jobs/TtsModelUploadJobs.ts
rename to packages/components/src/jobs/TtsModelUploadJobs.ts
diff --git a/packages/fakeyou/src/jobs/W2lInferenceJobs.ts b/packages/components/src/jobs/W2lInferenceJobs.ts
similarity index 100%
rename from packages/fakeyou/src/jobs/W2lInferenceJobs.ts
rename to packages/components/src/jobs/W2lInferenceJobs.ts
diff --git a/packages/fakeyou/src/jobs/W2lTemplateUploadJobs.ts b/packages/components/src/jobs/W2lTemplateUploadJobs.ts
similarity index 100%
rename from packages/fakeyou/src/jobs/W2lTemplateUploadJobs.ts
rename to packages/components/src/jobs/W2lTemplateUploadJobs.ts
diff --git a/packages/fakeyou/src/App.tsx b/packages/fakeyou/src/App.tsx
index d6342b4b01..bb906037e6 100644
--- a/packages/fakeyou/src/App.tsx
+++ b/packages/fakeyou/src/App.tsx
@@ -8,11 +8,11 @@ import { NewVocodesContainer } from './v2/view/NewVocodesContainer';
 import { OldVocodesContainer } from './v1/OldVocodesContainer';
 import { SessionStateResponse } from './session/SessionState';
 import { SessionWrapper } from './session/SessionWrapper';
-import { TtsInferenceJob, TtsInferenceJobStateResponsePayload } from './jobs/TtsInferenceJobs';
-import { W2lInferenceJob, W2lInferenceJobStateResponsePayload } from './jobs/W2lInferenceJobs';
-import { TtsModelUploadJob, TtsModelUploadJobStateResponsePayload } from './jobs/TtsModelUploadJobs';
-import { W2lTemplateUploadJob, W2lTemplateUploadJobStateResponsePayload } from './jobs/W2lTemplateUploadJobs';
-import { jobStateCanChange } from './jobs/JobStates';
+import { TtsInferenceJob, TtsInferenceJobStateResponsePayload } from '@storyteller/components/src/jobs/TtsInferenceJobs';
+import { W2lInferenceJob, W2lInferenceJobStateResponsePayload } from '@storyteller/components/src/jobs/W2lInferenceJobs';
+import { TtsModelUploadJob, TtsModelUploadJobStateResponsePayload } from '@storyteller/components/src/jobs/TtsModelUploadJobs';
+import { W2lTemplateUploadJob, W2lTemplateUploadJobStateResponsePayload } from '@storyteller/components/src/jobs/W2lTemplateUploadJobs';
+import { jobStateCanChange } from '@storyteller/components/src/jobs/JobStates';
 import { TtsModelListItem } from './v2/api/tts/ListTtsModels';
 import { TtsCategoryType } from './AppWrapper';
 
diff --git a/packages/fakeyou/src/v2/view/NewVocodesContainer.tsx b/packages/fakeyou/src/v2/view/NewVocodesContainer.tsx
index 997e35ecb3..9e8301457f 100644
--- a/packages/fakeyou/src/v2/view/NewVocodesContainer.tsx
+++ b/packages/fakeyou/src/v2/view/NewVocodesContainer.tsx
@@ -16,7 +16,7 @@ import { TermsFc } from './about/terms_page/TermsFc';
 import { TtsInferenceJob, W2lInferenceJob } from '../../App';
 import { TtsModelDeleteFc } from './tts/tts_model_delete/TtsModelDeleteFc';
 import { TtsModelEditFc } from './tts/tts_model_edit/TtsModelEditFc';
-import { TtsModelUploadJob } from '../../jobs/TtsModelUploadJobs';
+import { TtsModelUploadJob } from '@storyteller/components/src/jobs/TtsModelUploadJobs';
 import { TtsModelViewFc } from './tts/tts_model_view/TtsModelViewFc';
 import { TtsResultDeleteFc } from './tts/tts_result_delete/TtsResultDeleteFc';
 import { TtsResultViewFc } from './tts/tts_result_view/TtsResultViewFc';
@@ -26,7 +26,7 @@ import { UploadW2lPhotoFc } from './upload/UploadW2lPhotoFc';
 import { UploadW2lVideoFc } from './upload/UploadW2lVideoFc';
 import { W2lResultViewFc } from './w2l/w2l_result_view/W2lResultViewFc';
 import { W2lTemplateListFc } from './w2l/w2l_template_list/W2lTemplateListFc';
-import { W2lTemplateUploadJob } from '../../jobs/W2lTemplateUploadJobs';
+import { W2lTemplateUploadJob } from '@storyteller/components/src/jobs/W2lTemplateUploadJobs';
 import { W2lTemplateViewFc } from './w2l/w2l_template_view/W2lTemplateViewFc';
 import { TtsResultEditFc } from './tts/tts_result_edit/TtsResultEditFc';
 import { W2lResultEditFc } from './w2l/w2l_result_edit/W2lResultEditFc';
diff --git a/packages/fakeyou/src/v2/view/_common/SessionTtsInferenceResultsListFc.tsx b/packages/fakeyou/src/v2/view/_common/SessionTtsInferenceResultsListFc.tsx
index 4537c2d342..24299f21a7 100644
--- a/packages/fakeyou/src/v2/view/_common/SessionTtsInferenceResultsListFc.tsx
+++ b/packages/fakeyou/src/v2/view/_common/SessionTtsInferenceResultsListFc.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import { TtsInferenceJob } from '../../../App'
 import { BucketConfig } from '../../../common/BucketConfig';
-import { JobState } from '../../../jobs/JobStates';
+import { JobState } from '@storyteller/components/src/jobs/JobStates';
 
 interface Props {
   ttsInferenceJobs: Array<TtsInferenceJob>,
diff --git a/packages/fakeyou/src/v2/view/_common/SessionTtsModelUploadResultsListFc.tsx b/packages/fakeyou/src/v2/view/_common/SessionTtsModelUploadResultsListFc.tsx
index b7fa94bbac..d43b7b0aa6 100644
--- a/packages/fakeyou/src/v2/view/_common/SessionTtsModelUploadResultsListFc.tsx
+++ b/packages/fakeyou/src/v2/view/_common/SessionTtsModelUploadResultsListFc.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link, } from 'react-router-dom';
-import { JobState } from '../../../jobs/JobStates';
-import { TtsModelUploadJob } from '../../../jobs/TtsModelUploadJobs';
+import { JobState } from '@storyteller/components/src/jobs/JobStates';
+import { TtsModelUploadJob } from '@storyteller/components/src/jobs/TtsModelUploadJobs';
 
 interface Props {
   modelUploadJobs: Array<TtsModelUploadJob>,
diff --git a/packages/fakeyou/src/v2/view/_common/SessionW2lInferenceResultsListFc.tsx b/packages/fakeyou/src/v2/view/_common/SessionW2lInferenceResultsListFc.tsx
index 7ca593ca99..e611e27529 100644
--- a/packages/fakeyou/src/v2/view/_common/SessionW2lInferenceResultsListFc.tsx
+++ b/packages/fakeyou/src/v2/view/_common/SessionW2lInferenceResultsListFc.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 import { W2lInferenceJob } from '../../../App'
-import { JobState } from '../../../jobs/JobStates';
+import { JobState } from '@storyteller/components/src/jobs/JobStates';
 
 interface Props {
   w2lInferenceJobs: Array<W2lInferenceJob>,
diff --git a/packages/fakeyou/src/v2/view/_common/SessionW2lTemplateUploadResultsListFc.tsx b/packages/fakeyou/src/v2/view/_common/SessionW2lTemplateUploadResultsListFc.tsx
index 355f365063..555ab51d3e 100644
--- a/packages/fakeyou/src/v2/view/_common/SessionW2lTemplateUploadResultsListFc.tsx
+++ b/packages/fakeyou/src/v2/view/_common/SessionW2lTemplateUploadResultsListFc.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link, } from 'react-router-dom';
-import { JobState } from '../../../jobs/JobStates';
-import { W2lTemplateUploadJob } from '../../../jobs/W2lTemplateUploadJobs';
+import { JobState } from '@storyteller/components/src/jobs/JobStates';
+import { W2lTemplateUploadJob } from '@storyteller/components/src/jobs/W2lTemplateUploadJobs';
 
 interface Props {
   w2lTemplateUploadJobs: Array<W2lTemplateUploadJob>,
diff --git a/packages/fakeyou/src/v2/view/tts/tts_model_edit/TtsModelEditFc.tsx b/packages/fakeyou/src/v2/view/tts/tts_model_edit/TtsModelEditFc.tsx
index f1b5bd6af1..1e7cab3611 100644
--- a/packages/fakeyou/src/v2/view/tts/tts_model_edit/TtsModelEditFc.tsx
+++ b/packages/fakeyou/src/v2/view/tts/tts_model_edit/TtsModelEditFc.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { ApiConfig } from '@storyteller/components';
 import { SessionWrapper } from '../../../../session/SessionWrapper';
-import { TtsInferenceJob } from '../../../../jobs/TtsInferenceJobs';
+import { TtsInferenceJob } from '@storyteller/components/src/jobs/TtsInferenceJobs';
 import { useParams, useHistory } from 'react-router-dom';
 import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig';
 import { VisibleIconFc } from '../../_icons/VisibleIcon';
diff --git a/packages/fakeyou/src/v2/view/tts/tts_model_list/TtsModelListFc.tsx b/packages/fakeyou/src/v2/view/tts/tts_model_list/TtsModelListFc.tsx
index 36d1d5ed84..08e5b602b0 100644
--- a/packages/fakeyou/src/v2/view/tts/tts_model_list/TtsModelListFc.tsx
+++ b/packages/fakeyou/src/v2/view/tts/tts_model_list/TtsModelListFc.tsx
@@ -6,10 +6,10 @@ import { SessionTtsModelUploadResultListFc } from '../../_common/SessionTtsModel
 import { SessionW2lInferenceResultListFc } from '../../_common/SessionW2lInferenceResultsListFc';
 import { SessionW2lTemplateUploadResultListFc } from '../../_common/SessionW2lTemplateUploadResultsListFc';
 import { SessionWrapper } from '../../../../session/SessionWrapper';
-import { TtsInferenceJob } from '../../../../jobs/TtsInferenceJobs';
-import { TtsModelUploadJob } from '../../../../jobs/TtsModelUploadJobs';
-import { W2lInferenceJob } from '../../../../jobs/W2lInferenceJobs';
-import { W2lTemplateUploadJob } from '../../../../jobs/W2lTemplateUploadJobs';
+import { TtsInferenceJob } from '@storyteller/components/src/jobs/TtsInferenceJobs';
+import { TtsModelUploadJob } from '@storyteller/components/src/jobs/TtsModelUploadJobs';
+import { W2lInferenceJob } from '@storyteller/components/src/jobs/W2lInferenceJobs';
+import { W2lTemplateUploadJob } from '@storyteller/components/src/jobs/W2lTemplateUploadJobs';
 import { v4 as uuidv4 } from 'uuid';
 import { ListTtsModels, TtsModelListItem } from '../../../api/tts/ListTtsModels';
 import { GravatarFc } from '../../_common/GravatarFc';
diff --git a/packages/fakeyou/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx b/packages/fakeyou/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx
index b908d8aaad..a4ad0231df 100644
--- a/packages/fakeyou/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx
+++ b/packages/fakeyou/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx
@@ -3,7 +3,7 @@ import { ApiConfig } from '@storyteller/components';
 import { EnqueueJobResponsePayload } from '../tts_model_list/TtsModelListFc';
 import { SessionTtsInferenceResultListFc } from '../../_common/SessionTtsInferenceResultsListFc';
 import { SessionWrapper } from '../../../../session/SessionWrapper';
-import { TtsInferenceJob } from '../../../../jobs/TtsInferenceJobs';
+import { TtsInferenceJob } from '@storyteller/components/src/jobs/TtsInferenceJobs';
 import { useParams, Link } from 'react-router-dom';
 import { v4 as uuidv4 } from 'uuid';
 import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig';
diff --git a/packages/fakeyou/src/v2/view/upload/UploadComponent.tsx b/packages/fakeyou/src/v2/view/upload/UploadComponent.tsx
index ea8e7bcb82..5433674c9e 100644
--- a/packages/fakeyou/src/v2/view/upload/UploadComponent.tsx
+++ b/packages/fakeyou/src/v2/view/upload/UploadComponent.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import { ApiConfig } from '@storyteller/components';
 import { SessionWrapper } from '../../../session/SessionWrapper';
-import { TtsModelUploadJob } from '../../../jobs/TtsModelUploadJobs';
-import { W2lTemplateUploadJob } from '../../../jobs/W2lTemplateUploadJobs';
+import { TtsModelUploadJob } from '@storyteller/components/src/jobs/TtsModelUploadJobs';
+import { W2lTemplateUploadJob } from '@storyteller/components/src/jobs/W2lTemplateUploadJobs';
 import { v4 } from 'uuid';
 
 enum UploadType {
diff --git a/packages/fakeyou/src/v2/view/upload/UploadTtsModelFc.tsx b/packages/fakeyou/src/v2/view/upload/UploadTtsModelFc.tsx
index c92618d39c..8cecd5d905 100644
--- a/packages/fakeyou/src/v2/view/upload/UploadTtsModelFc.tsx
+++ b/packages/fakeyou/src/v2/view/upload/UploadTtsModelFc.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { ApiConfig } from '@storyteller/components';
 import { SessionTtsModelUploadResultListFc } from '../_common/SessionTtsModelUploadResultsListFc';
 import { SessionWrapper } from '../../../session/SessionWrapper';
-import { TtsModelUploadJob } from '../../../jobs/TtsModelUploadJobs';
+import { TtsModelUploadJob } from '@storyteller/components/src/jobs/TtsModelUploadJobs';
 import { useHistory } from "react-router-dom";
 import { v4 as uuidv4 } from 'uuid';
 import { DiscordLink } from '../_common/DiscordLink';
diff --git a/packages/fakeyou/src/v2/view/upload/UploadW2lPhotoFc.tsx b/packages/fakeyou/src/v2/view/upload/UploadW2lPhotoFc.tsx
index 48f0379696..1514d76015 100644
--- a/packages/fakeyou/src/v2/view/upload/UploadW2lPhotoFc.tsx
+++ b/packages/fakeyou/src/v2/view/upload/UploadW2lPhotoFc.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { ApiConfig } from '@storyteller/components';
 import { SessionWrapper } from '../../../session/SessionWrapper';
-import { W2lTemplateUploadJob } from '../../../jobs/W2lTemplateUploadJobs';
+import { W2lTemplateUploadJob } from '@storyteller/components/src/jobs/W2lTemplateUploadJobs';
 import { useHistory } from "react-router-dom";
 import { v4 as uuidv4 } from 'uuid';
 import { SessionW2lTemplateUploadResultListFc } from '../_common/SessionW2lTemplateUploadResultsListFc';
diff --git a/packages/fakeyou/src/v2/view/upload/UploadW2lVideoFc.tsx b/packages/fakeyou/src/v2/view/upload/UploadW2lVideoFc.tsx
index 4510478379..9b9613ad1b 100644
--- a/packages/fakeyou/src/v2/view/upload/UploadW2lVideoFc.tsx
+++ b/packages/fakeyou/src/v2/view/upload/UploadW2lVideoFc.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { ApiConfig } from '@storyteller/components';
 import { SessionW2lTemplateUploadResultListFc } from '../_common/SessionW2lTemplateUploadResultsListFc';
 import { SessionWrapper } from '../../../session/SessionWrapper';
-import { W2lTemplateUploadJob } from '../../../jobs/W2lTemplateUploadJobs';
+import { W2lTemplateUploadJob } from '@storyteller/components/src/jobs/W2lTemplateUploadJobs';
 import { useHistory } from "react-router-dom";
 import { v4 as uuidv4 } from 'uuid';
 import { BackLink } from '../_common/BackLink';
diff --git a/packages/storyteller/src/layout/TopNav.tsx b/packages/storyteller/src/layout/TopNav.tsx
index 36968a1ce9..9828ca7ad4 100644
--- a/packages/storyteller/src/layout/TopNav.tsx
+++ b/packages/storyteller/src/layout/TopNav.tsx
@@ -1,5 +1,3 @@
-import { faUpload } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import React, { useState } from 'react';
 import { Link } from 'react-router-dom';