diff --git a/vocodes/src/v2/NewVocodesContainer.tsx b/vocodes/src/v2/NewVocodesContainer.tsx
index 876f60b4af..3389f75ca4 100644
--- a/vocodes/src/v2/NewVocodesContainer.tsx
+++ b/vocodes/src/v2/NewVocodesContainer.tsx
@@ -5,25 +5,25 @@ import { ModerationFc } from './moderation/moderation_main/ModerationFc';
 import { ModerationIpBanListFc } from './moderation/moderation_ip_ban_list/ModerationIpBanListFc';
 import { NewFooterNavFc } from './NewFooterNavFc';
 import { NewTopNavFc } from './NewTopNavFc';
-import { ProfileEditFc } from './profile_edit/ProfileEditFc';
-import { ProfileFc } from './profile/ProfileFc';
+import { ProfileEditFc } from './profile/profile_edit/ProfileEditFc';
+import { ProfileFc } from './profile/profile_view/ProfileFc';
 import { SessionWrapper } from '../session/SessionWrapper';
 import { SignupComponent } from './signup/SignupComponent';
 import { Switch, Route, RouteProps } from 'react-router-dom';
 import { TtsInferenceJob, W2lInferenceJob } from '../App';
-import { TtsModelFormFc } from './tts_model_list/TtsModelFormFc';
-import { TtsModelListComponent } from './tts_model_list/TtsModelListComponent';
+import { TtsModelFormFc } from './tts/tts_model_list/TtsModelFormFc';
+import { TtsModelListComponent } from './tts/tts_model_list/TtsModelListComponent';
 import { TtsModelUploadJob } from '../jobs/TtsModelUploadJobs';
-import { TtsModelViewFc } from './tts_model_view/TtsModelViewFc';
-import { TtsResultViewFc } from './tts_result_view/TtsResultViewFc';
+import { TtsModelViewFc } from './tts/tts_model_view/TtsModelViewFc';
+import { TtsResultViewFc } from './tts/tts_result_view/TtsResultViewFc';
 import { UploadChoiceFc } from './upload/UploadChoiceFc';
 import { UploadTtsModelFc } from './upload/UploadTtsModelFc';
 import { UploadW2lPhotoFc } from './upload/UploadW2lPhotoFc';
 import { UploadW2lVideoFc } from './upload/UploadW2lVideoFc';
-import { W2lResultViewFc } from './w2l_result_view/W2lResultViewFc';
-import { W2lTemplateListFc } from './w2l_template_list/W2lTemplateListFc';
+import { W2lResultViewFc } from './w2l/w2l_result_view/W2lResultViewFc';
+import { W2lTemplateListFc } from './w2l/w2l_template_list/W2lTemplateListFc';
 import { W2lTemplateUploadJob } from '../jobs/W2lTemplateUploadJobs';
