diff --git a/src/app/core/services/daemon/daemon.service.ts b/src/app/core/services/daemon/daemon.service.ts
index 1e68c03..55bb9e2 100644
--- a/src/app/core/services/daemon/daemon.service.ts
+++ b/src/app/core/services/daemon/daemon.service.ts
@@ -1,6 +1,5 @@
 import { HttpClient, HttpErrorResponse } from '@angular/common/http';
 import { EventEmitter, Injectable } from '@angular/core';
-import { BlockCount } from '../../../../common/BlockCount';
 import { firstValueFrom } from 'rxjs';
 import { 
   GetBlockCountRequest, GetBlockHashRequest, GetBlockTemplateRequest, JsonRPCRequest, 
@@ -8,79 +7,27 @@ import {
   GetBlockHeaderByHashRequest, GetBlockHeaderByHeightRequest, GetBlockHeadersRangeRequest, 
   GetConnectionsRequest, GetInfoRequest, HardForkInfoRequest, SetBansRequest, GetBansRequest, 
   BannedRequest, FlushTxPoolRequest, GetOutputHistogramRequest, GetCoinbaseTxSumRequest,
-  SyncInfoRequest, GetOutsRequest,
-  GetVersionRequest,
-  GetFeeEstimateRequest,
-  GetAlternateChainsRequest,
-  GetTxPoolBacklogRequest,
-  PruneBlockchainRequest,
-  CalculatePoWHashRequest,
-  FlushCacheRequest,
-  GetMinerDataRequest,
-  EmptyRpcRequest, RPCRequest,
-  AddAuxPoWRequest,
-  GetOutputDistributionRequest,
-  GetBlockRequest,
-  UpdateRequest,
-  PopBlocksRequest,
-  GetTransactionPoolHashesRequest,
-  GetTransactionPoolHashesBinaryRequest,
-  GetPublicNodesRequest,
-  GetNetStatsRequest,
-  InPeersRequest,
-  OutPeersRequest,
-  SetLimitRequest,
-  StopDaemonRequest,
-  MiningStatusRequest,
-  StopMiningRequest,
-  StartMiningRequest,
-  SendRawTransactionRequest,
-  IsKeyImageSpentRequest,
-  GetAltBlockHashesRequest,
-  SaveBcRequest,
-  SetBootstrapDaemonRequest,
-  SetLogLevelRequest,
-  SetLogHashRateRequest,
-  SetLogCategoriesRequest,
-  GetTransactionPoolRequest,
-  GetPeerListRequest,
-  GetTransactionPoolStatsRequest
-} from '../../../../common/request';
-import { BlockTemplate } from '../../../../common/BlockTemplate';
-import { GeneratedBlocks } from '../../../../common/GeneratedBlocks';
-import { BlockHeader } from '../../../../common/BlockHeader';
-import { Connection } from '../../../../common/Connection';
-import { DaemonInfo } from '../../../../common/DaemonInfo';
-import { HardForkInfo } from '../../../../common/HardForkInfo';
-import { Ban } from '../../../../common/Ban';
-import { HistogramEntry } from '../../../../common/HistogramEntry';
-import { SyncInfo } from '../../../../common/SyncInfo';
-import { DaemonVersion } from '../../../../common/DaemonVersion';
-import { FeeEstimate } from '../../../../common/FeeEstimate';
-import { Chain } from '../../../../common/Chain';
-import { RelayTxRequest } from '../../../../common/request/RelayTxRequest';
-import { TxBacklogEntry } from '../../../../common/TxBacklogEntry';
-import { BlockchainPruneInfo } from '../../../../common/BlockchainPruneInfo';
-import { MinerData } from '../../../../common/MinerData';
-import { CoreIsBusyError } from '../../../../common/error';
-import { ElectronService } from '../electron/electron.service';
-import { AddedAuxPow } from '../../../../common/AddedAuxPow';
-import { AuxPoW } from '../../../../common/AuxPoW';
-import { OutputDistribution } from '../../../../common/OutputDistribution';
-import { CoinbaseTxSum } from '../../../../common/CoinbaseTxSum';
-import { Block } from '../../../../common/Block';
-import { Output } from '../../../../common/Output';
-import { OutKey } from '../../../../common/OutKey';
-import { UpdateInfo } from '../../../../common/UpdateInfo';
-import { PublicNode } from '../../../../common/PublicNode';
-import { NetStats } from '../../../../common/NetStats';
-import { MiningStatus } from '../../../../common/MiningStatus';
-import { TxInfo } from '../../../../common/TxInfo';
-import { DaemonSettings } from '../../../../common/DaemonSettings';
-import { MethodNotFoundError } from '../../../../common/error/MethodNotFoundError';
-import { openDB, IDBPDatabase } from "idb"
-import { PeerInfo, ProcessStats, TimeUtils, TxPool, TxPoolStats } from '../../../../common';
+  SyncInfoRequest, GetOutsRequest, GetVersionRequest, GetFeeEstimateRequest,
+  GetAlternateChainsRequest, GetTxPoolBacklogRequest, PruneBlockchainRequest,
+  CalculatePoWHashRequest, FlushCacheRequest, GetMinerDataRequest, EmptyRpcRequest, RPCRequest,
+  AddAuxPoWRequest, GetOutputDistributionRequest, GetBlockRequest, UpdateRequest,
+  PopBlocksRequest, GetTransactionPoolHashesRequest, GetTransactionPoolHashesBinaryRequest,
+  GetPublicNodesRequest, GetNetStatsRequest, InPeersRequest, OutPeersRequest,
+  SetLimitRequest, StopDaemonRequest, MiningStatusRequest, StopMiningRequest,
+  StartMiningRequest, SendRawTransactionRequest, IsKeyImageSpentRequest,
+  GetAltBlockHashesRequest, SaveBcRequest, SetBootstrapDaemonRequest, MethodNotFoundError,
+  SetLogLevelRequest, SetLogHashRateRequest, SetLogCategoriesRequest, DaemonSettings,
+  GetTransactionPoolRequest, GetPeerListRequest, GetTransactionPoolStatsRequest, MiningStatus,
+  BlockTemplate, GeneratedBlocks, BlockHeader, Connection, DaemonInfo, HardForkInfo,
+  Ban, HistogramEntry, SyncInfo, DaemonVersion, FeeEstimate, Chain, AddedAuxPow, TxInfo,
+  RelayTxRequest, TxBacklogEntry, BlockchainPruneInfo, MinerData, CoreIsBusyError, NetStats,
+  AuxPoW, OutputDistribution, CoinbaseTxSum, Block, Output, OutKey, UpdateInfo, PublicNode,
+  PeerInfo, ProcessStats, TimeUtils, TxPool, TxPoolStats, BlockCount
+} from '../../../../common';
+
 import { MoneroInstallerService } from '../monero-installer/monero-installer.service';
