diff --git a/package.json b/package.json
index 5f01d41..865273f 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "@angular-eslint/eslint-plugin-template": "^17.0.0",
     "@angular-eslint/schematics": "^17.0.0",
     "@angular-eslint/template-parser": "^17.0.0",
-    "@angular/cli": "^17.0.0",
+    "@angular/cli": "17.0.9",
     "@angular/compiler-cli": "^17.0.2",
     "@angular/language-service": "^17.0.2",
     "@capacitor/cli": "5.6.0",
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 48fc28d..5c818b7 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -4,7 +4,7 @@ import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
 const routes: Routes = [
   {
     path: '',
-    loadChildren: () => import('./tabs/tabs.module').then(m => m.TabsPageModule)
+    loadChildren: () => import('./pages/tabs/tabs.module').then(m => m.TabsPageModule)
   }
 ];
 @NgModule({
diff --git a/src/app/tab1/tab1-routing.module.ts b/src/app/pages/tab1/tab1-routing.module.ts
similarity index 100%
rename from src/app/tab1/tab1-routing.module.ts
rename to src/app/pages/tab1/tab1-routing.module.ts
diff --git a/src/app/tab1/tab1.module.ts b/src/app/pages/tab1/tab1.module.ts
similarity index 83%
rename from src/app/tab1/tab1.module.ts
rename to src/app/pages/tab1/tab1.module.ts
index 135eeae..5a63815 100644
--- a/src/app/tab1/tab1.module.ts
+++ b/src/app/pages/tab1/tab1.module.ts
@@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { Tab1Page } from './tab1.page';
-import { ExploreContainerComponentModule } from '../explore-container/explore-container.module';
+import { ExploreContainerComponentModule } from '../../explore-container/explore-container.module';
 
 import { Tab1PageRoutingModule } from './tab1-routing.module';
 
diff --git a/src/app/pages/tab1/tab1.page.html b/src/app/pages/tab1/tab1.page.html
new file mode 100644
index 0000000..65ec864
--- /dev/null
+++ b/src/app/pages/tab1/tab1.page.html
@@ -0,0 +1,62 @@
+<ion-content [fullscreen]="true">
+
+  <ion-grid>
+    <ion-row>
+      <ion-col>
+        <ion-card>
+          <ion-card-header>
+            <ion-card-title>Card Title</ion-card-title>
+            <ion-card-subtitle>Card Subtitle</ion-card-subtitle>
+          </ion-card-header>
+
+          <ion-card-content>
+            Here's a small text description for the card content. Nothing more, nothing less.
+          </ion-card-content>
+        </ion-card>
+      </ion-col>
+      <ion-col>
+        <ion-card>
+          <ion-card-header>
+            <ion-card-title>Card Title</ion-card-title>
+            <ion-card-subtitle>Card Subtitle</ion-card-subtitle>
+          </ion-card-header>
+
+          <ion-card-content>
+            Here's a small text description for the card content. Nothing more, nothing less.
+          </ion-card-content>
+        </ion-card>
+      </ion-col>
+    </ion-row>
+    <ion-row>
+      <ion-col>
+        <ion-card>
+          <ion-card-header>
+            <ion-card-title>Card Title</ion-card-title>
+            <ion-card-subtitle>Card Subtitle</ion-card-subtitle>
+          </ion-card-header>
+
+          <ion-card-content>
+            Here's a small text description for the card content. Nothing more, nothing less.
+          </ion-card-content>
+        </ion-card>
+      </ion-col>
+      <ion-col>
+        <ion-card>
+          <ion-card-header>
+            <ion-card-title>Card Title</ion-card-title>
+            <ion-card-subtitle>Card Subtitle</ion-card-subtitle>
+          </ion-card-header>
+
+          <ion-card-content>
+            Here's a small text description for the card content. Nothing more, nothing less.
+          </ion-card-content>
+        </ion-card>
+      </ion-col>
+    </ion-row>
+    <ion-row>
+      <ion-col>1</ion-col>
+    </ion-row>
+  </ion-grid>
+
+
+</ion-content>
diff --git a/src/app/tab1/tab1.page.scss b/src/app/pages/tab1/tab1.page.scss
similarity index 100%
rename from src/app/tab1/tab1.page.scss
rename to src/app/pages/tab1/tab1.page.scss
diff --git a/src/app/tab1/tab1.page.spec.ts b/src/app/pages/tab1/tab1.page.spec.ts
similarity index 86%
rename from src/app/tab1/tab1.page.spec.ts
rename to src/app/pages/tab1/tab1.page.spec.ts
index 0dbb7c0..400d9aa 100644
--- a/src/app/tab1/tab1.page.spec.ts
+++ b/src/app/pages/tab1/tab1.page.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { IonicModule } from '@ionic/angular';
 
-import { ExploreContainerComponentModule } from '../explore-container/explore-container.module';
+import { ExploreContainerComponentModule } from '../../explore-container/explore-container.module';
 
 import { Tab1Page } from './tab1.page';
 
diff --git a/src/app/tab1/tab1.page.ts b/src/app/pages/tab1/tab1.page.ts
similarity index 100%
rename from src/app/tab1/tab1.page.ts
rename to src/app/pages/tab1/tab1.page.ts
diff --git a/src/app/tab2/tab2-routing.module.ts b/src/app/pages/tab2/tab2-routing.module.ts
similarity index 100%
rename from src/app/tab2/tab2-routing.module.ts
rename to src/app/pages/tab2/tab2-routing.module.ts
diff --git a/src/app/tab2/tab2.module.ts b/src/app/pages/tab2/tab2.module.ts
similarity index 83%
rename from src/app/tab2/tab2.module.ts
rename to src/app/pages/tab2/tab2.module.ts
index 723bac1..8205c95 100644
--- a/src/app/tab2/tab2.module.ts
+++ b/src/app/pages/tab2/tab2.module.ts
@@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { Tab2Page } from './tab2.page';
-import { ExploreContainerComponentModule } from '../explore-container/explore-container.module';
+import { ExploreContainerComponentModule } from '../../explore-container/explore-container.module';
 
 import { Tab2PageRoutingModule } from './tab2-routing.module';
 
diff --git a/src/app/tab2/tab2.page.html b/src/app/pages/tab2/tab2.page.html
similarity index 100%
rename from src/app/tab2/tab2.page.html
rename to src/app/pages/tab2/tab2.page.html
diff --git a/src/app/tab2/tab2.page.scss b/src/app/pages/tab2/tab2.page.scss
similarity index 100%
rename from src/app/tab2/tab2.page.scss
rename to src/app/pages/tab2/tab2.page.scss
diff --git a/src/app/tab2/tab2.page.spec.ts b/src/app/pages/tab2/tab2.page.spec.ts
similarity index 86%
rename from src/app/tab2/tab2.page.spec.ts
rename to src/app/pages/tab2/tab2.page.spec.ts
index 70bd876..8c1a006 100644
--- a/src/app/tab2/tab2.page.spec.ts
+++ b/src/app/pages/tab2/tab2.page.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { IonicModule } from '@ionic/angular';
 
-import { ExploreContainerComponentModule } from '../explore-container/explore-container.module';
+import { ExploreContainerComponentModule } from '../../explore-container/explore-container.module';
 
 import { Tab2Page } from './tab2.page';
 
diff --git a/src/app/tab2/tab2.page.ts b/src/app/pages/tab2/tab2.page.ts
similarity index 100%
rename from src/app/tab2/tab2.page.ts
rename to src/app/pages/tab2/tab2.page.ts
diff --git a/src/app/tab3/tab3-routing.module.ts b/src/app/pages/tab3/tab3-routing.module.ts
similarity index 100%
rename from src/app/tab3/tab3-routing.module.ts
rename to src/app/pages/tab3/tab3-routing.module.ts
diff --git a/src/app/tab3/tab3.module.ts b/src/app/pages/tab3/tab3.module.ts
similarity index 83%
rename from src/app/tab3/tab3.module.ts
rename to src/app/pages/tab3/tab3.module.ts
index 2599fc6..8269b7e 100644
--- a/src/app/tab3/tab3.module.ts
+++ b/src/app/pages/tab3/tab3.module.ts
@@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { Tab3Page } from './tab3.page';
-import { ExploreContainerComponentModule } from '../explore-container/explore-container.module';
+import { ExploreContainerComponentModule } from '../../explore-container/explore-container.module';
 
 import { Tab3PageRoutingModule } from './tab3-routing.module';
 
diff --git a/src/app/tab3/tab3.page.html b/src/app/pages/tab3/tab3.page.html
similarity index 100%
rename from src/app/tab3/tab3.page.html
rename to src/app/pages/tab3/tab3.page.html
diff --git a/src/app/tab3/tab3.page.scss b/src/app/pages/tab3/tab3.page.scss
similarity index 100%
rename from src/app/tab3/tab3.page.scss
rename to src/app/pages/tab3/tab3.page.scss
diff --git a/src/app/tab3/tab3.page.spec.ts b/src/app/pages/tab3/tab3.page.spec.ts
similarity index 86%
rename from src/app/tab3/tab3.page.spec.ts
rename to src/app/pages/tab3/tab3.page.spec.ts
index 28d8619..415f782 100644
--- a/src/app/tab3/tab3.page.spec.ts
+++ b/src/app/pages/tab3/tab3.page.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { IonicModule } from '@ionic/angular';
 
-import { ExploreContainerComponentModule } from '../explore-container/explore-container.module';
+import { ExploreContainerComponentModule } from '../../explore-container/explore-container.module';
 
 import { Tab3Page } from './tab3.page';
 
diff --git a/src/app/tab3/tab3.page.ts b/src/app/pages/tab3/tab3.page.ts
similarity index 100%
rename from src/app/tab3/tab3.page.ts
rename to src/app/pages/tab3/tab3.page.ts
diff --git a/src/app/tabs/tabs-routing.module.ts b/src/app/pages/tabs/tabs-routing.module.ts
similarity index 100%
rename from src/app/tabs/tabs-routing.module.ts
rename to src/app/pages/tabs/tabs-routing.module.ts
diff --git a/src/app/tabs/tabs.module.ts b/src/app/pages/tabs/tabs.module.ts
similarity index 100%
rename from src/app/tabs/tabs.module.ts
rename to src/app/pages/tabs/tabs.module.ts
diff --git a/src/app/tabs/tabs.page.html b/src/app/pages/tabs/tabs.page.html
similarity index 93%
rename from src/app/tabs/tabs.page.html
rename to src/app/pages/tabs/tabs.page.html
index ae0aceb..f7b2e4a 100644
--- a/src/app/tabs/tabs.page.html
+++ b/src/app/pages/tabs/tabs.page.html
@@ -3,7 +3,7 @@
   <ion-tab-bar slot="bottom">
     <ion-tab-button tab="tab1" href="/tabs/tab1">
       <ion-icon aria-hidden="true" name="triangle"></ion-icon>
-      <ion-label>Tab 1</ion-label>
+      <ion-label>Home</ion-label>
     </ion-tab-button>
 
     <ion-tab-button tab="tab2" href="/tabs/tab2">
diff --git a/src/app/tabs/tabs.page.scss b/src/app/pages/tabs/tabs.page.scss
similarity index 100%
rename from src/app/tabs/tabs.page.scss
rename to src/app/pages/tabs/tabs.page.scss
diff --git a/src/app/tabs/tabs.page.spec.ts b/src/app/pages/tabs/tabs.page.spec.ts
similarity index 100%
rename from src/app/tabs/tabs.page.spec.ts
rename to src/app/pages/tabs/tabs.page.spec.ts
diff --git a/src/app/tabs/tabs.page.ts b/src/app/pages/tabs/tabs.page.ts
similarity index 100%
rename from src/app/tabs/tabs.page.ts
rename to src/app/pages/tabs/tabs.page.ts
diff --git a/src/app/tab1/tab1.page.html b/src/app/tab1/tab1.page.html
deleted file mode 100644
index b94bd13..0000000
--- a/src/app/tab1/tab1.page.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<ion-header [translucent]="true">
-  <ion-toolbar>
-    <ion-title>
-      Tab 1
-    </ion-title>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content [fullscreen]="true">
- Magic here 
-</ion-content>