[213] Change the organization of the frontend code

Bug: #213 Signed-off-by: Stéphane Bégaudeau <[email protected]>
svalyn · Jul 16, 2023 · 0054578 · 0054578
1 parent 7336704
commit 0054578
Show file tree

Hide file tree

Showing 142 changed files with 119 additions and 119 deletions.
diff --git a/frontend/svalyn-studio-app/src/app/App.tsx b/frontend/svalyn-studio-app/src/app/App.tsx
@@ -20,23 +20,23 @@
 import CssBaseline from '@mui/material/CssBaseline';
 import { ThemeProvider } from '@mui/material/styles';
 import { BrowserRouter, Route, Routes } from 'react-router-dom';
+import { ChangeProposalsRouter } from '../changeproposals/ChangeProposalsRouter';
+import { DomainsRouter } from '../domains/DomainsRouter';
+import { ErrorsRouter } from '../errors/ErrorsRouter';
+import { HelpRouter } from '../help/HelpRouter';
+import { HomeView } from '../home/HomeView';
+import { InvitationsRouter } from '../invitations/InvitationsRouter';
+import { LoginRouter } from '../login/LoginRouter';
+import { NewRouter } from '../new/NewRouter';
+import { NotFoundView } from '../notfound/NotFoundView';
+import { NotificationsRouter } from '../notifications/NotificationsRouter';
+import { OAuth2Router } from '../oauth2/OAuth2Router';
+import { OrganizationsRouter } from '../organizations/OrganizationsRouter';
 import { PaletteProvider } from '../palette/PaletteProvider';
-import { ChangeProposalRouter } from '../views/changeproposal/ChangeProposalRouter';
-import { DomainRouter } from '../views/domains/DomainRouter';
-import { ErrorRouter } from '../views/error/ErrorRouter';
-import { HelpRouter } from '../views/help/HelpRouter';
-import { HomeView } from '../views/home/HomeView';
-import { InvitationRouter } from '../views/invitations/InvitationRouter';
-import { LoginRouter } from '../views/login/LoginRouter';
-import { NewRouter } from '../views/new-organization/NewRouter';
-import { NotFoundView } from '../views/notfound/NotFoundView';
-import { NotificationRouter } from '../views/notifications/NotificationRouter';
-import { OAuth2Router } from '../views/oauth2redirect/OAuth2Router';
-import { OrganizationRouter } from '../views/organization/OrganizationRouter';
-import { ProfileRouter } from '../views/profile/ProfileRouter';
-import { ProjectRouter } from '../views/project/ProjectRouter';
-import { SearchRouter } from '../views/search/SearchRouter';
-import { SettingsRouter } from '../views/settings/SettingsRouter';
+import { ProfilesRouter } from '../profiles/ProfilesRouter';
+import { ProjectsRouter } from '../projects/ProjectsRouter';
+import { SearchRouter } from '../search/SearchRouter';
+import { SettingsRouter } from '../settings/SettingsRouter';
 import { AuthenticationRedirectionBoundary } from './AuthenticationRedirectionBoundary';
 import { theme } from './theme';
 
