diff --git a/src/app/(app)/NavBar.js b/src/app/(main)/NavBar.js
similarity index 100%
rename from src/app/(app)/NavBar.js
rename to src/app/(main)/NavBar.js
diff --git a/src/app/(app)/NavBar.module.css b/src/app/(main)/NavBar.module.css
similarity index 100%
rename from src/app/(app)/NavBar.module.css
rename to src/app/(main)/NavBar.module.css
diff --git a/src/app/(app)/Shell.tsx b/src/app/(main)/Shell.tsx
similarity index 100%
rename from src/app/(app)/Shell.tsx
rename to src/app/(main)/Shell.tsx
diff --git a/src/app/(app)/console/TestConsole.js b/src/app/(main)/console/TestConsole.js
similarity index 98%
rename from src/app/(app)/console/TestConsole.js
rename to src/app/(main)/console/TestConsole.js
index 82edd191..1ae3eaf1 100644
--- a/src/app/(app)/console/TestConsole.js
+++ b/src/app/(main)/console/TestConsole.js
@@ -3,7 +3,7 @@ import WebsiteSelect from 'components/input/WebsiteSelect';
 import Page from 'components/layout/Page';
 import PageHeader from 'components/layout/PageHeader';
 import EventsChart from 'components/metrics/EventsChart';
-import WebsiteChart from '../websites/[id]/WebsiteChart';
+import WebsiteChart from '../../(main)/websites/[id]/WebsiteChart';
 import useApi from 'components/hooks/useApi';
 import Head from 'next/head';
 import Link from 'next/link';
diff --git a/src/app/(app)/console/TestConsole.module.css b/src/app/(main)/console/TestConsole.module.css
similarity index 100%
rename from src/app/(app)/console/TestConsole.module.css
rename to src/app/(main)/console/TestConsole.module.css
diff --git a/src/app/(app)/console/[[...id]]/page.tsx b/src/app/(main)/console/[[...id]]/page.tsx
similarity index 100%
rename from src/app/(app)/console/[[...id]]/page.tsx
rename to src/app/(main)/console/[[...id]]/page.tsx
diff --git a/src/app/(app)/dashboard/Dashboard.js b/src/app/(main)/dashboard/Dashboard.js
similarity index 90%
rename from src/app/(app)/dashboard/Dashboard.js
rename to src/app/(main)/dashboard/Dashboard.js
index 6520323e..5fb65f23 100644
--- a/src/app/(app)/dashboard/Dashboard.js
+++ b/src/app/(main)/dashboard/Dashboard.js
@@ -3,9 +3,9 @@ import { Button, Icon, Icons, Loading, Text } from 'react-basics';
 import Link from 'next/link';
 import PageHeader from 'components/layout/PageHeader';
 import Pager from 'components/common/Pager';
-import WebsiteChartList from '../websites/[id]/WebsiteChartList';
-import DashboardSettingsButton from 'app/(app)/dashboard/DashboardSettingsButton';
-import DashboardEdit from 'app/(app)/dashboard/DashboardEdit';
+import WebsiteChartList from '../../(main)/websites/[id]/WebsiteChartList';
+import DashboardSettingsButton from 'app/(main)/dashboard/DashboardSettingsButton';
+import DashboardEdit from 'app/(main)/dashboard/DashboardEdit';
 import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
 import useApi from 'components/hooks/useApi';
 import useDashboard from 'store/dashboard';
