diff --git a/src/storeonwheels.client/src/app/app.component.ts b/src/storeonwheels.client/src/app/app.component.ts
index 343d1c0..613da11 100644
--- a/src/storeonwheels.client/src/app/app.component.ts
+++ b/src/storeonwheels.client/src/app/app.component.ts
@@ -1,11 +1,11 @@
 import { Component, OnDestroy, OnInit } from "@angular/core";
-import { FooterNavComponent } from "./libs/shared-module";
+import { FooterNavComponent } from "~/app/shared/components";
 import { RouterModule } from "@angular/router";
 import {
   HUB_CONNECTION,
   MessageHubService,
   hubConnection,
-} from "./libs/map-module";
+} from "~/app/shared/services";
 import { ReactiveFormsModule } from "@angular/forms";
 
 @Component({
diff --git a/src/storeonwheels.client/src/app/libs/broadcast-module/index.ts b/src/storeonwheels.client/src/app/libs/broadcast-module/index.ts
deleted file mode 100644
index 6439ff6..0000000
--- a/src/storeonwheels.client/src/app/libs/broadcast-module/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./components";
-export * from "./services";
diff --git a/src/storeonwheels.client/src/app/libs/map-module/index.ts b/src/storeonwheels.client/src/app/libs/map-module/index.ts
deleted file mode 100644
index 6439ff6..0000000
--- a/src/storeonwheels.client/src/app/libs/map-module/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./components";
-export * from "./services";
diff --git a/src/storeonwheels.client/src/app/libs/shared-module/index.ts b/src/storeonwheels.client/src/app/libs/shared-module/index.ts
deleted file mode 100644
index a76087c..0000000
--- a/src/storeonwheels.client/src/app/libs/shared-module/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "./components";
-export * from "./services";
-export * from "./models";
diff --git a/src/storeonwheels.client/src/app/libs/shared-module/services/index.ts b/src/storeonwheels.client/src/app/libs/shared-module/services/index.ts
deleted file mode 100644
index 6030039..0000000
--- a/src/storeonwheels.client/src/app/libs/shared-module/services/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./sleep/sleep.service";
diff --git a/src/storeonwheels.client/src/app/pages/broadcast-page/broadcast-page.component.spec.ts b/src/storeonwheels.client/src/app/pages/broadcast-page/broadcast-page.component.spec.ts
index 4c3f4ec..3aa6ccd 100644
--- a/src/storeonwheels.client/src/app/pages/broadcast-page/broadcast-page.component.spec.ts
+++ b/src/storeonwheels.client/src/app/pages/broadcast-page/broadcast-page.component.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import BroadcastPageComponent from "./broadcast-page.component";
 import axios from "axios";
-import { HUB_CONNECTION, hubConnection } from "~/app/libs/map-module";
+import { HUB_CONNECTION, hubConnection } from "~/app/shared/services";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 
 describe("BroadcastPageComponent", () => {
diff --git a/src/storeonwheels.client/src/app/pages/broadcast-page/broadcast-page.component.ts b/src/storeonwheels.client/src/app/pages/broadcast-page/broadcast-page.component.ts
index 54bd078..89ae22d 100644
--- a/src/storeonwheels.client/src/app/pages/broadcast-page/broadcast-page.component.ts
+++ b/src/storeonwheels.client/src/app/pages/broadcast-page/broadcast-page.component.ts
@@ -25,21 +25,15 @@ import { Observable } from "rxjs";
 import {
   GeoPermissionInstructionComponent,
   VendorFormComponent,
-  GeoPermission,
-  GeolocateService,
-  VendorService,
-} from "~/app/libs/broadcast-module";
+} from "./components";
+import { GeoPermission, GeolocateService, VendorService } from "./services";
 import {
   MessageHubService,
+  SleepService,
   WsState,
   hubConnection,
-} from "~/app/libs/map-module";
-import {
-  GeoInfo,
-  Vendor,
-  VendorForm,
-  SleepService,
-} from "~/app/libs/shared-module";
+} from "~/app/shared/services";
+import { GeoInfo, Vendor, VendorForm } from "~/app/shared/models";
 import { toSignal } from "@angular/core/rxjs-interop";
 
 @Component({
diff --git a/src/storeonwheels.client/src/app/libs/broadcast-module/components/geo-permission-instruction/geo-permission-instruction.component.css b/src/storeonwheels.client/src/app/pages/broadcast-page/components/geo-permission-instruction/geo-permission-instruction.component.css
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/broadcast-module/components/geo-permission-instruction/geo-permission-instruction.component.css
rename to src/storeonwheels.client/src/app/pages/broadcast-page/components/geo-permission-instruction/geo-permission-instruction.component.css
diff --git a/src/storeonwheels.client/src/app/libs/broadcast-module/components/geo-permission-instruction/geo-permission-instruction.component.html b/src/storeonwheels.client/src/app/pages/broadcast-page/components/geo-permission-instruction/geo-permission-instruction.component.html
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/broadcast-module/components/geo-permission-instruction/geo-permission-instruction.component.html
rename to src/storeonwheels.client/src/app/pages/broadcast-page/components/geo-permission-instruction/geo-permission-instruction.component.html
diff --git a/src/storeonwheels.client/src/app/libs/broadcast-module/components/geo-permission-instruction/geo-permission-instruction.component.spec.ts b/src/storeonwheels.client/src/app/pages/broadcast-page/components/geo-permission-instruction/geo-permission-instruction.component.spec.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/broadcast-module/components/geo-permission-instruction/geo-permission-instruction.component.spec.ts
rename to src/storeonwheels.client/src/app/pages/broadcast-page/components/geo-permission-instruction/geo-permission-instruction.component.spec.ts
diff --git a/src/storeonwheels.client/src/app/libs/broadcast-module/components/geo-permission-instruction/geo-permission-instruction.component.ts b/src/storeonwheels.client/src/app/pages/broadcast-page/components/geo-permission-instruction/geo-permission-instruction.component.ts
similarity index 93%
rename from src/storeonwheels.client/src/app/libs/broadcast-module/components/geo-permission-instruction/geo-permission-instruction.component.ts
rename to src/storeonwheels.client/src/app/pages/broadcast-page/components/geo-permission-instruction/geo-permission-instruction.component.ts
index dcdc9f1..a2d21f3 100644
--- a/src/storeonwheels.client/src/app/libs/broadcast-module/components/geo-permission-instruction/geo-permission-instruction.component.ts
+++ b/src/storeonwheels.client/src/app/pages/broadcast-page/components/geo-permission-instruction/geo-permission-instruction.component.ts
@@ -2,7 +2,7 @@ import { CommonModule } from "@angular/common";
 import { Component, Input } from "@angular/core";
 import { MatButtonModule } from "@angular/material/button";
 import { MatInputModule } from "@angular/material/input";
-import { GeoPermission } from "~/app/libs/broadcast-module/services";
+import { GeoPermission } from "~/app/pages/broadcast-page/services";
 
 @Component({
   selector: "app-geo-permission-instruction",
diff --git a/src/storeonwheels.client/src/app/libs/broadcast-module/components/index.ts b/src/storeonwheels.client/src/app/pages/broadcast-page/components/index.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/broadcast-module/components/index.ts
rename to src/storeonwheels.client/src/app/pages/broadcast-page/components/index.ts
diff --git a/src/storeonwheels.client/src/app/libs/broadcast-module/components/vendor-form/vendor-form.component.css b/src/storeonwheels.client/src/app/pages/broadcast-page/components/vendor-form/vendor-form.component.css
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/broadcast-module/components/vendor-form/vendor-form.component.css
rename to src/storeonwheels.client/src/app/pages/broadcast-page/components/vendor-form/vendor-form.component.css
diff --git a/src/storeonwheels.client/src/app/libs/broadcast-module/components/vendor-form/vendor-form.component.html b/src/storeonwheels.client/src/app/pages/broadcast-page/components/vendor-form/vendor-form.component.html
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/broadcast-module/components/vendor-form/vendor-form.component.html
rename to src/storeonwheels.client/src/app/pages/broadcast-page/components/vendor-form/vendor-form.component.html
diff --git a/src/storeonwheels.client/src/app/libs/broadcast-module/components/vendor-form/vendor-form.component.spec.ts b/src/storeonwheels.client/src/app/pages/broadcast-page/components/vendor-form/vendor-form.component.spec.ts
similarity index 97%
rename from src/storeonwheels.client/src/app/libs/broadcast-module/components/vendor-form/vendor-form.component.spec.ts
rename to src/storeonwheels.client/src/app/pages/broadcast-page/components/vendor-form/vendor-form.component.spec.ts
index 7d5ac5d..8f890dd 100644
--- a/src/storeonwheels.client/src/app/libs/broadcast-module/components/vendor-form/vendor-form.component.spec.ts
+++ b/src/storeonwheels.client/src/app/pages/broadcast-page/components/vendor-form/vendor-form.component.spec.ts
@@ -5,7 +5,7 @@ import {
 } from "@angular/core/testing";
 import { VendorFormComponent } from "./vendor-form.component";
 import { FormBuilder, FormGroup, Validators } from "@angular/forms";
-import { VendorForm } from "~/app/libs/shared-module";
+import { VendorForm } from "~/app/shared/models";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 
 describe("VendorFormComponent", () => {
diff --git a/src/storeonwheels.client/src/app/libs/broadcast-module/components/vendor-form/vendor-form.component.ts b/src/storeonwheels.client/src/app/pages/broadcast-page/components/vendor-form/vendor-form.component.ts
similarity index 95%
rename from src/storeonwheels.client/src/app/libs/broadcast-module/components/vendor-form/vendor-form.component.ts
rename to src/storeonwheels.client/src/app/pages/broadcast-page/components/vendor-form/vendor-form.component.ts
index 233b3b7..f8b09f5 100644
--- a/src/storeonwheels.client/src/app/libs/broadcast-module/components/vendor-form/vendor-form.component.ts
+++ b/src/storeonwheels.client/src/app/pages/broadcast-page/components/vendor-form/vendor-form.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, OnChanges, output } from "@angular/core";
-import { VendorForm } from "~/app/libs/shared-module";
+import { VendorForm } from "~/app/shared/models";
 import { FormControl, FormGroup, ReactiveFormsModule } from "@angular/forms";
 import { MatFormFieldModule } from "@angular/material/form-field";
 import { MatInputModule } from "@angular/material/input";
diff --git a/src/storeonwheels.client/src/app/libs/broadcast-module/services/geolocate/base-geolocate.service.ts b/src/storeonwheels.client/src/app/pages/broadcast-page/services/geolocate/base-geolocate.service.ts
similarity index 97%
rename from src/storeonwheels.client/src/app/libs/broadcast-module/services/geolocate/base-geolocate.service.ts
rename to src/storeonwheels.client/src/app/pages/broadcast-page/services/geolocate/base-geolocate.service.ts
index 4856bfe..46d3048 100644
--- a/src/storeonwheels.client/src/app/libs/broadcast-module/services/geolocate/base-geolocate.service.ts
+++ b/src/storeonwheels.client/src/app/pages/broadcast-page/services/geolocate/base-geolocate.service.ts
@@ -65,8 +65,6 @@ export class BaseGeolocateService {
       throw new Error("browser does not supprt geolocation");
     }
 
-    console.log({ enableHighAccuracy, timeout, maximumAge });
-
     const promise = new Promise<GeolocationPositionError | null>((resolve) => {
       const _onSuccess = (position: GeolocationPosition) => {
         onSuccess(position);
diff --git a/src/storeonwheels.client/src/app/libs/broadcast-module/services/geolocate/geolocate.service.ts b/src/storeonwheels.client/src/app/pages/broadcast-page/services/geolocate/geolocate.service.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/broadcast-module/services/geolocate/geolocate.service.ts
rename to src/storeonwheels.client/src/app/pages/broadcast-page/services/geolocate/geolocate.service.ts
diff --git a/src/storeonwheels.client/src/app/libs/broadcast-module/services/index.ts b/src/storeonwheels.client/src/app/pages/broadcast-page/services/index.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/broadcast-module/services/index.ts
rename to src/storeonwheels.client/src/app/pages/broadcast-page/services/index.ts
diff --git a/src/storeonwheels.client/src/app/libs/broadcast-module/services/vendor/vendor.service.ts b/src/storeonwheels.client/src/app/pages/broadcast-page/services/vendor/vendor.service.ts
similarity index 94%
rename from src/storeonwheels.client/src/app/libs/broadcast-module/services/vendor/vendor.service.ts
rename to src/storeonwheels.client/src/app/pages/broadcast-page/services/vendor/vendor.service.ts
index cb0bdf1..47aa011 100644
--- a/src/storeonwheels.client/src/app/libs/broadcast-module/services/vendor/vendor.service.ts
+++ b/src/storeonwheels.client/src/app/pages/broadcast-page/services/vendor/vendor.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from "@angular/core";
-import { Vendor } from "~/app/libs/shared-module";
+import { Vendor } from "~/app/shared/models";
 import axios, { AxiosError, AxiosResponse } from "axios";
 
 @Injectable({
diff --git a/src/storeonwheels.client/src/app/pages/healthcheck-page/healthcheck-page.component.spec.ts b/src/storeonwheels.client/src/app/pages/healthcheck-page/healthcheck-page.component.spec.ts
index 6150cb0..4303010 100644
--- a/src/storeonwheels.client/src/app/pages/healthcheck-page/healthcheck-page.component.spec.ts
+++ b/src/storeonwheels.client/src/app/pages/healthcheck-page/healthcheck-page.component.spec.ts
@@ -5,7 +5,7 @@ import {
   HUB_CONNECTION,
   MessageHubService,
   hubConnection,
-} from "~/app/libs/map-module";
+} from "~/app/shared/services";
 
 describe("HealthcheckComponent", () => {
   let component: HealthcheckPageComponent;
diff --git a/src/storeonwheels.client/src/app/pages/healthcheck-page/healthcheck-page.component.ts b/src/storeonwheels.client/src/app/pages/healthcheck-page/healthcheck-page.component.ts
index a04f2ee..6111c7e 100644
--- a/src/storeonwheels.client/src/app/pages/healthcheck-page/healthcheck-page.component.ts
+++ b/src/storeonwheels.client/src/app/pages/healthcheck-page/healthcheck-page.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from "@angular/core";
 import { HubConnectionState } from "@microsoft/signalr";
 import axios from "axios";
-import { MessageHubService, hubConnection } from "~/app/libs/map-module";
+import { MessageHubService, hubConnection } from "~/app/shared/services";
 
 @Component({
   selector: "app-healthcheck-page",
diff --git a/src/storeonwheels.client/src/app/libs/map-module/components/index.ts b/src/storeonwheels.client/src/app/pages/map-page/components/index.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/map-module/components/index.ts
rename to src/storeonwheels.client/src/app/pages/map-page/components/index.ts
diff --git a/src/storeonwheels.client/src/app/libs/map-module/components/map/map.component.css b/src/storeonwheels.client/src/app/pages/map-page/components/map/map.component.css
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/map-module/components/map/map.component.css
rename to src/storeonwheels.client/src/app/pages/map-page/components/map/map.component.css
diff --git a/src/storeonwheels.client/src/app/libs/map-module/components/map/map.component.html b/src/storeonwheels.client/src/app/pages/map-page/components/map/map.component.html
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/map-module/components/map/map.component.html
rename to src/storeonwheels.client/src/app/pages/map-page/components/map/map.component.html
diff --git a/src/storeonwheels.client/src/app/libs/map-module/components/map/map.component.spec.ts b/src/storeonwheels.client/src/app/pages/map-page/components/map/map.component.spec.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/map-module/components/map/map.component.spec.ts
rename to src/storeonwheels.client/src/app/pages/map-page/components/map/map.component.spec.ts
diff --git a/src/storeonwheels.client/src/app/libs/map-module/components/map/map.component.ts b/src/storeonwheels.client/src/app/pages/map-page/components/map/map.component.ts
similarity index 98%
rename from src/storeonwheels.client/src/app/libs/map-module/components/map/map.component.ts
rename to src/storeonwheels.client/src/app/pages/map-page/components/map/map.component.ts
index 1904f90..adfa5d3 100644
--- a/src/storeonwheels.client/src/app/libs/map-module/components/map/map.component.ts
+++ b/src/storeonwheels.client/src/app/pages/map-page/components/map/map.component.ts
@@ -16,8 +16,8 @@ import {
   ClickProps,
   clickSubject as _clickSubject,
   timedMapFactory,
-} from "~/app/libs/map-module/services";
-import { GeoInfo } from "~/app/libs/shared-module";
+} from "~/app/pages/map-page/services";
+import { GeoInfo } from "~/app/shared/models";
 import { LngLat, Marker, Popup } from "mapbox-gl";
 import { BehaviorSubject, Observable } from "rxjs";
 
diff --git a/src/storeonwheels.client/src/app/libs/map-module/components/vendor-table/vendor-table.component.css b/src/storeonwheels.client/src/app/pages/map-page/components/vendor-table/vendor-table.component.css
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/map-module/components/vendor-table/vendor-table.component.css
rename to src/storeonwheels.client/src/app/pages/map-page/components/vendor-table/vendor-table.component.css
diff --git a/src/storeonwheels.client/src/app/libs/map-module/components/vendor-table/vendor-table.component.html b/src/storeonwheels.client/src/app/pages/map-page/components/vendor-table/vendor-table.component.html
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/map-module/components/vendor-table/vendor-table.component.html
rename to src/storeonwheels.client/src/app/pages/map-page/components/vendor-table/vendor-table.component.html
diff --git a/src/storeonwheels.client/src/app/libs/map-module/components/vendor-table/vendor-table.component.spec.ts b/src/storeonwheels.client/src/app/pages/map-page/components/vendor-table/vendor-table.component.spec.ts
similarity index 96%
rename from src/storeonwheels.client/src/app/libs/map-module/components/vendor-table/vendor-table.component.spec.ts
rename to src/storeonwheels.client/src/app/pages/map-page/components/vendor-table/vendor-table.component.spec.ts
index 13786ed..89ffa00 100644
--- a/src/storeonwheels.client/src/app/libs/map-module/components/vendor-table/vendor-table.component.spec.ts
+++ b/src/storeonwheels.client/src/app/pages/map-page/components/vendor-table/vendor-table.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { VendorTableComponent } from "./vendor-table.component";
-import { Vendor } from "~/app/libs/shared-module";
+import { Vendor } from "~/app/shared/models";
 import { Observable, from } from "rxjs";
 
 describe("VendorTableComponent", () => {
diff --git a/src/storeonwheels.client/src/app/libs/map-module/components/vendor-table/vendor-table.component.ts b/src/storeonwheels.client/src/app/pages/map-page/components/vendor-table/vendor-table.component.ts
similarity index 96%
rename from src/storeonwheels.client/src/app/libs/map-module/components/vendor-table/vendor-table.component.ts
rename to src/storeonwheels.client/src/app/pages/map-page/components/vendor-table/vendor-table.component.ts
index 670071d..f0115cc 100644
--- a/src/storeonwheels.client/src/app/libs/map-module/components/vendor-table/vendor-table.component.ts
+++ b/src/storeonwheels.client/src/app/pages/map-page/components/vendor-table/vendor-table.component.ts
@@ -11,14 +11,14 @@ import {
   WritableSignal,
   signal,
 } from "@angular/core";
-import { Vendor } from "~/app/libs/shared-module";
+import { Vendor } from "~/app/shared/models";
 import {
   TimedMap,
   CLICK_SUBJECT,
   ClickProps,
   clickSubject as _clickSubject,
   timedMapFactory,
-} from "~/app/libs/map-module/services";
+} from "~/app/pages/map-page/services";
 import { CommonModule } from "@angular/common";
 import { BehaviorSubject, Observable } from "rxjs";
 import { MatRow, MatTableModule } from "@angular/material/table";
diff --git a/src/storeonwheels.client/src/app/pages/map-page/map-page.component.spec.ts b/src/storeonwheels.client/src/app/pages/map-page/map-page.component.spec.ts
index 65f4f7b..cb7a954 100644
--- a/src/storeonwheels.client/src/app/pages/map-page/map-page.component.spec.ts
+++ b/src/storeonwheels.client/src/app/pages/map-page/map-page.component.spec.ts
@@ -4,11 +4,11 @@ import {
   HUB_CONNECTION,
   MessageHubService,
   hubConnection,
-  VendorTableComponent,
-} from "~/app/libs/map-module";
-import { GeoInfo, Vendor } from "~/app/libs/shared-module";
+} from "~/app/shared/services";
+import { GeoInfo, Vendor } from "~/app/shared/models";
 import { Observable, from } from "rxjs";
 import { Mock } from "ts-mocks";
+import { VendorTableComponent } from "./components";
 
 describe("MapPageComponent", () => {
   let component: MapPageComponent;
diff --git a/src/storeonwheels.client/src/app/pages/map-page/map-page.component.ts b/src/storeonwheels.client/src/app/pages/map-page/map-page.component.ts
index 462bb72..80c6967 100644
--- a/src/storeonwheels.client/src/app/pages/map-page/map-page.component.ts
+++ b/src/storeonwheels.client/src/app/pages/map-page/map-page.component.ts
@@ -1,11 +1,8 @@
 import { CommonModule } from "@angular/common";
 import { Component, OnInit } from "@angular/core";
-import {
-  MapComponent,
-  VendorTableComponent,
-  MessageHubService,
-} from "~/app/libs/map-module";
-import { GeoInfo, Vendor } from "~/app/libs/shared-module";
+import { MapComponent, VendorTableComponent } from "./components";
+import { MessageHubService } from "~/app/shared/services";
+import { GeoInfo, Vendor } from "~/app/shared/models";
 import { Observable, map } from "rxjs";
 
 @Component({
diff --git a/src/storeonwheels.client/src/app/libs/map-module/services/click-event-subject/click-subject.ts b/src/storeonwheels.client/src/app/pages/map-page/services/click-event-subject/click-subject.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/map-module/services/click-event-subject/click-subject.ts
rename to src/storeonwheels.client/src/app/pages/map-page/services/click-event-subject/click-subject.ts
diff --git a/src/storeonwheels.client/src/app/libs/map-module/services/index.ts b/src/storeonwheels.client/src/app/pages/map-page/services/index.ts
similarity index 78%
rename from src/storeonwheels.client/src/app/libs/map-module/services/index.ts
rename to src/storeonwheels.client/src/app/pages/map-page/services/index.ts
index 69a326b..2805012 100644
--- a/src/storeonwheels.client/src/app/libs/map-module/services/index.ts
+++ b/src/storeonwheels.client/src/app/pages/map-page/services/index.ts
@@ -1,5 +1,3 @@
-export * from "./message-hub/message-hub.service";
-export * from "./message-hub/message-hub.provider";
 export * from "./mapbox/mapbox.service";
 export * from "./mapbox/mapbox.service.provider";
 export * from "./timed-cache/ticker-cache.service";
diff --git a/src/storeonwheels.client/src/app/libs/map-module/services/mapbox/animate.ts b/src/storeonwheels.client/src/app/pages/map-page/services/mapbox/animate.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/map-module/services/mapbox/animate.ts
rename to src/storeonwheels.client/src/app/pages/map-page/services/mapbox/animate.ts
diff --git a/src/storeonwheels.client/src/app/libs/map-module/services/mapbox/mapbox.service.provider.ts b/src/storeonwheels.client/src/app/pages/map-page/services/mapbox/mapbox.service.provider.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/map-module/services/mapbox/mapbox.service.provider.ts
rename to src/storeonwheels.client/src/app/pages/map-page/services/mapbox/mapbox.service.provider.ts
diff --git a/src/storeonwheels.client/src/app/libs/map-module/services/mapbox/mapbox.service.ts b/src/storeonwheels.client/src/app/pages/map-page/services/mapbox/mapbox.service.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/map-module/services/mapbox/mapbox.service.ts
rename to src/storeonwheels.client/src/app/pages/map-page/services/mapbox/mapbox.service.ts
diff --git a/src/storeonwheels.client/src/app/libs/map-module/services/timed-cache/ticker-cache.service.ts b/src/storeonwheels.client/src/app/pages/map-page/services/timed-cache/ticker-cache.service.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/map-module/services/timed-cache/ticker-cache.service.ts
rename to src/storeonwheels.client/src/app/pages/map-page/services/timed-cache/ticker-cache.service.ts
diff --git a/src/storeonwheels.client/src/app/libs/map-module/services/timed-cache/timed-cache.service.provider.ts b/src/storeonwheels.client/src/app/pages/map-page/services/timed-cache/timed-cache.service.provider.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/map-module/services/timed-cache/timed-cache.service.provider.ts
rename to src/storeonwheels.client/src/app/pages/map-page/services/timed-cache/timed-cache.service.provider.ts
diff --git a/src/storeonwheels.client/src/app/libs/map-module/services/timed-cache/timed-cache.service.spec.ts b/src/storeonwheels.client/src/app/pages/map-page/services/timed-cache/timed-cache.service.spec.ts
similarity index 96%
rename from src/storeonwheels.client/src/app/libs/map-module/services/timed-cache/timed-cache.service.spec.ts
rename to src/storeonwheels.client/src/app/pages/map-page/services/timed-cache/timed-cache.service.spec.ts
index da42f0a..1b5661f 100644
--- a/src/storeonwheels.client/src/app/libs/map-module/services/timed-cache/timed-cache.service.spec.ts
+++ b/src/storeonwheels.client/src/app/pages/map-page/services/timed-cache/timed-cache.service.spec.ts
@@ -1,7 +1,7 @@
 import { TestBed } from "@angular/core/testing";
 
 import { TickerCache } from "./ticker-cache.service";
-import { SleepService } from "~/app/libs/shared-module";
+import { SleepService } from "~/app/shared/services";
 
 describe("TimeoutCacheService", () => {
   let cache: TickerCache<string, number>;
diff --git a/src/storeonwheels.client/src/app/libs/map-module/services/timed-cache/timeout-cache.service.ts b/src/storeonwheels.client/src/app/pages/map-page/services/timed-cache/timeout-cache.service.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/map-module/services/timed-cache/timeout-cache.service.ts
rename to src/storeonwheels.client/src/app/pages/map-page/services/timed-cache/timeout-cache.service.ts
diff --git a/src/storeonwheels.client/src/app/libs/map-module/services/timed-cache/timeout-info.ts b/src/storeonwheels.client/src/app/pages/map-page/services/timed-cache/timeout-info.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/map-module/services/timed-cache/timeout-info.ts
rename to src/storeonwheels.client/src/app/pages/map-page/services/timed-cache/timeout-info.ts
diff --git a/src/storeonwheels.client/src/app/libs/shared-module/components/footer-nav/footer-nav.component.html b/src/storeonwheels.client/src/app/shared/components/footer-nav/footer-nav.component.html
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/shared-module/components/footer-nav/footer-nav.component.html
rename to src/storeonwheels.client/src/app/shared/components/footer-nav/footer-nav.component.html
diff --git a/src/storeonwheels.client/src/app/libs/shared-module/components/footer-nav/footer-nav.component.spec.ts b/src/storeonwheels.client/src/app/shared/components/footer-nav/footer-nav.component.spec.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/shared-module/components/footer-nav/footer-nav.component.spec.ts
rename to src/storeonwheels.client/src/app/shared/components/footer-nav/footer-nav.component.spec.ts
diff --git a/src/storeonwheels.client/src/app/libs/shared-module/components/footer-nav/footer-nav.component.ts b/src/storeonwheels.client/src/app/shared/components/footer-nav/footer-nav.component.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/shared-module/components/footer-nav/footer-nav.component.ts
rename to src/storeonwheels.client/src/app/shared/components/footer-nav/footer-nav.component.ts
diff --git a/src/storeonwheels.client/src/app/libs/shared-module/components/index.ts b/src/storeonwheels.client/src/app/shared/components/index.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/shared-module/components/index.ts
rename to src/storeonwheels.client/src/app/shared/components/index.ts
diff --git a/src/storeonwheels.client/src/app/libs/shared-module/models/GeoInfo.ts b/src/storeonwheels.client/src/app/shared/models/GeoInfo.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/shared-module/models/GeoInfo.ts
rename to src/storeonwheels.client/src/app/shared/models/GeoInfo.ts
diff --git a/src/storeonwheels.client/src/app/libs/shared-module/models/Result.ts b/src/storeonwheels.client/src/app/shared/models/Result.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/shared-module/models/Result.ts
rename to src/storeonwheels.client/src/app/shared/models/Result.ts
diff --git a/src/storeonwheels.client/src/app/libs/shared-module/models/Vendor.ts b/src/storeonwheels.client/src/app/shared/models/Vendor.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/shared-module/models/Vendor.ts
rename to src/storeonwheels.client/src/app/shared/models/Vendor.ts
diff --git a/src/storeonwheels.client/src/app/libs/shared-module/models/index.ts b/src/storeonwheels.client/src/app/shared/models/index.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/shared-module/models/index.ts
rename to src/storeonwheels.client/src/app/shared/models/index.ts
diff --git a/src/storeonwheels.client/src/app/shared/services/index.ts b/src/storeonwheels.client/src/app/shared/services/index.ts
new file mode 100644
index 0000000..f343c10
--- /dev/null
+++ b/src/storeonwheels.client/src/app/shared/services/index.ts
@@ -0,0 +1,3 @@
+export * from "./message-hub/message-hub.service";
+export * from "./message-hub/message-hub.provider";
+export * from "./sleep/sleep.service";
diff --git a/src/storeonwheels.client/src/app/libs/map-module/services/message-hub/message-hub.provider.ts b/src/storeonwheels.client/src/app/shared/services/message-hub/message-hub.provider.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/map-module/services/message-hub/message-hub.provider.ts
rename to src/storeonwheels.client/src/app/shared/services/message-hub/message-hub.provider.ts
diff --git a/src/storeonwheels.client/src/app/libs/map-module/services/message-hub/message-hub.service.ts b/src/storeonwheels.client/src/app/shared/services/message-hub/message-hub.service.ts
similarity index 97%
rename from src/storeonwheels.client/src/app/libs/map-module/services/message-hub/message-hub.service.ts
rename to src/storeonwheels.client/src/app/shared/services/message-hub/message-hub.service.ts
index d959731..52202d3 100644
--- a/src/storeonwheels.client/src/app/libs/map-module/services/message-hub/message-hub.service.ts
+++ b/src/storeonwheels.client/src/app/shared/services/message-hub/message-hub.service.ts
@@ -1,6 +1,6 @@
 import { Inject, Injectable } from "@angular/core";
 import { HubConnection, HubConnectionState } from "@microsoft/signalr";
-import { GeoInfo } from "~/app/libs/shared-module";
+import { GeoInfo } from "~/app/shared/models";
 import { BehaviorSubject, Observable, Subject } from "rxjs";
 import { HUB_CONNECTION, WsState } from "./message-hub.provider";
 
diff --git a/src/storeonwheels.client/src/app/libs/shared-module/services/sleep/sleep.service.spec.ts b/src/storeonwheels.client/src/app/shared/services/sleep/sleep.service.spec.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/shared-module/services/sleep/sleep.service.spec.ts
rename to src/storeonwheels.client/src/app/shared/services/sleep/sleep.service.spec.ts
diff --git a/src/storeonwheels.client/src/app/libs/shared-module/services/sleep/sleep.service.ts b/src/storeonwheels.client/src/app/shared/services/sleep/sleep.service.ts
similarity index 100%
rename from src/storeonwheels.client/src/app/libs/shared-module/services/sleep/sleep.service.ts
rename to src/storeonwheels.client/src/app/shared/services/sleep/sleep.service.ts