diff --git a/frontend/src/Images/profile_default.png b/frontend/src/Images/profile_default.png
deleted file mode 100644
index dceff98..0000000
Binary files a/frontend/src/Images/profile_default.png and /dev/null differ
diff --git a/frontend/src/util/sound.mp3 b/frontend/src/assets/sound.mp3
similarity index 100%
rename from frontend/src/util/sound.mp3
rename to frontend/src/assets/sound.mp3
diff --git a/frontend/src/util/sound.ogg b/frontend/src/assets/sound.ogg
similarity index 100%
rename from frontend/src/util/sound.ogg
rename to frontend/src/assets/sound.ogg
diff --git a/frontend/src/Images/wa-background.png b/frontend/src/assets/wa-background.png
similarity index 100%
rename from frontend/src/Images/wa-background.png
rename to frontend/src/assets/wa-background.png
diff --git a/frontend/src/components/ConfirmationModal/ConfirmationModal.js b/frontend/src/components/ConfirmationModal/index.js
similarity index 100%
rename from frontend/src/components/ConfirmationModal/ConfirmationModal.js
rename to frontend/src/components/ConfirmationModal/index.js
diff --git a/frontend/src/pages/Contacts/ContactModal.js b/frontend/src/components/ContactModal/index.js
similarity index 95%
rename from frontend/src/pages/Contacts/ContactModal.js
rename to frontend/src/components/ContactModal/index.js
index 805c60f..bd68aae 100644
--- a/frontend/src/pages/Contacts/ContactModal.js
+++ b/frontend/src/components/ContactModal/index.js
@@ -17,7 +17,7 @@ import { green } from "@material-ui/core/colors";
 
 import { makeStyles } from "@material-ui/core/styles";
 
