diff --git a/packages/developer-portal/src/components/pages/developer-analytics/__tests__/__snapshots__/developer-analytics.tsx.snap b/packages/developer-portal/src/components/pages/analytics/__tests__/__snapshots__/analytics.tsx.snap
similarity index 100%
rename from packages/developer-portal/src/components/pages/developer-analytics/__tests__/__snapshots__/developer-analytics.tsx.snap
rename to packages/developer-portal/src/components/pages/analytics/__tests__/__snapshots__/analytics.tsx.snap
diff --git a/packages/developer-portal/src/components/pages/developer-analytics/__tests__/developer-analytics.tsx b/packages/developer-portal/src/components/pages/analytics/__tests__/analytics.tsx
similarity index 96%
rename from packages/developer-portal/src/components/pages/developer-analytics/__tests__/developer-analytics.tsx
rename to packages/developer-portal/src/components/pages/analytics/__tests__/analytics.tsx
index 49f5e684c3..4ff6491118 100644
--- a/packages/developer-portal/src/components/pages/developer-analytics/__tests__/developer-analytics.tsx
+++ b/packages/developer-portal/src/components/pages/analytics/__tests__/analytics.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react'
 import { shallow } from 'enzyme'
 
-import { AnalyticsTab, handleUseEffectToSetCurrentTab, renderTabContent, tabConfigs } from '../developer-analytics'
-import AnalyticsPage from '../developer-analytics'
+import { AnalyticsTab, handleUseEffectToSetCurrentTab, renderTabContent, tabConfigs } from '../analytics'
+import AnalyticsPage from '../analytics'
 
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'), // use actual for all non-hook parts
diff --git a/packages/developer-portal/src/components/pages/developer-analytics/developer-analytics.tsx b/packages/developer-portal/src/components/pages/analytics/analytics.tsx
similarity index 88%
rename from packages/developer-portal/src/components/pages/developer-analytics/developer-analytics.tsx
rename to packages/developer-portal/src/components/pages/analytics/analytics.tsx
index f37bd66674..b6e0bb24ca 100644
--- a/packages/developer-portal/src/components/pages/developer-analytics/developer-analytics.tsx
+++ b/packages/developer-portal/src/components/pages/analytics/analytics.tsx
@@ -2,8 +2,8 @@ import * as React from 'react'
 import { useHistory, useParams } from 'react-router-dom'
 import { Tabs, H3, TabConfig, Section } from '@reapit/elements'
 import ErrorBoundary from '@/components/hocs/error-boundary'
-import DetailedTab from '@/components/ui/developer-analytics/detailed'
-import CostExplorerTab from '@/components/ui/developer-analytics/cost-explorer'
+import DetailedTab from './detailed'
+import CostExplorerTab from './cost-explorer'
 import Routes from '@/constants/routes'
 
 export type DeveloperAnalyticsPageProps = {}
@@ -24,7 +24,7 @@ export const tabConfigs = ({ currentTab, history }: TabConfigsProps): TabConfig[
       tabIdentifier: AnalyticsTab.DETAILED,
       displayText: 'DETAILED',
       onTabClick: () => {
-        history.push(Routes.DEVELOPER_ANALYTICS)
+        history.push(Routes.ANALYTICS)
       },
       active: currentTab === AnalyticsTab.DETAILED,
     },