-import { W2lTemplateViewFc } from './w2l_template_view/W2lTemplateViewFc';
+import { W2lTemplateViewFc } from './w2l/w2l_template_view/W2lTemplateViewFc';
 import { ModerationViewIpBanFc } from './moderation/moderation_view_ip_ban/ModerationViewIpBanFc';
 
 interface Props {
diff --git a/vocodes/src/v2/profile_edit/ProfileEditFc.tsx b/vocodes/src/v2/profile/profile_edit/ProfileEditFc.tsx
similarity index 98%
rename from vocodes/src/v2/profile_edit/ProfileEditFc.tsx
rename to vocodes/src/v2/profile/profile_edit/ProfileEditFc.tsx
index f747aaaa71..5c2910156c 100644
--- a/vocodes/src/v2/profile_edit/ProfileEditFc.tsx
+++ b/vocodes/src/v2/profile/profile_edit/ProfileEditFc.tsx
@@ -1,8 +1,8 @@
 import React, { useEffect, useState }  from 'react';
-import { ApiConfig } from '../../common/ApiConfig';
-import { GravatarFc } from '../common/GravatarFc';
+import { ApiConfig } from '../../../common/ApiConfig';
+import { GravatarFc } from '../../common/GravatarFc';
 import { Link, useHistory } from 'react-router-dom';
-import { SessionWrapper } from '../../session/SessionWrapper';
+import { SessionWrapper } from '../../../session/SessionWrapper';
 import { useParams } from 'react-router-dom';
 
 interface Props {
diff --git a/vocodes/src/v2/profile/ProfileFc.tsx b/vocodes/src/v2/profile/profile_view/ProfileFc.tsx
similarity index 96%
rename from vocodes/src/v2/profile/ProfileFc.tsx
rename to vocodes/src/v2/profile/profile_view/ProfileFc.tsx
index 0971c70a83..e30e574257 100644
--- a/vocodes/src/v2/profile/ProfileFc.tsx
+++ b/vocodes/src/v2/profile/profile_view/ProfileFc.tsx
@@ -1,12 +1,12 @@
 import React, { useEffect, useState }  from 'react';
-import { ApiConfig } from '../../common/ApiConfig';
-import { GravatarFc } from '../common/GravatarFc';
+import { ApiConfig } from '../../../common/ApiConfig';
+import { GravatarFc } from '../../common/GravatarFc';
 import { Link } from 'react-router-dom';
 import { ProfileTtsInferenceResultsListFc } from './Profile_TtsInferenceResultListFc';
 import { ProfileTtsModelListFc } from './Profile_TtsModelListFc';
 import { ProfileW2lInferenceResultsListFc } from './Profile_W2lInferenceResultListFc';
 import { ProfileW2lTemplateListFc } from './Profile_W2lTemplateListFc';
-import { SessionWrapper } from '../../session/SessionWrapper';
+import { SessionWrapper } from '../../../session/SessionWrapper';
 import { useParams } from 'react-router-dom';
 
 interface Props {
diff --git a/vocodes/src/v2/profile/Profile_TtsInferenceResultListFc.tsx b/vocodes/src/v2/profile/profile_view/Profile_TtsInferenceResultListFc.tsx
similarity index 99%
rename from vocodes/src/v2/profile/Profile_TtsInferenceResultListFc.tsx
rename to vocodes/src/v2/profile/profile_view/Profile_TtsInferenceResultListFc.tsx
index 7da695eb82..46828279a0 100644
--- a/vocodes/src/v2/profile/Profile_TtsInferenceResultListFc.tsx
+++ b/vocodes/src/v2/profile/profile_view/Profile_TtsInferenceResultListFc.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useCallback } from 'react';
-import { ApiConfig, ListTtsInferenceResultsForUserArgs } from '../../common/ApiConfig';
+import { ApiConfig, ListTtsInferenceResultsForUserArgs } from '../../../common/ApiConfig';
 import { Link } from 'react-router-dom';
 import { formatDistance } from 'date-fns';
 
diff --git a/vocodes/src/v2/profile/Profile_TtsModelListFc.tsx b/vocodes/src/v2/profile/profile_view/Profile_TtsModelListFc.tsx
similarity index 97%
rename from vocodes/src/v2/profile/Profile_TtsModelListFc.tsx
rename to vocodes/src/v2/profile/profile_view/Profile_TtsModelListFc.tsx
index 437dc4eddb..715beabe23 100644
--- a/vocodes/src/v2/profile/Profile_TtsModelListFc.tsx
+++ b/vocodes/src/v2/profile/profile_view/Profile_TtsModelListFc.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { ApiConfig } from '../../common/ApiConfig';
+import { ApiConfig } from '../../../common/ApiConfig';
 import { Link } from 'react-router-dom';
 import { formatDistance } from 'date-fns';
 
diff --git a/vocodes/src/v2/profile/Profile_W2lInferenceResultListFc.tsx b/vocodes/src/v2/profile/profile_view/Profile_W2lInferenceResultListFc.tsx
similarity index 99%
rename from vocodes/src/v2/profile/Profile_W2lInferenceResultListFc.tsx
rename to vocodes/src/v2/profile/profile_view/Profile_W2lInferenceResultListFc.tsx
index 39b9e24499..9df20398ff 100644
--- a/vocodes/src/v2/profile/Profile_W2lInferenceResultListFc.tsx
+++ b/vocodes/src/v2/profile/profile_view/Profile_W2lInferenceResultListFc.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useCallback } from 'react';
-import { ApiConfig, ListW2lInferenceResultsForUserArgs } from '../../common/ApiConfig';
+import { ApiConfig, ListW2lInferenceResultsForUserArgs } from '../../../common/ApiConfig';
 import { Link } from 'react-router-dom';
 import { formatDistance } from 'date-fns'
 
diff --git a/vocodes/src/v2/profile/Profile_W2lTemplateListFc.tsx b/vocodes/src/v2/profile/profile_view/Profile_W2lTemplateListFc.tsx
similarity index 96%
rename from vocodes/src/v2/profile/Profile_W2lTemplateListFc.tsx
rename to vocodes/src/v2/profile/profile_view/Profile_W2lTemplateListFc.tsx
index e4dbb5abde..6f7ad81a67 100644
--- a/vocodes/src/v2/profile/Profile_W2lTemplateListFc.tsx
+++ b/vocodes/src/v2/profile/profile_view/Profile_W2lTemplateListFc.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
-import { ApiConfig } from '../../common/ApiConfig';
+import { ApiConfig } from '../../../common/ApiConfig';
 import { Link } from "react-router-dom";
-import { getRandomInt } from '../../v1/api/Utils';
+import { getRandomInt } from '../../../v1/api/Utils';
 
 interface W2lTemplateListResponsePayload {
   success: boolean,
diff --git a/vocodes/src/v2/tts_model_list/TtsModelFormFc.tsx b/vocodes/src/v2/tts/tts_model_list/TtsModelFormFc.tsx
similarity index 89%
rename from vocodes/src/v2/tts_model_list/TtsModelFormFc.tsx
rename to vocodes/src/v2/tts/tts_model_list/TtsModelFormFc.tsx
index dc57488d04..38070eb98c 100644
--- a/vocodes/src/v2/tts_model_list/TtsModelFormFc.tsx
+++ b/vocodes/src/v2/tts/tts_model_list/TtsModelFormFc.tsx
@@ -1,15 +1,15 @@
 import React, { useState, useEffect } from 'react';
-import { ApiConfig } from '../../common/ApiConfig';
+import { ApiConfig } from '../../../common/ApiConfig';
 import { Link } from 'react-router-dom';
-import { SessionTtsInferenceResultListFc } from '../common/SessionTtsInferenceResultsListFc';
-import { SessionTtsModelUploadResultListFc } from '../common/SessionTtsModelUploadResultsListFc';
-import { SessionW2lInferenceResultListFc } from '../common/SessionW2lInferenceResultsListFc';
-import { SessionW2lTemplateUploadResultListFc } from '../common/SessionW2lTemplateUploadResultsListFc';
-import { SessionWrapper } from '../../session/SessionWrapper';
-import { TtsInferenceJob } from '../../App';
-import { TtsModelUploadJob } from '../../jobs/TtsModelUploadJobs';
-import { W2lInferenceJob } from '../../jobs/W2lInferenceJobs';
-import { W2lTemplateUploadJob } from '../../jobs/W2lTemplateUploadJobs';
+import { SessionTtsInferenceResultListFc } from '../../common/SessionTtsInferenceResultsListFc';
+import { SessionTtsModelUploadResultListFc } from '../../common/SessionTtsModelUploadResultsListFc';
+import { SessionW2lInferenceResultListFc } from '../../common/SessionW2lInferenceResultsListFc';
+import { SessionW2lTemplateUploadResultListFc } from '../../common/SessionW2lTemplateUploadResultsListFc';
+import { SessionWrapper } from '../../../session/SessionWrapper';
+import { TtsInferenceJob } from '../../../App';
+import { TtsModelUploadJob } from '../../../jobs/TtsModelUploadJobs';
+import { W2lInferenceJob } from '../../../jobs/W2lInferenceJobs';
+import { W2lTemplateUploadJob } from '../../../jobs/W2lTemplateUploadJobs';
 import { v1 as uuidv1 } from 'uuid';
 
 interface TtsModelListResponsePayload {
diff --git a/vocodes/src/v2/tts_model_list/TtsModelListComponent.tsx b/vocodes/src/v2/tts/tts_model_list/TtsModelListComponent.tsx
similarity index 96%
rename from vocodes/src/v2/tts_model_list/TtsModelListComponent.tsx
rename to vocodes/src/v2/tts/tts_model_list/TtsModelListComponent.tsx
index b9e95defef..0dd173aadf 100644
--- a/vocodes/src/v2/tts_model_list/TtsModelListComponent.tsx
+++ b/vocodes/src/v2/tts/tts_model_list/TtsModelListComponent.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import { ApiConfig } from '../../common/ApiConfig';
-import { Mode } from '../../AppMode';
-import { SessionWrapper } from '../../session/SessionWrapper';
+import { ApiConfig } from '../../../common/ApiConfig';
+import { Mode } from '../../../AppMode';
+import { SessionWrapper } from '../../../session/SessionWrapper';
 
 enum FieldTriState {
   EMPTY_FALSE,
diff --git a/vocodes/src/v2/tts_model_view/TtsModelViewComponent.tsx b/vocodes/src/v2/tts/tts_model_view/TtsModelViewComponent.tsx
similarity index 96%
rename from vocodes/src/v2/tts_model_view/TtsModelViewComponent.tsx
rename to vocodes/src/v2/tts/tts_model_view/TtsModelViewComponent.tsx
index 641aa18e7f..57765d97dd 100644
--- a/vocodes/src/v2/tts_model_view/TtsModelViewComponent.tsx
+++ b/vocodes/src/v2/tts/tts_model_view/TtsModelViewComponent.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import { ApiConfig } from '../../common/ApiConfig';
-import { Mode } from '../../AppMode';
-import { SessionWrapper } from '../../session/SessionWrapper';
+import { ApiConfig } from '../../../common/ApiConfig';
+import { Mode } from '../../../AppMode';
+import { SessionWrapper } from '../../../session/SessionWrapper';
 
 enum FieldTriState {
   EMPTY_FALSE,
diff --git a/vocodes/src/v2/tts_model_view/TtsModelViewFc.tsx b/vocodes/src/v2/tts/tts_model_view/TtsModelViewFc.tsx
similarity index 95%
rename from vocodes/src/v2/tts_model_view/TtsModelViewFc.tsx
rename to vocodes/src/v2/tts/tts_model_view/TtsModelViewFc.tsx
index 9eb2a548f5..70949e7d26 100644
--- a/vocodes/src/v2/tts_model_view/TtsModelViewFc.tsx
+++ b/vocodes/src/v2/tts/tts_model_view/TtsModelViewFc.tsx
@@ -1,11 +1,11 @@
 
 import React, { useState, useEffect, useCallback } from 'react';
 //import axios from 'axios';
-import { ApiConfig } from '../../common/ApiConfig';
+import { ApiConfig } from '../../../common/ApiConfig';
 import { EnqueueJobResponsePayload } from '../tts_model_list/TtsModelFormFc';
-import { SessionTtsInferenceResultListFc } from '../common/SessionTtsInferenceResultsListFc';
-import { SessionWrapper } from '../../session/SessionWrapper';
-import { TtsInferenceJob } from '../../App';
+import { SessionTtsInferenceResultListFc } from '../../common/SessionTtsInferenceResultsListFc';
+import { SessionWrapper } from '../../../session/SessionWrapper';
+import { TtsInferenceJob } from '../../../App';
 import { useParams, Link } from 'react-router-dom';
 import { v1 as uuidv1 } from 'uuid';
 
diff --git a/vocodes/src/v2/tts_result_view/SpectrogramFc.tsx b/vocodes/src/v2/tts/tts_result_view/SpectrogramFc.tsx
similarity index 97%
rename from vocodes/src/v2/tts_result_view/SpectrogramFc.tsx
rename to vocodes/src/v2/tts/tts_result_view/SpectrogramFc.tsx
index 177c01d51c..54000dcf5d 100644
--- a/vocodes/src/v2/tts_result_view/SpectrogramFc.tsx
+++ b/vocodes/src/v2/tts/tts_result_view/SpectrogramFc.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useRef }  from 'react';
 import { VIRIDIS, MAGMA } from "@colormap/presets";
 import { createColorMap, linearScale } from "@colormap/core";
-import { getRandomArrayValue } from "../../v1/api/Utils";
+import { getRandomArrayValue } from "../../../v1/api/Utils";
 
 interface Props {
   spectrogramJsonLink: string  
diff --git a/vocodes/src/v2/tts_result_view/TtsResultViewFc.tsx b/vocodes/src/v2/tts/tts_result_view/TtsResultViewFc.tsx
similarity index 96%
rename from vocodes/src/v2/tts_result_view/TtsResultViewFc.tsx
rename to vocodes/src/v2/tts/tts_result_view/TtsResultViewFc.tsx
index fc2e4b5973..43085d21c6 100644
--- a/vocodes/src/v2/tts_result_view/TtsResultViewFc.tsx
+++ b/vocodes/src/v2/tts/tts_result_view/TtsResultViewFc.tsx
@@ -1,8 +1,8 @@
 import React, { useState, useEffect } from 'react';
-import { ApiConfig } from '../../common/ApiConfig';
-import { SessionWrapper } from '../../session/SessionWrapper';
+import { ApiConfig } from '../../../common/ApiConfig';
+import { SessionWrapper } from '../../../session/SessionWrapper';
 import { useParams, Link } from 'react-router-dom';
-import { GravatarFc } from '../common/GravatarFc';
+import { GravatarFc } from '../../common/GravatarFc';
 import { SpectrogramFc } from './SpectrogramFc';
 
 interface TtsInferenceResultResponsePayload {
diff --git a/vocodes/src/v2/w2l_result_view/W2lResultViewFc.tsx b/vocodes/src/v2/w2l/w2l_result_view/W2lResultViewFc.tsx
similarity index 94%
rename from vocodes/src/v2/w2l_result_view/W2lResultViewFc.tsx
rename to vocodes/src/v2/w2l/w2l_result_view/W2lResultViewFc.tsx
index 5ab38db2ba..c7b60c5ec7 100644
--- a/vocodes/src/v2/w2l_result_view/W2lResultViewFc.tsx
+++ b/vocodes/src/v2/w2l/w2l_result_view/W2lResultViewFc.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
-import { ApiConfig } from '../../common/ApiConfig';
-import { GravatarFc } from '../common/GravatarFc';
-import { SessionWrapper } from '../../session/SessionWrapper';
+import { ApiConfig } from '../../../common/ApiConfig';
+import { GravatarFc } from '../../common/GravatarFc';
+import { SessionWrapper } from '../../../session/SessionWrapper';
 import { useParams, Link } from 'react-router-dom';
 
 interface W2lInferenceResultResponsePayload {
@@ -40,7 +40,7 @@ interface Props {
 }
 
 function W2lResultViewFc(props: Props) {
-  let { token } = useParams();
+  let { token } = useParams() as { token : string };
 
   const [w2lInferenceResult, setW2lInferenceResult] = useState<W2lInferenceResult|undefined>(undefined);
 
@@ -92,8 +92,8 @@ function W2lResultViewFc(props: Props) {
       <span>
         <GravatarFc 
           size={15}
-          username={w2lInferenceResult.maybe_creator_display_name} 
-          email_hash={w2lInferenceResult.maybe_creator_gravatar_hash} 
+          username={w2lInferenceResult.maybe_creator_display_name || ""} 
+          email_hash={w2lInferenceResult.maybe_creator_gravatar_hash || ""} 
           />
         &nbsp;
         <Link to={creatorLink}>{w2lInferenceResult.maybe_creator_display_name}</Link>
@@ -108,8 +108,8 @@ function W2lResultViewFc(props: Props) {
       <span>
         <GravatarFc 
           size={15}
-          username={w2lInferenceResult.maybe_template_creator_display_name} 
-          email_hash={w2lInferenceResult.maybe_template_creator_gravatar_hash} 
+          username={w2lInferenceResult.maybe_template_creator_display_name || ""} 
+          email_hash={w2lInferenceResult.maybe_template_creator_gravatar_hash || ""} 
           />
         &nbsp;
         <Link to={templateCreatorLink}>{w2lInferenceResult.maybe_template_creator_display_name}</Link>
diff --git a/vocodes/src/v2/w2l_template_list/W2lTemplateListFc.tsx b/vocodes/src/v2/w2l/w2l_template_list/W2lTemplateListFc.tsx
similarity index 96%
rename from vocodes/src/v2/w2l_template_list/W2lTemplateListFc.tsx
rename to vocodes/src/v2/w2l/w2l_template_list/W2lTemplateListFc.tsx
index 707bed32f8..8b4cd279b8 100644
--- a/vocodes/src/v2/w2l_template_list/W2lTemplateListFc.tsx
+++ b/vocodes/src/v2/w2l/w2l_template_list/W2lTemplateListFc.tsx
@@ -1,8 +1,8 @@
 import React, { useState, useEffect } from 'react';
-import { ApiConfig } from '../../common/ApiConfig';
-import { SessionWrapper } from '../../session/SessionWrapper';
+import { ApiConfig } from '../../../common/ApiConfig';
+import { SessionWrapper } from '../../../session/SessionWrapper';
 import { Link } from "react-router-dom";
-import { getRandomInt } from '../../v1/api/Utils';
+import { getRandomInt } from '../../../v1/api/Utils';
 
 interface W2lTemplateListResponsePayload {
   success: boolean,
diff --git a/vocodes/src/v2/w2l_template_view/W2lTemplateViewFc.tsx b/vocodes/src/v2/w2l/w2l_template_view/W2lTemplateViewFc.tsx
similarity index 97%
rename from vocodes/src/v2/w2l_template_view/W2lTemplateViewFc.tsx
rename to vocodes/src/v2/w2l/w2l_template_view/W2lTemplateViewFc.tsx
index 54b33a6ed7..69747a8859 100644
--- a/vocodes/src/v2/w2l_template_view/W2lTemplateViewFc.tsx
+++ b/vocodes/src/v2/w2l/w2l_template_view/W2lTemplateViewFc.tsx
@@ -1,11 +1,11 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import axios from 'axios';
-import { ApiConfig } from '../../common/ApiConfig';
-import { SessionWrapper } from '../../session/SessionWrapper';
-import { W2lInferenceJob } from '../../App';
+import { ApiConfig } from '../../../common/ApiConfig';
+import { SessionWrapper } from '../../../session/SessionWrapper';
+import { W2lInferenceJob } from '../../../App';
 import { useParams, Link, useHistory } from 'react-router-dom';
 import { v1 as uuidv1 } from 'uuid';
-import { SessionW2lInferenceResultListFc } from '../common/SessionW2lInferenceResultsListFc';
+import { SessionW2lInferenceResultListFc } from '../../common/SessionW2lInferenceResultsListFc';
 import { W2lTemplateViewDeleteFc } from './W2lTemplateView_DeleteFc';
 
 interface W2lTemplateViewResponsePayload {
diff --git a/vocodes/src/v2/w2l_template_view/W2lTemplateView_DeleteFc.tsx b/vocodes/src/v2/w2l/w2l_template_view/W2lTemplateView_DeleteFc.tsx
similarity index 93%
rename from vocodes/src/v2/w2l_template_view/W2lTemplateView_DeleteFc.tsx
rename to vocodes/src/v2/w2l/w2l_template_view/W2lTemplateView_DeleteFc.tsx
index dafb356d7a..8a04a853cc 100644
--- a/vocodes/src/v2/w2l_template_view/W2lTemplateView_DeleteFc.tsx
+++ b/vocodes/src/v2/w2l/w2l_template_view/W2lTemplateView_DeleteFc.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { ApiConfig } from '../../common/ApiConfig';
-import { SessionWrapper } from '../../session/SessionWrapper';
+import { ApiConfig } from '../../../common/ApiConfig';
+import { SessionWrapper } from '../../../session/SessionWrapper';
 import { useHistory } from 'react-router-dom';
 
 interface Props {