diff --git a/src/pages/Home/home.test.tsx b/src/pages/Home/home.test.tsx
index be00da4..8628874 100644
--- a/src/pages/Home/home.test.tsx
+++ b/src/pages/Home/home.test.tsx
@@ -3,7 +3,7 @@ import MockDate from 'mockdate'
 import '@testing-library/jest-dom';
 import { fireEvent, render, screen } from '@testing-library/react';
 
-import Home from '.';
+import Home from './index';
 
 import { UserContext } from '../../contexts/User';
 import { FrequencyContext } from '../../contexts/Frequency';
diff --git a/src/pages/auth/components/Container.tsx b/src/pages/auth/components/Container.tsx
index 39a58ec..bf5e0fc 100644
--- a/src/pages/auth/components/Container.tsx
+++ b/src/pages/auth/components/Container.tsx
@@ -35,6 +35,8 @@ const Wrapper = styled.div`
   width: 90%;
   max-width: 400px;
   align-items: center;
+  min-height: 100vh;
+  justify-content: center;
 `;
 
 const Logo = styled.img`
diff --git a/src/pages/auth/components/EmailSignIn.tsx b/src/pages/auth/components/email-signin.tsx
similarity index 81%
rename from src/pages/auth/components/EmailSignIn.tsx
rename to src/pages/auth/components/email-signin.tsx
index 5f7341e..ba2426a 100644
--- a/src/pages/auth/components/EmailSignIn.tsx
+++ b/src/pages/auth/components/email-signin.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import SignInBtn from "./SignInBtn";
+import SignInBtn from "./signin-btn";
 
 const EmailSignIn = (props: any) => {
   return <SignInBtn text="Sign in with Email" icon="@" {...props} />;
diff --git a/src/pages/auth/components/GoogleSignIn.tsx b/src/pages/auth/components/google-signin.tsx
similarity index 82%
rename from src/pages/auth/components/GoogleSignIn.tsx
rename to src/pages/auth/components/google-signin.tsx
index 091deb8..0a5fe55 100644
--- a/src/pages/auth/components/GoogleSignIn.tsx
+++ b/src/pages/auth/components/google-signin.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import SignInBtn from "./SignInBtn";
+import SignInBtn from "./signin-btn";
 
 
 const GoogleSignIn = (props: any) => {
diff --git a/src/pages/auth/components/index.ts b/src/pages/auth/components/index.ts
index 017e306..dbd4dd1 100644
--- a/src/pages/auth/components/index.ts
+++ b/src/pages/auth/components/index.ts
@@ -1,6 +1,6 @@
-export { default as Container } from "./Container";
-export { default as Form } from "./Form";
-export { default as H2 } from "./H2";
-export { default as H4 } from "./H4";
-export { default as GoogleSignIn } from './GoogleSignIn';
-export { default as EmailSignIn } from './EmailSignIn';
\ No newline at end of file
+export { default as Form } from "./form";
+export { default as H2 } from "./h2";
+export { default as H4 } from "./h4";
+export { default as GoogleSignIn } from './google-signin';
+export { default as EmailSignIn } from './email-signin';
+export { default as Container } from "./container";
\ No newline at end of file
diff --git a/src/pages/auth/components/SignInBtn.tsx b/src/pages/auth/components/signin-btn.tsx
similarity index 97%
rename from src/pages/auth/components/SignInBtn.tsx
rename to src/pages/auth/components/signin-btn.tsx
index 61fcaf4..4eec473 100644
--- a/src/pages/auth/components/SignInBtn.tsx
+++ b/src/pages/auth/components/signin-btn.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Text } from "../../../components";
 import { Colors } from "../../../config";
 import styled from "styled-components";
-import H2 from "./H2";
+import H2 from "./h2";
 
 
 export interface SignInBtnProps {
diff --git a/src/pages/auth/components/Login/index.tsx b/src/pages/auth/login/index.tsx
similarity index 94%
rename from src/pages/auth/components/Login/index.tsx
rename to src/pages/auth/login/index.tsx
index 1f7d07e..abae3a2 100644
--- a/src/pages/auth/components/Login/index.tsx
+++ b/src/pages/auth/login/index.tsx
@@ -1,19 +1,19 @@
 import * as React from "react";
 import * as Yup from "yup";
 import { useFormik } from "formik";
-import { Input, Button, Spacing } from "../../../../components";
+import { Input, Button, Spacing } from "../../../components";
 import {
   Container,
   Form,
   H4,
   GoogleSignIn,
   EmailSignIn,
-} from "..";
-import { AuthContext, LoginDetails } from "../../../../contexts/Auth";
+} from "../components";
+import { AuthContext, LoginDetails } from "../../../contexts/Auth";
 import { useNavigate } from "react-router-dom";
 import { useGoogleLogin } from '@react-oauth/google';
 import styled from "styled-components";
-import { Colors } from "../../../../config";
+import { Colors } from "../../../config";
 
 const CreateNewAccountBtn = styled(Button) <{ transparent: boolean }>`
   margin-top: 10px;
diff --git a/src/pages/auth/components/Login/login.test.tsx b/src/pages/auth/login/login.test.tsx
similarity index 97%
rename from src/pages/auth/components/Login/login.test.tsx
rename to src/pages/auth/login/login.test.tsx
index edc9b22..5de39bb 100644
--- a/src/pages/auth/components/Login/login.test.tsx
+++ b/src/pages/auth/login/login.test.tsx
@@ -1,4 +1,4 @@
-import Login from '.';
+import Login from './index'
 import { fireEvent, render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom'
 import * as React from 'react';
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 2ada516..a91ee2d 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -7,9 +7,9 @@ import { SettingsProvider } from "../contexts/Settings";
 
 import { Layout } from "../components";
 
-import Home from "./Home";
+import Home from "./home";
 
-import Login from "./auth/components/Login";
+import Login from "./auth/login";
 import SignUp from "./auth/sign-up";
 import ForgotPassword from "./auth/forgot-password";
 import ChangePassword from "./auth/change-password";