@@ -32,7 +32,7 @@ export const tabConfigs = ({ currentTab, history }: TabConfigsProps): TabConfig[
       tabIdentifier: AnalyticsTab.COST_EXPLORER,
       displayText: 'Cost Explorer',
       onTabClick: () => {
-        history.push(`${Routes.DEVELOPER_ANALYTICS}/${AnalyticsTab.COST_EXPLORER}`)
+        history.push(`${Routes.ANALYTICS}/${AnalyticsTab.COST_EXPLORER}`)
       },
       active: currentTab === AnalyticsTab.COST_EXPLORER,
     },
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/__test__/cost-explore.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/__test__/cost-explore.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/__test__/cost-explore.tsx
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/__test__/cost-explore.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/__test__/__snapshots__/cost-calculator-form.test.tsx.snap b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/__test__/__snapshots__/cost-calculator-form.test.tsx.snap
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/__test__/__snapshots__/cost-calculator-form.test.tsx.snap
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/__test__/__snapshots__/cost-calculator-form.test.tsx.snap
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/__test__/__snapshots__/cost-calculator.test.tsx.snap b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/__test__/__snapshots__/cost-calculator.test.tsx.snap
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/__test__/__snapshots__/cost-calculator.test.tsx.snap
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/__test__/__snapshots__/cost-calculator.test.tsx.snap
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/__test__/__snapshots__/total-cost-table.test.tsx.snap b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/__test__/__snapshots__/total-cost-table.test.tsx.snap
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/__test__/__snapshots__/total-cost-table.test.tsx.snap
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/__test__/__snapshots__/total-cost-table.test.tsx.snap
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/__test__/cost-calculator-form.test.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/__test__/cost-calculator-form.test.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/__test__/cost-calculator-form.test.tsx
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/__test__/cost-calculator-form.test.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/__test__/cost-calculator.test.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/__test__/cost-calculator.test.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/__test__/cost-calculator.test.tsx
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/__test__/cost-calculator.test.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/__test__/total-cost-table.test.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/__test__/total-cost-table.test.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/__test__/total-cost-table.test.tsx
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/__test__/total-cost-table.test.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/__test__/use-foundation-cost-table.test.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/__test__/use-foundation-cost-table.test.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/__test__/use-foundation-cost-table.test.tsx
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/__test__/use-foundation-cost-table.test.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/cost-calculator-form.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/cost-calculator-form.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/cost-calculator-form.tsx
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/cost-calculator-form.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/cost-calculator.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/cost-calculator.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/cost-calculator.tsx
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/cost-calculator.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/form-fields.ts b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/form-fields.ts
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/form-fields.ts
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/form-fields.ts
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/index.ts b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/index.ts
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/index.ts
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/index.ts
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/total-cost-table.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/total-cost-table.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/total-cost-table.tsx
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/total-cost-table.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/use-foundation-cost-table.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/use-foundation-cost-table.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/use-foundation-cost-table.tsx
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/use-foundation-cost-table.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/validation-schema.ts b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/validation-schema.ts
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-calculator/validation-schema.ts
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-calculator/validation-schema.ts
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer-component/__test__/__snapshots__/cost-explorer-table.test.tsx.snap b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/__test__/__snapshots__/cost-explorer-table.test.tsx.snap
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer-component/__test__/__snapshots__/cost-explorer-table.test.tsx.snap
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/__test__/__snapshots__/cost-explorer-table.test.tsx.snap
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer-component/__test__/__snapshots__/cost-explorer.test.tsx.snap b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/__test__/__snapshots__/cost-explorer.test.tsx.snap
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer-component/__test__/__snapshots__/cost-explorer.test.tsx.snap
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/__test__/__snapshots__/cost-explorer.test.tsx.snap
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer-component/__test__/__snapshots__/cost-filter-form.test.tsx.snap b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/__test__/__snapshots__/cost-filter-form.test.tsx.snap
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer-component/__test__/__snapshots__/cost-filter-form.test.tsx.snap
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/__test__/__snapshots__/cost-filter-form.test.tsx.snap
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer-component/__test__/cost-explorer-table.test.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/__test__/cost-explorer-table.test.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer-component/__test__/cost-explorer-table.test.tsx
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/__test__/cost-explorer-table.test.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer-component/__test__/cost-explorer.test.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/__test__/cost-explorer.test.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer-component/__test__/cost-explorer.test.tsx
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/__test__/cost-explorer.test.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer-component/__test__/cost-filter-form.test.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/__test__/cost-filter-form.test.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer-component/__test__/cost-filter-form.test.tsx
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/__test__/cost-filter-form.test.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer-component/cost-explorer-table.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/cost-explorer-table.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer-component/cost-explorer-table.tsx
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/cost-explorer-table.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer-component/cost-explorer.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/cost-explorer.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer-component/cost-explorer.tsx
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/cost-explorer.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer-component/cost-filter-form.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/cost-filter-form.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer-component/cost-filter-form.tsx
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/cost-filter-form.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer-component/index.ts b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/index.ts
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer-component/index.ts
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/index.ts
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/cost-explorer.tsx
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/index.ts b/packages/developer-portal/src/components/pages/analytics/cost-explorer/index.ts
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/index.ts
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/index.ts
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/service-chart/__mocks__/billing.ts b/packages/developer-portal/src/components/pages/analytics/cost-explorer/service-chart/__mocks__/billing.ts
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/service-chart/__mocks__/billing.ts
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/service-chart/__mocks__/billing.ts
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/service-chart/__tests__/__snapshots__/service-chart.test.tsx.snap b/packages/developer-portal/src/components/pages/analytics/cost-explorer/service-chart/__tests__/__snapshots__/service-chart.test.tsx.snap
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/service-chart/__tests__/__snapshots__/service-chart.test.tsx.snap
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/service-chart/__tests__/__snapshots__/service-chart.test.tsx.snap
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/service-chart/__tests__/service-chart.test.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/service-chart/__tests__/service-chart.test.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/service-chart/__tests__/service-chart.test.tsx
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/service-chart/__tests__/service-chart.test.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/service-chart/index.ts b/packages/developer-portal/src/components/pages/analytics/cost-explorer/service-chart/index.ts
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/service-chart/index.ts
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/service-chart/index.ts
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/service-chart/service-chart.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/service-chart/service-chart.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/service-chart/service-chart.tsx
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/service-chart/service-chart.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/transaction-history/__test__/__snapshots__/transaction-history.test.tsx.snap b/packages/developer-portal/src/components/pages/analytics/cost-explorer/transaction-history/__test__/__snapshots__/transaction-history.test.tsx.snap
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/transaction-history/__test__/__snapshots__/transaction-history.test.tsx.snap
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/transaction-history/__test__/__snapshots__/transaction-history.test.tsx.snap
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/transaction-history/__test__/transaction-history.test.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/transaction-history/__test__/transaction-history.test.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/transaction-history/__test__/transaction-history.test.tsx
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/transaction-history/__test__/transaction-history.test.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/transaction-history/__test__/utils.test.ts b/packages/developer-portal/src/components/pages/analytics/cost-explorer/transaction-history/__test__/utils.test.ts
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/transaction-history/__test__/utils.test.ts
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/transaction-history/__test__/utils.test.ts
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/transaction-history/index.ts b/packages/developer-portal/src/components/pages/analytics/cost-explorer/transaction-history/index.ts
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/transaction-history/index.ts
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/transaction-history/index.ts
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/transaction-history/transaction-history.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/transaction-history/transaction-history.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/transaction-history/transaction-history.tsx
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/transaction-history/transaction-history.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/transaction-history/utils.ts b/packages/developer-portal/src/components/pages/analytics/cost-explorer/transaction-history/utils.ts
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/cost-explorer/transaction-history/utils.ts
rename to packages/developer-portal/src/components/pages/analytics/cost-explorer/transaction-history/utils.ts
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/detailed/__test__/__snapshots__/detailed-tab.test.tsx.snap b/packages/developer-portal/src/components/pages/analytics/detailed/__test__/__snapshots__/detailed-tab.test.tsx.snap
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/detailed/__test__/__snapshots__/detailed-tab.test.tsx.snap
rename to packages/developer-portal/src/components/pages/analytics/detailed/__test__/__snapshots__/detailed-tab.test.tsx.snap
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/detailed/__test__/__snapshots__/installation-app-section.test.tsx.snap b/packages/developer-portal/src/components/pages/analytics/detailed/__test__/__snapshots__/installation-app-section.test.tsx.snap
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/detailed/__test__/__snapshots__/installation-app-section.test.tsx.snap
rename to packages/developer-portal/src/components/pages/analytics/detailed/__test__/__snapshots__/installation-app-section.test.tsx.snap
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/detailed/__test__/__snapshots__/traffic-event-table.test.tsx.snap b/packages/developer-portal/src/components/pages/analytics/detailed/__test__/__snapshots__/traffic-event-table.test.tsx.snap
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/detailed/__test__/__snapshots__/traffic-event-table.test.tsx.snap
rename to packages/developer-portal/src/components/pages/analytics/detailed/__test__/__snapshots__/traffic-event-table.test.tsx.snap
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/detailed/__test__/detailed-tab.test.tsx b/packages/developer-portal/src/components/pages/analytics/detailed/__test__/detailed-tab.test.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/detailed/__test__/detailed-tab.test.tsx
rename to packages/developer-portal/src/components/pages/analytics/detailed/__test__/detailed-tab.test.tsx
diff --git a/packages/developer-portal/src/components/ui/__tests__/developer-hits-per-day-chart.tsx b/packages/developer-portal/src/components/pages/analytics/detailed/__test__/hits-per-day-chart.tsx
similarity index 96%
rename from packages/developer-portal/src/components/ui/__tests__/developer-hits-per-day-chart.tsx
rename to packages/developer-portal/src/components/pages/analytics/detailed/__test__/hits-per-day-chart.tsx
index 1b979a5665..f9f54ec649 100644
--- a/packages/developer-portal/src/components/ui/__tests__/developer-hits-per-day-chart.tsx
+++ b/packages/developer-portal/src/components/pages/analytics/detailed/__test__/hits-per-day-chart.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { shallow } from 'enzyme'
-import DeveloperHitsPerDay, { DeveloperHitsPerDayProps } from '../developer-hits-per-day-chart'
+import DeveloperHitsPerDay, { DeveloperHitsPerDayProps } from '../hits-per-day-chart'
 import { httpTrafficPerDayStub } from '@/sagas/__stubs__/app-http-traffic-event'
 import { H5 } from '@reapit/elements'
 import { Line } from 'react-chartjs-2'
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/detailed/__test__/installation-app-section.test.tsx b/packages/developer-portal/src/components/pages/analytics/detailed/__test__/installation-app-section.test.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/detailed/__test__/installation-app-section.test.tsx
rename to packages/developer-portal/src/components/pages/analytics/detailed/__test__/installation-app-section.test.tsx
diff --git a/packages/developer-portal/src/components/ui/__tests__/developer-installations-chart.tsx b/packages/developer-portal/src/components/pages/analytics/detailed/__test__/installations-chart.tsx
similarity index 76%
rename from packages/developer-portal/src/components/ui/__tests__/developer-installations-chart.tsx
rename to packages/developer-portal/src/components/pages/analytics/detailed/__test__/installations-chart.tsx
index e50ffe4bf0..277f6f088e 100644
--- a/packages/developer-portal/src/components/ui/__tests__/developer-installations-chart.tsx
+++ b/packages/developer-portal/src/components/pages/analytics/detailed/__test__/installations-chart.tsx
@@ -1,10 +1,7 @@
 import * as React from 'react'
 import { shallow } from 'enzyme'
