MASSIVE view directory refactor

vocodes/src/App.tsx

@@ -5,7 +5,7 @@ import React from 'react';
 import { ApiConfig } from './common/ApiConfig';
 import { BrowserRouter, Route, Switch } from "react-router-dom";
 import { MigrationTopNav } from './migration/MigrationTopNav';
-import { NewVocodesContainer } from './v2/NewVocodesContainer';
+import { NewVocodesContainer } from './v2/view/NewVocodesContainer';
 import { OldVocodesContainer } from './v1/OldVocodesContainer';
 import { SessionStateResponse } from './session/SessionState';
 import { SessionWrapper } from './session/SessionWrapper';

vocodes/src/v2/view/NewFooterNavFc.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { SessionWrapper } from '../session/SessionWrapper';
+import { SessionWrapper } from '../../session/SessionWrapper';
 import { Link } from 'react-router-dom';
 
 import './_css/footer.scss'

vocodes/src/v2/view/NewTopNavFc.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { SessionWrapper } from '../session/SessionWrapper';
+import { SessionWrapper } from '../../session/SessionWrapper';
 import { Link } from 'react-router-dom';
 
 interface Props {

vocodes/src/v2/view/NewVocodesContainer.tsx

@@ -9,16 +9,16 @@ import { NewFooterNavFc } from './NewFooterNavFc';
 import { NewTopNavFc } from './NewTopNavFc';
 import { ProfileEditFc } from './profile/profile_edit/ProfileEditFc';
 import { ProfileFc } from './profile/profile_view/ProfileFc';
-import { SessionWrapper } from '../session/SessionWrapper';
+import { SessionWrapper } from '../../session/SessionWrapper';
 import { SignupComponent } from './signup/SignupComponent';
 import { Switch, Route } from 'react-router-dom';
 import { TermsFc } from './about/terms_page/TermsFc';
-import { TtsInferenceJob, W2lInferenceJob } from '../App';
+import { TtsInferenceJob, W2lInferenceJob } from '../../App';
 import { TtsModelDeleteFc } from './tts/tts_model_delete/TtsModelDeleteFc';
 import { TtsModelEditFc } from './tts/tts_model_edit/TtsModelEditFc';
 import { TtsModelFormFc } from './tts/tts_model_list/TtsModelFormFc';
 import { TtsModelListComponent } from './tts/tts_model_list/TtsModelListComponent';
-import { TtsModelUploadJob } from '../jobs/TtsModelUploadJobs';
+import { TtsModelUploadJob } from '../../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';
@@ -28,7 +28,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 '../../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';

vocodes/src/v2/view/_common/SessionTtsInferenceResultsListFc.tsx

@@ -1,8 +1,8 @@
 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 { TtsInferenceJob } from '../../../App'
+import { BucketConfig } from '../../../common/BucketConfig';
+import { JobState } from '../../../jobs/JobStates';
 
 interface Props {
   ttsInferenceJobs: Array<TtsInferenceJob>,

vocodes/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 '../../../jobs/JobStates';
+import { TtsModelUploadJob } from '../../../jobs/TtsModelUploadJobs';
 
 interface Props {
   modelUploadJobs: Array<TtsModelUploadJob>,

vocodes/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 { W2lInferenceJob } from '../../../App'
+import { JobState } from '../../../jobs/JobStates';
 
 interface Props {
   w2lInferenceJobs: Array<W2lInferenceJob>,

vocodes/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 '../../../jobs/JobStates';
+import { W2lTemplateUploadJob } from '../../../jobs/W2lTemplateUploadJobs';
 
 interface Props {
   w2lTemplateUploadJobs: Array<W2lTemplateUploadJob>,

vocodes/src/v2/view/about/about_page/AboutFc.tsx

@@ -1,4 +1,3 @@
-
 import React from 'react';
 
 interface Props {

vocodes/src/v2/view/firehose/FirehoseEventListFc.tsx

@@ -1,8 +1,8 @@
 import React, { useState, useEffect, useRef } 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 { GravatarFc } from '../common/GravatarFc';
+import { GravatarFc } from '../_common/GravatarFc';
 
 interface FirehoseEventListResponsePayload {
   success: boolean,

vocodes/src/v2/view/login/LoginComponent.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
-import { ApiConfig } from '../../common/ApiConfig';
+import { ApiConfig } from '../../../common/ApiConfig';
 import { useHistory, withRouter } from "react-router-dom";
 import { History } from 'history'
-import { SessionWrapper } from '../../session/SessionWrapper';
+import { SessionWrapper } from '../../../session/SessionWrapper';
 
 enum FieldTriState {
   EMPTY_FALSE,

vocodes/src/v2/view/login/LoginFc.tsx

@@ -1,9 +1,9 @@
 import React, { useState } from 'react';
-import { SessionWrapper } from '../../session/SessionWrapper';
+import { SessionWrapper } from '../../../session/SessionWrapper';
 import { useHistory } from "react-router-dom";
-import { ApiConfig } from '../../common/ApiConfig';
-import { UserIcon } from '../../icons/UserIcon';
-import { EnvelopeIcon } from '../../icons/EnvelopeIcon';
+import { ApiConfig } from '../../../common/ApiConfig';
+import { UserIcon } from '../_icons/UserIcon';
+import { EnvelopeIcon } from '../_icons/EnvelopeIcon';
 
 //enum FieldTriState {
 //  EMPTY_FALSE,

vocodes/src/v2/view/moderation/moderation_ip_ban_list/ModerationIpBanListFc.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { Link, useHistory } from 'react-router-dom';
-import { ApiConfig } from '../../../common/ApiConfig';
-import { SessionWrapper } from '../../../session/SessionWrapper';
+import { ApiConfig } from '../../../../common/ApiConfig';
+import { SessionWrapper } from '../../../../session/SessionWrapper';
 import { formatDistance } from 'date-fns';
 
 interface Props {

vocodes/src/v2/view/moderation/moderation_main/ModerationFc.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-import { SessionWrapper } from '../../../session/SessionWrapper';
+import { SessionWrapper } from '../../../../session/SessionWrapper';
 
 interface Props {
   sessionWrapper: SessionWrapper,

vocodes/src/v2/view/moderation/moderation_view_ip_ban/ModerationViewIpBanFc.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
-import { ApiConfig } from '../../../common/ApiConfig';
+import { ApiConfig } from '../../../../common/ApiConfig';
 import { Link, useHistory, useParams } from 'react-router-dom';
-import { SessionWrapper } from '../../../session/SessionWrapper';
+import { SessionWrapper } from '../../../../session/SessionWrapper';
 import { formatDistance } from 'date-fns';
 
 interface Props {

vocodes/src/v2/view/profile/profile_edit/ProfileEditFc.tsx

@@ -1,10 +1,10 @@
 import React, { useEffect, useState }  from 'react';
-import { ApiConfig } from '../../../common/ApiConfig';
+import { ApiConfig } from '../../../../common/ApiConfig';
 import { Link, useHistory } from 'react-router-dom';
-import { SessionWrapper } from '../../../session/SessionWrapper';
+import { SessionWrapper } from '../../../../session/SessionWrapper';
 import { useParams } from 'react-router-dom';
-import { VisibleIconFc } from '../../../icons/VisibleIconFc';
-import { HiddenIconFc } from '../../../icons/HiddenIconFc';
+import { VisibleIconFc } from '../../_icons/VisibleIcon';
+import { HiddenIconFc } from '../../_icons/HiddenIcon';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faDiscord, faFirefox, faGithub, faTwitch, faTwitter } from '@fortawesome/free-brands-svg-icons';
 import { faDollarSign, faUser } from '@fortawesome/free-solid-svg-icons';

vocodes/src/v2/view/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';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faDiscord, faFirefox, faGithub, faTwitch, faTwitter } from '@fortawesome/free-brands-svg-icons';

vocodes/src/v2/view/profile/profile_view/Profile_TtsInferenceResultListFc.tsx

@@ -1,9 +1,9 @@
 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';
-import { VisibleIconFc } from '../../../icons/VisibleIconFc';
-import { HiddenIconFc } from '../../../icons/HiddenIconFc';
+import { VisibleIconFc } from '../../_icons/VisibleIcon';
+import { HiddenIconFc } from '../../_icons/HiddenIcon';
 
 interface TtsInferenceResultListResponsePayload {
   success: boolean,

vocodes/src/v2/view/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';
 

vocodes/src/v2/view/profile/profile_view/Profile_W2lInferenceResultListFc.tsx

@@ -1,9 +1,9 @@
 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'
-import { VisibleIconFc } from '../../../icons/VisibleIconFc';
-import { HiddenIconFc } from '../../../icons/HiddenIconFc';
+import { VisibleIconFc } from '../../_icons/VisibleIcon';
+import { HiddenIconFc } from '../../_icons/HiddenIcon';
 
 interface W2lInferenceResultListResponsePayload {
   success: boolean,

vocodes/src/v2/view/profile/profile_view/Profile_W2lTemplateListFc.tsx

@@ -1,8 +1,8 @@
 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 { BucketConfig } from '../../../common/BucketConfig';
+import { getRandomInt } from '../../../../v1/api/Utils';
+import { BucketConfig } from '../../../../common/BucketConfig';
 
 interface W2lTemplateListResponsePayload {
   success: boolean,

vocodes/src/v2/view/signup/SignupComponent.tsx

@@ -1,11 +1,11 @@
 import React from 'react';
-import { ApiConfig } from '../../common/ApiConfig';
-import { AsteriskIcon } from '../../icons/AsteriskIcon';
-import { EnvelopeIcon } from '../../icons/EnvelopeIcon';
+import { ApiConfig } from '../../../common/ApiConfig';
+import { AsteriskIcon } from '../_icons/AsteriskIcon';
+import { EnvelopeIcon } from '../_icons/EnvelopeIcon';
 import { Link } from 'react-router-dom';
-import { Mode } from '../../AppMode';
-import { SessionWrapper } from '../../session/SessionWrapper';
-import { UserIcon } from '../../icons/UserIcon';
+import { Mode } from '../../../AppMode';
+import { SessionWrapper } from '../../../session/SessionWrapper';
+import { UserIcon } from '../_icons/UserIcon';
 
 enum FieldTriState {
   EMPTY_FALSE,

vocodes/src/v2/view/tts/tts_model_delete/TtsModelDeleteFc.tsx

@@ -1,8 +1,8 @@
 
 import React, { useState, useEffect, useCallback } from 'react';
-import { ApiConfig } from '../../../common/ApiConfig';
-import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig';
-import { SessionWrapper } from '../../../session/SessionWrapper';
+import { ApiConfig } from '../../../../common/ApiConfig';
+import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig';
+import { SessionWrapper } from '../../../../session/SessionWrapper';
 import { useParams, Link, useHistory } from 'react-router-dom';
 
 interface TtsModelViewResponsePayload {

vocodes/src/v2/view/tts/tts_model_edit/TtsModelEditFc.tsx

@@ -1,13 +1,13 @@
 
 import React, { useState, useEffect, useCallback } from 'react';
 //import axios from 'axios';
-import { ApiConfig } from '../../../common/ApiConfig';
-import { SessionWrapper } from '../../../session/SessionWrapper';
-import { TtsInferenceJob } from '../../../App';
+import { ApiConfig } from '../../../../common/ApiConfig';
+import { SessionWrapper } from '../../../../session/SessionWrapper';
+import { TtsInferenceJob } from '../../../../App';
 import { useParams, Link, useHistory } from 'react-router-dom';
-import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig';
-import { VisibleIconFc } from '../../../icons/VisibleIconFc';
-import { HiddenIconFc } from '../../../icons/HiddenIconFc';
+import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig';
+import { VisibleIconFc } from '../../_icons/VisibleIcon';
+import { HiddenIconFc } from '../../_icons/HiddenIcon';
 
 const DEFAULT_VISIBILITY = 'public';
 

vocodes/src/v2/view/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 { v4 as uuidv4 } from 'uuid';
 
 interface TtsModelListResponsePayload {

vocodes/src/v2/view/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,

vocodes/src/v2/view/tts/tts_model_view/TtsModelViewFc.tsx

@@ -1,16 +1,16 @@
 
 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 { v4 as uuidv4 } from 'uuid';
-import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig';
-import { HiddenIconFc } from '../../../icons/HiddenIconFc';
-import { VisibleIconFc } from '../../../icons/VisibleIconFc';
+import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig';
+import { HiddenIconFc } from '../../_icons/HiddenIcon';
+import { VisibleIconFc } from '../../_icons/VisibleIcon';
 
 interface TtsModelViewResponsePayload {
   success: boolean,

vocodes/src/v2/view/tts/tts_result_delete/TtsResultDeleteFc.tsx

@@ -1,9 +1,9 @@
 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, useHistory } from 'react-router-dom';
-import { GravatarFc } from '../../common/GravatarFc';
-import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig';
+import { GravatarFc } from '../../_common/GravatarFc';
+import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig';
 
 interface TtsInferenceResultResponsePayload {
   success: boolean,

vocodes/src/v2/view/tts/tts_result_edit/TtsResultEditFc.tsx

@@ -1,10 +1,10 @@
 import React, { useState, useEffect, useCallback } 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, useHistory } from 'react-router-dom';
-import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig';
-import { VisibleIconFc } from '../../../icons/VisibleIconFc';
-import { HiddenIconFc } from '../../../icons/HiddenIconFc';
+import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig';
+import { VisibleIconFc } from '../../_icons/VisibleIcon';
+import { HiddenIconFc } from '../../_icons/HiddenIcon';
 
 const DEFAULT_VISIBILITY = 'public';
 

vocodes/src/v2/view/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  

vocodes/src/v2/view/tts/tts_result_view/TtsResultViewFc.tsx

@@ -1,14 +1,14 @@
 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';
-import { ReportDiscordLinkFc } from '../../common/DiscordReportLinkFc';
-import { BucketConfig } from '../../../common/BucketConfig';
-import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig';
-import { HiddenIconFc } from '../../../icons/HiddenIconFc';
-import { VisibleIconFc } from '../../../icons/VisibleIconFc';
+import { ReportDiscordLinkFc } from '../../_common/DiscordReportLinkFc';
+import { BucketConfig } from '../../../../common/BucketConfig';
+import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig';
+import { HiddenIconFc } from '../../_icons/HiddenIcon';
+import { VisibleIconFc } from '../../_icons/VisibleIcon';
 
 interface TtsInferenceResultResponsePayload {
   success: boolean,

vocodes/src/v2/view/upload/UploadChoiceFc.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { SessionWrapper } from '../../session/SessionWrapper';
+import { SessionWrapper } from '../../../session/SessionWrapper';
 import { Link } from "react-router-dom";
 
 interface Props {

vocodes/src/v2/view/upload/UploadComponent.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
-import { ApiConfig } from '../../common/ApiConfig';
-import { SessionWrapper } from '../../session/SessionWrapper';
-import { TtsModelUploadJob } from '../../jobs/TtsModelUploadJobs';
-import { W2lTemplateUploadJob } from '../../jobs/W2lTemplateUploadJobs';
+import { ApiConfig } from '../../../common/ApiConfig';
+import { SessionWrapper } from '../../../session/SessionWrapper';
+import { TtsModelUploadJob } from '../../../jobs/TtsModelUploadJobs';
+import { W2lTemplateUploadJob } from '../../../jobs/W2lTemplateUploadJobs';
 import { v4 } from 'uuid';
 
 enum UploadType {

vocodes/src/v2/view/upload/UploadTtsModelFc.tsx

@@ -1,8 +1,8 @@
 import React, { useState } from 'react';
-import { ApiConfig } from '../../common/ApiConfig';
-import { SessionTtsModelUploadResultListFc } from '../common/SessionTtsModelUploadResultsListFc';
-import { SessionWrapper } from '../../session/SessionWrapper';
-import { TtsModelUploadJob } from '../../jobs/TtsModelUploadJobs';
+import { ApiConfig } from '../../../common/ApiConfig';
+import { SessionTtsModelUploadResultListFc } from '../_common/SessionTtsModelUploadResultsListFc';
+import { SessionWrapper } from '../../../session/SessionWrapper';
+import { TtsModelUploadJob } from '../../../jobs/TtsModelUploadJobs';
 import { useHistory, Link } from "react-router-dom";
 import { v4 as uuidv4 } from 'uuid';
 

vocodes/src/v2/view/upload/UploadW2lPhotoFc.tsx

@@ -1,10 +1,10 @@
 import React, { useState } from 'react';
-import { ApiConfig } from '../../common/ApiConfig';
-import { SessionWrapper } from '../../session/SessionWrapper';
-import { W2lTemplateUploadJob } from '../../jobs/W2lTemplateUploadJobs';
+import { ApiConfig } from '../../../common/ApiConfig';
+import { SessionWrapper } from '../../../session/SessionWrapper';
+import { W2lTemplateUploadJob } from '../../../jobs/W2lTemplateUploadJobs';
 import { useHistory, Link } from "react-router-dom";
 import { v4 as uuidv4 } from 'uuid';
-import { SessionW2lTemplateUploadResultListFc } from '../common/SessionW2lTemplateUploadResultsListFc';
+import { SessionW2lTemplateUploadResultListFc } from '../_common/SessionW2lTemplateUploadResultsListFc';
 
 interface W2lTemplateUploadJobResponsePayload {
   success: boolean,

vocodes/src/v2/view/upload/UploadW2lVideoFc.tsx

@@ -1,8 +1,8 @@
 import React, { useState } from 'react';
-import { ApiConfig } from '../../common/ApiConfig';
-import { SessionW2lTemplateUploadResultListFc } from '../common/SessionW2lTemplateUploadResultsListFc';
-import { SessionWrapper } from '../../session/SessionWrapper';
-import { W2lTemplateUploadJob } from '../../jobs/W2lTemplateUploadJobs';
+import { ApiConfig } from '../../../common/ApiConfig';
+import { SessionW2lTemplateUploadResultListFc } from '../_common/SessionW2lTemplateUploadResultsListFc';
+import { SessionWrapper } from '../../../session/SessionWrapper';
+import { W2lTemplateUploadJob } from '../../../jobs/W2lTemplateUploadJobs';
 import { useHistory, Link } from "react-router-dom";
 import { v4 as uuidv4 } from 'uuid';
 

vocodes/src/v2/view/w2l/w2l_result_delete/W2lResultDeleteFc.tsx

@@ -1,10 +1,10 @@
 
 import React, { useState, useEffect, useCallback } from 'react';
-import { ApiConfig } from '../../../common/ApiConfig';
-import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig';
-import { SessionWrapper } from '../../../session/SessionWrapper';
+import { ApiConfig } from '../../../../common/ApiConfig';
+import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig';
+import { SessionWrapper } from '../../../../session/SessionWrapper';
 import { useParams, Link, useHistory } from 'react-router-dom';
-import { GetW2lResult, W2lResult } from '../../api/w2l/GetW2lResult';
+import { GetW2lResult, W2lResult } from '../../../api/w2l/GetW2lResult';
 
 interface Props {
   sessionWrapper: SessionWrapper,

vocodes/src/v2/view/w2l/w2l_result_edit/W2lResultEditFc.tsx

@@ -1,10 +1,10 @@
 import React, { useState, useEffect, useCallback } 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, useHistory } from 'react-router-dom';
-import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig';
-import { VisibleIconFc } from '../../../icons/VisibleIconFc';
-import { HiddenIconFc } from '../../../icons/HiddenIconFc';
+import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig';
+import { VisibleIconFc } from '../../_icons/VisibleIcon';
+import { HiddenIconFc } from '../../_icons/HiddenIcon';
 
 const DEFAULT_VISIBILITY = 'public';
 

vocodes/src/v2/view/w2l/w2l_result_view/W2lResultViewFc.tsx

@@ -1,14 +1,14 @@
 import React, { useState, useEffect, useCallback } from 'react';
-import { GravatarFc } from '../../common/GravatarFc';
-import { SessionWrapper } from '../../../session/SessionWrapper';
+import { GravatarFc } from '../../_common/GravatarFc';
+import { SessionWrapper } from '../../../../session/SessionWrapper';
 import { useParams, Link } from 'react-router-dom';
-import { ReportDiscordLinkFc } from '../../common/DiscordReportLinkFc';
-import { BucketConfig } from '../../../common/BucketConfig';
-import { HiddenIconFc } from '../../../icons/HiddenIconFc';
-import { VisibleIconFc } from '../../../icons/VisibleIconFc';
-import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig';
-import { DownloadIcon } from '../../../icons/DownloadIcon';
-import { GetW2lResult, W2lResult } from '../../api/w2l/GetW2lResult';
+import { ReportDiscordLinkFc } from '../../_common/DiscordReportLinkFc';
+import { BucketConfig } from '../../../../common/BucketConfig';
+import { HiddenIconFc } from '../../_icons/HiddenIcon';
+import { VisibleIconFc } from '../../_icons/VisibleIcon';
+import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig';
+import { DownloadIcon } from '../../_icons/DownloadIcon';
+import { GetW2lResult, W2lResult } from '../../../api/w2l/GetW2lResult';
 
 interface Props {
   sessionWrapper: SessionWrapper,

vocodes/src/v2/view/w2l/w2l_template_approve/W2lTemplateApproveFc.tsx

@@ -1,10 +1,10 @@
 import React, { useState, useEffect, useCallback } from 'react';
-import { ApiConfig } from '../../../common/ApiConfig';
-import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig';
-import { SessionWrapper } from '../../../session/SessionWrapper';
+import { ApiConfig } from '../../../../common/ApiConfig';
+import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig';
+import { SessionWrapper } from '../../../../session/SessionWrapper';
 import { useParams, Link, useHistory } from 'react-router-dom';
-import { GetW2lTemplate, W2lTemplate } from '../../api/w2l/GetW2lTemplate';
-import { GetW2lTemplateUseCount } from '../../api/w2l/GetW2lTemplateUseCount';
+import { GetW2lTemplate, W2lTemplate } from '../../../api/w2l/GetW2lTemplate';
+import { GetW2lTemplateUseCount } from '../../../api/w2l/GetW2lTemplateUseCount';
 
 const DEFAULT_APPROVED_STATE = true;
 

vocodes/src/v2/view/w2l/w2l_template_delete/W2lTemplateDeleteFc.tsx

@@ -1,10 +1,10 @@
 import React, { useState, useEffect, useCallback } from 'react';
-import { ApiConfig } from '../../../common/ApiConfig';
-import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig';
-import { SessionWrapper } from '../../../session/SessionWrapper';
+import { ApiConfig } from '../../../../common/ApiConfig';
+import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig';
+import { SessionWrapper } from '../../../../session/SessionWrapper';
 import { useParams, Link, useHistory } from 'react-router-dom';
-import { GetW2lTemplate, W2lTemplate } from '../../api/w2l/GetW2lTemplate';
-import { GetW2lTemplateUseCount } from '../../api/w2l/GetW2lTemplateUseCount';
+import { GetW2lTemplate, W2lTemplate } from '../../../api/w2l/GetW2lTemplate';
+import { GetW2lTemplateUseCount } from '../../../api/w2l/GetW2lTemplateUseCount';
 
 interface Props {
   sessionWrapper: SessionWrapper,

vocodes/src/v2/view/w2l/w2l_template_edit/W2lTemplateEditFc.tsx

@@ -1,11 +1,11 @@
 import React, { useState, useEffect, useCallback } 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, useHistory } from 'react-router-dom';
-import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig';
-import { VisibleIconFc } from '../../../icons/VisibleIconFc';
-import { HiddenIconFc } from '../../../icons/HiddenIconFc';
-import { GetW2lTemplate, W2lTemplate } from '../../api/w2l/GetW2lTemplate';
+import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig';
+import { VisibleIconFc } from '../../_icons/VisibleIcon';
+import { HiddenIconFc } from '../../_icons/HiddenIcon';
+import { GetW2lTemplate, W2lTemplate } from '../../../api/w2l/GetW2lTemplate';
 
 const DEFAULT_VISIBILITY = 'public';
 

vocodes/src/v2/view/w2l/w2l_template_list/W2lTemplateListFc.tsx

@@ -1,9 +1,9 @@
 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 { BucketConfig } from '../../../common/BucketConfig';
+import { getRandomInt } from '../../../../v1/api/Utils';
+import { BucketConfig } from '../../../../common/BucketConfig';
 
 interface W2lTemplateListResponsePayload {
   success: boolean,

vocodes/src/v2/view/w2l/w2l_template_view/W2lTemplateViewFc.tsx

@@ -1,19 +1,19 @@
 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 } from 'react-router-dom';
 import { v4 as uuidv4 } from 'uuid';
-import { SessionW2lInferenceResultListFc } from '../../common/SessionW2lInferenceResultsListFc';
-import { ReportDiscordLinkFc } from '../../common/DiscordReportLinkFc';
-import { BucketConfig } from '../../../common/BucketConfig';
-import { UploadIcon } from '../../../icons/UploadIcon';
-import { VisibleIconFc } from '../../../icons/VisibleIconFc';
-import { HiddenIconFc } from '../../../icons/HiddenIconFc';
-import { FrontendUrlConfig } from '../../../common/FrontendUrlConfig';
-import { GetW2lTemplate, W2lTemplate } from '../../api/w2l/GetW2lTemplate';
-import { GetW2lTemplateUseCount } from '../../api/w2l/GetW2lTemplateUseCount';
+import { SessionW2lInferenceResultListFc } from '../../_common/SessionW2lInferenceResultsListFc';
+import { ReportDiscordLinkFc } from '../../_common/DiscordReportLinkFc';
+import { BucketConfig } from '../../../../common/BucketConfig';
+import { UploadIcon } from '../../_icons/UploadIcon';
+import { VisibleIconFc } from '../../_icons/VisibleIcon';
+import { HiddenIconFc } from '../../_icons/HiddenIcon';
+import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig';
+import { GetW2lTemplate, W2lTemplate } from '../../../api/w2l/GetW2lTemplate';
+import { GetW2lTemplateUseCount } from '../../../api/w2l/GetW2lTemplateUseCount';
 
 interface EnqueueJobResponsePayload {
   success: boolean,