From e928eb6d3d8ce2f16ca5ee6cea9453e5937d22e2 Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Wed, 21 Apr 2021 20:18:36 +0200
Subject: [PATCH] Improve imports

---
 .../src/app/components/header/header.component.ts  |  8 ++++----
 .../src/app/components/header/header.module.ts     |  2 +-
 .../performance-chart-dialog.component.ts          |  2 +-
 .../performance-chart-dialog.module.ts             |  2 +-
 .../position-detail-dialog.component.ts            |  2 +-
 .../position-detail-dialog.module.ts               |  2 +-
 .../src/app/components/rules/rules.module.ts       |  2 +-
 .../src/app/pages/about/about-page.component.ts    |  4 ++--
 .../pages/account/account-page-routing.module.ts   |  2 +-
 .../app/pages/account/account-page.component.ts    |  4 ++--
 .../src/app/pages/account/account-page.module.ts   |  2 +-
 .../app/pages/admin/admin-page-routing.module.ts   |  2 +-
 .../src/app/pages/admin/admin-page.component.ts    |  6 +++---
 .../src/app/pages/admin/admin-page.module.ts       |  2 +-
 .../pages/analysis/analysis-page-routing.module.ts |  2 +-
 .../app/pages/analysis/analysis-page.component.ts  |  8 ++++----
 .../src/app/pages/analysis/analysis-page.module.ts | 10 +++++-----
 .../src/app/pages/auth/auth-page.component.ts      |  2 +-
 .../src/app/pages/home/home-page-routing.module.ts |  2 +-
 .../src/app/pages/home/home-page.component.ts      | 14 +++++++-------
 apps/client/src/app/pages/home/home-page.module.ts | 14 +++++++-------
 .../app/pages/login/login-page-routing.module.ts   |  2 +-
 .../src/app/pages/login/login-page.component.ts    |  6 +++---
 .../src/app/pages/login/login-page.module.ts       |  4 ++--
 .../app/pages/report/report-page-routing.module.ts |  2 +-
 .../src/app/pages/report/report-page.component.ts  |  2 +-
 .../src/app/pages/report/report-page.module.ts     |  2 +-
 .../transactions-page-routing.module.ts            |  2 +-
 .../transactions/transactions-page.component.ts    |  6 +++---
 .../pages/transactions/transactions-page.module.ts |  2 +-
 tsconfig.base.json                                 |  2 +-
 31 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/apps/client/src/app/components/header/header.component.ts b/apps/client/src/app/components/header/header.component.ts
index 94e202bdd..ceac52a22 100644
--- a/apps/client/src/app/components/header/header.component.ts
+++ b/apps/client/src/app/components/header/header.component.ts
@@ -6,10 +6,10 @@ import {
 } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Router } from '@angular/router';
-import { LoginWithAccessTokenDialog } from '@ghostfolio/client/app/pages/login/login-with-access-token-dialog/login-with-access-token-dialog.component';
-import { DataService } from '@ghostfolio/client/app/services/data.service';
-import { ImpersonationStorageService } from '@ghostfolio/client/app/services/impersonation-storage.service';
-import { TokenStorageService } from '@ghostfolio/client/app/services/token-storage.service';
+import { LoginWithAccessTokenDialog } from '@ghostfolio/client/pages/login/login-with-access-token-dialog/login-with-access-token-dialog.component';
+import { DataService } from '@ghostfolio/client/services/data.service';
+import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
+import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service';
 import { hasPermission, permissions } from '@ghostfolio/helper';
 import { InfoItem } from 'apps/api/src/app/info/interfaces/info-item.interface';
 import { User } from 'apps/api/src/app/user/interfaces/user.interface';
diff --git a/apps/client/src/app/components/header/header.module.ts b/apps/client/src/app/components/header/header.module.ts
index f5e89d592..b1cdbd24d 100644
--- a/apps/client/src/app/components/header/header.module.ts
+++ b/apps/client/src/app/components/header/header.module.ts
@@ -4,7 +4,7 @@ import { MatButtonModule } from '@angular/material/button';
 import { MatMenuModule } from '@angular/material/menu';
 import { MatToolbarModule } from '@angular/material/toolbar';
 import { RouterModule } from '@angular/router';
