diff --git a/src/components/Login/login.css b/src/components/Login/login.css
deleted file mode 100644
index b3d2175..0000000
--- a/src/components/Login/login.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.home-login-form {
-  transform: translateY(25%);
-}
-
-.form-logo {
-  margin: var(--tl-spacing-xl) auto;
-  display: block;
-}
\ No newline at end of file
diff --git a/src/components/Register/register.css b/src/components/Register/register.css
deleted file mode 100644
index 3adf445..0000000
--- a/src/components/Register/register.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.form-background.register-form-background {
-  margin-top: 5em;
-}
-.home-register-form {
-  transform: translateY(5%);
-}
diff --git a/src/components/Dashboard/StatCard/StatCard.jsx b/src/components/StatCard/StatCard.jsx
similarity index 100%
rename from src/components/Dashboard/StatCard/StatCard.jsx
rename to src/components/StatCard/StatCard.jsx
diff --git a/src/components/Dashboard/StatCard/statcard.scss b/src/components/StatCard/statcard.scss
similarity index 100%
rename from src/components/Dashboard/StatCard/statcard.scss
rename to src/components/StatCard/statcard.scss
diff --git a/src/components/TaskManager/TaskManager.jsx b/src/components/TaskManager/TaskManager.jsx
index 18af752..b35e24c 100644
--- a/src/components/TaskManager/TaskManager.jsx
+++ b/src/components/TaskManager/TaskManager.jsx
@@ -3,18 +3,19 @@ import { Routes, Route, Navigate, useLocation } from "react-router-dom";
 import { getTasksResponse, renderToast, updateTaskStatusApi, handleTaskDeleteResponse } from "../../utils/utils";
 import useAppContext from "../../hooks/useAppContext";
 import api from "../../api/api";
-import Home from "../Home/Home";
-import Login from "../Login/Login";
-import Register from "../Register/Register";
+
+import Home from "../../pages/Home/Home.jsx";
+import Login from "../../pages/Login/Login.jsx";
+import Register from "../../pages/Register/Register.jsx";
+import Inbox from "../../pages/Inbox/Inbox.jsx";
+import Dashboard from "../../pages/Dashboard/Dashboard.jsx";
+import Today from "../../pages/Today/Today.jsx";
 import MainContent from "../MainContent/MainContent.jsx";
-import Inbox from "../Inbox/Inbox.jsx";
 import PrivateRoutes from "../PrivateRoutes/PrivateRoutes";
-import Dashboard from "../Dashboard/Dashboard.jsx";
 import Spinner from "../Spinner/Spinner";
 import Sidebar from "../Sidebar/Sidebar.jsx";
 import history from "../../history/history.js";
 import TaskForm from "../TaskForm/TaskForm.jsx";
