diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 7133cc3..bb5cca1 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -15,9 +15,9 @@ import { HomeModule } from './pages/home/home.module';
 import { DetailModule } from './pages/detail/detail.module';
 
 import { AppComponent } from './app.component';
-import { LoadComponent } from "./load/load.component";
+import { LoadComponent } from "./shared/components/load/load.component";
 import { BansModule } from './pages/bans/bans.module';
-import { NavbarComponent } from "./navbar/navbar.component";
+import { NavbarComponent } from "./shared/components/navbar/navbar.component";
 import { MiningModule } from './pages/mining/mining.module';
 import { TransactionsModule } from './pages/transactions/transactions.module';
 import { OutputsModule } from './pages/outputs/outputs.module';
diff --git a/src/app/pages/bans/bans.component.ts b/src/app/pages/bans/bans.component.ts
index a95bdb0..e830f10 100644
--- a/src/app/pages/bans/bans.component.ts
+++ b/src/app/pages/bans/bans.component.ts
@@ -1,6 +1,6 @@
 import { AfterViewInit, Component } from '@angular/core';
 import { NavigationEnd, Router } from '@angular/router';
-import { NavbarService } from '../../navbar/navbar.service';
+import { NavbarService } from '../../shared/components/navbar/navbar.service';
 import { DaemonService } from '../../core/services/daemon/daemon.service';
 
 @Component({
diff --git a/src/app/pages/detail/detail.component.ts b/src/app/pages/detail/detail.component.ts
index 409d827..09e9998 100644
--- a/src/app/pages/detail/detail.component.ts
+++ b/src/app/pages/detail/detail.component.ts
@@ -2,8 +2,8 @@ import { Component, OnInit, AfterViewInit, NgZone, OnDestroy } from '@angular/co
 import { DaemonService } from '../../core/services/daemon/daemon.service';
 import { SyncInfo } from '../../../common/SyncInfo';
 import { Peer } from '../../../common/Peer';
-import { NavbarLink } from '../../navbar/navbar.model';
-import { NavbarService } from '../../navbar/navbar.service';
+import { NavbarLink } from '../../shared/components/navbar/navbar.model';
+import { NavbarService } from '../../shared/components/navbar/navbar.service';
 import { NavigationEnd, Router } from '@angular/router';
 import { DaemonInfo } from '../../../common/DaemonInfo';
 
diff --git a/src/app/pages/detail/detail.module.ts b/src/app/pages/detail/detail.module.ts
index f683aca..d727ccc 100644
--- a/src/app/pages/detail/detail.module.ts
+++ b/src/app/pages/detail/detail.module.ts
@@ -5,7 +5,7 @@ import { DetailRoutingModule } from './detail-routing.module';
 
 import { DetailComponent } from './detail.component';
 import { SharedModule } from '../../shared/shared.module';
-import { LoadComponent } from "../../load/load.component";
+import { LoadComponent } from "../../shared/components/load/load.component";
 
 @NgModule({
   declarations: [DetailComponent],
diff --git a/src/app/pages/hard-fork-info/hard-fork-info.component.ts b/src/app/pages/hard-fork-info/hard-fork-info.component.ts
index 07a7837..ba34ea2 100644
--- a/src/app/pages/hard-fork-info/hard-fork-info.component.ts
+++ b/src/app/pages/hard-fork-info/hard-fork-info.component.ts
@@ -1,7 +1,7 @@
 import { AfterViewInit, Component } from '@angular/core';
 import { DaemonService } from '../../core/services/daemon/daemon.service';
 import { NavigationEnd, Router } from '@angular/router';
-import { NavbarService } from '../../navbar/navbar.service';
+import { NavbarService } from '../../shared/components/navbar/navbar.service';
 
 @Component({
   selector: 'app-hard-fork-info',
diff --git a/src/app/pages/mining/mining.component.ts b/src/app/pages/mining/mining.component.ts
index 3701fcb..2209904 100644
--- a/src/app/pages/mining/mining.component.ts
+++ b/src/app/pages/mining/mining.component.ts
@@ -1,9 +1,9 @@
 import { AfterViewInit, Component } from '@angular/core';
 import { DaemonService } from '../../core/services/daemon/daemon.service';
-import { NavbarService } from '../../navbar/navbar.service';
+import { NavbarService } from '../../shared/components/navbar/navbar.service';
 import { MinerData } from '../../../common/MinerData';
 import { NavigationEnd, Router } from '@angular/router';
-import { NavbarLink } from '../../navbar/navbar.model';
+import { NavbarLink } from '../../shared/components/navbar/navbar.model';
 import { MineableTxBacklog } from '../../../common/MineableTxBacklog';
 import { Chain } from '../../../common/Chain';
 import { CoreIsBusyError } from '../../../common/error';
diff --git a/src/app/pages/mining/mining.module.ts b/src/app/pages/mining/mining.module.ts
index 5694f5a..2f12abe 100644
--- a/src/app/pages/mining/mining.module.ts
+++ b/src/app/pages/mining/mining.module.ts
@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
 
 import { MiningRoutingModule } from './mining-routing.module';
 import { SharedModule } from '../../shared/shared.module';
-import { LoadComponent } from '../../load/load.component';
+import { LoadComponent } from '../../shared/components/load/load.component';
 import { MiningComponent } from './mining.component';
 
 
diff --git a/src/app/pages/outputs/outputs.component.ts b/src/app/pages/outputs/outputs.component.ts
index 1d6d9eb..c0411b6 100644
--- a/src/app/pages/outputs/outputs.component.ts
+++ b/src/app/pages/outputs/outputs.component.ts
@@ -1,7 +1,7 @@
 import { AfterViewInit, Component } from '@angular/core';
-import { NavbarLink } from '../../navbar/navbar.model';
+import { NavbarLink } from '../../shared/components/navbar/navbar.model';
 import { DaemonService } from '../../core/services/daemon/daemon.service';
-import { NavbarService } from '../../navbar/navbar.service';
+import { NavbarService } from '../../shared/components/navbar/navbar.service';
 
 @Component({
   selector: 'app-outputs',
diff --git a/src/app/pages/settings/settings.component.ts b/src/app/pages/settings/settings.component.ts
index c8e4d35..c949b9a 100644
--- a/src/app/pages/settings/settings.component.ts
+++ b/src/app/pages/settings/settings.component.ts
@@ -1,7 +1,7 @@
 import { AfterViewInit, Component } from '@angular/core';
-import { NavbarService } from '../../navbar/navbar.service';
+import { NavbarService } from '../../shared/components/navbar/navbar.service';
 import { NavigationEnd, NavigationStart, Router } from '@angular/router';
-import { NavbarLink } from '../../navbar/navbar.model';
+import { NavbarLink } from '../../shared/components/navbar/navbar.model';
 
 @Component({
   selector: 'app-settings',
diff --git a/src/app/pages/transactions/transactions.component.ts b/src/app/pages/transactions/transactions.component.ts
index ce166da..49656d3 100644
--- a/src/app/pages/transactions/transactions.component.ts
+++ b/src/app/pages/transactions/transactions.component.ts
@@ -1,7 +1,7 @@
 import { AfterViewInit, Component } from '@angular/core';
 import { DaemonService } from '../../core/services/daemon/daemon.service';
-import { NavbarService } from '../../navbar/navbar.service';
-import { NavbarLink } from '../../navbar/navbar.model';
+import { NavbarService } from '../../shared/components/navbar/navbar.service';
+import { NavbarLink } from '../../shared/components/navbar/navbar.model';
 
 @Component({
   selector: 'app-transactions',
diff --git a/src/app/load/load.component.html b/src/app/shared/components/load/load.component.html
similarity index 100%
rename from src/app/load/load.component.html
rename to src/app/shared/components/load/load.component.html
diff --git a/src/app/load/load.component.scss b/src/app/shared/components/load/load.component.scss
similarity index 100%
rename from src/app/load/load.component.scss
rename to src/app/shared/components/load/load.component.scss
diff --git a/src/app/load/load.component.spec.ts b/src/app/shared/components/load/load.component.spec.ts
similarity index 100%
rename from src/app/load/load.component.spec.ts
rename to src/app/shared/components/load/load.component.spec.ts
diff --git a/src/app/load/load.component.ts b/src/app/shared/components/load/load.component.ts
similarity index 100%
rename from src/app/load/load.component.ts
rename to src/app/shared/components/load/load.component.ts
diff --git a/src/app/navbar/navbar.component.html b/src/app/shared/components/navbar/navbar.component.html
similarity index 100%
rename from src/app/navbar/navbar.component.html
rename to src/app/shared/components/navbar/navbar.component.html
diff --git a/src/app/navbar/navbar.component.scss b/src/app/shared/components/navbar/navbar.component.scss
similarity index 100%
rename from src/app/navbar/navbar.component.scss
rename to src/app/shared/components/navbar/navbar.component.scss
diff --git a/src/app/navbar/navbar.component.spec.ts b/src/app/shared/components/navbar/navbar.component.spec.ts
similarity index 100%
rename from src/app/navbar/navbar.component.spec.ts
rename to src/app/shared/components/navbar/navbar.component.spec.ts
diff --git a/src/app/navbar/navbar.component.ts b/src/app/shared/components/navbar/navbar.component.ts
similarity index 100%
rename from src/app/navbar/navbar.component.ts
rename to src/app/shared/components/navbar/navbar.component.ts
diff --git a/src/app/navbar/navbar.model.ts b/src/app/shared/components/navbar/navbar.model.ts
similarity index 100%
rename from src/app/navbar/navbar.model.ts
rename to src/app/shared/components/navbar/navbar.model.ts
diff --git a/src/app/navbar/navbar.service.spec.ts b/src/app/shared/components/navbar/navbar.service.spec.ts
similarity index 100%
rename from src/app/navbar/navbar.service.spec.ts
rename to src/app/shared/components/navbar/navbar.service.spec.ts
diff --git a/src/app/navbar/navbar.service.ts b/src/app/shared/components/navbar/navbar.service.ts
similarity index 100%
rename from src/app/navbar/navbar.service.ts
rename to src/app/shared/components/navbar/navbar.service.ts