-import { LoginWithAccessTokenDialogModule } from '@ghostfolio/client/app/pages/login/login-with-access-token-dialog/login-with-access-token-dialog.module';
+import { LoginWithAccessTokenDialogModule } from '@ghostfolio/client/pages/login/login-with-access-token-dialog/login-with-access-token-dialog.module';
 
 import { GfLogoModule } from '../logo/logo.module';
 import { HeaderComponent } from './header.component';
diff --git a/apps/client/src/app/components/performance-chart-dialog/performance-chart-dialog.component.ts b/apps/client/src/app/components/performance-chart-dialog/performance-chart-dialog.component.ts
index d61ba9504..0a4c9e4a3 100644
--- a/apps/client/src/app/components/performance-chart-dialog/performance-chart-dialog.component.ts
+++ b/apps/client/src/app/components/performance-chart-dialog/performance-chart-dialog.component.ts
@@ -5,7 +5,7 @@ import {
   Inject
 } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { DataService } from '@ghostfolio/client/app/services/data.service';
+import { DataService } from '@ghostfolio/client/services/data.service';
 import { isToday, parse } from 'date-fns';
 
 import { LineChartItem } from '../line-chart/interfaces/line-chart.interface';
diff --git a/apps/client/src/app/components/performance-chart-dialog/performance-chart-dialog.module.ts b/apps/client/src/app/components/performance-chart-dialog/performance-chart-dialog.module.ts
index 4555058b6..1db013464 100644
--- a/apps/client/src/app/components/performance-chart-dialog/performance-chart-dialog.module.ts
+++ b/apps/client/src/app/components/performance-chart-dialog/performance-chart-dialog.module.ts
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatDialogModule } from '@angular/material/dialog';
-import { GfLineChartModule } from '@ghostfolio/client/app/components/line-chart/line-chart.module';
+import { GfLineChartModule } from '@ghostfolio/client/components/line-chart/line-chart.module';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 
 import { GfDialogFooterModule } from '../dialog-footer/dialog-footer.module';
diff --git a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.component.ts b/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.component.ts
index a023ae92d..7ee16d2ce 100644
--- a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.component.ts
+++ b/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.component.ts
@@ -5,7 +5,7 @@ import {
   Inject
 } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { DataService } from '@ghostfolio/client/app/services/data.service';
+import { DataService } from '@ghostfolio/client/services/data.service';
 import { format, isSameMonth, isToday, parseISO } from 'date-fns';
 
 import { LineChartItem } from '../../line-chart/interfaces/line-chart.interface';
diff --git a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.module.ts b/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.module.ts
index 1355117ee..38d42e914 100644
--- a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.module.ts
+++ b/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.module.ts
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatDialogModule } from '@angular/material/dialog';
-import { GfLineChartModule } from '@ghostfolio/client/app/components/line-chart/line-chart.module';
+import { GfLineChartModule } from '@ghostfolio/client/components/line-chart/line-chart.module';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 
 import { GfDialogFooterModule } from '../../dialog-footer/dialog-footer.module';
diff --git a/apps/client/src/app/components/rules/rules.module.ts b/apps/client/src/app/components/rules/rules.module.ts
index 22e0881d6..5a6a5bc8b 100644
--- a/apps/client/src/app/components/rules/rules.module.ts
+++ b/apps/client/src/app/components/rules/rules.module.ts
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatCardModule } from '@angular/material/card';
-import { GfRuleModule } from '@ghostfolio/client/app/components/rule/rule.module';
+import { GfRuleModule } from '@ghostfolio/client/components/rule/rule.module';
 
 import { GfNoTransactionsInfoModule } from '../no-transactions-info/no-transactions-info.module';
 import { GfPositionModule } from '../position/position.module';
