diff --git a/Display/src/app/app-routing.module.ts b/Display/src/app/app-routing.module.ts
index 99ea949..edce114 100644
--- a/Display/src/app/app-routing.module.ts
+++ b/Display/src/app/app-routing.module.ts
@@ -3,18 +3,14 @@ import { Routes, RouterModule } from '@angular/router';
 import { WeatherComponent } from './weather/weather.component';
 import { DashboardComponent } from './dashboard/dashboard.component';
 import { LaundryComponent } from './laundry/laundry.component';
-import { WeatherChartsComponent } from './weather-charts/weather-charts.component';
-import { WeatherCurrentComponent } from './Weather/weather-current/weather-current.component';
+import { WeatherChartsComponent } from './weather/charts/weather-charts.component';
+import { WeatherCurrentComponent } from './weather/current/weather-current.component';
 
 const routes: Routes = [
     {
         path: '',
         component: DashboardComponent
     },
-    {
-        path: 'dashboard',
-        component: DashboardComponent
-    },
     {
         path: 'weather',
         component: WeatherComponent,
diff --git a/Display/src/app/app.component.html b/Display/src/app/app.component.html
index 2ddc9e2..381ecaa 100644
--- a/Display/src/app/app.component.html
+++ b/Display/src/app/app.component.html
@@ -1,12 +1,8 @@
 <mat-toolbar color="primary">
     <mat-toolbar-row>
-        <button mat-icon-button>
-            <mat-icon (click)="sidenav.toggle()">menu</mat-icon>
-        </button>
-        <h1>Home Status</h1>
+        <a mat-button [routerLink]="'/'"><h1>Home Status</h1></a>
         <span class="menu-spacer"></span>
         <div>
-            <a mat-button [routerLink]="'/dashboard'">Dashboard</a>
             <a mat-button [routerLink]="'/weather'">Weather</a>
             <a mat-button [routerLink]="'/laundry'">Laundry</a>
         </div>
diff --git a/Display/src/app/app.module.ts b/Display/src/app/app.module.ts
index 5acc38b..ec046ad 100644
--- a/Display/src/app/app.module.ts
+++ b/Display/src/app/app.module.ts
@@ -10,8 +10,8 @@ import { SocketIoModule, SocketIoConfig } from 'ngx-socket-io';
 import { WeatherComponent } from './weather/weather.component';
 import { LaundryComponent } from './laundry/laundry.component';
 import { DashboardComponent } from './dashboard/dashboard.component';
-import { WeatherChartsComponent } from './weather-charts/weather-charts.component';
-import { WeatherCurrentComponent } from './Weather/weather-current/weather-current.component';
+import { WeatherChartsComponent } from './weather/charts/weather-charts.component';
+import { WeatherCurrentComponent } from './weather/current/weather-current.component';
 
 const config: SocketIoConfig = { url: 'http://home.kaczorzoo.net:9091', options: {} };
 
diff --git a/Display/src/app/laundry/laundry.component.ts b/Display/src/app/laundry/laundry.component.ts
index 2a2f121..2149f47 100644
--- a/Display/src/app/laundry/laundry.component.ts
+++ b/Display/src/app/laundry/laundry.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { LaundryService } from '../laundry.service';
-import { LaundryStatus } from '../laundry-status';
+import { LaundryService } from './service/laundry.service';
+import { LaundryStatus } from './service/laundry-status';
 
 @Component({
     selector: 'app-laundry',
diff --git a/Display/src/app/laundry-status.spec.ts b/Display/src/app/laundry/service/laundry-status.spec.ts
similarity index 100%
rename from Display/src/app/laundry-status.spec.ts
rename to Display/src/app/laundry/service/laundry-status.spec.ts
diff --git a/Display/src/app/laundry-status.ts b/Display/src/app/laundry/service/laundry-status.ts
similarity index 100%
rename from Display/src/app/laundry-status.ts
rename to Display/src/app/laundry/service/laundry-status.ts
diff --git a/Display/src/app/laundry.service.spec.ts b/Display/src/app/laundry/service/laundry.service.spec.ts
similarity index 100%
rename from Display/src/app/laundry.service.spec.ts
rename to Display/src/app/laundry/service/laundry.service.spec.ts
diff --git a/Display/src/app/laundry.service.ts b/Display/src/app/laundry/service/laundry.service.ts
similarity index 100%
rename from Display/src/app/laundry.service.ts
rename to Display/src/app/laundry/service/laundry.service.ts
diff --git a/Display/src/app/weather-charts/weather-charts.component.html b/Display/src/app/weather/charts/weather-charts.component.html
similarity index 100%
rename from Display/src/app/weather-charts/weather-charts.component.html
rename to Display/src/app/weather/charts/weather-charts.component.html
diff --git a/Display/src/app/weather-charts/weather-charts.component.scss b/Display/src/app/weather/charts/weather-charts.component.scss
similarity index 100%
rename from Display/src/app/weather-charts/weather-charts.component.scss
rename to Display/src/app/weather/charts/weather-charts.component.scss
diff --git a/Display/src/app/weather-charts/weather-charts.component.spec.ts b/Display/src/app/weather/charts/weather-charts.component.spec.ts
similarity index 100%
rename from Display/src/app/weather-charts/weather-charts.component.spec.ts
rename to Display/src/app/weather/charts/weather-charts.component.spec.ts
diff --git a/Display/src/app/weather-charts/weather-charts.component.ts b/Display/src/app/weather/charts/weather-charts.component.ts
similarity index 100%
rename from Display/src/app/weather-charts/weather-charts.component.ts
rename to Display/src/app/weather/charts/weather-charts.component.ts
diff --git a/Display/src/app/weather/weather-current/weather-current.component.html b/Display/src/app/weather/current/weather-current.component.html
similarity index 100%
rename from Display/src/app/weather/weather-current/weather-current.component.html
rename to Display/src/app/weather/current/weather-current.component.html
diff --git a/Display/src/app/weather/weather-current/weather-current.component.scss b/Display/src/app/weather/current/weather-current.component.scss
similarity index 100%
rename from Display/src/app/weather/weather-current/weather-current.component.scss
rename to Display/src/app/weather/current/weather-current.component.scss
diff --git a/Display/src/app/weather/weather-current/weather-current.component.spec.ts b/Display/src/app/weather/current/weather-current.component.spec.ts
similarity index 100%
rename from Display/src/app/weather/weather-current/weather-current.component.spec.ts
rename to Display/src/app/weather/current/weather-current.component.spec.ts
diff --git a/Display/src/app/weather/weather-current/weather-current.component.ts b/Display/src/app/weather/current/weather-current.component.ts
similarity index 76%
rename from Display/src/app/weather/weather-current/weather-current.component.ts
rename to Display/src/app/weather/current/weather-current.component.ts
index 3f1d4c2..eea111b 100644
--- a/Display/src/app/weather/weather-current/weather-current.component.ts
+++ b/Display/src/app/weather/current/weather-current.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { WeatherReading } from 'src/app/weather-reading';
-import { WeatherService } from 'src/app/weather.service';
+import { WeatherReading } from 'src/app/weather/service/weather-reading';
+import { WeatherService } from 'src/app/weather/service/weather.service';
 
 @Component({
     selector: 'app-weather-current',
diff --git a/Display/src/app/weather-reading.spec.ts b/Display/src/app/weather/service/weather-reading.spec.ts
similarity index 100%
rename from Display/src/app/weather-reading.spec.ts
rename to Display/src/app/weather/service/weather-reading.spec.ts
diff --git a/Display/src/app/weather-reading.ts b/Display/src/app/weather/service/weather-reading.ts
similarity index 100%
rename from Display/src/app/weather-reading.ts
rename to Display/src/app/weather/service/weather-reading.ts
diff --git a/Display/src/app/weather.service.spec.ts b/Display/src/app/weather/service/weather.service.spec.ts
similarity index 100%
rename from Display/src/app/weather.service.spec.ts
rename to Display/src/app/weather/service/weather.service.spec.ts
diff --git a/Display/src/app/weather.service.ts b/Display/src/app/weather/service/weather.service.ts
similarity index 100%
rename from Display/src/app/weather.service.ts
rename to Display/src/app/weather/service/weather.service.ts