diff --git a/Backend/index.js b/Backend/index.js
index c48ebbb..4b9c288 100644
--- a/Backend/index.js
+++ b/Backend/index.js
@@ -1,4 +1,4 @@
-require('dotenv').config(); // Add this at the very top
+require('dotenv').config(); 
 const express = require('express');
 const mongoose = require('mongoose');
 const axios = require('axios');
diff --git a/Frontend/monarch/lib/main.dart b/Frontend/monarch/lib/main.dart
index 2e56f22..4db7f67 100644
--- a/Frontend/monarch/lib/main.dart
+++ b/Frontend/monarch/lib/main.dart
@@ -5,10 +5,10 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:http/http.dart' as http;
-import 'package:monarch/add.dart';
-import 'package:monarch/update_budget.dart';
-import 'package:monarch/homepage.dart';
-import 'package:monarch/statistics.dart';
+import 'package:monarch/support/add.dart';
+import 'package:monarch/main_pages/Statistics/update_budget.dart';
+import 'package:monarch/main_pages/HomePage/homepage.dart';
+import 'package:monarch/main_pages/Statistics/statistics.dart';
 
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
diff --git a/Frontend/monarch/lib/hero_card.dart b/Frontend/monarch/lib/main_pages/HomePage/hero_card.dart
similarity index 98%
rename from Frontend/monarch/lib/hero_card.dart
rename to Frontend/monarch/lib/main_pages/HomePage/hero_card.dart
index ca1d402..07af0e4 100644
--- a/Frontend/monarch/lib/hero_card.dart
+++ b/Frontend/monarch/lib/main_pages/HomePage/hero_card.dart
@@ -2,7 +2,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:monarch/colors.dart';
+import 'package:monarch/other_pages/colors.dart';
   final double totalBalance = 5847.32;
   final double monthlyIncome = 8500.00;
   final double monthlyExpenses = 2652.68;