diff --git a/apps/client/src/app/pages/about/about-page.component.ts b/apps/client/src/app/pages/about/about-page.component.ts
index b4963e002..a9b0bf818 100644
--- a/apps/client/src/app/pages/about/about-page.component.ts
+++ b/apps/client/src/app/pages/about/about-page.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectorRef, Component, OnInit } from '@angular/core';
-import { DataService } from '@ghostfolio/client/app/services/data.service';
-import { TokenStorageService } from '@ghostfolio/client/app/services/token-storage.service';
+import { DataService } from '@ghostfolio/client/services/data.service';
+import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service';
 import { baseCurrency } from '@ghostfolio/helper';
 import { User } from 'apps/api/src/app/user/interfaces/user.interface';
 import { environment } from 'apps/client/src/environments/environment';
diff --git a/apps/client/src/app/pages/account/account-page-routing.module.ts b/apps/client/src/app/pages/account/account-page-routing.module.ts
index 7fb54aef2..fc0fd0349 100644
--- a/apps/client/src/app/pages/account/account-page-routing.module.ts
+++ b/apps/client/src/app/pages/account/account-page-routing.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { AuthGuard } from '@ghostfolio/client/app/core/auth.guard';
+import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 
 import { AccountPageComponent } from './account-page.component';
 
diff --git a/apps/client/src/app/pages/account/account-page.component.ts b/apps/client/src/app/pages/account/account-page.component.ts
index e11df165d..a832bf125 100644
--- a/apps/client/src/app/pages/account/account-page.component.ts
+++ b/apps/client/src/app/pages/account/account-page.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
-import { DataService } from '@ghostfolio/client/app/services/data.service';
-import { TokenStorageService } from '@ghostfolio/client/app/services/token-storage.service';
+import { DataService } from '@ghostfolio/client/services/data.service';
+import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service';
 import { DEFAULT_DATE_FORMAT } from '@ghostfolio/helper';
 import { Access } from 'apps/api/src/app/access/interfaces/access.interface';
 import { User } from 'apps/api/src/app/user/interfaces/user.interface';
diff --git a/apps/client/src/app/pages/account/account-page.module.ts b/apps/client/src/app/pages/account/account-page.module.ts
index 71d6d6ecb..3c44a988f 100644
--- a/apps/client/src/app/pages/account/account-page.module.ts
+++ b/apps/client/src/app/pages/account/account-page.module.ts
@@ -4,7 +4,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatCardModule } from '@angular/material/card';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatSelectModule } from '@angular/material/select';
-import { GfPortfolioAccessTableModule } from '@ghostfolio/client/app/components/access-table/access-table.module';
+import { GfPortfolioAccessTableModule } from '@ghostfolio/client/components/access-table/access-table.module';
 
 import { AccountPageRoutingModule } from './account-page-routing.module';
 import { AccountPageComponent } from './account-page.component';
diff --git a/apps/client/src/app/pages/admin/admin-page-routing.module.ts b/apps/client/src/app/pages/admin/admin-page-routing.module.ts
index 91c2e0fbf..1362cec53 100644
--- a/apps/client/src/app/pages/admin/admin-page-routing.module.ts
+++ b/apps/client/src/app/pages/admin/admin-page-routing.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { AuthGuard } from '@ghostfolio/client/app/core/auth.guard';
+import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 
 import { AdminPageComponent } from './admin-page.component';
 
diff --git a/apps/client/src/app/pages/admin/admin-page.component.ts b/apps/client/src/app/pages/admin/admin-page.component.ts
index bf38af4f7..99d378d02 100644
--- a/apps/client/src/app/pages/admin/admin-page.component.ts
+++ b/apps/client/src/app/pages/admin/admin-page.component.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectorRef, Component, OnInit } from '@angular/core';
-import { AdminService } from '@ghostfolio/client/app/services/admin.service';
-import { CacheService } from '@ghostfolio/client/app/services/cache.service';
-import { DataService } from '@ghostfolio/client/app/services/data.service';
+import { AdminService } from '@ghostfolio/client/services/admin.service';
+import { CacheService } from '@ghostfolio/client/services/cache.service';
+import { DataService } from '@ghostfolio/client/services/data.service';
 import { DEFAULT_DATE_FORMAT } from '@ghostfolio/helper';
 import { AdminData } from 'apps/api/src/app/admin/interfaces/admin-data.interface';
 import { formatDistanceToNow, isValid, parseISO, sub } from 'date-fns';