-import DeveloperInstallationsChart, {
-  DeveloperInstallationsChartProps,
-  getChartOptions,
-} from '../developer-installations-chart'
-import { installedAppsStub } from '../__stubs__/developer-installations-chart-data'
+import DeveloperInstallationsChart, { DeveloperInstallationsChartProps, getChartOptions } from '../installations-chart'
+import { installedAppsStub } from '../../../../ui/__stubs__/developer-installations-chart-data'
 import { groupInstalledAppsByDate } from '@/utils/developer-analytics'
 
 const props: DeveloperInstallationsChartProps = {
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/detailed/__test__/traffic-event-table.test.tsx b/packages/developer-portal/src/components/pages/analytics/detailed/__test__/traffic-event-table.test.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/detailed/__test__/traffic-event-table.test.tsx
rename to packages/developer-portal/src/components/pages/analytics/detailed/__test__/traffic-event-table.test.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/detailed/detailed-tab.tsx b/packages/developer-portal/src/components/pages/analytics/detailed/detailed-tab.tsx
similarity index 98%
rename from packages/developer-portal/src/components/ui/developer-analytics/detailed/detailed-tab.tsx
rename to packages/developer-portal/src/components/pages/analytics/detailed/detailed-tab.tsx
index 9267acd7a6..ac6135c23a 100644
--- a/packages/developer-portal/src/components/ui/developer-analytics/detailed/detailed-tab.tsx
+++ b/packages/developer-portal/src/components/pages/analytics/detailed/detailed-tab.tsx
@@ -13,7 +13,7 @@ import { selectDeveloper } from '@/selector/developer'
 import { getInstallations } from '@/selector/installations'
 
 import { Grid, GridItem, DATE_TIME_FORMAT, Section } from '@reapit/elements'
-import DeveloperHitsPerDayChart from '@/components/ui/developer-hits-per-day-chart'
+import DeveloperHitsPerDayChart from './hits-per-day-chart'
 import InstallationAppSection, { InstallationModelWithAppName } from './installation-app-section'
 import FilterBar from './filter-bar'
 import ErrorBoundary from '@/components/hocs/error-boundary'
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/detailed/filter-bar/__test__/__snapshots__/default-filter-group.test.tsx.snap b/packages/developer-portal/src/components/pages/analytics/detailed/filter-bar/__test__/__snapshots__/default-filter-group.test.tsx.snap
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/detailed/filter-bar/__test__/__snapshots__/default-filter-group.test.tsx.snap
rename to packages/developer-portal/src/components/pages/analytics/detailed/filter-bar/__test__/__snapshots__/default-filter-group.test.tsx.snap
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/detailed/filter-bar/__test__/__snapshots__/filter-bar.test.tsx.snap b/packages/developer-portal/src/components/pages/analytics/detailed/filter-bar/__test__/__snapshots__/filter-bar.test.tsx.snap
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/detailed/filter-bar/__test__/__snapshots__/filter-bar.test.tsx.snap
rename to packages/developer-portal/src/components/pages/analytics/detailed/filter-bar/__test__/__snapshots__/filter-bar.test.tsx.snap
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/detailed/filter-bar/__test__/__snapshots__/filter-form.test.tsx.snap b/packages/developer-portal/src/components/pages/analytics/detailed/filter-bar/__test__/__snapshots__/filter-form.test.tsx.snap
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/detailed/filter-bar/__test__/__snapshots__/filter-form.test.tsx.snap
rename to packages/developer-portal/src/components/pages/analytics/detailed/filter-bar/__test__/__snapshots__/filter-form.test.tsx.snap
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/detailed/filter-bar/__test__/default-filter-group.test.tsx b/packages/developer-portal/src/components/pages/analytics/detailed/filter-bar/__test__/default-filter-group.test.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/detailed/filter-bar/__test__/default-filter-group.test.tsx
rename to packages/developer-portal/src/components/pages/analytics/detailed/filter-bar/__test__/default-filter-group.test.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/detailed/filter-bar/__test__/filter-bar.test.tsx b/packages/developer-portal/src/components/pages/analytics/detailed/filter-bar/__test__/filter-bar.test.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/detailed/filter-bar/__test__/filter-bar.test.tsx
rename to packages/developer-portal/src/components/pages/analytics/detailed/filter-bar/__test__/filter-bar.test.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/detailed/filter-bar/__test__/filter-form.test.tsx b/packages/developer-portal/src/components/pages/analytics/detailed/filter-bar/__test__/filter-form.test.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/detailed/filter-bar/__test__/filter-form.test.tsx
rename to packages/developer-portal/src/components/pages/analytics/detailed/filter-bar/__test__/filter-form.test.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/detailed/filter-bar/default-filter-group.tsx b/packages/developer-portal/src/components/pages/analytics/detailed/filter-bar/default-filter-group.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/detailed/filter-bar/default-filter-group.tsx
rename to packages/developer-portal/src/components/pages/analytics/detailed/filter-bar/default-filter-group.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/detailed/filter-bar/filter-bar.tsx b/packages/developer-portal/src/components/pages/analytics/detailed/filter-bar/filter-bar.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/detailed/filter-bar/filter-bar.tsx
rename to packages/developer-portal/src/components/pages/analytics/detailed/filter-bar/filter-bar.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/detailed/filter-bar/filter-form.tsx b/packages/developer-portal/src/components/pages/analytics/detailed/filter-bar/filter-form.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/detailed/filter-bar/filter-form.tsx
rename to packages/developer-portal/src/components/pages/analytics/detailed/filter-bar/filter-form.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/detailed/filter-bar/index.ts b/packages/developer-portal/src/components/pages/analytics/detailed/filter-bar/index.ts
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/detailed/filter-bar/index.ts
rename to packages/developer-portal/src/components/pages/analytics/detailed/filter-bar/index.ts
diff --git a/packages/developer-portal/src/components/ui/developer-hits-per-day-chart.tsx b/packages/developer-portal/src/components/pages/analytics/detailed/hits-per-day-chart.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-hits-per-day-chart.tsx
rename to packages/developer-portal/src/components/pages/analytics/detailed/hits-per-day-chart.tsx
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/detailed/index.ts b/packages/developer-portal/src/components/pages/analytics/detailed/index.ts
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/detailed/index.ts
rename to packages/developer-portal/src/components/pages/analytics/detailed/index.ts
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/detailed/installation-app-section.tsx b/packages/developer-portal/src/components/pages/analytics/detailed/installation-app-section.tsx
similarity index 96%
rename from packages/developer-portal/src/components/ui/developer-analytics/detailed/installation-app-section.tsx
rename to packages/developer-portal/src/components/pages/analytics/detailed/installation-app-section.tsx
index a99030e0a0..f233bc3678 100644
--- a/packages/developer-portal/src/components/ui/developer-analytics/detailed/installation-app-section.tsx
+++ b/packages/developer-portal/src/components/pages/analytics/detailed/installation-app-section.tsx
@@ -4,8 +4,8 @@ import { InstallationModel, AppSummaryModel } from '@reapit/foundations-ts-defin
 import { AppInstallationsState } from '@/reducers/app-installations'
 import { DeveloperState } from '@/reducers/developer'
 import { INSTALLATIONS_PER_PAGE } from '@/constants/paginator'
-import DeveloperInstallationsChart from '@/components/ui/developer-installations-chart'
-import { handleMapAppNameToInstallation } from '@/components/ui/developer-analytics/detailed/detailed-tab'
+import DeveloperInstallationsChart from '@/components/pages/analytics/detailed/installations-chart'
+import { handleMapAppNameToInstallation } from '@/components/pages/analytics/detailed/detailed-tab'
 
 export interface InstallationModelWithAppName extends InstallationModel {
   appName?: string
diff --git a/packages/developer-portal/src/components/ui/developer-installations-chart.tsx b/packages/developer-portal/src/components/pages/analytics/detailed/installations-chart.tsx
similarity index 94%
rename from packages/developer-portal/src/components/ui/developer-installations-chart.tsx
rename to packages/developer-portal/src/components/pages/analytics/detailed/installations-chart.tsx
index c85cd6933b..117f54aa08 100644
--- a/packages/developer-portal/src/components/ui/developer-installations-chart.tsx
+++ b/packages/developer-portal/src/components/pages/analytics/detailed/installations-chart.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import { Line } from 'react-chartjs-2'
 import { Loader, H5, Section } from '@reapit/elements'
-import { InstallationModelWithAppName } from '@/components/ui/developer-analytics/detailed/installation-app-section'
+import { InstallationModelWithAppName } from '@/components/pages/analytics/detailed/installation-app-section'
 import { groupInstalledAppsByDate, getChartData, groupAppsByNameAndCount } from '@/utils/developer-analytics'
 
 export interface DeveloperInstallationsChartProps {
diff --git a/packages/developer-portal/src/components/ui/developer-analytics/detailed/traffic-event-table.tsx b/packages/developer-portal/src/components/pages/analytics/detailed/traffic-event-table.tsx
similarity index 100%
rename from packages/developer-portal/src/components/ui/developer-analytics/detailed/traffic-event-table.tsx
rename to packages/developer-portal/src/components/pages/analytics/detailed/traffic-event-table.tsx
diff --git a/packages/developer-portal/src/components/pages/analytics/index.ts b/packages/developer-portal/src/components/pages/analytics/index.ts
new file mode 100644
index 0000000000..fc6b7bfa6c
--- /dev/null
+++ b/packages/developer-portal/src/components/pages/analytics/index.ts
@@ -0,0 +1,3 @@
+import DeveloperAnalytics from './analytics'
+
+export default DeveloperAnalytics
diff --git a/packages/developer-portal/src/components/pages/developer-analytics/index.ts b/packages/developer-portal/src/components/pages/developer-analytics/index.ts
deleted file mode 100644
index 2c57fae197..0000000000
--- a/packages/developer-portal/src/components/pages/developer-analytics/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import DeveloperAnalytics from './developer-analytics'
-
-export default DeveloperAnalytics
diff --git a/packages/developer-portal/src/components/ui/__stubs__/developer-installations-chart-data.ts b/packages/developer-portal/src/components/ui/__stubs__/developer-installations-chart-data.ts
index e626845172..3f5a705609 100644
--- a/packages/developer-portal/src/components/ui/__stubs__/developer-installations-chart-data.ts
+++ b/packages/developer-portal/src/components/ui/__stubs__/developer-installations-chart-data.ts
@@ -1,4 +1,4 @@
-import { InstallationModelWithAppName } from '@/components/ui/developer-analytics/detailed/installation-app-section'
+import { InstallationModelWithAppName } from '@/components/pages/analytics/detailed/installation-app-section'
 
 export const installedAppsStub: Array<InstallationModelWithAppName> = [
   {
diff --git a/packages/developer-portal/src/components/ui/__tests__/__snapshots__/developer-hits-per-day-chart.tsx.snap b/packages/developer-portal/src/components/ui/__tests__/__snapshots__/developer-hits-per-day-chart.tsx.snap
deleted file mode 100644
index 684a2b6de1..0000000000
--- a/packages/developer-portal/src/components/ui/__tests__/__snapshots__/developer-hits-per-day-chart.tsx.snap
+++ /dev/null
@@ -1,62 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`DeveloperHitsPerDay should match a snapshot 1`] = `
-<Component
-  hasMargin={false}
->
-  <Component>
-    Hits Per Day
-  </Component>
-  <Line
-    data={
-      Object {
-        "datasets": Array [
-          Object {
-            "backgroundColor": "rgba(75,192,192,0.4)",
-            "borderCapStyle": "butt",
-            "borderColor": "rgba(75,192,192,1)",
-            "borderDash": Array [],
-            "borderDashOffset": 0,
-            "borderJoinStyle": "miter",
-            "data": Array [
-              4,
-              65,
-            ],
-            "fill": false,
-            "lineTension": 0.1,
-            "pointBackgroundColor": "#fff",
-            "pointBorderColor": "rgba(75,192,192,1)",
-            "pointBorderWidth": 1,
-            "pointHitRadius": 10,
-            "pointHoverBackgroundColor": "rgba(75,192,192,1)",
-            "pointHoverBorderColor": "rgba(220,220,220,1)",
-            "pointHoverBorderWidth": 2,
-            "pointHoverRadius": 5,
-            "pointRadius": 1,
-          },
-        ],
-        "labels": Array [
-          "2020-04-04",
-          "2020-04-05",
-        ],
-      }
-    }
-    options={
-      Object {
-        "height": 50,
-        "legend": null,
-        "maintainAspectRatio": true,
-        "tooltips": Object {
-          "callbacks": Object {
-            "label": [Function],
-          },
-          "mode": "label",
-        },
-        "width": 100,
-      }
-    }
-  />
-</Component>
-`;
-
-exports[`DeveloperHitsPerDay should match a snapshot when loading 1`] = `<Component />`;
diff --git a/packages/developer-portal/src/components/ui/__tests__/__snapshots__/developer-installations-chart.tsx.snap b/packages/developer-portal/src/components/ui/__tests__/__snapshots__/developer-installations-chart.tsx.snap
deleted file mode 100644
index 235b803f14..0000000000
--- a/packages/developer-portal/src/components/ui/__tests__/__snapshots__/developer-installations-chart.tsx.snap
+++ /dev/null
@@ -1,61 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`DeveloperInstallationsChart should match a snapshot 1`] = `
-<Component
-  hasMargin={false}
->
-  <Component>
-    Installations By Day
-  </Component>
-  <Line
-    data={
-      Object {
-        "datasets": Array [
-          Object {
-            "backgroundColor": "rgba(75,192,192,0.4)",
-            "borderCapStyle": "butt",
-            "borderColor": "rgba(75,192,192,1)",
-            "borderDash": Array [],
-            "borderDashOffset": 0,
-            "borderJoinStyle": "miter",
-            "data": Array [
-              2,
-              0,
-              0,
-              1,
-            ],
-            "fill": false,
-            "lineTension": 0.1,
-            "pointBackgroundColor": "#fff",
-            "pointBorderColor": "rgba(75,192,192,1)",
-            "pointBorderWidth": 1,
-            "pointHitRadius": 10,
-            "pointHoverBackgroundColor": "rgba(75,192,192,1)",
-            "pointHoverBorderColor": "rgba(220,220,220,1)",
-            "pointHoverBorderWidth": 2,
-            "pointHoverRadius": 5,
-            "pointRadius": 1,
-          },
-        ],
-        "labels": Array [
-          "31/01/2020",
-          "01/02/2020",
-          "02/02/2020",
-          "03/02/2020",
-        ],
-      }
-    }
-    options={
-      Object {
-        "legend": null,
-        "tooltips": Object {
-          "callbacks": Object {
-            "label": [Function],
-          },
-          "mode": "label",
-        },
-      }
-    }
-  />
-</Component>
-`;
diff --git a/packages/developer-portal/src/components/ui/__tests__/__snapshots__/developer-traffic-chart.tsx.snap b/packages/developer-portal/src/components/ui/__tests__/__snapshots__/developer-traffic-chart.tsx.snap
deleted file mode 100644
index 3a5c432b36..0000000000
--- a/packages/developer-portal/src/components/ui/__tests__/__snapshots__/developer-traffic-chart.tsx.snap
+++ /dev/null
@@ -1,53 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`DeveloperTrafficChart should match a snapshot 1`] = `
-<div>
-  <Component>
-    Traffic (API Count)
-  </Component>
-  <Line
-    data={
-      Object {
-        "datasets": Array [
-          Object {
-            "backgroundColor": "rgba(75,192,192,0.4)",
-            "borderCapStyle": "butt",
-            "borderColor": "rgba(75,192,192,1)",
-            "borderDash": Array [],
-            "borderDashOffset": 0,
-            "borderJoinStyle": "miter",
-            "data": Array [
-              5,
-            ],
-            "fill": false,
-            "lineTension": 0.1,
-            "pointBackgroundColor": "#fff",
-            "pointBorderColor": "rgba(75,192,192,1)",
-            "pointBorderWidth": 1,
-            "pointHitRadius": 10,
-            "pointHoverBackgroundColor": "rgba(75,192,192,1)",
-            "pointHoverBorderColor": "rgba(220,220,220,1)",
-            "pointHoverBorderWidth": 2,
-            "pointHoverRadius": 5,
-            "pointRadius": 1,
-          },
-        ],
-        "labels": Array [
-          "15/11/2019",
-        ],
-      }
-    }
-    options={
-      Object {
-        "legend": null,
-        "tooltips": Object {
-          "callbacks": Object {
-            "label": [Function],
-          },
-          "mode": "label",
-        },
-      }
-    }
-  />
-</div>
-`;
diff --git a/packages/developer-portal/src/components/ui/__tests__/__snapshots__/developer-traffic-table.tsx.snap b/packages/developer-portal/src/components/ui/__tests__/__snapshots__/developer-traffic-table.tsx.snap
deleted file mode 100644
index a5700b07f3..0000000000
--- a/packages/developer-portal/src/components/ui/__tests__/__snapshots__/developer-traffic-table.tsx.snap
+++ /dev/null
@@ -1,62 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`DeveloperTrafficTable should match a snapshot 1`] = `
-<div>
-  <Component>
-    Traffic
-  </Component>
-  <p
-    className="is-italic"
-  >
-    The traffic table below shows all API calls made against each of your applications since the date your app was created
-  </p>
-  <Component
-    bordered={true}
-    columns={
-      Array [
-        Object {
-          "Header": "App Name",
-          "accessor": "appName",
-        },
-        Object {
-          "Header": "Date Created",
-          "accessor": [Function],
-        },
-        Object {
-          "Header": "Total API Calls",
-          "accessor": "requests",
-          "columnProps": Object {
-            "width": 300,
-          },
-        },
-      ]
-    }
-    data={
-      Array [
-        Object {
-          "appName": "test",
-          "created": "2020-02-02T10:45:57",
-          "requests": 5,
-        },
-        Object {
-          "appName": "asd",
-          "created": "2020-02-02T10:45:57",
-          "requests": 0,
-        },
-      ]
-    }
-    loading={false}
-    scrollable={true}
-  />
-  <div
-    className="undefined"
-  >
-    <Component
-      className="undefined is-pulled-left"
-    >
-      Total API Calls: 
-      5
-    </Component>
-  </div>
-</div>
-`;
diff --git a/packages/developer-portal/src/components/ui/__tests__/developer-traffic-chart.tsx b/packages/developer-portal/src/components/ui/__tests__/developer-traffic-chart.tsx
deleted file mode 100644
index faa9978f5d..0000000000
--- a/packages/developer-portal/src/components/ui/__tests__/developer-traffic-chart.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import * as React from 'react'
-import { shallow } from 'enzyme'
-import { appsDataStub } from '@/sagas/__stubs__/apps'
-import { usageStatsDataStub } from '@/sagas/__stubs__/app-usage-stats'
-import { getAppUsageStatsChartData, getChartConfig, getChartOptions } from '@/utils/app-usage-stats.ts'
-import DeveloperTrafficChart, { DeveloperTrafficChartProps } from '../developer-traffic-chart'
-
-const props: DeveloperTrafficChartProps = {
-  apps: appsDataStub.data,
-  stats: usageStatsDataStub,
-}
-
-describe('DeveloperTrafficChart', () => {
-  it('should match a snapshot', () => {
-    expect(shallow(<DeveloperTrafficChart {...props} />)).toMatchSnapshot()
-  })
-
-  describe('getAppUsageStatsChartData', () => {
-    it('should run correctly', () => {
-      const { stats, apps } = props
-      const result = getAppUsageStatsChartData(stats.appUsage, apps.data)
-      const expected = {
-        labels: ['15/11/2019'],
-        data: [5],
-        appUsageStatsGroupedByDate: {
-          '15/11/2019': {
-            '09043eb8-9e5e-4650-b7f1-f0cb62699027': { appName: 'test', requests: 5 },
-            date: new Date('2019-11-15T00:00:00+00:00'),
-            totalRequests: 5,
-          },
-        },
-      }
-      expect(result).toEqual(expected)
-    })
-
-    describe('getChartOptions', () => {
-      it('should run correctly', () => {
-        const { stats, apps } = props
-        const result = getAppUsageStatsChartData(stats.appUsage, apps.data)
-        const options = getChartOptions(result?.appUsageStatsGroupedByDate)
-        expect(options.tooltips).not.toBeNull()
-      })
-    })
-
-    describe('getChartConfig', () => {
-      it('should run correctly', () => {
-        const { stats, apps } = props
-        const result = getAppUsageStatsChartData(stats.appUsage, apps.data)
-        const configs = getChartConfig(result?.labels, result?.data)
-        expect(configs).not.toBeNull()
-      })
-    })
-  })
-})
diff --git a/packages/developer-portal/src/components/ui/__tests__/developer-traffic-table.tsx b/packages/developer-portal/src/components/ui/__tests__/developer-traffic-table.tsx
deleted file mode 100644
index ab1e784c0d..0000000000
--- a/packages/developer-portal/src/components/ui/__tests__/developer-traffic-table.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import * as React from 'react'
-import { shallow } from 'enzyme'
-import DeveloperTrafficTable, {
-  DeveloperAppTrafficProps,
-  generateUsageStatsData,
-  AppUsageStats,
-  calculateTotalRequest,
-} from '../developer-traffic-table'
-import { appsDataStub } from '@/sagas/__stubs__/apps'
-import { usageStatsDataStub } from '@/sagas/__stubs__/app-usage-stats'
-
-const props: DeveloperAppTrafficProps = {
-  apps: appsDataStub.data,
-  stats: usageStatsDataStub,
-}
-
-describe('DeveloperTrafficTable', () => {
-  it('should match a snapshot', () => {
-    expect(shallow(<DeveloperTrafficTable {...props} />)).toMatchSnapshot()
-  })
-
-  describe('generateUsageStatsData', () => {
-    it('should run correctly', () => {
-      const props = {
-        apps: appsDataStub.data,
-        stats: usageStatsDataStub,
-      }
-      const result = generateUsageStatsData(props)()
-      const expected: AppUsageStats[] = [
-        { appName: 'test', created: '2020-02-02T10:45:57', requests: 5 },
-        { appName: 'asd', created: '2020-02-02T10:45:57', requests: 0 },
-      ]
-      expect(result).toEqual(expected)
-    })
-
-    it('should run correctly when not found apps data', () => {
-      const props: DeveloperAppTrafficProps = {
-        apps: {},
-        stats: {},
-      }
-      const result = generateUsageStatsData(props)()
-      expect(result).toEqual(undefined)
-    })
-  })
-
-  describe('calculate total api request', () => {
-    it('should run correctly', () => {
-      const props = {
-        apps: appsDataStub.data,
-        stats: usageStatsDataStub,
-      }
-      const usageStatsData = generateUsageStatsData(props)()
-      const result = calculateTotalRequest(usageStatsData)
-      expect(result).toEqual(5)
-    })
-  })
-})
diff --git a/packages/developer-portal/src/components/ui/developer-traffic-chart.tsx b/packages/developer-portal/src/components/ui/developer-traffic-chart.tsx
deleted file mode 100644
index a0d4d11b7e..0000000000
--- a/packages/developer-portal/src/components/ui/developer-traffic-chart.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import * as React from 'react'
-import { H4, Loader } from '@reapit/elements'
-import { Line } from 'react-chartjs-2'
-import { UsageStatsModel, PagedResultAppSummaryModel_ } from '@reapit/foundations-ts-definitions'
-import { getAppUsageStatsChartData, getChartConfig, getChartOptions } from '@/utils/app-usage-stats.ts'
-
-export type DeveloperTrafficChartProps = {
-  stats: UsageStatsModel
-  apps: PagedResultAppSummaryModel_
-  loading?: Boolean | false
-}
-
-export const DeveloperTrafficChart: React.FC<DeveloperTrafficChartProps> = ({ stats, apps, loading }) => {
-  const { appUsage } = stats || {}
-  const appUsageStatsChartData = getAppUsageStatsChartData(appUsage, apps.data)
-
-  function renderChart() {
-    const { labels, data, appUsageStatsGroupedByDate } = appUsageStatsChartData
-    const chartData = getChartConfig(labels, data)
-    const chartOptions = getChartOptions(appUsageStatsGroupedByDate)
-    return (
-      <>
-        <H4>Traffic (API Count)</H4>
-        <Line data={chartData} options={chartOptions} />
-      </>
-    )
-  }
-
-  return <div>{loading ? <Loader /> : renderChart()}</div>
-}
-
-export default DeveloperTrafficChart
diff --git a/packages/developer-portal/src/components/ui/developer-traffic-table.tsx b/packages/developer-portal/src/components/ui/developer-traffic-table.tsx
deleted file mode 100644
index 50a7fd070e..0000000000
--- a/packages/developer-portal/src/components/ui/developer-traffic-table.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import React, { useMemo } from 'react'
-import { UsageStatsModel, PagedResultAppSummaryModel_, AppUsageStatsModel } from '@reapit/foundations-ts-definitions'
-import { H4, Table, toLocalTime, Loader } from '@reapit/elements'
-import styles from '@/styles/pages/developer-analytics.scss?mod'
-
-export interface DeveloperAppTrafficProps {
-  stats: UsageStatsModel
-  apps: PagedResultAppSummaryModel_
-  loading?: Boolean
-}
-
-export interface AppUsageStats {
-  appName?: string
-  created?: string
-  requests?: number
-}
-
-export const generateUsageStatsData = ({ apps, stats }: DeveloperAppTrafficProps) => () => {
-  return apps.data?.reduce<AppUsageStats[]>((prev, app) => {
-    const appUsage = stats.appUsage?.find((item: AppUsageStatsModel) => item.appId === app.id)
-    const result = {
-      appName: app.name,
-      created: app.created,
-      requests: appUsage ? appUsage.requestsForPeriod : 0,
-    }
-    return [...prev, result]
-  }, [])
-}
-
-export const generateUsageStatsColumns = () => () => {
-  return [
-    {
-      Header: 'App Name',
-      accessor: 'appName',
-    },
-
-    {
-      Header: 'Date Created',
-      accessor: row => toLocalTime(row.created, 'DD/MM/YYYY'),
-    },
-    {
-      Header: 'Total API Calls',
-      accessor: 'requests',
-      columnProps: {
-        width: 300,
-      },
-    },
-  ]
-}
-
-export const calculateTotalRequest = (usageStatsData?: AppUsageStats[]) => {
-  if (!usageStatsData) {
-    return 0
-  }
-  return usageStatsData.reduce((previousValue, currentValue) => {
-    const requests = currentValue.requests || 0
-    return previousValue + requests
-  }, 0)
-}
-
-const DeveloperTrafficTable: React.FC<DeveloperAppTrafficProps> = ({ stats, apps, loading }) => {
-  const usageStatsData = useMemo(generateUsageStatsData({ apps, stats }), [stats, apps]) || []
-  const usageStatsColumns = useMemo(generateUsageStatsColumns(), [usageStatsData])
-
-  const renderTotalRequest = () => {
-    return (
-      <div className={`${styles.totalApiCountWrapper}`}>
-        <H4 className={`${styles.totalCount} is-pulled-left`}>
-          Total API Calls: {calculateTotalRequest(usageStatsData)}
-        </H4>
-      </div>
-    )
-  }
-
-  return (
-    <div>
-      {loading ? (
-        <Loader />
-      ) : (
-        <>
-          <H4>Traffic</H4>
-          <p className="is-italic">
-            The traffic table below shows all API calls made against each of your applications since the date your app
-            was created
-          </p>
-          <Table bordered scrollable columns={usageStatsColumns} data={usageStatsData} loading={false} />
-          {renderTotalRequest()}
-        </>
-      )}
-    </div>
-  )
-}
-
-export default DeveloperTrafficTable
diff --git a/packages/developer-portal/src/components/ui/menu.tsx b/packages/developer-portal/src/components/ui/menu.tsx
index 9968ce7aed..bec35aeb12 100644
--- a/packages/developer-portal/src/components/ui/menu.tsx
+++ b/packages/developer-portal/src/components/ui/menu.tsx
@@ -106,7 +106,7 @@ export const generateMenuConfig = (
         {
           title: 'Analytics',
           key: 'DEVELOPER_ANALYTICS',
-          url: Routes.DEVELOPER_ANALYTICS,
+          url: Routes.ANALYTICS,
           type: 'PRIMARY',
           icon: <FaChartBar className="nav-item-icon" />,
         },
diff --git a/packages/developer-portal/src/components/ui/terms-and-conditions-modal/consumption-cost-example-table.tsx b/packages/developer-portal/src/components/ui/terms-and-conditions-modal/consumption-cost-example-table.tsx
index eab954f132..223ebfd7fa 100644
--- a/packages/developer-portal/src/components/ui/terms-and-conditions-modal/consumption-cost-example-table.tsx
+++ b/packages/developer-portal/src/components/ui/terms-and-conditions-modal/consumption-cost-example-table.tsx
@@ -1,9 +1,10 @@
 import React from 'react'
 import { Table, Grid, GridItem, H6 } from '@reapit/elements'
-import { CostCalculatorFormValues } from '../developer-analytics/cost-explorer/cost-calculator/cost-calculator-form'
+// eslint-disable-next-line max-len
+import { CostCalculatorFormValues } from '@/components/pages/analytics/cost-explorer/cost-calculator/cost-calculator-form'
 import useFoundationCostTable, {
   endpointsUsedRange,
-} from '../developer-analytics/cost-explorer/cost-calculator/use-foundation-cost-table'
+} from '@/components/pages/analytics/cost-explorer/cost-calculator/use-foundation-cost-table'
 import { formatNumber } from '@/utils/number-formatter'
 
 const totalCostFormValues: CostCalculatorFormValues = {
diff --git a/packages/developer-portal/src/constants/routes.ts b/packages/developer-portal/src/constants/routes.ts
index b2e2b81b90..305f2b6250 100644
--- a/packages/developer-portal/src/constants/routes.ts
+++ b/packages/developer-portal/src/constants/routes.ts
@@ -18,8 +18,8 @@ const Routes = {
   DEVELOPER_DESKTOP: '/developer/desktop',
   APPS_EDIT: '/developer/apps/:appid/edit',
   DEVELOPER_API_DOCS: '/developer/api-docs',
-  DEVELOPER_ANALYTICS: '/developer/analytics',
-  DEVELOPER_ANALYTICS_TAB: '/developer/analytics/:activeTab?',
+  ANALYTICS: '/developer/analytics',
+  ANALYTICS_TAB: '/developer/analytics/:activeTab?',
   DEVELOPER_RESET_PASSWORD: '/developer/reset-password',
   DEVELOPER_WEBHOOKS: '/developer/webhooks',
   DEVELOPER_SETTINGS: '/developer/settings/',
diff --git a/packages/developer-portal/src/core/router.tsx b/packages/developer-portal/src/core/router.tsx
index fca6bf95f7..3083b45e7f 100644
--- a/packages/developer-portal/src/core/router.tsx
+++ b/packages/developer-portal/src/core/router.tsx
@@ -31,7 +31,7 @@ const DeveloperDesktopPage = React.lazy(() => catchChunkError(() => import('../c
 const DeveloperWelcomePage = React.lazy(() => catchChunkError(() => import('../components/pages/developer-welcome')))
 const DeveloperHelpPage = React.lazy(() => catchChunkError(() => import('../components/pages/developer-help')))
 const ClientHelpPage = React.lazy(() => catchChunkError(() => import('../components/pages/client-help')))
-const AnalyticsPage = React.lazy(() => catchChunkError(() => import('@/components/pages/developer-analytics')))
+const AnalyticsPage = React.lazy(() => catchChunkError(() => import('@/components/pages/analytics')))
 const AdminAppsPage = React.lazy(() => catchChunkError(() => import('../components/pages/admin-apps')))
 const RegisterConfirm = React.lazy(() => catchChunkError(() => import('../components/pages/register-confirm')))
 const AdminStats = React.lazy(() => catchChunkError(() => import('../components/pages/admin-stats')))
@@ -117,13 +117,7 @@ const Router = () => {
                   exact
                   component={DeveloperDesktopPage}
                 />
-                <PrivateRoute
-                  allow="DEVELOPER"
-                  path={Routes.DEVELOPER_ANALYTICS_TAB}
-                  fetcher
-                  exact
-                  component={AnalyticsPage}
-                />
+                <PrivateRoute allow="DEVELOPER" path={Routes.ANALYTICS_TAB} fetcher exact component={AnalyticsPage} />
 
                 <PrivateRoute
                   allow="DEVELOPER"
diff --git a/packages/developer-portal/src/utils/__tests__/app-usage-stats.ts b/packages/developer-portal/src/utils/__tests__/app-usage-stats.ts
deleted file mode 100644
index ab2d44d7e4..0000000000
--- a/packages/developer-portal/src/utils/__tests__/app-usage-stats.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import { appsDataStub } from '@/sagas/__stubs__/apps'
-import { usageStatsDataStub, usageStatsForMultipleAppsDataStub } from '@/sagas/__stubs__/app-usage-stats'
-import { getAppUsageStatsChartData, getChartConfig, getChartOptions } from '@/utils/app-usage-stats.ts'
-import { DeveloperTrafficChartProps } from '@/components/ui/developer-traffic-chart'
-
-const props: DeveloperTrafficChartProps = {
-  apps: appsDataStub.data,
-  stats: usageStatsDataStub,
-}
-
-const multipeAppStatsprops: DeveloperTrafficChartProps = {
-  apps: appsDataStub.data,
-  stats: usageStatsForMultipleAppsDataStub,
-}
-
-describe('DeveloperTrafficChart', () => {
-  describe('getAppUsageStatsChartData', () => {
-    it('should run correctly with stats for 1 app', () => {
-      const { stats, apps } = props
-      const result = getAppUsageStatsChartData(stats.appUsage, apps.data)
-      const expected = {
-        labels: ['15/11/2019'],
-        data: [5],
-        appUsageStatsGroupedByDate: {
-          '15/11/2019': {
-            '09043eb8-9e5e-4650-b7f1-f0cb62699027': { appName: 'test', requests: 5 },
-            date: new Date('2019-11-15T00:00:00+00:00'),
-            totalRequests: 5,
-          },
-        },
-      }
-      expect(result).toEqual(expected)
-    })
-
-    it('should run correctly with stats for multiple apps', () => {
-      const { stats, apps } = multipeAppStatsprops
-      const result = getAppUsageStatsChartData(stats.appUsage, apps.data)
-      const expected = {
-        labels: ['01/02/2020', '05/02/2020', '09/02/2020'],
-        data: [8, 0, 5],
-        appUsageStatsGroupedByDate: {
-          '09/02/2020': {
-            '09043eb8-9e5e-4650-b7f1-f0cb62699027': { appName: 'test', requests: 2 },
-            '261da083-cee2-4f5c-a18f-8f9375f1f5af': { appName: 'asd', requests: 3 },
-            date: new Date('2020-02-09T09:18:23.957Z'),
-            totalRequests: 5,
-          },
-          '01/02/2020': {
-            '09043eb8-9e5e-4650-b7f1-f0cb62699027': { appName: 'test', requests: 5 },
-            '261da083-cee2-4f5c-a18f-8f9375f1f5af': { appName: 'asd', requests: 3 },
-            date: new Date('2020-02-01T09:18:23.957Z'),
-            totalRequests: 8,
-          },
-          '05/02/2020': {
-            '09043eb8-9e5e-4650-b7f1-f0cb62699027': { appName: 'test', requests: 0 },
-            '261da083-cee2-4f5c-a18f-8f9375f1f5af': { appName: 'asd', requests: 0 },
-            date: new Date('2020-02-05T09:18:23.957Z'),
-            totalRequests: 0,
-          },
-        },
-      }
-      expect(result).toEqual(expected)
-    })
-
-    describe('getChartOptions', () => {
-      it('should run correctly', () => {
-        const { stats, apps } = props
-        const result = getAppUsageStatsChartData(stats.appUsage, apps.data)
-        const options = getChartOptions(result?.appUsageStatsGroupedByDate)
-        expect(options.tooltips).not.toBeNull()
-      })
-    })
-
-    describe('getChartConfig', () => {
-      it('should run correctly', () => {
-        const { stats, apps } = props
-        const result = getAppUsageStatsChartData(stats.appUsage, apps.data)
-        const configs = getChartConfig(result?.labels, result?.data)
-        expect(configs).not.toBeNull()
-      })
-    })
-  })
-})
diff --git a/packages/developer-portal/src/utils/__tests__/route-dispatcher.ts b/packages/developer-portal/src/utils/__tests__/route-dispatcher.ts
index 0caa7d1c51..765b18f630 100644
--- a/packages/developer-portal/src/utils/__tests__/route-dispatcher.ts
+++ b/packages/developer-portal/src/utils/__tests__/route-dispatcher.ts
@@ -49,7 +49,7 @@ describe('routeDispatcher', () => {
   })
 
   it('should dispatch to appInstallationsRequestData & developerRequestData for the analytics route', async () => {
-    await routeDispatcher(Routes.DEVELOPER_ANALYTICS_TAB as RouteValue)
+    await routeDispatcher(Routes.ANALYTICS_TAB as RouteValue)
     expect(store.dispatch).toHaveBeenCalledWith(developerRequestData({ appsPerPage: GET_ALL_PAGE_SIZE, page: 1 }))
     expect(store.dispatch).toHaveBeenCalledWith(fetchMyIdentity())
   })
diff --git a/packages/developer-portal/src/utils/app-usage-stats.ts b/packages/developer-portal/src/utils/app-usage-stats.ts
deleted file mode 100644
index b1bd46393b..0000000000
--- a/packages/developer-portal/src/utils/app-usage-stats.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import { AppUsageStatsModel, AppSummaryModel } from '@reapit/foundations-ts-definitions'
-import orderBy from 'lodash.orderby'
-import { toLocalTime } from '@reapit/elements'
-
-export interface AppTooltipLabel {
-  appName: string
-  requests: number
-}
-
-export const getAppUsageStatsChartData = (appUsageStats?: AppUsageStatsModel[], developerApps?: AppSummaryModel[]) => {
-  const appUsageStatsGroupedByDate = appUsageStats?.reduce((accumulator, currentValue) => {
-    const { appId, usage } = currentValue || {}
-    const developerApp = developerApps?.find(app => app.id === appId)
-    if (!developerApp?.id) {
-      return accumulator
-    }
-    const { id: developerAppId, name: developerAppName } = developerApp
-    usage?.forEach(usageByDate => {
-      const { date, requests } = usageByDate
-      if (!date) {
-        return null
-      }
-      const formattedDate = toLocalTime(date, 'DD/MM/YYYY')
-      if (!accumulator[formattedDate]) {
-        accumulator[formattedDate] = {
-          [developerAppId]: {
-            appName: developerAppName,
-            requests,
-          },
-          date: new Date(date),
-          totalRequests: requests,
-        }
-      } else {
-        accumulator[formattedDate] = {
-          ...accumulator[formattedDate],
-          ...{
-            [developerAppId]: {
-              appName: developerAppName,
-              requests,
-            },
-          },
-          date: new Date(date),
-          totalRequests: accumulator[formattedDate].totalRequests + requests,
-        }
-      }
-    })
-    return accumulator
-  }, {})
-
-  if (!appUsageStatsGroupedByDate || Object.keys(appUsageStatsGroupedByDate).length === 0) {
-    return {}
-  }
-
-  const orderedAppUsageStats = orderBy(appUsageStatsGroupedByDate, ['date'], ['asc'])
-  const labels = orderedAppUsageStats.map(item => toLocalTime(item.date, 'DD/MM/YYYY'))
-  const data = orderedAppUsageStats.map(item => item.totalRequests)
-
-  return {
-    labels,
-    data,
-    appUsageStatsGroupedByDate,
-  }
-}
-
-export const getChartOptions = data => {
-  return {
-    legend: null,
-    tooltips: {
-      mode: 'label',
-      callbacks: {
-        label: function(tooltipItem) {
-          const appUsage: [AppTooltipLabel] = data[tooltipItem.label]
-          if (!appUsage) {
-            return 'No Data'
-          }
-          return Object.values(appUsage)
-            .filter((app: AppTooltipLabel) => app.appName)
-            .map((app: AppTooltipLabel) => {
-              return `${app.appName}: ${app.requests}`
-            })
-        },
-      },
-    },
-  }
-}
-
-export const getChartConfig = (labels: string[], data: number[]) => {
-  return {
-    labels,
-    datasets: [
-      {
-        fill: false,
-        lineTension: 0.1,
-        backgroundColor: 'rgba(75,192,192,0.4)',
-        borderColor: 'rgba(75,192,192,1)',
-        borderCapStyle: 'butt',
-        borderDash: [],
-        borderDashOffset: 0.0,
-        borderJoinStyle: 'miter',
-        pointBorderColor: 'rgba(75,192,192,1)',
-        pointBackgroundColor: '#fff',
-        pointBorderWidth: 1,
-        pointHoverRadius: 5,
-        pointHoverBackgroundColor: 'rgba(75,192,192,1)',
-        pointHoverBorderColor: 'rgba(220,220,220,1)',
-        pointHoverBorderWidth: 2,
-        pointRadius: 1,
-        pointHitRadius: 10,
-        data,
-      },
-    ],
-  }
-}
diff --git a/packages/developer-portal/src/utils/developer-analytics.ts b/packages/developer-portal/src/utils/developer-analytics.ts
index 9a6d53ac45..51a18449f5 100644
--- a/packages/developer-portal/src/utils/developer-analytics.ts
+++ b/packages/developer-portal/src/utils/developer-analytics.ts
@@ -1,6 +1,6 @@
 import dayjs from 'dayjs'
 import orderBy from 'lodash.orderby'
-import { InstallationModelWithAppName } from '@/components/ui/developer-analytics/detailed/installation-app-section'
+import { InstallationModelWithAppName } from '@/components/pages/analytics/detailed/installation-app-section'
 
 export interface InstallationModelWithDateObject extends InstallationModelWithAppName {
   createdDate: Date
diff --git a/packages/developer-portal/src/utils/route-dispatcher.ts b/packages/developer-portal/src/utils/route-dispatcher.ts
index c43a6c2ce3..1483ff6e31 100644
--- a/packages/developer-portal/src/utils/route-dispatcher.ts
+++ b/packages/developer-portal/src/utils/route-dispatcher.ts
@@ -53,7 +53,7 @@ const routeDispatcher = async (route: RouteValue, params?: StringMap, search?: s
       store.dispatch(submitAppRequestData())
       store.dispatch(developerRequestData({ page }))
       break
-    case Routes.DEVELOPER_ANALYTICS_TAB: {
+    case Routes.ANALYTICS_TAB: {
       // Fetch all apps to map app name to installations
       store.dispatch(fetchMyIdentity())
       store.dispatch(developerRequestData({ page: 1, appsPerPage: GET_ALL_PAGE_SIZE }))