+import { ElectronService } from '../electron/electron.service';
+import { openDB, IDBPDatabase } from "idb"
 
 @Injectable({
   providedIn: 'root'
diff --git a/src/app/pages/settings/settings.component.ts b/src/app/pages/settings/settings.component.ts
index 993c48b..f1b0e86 100644
--- a/src/app/pages/settings/settings.component.ts
+++ b/src/app/pages/settings/settings.component.ts
@@ -1,6 +1,6 @@
 import { AfterViewInit, Component, NgZone } from '@angular/core';
 import { NavbarLink } from '../../shared/components/navbar/navbar.model';
-import { DaemonSettings } from '../../../common/DaemonSettings';
+import { DaemonSettings } from '../../../common';
 import { DaemonService } from '../../core/services/daemon/daemon.service';
 import { ElectronService } from '../../core/services';
 import { DaemonSettingsError } from '../../../common';
diff --git a/src/app/pages/transactions/transactions.component.ts b/src/app/pages/transactions/transactions.component.ts
index 728fdc8..775d3e8 100644
--- a/src/app/pages/transactions/transactions.component.ts
+++ b/src/app/pages/transactions/transactions.component.ts
@@ -2,7 +2,7 @@ import { AfterViewInit, Component, NgZone } from '@angular/core';
 import { DaemonService } from '../../core/services/daemon/daemon.service';
 import { NavbarService } from '../../shared/components/navbar/navbar.service';
 import { NavbarLink } from '../../shared/components/navbar/navbar.model';
-import { TxBacklogEntry } from '../../../common/TxBacklogEntry';
+import { TxBacklogEntry } from '../../../common';
 import { SimpleBootstrapCard } from '../../shared/utils';
 import { DaemonDataService } from '../../core/services';
 import { FeeEstimate, SpentKeyImage, TxPoolHisto, TxPoolStats, UnconfirmedTx } from '../../../common';
diff --git a/src/app/pages/version/version.component.ts b/src/app/pages/version/version.component.ts
index ecfecb2..1ceaad9 100644
--- a/src/app/pages/version/version.component.ts
+++ b/src/app/pages/version/version.component.ts
@@ -2,9 +2,8 @@ import { AfterViewInit, Component, NgZone } from '@angular/core';
 import { NavbarLink } from '../../shared/components/navbar/navbar.model';
 import { DaemonService } from '../../core/services/daemon/daemon.service';
 import { SimpleBootstrapCard } from '../../shared/utils';
-import { DaemonVersion } from '../../../common/DaemonVersion';
 import { DaemonDataService, ElectronService, MoneroInstallerService } from '../../core/services';
-import { DaemonSettings } from '../../../common';
+import { DaemonSettings, DaemonVersion } from '../../../common';
 import { StringUtils } from '../../core/utils';
 
 @Component({