diff --git a/apps/client/src/app/pages/admin/admin-page.module.ts b/apps/client/src/app/pages/admin/admin-page.module.ts
index 66f86a780..dae85ecea 100644
--- a/apps/client/src/app/pages/admin/admin-page.module.ts
+++ b/apps/client/src/app/pages/admin/admin-page.module.ts
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatCardModule } from '@angular/material/card';
-import { CacheService } from '@ghostfolio/client/app/services/cache.service';
+import { CacheService } from '@ghostfolio/client/services/cache.service';
 
 import { AdminPageRoutingModule } from './admin-page-routing.module';
 import { AdminPageComponent } from './admin-page.component';
diff --git a/apps/client/src/app/pages/analysis/analysis-page-routing.module.ts b/apps/client/src/app/pages/analysis/analysis-page-routing.module.ts
index dfc854880..2b2356fed 100644
--- a/apps/client/src/app/pages/analysis/analysis-page-routing.module.ts
+++ b/apps/client/src/app/pages/analysis/analysis-page-routing.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { AuthGuard } from '@ghostfolio/client/app/core/auth.guard';
+import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 
 import { AnalysisPageComponent } from './analysis-page.component';
 
diff --git a/apps/client/src/app/pages/analysis/analysis-page.component.ts b/apps/client/src/app/pages/analysis/analysis-page.component.ts
index ac2304c66..55fdf89ac 100644
--- a/apps/client/src/app/pages/analysis/analysis-page.component.ts
+++ b/apps/client/src/app/pages/analysis/analysis-page.component.ts
@@ -1,8 +1,8 @@
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
-import { ToggleOption } from '@ghostfolio/client/app/components/toggle/interfaces/toggle-option.type';
-import { DataService } from '@ghostfolio/client/app/services/data.service';
-import { ImpersonationStorageService } from '@ghostfolio/client/app/services/impersonation-storage.service';
-import { TokenStorageService } from '@ghostfolio/client/app/services/token-storage.service';
+import { ToggleOption } from '@ghostfolio/client/components/toggle/interfaces/toggle-option.type';
+import { DataService } from '@ghostfolio/client/services/data.service';
+import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
+import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service';
 import { PortfolioItem } from 'apps/api/src/app/portfolio/interfaces/portfolio-item.interface';
 import { PortfolioPosition } from 'apps/api/src/app/portfolio/interfaces/portfolio-position.interface';
 import { User } from 'apps/api/src/app/user/interfaces/user.interface';
diff --git a/apps/client/src/app/pages/analysis/analysis-page.module.ts b/apps/client/src/app/pages/analysis/analysis-page.module.ts
index ead2d929d..c3081dc9e 100644
--- a/apps/client/src/app/pages/analysis/analysis-page.module.ts
+++ b/apps/client/src/app/pages/analysis/analysis-page.module.ts
@@ -1,11 +1,11 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { MatCardModule } from '@angular/material/card';
-import { GfInvestmentChartModule } from '@ghostfolio/client/app/components/investment-chart/investment-chart.module';
-import { PortfolioPositionsChartModule } from '@ghostfolio/client/app/components/portfolio-positions-chart/portfolio-positions-chart.module';
-import { PortfolioProportionChartModule } from '@ghostfolio/client/app/components/portfolio-proportion-chart/portfolio-proportion-chart.module';
-import { GfPositionsTableModule } from '@ghostfolio/client/app/components/positions-table/positions-table.module';
-import { GfToggleModule } from '@ghostfolio/client/app/components/toggle/toggle.module';
+import { GfInvestmentChartModule } from '@ghostfolio/client/components/investment-chart/investment-chart.module';
+import { PortfolioPositionsChartModule } from '@ghostfolio/client/components/portfolio-positions-chart/portfolio-positions-chart.module';
+import { PortfolioProportionChartModule } from '@ghostfolio/client/components/portfolio-proportion-chart/portfolio-proportion-chart.module';
+import { GfPositionsTableModule } from '@ghostfolio/client/components/positions-table/positions-table.module';
+import { GfToggleModule } from '@ghostfolio/client/components/toggle/toggle.module';
 
 import { AnalysisPageRoutingModule } from './analysis-page-routing.module';
 import { AnalysisPageComponent } from './analysis-page.component';