diff --git a/src/app/(app)/dashboard/DashboardEdit.js b/src/app/(main)/dashboard/DashboardEdit.js
similarity index 100%
rename from src/app/(app)/dashboard/DashboardEdit.js
rename to src/app/(main)/dashboard/DashboardEdit.js
diff --git a/src/app/(app)/dashboard/DashboardEdit.module.css b/src/app/(main)/dashboard/DashboardEdit.module.css
similarity index 100%
rename from src/app/(app)/dashboard/DashboardEdit.module.css
rename to src/app/(main)/dashboard/DashboardEdit.module.css
diff --git a/src/app/(app)/dashboard/DashboardSettingsButton.js b/src/app/(main)/dashboard/DashboardSettingsButton.js
similarity index 100%
rename from src/app/(app)/dashboard/DashboardSettingsButton.js
rename to src/app/(main)/dashboard/DashboardSettingsButton.js
diff --git a/src/app/(app)/dashboard/DashboardSettingsButton.module.css b/src/app/(main)/dashboard/DashboardSettingsButton.module.css
similarity index 100%
rename from src/app/(app)/dashboard/DashboardSettingsButton.module.css
rename to src/app/(main)/dashboard/DashboardSettingsButton.module.css
diff --git a/src/app/(app)/dashboard/page.tsx b/src/app/(main)/dashboard/page.tsx
similarity index 75%
rename from src/app/(app)/dashboard/page.tsx
rename to src/app/(main)/dashboard/page.tsx
index 7e7c095c..91cc9c6e 100644
--- a/src/app/(app)/dashboard/page.tsx
+++ b/src/app/(main)/dashboard/page.tsx
@@ -1,4 +1,4 @@
-import Dashboard from 'app/(app)/dashboard/Dashboard';
+import Dashboard from 'app/(main)/dashboard/Dashboard';
 import { Metadata } from 'next';
 
 export default function DashboardPage() {
diff --git a/src/app/(app)/layout.module.css b/src/app/(main)/layout.module.css
similarity index 100%
rename from src/app/(app)/layout.module.css
rename to src/app/(main)/layout.module.css
diff --git a/src/app/(app)/layout.tsx b/src/app/(main)/layout.tsx
similarity index 100%
rename from src/app/(app)/layout.tsx
rename to src/app/(main)/layout.tsx
diff --git a/src/app/(app)/reports/BaseParameters.js b/src/app/(main)/reports/BaseParameters.js
similarity index 100%
rename from src/app/(app)/reports/BaseParameters.js
rename to src/app/(main)/reports/BaseParameters.js
diff --git a/src/app/(app)/reports/FieldAddForm.js b/src/app/(main)/reports/FieldAddForm.js
similarity index 100%
rename from src/app/(app)/reports/FieldAddForm.js
rename to src/app/(main)/reports/FieldAddForm.js
diff --git a/src/app/(app)/reports/FieldAddForm.module.css b/src/app/(main)/reports/FieldAddForm.module.css
similarity index 100%
rename from src/app/(app)/reports/FieldAddForm.module.css
rename to src/app/(main)/reports/FieldAddForm.module.css
diff --git a/src/app/(app)/reports/FieldAggregateForm.js b/src/app/(main)/reports/FieldAggregateForm.js
similarity index 100%
rename from src/app/(app)/reports/FieldAggregateForm.js
rename to src/app/(main)/reports/FieldAggregateForm.js
diff --git a/src/app/(app)/reports/FieldFilterForm.js b/src/app/(main)/reports/FieldFilterForm.js
similarity index 100%
rename from src/app/(app)/reports/FieldFilterForm.js
rename to src/app/(main)/reports/FieldFilterForm.js
diff --git a/src/app/(app)/reports/FieldFilterForm.module.css b/src/app/(main)/reports/FieldFilterForm.module.css
similarity index 100%
rename from src/app/(app)/reports/FieldFilterForm.module.css
rename to src/app/(main)/reports/FieldFilterForm.module.css
diff --git a/src/app/(app)/reports/FieldSelectForm.js b/src/app/(main)/reports/FieldSelectForm.js
similarity index 100%
rename from src/app/(app)/reports/FieldSelectForm.js
rename to src/app/(main)/reports/FieldSelectForm.js
diff --git a/src/app/(app)/reports/FieldSelectForm.module.css b/src/app/(main)/reports/FieldSelectForm.module.css
similarity index 100%
rename from src/app/(app)/reports/FieldSelectForm.module.css
rename to src/app/(main)/reports/FieldSelectForm.module.css
diff --git a/src/app/(app)/reports/FilterSelectForm.js b/src/app/(main)/reports/FilterSelectForm.js
similarity index 100%
rename from src/app/(app)/reports/FilterSelectForm.js
rename to src/app/(main)/reports/FilterSelectForm.js
diff --git a/src/app/(app)/reports/ParameterList.js b/src/app/(main)/reports/ParameterList.js
similarity index 100%
rename from src/app/(app)/reports/ParameterList.js
rename to src/app/(main)/reports/ParameterList.js
diff --git a/src/app/(app)/reports/ParameterList.module.css b/src/app/(main)/reports/ParameterList.module.css
similarity index 100%
rename from src/app/(app)/reports/ParameterList.module.css
rename to src/app/(main)/reports/ParameterList.module.css
diff --git a/src/app/(app)/reports/PopupForm.js b/src/app/(main)/reports/PopupForm.js
similarity index 100%
rename from src/app/(app)/reports/PopupForm.js
rename to src/app/(main)/reports/PopupForm.js
diff --git a/src/app/(app)/reports/PopupForm.module.css b/src/app/(main)/reports/PopupForm.module.css
similarity index 100%
rename from src/app/(app)/reports/PopupForm.module.css
rename to src/app/(main)/reports/PopupForm.module.css
diff --git a/src/app/(app)/reports/Report.js b/src/app/(main)/reports/Report.js
similarity index 100%
rename from src/app/(app)/reports/Report.js
rename to src/app/(main)/reports/Report.js
diff --git a/src/app/(app)/reports/Report.module.css b/src/app/(main)/reports/Report.module.css
similarity index 100%
rename from src/app/(app)/reports/Report.module.css
rename to src/app/(main)/reports/Report.module.css
diff --git a/src/app/(app)/reports/ReportBody.js b/src/app/(main)/reports/ReportBody.js
similarity index 100%
rename from src/app/(app)/reports/ReportBody.js
rename to src/app/(main)/reports/ReportBody.js
diff --git a/src/app/(app)/reports/ReportHeader.js b/src/app/(main)/reports/ReportHeader.js
similarity index 100%
rename from src/app/(app)/reports/ReportHeader.js
rename to src/app/(main)/reports/ReportHeader.js
diff --git a/src/app/(app)/reports/ReportHeader.module.css b/src/app/(main)/reports/ReportHeader.module.css
similarity index 100%
rename from src/app/(app)/reports/ReportHeader.module.css
rename to src/app/(main)/reports/ReportHeader.module.css
diff --git a/src/app/(app)/reports/ReportMenu.js b/src/app/(main)/reports/ReportMenu.js
similarity index 100%
rename from src/app/(app)/reports/ReportMenu.js
rename to src/app/(main)/reports/ReportMenu.js
diff --git a/src/app/(app)/reports/ReportsHeader.js b/src/app/(main)/reports/ReportsHeader.js
similarity index 100%
rename from src/app/(app)/reports/ReportsHeader.js
rename to src/app/(main)/reports/ReportsHeader.js
diff --git a/src/app/(app)/reports/ReportsList.js b/src/app/(main)/reports/ReportsList.js
similarity index 100%
rename from src/app/(app)/reports/ReportsList.js
rename to src/app/(main)/reports/ReportsList.js
diff --git a/src/app/(app)/reports/ReportsTable.js b/src/app/(main)/reports/ReportsTable.js
similarity index 100%
rename from src/app/(app)/reports/ReportsTable.js
rename to src/app/(main)/reports/ReportsTable.js
diff --git a/src/app/(app)/reports/[id]/ReportDetails.js b/src/app/(main)/reports/[id]/ReportDetails.js
similarity index 100%
rename from src/app/(app)/reports/[id]/ReportDetails.js
rename to src/app/(main)/reports/[id]/ReportDetails.js
diff --git a/src/app/(app)/reports/[id]/page.tsx b/src/app/(main)/reports/[id]/page.tsx
similarity index 100%
rename from src/app/(app)/reports/[id]/page.tsx
rename to src/app/(main)/reports/[id]/page.tsx
diff --git a/src/app/(app)/reports/create/ReportTemplates.js b/src/app/(main)/reports/create/ReportTemplates.js
similarity index 100%
rename from src/app/(app)/reports/create/ReportTemplates.js
rename to src/app/(main)/reports/create/ReportTemplates.js
diff --git a/src/app/(app)/reports/create/ReportTemplates.module.css b/src/app/(main)/reports/create/ReportTemplates.module.css
similarity index 100%
rename from src/app/(app)/reports/create/ReportTemplates.module.css
rename to src/app/(main)/reports/create/ReportTemplates.module.css
diff --git a/src/app/(app)/reports/create/page.tsx b/src/app/(main)/reports/create/page.tsx
similarity index 100%
rename from src/app/(app)/reports/create/page.tsx
rename to src/app/(main)/reports/create/page.tsx
diff --git a/src/app/(app)/reports/event-data/EventDataParameters.js b/src/app/(main)/reports/event-data/EventDataParameters.js
similarity index 100%
rename from src/app/(app)/reports/event-data/EventDataParameters.js
rename to src/app/(main)/reports/event-data/EventDataParameters.js
diff --git a/src/app/(app)/reports/event-data/EventDataParameters.module.css b/src/app/(main)/reports/event-data/EventDataParameters.module.css
similarity index 100%
rename from src/app/(app)/reports/event-data/EventDataParameters.module.css
rename to src/app/(main)/reports/event-data/EventDataParameters.module.css
diff --git a/src/app/(app)/reports/event-data/EventDataReport.js b/src/app/(main)/reports/event-data/EventDataReport.js
similarity index 100%
rename from src/app/(app)/reports/event-data/EventDataReport.js
rename to src/app/(main)/reports/event-data/EventDataReport.js
diff --git a/src/app/(app)/reports/event-data/EventDataTable.js b/src/app/(main)/reports/event-data/EventDataTable.js
similarity index 100%
rename from src/app/(app)/reports/event-data/EventDataTable.js
rename to src/app/(main)/reports/event-data/EventDataTable.js
diff --git a/src/app/(app)/reports/funnel/FunnelChart.js b/src/app/(main)/reports/funnel/FunnelChart.js
similarity index 100%
rename from src/app/(app)/reports/funnel/FunnelChart.js
rename to src/app/(main)/reports/funnel/FunnelChart.js
diff --git a/src/app/(app)/reports/funnel/FunnelChart.module.css b/src/app/(main)/reports/funnel/FunnelChart.module.css
similarity index 100%
rename from src/app/(app)/reports/funnel/FunnelChart.module.css
rename to src/app/(main)/reports/funnel/FunnelChart.module.css
diff --git a/src/app/(app)/reports/funnel/FunnelParameters.js b/src/app/(main)/reports/funnel/FunnelParameters.js
similarity index 100%
rename from src/app/(app)/reports/funnel/FunnelParameters.js
rename to src/app/(main)/reports/funnel/FunnelParameters.js
diff --git a/src/app/(app)/reports/funnel/FunnelReport.js b/src/app/(main)/reports/funnel/FunnelReport.js
similarity index 100%
rename from src/app/(app)/reports/funnel/FunnelReport.js
rename to src/app/(main)/reports/funnel/FunnelReport.js
diff --git a/src/app/(app)/reports/funnel/FunnelReport.module.css b/src/app/(main)/reports/funnel/FunnelReport.module.css
similarity index 100%
rename from src/app/(app)/reports/funnel/FunnelReport.module.css
rename to src/app/(main)/reports/funnel/FunnelReport.module.css
diff --git a/src/app/(app)/reports/funnel/FunnelTable.js b/src/app/(main)/reports/funnel/FunnelTable.js
similarity index 100%
rename from src/app/(app)/reports/funnel/FunnelTable.js
rename to src/app/(main)/reports/funnel/FunnelTable.js
diff --git a/src/app/(app)/reports/funnel/UrlAddForm.js b/src/app/(main)/reports/funnel/UrlAddForm.js
similarity index 100%
rename from src/app/(app)/reports/funnel/UrlAddForm.js
rename to src/app/(main)/reports/funnel/UrlAddForm.js
diff --git a/src/app/(app)/reports/funnel/UrlAddForm.module.css b/src/app/(main)/reports/funnel/UrlAddForm.module.css
similarity index 100%
rename from src/app/(app)/reports/funnel/UrlAddForm.module.css
rename to src/app/(main)/reports/funnel/UrlAddForm.module.css
diff --git a/src/app/(app)/reports/funnel/page.tsx b/src/app/(main)/reports/funnel/page.tsx
similarity index 100%
rename from src/app/(app)/reports/funnel/page.tsx
rename to src/app/(main)/reports/funnel/page.tsx
diff --git a/src/app/(app)/reports/insights/InsightsParameters.js b/src/app/(main)/reports/insights/InsightsParameters.js
similarity index 100%
rename from src/app/(app)/reports/insights/InsightsParameters.js
rename to src/app/(main)/reports/insights/InsightsParameters.js
diff --git a/src/app/(app)/reports/insights/InsightsParameters.module.css b/src/app/(main)/reports/insights/InsightsParameters.module.css
similarity index 100%
rename from src/app/(app)/reports/insights/InsightsParameters.module.css
rename to src/app/(main)/reports/insights/InsightsParameters.module.css
diff --git a/src/app/(app)/reports/insights/InsightsReport.js b/src/app/(main)/reports/insights/InsightsReport.js
similarity index 100%
rename from src/app/(app)/reports/insights/InsightsReport.js
rename to src/app/(main)/reports/insights/InsightsReport.js
diff --git a/src/app/(app)/reports/insights/InsightsTable.js b/src/app/(main)/reports/insights/InsightsTable.js
similarity index 100%
rename from src/app/(app)/reports/insights/InsightsTable.js
rename to src/app/(main)/reports/insights/InsightsTable.js
diff --git a/src/app/(app)/reports/insights/page.tsx b/src/app/(main)/reports/insights/page.tsx
similarity index 100%
rename from src/app/(app)/reports/insights/page.tsx
rename to src/app/(main)/reports/insights/page.tsx
diff --git a/src/app/(app)/reports/page.tsx b/src/app/(main)/reports/page.tsx
similarity index 100%
rename from src/app/(app)/reports/page.tsx
rename to src/app/(main)/reports/page.tsx
diff --git a/src/app/(app)/reports/retention/RetentionParameters.js b/src/app/(main)/reports/retention/RetentionParameters.js
similarity index 100%
rename from src/app/(app)/reports/retention/RetentionParameters.js
rename to src/app/(main)/reports/retention/RetentionParameters.js
diff --git a/src/app/(app)/reports/retention/RetentionReport.js b/src/app/(main)/reports/retention/RetentionReport.js
similarity index 100%
rename from src/app/(app)/reports/retention/RetentionReport.js
rename to src/app/(main)/reports/retention/RetentionReport.js
diff --git a/src/app/(app)/reports/retention/RetentionReport.module.css b/src/app/(main)/reports/retention/RetentionReport.module.css
similarity index 100%
rename from src/app/(app)/reports/retention/RetentionReport.module.css
rename to src/app/(main)/reports/retention/RetentionReport.module.css
diff --git a/src/app/(app)/reports/retention/RetentionTable.js b/src/app/(main)/reports/retention/RetentionTable.js
similarity index 100%
rename from src/app/(app)/reports/retention/RetentionTable.js
rename to src/app/(main)/reports/retention/RetentionTable.js
diff --git a/src/app/(app)/reports/retention/RetentionTable.module.css b/src/app/(main)/reports/retention/RetentionTable.module.css
similarity index 100%
rename from src/app/(app)/reports/retention/RetentionTable.module.css
rename to src/app/(main)/reports/retention/RetentionTable.module.css
diff --git a/src/app/(app)/reports/retention/page.js b/src/app/(main)/reports/retention/page.js
similarity index 100%
rename from src/app/(app)/reports/retention/page.js
rename to src/app/(main)/reports/retention/page.js
diff --git a/src/app/(app)/settings/layout.module.css b/src/app/(main)/settings/layout.module.css
similarity index 100%
rename from src/app/(app)/settings/layout.module.css
rename to src/app/(main)/settings/layout.module.css
diff --git a/src/app/(app)/settings/layout.tsx b/src/app/(main)/settings/layout.tsx
similarity index 100%
rename from src/app/(app)/settings/layout.tsx
rename to src/app/(main)/settings/layout.tsx
diff --git a/src/app/(app)/settings/profile/DateRangeSetting.js b/src/app/(main)/settings/profile/DateRangeSetting.js
similarity index 100%
rename from src/app/(app)/settings/profile/DateRangeSetting.js
rename to src/app/(main)/settings/profile/DateRangeSetting.js
diff --git a/src/app/(app)/settings/profile/LanguageSetting.js b/src/app/(main)/settings/profile/LanguageSetting.js
similarity index 100%
rename from src/app/(app)/settings/profile/LanguageSetting.js
rename to src/app/(main)/settings/profile/LanguageSetting.js
diff --git a/src/app/(app)/settings/profile/PasswordChangeButton.js b/src/app/(main)/settings/profile/PasswordChangeButton.js
similarity index 91%
rename from src/app/(app)/settings/profile/PasswordChangeButton.js
rename to src/app/(main)/settings/profile/PasswordChangeButton.js
index 692f6d6e..29ec844a 100644
--- a/src/app/(app)/settings/profile/PasswordChangeButton.js
+++ b/src/app/(main)/settings/profile/PasswordChangeButton.js
@@ -1,5 +1,5 @@
 import { Button, Icon, Text, useToasts, ModalTrigger, Modal } from 'react-basics';
-import PasswordEditForm from 'app/(app)/settings/profile/PasswordEditForm';
+import PasswordEditForm from 'app/(main)/settings/profile/PasswordEditForm';
 import Icons from 'components/icons';
 import useMessages from 'components/hooks/useMessages';
 
diff --git a/src/app/(app)/settings/profile/PasswordEditForm.js b/src/app/(main)/settings/profile/PasswordEditForm.js
similarity index 100%
rename from src/app/(app)/settings/profile/PasswordEditForm.js
rename to src/app/(main)/settings/profile/PasswordEditForm.js
diff --git a/src/app/(app)/settings/profile/ProfileHeader.js b/src/app/(main)/settings/profile/ProfileHeader.js
similarity index 100%
rename from src/app/(app)/settings/profile/ProfileHeader.js
rename to src/app/(main)/settings/profile/ProfileHeader.js
diff --git a/src/app/(app)/settings/profile/ProfileSettings.js b/src/app/(main)/settings/profile/ProfileSettings.js
similarity index 84%
rename from src/app/(app)/settings/profile/ProfileSettings.js
rename to src/app/(main)/settings/profile/ProfileSettings.js
index 8510efbb..89c6354c 100644
--- a/src/app/(app)/settings/profile/ProfileSettings.js
+++ b/src/app/(main)/settings/profile/ProfileSettings.js
@@ -1,9 +1,9 @@
 'use client';
 import { Form, FormRow } from 'react-basics';
-import TimezoneSetting from 'app/(app)/settings/profile/TimezoneSetting';
-import DateRangeSetting from 'app/(app)/settings/profile/DateRangeSetting';
-import LanguageSetting from 'app/(app)/settings/profile/LanguageSetting';
-import ThemeSetting from 'app/(app)/settings/profile/ThemeSetting';
+import TimezoneSetting from 'app/(main)/settings/profile/TimezoneSetting';
+import DateRangeSetting from 'app/(main)/settings/profile/DateRangeSetting';
+import LanguageSetting from 'app/(main)/settings/profile/LanguageSetting';
+import ThemeSetting from 'app/(main)/settings/profile/ThemeSetting';
 import PasswordChangeButton from './PasswordChangeButton';
 import useUser from 'components/hooks/useUser';
 import useMessages from 'components/hooks/useMessages';
diff --git a/src/app/(app)/settings/profile/ThemeSetting.js b/src/app/(main)/settings/profile/ThemeSetting.js
similarity index 100%
rename from src/app/(app)/settings/profile/ThemeSetting.js
rename to src/app/(main)/settings/profile/ThemeSetting.js
diff --git a/src/app/(app)/settings/profile/ThemeSetting.module.css b/src/app/(main)/settings/profile/ThemeSetting.module.css
similarity index 100%
rename from src/app/(app)/settings/profile/ThemeSetting.module.css
rename to src/app/(main)/settings/profile/ThemeSetting.module.css
diff --git a/src/app/(app)/settings/profile/TimezoneSetting.js b/src/app/(main)/settings/profile/TimezoneSetting.js
similarity index 100%
rename from src/app/(app)/settings/profile/TimezoneSetting.js
rename to src/app/(main)/settings/profile/TimezoneSetting.js
diff --git a/src/app/(app)/settings/profile/page.js b/src/app/(main)/settings/profile/page.js
similarity index 100%
rename from src/app/(app)/settings/profile/page.js
rename to src/app/(main)/settings/profile/page.js
diff --git a/src/app/(app)/settings/teams/TeamAddForm.js b/src/app/(main)/settings/teams/TeamAddForm.js
similarity index 100%
rename from src/app/(app)/settings/teams/TeamAddForm.js
rename to src/app/(main)/settings/teams/TeamAddForm.js
diff --git a/src/app/(app)/settings/teams/TeamDeleteButton.js b/src/app/(main)/settings/teams/TeamDeleteButton.js
similarity index 100%
rename from src/app/(app)/settings/teams/TeamDeleteButton.js
rename to src/app/(main)/settings/teams/TeamDeleteButton.js
diff --git a/src/app/(app)/settings/teams/TeamDeleteForm.js b/src/app/(main)/settings/teams/TeamDeleteForm.js
similarity index 100%
rename from src/app/(app)/settings/teams/TeamDeleteForm.js
rename to src/app/(main)/settings/teams/TeamDeleteForm.js
diff --git a/src/app/(app)/settings/teams/TeamJoinForm.js b/src/app/(main)/settings/teams/TeamJoinForm.js
similarity index 100%
rename from src/app/(app)/settings/teams/TeamJoinForm.js
rename to src/app/(main)/settings/teams/TeamJoinForm.js
diff --git a/src/app/(app)/settings/teams/TeamLeaveButton.js b/src/app/(main)/settings/teams/TeamLeaveButton.js
similarity index 100%
rename from src/app/(app)/settings/teams/TeamLeaveButton.js
rename to src/app/(main)/settings/teams/TeamLeaveButton.js
diff --git a/src/app/(app)/settings/teams/TeamLeaveForm.js b/src/app/(main)/settings/teams/TeamLeaveForm.js
similarity index 100%
rename from src/app/(app)/settings/teams/TeamLeaveForm.js
rename to src/app/(main)/settings/teams/TeamLeaveForm.js
diff --git a/src/app/(app)/settings/teams/TeamWebsiteRemoveButton.js b/src/app/(main)/settings/teams/TeamWebsiteRemoveButton.js
similarity index 100%
rename from src/app/(app)/settings/teams/TeamWebsiteRemoveButton.js
rename to src/app/(main)/settings/teams/TeamWebsiteRemoveButton.js
diff --git a/src/app/(app)/settings/teams/TeamsAddButton.js b/src/app/(main)/settings/teams/TeamsAddButton.js
similarity index 100%
rename from src/app/(app)/settings/teams/TeamsAddButton.js
rename to src/app/(main)/settings/teams/TeamsAddButton.js
diff --git a/src/app/(app)/settings/teams/TeamsHeader.js b/src/app/(main)/settings/teams/TeamsHeader.js
similarity index 100%
rename from src/app/(app)/settings/teams/TeamsHeader.js
rename to src/app/(main)/settings/teams/TeamsHeader.js
diff --git a/src/app/(app)/settings/teams/TeamsJoinButton.js b/src/app/(main)/settings/teams/TeamsJoinButton.js
similarity index 100%
rename from src/app/(app)/settings/teams/TeamsJoinButton.js
rename to src/app/(main)/settings/teams/TeamsJoinButton.js
diff --git a/src/app/(app)/settings/teams/TeamsList.js b/src/app/(main)/settings/teams/TeamsList.js
similarity index 89%
rename from src/app/(app)/settings/teams/TeamsList.js
rename to src/app/(main)/settings/teams/TeamsList.js
index 78e0c299..1983ceae 100644
--- a/src/app/(app)/settings/teams/TeamsList.js
+++ b/src/app/(main)/settings/teams/TeamsList.js
@@ -1,6 +1,6 @@
 'use client';
 import DataTable from 'components/common/DataTable';
-import TeamsTable from 'app/(app)/settings/teams/TeamsTable';
+import TeamsTable from 'app/(main)/settings/teams/TeamsTable';
 import useApi from 'components/hooks/useApi';
 import useFilterQuery from 'components/hooks/useFilterQuery';
 
diff --git a/src/app/(app)/settings/teams/TeamsTable.js b/src/app/(main)/settings/teams/TeamsTable.js
similarity index 100%
rename from src/app/(app)/settings/teams/TeamsTable.js
rename to src/app/(main)/settings/teams/TeamsTable.js
diff --git a/src/app/(app)/settings/teams/WebsiteTags.js b/src/app/(main)/settings/teams/WebsiteTags.js
similarity index 100%
rename from src/app/(app)/settings/teams/WebsiteTags.js
rename to src/app/(main)/settings/teams/WebsiteTags.js
diff --git a/src/app/(app)/settings/teams/WebsiteTags.module.css b/src/app/(main)/settings/teams/WebsiteTags.module.css
similarity index 100%
rename from src/app/(app)/settings/teams/WebsiteTags.module.css
rename to src/app/(main)/settings/teams/WebsiteTags.module.css
diff --git a/src/app/(app)/settings/teams/[id]/TeamAddWebsiteForm.js b/src/app/(main)/settings/teams/[id]/TeamAddWebsiteForm.js
similarity index 100%
rename from src/app/(app)/settings/teams/[id]/TeamAddWebsiteForm.js
rename to src/app/(main)/settings/teams/[id]/TeamAddWebsiteForm.js
diff --git a/src/app/(app)/settings/teams/[id]/TeamEditForm.js b/src/app/(main)/settings/teams/[id]/TeamEditForm.js
similarity index 100%
rename from src/app/(app)/settings/teams/[id]/TeamEditForm.js
rename to src/app/(main)/settings/teams/[id]/TeamEditForm.js
diff --git a/src/app/(app)/settings/teams/[id]/TeamMemberRemoveButton.js b/src/app/(main)/settings/teams/[id]/TeamMemberRemoveButton.js
similarity index 100%
rename from src/app/(app)/settings/teams/[id]/TeamMemberRemoveButton.js
rename to src/app/(main)/settings/teams/[id]/TeamMemberRemoveButton.js
diff --git a/src/app/(app)/settings/teams/[id]/TeamMembers.js b/src/app/(main)/settings/teams/[id]/TeamMembers.js
similarity index 100%
rename from src/app/(app)/settings/teams/[id]/TeamMembers.js
rename to src/app/(main)/settings/teams/[id]/TeamMembers.js
diff --git a/src/app/(app)/settings/teams/[id]/TeamMembersTable.js b/src/app/(main)/settings/teams/[id]/TeamMembersTable.js
similarity index 100%
rename from src/app/(app)/settings/teams/[id]/TeamMembersTable.js
rename to src/app/(main)/settings/teams/[id]/TeamMembersTable.js
diff --git a/src/app/(app)/settings/teams/[id]/TeamSettings.js b/src/app/(main)/settings/teams/[id]/TeamSettings.js
similarity index 100%
rename from src/app/(app)/settings/teams/[id]/TeamSettings.js
rename to src/app/(main)/settings/teams/[id]/TeamSettings.js
diff --git a/src/app/(app)/settings/teams/[id]/TeamWebsites.js b/src/app/(main)/settings/teams/[id]/TeamWebsites.js
similarity index 100%
rename from src/app/(app)/settings/teams/[id]/TeamWebsites.js
rename to src/app/(main)/settings/teams/[id]/TeamWebsites.js
diff --git a/src/app/(app)/settings/teams/[id]/TeamWebsitesTable.js b/src/app/(main)/settings/teams/[id]/TeamWebsitesTable.js
similarity index 100%
rename from src/app/(app)/settings/teams/[id]/TeamWebsitesTable.js
rename to src/app/(main)/settings/teams/[id]/TeamWebsitesTable.js
diff --git a/src/app/(app)/settings/teams/[id]/page.js b/src/app/(main)/settings/teams/[id]/page.js
similarity index 100%
rename from src/app/(app)/settings/teams/[id]/page.js
rename to src/app/(main)/settings/teams/[id]/page.js
diff --git a/src/app/(app)/settings/teams/page.js b/src/app/(main)/settings/teams/page.js
similarity index 76%
rename from src/app/(app)/settings/teams/page.js
rename to src/app/(main)/settings/teams/page.js
index 606c4572..d2d0ff16 100644
--- a/src/app/(app)/settings/teams/page.js
+++ b/src/app/(main)/settings/teams/page.js
@@ -1,4 +1,4 @@
-import TeamsList from 'app/(app)/settings/teams/TeamsList';
+import TeamsList from 'app/(main)/settings/teams/TeamsList';
 import TeamsHeader from './TeamsHeader';
 
 export default function () {
diff --git a/src/app/(app)/settings/users/UserAddButton.js b/src/app/(main)/settings/users/UserAddButton.js
similarity index 100%
rename from src/app/(app)/settings/users/UserAddButton.js
rename to src/app/(main)/settings/users/UserAddButton.js
diff --git a/src/app/(app)/settings/users/UserAddForm.js b/src/app/(main)/settings/users/UserAddForm.js
similarity index 100%
rename from src/app/(app)/settings/users/UserAddForm.js
rename to src/app/(main)/settings/users/UserAddForm.js
diff --git a/src/app/(app)/settings/users/UserDeleteButton.js b/src/app/(main)/settings/users/UserDeleteButton.js
similarity index 100%
rename from src/app/(app)/settings/users/UserDeleteButton.js
rename to src/app/(main)/settings/users/UserDeleteButton.js
diff --git a/src/app/(app)/settings/users/UserDeleteForm.js b/src/app/(main)/settings/users/UserDeleteForm.js
similarity index 100%
rename from src/app/(app)/settings/users/UserDeleteForm.js
rename to src/app/(main)/settings/users/UserDeleteForm.js
diff --git a/src/app/(app)/settings/users/UserEditForm.js b/src/app/(main)/settings/users/UserEditForm.js
similarity index 100%
rename from src/app/(app)/settings/users/UserEditForm.js
rename to src/app/(main)/settings/users/UserEditForm.js
diff --git a/src/app/(app)/settings/users/UserWebsites.js b/src/app/(main)/settings/users/UserWebsites.js
similarity index 93%
rename from src/app/(app)/settings/users/UserWebsites.js
rename to src/app/(main)/settings/users/UserWebsites.js
index f88ec78a..333ba5d1 100644
--- a/src/app/(app)/settings/users/UserWebsites.js
+++ b/src/app/(main)/settings/users/UserWebsites.js
@@ -1,6 +1,6 @@
 import Page from 'components/layout/Page';
 import useApi from 'components/hooks/useApi';
-import WebsitesTable from 'app/(app)/settings/websites/WebsitesTable';
+import WebsitesTable from 'app/(main)/settings/websites/WebsitesTable';
 import useApiFilter from 'components/hooks/useApiFilter';
 
 export function UserWebsites({ userId }) {
diff --git a/src/app/(app)/settings/users/UsersHeader.js b/src/app/(main)/settings/users/UsersHeader.js
similarity index 100%
rename from src/app/(app)/settings/users/UsersHeader.js
rename to src/app/(main)/settings/users/UsersHeader.js
diff --git a/src/app/(app)/settings/users/UsersList.js b/src/app/(main)/settings/users/UsersList.js
similarity index 100%
rename from src/app/(app)/settings/users/UsersList.js
rename to src/app/(main)/settings/users/UsersList.js
diff --git a/src/app/(app)/settings/users/UsersTable.js b/src/app/(main)/settings/users/UsersTable.js
similarity index 100%
rename from src/app/(app)/settings/users/UsersTable.js
rename to src/app/(main)/settings/users/UsersTable.js
diff --git a/src/app/(app)/settings/users/[id]/UserSettings.js b/src/app/(main)/settings/users/[id]/UserSettings.js
similarity index 100%
rename from src/app/(app)/settings/users/[id]/UserSettings.js
rename to src/app/(main)/settings/users/[id]/UserSettings.js
diff --git a/src/app/(app)/settings/users/[id]/page.js b/src/app/(main)/settings/users/[id]/page.js
similarity index 100%
rename from src/app/(app)/settings/users/[id]/page.js
rename to src/app/(main)/settings/users/[id]/page.js
diff --git a/src/app/(app)/settings/users/page.tsx b/src/app/(main)/settings/users/page.tsx
similarity index 77%
rename from src/app/(app)/settings/users/page.tsx
rename to src/app/(main)/settings/users/page.tsx
index 25545083..b0af9fbb 100644
--- a/src/app/(app)/settings/users/page.tsx
+++ b/src/app/(main)/settings/users/page.tsx
@@ -1,4 +1,4 @@
-import UsersList from 'app/(app)/settings/users/UsersList';
+import UsersList from 'app/(main)/settings/users/UsersList';
 import { Metadata } from 'next';
 
 export default function () {
diff --git a/src/app/(app)/settings/websites/WebsiteAddButton.js b/src/app/(main)/settings/websites/WebsiteAddButton.js
similarity index 100%
rename from src/app/(app)/settings/websites/WebsiteAddButton.js
rename to src/app/(main)/settings/websites/WebsiteAddButton.js
diff --git a/src/app/(app)/settings/websites/WebsiteAddForm.js b/src/app/(main)/settings/websites/WebsiteAddForm.js
similarity index 100%
rename from src/app/(app)/settings/websites/WebsiteAddForm.js
rename to src/app/(main)/settings/websites/WebsiteAddForm.js
diff --git a/src/app/(app)/settings/websites/WebsiteSettings.js b/src/app/(main)/settings/websites/WebsiteSettings.js
similarity index 100%
rename from src/app/(app)/settings/websites/WebsiteSettings.js
rename to src/app/(main)/settings/websites/WebsiteSettings.js
diff --git a/src/app/(app)/settings/websites/Websites.js b/src/app/(main)/settings/websites/Websites.js
similarity index 93%
rename from src/app/(app)/settings/websites/Websites.js
rename to src/app/(main)/settings/websites/Websites.js
index 56805062..693d6780 100644
--- a/src/app/(app)/settings/websites/Websites.js
+++ b/src/app/(main)/settings/websites/Websites.js
@@ -1,5 +1,5 @@
 'use client';
-import WebsitesTable from 'app/(app)/settings/websites/WebsitesTable';
+import WebsitesTable from 'app/(main)/settings/websites/WebsitesTable';
 import useUser from 'components/hooks/useUser';
 import useApi from 'components/hooks/useApi';
 import DataTable from 'components/common/DataTable';
diff --git a/src/app/(app)/settings/websites/Websites.module.css b/src/app/(main)/settings/websites/Websites.module.css
similarity index 100%
rename from src/app/(app)/settings/websites/Websites.module.css
rename to src/app/(main)/settings/websites/Websites.module.css
diff --git a/src/app/(app)/settings/websites/WebsitesHeader.js b/src/app/(main)/settings/websites/WebsitesHeader.js
similarity index 100%
rename from src/app/(app)/settings/websites/WebsitesHeader.js
rename to src/app/(main)/settings/websites/WebsitesHeader.js
diff --git a/src/app/(app)/settings/websites/WebsitesTable.js b/src/app/(main)/settings/websites/WebsitesTable.js
similarity index 100%
rename from src/app/(app)/settings/websites/WebsitesTable.js
rename to src/app/(main)/settings/websites/WebsitesTable.js
diff --git a/src/app/(app)/settings/websites/WebsitesTable.module.css b/src/app/(main)/settings/websites/WebsitesTable.module.css
similarity index 100%
rename from src/app/(app)/settings/websites/WebsitesTable.module.css
rename to src/app/(main)/settings/websites/WebsitesTable.module.css
diff --git a/src/app/(app)/settings/websites/[id]/ShareUrl.js b/src/app/(main)/settings/websites/[id]/ShareUrl.js
similarity index 100%
rename from src/app/(app)/settings/websites/[id]/ShareUrl.js
rename to src/app/(main)/settings/websites/[id]/ShareUrl.js
diff --git a/src/app/(app)/settings/websites/[id]/TrackingCode.js b/src/app/(main)/settings/websites/[id]/TrackingCode.js
similarity index 100%
rename from src/app/(app)/settings/websites/[id]/TrackingCode.js
rename to src/app/(main)/settings/websites/[id]/TrackingCode.js
diff --git a/src/app/(app)/settings/websites/[id]/WebsiteData.js b/src/app/(main)/settings/websites/[id]/WebsiteData.js
similarity index 100%
rename from src/app/(app)/settings/websites/[id]/WebsiteData.js
rename to src/app/(main)/settings/websites/[id]/WebsiteData.js
diff --git a/src/app/(app)/settings/websites/[id]/WebsiteDeleteForm.js b/src/app/(main)/settings/websites/[id]/WebsiteDeleteForm.js
similarity index 100%
rename from src/app/(app)/settings/websites/[id]/WebsiteDeleteForm.js
rename to src/app/(main)/settings/websites/[id]/WebsiteDeleteForm.js
diff --git a/src/app/(app)/settings/websites/[id]/WebsiteEditForm.js b/src/app/(main)/settings/websites/[id]/WebsiteEditForm.js
similarity index 100%
rename from src/app/(app)/settings/websites/[id]/WebsiteEditForm.js
rename to src/app/(main)/settings/websites/[id]/WebsiteEditForm.js
diff --git a/src/app/(app)/settings/websites/[id]/WebsiteResetForm.js b/src/app/(main)/settings/websites/[id]/WebsiteResetForm.js
similarity index 100%
rename from src/app/(app)/settings/websites/[id]/WebsiteResetForm.js
rename to src/app/(main)/settings/websites/[id]/WebsiteResetForm.js
diff --git a/src/app/(app)/settings/websites/[id]/page.js b/src/app/(main)/settings/websites/[id]/page.js
similarity index 100%
rename from src/app/(app)/settings/websites/[id]/page.js
rename to src/app/(main)/settings/websites/[id]/page.js
diff --git a/src/app/(app)/settings/websites/page.js b/src/app/(main)/settings/websites/page.js
similarity index 100%
rename from src/app/(app)/settings/websites/page.js
rename to src/app/(main)/settings/websites/page.js
diff --git a/src/app/(app)/websites/WebsiteTableView.js b/src/app/(main)/websites/WebsiteTableView.js
similarity index 100%
rename from src/app/(app)/websites/WebsiteTableView.js
rename to src/app/(main)/websites/WebsiteTableView.js
diff --git a/src/app/(app)/websites/WebsitesBrowse.js b/src/app/(main)/websites/WebsitesBrowse.js
similarity index 92%
rename from src/app/(app)/websites/WebsitesBrowse.js
rename to src/app/(main)/websites/WebsitesBrowse.js
index 96a25743..8f2c5d51 100644
--- a/src/app/(app)/websites/WebsitesBrowse.js
+++ b/src/app/(main)/websites/WebsitesBrowse.js
@@ -1,5 +1,5 @@
 'use client';
-import WebsiteList from '../settings/websites/Websites';
+import WebsiteList from '../../(main)/settings/websites/Websites';
 import { useMessages } from 'components/hooks';
 import { useState } from 'react';
 import { Item, Tabs } from 'react-basics';
diff --git a/src/app/(app)/websites/[id]/WebsiteChart.js b/src/app/(main)/websites/[id]/WebsiteChart.js
similarity index 100%
rename from src/app/(app)/websites/[id]/WebsiteChart.js
rename to src/app/(main)/websites/[id]/WebsiteChart.js
diff --git a/src/app/(app)/websites/[id]/WebsiteChart.module.css b/src/app/(main)/websites/[id]/WebsiteChart.module.css
similarity index 100%
rename from src/app/(app)/websites/[id]/WebsiteChart.module.css
rename to src/app/(main)/websites/[id]/WebsiteChart.module.css
diff --git a/src/app/(app)/websites/[id]/WebsiteChartList.js b/src/app/(main)/websites/[id]/WebsiteChartList.js
similarity index 100%
rename from src/app/(app)/websites/[id]/WebsiteChartList.js
rename to src/app/(main)/websites/[id]/WebsiteChartList.js
diff --git a/src/app/(app)/websites/[id]/WebsiteDetails.js b/src/app/(main)/websites/[id]/WebsiteDetails.js
similarity index 100%
rename from src/app/(app)/websites/[id]/WebsiteDetails.js
rename to src/app/(main)/websites/[id]/WebsiteDetails.js
diff --git a/src/app/(app)/websites/[id]/WebsiteHeader.js b/src/app/(main)/websites/[id]/WebsiteHeader.js
similarity index 100%
rename from src/app/(app)/websites/[id]/WebsiteHeader.js
rename to src/app/(main)/websites/[id]/WebsiteHeader.js
diff --git a/src/app/(app)/websites/[id]/WebsiteHeader.module.css b/src/app/(main)/websites/[id]/WebsiteHeader.module.css
similarity index 100%
rename from src/app/(app)/websites/[id]/WebsiteHeader.module.css
rename to src/app/(main)/websites/[id]/WebsiteHeader.module.css
diff --git a/src/app/(app)/websites/[id]/WebsiteMenuView.js b/src/app/(main)/websites/[id]/WebsiteMenuView.js
similarity index 100%
rename from src/app/(app)/websites/[id]/WebsiteMenuView.js
rename to src/app/(main)/websites/[id]/WebsiteMenuView.js
diff --git a/src/app/(app)/websites/[id]/WebsiteMenuView.module.css b/src/app/(main)/websites/[id]/WebsiteMenuView.module.css
similarity index 100%
rename from src/app/(app)/websites/[id]/WebsiteMenuView.module.css
rename to src/app/(main)/websites/[id]/WebsiteMenuView.module.css
diff --git a/src/app/(app)/websites/[id]/WebsiteMetricsBar.js b/src/app/(main)/websites/[id]/WebsiteMetricsBar.js
similarity index 97%
rename from src/app/(app)/websites/[id]/WebsiteMetricsBar.js
rename to src/app/(main)/websites/[id]/WebsiteMetricsBar.js
index b2aa8ca4..62f549b0 100644
--- a/src/app/(app)/websites/[id]/WebsiteMetricsBar.js
+++ b/src/app/(main)/websites/[id]/WebsiteMetricsBar.js
@@ -3,8 +3,8 @@ import { useApi, useDateRange, useMessages, useNavigation, useSticky } from 'com
 import WebsiteDateFilter from 'components/input/WebsiteDateFilter';
 import MetricCard from 'components/metrics/MetricCard';
 import MetricsBar from 'components/metrics/MetricsBar';
-import FilterSelectForm from '../../reports/FilterSelectForm';
-import PopupForm from '../../reports/PopupForm';
+import FilterSelectForm from '../../../(main)/reports/FilterSelectForm';
+import PopupForm from '../../../(main)/reports/PopupForm';
 import { formatShortTime } from 'lib/format';
 import { Button, Icon, Icons, Popup, PopupTrigger } from 'react-basics';
 import styles from './WebsiteMetricsBar.module.css';
diff --git a/src/app/(app)/websites/[id]/WebsiteMetricsBar.module.css b/src/app/(main)/websites/[id]/WebsiteMetricsBar.module.css
similarity index 100%
rename from src/app/(app)/websites/[id]/WebsiteMetricsBar.module.css
rename to src/app/(main)/websites/[id]/WebsiteMetricsBar.module.css
diff --git a/src/app/(app)/websites/[id]/event-data/EventDataMetricsBar.js b/src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.js
similarity index 100%
rename from src/app/(app)/websites/[id]/event-data/EventDataMetricsBar.js
rename to src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.js
diff --git a/src/app/(app)/websites/[id]/event-data/EventDataMetricsBar.module.css b/src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.module.css
similarity index 100%
rename from src/app/(app)/websites/[id]/event-data/EventDataMetricsBar.module.css
rename to src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.module.css
diff --git a/src/app/(app)/websites/[id]/event-data/EventDataTable.js b/src/app/(main)/websites/[id]/event-data/EventDataTable.js
similarity index 100%
rename from src/app/(app)/websites/[id]/event-data/EventDataTable.js
rename to src/app/(main)/websites/[id]/event-data/EventDataTable.js
diff --git a/src/app/(app)/websites/[id]/event-data/EventDataValueTable.js b/src/app/(main)/websites/[id]/event-data/EventDataValueTable.js
similarity index 100%
rename from src/app/(app)/websites/[id]/event-data/EventDataValueTable.js
rename to src/app/(main)/websites/[id]/event-data/EventDataValueTable.js
diff --git a/src/app/(app)/websites/[id]/event-data/WebsiteEventData.js b/src/app/(main)/websites/[id]/event-data/WebsiteEventData.js
similarity index 100%
rename from src/app/(app)/websites/[id]/event-data/WebsiteEventData.js
rename to src/app/(main)/websites/[id]/event-data/WebsiteEventData.js
diff --git a/src/app/(app)/websites/[id]/event-data/WebsiteEventData.module.css b/src/app/(main)/websites/[id]/event-data/WebsiteEventData.module.css
similarity index 100%
rename from src/app/(app)/websites/[id]/event-data/WebsiteEventData.module.css
rename to src/app/(main)/websites/[id]/event-data/WebsiteEventData.module.css
diff --git a/src/app/(app)/websites/[id]/event-data/page.js b/src/app/(main)/websites/[id]/event-data/page.js
similarity index 100%
rename from src/app/(app)/websites/[id]/event-data/page.js
rename to src/app/(main)/websites/[id]/event-data/page.js
diff --git a/src/app/(app)/websites/[id]/page.tsx b/src/app/(main)/websites/[id]/page.tsx
similarity index 100%
rename from src/app/(app)/websites/[id]/page.tsx
rename to src/app/(main)/websites/[id]/page.tsx
diff --git a/src/app/(app)/websites/[id]/realtime/Realtime.js b/src/app/(main)/websites/[id]/realtime/Realtime.js
similarity index 100%
rename from src/app/(app)/websites/[id]/realtime/Realtime.js
rename to src/app/(main)/websites/[id]/realtime/Realtime.js
diff --git a/src/app/(app)/websites/[id]/realtime/Realtime.module.css b/src/app/(main)/websites/[id]/realtime/Realtime.module.css
similarity index 100%
rename from src/app/(app)/websites/[id]/realtime/Realtime.module.css
rename to src/app/(main)/websites/[id]/realtime/Realtime.module.css
diff --git a/src/app/(app)/websites/[id]/realtime/RealtimeCountries.js b/src/app/(main)/websites/[id]/realtime/RealtimeCountries.js
similarity index 100%
rename from src/app/(app)/websites/[id]/realtime/RealtimeCountries.js
rename to src/app/(main)/websites/[id]/realtime/RealtimeCountries.js
diff --git a/src/app/(app)/websites/[id]/realtime/RealtimeCountries.module.css b/src/app/(main)/websites/[id]/realtime/RealtimeCountries.module.css
similarity index 100%
rename from src/app/(app)/websites/[id]/realtime/RealtimeCountries.module.css
rename to src/app/(main)/websites/[id]/realtime/RealtimeCountries.module.css
diff --git a/src/app/(app)/websites/[id]/realtime/RealtimeHeader.js b/src/app/(main)/websites/[id]/realtime/RealtimeHeader.js
similarity index 100%
rename from src/app/(app)/websites/[id]/realtime/RealtimeHeader.js
rename to src/app/(main)/websites/[id]/realtime/RealtimeHeader.js
diff --git a/src/app/(app)/websites/[id]/realtime/RealtimeHeader.module.css b/src/app/(main)/websites/[id]/realtime/RealtimeHeader.module.css
similarity index 100%
rename from src/app/(app)/websites/[id]/realtime/RealtimeHeader.module.css
rename to src/app/(main)/websites/[id]/realtime/RealtimeHeader.module.css
diff --git a/src/app/(app)/websites/[id]/realtime/RealtimeHome.js b/src/app/(main)/websites/[id]/realtime/RealtimeHome.js
similarity index 100%
rename from src/app/(app)/websites/[id]/realtime/RealtimeHome.js
rename to src/app/(main)/websites/[id]/realtime/RealtimeHome.js
diff --git a/src/app/(app)/websites/[id]/realtime/RealtimeLog.js b/src/app/(main)/websites/[id]/realtime/RealtimeLog.js
similarity index 100%
rename from src/app/(app)/websites/[id]/realtime/RealtimeLog.js
rename to src/app/(main)/websites/[id]/realtime/RealtimeLog.js
diff --git a/src/app/(app)/websites/[id]/realtime/RealtimeLog.module.css b/src/app/(main)/websites/[id]/realtime/RealtimeLog.module.css
similarity index 100%
rename from src/app/(app)/websites/[id]/realtime/RealtimeLog.module.css
rename to src/app/(main)/websites/[id]/realtime/RealtimeLog.module.css
diff --git a/src/app/(app)/websites/[id]/realtime/RealtimeUrls.js b/src/app/(main)/websites/[id]/realtime/RealtimeUrls.js
similarity index 100%
rename from src/app/(app)/websites/[id]/realtime/RealtimeUrls.js
rename to src/app/(main)/websites/[id]/realtime/RealtimeUrls.js
diff --git a/src/app/(app)/websites/[id]/realtime/page.tsx b/src/app/(main)/websites/[id]/realtime/page.tsx
similarity index 100%
rename from src/app/(app)/websites/[id]/realtime/page.tsx
rename to src/app/(main)/websites/[id]/realtime/page.tsx
diff --git a/src/app/(app)/websites/[id]/reports/WebsiteReports.js b/src/app/(main)/websites/[id]/reports/WebsiteReports.js
similarity index 95%
rename from src/app/(app)/websites/[id]/reports/WebsiteReports.js
rename to src/app/(main)/websites/[id]/reports/WebsiteReports.js
index f5d9aca9..69654375 100644
--- a/src/app/(app)/websites/[id]/reports/WebsiteReports.js
+++ b/src/app/(main)/websites/[id]/reports/WebsiteReports.js
@@ -1,7 +1,7 @@
 'use client';
 import Page from 'components/layout/Page';
 import Empty from 'components/common/Empty';
-import ReportsTable from 'app/(app)/reports/ReportsTable';
+import ReportsTable from '../../../../(main)/reports/ReportsTable';
 import { useMessages, useWebsiteReports } from 'components/hooks';
 import Link from 'next/link';
 import { Button, Flexbox, Icon, Icons, Text } from 'react-basics';
diff --git a/src/app/(app)/websites/[id]/reports/page.tsx b/src/app/(main)/websites/[id]/reports/page.tsx
similarity index 100%
rename from src/app/(app)/websites/[id]/reports/page.tsx
rename to src/app/(main)/websites/[id]/reports/page.tsx
diff --git a/src/app/(app)/websites/page.js b/src/app/(main)/websites/page.js
similarity index 70%
rename from src/app/(app)/websites/page.js
rename to src/app/(main)/websites/page.js
index a30bc583..07c82a50 100644
--- a/src/app/(app)/websites/page.js
+++ b/src/app/(main)/websites/page.js
@@ -1,5 +1,5 @@
 'use client';
-import WebsitesHeader from '../settings/websites/WebsitesHeader';
+import WebsitesHeader from '../../(main)/settings/websites/WebsitesHeader';
 import WebsitesBrowse from './WebsitesBrowse';
 
 export default function WebsitesPage() {
diff --git a/src/app/share/[...id]/Share.js b/src/app/share/[...id]/Share.js
index 69d76178..618f66b7 100644
--- a/src/app/share/[...id]/Share.js
+++ b/src/app/share/[...id]/Share.js
@@ -1,5 +1,5 @@
 'use client';
-import WebsiteDetails from 'app/(app)/websites/[id]/WebsiteDetails';
+import WebsiteDetails from '../../(main)/websites/[id]/WebsiteDetails';
 import useShareToken from 'components/hooks/useShareToken';
 
 export default function ({ shareId }) {
diff --git a/src/components/input/SettingsButton.js b/src/components/input/SettingsButton.js
index 8c15c615..46c72597 100644
--- a/src/components/input/SettingsButton.js
+++ b/src/components/input/SettingsButton.js
@@ -1,6 +1,6 @@
 import { Button, Icon, PopupTrigger, Popup, Form, FormRow } from 'react-basics';
-import TimezoneSetting from 'app/(app)/settings/profile/TimezoneSetting';
-import DateRangeSetting from 'app/(app)/settings/profile/DateRangeSetting';
+import TimezoneSetting from 'app/(main)/settings/profile/TimezoneSetting';
+import DateRangeSetting from 'app/(main)/settings/profile/DateRangeSetting';
 import Icons from 'components/icons';
 import useMessages from 'components/hooks/useMessages';
 import styles from './SettingsButton.module.css';
diff --git a/src/index.ts b/src/index.ts
index fed9d096..b56051e9 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,69 +1,3 @@
-/*
-export * from 'components/common/ConfirmDeleteForm';
-export * from 'components/common/Empty';
-export * from 'components/common/EmptyPlaceholder';
-export * from 'components/common/ErrorBoundary';
-export * from 'components/common/ErrorMessage';
-export * from 'components/common/Favicon';
-export * from 'components/common/FilterButtons';
-export * from 'components/common/FilterLink';
-export * from 'components/common/HamburgerButton';
-export * from 'components/common/HoverTooltip';
-export * from 'components/common/LinkButton';
-export * from 'components/common/MobileMenu';
-export * from 'components/common/Pager';
-export * from 'components/common/UpdateNotice';
-export * from 'components/common/WorldMap';
-
-export * from 'components/hooks/useApi';
-export * from 'components/hooks/useConfig';
-export * from 'components/hooks/useCountryNames';
-export * from 'components/hooks/useDateRange';
-export * from 'components/hooks/useDocumentClick';
-export * from 'components/hooks/useEscapeKey';
-export * from 'components/hooks/useFilters';
-export * from 'components/hooks/useForceUpdate';
-export * from 'components/hooks/useFormat';
-export * from 'components/hooks/useLanguageNames';
-export * from 'components/hooks/useLocale';
-export * from 'components/hooks/useMessages';
-export * from 'components/hooks/usePageQuery';
-export * from 'components/hooks/useReport';
-export * from 'components/hooks/useReports';
-export * from 'components/hooks/useRequireLogin';
-export * from 'components/hooks/useShareToken';
-export * from 'components/hooks/useSticky';
-export * from 'components/hooks/useTheme';
-export * from 'components/hooks/useTimezone';
-export * from 'components/hooks/useUser';
-export * from 'components/hooks/useWebsite';
-export * from 'components/hooks/useWebsiteReports';
-
-export * from 'components/input/DateFilter';
-export * from 'components/input/LanguageButton';
-export * from 'components/input/LogoutButton';
-export * from 'components/input/MonthSelect';
-export * from 'components/input/ProfileButton';
-export * from 'components/input/RefreshButton';
-export * from 'components/input/SettingsButton';
-export * from 'components/input/ThemeButton';
-export * from 'components/input/WebsiteDateFilter';
-export * from 'components/input/WebsiteSelect';
-
-export * from 'components/layout/AppLayout';
-export * from 'components/layout/Footer';
-export * from 'components/layout/Grid';
-export * from 'components/layout/Header';
-export * from 'components/layout/NavBar';
-export * from 'components/layout/NavGroup';
-export * from 'components/layout/Page';
-export * from 'components/layout/PageHeader';
-export * from 'components/layout/ReportsLayout';
-export * from 'components/layout/SettingsLayout';
-export * from 'components/layout/ShareLayout';
-export * from 'components/layout/SideNav';
-*/
-
 export * from 'components/hooks/useApi';
 export * from 'components/hooks/useConfig';
 export * from 'components/hooks/useCountryNames';
@@ -88,29 +22,29 @@ export * from 'components/hooks/useUser';
 export * from 'components/hooks/useWebsite';
 export * from 'components/hooks/useWebsiteReports';
 
-export * from 'app/(app)/settings/teams/TeamAddForm';
-export * from 'app/(app)/settings/teams/[id]/TeamAddWebsiteForm';
-export * from 'app/(app)/settings/teams/TeamDeleteForm';
-export * from 'app/(app)/settings/teams/[id]/TeamEditForm';
-export * from 'app/(app)/settings/teams/TeamJoinForm';
-export * from 'app/(app)/settings/teams/TeamLeaveForm';
-export * from 'app/(app)/settings/teams/[id]/TeamMemberRemoveButton';
-export * from 'app/(app)/settings/teams/[id]/TeamMembers';
-export * from 'app/(app)/settings/teams/[id]/TeamMembersTable';
-export * from 'app/(app)/settings/teams/[id]/TeamSettings';
-export * from 'app/(app)/settings/teams/TeamsList';
-export * from 'app/(app)/settings/teams/TeamsTable';
-export * from 'app/(app)/settings/teams/TeamWebsiteRemoveButton';
-export * from 'app/(app)/settings/teams/[id]/TeamWebsites';
-export * from 'app/(app)/settings/teams/[id]/TeamWebsitesTable';
-export * from 'app/(app)/settings/teams/WebsiteTags';
+export * from 'app/(main)/settings/teams/TeamAddForm';
+export * from 'app/(main)/settings/teams/[id]/TeamAddWebsiteForm';
+export * from 'app/(main)/settings/teams/TeamDeleteForm';
+export * from 'app/(main)/settings/teams/[id]/TeamEditForm';
+export * from 'app/(main)/settings/teams/TeamJoinForm';
+export * from 'app/(main)/settings/teams/TeamLeaveForm';
+export * from 'app/(main)/settings/teams/[id]/TeamMemberRemoveButton';
+export * from 'app/(main)/settings/teams/[id]/TeamMembers';
+export * from 'app/(main)/settings/teams/[id]/TeamMembersTable';
+export * from 'app/(main)/settings/teams/[id]/TeamSettings';
+export * from 'app/(main)/settings/teams/TeamsList';
+export * from 'app/(main)/settings/teams/TeamsTable';
+export * from 'app/(main)/settings/teams/TeamWebsiteRemoveButton';
+export * from 'app/(main)/settings/teams/[id]/TeamWebsites';
+export * from 'app/(main)/settings/teams/[id]/TeamWebsitesTable';
+export * from 'app/(main)/settings/teams/WebsiteTags';
 
-export * from 'app/(app)/settings/websites/[id]/ShareUrl';
-export * from 'app/(app)/settings/websites/[id]/TrackingCode';
-export * from 'app/(app)/settings/websites/WebsiteAddForm';
-export * from 'app/(app)/settings/websites/[id]/WebsiteDeleteForm';
-export * from 'app/(app)/settings/websites/[id]/WebsiteEditForm';
-export * from 'app/(app)/settings/websites/[id]/WebsiteResetForm';
-export * from 'app/(app)/settings/websites/WebsiteSettings';
-export * from './app/(app)/settings/websites/Websites';
-export * from 'app/(app)/settings/websites/WebsitesTable';
+export * from 'app/(main)/settings/websites/[id]/ShareUrl';
+export * from 'app/(main)/settings/websites/[id]/TrackingCode';
+export * from 'app/(main)/settings/websites/WebsiteAddForm';
+export * from 'app/(main)/settings/websites/[id]/WebsiteDeleteForm';
+export * from 'app/(main)/settings/websites/[id]/WebsiteEditForm';
+export * from 'app/(main)/settings/websites/[id]/WebsiteResetForm';
+export * from 'app/(main)/settings/websites/WebsiteSettings';
+export * from 'app/(main)/settings/websites/Websites';
+export * from 'app/(main)/settings/websites/WebsitesTable';