@@ -50,17 +50,17 @@ export const App = () => {
             <Routes>
               <Route path="/" element={<HomeView />} />
               <Route path="/new/*" element={<NewRouter />} />
-              <Route path="/orgs/*" element={<OrganizationRouter />} />
-              <Route path="/projects/*" element={<ProjectRouter />} />
-              <Route path="/changeproposals/*" element={<ChangeProposalRouter />} />
-              <Route path="/domains/*" element={<DomainRouter />} />
+              <Route path="/orgs/*" element={<OrganizationsRouter />} />
+              <Route path="/projects/*" element={<ProjectsRouter />} />
+              <Route path="/changeproposals/*" element={<ChangeProposalsRouter />} />
+              <Route path="/domains/*" element={<DomainsRouter />} />
               <Route path="/search/*" element={<SearchRouter />} />
-              <Route path="/profiles/*" element={<ProfileRouter />} />
-              <Route path="/notifications/*" element={<NotificationRouter />} />
-              <Route path="/invitations/*" element={<InvitationRouter />} />
+              <Route path="/profiles/*" element={<ProfilesRouter />} />
+              <Route path="/notifications/*" element={<NotificationsRouter />} />
+              <Route path="/invitations/*" element={<InvitationsRouter />} />
               <Route path="/settings/*" element={<SettingsRouter />} />
               <Route path="/help/*" element={<HelpRouter />} />
-              <Route path="/error/*" element={<ErrorRouter />} />
+              <Route path="/errors/*" element={<ErrorsRouter />} />
               <Route path="/login/*" element={<LoginRouter />} />
               <Route path="/oauth2/*" element={<OAuth2Router />} />
               <Route path="*" element={<NotFoundView />} />

diff --git a/...ews/changeproposal/ChangeProposalView.tsx → ...rc/changeproposals/ChangeProposalView.tsx b/...ews/changeproposal/ChangeProposalView.tsx → ...rc/changeproposals/ChangeProposalView.tsx
@@ -22,12 +22,12 @@ import ClassIcon from '@mui/icons-material/Class';
 import CorporateFareIcon from '@mui/icons-material/CorporateFare';
 import { useEffect, useState } from 'react';
 import { useParams } from 'react-router-dom';
-import { Navbar } from '../../navbars/Navbar';
-import { goToDomains, goToHelp, goToHome, goToNotifications, goToSettings } from '../../palette/DefaultPaletteActions';
-import { PaletteNavigationAction } from '../../palette/Palette.types';
-import { usePalette } from '../../palette/usePalette';
-import { ErrorSnackbar } from '../../snackbar/ErrorSnackbar';
+import { Navbar } from '../navbars/Navbar';
 import { NotFoundView } from '../notfound/NotFoundView';
+import { goToDomains, goToHelp, goToHome, goToNotifications, goToSettings } from '../palette/DefaultPaletteActions';
+import { PaletteNavigationAction } from '../palette/Palette.types';
+import { usePalette } from '../palette/usePalette';
+import { ErrorSnackbar } from '../snackbar/ErrorSnackbar';
 import { ChangeProposalViewState, GetChangeProposalData, GetChangeProposalVariables } from './ChangeProposalView.types';
 import { ChangeProposalViewTabPanel } from './ChangeProposalViewTabPanel';
 

diff --git a/...hangeproposal/ChangeProposalView.types.ts → ...angeproposals/ChangeProposalView.types.ts b/...hangeproposal/ChangeProposalView.types.ts → ...angeproposals/ChangeProposalView.types.ts
diff --git a/...geproposal/ChangeProposalViewTabPanel.tsx → ...eproposals/ChangeProposalViewTabPanel.tsx b/...geproposal/ChangeProposalViewTabPanel.tsx → ...eproposals/ChangeProposalViewTabPanel.tsx
diff --git a/...posal/ChangeProposalViewTabPanel.types.ts → ...osals/ChangeProposalViewTabPanel.types.ts b/...posal/ChangeProposalViewTabPanel.types.ts → ...osals/ChangeProposalViewTabPanel.types.ts
diff --git a/...s/changeproposal/ChangeProposalRouter.tsx → ...changeproposals/ChangeProposalsRouter.tsx b/...s/changeproposal/ChangeProposalRouter.tsx → ...changeproposals/ChangeProposalsRouter.tsx
@@ -20,7 +20,7 @@
 import { Outlet, Route, Routes } from 'react-router-dom';
 import { ChangeProposalView } from './ChangeProposalView';
 
-export const ChangeProposalRouter = () => {
+export const ChangeProposalsRouter = () => {
   return (
     <>
       <Routes>

diff --git a/...src/views/changeproposal/ReviewDialog.tsx → ...-app/src/changeproposals/ReviewDialog.tsx b/...src/views/changeproposal/ReviewDialog.tsx → ...-app/src/changeproposals/ReviewDialog.tsx
@@ -31,7 +31,7 @@ import Radio from '@mui/material/Radio';
 import RadioGroup from '@mui/material/RadioGroup';
 import TextField from '@mui/material/TextField';
 import { useEffect, useState } from 'react';
-import { ErrorSnackbar } from '../../snackbar/ErrorSnackbar';
+import { ErrorSnackbar } from '../snackbar/ErrorSnackbar';
 import {
   ErrorPayload,
   PerformReviewData,

diff --git a/...iews/changeproposal/ReviewDialog.types.ts → ...src/changeproposals/ReviewDialog.types.ts b/...iews/changeproposal/ReviewDialog.types.ts → ...src/changeproposals/ReviewDialog.types.ts
diff --git a/...ngeproposal/files/ChangeProposalFiles.tsx → ...geproposals/files/ChangeProposalFiles.tsx b/...ngeproposal/files/ChangeProposalFiles.tsx → ...geproposals/files/ChangeProposalFiles.tsx
@@ -28,8 +28,8 @@ import ListItemIcon from '@mui/material/ListItemIcon';
 import ListItemText from '@mui/material/ListItemText';
 import Paper from '@mui/material/Paper';
 import { useEffect, useState } from 'react';
-import { ErrorSnackbar } from '../../../snackbar/ErrorSnackbar';
-import { ViewerCard } from '../../../viewers/ViewerCard';
+import { ErrorSnackbar } from '../../snackbar/ErrorSnackbar';
+import { ViewerCard } from '../../viewers/ViewerCard';
 import {
   ChangeProposalFilesProps,
   ChangeProposalFilesState,

diff --git a/...oposal/files/ChangeProposalFiles.types.ts → ...posals/files/ChangeProposalFiles.types.ts b/...oposal/files/ChangeProposalFiles.types.ts → ...posals/files/ChangeProposalFiles.types.ts
diff --git a/...roposal/overview/ChangeProposalHeader.tsx → ...oposals/overview/ChangeProposalHeader.tsx b/...roposal/overview/ChangeProposalHeader.tsx → ...oposals/overview/ChangeProposalHeader.tsx
@@ -22,8 +22,8 @@ import NotInterestedIcon from '@mui/icons-material/NotInterested';
 import PanoramaFishEyeIcon from '@mui/icons-material/PanoramaFishEye';
 import Box from '@mui/material/Box';
 import Chip from '@mui/material/Chip';
-import { CreatedOn } from '../../../widgets/CreatedOn';
-import { LastModifiedOn } from '../../../widgets/LastModifiedOn';
+import { CreatedOn } from '../../widgets/CreatedOn';
+import { LastModifiedOn } from '../../widgets/LastModifiedOn';
 import { ChangeProposalHeaderProps } from './ChangeProposalHeader.types';
 
 export const ChangeProposalHeader = ({ changeProposal }: ChangeProposalHeaderProps) => {

diff --git a/...al/overview/ChangeProposalHeader.types.ts → ...ls/overview/ChangeProposalHeader.types.ts b/...al/overview/ChangeProposalHeader.types.ts → ...ls/overview/ChangeProposalHeader.types.ts
diff --git a/...posal/overview/ChangeProposalOverview.tsx → ...osals/overview/ChangeProposalOverview.tsx b/...posal/overview/ChangeProposalOverview.tsx → ...osals/overview/ChangeProposalOverview.tsx
@@ -28,8 +28,8 @@ import Paper from '@mui/material/Paper';
 import Typography from '@mui/material/Typography';
 import { useEffect, useState } from 'react';
 import ReactMarkdown from 'react-markdown';
-import { EditReadMeDialog } from '../../../dialogs/EditReadMeDialog';
-import { ErrorSnackbar } from '../../../snackbar/ErrorSnackbar';
+import { EditReadMeDialog } from '../../dialogs/EditReadMeDialog';
+import { ErrorSnackbar } from '../../snackbar/ErrorSnackbar';
 import { ChangeProposalHeader } from './ChangeProposalHeader';
 import {
   ChangeProposalOverviewProps,

diff --git a/.../overview/ChangeProposalOverview.types.ts → .../overview/ChangeProposalOverview.types.ts b/.../overview/ChangeProposalOverview.types.ts → .../overview/ChangeProposalOverview.types.ts
diff --git a/...roposal/overview/ChangeProposalStatus.tsx → ...oposals/overview/ChangeProposalStatus.tsx b/...roposal/overview/ChangeProposalStatus.tsx → ...oposals/overview/ChangeProposalStatus.tsx
diff --git a/...al/overview/ChangeProposalStatus.types.ts → ...ls/overview/ChangeProposalStatus.types.ts b/...al/overview/ChangeProposalStatus.types.ts → ...ls/overview/ChangeProposalStatus.types.ts
diff --git a/...tudio-app/src/views/domain/DomainView.tsx → ...lyn-studio-app/src/domains/DomainView.tsx b/...tudio-app/src/views/domain/DomainView.tsx → ...lyn-studio-app/src/domains/DomainView.tsx
@@ -22,9 +22,9 @@ import Container from '@mui/material/Container';
 import Toolbar from '@mui/material/Toolbar';
 import Typography from '@mui/material/Typography';
 import { useParams } from 'react-router-dom';
-import { DiagramEditor } from '../../diagram/DiagramEditor';
-import { Diagram } from '../../diagram/DiagramEditor.types';
-import { Navbar } from '../../navbars/Navbar';
+import { DiagramEditor } from '../diagram/DiagramEditor';
+import { Diagram } from '../diagram/DiagramEditor.types';
+import { Navbar } from '../navbars/Navbar';
 import { GetDomainData, GetDomainVariables } from './DomainView.types';
 import { convertDomain } from './converters';
 

diff --git a/...-app/src/views/domain/DomainView.types.ts → ...tudio-app/src/domains/DomainView.types.ts b/...-app/src/views/domain/DomainView.types.ts → ...tudio-app/src/domains/DomainView.types.ts
diff --git a/...io-app/src/views/domains/DomainRouter.tsx → ...-studio-app/src/domains/DomainsRouter.tsx b/...io-app/src/views/domains/DomainRouter.tsx → ...-studio-app/src/domains/DomainsRouter.tsx
@@ -18,10 +18,10 @@
  */
 
 import { Outlet, Route, Routes } from 'react-router-dom';
-import { DomainView } from '../domain/DomainView';
+import { DomainView } from './DomainView';
 import { DomainsView } from './DomainsView';
 
-export const DomainRouter = () => {
+export const DomainsRouter = () => {
   return (
     <>
       <Routes>

diff --git a/...dio-app/src/views/domains/DomainsView.tsx → ...yn-studio-app/src/domains/DomainsView.tsx b/...dio-app/src/views/domains/DomainsView.tsx → ...yn-studio-app/src/domains/DomainsView.tsx
@@ -30,8 +30,8 @@ import Toolbar from '@mui/material/Toolbar';
 import Typography from '@mui/material/Typography';
 import { useEffect, useState } from 'react';
 import { Link as RouterLink } from 'react-router-dom';
-import { Navbar } from '../../navbars/Navbar';
-import { ErrorSnackbar } from '../../snackbar/ErrorSnackbar';
+import { Navbar } from '../navbars/Navbar';
+import { ErrorSnackbar } from '../snackbar/ErrorSnackbar';
 import { Domain, DomainsViewState, GetDomainsData, GetDomainsVariables } from './DomainsView.types';
 
 const getDomainsQuery = gql`

diff --git a/...pp/src/views/domains/DomainsView.types.ts → ...udio-app/src/domains/DomainsView.types.ts b/...pp/src/views/domains/DomainsView.types.ts → ...udio-app/src/domains/DomainsView.types.ts
diff --git a/...studio-app/src/views/domain/converters.ts → ...alyn-studio-app/src/domains/converters.ts b/...studio-app/src/views/domain/converters.ts → ...alyn-studio-app/src/domains/converters.ts
@@ -18,8 +18,8 @@
  */
 
 import { Edge, Node } from 'reactflow';
-import { Diagram } from '../../diagram/DiagramEditor.types';
-import { ListItemData, ListNodeData } from '../../diagram/nodes/ListNode.types';
+import { Diagram } from '../diagram/DiagramEditor.types';
+import { ListItemData, ListNodeData } from '../diagram/nodes/ListNode.types';
 import { DataType, Domain, Entity, Enumeration } from './DomainView.types';
 
 export const convertDomain = (domain: Domain): Diagram => {

diff --git a/...-studio-app/src/views/error/ErrorView.tsx → ...valyn-studio-app/src/errors/ErrorView.tsx b/...-studio-app/src/views/error/ErrorView.tsx → ...valyn-studio-app/src/errors/ErrorView.tsx
@@ -20,7 +20,7 @@
 import Container from '@mui/material/Container';
 import Toolbar from '@mui/material/Toolbar';
 import Typography from '@mui/material/Typography';
-import { UnauthenticatedNavbar } from '../../navbars/UnauthenticatedNavbar';
+import { UnauthenticatedNavbar } from '../navbars/UnauthenticatedNavbar';
 
 export const ErrorView = () => {
   return (

diff --git a/...tudio-app/src/views/error/ErrorRouter.tsx → ...yn-studio-app/src/errors/ErrorsRouter.tsx b/...tudio-app/src/views/error/ErrorRouter.tsx → ...yn-studio-app/src/errors/ErrorsRouter.tsx
@@ -20,7 +20,7 @@
 import { Outlet, Route, Routes } from 'react-router-dom';
 import { ErrorView } from './ErrorView';
 
-export const ErrorRouter = () => {
+export const ErrorsRouter = () => {
   return (
     <>
       <Routes>

diff --git a/...-studio-app/src/views/help/HelpRouter.tsx → ...svalyn-studio-app/src/help/HelpRouter.tsx b/...-studio-app/src/views/help/HelpRouter.tsx → ...svalyn-studio-app/src/help/HelpRouter.tsx
diff --git a/...yn-studio-app/src/views/help/HelpView.tsx → ...d/svalyn-studio-app/src/help/HelpView.tsx b/...yn-studio-app/src/views/help/HelpView.tsx → ...d/svalyn-studio-app/src/help/HelpView.tsx
@@ -20,7 +20,7 @@
 import Container from '@mui/material/Container';
 import Toolbar from '@mui/material/Toolbar';
 import Typography from '@mui/material/Typography';
-import { UnauthenticatedNavbar } from '../../navbars/UnauthenticatedNavbar';
+import { UnauthenticatedNavbar } from '../navbars/UnauthenticatedNavbar';
 
 export const HelpView = () => {
   return (

diff --git a/...yn-studio-app/src/views/home/HomeView.tsx → ...d/svalyn-studio-app/src/home/HomeView.tsx b/...yn-studio-app/src/views/home/HomeView.tsx → ...d/svalyn-studio-app/src/home/HomeView.tsx
@@ -18,7 +18,7 @@
  */
 
 import Box from '@mui/material/Box';
-import { Navbar } from '../../navbars/Navbar';
+import { Navbar } from '../navbars/Navbar';
 import { HomeViewCenterPanel } from './HomeViewCenterPanel';
 import { HomeViewLeftPanel } from './HomeViewLeftPanel';
 import { HomeViewRightPanel } from './HomeViewRightPanel';

diff --git a/...o-app/src/views/home/HomeViewActivity.tsx → ...-studio-app/src/home/HomeViewActivity.tsx b/...o-app/src/views/home/HomeViewActivity.tsx → ...-studio-app/src/home/HomeViewActivity.tsx
@@ -21,8 +21,8 @@ import { gql, useQuery } from '@apollo/client';
 import Link from '@mui/material/Link';
 import Typography from '@mui/material/Typography';
 import { useEffect, useState } from 'react';
-import { ActivityTimeline } from '../../activity/ActivityTimeline';
-import { ErrorSnackbar } from '../../snackbar/ErrorSnackbar';
+import { ActivityTimeline } from '../activity/ActivityTimeline';
+import { ErrorSnackbar } from '../snackbar/ErrorSnackbar';
 import {
   GetActivityData,
   GetActivityVariables,

diff --git a/.../src/views/home/HomeViewActivity.types.ts → ...io-app/src/home/HomeViewActivity.types.ts b/.../src/views/home/HomeViewActivity.types.ts → ...io-app/src/home/HomeViewActivity.types.ts
diff --git a/...pp/src/views/home/HomeViewCenterPanel.tsx → ...udio-app/src/home/HomeViewCenterPanel.tsx b/...pp/src/views/home/HomeViewCenterPanel.tsx → ...udio-app/src/home/HomeViewCenterPanel.tsx
diff --git a/...c/views/home/HomeViewCenterPanel.types.ts → ...app/src/home/HomeViewCenterPanel.types.ts b/...c/views/home/HomeViewCenterPanel.types.ts → ...app/src/home/HomeViewCenterPanel.types.ts
diff --git a/...-app/src/views/home/HomeViewLeftPanel.tsx → ...studio-app/src/home/HomeViewLeftPanel.tsx b/...-app/src/views/home/HomeViewLeftPanel.tsx → ...studio-app/src/home/HomeViewLeftPanel.tsx
@@ -30,7 +30,7 @@ import Paper from '@mui/material/Paper';
 import Typography from '@mui/material/Typography';
 import { useEffect, useState } from 'react';
 import { Link as RouterLink } from 'react-router-dom';
-import { ErrorSnackbar } from '../../snackbar/ErrorSnackbar';
+import { ErrorSnackbar } from '../snackbar/ErrorSnackbar';
 import {
   GetOrganizationsData,
   GetOrganizationsVariables,

diff --git a/...src/views/home/HomeViewLeftPanel.types.ts → ...o-app/src/home/HomeViewLeftPanel.types.ts b/...src/views/home/HomeViewLeftPanel.types.ts → ...o-app/src/home/HomeViewLeftPanel.types.ts
diff --git a/...app/src/views/home/HomeViewRightPanel.tsx → ...tudio-app/src/home/HomeViewRightPanel.tsx b/...app/src/views/home/HomeViewRightPanel.tsx → ...tudio-app/src/home/HomeViewRightPanel.tsx
diff --git a/...rc/views/home/HomeViewRightPanel.types.ts → ...-app/src/home/HomeViewRightPanel.types.ts b/...rc/views/home/HomeViewRightPanel.types.ts → ...-app/src/home/HomeViewRightPanel.types.ts
diff --git a/...dio-app/src/views/home/HomeViewSearch.tsx → ...yn-studio-app/src/home/HomeViewSearch.tsx b/...dio-app/src/views/home/HomeViewSearch.tsx → ...yn-studio-app/src/home/HomeViewSearch.tsx
diff --git a/...pp/src/views/home/HomeViewSearch.types.ts → ...udio-app/src/home/HomeViewSearch.types.ts b/...pp/src/views/home/HomeViewSearch.types.ts → ...udio-app/src/home/HomeViewSearch.types.ts
diff --git a/...rc/views/invitations/InvitationRouter.tsx → ...app/src/invitations/InvitationsRouter.tsx b/...rc/views/invitations/InvitationRouter.tsx → ...app/src/invitations/InvitationsRouter.tsx
@@ -20,7 +20,7 @@
 import { Outlet, Route, Routes } from 'react-router-dom';
 import { InvitationsView } from './InvitationsView';
 
-export const InvitationRouter = () => {
+export const InvitationsRouter = () => {
   return (
     <>
       <Routes>

diff --git a/...src/views/invitations/InvitationsView.tsx → ...o-app/src/invitations/InvitationsView.tsx b/...src/views/invitations/InvitationsView.tsx → ...o-app/src/invitations/InvitationsView.tsx
@@ -32,8 +32,8 @@ import Toolbar from '@mui/material/Toolbar';
 import Tooltip from '@mui/material/Tooltip';
 import Typography from '@mui/material/Typography';
 import { useEffect, useState } from 'react';
-import { Navbar } from '../../navbars/Navbar';
-import { ErrorSnackbar } from '../../snackbar/ErrorSnackbar';
+import { Navbar } from '../navbars/Navbar';
+import { ErrorSnackbar } from '../snackbar/ErrorSnackbar';
 import {
   AcceptInvitationData,
   AcceptInvitationVariables,

diff --git a/...iews/invitations/InvitationsView.types.ts → .../src/invitations/InvitationsView.types.ts b/...iews/invitations/InvitationsView.types.ts → .../src/invitations/InvitationsView.types.ts
diff --git a/...tudio-app/src/views/login/LoginRouter.tsx → ...alyn-studio-app/src/login/LoginRouter.tsx b/...tudio-app/src/views/login/LoginRouter.tsx → ...alyn-studio-app/src/login/LoginRouter.tsx
diff --git a/...-studio-app/src/views/login/LoginView.tsx → ...svalyn-studio-app/src/login/LoginView.tsx b/...-studio-app/src/views/login/LoginView.tsx → ...svalyn-studio-app/src/login/LoginView.tsx
@@ -31,7 +31,7 @@ import Toolbar from '@mui/material/Toolbar';
 import Typography from '@mui/material/Typography';
 import { useState } from 'react';
 import { Link } from 'react-router-dom';
-import { UnauthenticatedNavbar } from '../../navbars/UnauthenticatedNavbar';
+import { UnauthenticatedNavbar } from '../navbars/UnauthenticatedNavbar';
 import { LoginViewState, LoginViewTab } from './LoginView.types';
 import { LoginWithCredentials } from './LoginWithCredentials';
 import { LoginWithGithub } from './LoginWithGithub';

diff --git a/...io-app/src/views/login/LoginView.types.ts → ...n-studio-app/src/login/LoginView.types.ts b/...io-app/src/views/login/LoginView.types.ts → ...n-studio-app/src/login/LoginView.types.ts
diff --git a/.../src/views/login/LoginWithCredentials.tsx → ...io-app/src/login/LoginWithCredentials.tsx b/.../src/views/login/LoginWithCredentials.tsx → ...io-app/src/login/LoginWithCredentials.tsx
@@ -24,8 +24,8 @@ import TextField from '@mui/material/TextField';
 import Typography from '@mui/material/Typography';
 import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { getCookie } from '../../cookies/getCookie';
-import { ErrorSnackbar } from '../../snackbar/ErrorSnackbar';
+import { getCookie } from '../cookies/getCookie';
+import { ErrorSnackbar } from '../snackbar/ErrorSnackbar';
 import { LoginWithCredentialsState } from './LoginWithCredentials.types';
 
 const { VITE_BACKEND_URL } = import.meta.env;

diff --git a/...views/login/LoginWithCredentials.types.ts → ...p/src/login/LoginWithCredentials.types.ts b/...views/login/LoginWithCredentials.types.ts → ...p/src/login/LoginWithCredentials.types.ts
diff --git a/...o-app/src/views/login/LoginWithGithub.tsx → ...-studio-app/src/login/LoginWithGithub.tsx b/...o-app/src/views/login/LoginWithGithub.tsx → ...-studio-app/src/login/LoginWithGithub.tsx
diff --git a/.../new-organization/NewOrganizationView.tsx → ...tudio-app/src/new/NewOrganizationView.tsx b/.../new-organization/NewOrganizationView.tsx → ...tudio-app/src/new/NewOrganizationView.tsx
@@ -30,8 +30,8 @@ import Typography from '@mui/material/Typography';
 import { styled } from '@mui/material/styles';
 import { useEffect, useState } from 'react';
 import { Navigate, Link as RouterLink } from 'react-router-dom';
-import { Navbar } from '../../navbars/Navbar';
-import { ErrorSnackbar } from '../../snackbar/ErrorSnackbar';
+import { Navbar } from '../navbars/Navbar';
+import { ErrorSnackbar } from '../snackbar/ErrorSnackbar';
 import {
   CreateOrganizationData,
   CreateOrganizationInput,

diff --git a/...organization/NewOrganizationView.types.ts → ...-app/src/new/NewOrganizationView.types.ts b/...organization/NewOrganizationView.types.ts → ...-app/src/new/NewOrganizationView.types.ts
diff --git a/.../src/views/new-organization/NewRouter.tsx → ...d/svalyn-studio-app/src/new/NewRouter.tsx b/.../src/views/new-organization/NewRouter.tsx → ...d/svalyn-studio-app/src/new/NewRouter.tsx
diff --git a/...o-app/src/views/notfound/NotFoundView.tsx → ...-studio-app/src/notfound/NotFoundView.tsx b/...o-app/src/views/notfound/NotFoundView.tsx → ...-studio-app/src/notfound/NotFoundView.tsx
@@ -20,7 +20,7 @@
 import Container from '@mui/material/Container';
 import Toolbar from '@mui/material/Toolbar';
 import Typography from '@mui/material/Typography';
-import { UnauthenticatedNavbar } from '../../navbars/UnauthenticatedNavbar';
+import { UnauthenticatedNavbar } from '../navbars/UnauthenticatedNavbar';
 
 export const NotFoundView = () => {
   return (

diff --git a/...iews/notifications/NotificationRouter.tsx → ...src/notifications/NotificationsRouter.tsx b/...iews/notifications/NotificationRouter.tsx → ...src/notifications/NotificationsRouter.tsx
@@ -20,7 +20,7 @@
 import { Outlet, Route, Routes } from 'react-router-dom';
 import { NotificationsView } from './NotificationsView';
 
-export const NotificationRouter = () => {
+export const NotificationsRouter = () => {
   return (
     <>
       <Routes>

diff --git a/.../notifications/NotificationsTableHead.tsx → .../notifications/NotificationsTableHead.tsx b/.../notifications/NotificationsTableHead.tsx → .../notifications/NotificationsTableHead.tsx
diff --git a/...fications/NotificationsTableHead.types.ts → ...fications/NotificationsTableHead.types.ts b/...fications/NotificationsTableHead.types.ts → ...fications/NotificationsTableHead.types.ts
diff --git a/...tifications/NotificationsTableToolbar.tsx → ...tifications/NotificationsTableToolbar.tsx b/...tifications/NotificationsTableToolbar.tsx → ...tifications/NotificationsTableToolbar.tsx
diff --git a/...ations/NotificationsTableToolbar.types.ts → ...ations/NotificationsTableToolbar.types.ts b/...ations/NotificationsTableToolbar.types.ts → ...ations/NotificationsTableToolbar.types.ts
diff --git a/...views/notifications/NotificationsView.tsx → ...p/src/notifications/NotificationsView.tsx b/...views/notifications/NotificationsView.tsx → ...p/src/notifications/NotificationsView.tsx
@@ -39,9 +39,9 @@ import Tooltip from '@mui/material/Tooltip';
 import Typography from '@mui/material/Typography';
 import { useEffect, useState } from 'react';
 import { Link as RouterLink } from 'react-router-dom';
-import { Navbar } from '../../navbars/Navbar';
-import { ErrorSnackbar } from '../../snackbar/ErrorSnackbar';
-import { formatTime } from '../../utils/formatTime';
+import { Navbar } from '../navbars/Navbar';
+import { ErrorSnackbar } from '../snackbar/ErrorSnackbar';
+import { formatTime } from '../utils/formatTime';
 import { NavigationsTableHead } from './NotificationsTableHead';
 import { NotificationsTableToolbar } from './NotificationsTableToolbar';
 import {

diff --git a/.../notifications/NotificationsView.types.ts → .../notifications/NotificationsView.types.ts b/.../notifications/NotificationsView.types.ts → .../notifications/NotificationsView.types.ts
diff --git a/...ews/oauth2redirect/OAuth2RedirectView.tsx → ...dio-app/src/oauth2/OAuth2RedirectView.tsx b/...ews/oauth2redirect/OAuth2RedirectView.tsx → ...dio-app/src/oauth2/OAuth2RedirectView.tsx
diff --git a/...src/views/oauth2redirect/OAuth2Router.tsx → ...yn-studio-app/src/oauth2/OAuth2Router.tsx b/...src/views/oauth2redirect/OAuth2Router.tsx → ...yn-studio-app/src/oauth2/OAuth2Router.tsx
diff --git a/...c/views/organization/NewProjectDialog.tsx → ...pp/src/organizations/NewProjectDialog.tsx b/...c/views/organization/NewProjectDialog.tsx → ...pp/src/organizations/NewProjectDialog.tsx
@@ -29,7 +29,7 @@ import Typography from '@mui/material/Typography';
 import { Theme } from '@mui/material/styles';
 import { useEffect, useState } from 'react';
 import { Navigate } from 'react-router-dom';
-import { ErrorSnackbar } from '../../snackbar/ErrorSnackbar';
+import { ErrorSnackbar } from '../snackbar/ErrorSnackbar';
 import {
   CreateProjectData,
   CreateProjectSuccessPayload,

diff --git a/...s/organization/NewProjectDialog.types.tsx → .../organizations/NewProjectDialog.types.tsx b/...s/organization/NewProjectDialog.types.tsx → .../organizations/NewProjectDialog.types.tsx
diff --git a/...views/organization/OrganizationPicker.tsx → .../src/organizations/OrganizationPicker.tsx b/...views/organization/OrganizationPicker.tsx → .../src/organizations/OrganizationPicker.tsx
@@ -31,7 +31,7 @@ import MenuItem from '@mui/material/MenuItem';
 import { styled } from '@mui/material/styles';
 import { useEffect, useState } from 'react';
 import { Link as RouterLink } from 'react-router-dom';
-import { ErrorSnackbar } from '../../snackbar/ErrorSnackbar';
+import { ErrorSnackbar } from '../snackbar/ErrorSnackbar';
 import {
   GetOrganizationsData,
   GetOrganizationsVariables,

diff --git a/.../organization/OrganizationPicker.types.ts → ...organizations/OrganizationPicker.types.ts b/.../organization/OrganizationPicker.types.ts → ...organizations/OrganizationPicker.types.ts
diff --git a/...c/views/organization/OrganizationView.tsx → ...pp/src/organizations/OrganizationView.tsx b/...c/views/organization/OrganizationView.tsx → ...pp/src/organizations/OrganizationView.tsx
@@ -20,9 +20,9 @@
 import { gql, useQuery } from '@apollo/client';
 import { useEffect, useState } from 'react';
 import { useLocation, useParams } from 'react-router-dom';
-import { Navbar } from '../../navbars/Navbar';
-import { ErrorSnackbar } from '../../snackbar/ErrorSnackbar';
+import { Navbar } from '../navbars/Navbar';
 import { NotFoundView } from '../notfound/NotFoundView';
+import { ErrorSnackbar } from '../snackbar/ErrorSnackbar';
 import { OrganizationPicker } from './OrganizationPicker';
 import { GetOrganizationData, GetOrganizationVariables, OrganizationViewState } from './OrganizationView.types';
 import { OrganizationViewTabPanel } from './OrganizationViewTabPanel';

diff --git a/...ws/organization/OrganizationView.types.ts → ...c/organizations/OrganizationView.types.ts b/...ws/organization/OrganizationView.types.ts → ...c/organizations/OrganizationView.types.ts
diff --git a/...organization/OrganizationViewTabPanel.tsx → ...rganizations/OrganizationViewTabPanel.tsx b/...organization/OrganizationViewTabPanel.tsx → ...rganizations/OrganizationViewTabPanel.tsx
@@ -38,9 +38,9 @@ import {
   goToNewOrganization,
   goToNotifications,
   goToSettings,
-} from '../../palette/DefaultPaletteActions';
-import { PaletteSimpleAction } from '../../palette/Palette.types';
-import { usePalette } from '../../palette/usePalette';
+} from '../palette/DefaultPaletteActions';
+import { PaletteSimpleAction } from '../palette/Palette.types';
+import { usePalette } from '../palette/usePalette';
 import { NewProjectDialog } from './NewProjectDialog';
 import { OrganizationViewTabPanelProps, OrganizationViewTabPanelState } from './OrganizationViewTabPanel.types';
 import { OrganizationDashboard } from './dashboard/OrganizationDashboard';

diff --git a/...ization/OrganizationViewTabPanel.types.ts → ...zations/OrganizationViewTabPanel.types.ts b/...ization/OrganizationViewTabPanel.types.ts → ...zations/OrganizationViewTabPanel.types.ts
diff --git a/...views/organization/OrganizationRouter.tsx → ...src/organizations/OrganizationsRouter.tsx b/...views/organization/OrganizationRouter.tsx → ...src/organizations/OrganizationsRouter.tsx
@@ -20,7 +20,7 @@
 import { Outlet, Route, Routes } from 'react-router-dom';
 import { OrganizationView } from './OrganizationView';
 
-export const OrganizationRouter = () => {
+export const OrganizationsRouter = () => {
   return (
     <>
       <Routes>

diff --git a/...ation/dashboard/OrganizationDashboard.tsx → ...tions/dashboard/OrganizationDashboard.tsx b/...ation/dashboard/OrganizationDashboard.tsx → ...tions/dashboard/OrganizationDashboard.tsx
@@ -22,14 +22,14 @@ import ClassIcon from '@mui/icons-material/Class';
 import TimelineIcon from '@mui/icons-material/Timeline';
 import Box, { BoxProps } from '@mui/material/Box';
 import Grid from '@mui/material/Grid';
-import { styled } from '@mui/material/styles';
 import TablePagination from '@mui/material/TablePagination';
 import Typography from '@mui/material/Typography';
+import { styled } from '@mui/material/styles';
 import { useEffect, useState } from 'react';
-import { ActivityTimeline } from '../../../activity/ActivityTimeline';
-import { ErrorSnackbar } from '../../../snackbar/ErrorSnackbar';
-import { CreatedOn } from '../../../widgets/CreatedOn';
-import { LastModifiedOn } from '../../../widgets/LastModifiedOn';
+import { ActivityTimeline } from '../../activity/ActivityTimeline';
+import { ErrorSnackbar } from '../../snackbar/ErrorSnackbar';
+import { CreatedOn } from '../../widgets/CreatedOn';
+import { LastModifiedOn } from '../../widgets/LastModifiedOn';
 import {
   ActivityAreaProps,
   GetOrganizationDashboardData,

diff --git a/.../dashboard/OrganizationDashboard.types.ts → .../dashboard/OrganizationDashboard.types.ts b/.../dashboard/OrganizationDashboard.types.ts → .../dashboard/OrganizationDashboard.types.ts
diff --git a/...ws/organization/dashboard/ProjectCard.tsx → ...c/organizations/dashboard/ProjectCard.tsx b/...ws/organization/dashboard/ProjectCard.tsx → ...c/organizations/dashboard/ProjectCard.tsx
diff --git a/...ganization/dashboard/ProjectCard.types.ts → ...anizations/dashboard/ProjectCard.types.ts b/...ganization/dashboard/ProjectCard.types.ts → ...anizations/dashboard/ProjectCard.types.ts