diff --git a/apps/client/src/app/pages/auth/auth-page.component.ts b/apps/client/src/app/pages/auth/auth-page.component.ts
index dcb147ccd..70f4f6563 100644
--- a/apps/client/src/app/pages/auth/auth-page.component.ts
+++ b/apps/client/src/app/pages/auth/auth-page.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { TokenStorageService } from '@ghostfolio/client/app/services/token-storage.service';
+import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service';
 
 @Component({
   selector: 'gf-auth-page',
diff --git a/apps/client/src/app/pages/home/home-page-routing.module.ts b/apps/client/src/app/pages/home/home-page-routing.module.ts
index b82228252..ab5a539aa 100644
--- a/apps/client/src/app/pages/home/home-page-routing.module.ts
+++ b/apps/client/src/app/pages/home/home-page-routing.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { AuthGuard } from '@ghostfolio/client/app/core/auth.guard';
+import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 
 import { HomePageComponent } from './home-page.component';
 
diff --git a/apps/client/src/app/pages/home/home-page.component.ts b/apps/client/src/app/pages/home/home-page.component.ts
index a3fce3daa..2d5a99a13 100644
--- a/apps/client/src/app/pages/home/home-page.component.ts
+++ b/apps/client/src/app/pages/home/home-page.component.ts
@@ -1,16 +1,16 @@
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { ActivatedRoute, Router } from '@angular/router';
-import { LineChartItem } from '@ghostfolio/client/app/components/line-chart/interfaces/line-chart.interface';
-import { PerformanceChartDialog } from '@ghostfolio/client/app/components/performance-chart-dialog/performance-chart-dialog.component';
-import { ToggleOption } from '@ghostfolio/client/app/components/toggle/interfaces/toggle-option.type';
-import { DataService } from '@ghostfolio/client/app/services/data.service';
-import { ImpersonationStorageService } from '@ghostfolio/client/app/services/impersonation-storage.service';
+import { LineChartItem } from '@ghostfolio/client/components/line-chart/interfaces/line-chart.interface';
+import { PerformanceChartDialog } from '@ghostfolio/client/components/performance-chart-dialog/performance-chart-dialog.component';
+import { ToggleOption } from '@ghostfolio/client/components/toggle/interfaces/toggle-option.type';
+import { DataService } from '@ghostfolio/client/services/data.service';
+import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
 import {
   RANGE,
   SettingsStorageService
-} from '@ghostfolio/client/app/services/settings-storage.service';
-import { TokenStorageService } from '@ghostfolio/client/app/services/token-storage.service';
+} from '@ghostfolio/client/services/settings-storage.service';
+import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service';
 import { hasPermission, permissions } from '@ghostfolio/helper';
 import { DateRange } from 'apps/api/src/app/portfolio/interfaces/date-range.type';
 import { PortfolioOverview } from 'apps/api/src/app/portfolio/interfaces/portfolio-overview.interface';
diff --git a/apps/client/src/app/pages/home/home-page.module.ts b/apps/client/src/app/pages/home/home-page.module.ts
index e583df515..9f3c495e2 100644
--- a/apps/client/src/app/pages/home/home-page.module.ts
+++ b/apps/client/src/app/pages/home/home-page.module.ts
@@ -3,13 +3,13 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatCardModule } from '@angular/material/card';
 import { RouterModule } from '@angular/router';