-import Today from "../Today/Today.jsx";
 
 const TaskManager = () => {
   const appPath = "/app";
@@ -194,8 +195,6 @@ const TaskManager = () => {
               path={`${appPath}/today`}
               element={
                 <Today
-                  // pendingTasks={pendingTasks.filter((task) => new Date(task.due_date).toISOString().split("T")[0] === new Date().toISOString().split("T")[0])}
-                  // completedTasks={completedTasks.filter((task) => new Date(task.due_date).toISOString().split("T")[0] === new Date().toISOString().split("T")[0])}
                   handleTaskDelete={handleTaskDelete}
                   updateTaskStatus={updateTaskStatus}
                   isToday={true}
diff --git a/src/components/Dashboard/Dashboard.jsx b/src/pages/Dashboard/Dashboard.jsx
similarity index 88%
rename from src/components/Dashboard/Dashboard.jsx
rename to src/pages/Dashboard/Dashboard.jsx
index a30713e..aad07d6 100644
--- a/src/components/Dashboard/Dashboard.jsx
+++ b/src/pages/Dashboard/Dashboard.jsx
@@ -1,12 +1,11 @@
 import React, { useState, useEffect, useMemo } from "react";
-import { handleTaskDeleteResponse } from "../../utils/utils";
-import StatCard from "./StatCard/StatCard";
-import BreadCrumb from "../BreadCrumb/BreadCrumb";
-import ContentInfo from "../MainContent/ContentInfo/ContentInfo";
-import TaskContainer from "../TaskContainer/TaskContainer";
-import "./dashboard.scss";
+import StatCard from "../../components/StatCard/StatCard";
+import BreadCrumb from "../../components/BreadCrumb/BreadCrumb";
+import ContentInfo from "../../components/MainContent/ContentInfo/ContentInfo";
+import TaskContainer from "../../components/TaskContainer/TaskContainer";
 import useAppContext from "../../hooks/useAppContext";
-import Spinner from "../Spinner/Spinner";
+import Spinner from "../../components/Spinner/Spinner";
+import "./dashboard.scss";
 
 function Dashboard({ tasks, updateTaskStatus, handleTaskDelete }) {
   const [stats, setStats] = useState([
diff --git a/src/components/Dashboard/dashboard.scss b/src/pages/Dashboard/dashboard.scss
similarity index 100%
rename from src/components/Dashboard/dashboard.scss
rename to src/pages/Dashboard/dashboard.scss
diff --git a/src/components/Home/Home.jsx b/src/pages/Home/Home.jsx
similarity index 80%
rename from src/components/Home/Home.jsx
rename to src/pages/Home/Home.jsx
index 0e73a4c..fa25a62 100644
--- a/src/components/Home/Home.jsx
+++ b/src/pages/Home/Home.jsx
@@ -1,16 +1,16 @@
 import React, { useEffect } from "react";
 import { Container } from "react-bootstrap";
 import { Link, useNavigate } from "react-router-dom";
-import Spinner from "../Spinner/Spinner";
-import api from "../../api/api";
-import Header from "../Header/Header";
-import useAppContext from "../../hooks/useAppContext";
+import Spinner from "../../components/Spinner/Spinner.jsx";
+import api from "../../api/api.js";
+import Header from "../../components/Header/Header.jsx";
+import useAppContext from "../../hooks/useAppContext.js";
 import { Figure } from "react-bootstrap";
-import Features from "../Features/Features.jsx";
+import Features from "../../components/Features/Features.jsx";
 import "./home.scss";
-import Footer from "../Footer/Footer";
-import { handleApiResponse, verifyCookie } from "../../utils/utils";
-import Hero from "../Hero/Hero.jsx";
+import Footer from "../../components/Footer/Footer.jsx";
+import { handleApiResponse, verifyCookie } from "../../utils/utils.js";
+import Hero from "../../components/Hero/Hero.jsx";
 
 function Home() {
   let navigate = useNavigate();
diff --git a/src/components/Home/home.scss b/src/pages/Home/home.scss
similarity index 100%
rename from src/components/Home/home.scss
rename to src/pages/Home/home.scss
diff --git a/src/components/Inbox/Inbox.jsx b/src/pages/Inbox/Inbox.jsx
similarity index 77%
rename from src/components/Inbox/Inbox.jsx
rename to src/pages/Inbox/Inbox.jsx
index b56bef9..6114aad 100644
--- a/src/components/Inbox/Inbox.jsx
+++ b/src/pages/Inbox/Inbox.jsx
@@ -1,13 +1,13 @@
 import React from "react";
 import { useEffect } from "react";
-import Spinner from "../Spinner/Spinner";
+import Spinner from "../../components/Spinner/Spinner";
 import { useLocation } from "react-router-dom";
 import { renderToast } from "../../utils/utils";
 import useAppContext from "../../hooks/useAppContext";
-import BreadCrumb from "../BreadCrumb/BreadCrumb";
-import ContentInfo from "../MainContent/ContentInfo/ContentInfo";
-import Filters from "../Filters/Filters";
-import TaskContainer from "../TaskContainer/TaskContainer";
+import BreadCrumb from "../../components/BreadCrumb/BreadCrumb";
+import ContentInfo from "../../components/MainContent/ContentInfo/ContentInfo";
+import Filters from "../../components/Filters/Filters";
+import TaskContainer from "../../components/TaskContainer/TaskContainer";
 import "./inbox.scss";
 
 function Inbox({ getTasks, loading, updateTaskStatus, handleTaskDelete, tasks, pendingTasks, completedTasks }) {
diff --git a/src/components/Inbox/inbox.scss b/src/pages/Inbox/inbox.scss
similarity index 100%
rename from src/components/Inbox/inbox.scss
rename to src/pages/Inbox/inbox.scss
diff --git a/src/components/Login/Login.jsx b/src/pages/Login/Login.jsx
similarity index 90%
rename from src/components/Login/Login.jsx
rename to src/pages/Login/Login.jsx
index 5a22f8a..87175e0 100644
--- a/src/components/Login/Login.jsx
+++ b/src/pages/Login/Login.jsx
@@ -1,15 +1,8 @@
-import React, { useState } from "react";
-import Form from "react-bootstrap/Form";
-import Button from "react-bootstrap/Button";
-import Container from "react-bootstrap/Container";
-import Row from "react-bootstrap/Row";
-import Col from "react-bootstrap/Col";
+import React, { useState, useEffect } from "react";
 import { Link, useNavigate } from "react-router-dom";
 import api from "../../api/api";
-import Spinner from "../Spinner/Spinner";
-import { useEffect } from "react";
-import "./login.css";
-import Header from "../Header/Header";
+import Spinner from "../../components/Spinner/Spinner";
+import Header from "../../components/Header/Header";
 import useAppContext from "../../hooks/useAppContext";
 import { renderToast, verifyCookie } from "../../utils/utils";
 
diff --git a/src/components/Register/Register.jsx b/src/pages/Register/Register.jsx
similarity index 92%
rename from src/components/Register/Register.jsx
rename to src/pages/Register/Register.jsx
index 98ba6e2..766309e 100644
--- a/src/components/Register/Register.jsx
+++ b/src/pages/Register/Register.jsx
@@ -1,16 +1,8 @@
-import React from "react";
-import Form from "react-bootstrap/Form";
-import Button from "react-bootstrap/Button";
-import Container from "react-bootstrap/Container";
-import Row from "react-bootstrap/Row";
-import Col from "react-bootstrap/Col";
-import { useState, useEffect } from "react";
-import { useNavigate } from "react-router-dom";
-import Spinner from "../Spinner/Spinner";
+import React, { useState, useEffect } from "react";
+import { useNavigate, Link } from "react-router-dom";
+import Spinner from "../../components/Spinner/Spinner";
 import api from "../../api/api";
-import "./register.css";
-import { Link } from "react-router-dom";
-import Header from "../Header/Header";
+import Header from "../../components/Header/Header";
 import { renderToast } from "../../utils/utils";
 import useAppContext from "../../hooks/useAppContext";
 
diff --git a/src/components/Today/Today.jsx b/src/pages/Today/Today.jsx
similarity index 82%
rename from src/components/Today/Today.jsx
rename to src/pages/Today/Today.jsx
index 9b9a70f..6eb9a5c 100644
--- a/src/components/Today/Today.jsx
+++ b/src/pages/Today/Today.jsx
@@ -1,6 +1,6 @@
-import BreadCrumb from "../BreadCrumb/BreadCrumb";
-import Filters from "../Filters/Filters";
-import ContentInfo from "../MainContent/ContentInfo/ContentInfo";
+import BreadCrumb from "../../components/BreadCrumb/BreadCrumb";
+import Filters from "../../components/Filters/Filters";
+import ContentInfo from "../../components/MainContent/ContentInfo/ContentInfo";
 import TodayContent from "./TodayContent";
 import "./today.scss";
 
diff --git a/src/components/Today/TodayContent.jsx b/src/pages/Today/TodayContent.jsx
similarity index 88%
rename from src/components/Today/TodayContent.jsx
rename to src/pages/Today/TodayContent.jsx
index 836ab84..23adb80 100644
--- a/src/components/Today/TodayContent.jsx
+++ b/src/pages/Today/TodayContent.jsx
@@ -1,6 +1,6 @@
 import { useState } from "react";
-import Icons from "../Icons/Icons";
-import TaskContainer from "../TaskContainer/TaskContainer";
+import Icons from "../../components/Icons/Icons";
+import TaskContainer from "../../components/TaskContainer/TaskContainer";
 
 const TodayContent = ({ tasks, handleTaskDelete, updateTaskStatus, heading }) => {
   const [show, setShow] = useState(true);
diff --git a/src/components/Today/today.scss b/src/pages/Today/today.scss
similarity index 100%
rename from src/components/Today/today.scss
rename to src/pages/Today/today.scss