diff --git a/Frontend/monarch/lib/homepage.dart b/Frontend/monarch/lib/main_pages/HomePage/homepage.dart
similarity index 92%
rename from Frontend/monarch/lib/homepage.dart
rename to Frontend/monarch/lib/main_pages/HomePage/homepage.dart
index cf6aa37..65a48b1 100644
--- a/Frontend/monarch/lib/homepage.dart
+++ b/Frontend/monarch/lib/main_pages/HomePage/homepage.dart
@@ -3,12 +3,12 @@
 
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:monarch/colors.dart';
-import 'package:monarch/fetch_service.dart';
-import 'package:monarch/hero_card.dart';
-import 'package:monarch/navbar.dart';
-import 'package:monarch/quick_actions.dart';
-import 'package:monarch/transcations_recent.dart';
+import 'package:monarch/other_pages/colors.dart';
+import 'package:monarch/support/fetch_service.dart';
+import 'package:monarch/main_pages/HomePage/hero_card.dart';
+import 'package:monarch/main_pages/HomePage/navbar.dart';
+import 'package:monarch/main_pages/HomePage/quick_actions.dart';
+import 'package:monarch/support/transcations_recent.dart';
 //import 'package:monarch/static.dart';
 
 class FinTrackHomePage extends StatefulWidget {
diff --git a/Frontend/monarch/lib/navbar.dart b/Frontend/monarch/lib/main_pages/HomePage/navbar.dart
similarity index 95%
rename from Frontend/monarch/lib/navbar.dart
rename to Frontend/monarch/lib/main_pages/HomePage/navbar.dart
index c16489f..31d0b75 100644
--- a/Frontend/monarch/lib/navbar.dart
+++ b/Frontend/monarch/lib/main_pages/HomePage/navbar.dart
@@ -1,9 +1,9 @@
 // ignore_for_file: deprecated_member_use
 
 import 'package:flutter/material.dart';
-import 'package:monarch/add.dart';
-import 'package:monarch/homepage.dart';
-import 'package:monarch/statistics.dart';
+import 'package:monarch/support/add.dart';
+import 'package:monarch/main_pages/HomePage/homepage.dart';
+import 'package:monarch/main_pages/Statistics/statistics.dart';
 
 class CustomNavBar extends StatelessWidget {
   final int currentIndex;
diff --git a/Frontend/monarch/lib/quick_actions.dart b/Frontend/monarch/lib/main_pages/HomePage/quick_actions.dart
similarity index 97%
rename from Frontend/monarch/lib/quick_actions.dart
rename to Frontend/monarch/lib/main_pages/HomePage/quick_actions.dart
index b070ad6..a97f572 100644
--- a/Frontend/monarch/lib/quick_actions.dart
+++ b/Frontend/monarch/lib/main_pages/HomePage/quick_actions.dart
@@ -3,8 +3,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:monarch/add.dart';
-import 'package:monarch/colors.dart';
+import 'package:monarch/support/add.dart';
+import 'package:monarch/other_pages/colors.dart';
 
 class QuickActionsPage extends StatelessWidget {
   const QuickActionsPage({super.key});
diff --git a/Frontend/monarch/lib/budget_manager.dart b/Frontend/monarch/lib/main_pages/Statistics/budget_manager.dart
similarity index 100%
rename from Frontend/monarch/lib/budget_manager.dart
rename to Frontend/monarch/lib/main_pages/Statistics/budget_manager.dart
diff --git a/Frontend/monarch/lib/statistics.dart b/Frontend/monarch/lib/main_pages/Statistics/statistics.dart
similarity index 98%
rename from Frontend/monarch/lib/statistics.dart
rename to Frontend/monarch/lib/main_pages/Statistics/statistics.dart
index f435d91..89cad31 100644
--- a/Frontend/monarch/lib/statistics.dart
+++ b/Frontend/monarch/lib/main_pages/Statistics/statistics.dart
@@ -7,12 +7,12 @@ import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:http/http.dart' as http;
-import 'package:monarch/add.dart';
-import 'package:monarch/enviroment.dart';
-import 'package:monarch/update_budget.dart';
-import 'package:monarch/budget_manager.dart';
-import 'package:monarch/homepage.dart';
-import 'package:monarch/navbar.dart';
+import 'package:monarch/support/add.dart';
+import 'package:monarch/other_pages/enviroment.dart';
+import 'package:monarch/main_pages/Statistics/update_budget.dart';
+import 'package:monarch/main_pages/Statistics/budget_manager.dart';
+import 'package:monarch/main_pages/HomePage/homepage.dart';
+import 'package:monarch/main_pages/HomePage/navbar.dart';
 
 class Transaction {
   final String description;
diff --git a/Frontend/monarch/lib/update_budget.dart b/Frontend/monarch/lib/main_pages/Statistics/update_budget.dart
similarity index 99%
rename from Frontend/monarch/lib/update_budget.dart
rename to Frontend/monarch/lib/main_pages/Statistics/update_budget.dart
index d9a161d..a394e30 100644
--- a/Frontend/monarch/lib/update_budget.dart
+++ b/Frontend/monarch/lib/main_pages/Statistics/update_budget.dart
@@ -3,8 +3,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:monarch/colors.dart';
-import 'package:monarch/statistics.dart';
+import 'package:monarch/other_pages/colors.dart';
+import 'package:monarch/main_pages/Statistics/statistics.dart';
 
 class UpdateBudget extends StatefulWidget {
   const UpdateBudget({super.key});
diff --git a/Frontend/monarch/lib/colors.dart b/Frontend/monarch/lib/other_pages/colors.dart
similarity index 100%
rename from Frontend/monarch/lib/colors.dart
rename to Frontend/monarch/lib/other_pages/colors.dart
diff --git a/Frontend/monarch/lib/enviroment.dart b/Frontend/monarch/lib/other_pages/enviroment.dart
similarity index 100%
rename from Frontend/monarch/lib/enviroment.dart
rename to Frontend/monarch/lib/other_pages/enviroment.dart
diff --git a/Frontend/monarch/lib/add.dart b/Frontend/monarch/lib/support/add.dart
similarity index 99%
rename from Frontend/monarch/lib/add.dart
rename to Frontend/monarch/lib/support/add.dart
index 935d45d..fd1d99b 100644
--- a/Frontend/monarch/lib/add.dart
+++ b/Frontend/monarch/lib/support/add.dart
@@ -7,8 +7,8 @@ import 'package:flutter/services.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:http/http.dart' as http;
-import 'package:monarch/enviroment.dart';
-import 'package:monarch/statistics.dart';
+import 'package:monarch/other_pages/enviroment.dart';
+import 'package:monarch/main_pages/Statistics/statistics.dart';
 
 class AddExpenseScreen extends StatefulWidget {
   const AddExpenseScreen({super.key});
diff --git a/Frontend/monarch/lib/fetch_service.dart b/Frontend/monarch/lib/support/fetch_service.dart
similarity index 92%
rename from Frontend/monarch/lib/fetch_service.dart
rename to Frontend/monarch/lib/support/fetch_service.dart
index ce3f697..2ecb534 100644
--- a/Frontend/monarch/lib/fetch_service.dart
+++ b/Frontend/monarch/lib/support/fetch_service.dart
@@ -2,7 +2,7 @@
 
 import 'package:http/http.dart' as http;
 import 'dart:convert';
-import 'enviroment.dart';
+import '../other_pages/enviroment.dart';
 Future<List<Map<String, dynamic>>> fetchRecentTransactions() async {
   final response = await http.get(
 
diff --git a/Frontend/monarch/lib/transcations_recent.dart b/Frontend/monarch/lib/support/transcations_recent.dart
similarity index 98%
rename from Frontend/monarch/lib/transcations_recent.dart
rename to Frontend/monarch/lib/support/transcations_recent.dart
index 33ac49d..0acee82 100644
--- a/Frontend/monarch/lib/transcations_recent.dart
+++ b/Frontend/monarch/lib/support/transcations_recent.dart
@@ -2,7 +2,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:monarch/colors.dart';
+import 'package:monarch/other_pages/colors.dart';
 
 class RecentTransactionsWidget extends StatelessWidget {
   final Future<List<Map<String, dynamic>>> recentTransactions;