-import { GfLineChartModule } from '@ghostfolio/client/app/components/line-chart/line-chart.module';
-import { GfPerformanceChartDialogModule } from '@ghostfolio/client/app/components/performance-chart-dialog/performance-chart-dialog.module';
-import { GfPortfolioOverviewModule } from '@ghostfolio/client/app/components/portfolio-overview/portfolio-overview.module';
-import { GfPortfolioPerformanceSummaryModule } from '@ghostfolio/client/app/components/portfolio-performance-summary/portfolio-performance-summary.module';
-import { GfPortfolioPerformanceModule } from '@ghostfolio/client/app/components/portfolio-performance/portfolio-performance.module';
-import { GfPositionsModule } from '@ghostfolio/client/app/components/positions/positions.module';
-import { GfToggleModule } from '@ghostfolio/client/app/components/toggle/toggle.module';
+import { GfLineChartModule } from '@ghostfolio/client/components/line-chart/line-chart.module';
+import { GfPerformanceChartDialogModule } from '@ghostfolio/client/components/performance-chart-dialog/performance-chart-dialog.module';
+import { GfPortfolioOverviewModule } from '@ghostfolio/client/components/portfolio-overview/portfolio-overview.module';
+import { GfPortfolioPerformanceSummaryModule } from '@ghostfolio/client/components/portfolio-performance-summary/portfolio-performance-summary.module';
+import { GfPortfolioPerformanceModule } from '@ghostfolio/client/components/portfolio-performance/portfolio-performance.module';
+import { GfPositionsModule } from '@ghostfolio/client/components/positions/positions.module';
+import { GfToggleModule } from '@ghostfolio/client/components/toggle/toggle.module';
 
 import { HomePageRoutingModule } from './home-page-routing.module';
 import { HomePageComponent } from './home-page.component';
diff --git a/apps/client/src/app/pages/login/login-page-routing.module.ts b/apps/client/src/app/pages/login/login-page-routing.module.ts
index 9d95bf797..63829706e 100644
--- a/apps/client/src/app/pages/login/login-page-routing.module.ts
+++ b/apps/client/src/app/pages/login/login-page-routing.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { AuthGuard } from '@ghostfolio/client/app/core/auth.guard';
+import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 
 import { LoginPageComponent } from './login-page.component';
 
diff --git a/apps/client/src/app/pages/login/login-page.component.ts b/apps/client/src/app/pages/login/login-page.component.ts
index a7d42f058..d1dd0bfbc 100644
--- a/apps/client/src/app/pages/login/login-page.component.ts
+++ b/apps/client/src/app/pages/login/login-page.component.ts
@@ -1,9 +1,9 @@
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Router } from '@angular/router';
-import { LineChartItem } from '@ghostfolio/client/app/components/line-chart/interfaces/line-chart.interface';
-import { DataService } from '@ghostfolio/client/app/services/data.service';
-import { TokenStorageService } from '@ghostfolio/client/app/services/token-storage.service';
+import { LineChartItem } from '@ghostfolio/client/components/line-chart/interfaces/line-chart.interface';
+import { DataService } from '@ghostfolio/client/services/data.service';
+import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service';
 import { format } from 'date-fns';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
diff --git a/apps/client/src/app/pages/login/login-page.module.ts b/apps/client/src/app/pages/login/login-page.module.ts
index 80215135f..6ff7480e0 100644
--- a/apps/client/src/app/pages/login/login-page.module.ts
+++ b/apps/client/src/app/pages/login/login-page.module.ts
@@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { RouterModule } from '@angular/router';
-import { GfLineChartModule } from '@ghostfolio/client/app/components/line-chart/line-chart.module';
-import { GfLogoModule } from '@ghostfolio/client/app/components/logo/logo.module';
+import { GfLineChartModule } from '@ghostfolio/client/components/line-chart/line-chart.module';
+import { GfLogoModule } from '@ghostfolio/client/components/logo/logo.module';
 
 import { LoginPageRoutingModule } from './login-page-routing.module';
 import { LoginPageComponent } from './login-page.component';
diff --git a/apps/client/src/app/pages/report/report-page-routing.module.ts b/apps/client/src/app/pages/report/report-page-routing.module.ts
index d89be9670..e1306a6f5 100644
--- a/apps/client/src/app/pages/report/report-page-routing.module.ts
+++ b/apps/client/src/app/pages/report/report-page-routing.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { AuthGuard } from '@ghostfolio/client/app/core/auth.guard';
+import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 
 import { ReportPageComponent } from './report-page.component';
 