-import api from "../../util/api";
+import api from "../../services/api";
 
 const useStyles = makeStyles(theme => ({
 	root: {
diff --git a/frontend/src/pages/Contacts/ContactsSekeleton.js b/frontend/src/components/ContactsSekeleton/index.js
similarity index 100%
rename from frontend/src/pages/Contacts/ContactsSekeleton.js
rename to frontend/src/components/ContactsSekeleton/index.js
diff --git a/frontend/src/components/Layout/MainListItems.js b/frontend/src/components/MainDrawer/MainListItems.js
similarity index 100%
rename from frontend/src/components/Layout/MainListItems.js
rename to frontend/src/components/MainDrawer/MainListItems.js
diff --git a/frontend/src/components/Layout/MainDrawer.js b/frontend/src/components/MainDrawer/index.js
similarity index 94%
rename from frontend/src/components/Layout/MainDrawer.js
rename to frontend/src/components/MainDrawer/index.js
index 184ba8b..067e85a 100644
--- a/frontend/src/components/Layout/MainDrawer.js
+++ b/frontend/src/components/MainDrawer/index.js
@@ -21,7 +21,7 @@ import AccountCircle from "@material-ui/icons/AccountCircle";
 import MenuItem from "@material-ui/core/MenuItem";
 import Menu from "@material-ui/core/Menu";
 
-import { AuthContext } from "../../Context/Auth/AuthContext";
+import { AuthContext } from "../../context/Auth/AuthContext";
 
 const drawerWidth = 240;
 
diff --git a/frontend/src/pages/Chat/components/MessagesInput/RecordingTimer.js b/frontend/src/components/MessageInput/RecordingTimer.js
similarity index 100%
rename from frontend/src/pages/Chat/components/MessagesInput/RecordingTimer.js
rename to frontend/src/components/MessageInput/RecordingTimer.js
diff --git a/frontend/src/pages/Chat/components/MessagesInput/MessagesInput.js b/frontend/src/components/MessageInput/index.js
similarity index 94%
rename from frontend/src/pages/Chat/components/MessagesInput/MessagesInput.js
rename to frontend/src/components/MessageInput/index.js
index 2cae4b3..6e93c54 100644
--- a/frontend/src/pages/Chat/components/MessagesInput/MessagesInput.js
+++ b/frontend/src/components/MessageInput/index.js
@@ -18,7 +18,7 @@ import MicIcon from "@material-ui/icons/Mic";
 import CheckCircleOutlineIcon from "@material-ui/icons/CheckCircleOutline";
 import HighlightOffIcon from "@material-ui/icons/HighlightOff";
 
-import api from "../../../../util/api";
+import api from "../../services/api";
 import RecordingTimer from "./RecordingTimer";
 
 const Mp3Recorder = new MicRecorder({ bitRate: 128 });
@@ -102,7 +102,7 @@ const useStyles = makeStyles(theme => ({
 	},
 }));
 
-const MessagesInput = ({ searchParam }) => {
+const MessageInput = ({ searchParam }) => {
 	const classes = useStyles();
 	const { ticketId } = useParams();
 	const userId = localStorage.getItem("userId");
@@ -378,4 +378,4 @@ const MessagesInput = ({ searchParam }) => {
 	}
 };
 
-export default MessagesInput;
+export default MessageInput;
diff --git a/frontend/src/pages/Chat/components/MessagesList/MessagesList.js b/frontend/src/components/MessagesList/index.js
similarity index 94%
rename from frontend/src/pages/Chat/components/MessagesList/MessagesList.js
rename to frontend/src/components/MessagesList/index.js
index 9875c1b..60209e1 100644
--- a/frontend/src/pages/Chat/components/MessagesList/MessagesList.js
+++ b/frontend/src/components/MessagesList/index.js
@@ -27,12 +27,12 @@ import Skeleton from "@material-ui/lab/Skeleton";
 
 import Drawer from "@material-ui/core/Drawer";
 
-import whatsBackground from "../../../../Images/wa-background.png";
+import whatsBackground from "../../assets/wa-background.png";
 
-import LinkifyWithTargetBlank from "../../../../components/LinkifyWithTargetBlank";
-import api from "../../../../util/api";
+import LinkifyWithTargetBlank from "../LinkifyWithTargetBlank";
+import api from "../../services/api";
 
-import MessagesInput from "../MessagesInput/MessagesInput";
+import MessageInput from "../MessageInput/";
 
 const drawerWidth = 320;
 
@@ -593,7 +593,7 @@ const MessagesList = () => {
 					>
 						{messagesList.length > 0 ? renderMessages() : []}
 					</InfiniteScrollReverse>
-					<MessagesInput searchParam={searchParam} />
+					<MessageInput searchParam={searchParam} />
 					{loading ? (
 						<div>
 							<CircularProgress className={classes.circleLoading} />
diff --git a/frontend/src/pages/Contacts/PaginationActions.js b/frontend/src/components/PaginationActions/index.js
similarity index 100%
rename from frontend/src/pages/Contacts/PaginationActions.js
rename to frontend/src/components/PaginationActions/index.js
diff --git a/frontend/src/pages/WhatsAuth/components/Qrcode.js b/frontend/src/components/Qrcode/index.js
similarity index 100%
rename from frontend/src/pages/WhatsAuth/components/Qrcode.js
rename to frontend/src/components/Qrcode/index.js
diff --git a/frontend/src/pages/WhatsAuth/components/Bateryinfo.js b/frontend/src/components/SessionInfo/index.js
similarity index 88%
rename from frontend/src/pages/WhatsAuth/components/Bateryinfo.js
rename to frontend/src/components/SessionInfo/index.js
index 69a912b..a749dd3 100644
--- a/frontend/src/pages/WhatsAuth/components/Bateryinfo.js
+++ b/frontend/src/components/SessionInfo/index.js
@@ -9,7 +9,7 @@ const useStyles = makeStyles({
 	},
 });
 
-const Bateryinfo = ({ session }) => {
+const SessionInfo = ({ session }) => {
 	const classes = useStyles();
 	return (
 		<React.Fragment>
@@ -31,4 +31,4 @@ const Bateryinfo = ({ session }) => {
 	);
 };
 
-export default Bateryinfo;
+export default SessionInfo;
diff --git a/frontend/src/pages/Chat/components/TicketsList/TicketSkeleton.js b/frontend/src/components/TicketsList/TicketSkeleton.js
similarity index 100%
rename from frontend/src/pages/Chat/components/TicketsList/TicketSkeleton.js
rename to frontend/src/components/TicketsList/TicketSkeleton.js
diff --git a/frontend/src/pages/Chat/components/TicketsList/TicketsList.js b/frontend/src/components/TicketsList/index.js
similarity index 94%
rename from frontend/src/pages/Chat/components/TicketsList/TicketsList.js
rename to frontend/src/components/TicketsList/index.js
index 2f8ef0b..964d947 100644
--- a/frontend/src/pages/Chat/components/TicketsList/TicketsList.js
+++ b/frontend/src/components/TicketsList/index.js
@@ -1,6 +1,5 @@
 import React, { useState, useEffect } from "react";
 import { useHistory, useParams } from "react-router-dom";
-import api from "../../../../util/api";
 import openSocket from "socket.io-client";
 
 import { parseISO, format } from "date-fns";
@@ -24,9 +23,10 @@ import Tabs from "@material-ui/core/Tabs";
 import Tab from "@material-ui/core/Tab";
 import MoveToInboxIcon from "@material-ui/icons/MoveToInbox";
 import CheckCircleOutlineIcon from "@material-ui/icons/CheckCircleOutline";
-
 import TicketSkeleton from "./TicketSkeleton";
 
+import api from "../../services/api";
+
 const useStyles = makeStyles(theme => ({
 	contactsWrapper: {
 		position: "relative",
@@ -533,8 +533,8 @@ const TicketsList = () => {
 				</Paper>
 			)}
 			<audio id="sound" preload="auto">
-				<source src={require("../../../../util/sound.mp3")} type="audio/mpeg" />
-				<source src={require("../../../../util/sound.ogg")} type="audio/ogg" />
+				<source src={require("../../assets/sound.mp3")} type="audio/mpeg" />
+				<source src={require("../../assets/sound.ogg")} type="audio/ogg" />
 				<embed hidden={true} autostart="false" loop={false} src="./sound.mp3" />
 			</audio>
 		</Paper>
diff --git a/frontend/src/Context/Auth/AuthContext.js b/frontend/src/context/Auth/AuthContext.js
similarity index 100%
rename from frontend/src/Context/Auth/AuthContext.js
rename to frontend/src/context/Auth/AuthContext.js
diff --git a/frontend/src/Context/Auth/useAuth.js b/frontend/src/context/Auth/useAuth.js
similarity index 94%
rename from frontend/src/Context/Auth/useAuth.js
rename to frontend/src/context/Auth/useAuth.js
index a185687..c33e1ec 100644
--- a/frontend/src/Context/Auth/useAuth.js
+++ b/frontend/src/context/Auth/useAuth.js
@@ -1,7 +1,7 @@
 import { useState, useEffect } from "react";
 import { useHistory } from "react-router-dom";
 
-import api from "../../util/api";
+import api from "../../services/api";
 
 const useAuth = () => {
 	const history = useHistory();
diff --git a/frontend/src/pages/Chat/Chat.js b/frontend/src/pages/Chat/index.js
similarity index 88%
rename from frontend/src/pages/Chat/Chat.js
rename to frontend/src/pages/Chat/index.js
index 1160193..b627231 100644
--- a/frontend/src/pages/Chat/Chat.js
+++ b/frontend/src/pages/Chat/index.js
@@ -4,8 +4,8 @@ import Grid from "@material-ui/core/Grid";
 import Paper from "@material-ui/core/Paper";
 import { makeStyles } from "@material-ui/core/styles";
 
-import TicketsList from "./components/TicketsList/TicketsList";
-import MessagesList from "./components/MessagesList/MessagesList";
+import TicketsList from "../../components/TicketsList/";
+import MessagesList from "../../components/MessagesList/";
 
 const useStyles = makeStyles(theme => ({
 	chatContainer: {
diff --git a/frontend/src/pages/Contacts/ContactsList.js b/frontend/src/pages/Contacts/index.js
similarity index 97%
rename from frontend/src/pages/Contacts/ContactsList.js
rename to frontend/src/pages/Contacts/index.js
index 2f1149e..2abc08b 100644
--- a/frontend/src/pages/Contacts/ContactsList.js
+++ b/frontend/src/pages/Contacts/index.js
@@ -22,12 +22,11 @@ import IconButton from "@material-ui/core/IconButton";
 import DeleteOutlineIcon from "@material-ui/icons/DeleteOutline";
 import EditIcon from "@material-ui/icons/Edit";
 
-import PaginationActions from "./PaginationActions";
-import api from "../../util/api";
-import ContactModal from "./ContactModal";
-import ContactsSekeleton from "./ContactsSekeleton";
-
-import ConfirmationModal from "../../components/ConfirmationModal/ConfirmationModal";
+import PaginationActions from "../../components/PaginationActions";
+import api from "../../services/api";
+import ContactsSekeleton from "../../components/ContactsSekeleton";
+import ContactModal from "../../components/ContactModal";
+import ConfirmationModal from "../../components/ConfirmationModal/";
 
 const useStyles = makeStyles(theme => ({
 	mainContainer: {
diff --git a/frontend/src/pages/Home/Dashboard.js b/frontend/src/pages/Dashboard/index.js
similarity index 100%
rename from frontend/src/pages/Home/Dashboard.js
rename to frontend/src/pages/Dashboard/index.js
diff --git a/frontend/src/pages/Home/Notifications_button_24.png b/frontend/src/pages/Home/Notifications_button_24.png
deleted file mode 100644
index 7409b40..0000000
Binary files a/frontend/src/pages/Home/Notifications_button_24.png and /dev/null differ
diff --git a/frontend/src/pages/Login/Login.js b/frontend/src/pages/Login/index.js
similarity index 94%
rename from frontend/src/pages/Login/Login.js
rename to frontend/src/pages/Login/index.js
index f0231c2..ab78284 100644
--- a/frontend/src/pages/Login/Login.js
+++ b/frontend/src/pages/Login/index.js
@@ -15,7 +15,7 @@ import Typography from "@material-ui/core/Typography";
 import { makeStyles } from "@material-ui/core/styles";
 import Container from "@material-ui/core/Container";
 
-import { AuthContext } from "../../Context/Auth/AuthContext";
+import { AuthContext } from "../../context/Auth/AuthContext";
 
 const Copyright = () => {
 	return (
diff --git a/frontend/src/pages/Profile/Profile.js b/frontend/src/pages/Profile/Profile.js
deleted file mode 100644
index e69de29..0000000
diff --git a/frontend/src/pages/Signup/Signup.js b/frontend/src/pages/Signup/index.js
similarity index 95%
rename from frontend/src/pages/Signup/Signup.js
rename to frontend/src/pages/Signup/index.js
index 7e6438f..c18a985 100644
--- a/frontend/src/pages/Signup/Signup.js
+++ b/frontend/src/pages/Signup/index.js
@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 
 import { useHistory } from "react-router-dom";
-import api from "../../util/api";
+import api from "../../services/api";
 import { Link as RouterLink } from "react-router-dom";
 
 import Avatar from "@material-ui/core/Avatar";
diff --git a/frontend/src/pages/WhatsAuth/WhatsAuth.js b/frontend/src/pages/WhatsAuth/WhatsAuth.js
index 8a11220..3d63eb2 100644
--- a/frontend/src/pages/WhatsAuth/WhatsAuth.js
+++ b/frontend/src/pages/WhatsAuth/WhatsAuth.js
@@ -1,14 +1,14 @@
 import React, { useState, useEffect } from "react";
 import { useHistory } from "react-router-dom";
-import api from "../../util/api";
+import api from "../../services/api";
 import openSocket from "socket.io-client";
 
 import { makeStyles } from "@material-ui/core/styles";
 
 import Grid from "@material-ui/core/Grid";
 import Paper from "@material-ui/core/Paper";
-import Bateryinfo from "./components/Bateryinfo";
-import Qrcode from "./components/Qrcode";
+import SessionInfo from "../../components/SessionInfo";
+import Qrcode from "../../components/Qrcode";
 
 const useStyles = makeStyles(theme => ({
 	root: {
@@ -88,7 +88,7 @@ const WhatsAuth = () => {
 				) : (
 					<Grid item xs={6}>
 						<Paper className={classes.paper}>
-							<Bateryinfo sessio={session} />
+							<SessionInfo sessio={session} />
 						</Paper>
 					</Grid>
 				)}
diff --git a/frontend/src/routes.js b/frontend/src/routes.js
index 5c16fd5..18cd1e1 100644
--- a/frontend/src/routes.js
+++ b/frontend/src/routes.js
@@ -5,15 +5,14 @@ import Backdrop from "@material-ui/core/Backdrop";
 import CircularProgress from "@material-ui/core/CircularProgress";
 import { makeStyles } from "@material-ui/core/styles";
 
-import MainDrawer from "./components/Layout/MainDrawer";
-import Dashboard from "./pages/Home/Dashboard";
-import Chat from "./pages/Chat/Chat";
-import Profile from "./pages/Profile/Profile";
-import Signup from "./pages/Signup/Signup";
-import Login from "./pages/Login/Login";
+import MainDrawer from "./components/MainDrawer";
+import Dashboard from "./pages/Dashboard/";
+import Chat from "./pages/Chat/";
+import Signup from "./pages/Signup/";
+import Login from "./pages/Login/";
 import WhatsAuth from "./pages/WhatsAuth/WhatsAuth";
-import ContactsList from "./pages/Contacts/ContactsList";
-import { AuthContext, AuthProvider } from "./Context/Auth/AuthContext";
+import Contacts from "./pages/Contacts/";
+import { AuthContext, AuthProvider } from "./context/Auth/AuthContext";
 
 const useStyles = makeStyles(theme => ({
 	backdrop: {
@@ -84,9 +83,8 @@ const Routes = () => {
 					<MainDrawer>
 						<PrivateRoute exact path="/" component={Dashboard} />
 						<PrivateRoute exact path="/chat/:ticketId?" component={Chat} />
-						<PrivateRoute exact path="/profile" component={Profile} />
 						<PrivateRoute exact path="/whats-auth" component={WhatsAuth} />
-						<PrivateRoute exact path="/contacts" component={ContactsList} />
+						<PrivateRoute exact path="/contacts" component={Contacts} />
 					</MainDrawer>
 				</Switch>
 			</AuthProvider>
diff --git a/frontend/src/util/api.js b/frontend/src/services/api.js
similarity index 100%
rename from frontend/src/util/api.js
rename to frontend/src/services/api.js