diff --git a/apps/client/src/app/pages/report/report-page.component.ts b/apps/client/src/app/pages/report/report-page.component.ts
index 5246b40d6..c507fc2d2 100644
--- a/apps/client/src/app/pages/report/report-page.component.ts
+++ b/apps/client/src/app/pages/report/report-page.component.ts
@@ -1,5 +1,5 @@
 import { ChangeDetectorRef, Component, OnInit } from '@angular/core';
-import { DataService } from '@ghostfolio/client/app/services/data.service';
+import { DataService } from '@ghostfolio/client/services/data.service';
 import { PortfolioReportRule } from 'apps/api/src/app/portfolio/interfaces/portfolio-report.interface';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
diff --git a/apps/client/src/app/pages/report/report-page.module.ts b/apps/client/src/app/pages/report/report-page.module.ts
index ac7c47bf1..1f11e2f15 100644
--- a/apps/client/src/app/pages/report/report-page.module.ts
+++ b/apps/client/src/app/pages/report/report-page.module.ts
@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { RulesModule } from '@ghostfolio/client/app/components/rules/rules.module';
+import { RulesModule } from '@ghostfolio/client/components/rules/rules.module';
 
 import { ReportPageRoutingModule } from './report-page-routing.module';
 import { ReportPageComponent } from './report-page.component';
diff --git a/apps/client/src/app/pages/transactions/transactions-page-routing.module.ts b/apps/client/src/app/pages/transactions/transactions-page-routing.module.ts
index a741a466d..ae3de4dba 100644
--- a/apps/client/src/app/pages/transactions/transactions-page-routing.module.ts
+++ b/apps/client/src/app/pages/transactions/transactions-page-routing.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { AuthGuard } from '@ghostfolio/client/app/core/auth.guard';
+import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 
 import { TransactionsPageComponent } from './transactions-page.component';
 
diff --git a/apps/client/src/app/pages/transactions/transactions-page.component.ts b/apps/client/src/app/pages/transactions/transactions-page.component.ts
index 3c58b9d69..0d994187f 100644
--- a/apps/client/src/app/pages/transactions/transactions-page.component.ts
+++ b/apps/client/src/app/pages/transactions/transactions-page.component.ts
@@ -1,9 +1,9 @@
 import { ChangeDetectorRef, Component, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { ActivatedRoute, Router } from '@angular/router';
-import { DataService } from '@ghostfolio/client/app/services/data.service';
-import { ImpersonationStorageService } from '@ghostfolio/client/app/services/impersonation-storage.service';
-import { TokenStorageService } from '@ghostfolio/client/app/services/token-storage.service';
+import { DataService } from '@ghostfolio/client/services/data.service';
+import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
+import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service';
 import { hasPermission, permissions } from '@ghostfolio/helper';
 import { Order as OrderModel } from '@prisma/client';
 import { UpdateOrderDto } from 'apps/api/src/app/order/update-order.dto';
diff --git a/apps/client/src/app/pages/transactions/transactions-page.module.ts b/apps/client/src/app/pages/transactions/transactions-page.module.ts
index b21344b0f..b44ed4226 100644
--- a/apps/client/src/app/pages/transactions/transactions-page.module.ts
+++ b/apps/client/src/app/pages/transactions/transactions-page.module.ts
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { RouterModule } from '@angular/router';
-import { GfTransactionsTableModule } from '@ghostfolio/client/app/components/transactions-table/transactions-table.module';
+import { GfTransactionsTableModule } from '@ghostfolio/client/components/transactions-table/transactions-table.module';
 
 import { CreateOrUpdateTransactionDialogModule } from './create-or-update-transaction-dialog/create-or-update-transaction-dialog.module';
 import { TransactionsPageRoutingModule } from './transactions-page-routing.module';
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 9adcb93ff..cc4def900 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -17,7 +17,7 @@
     "baseUrl": ".",
     "paths": {
       "@ghostfolio/api/*": ["apps/api/src/*"],
-      "@ghostfolio/client/*": ["apps/client/src/*"],
+      "@ghostfolio/client/*": ["apps/client/src/app/*"],
       "@ghostfolio/helper": ["libs/helper/src/index.ts"]
     }
   },