diff --git a/app/(auth)/layout.tsx b/app/(auth)/layout.tsx
deleted file mode 100644
index 98282d1..0000000
--- a/app/(auth)/layout.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from "react";
-
-const clearLayout = ({ children }: Readonly<{ children: React.ReactNode }>) => {
-  return (
-    <div className="relative w-screen h-screen bg-red-500 bg-[url('/assets/pages/login/a78h12j89a01n.jpg')] bg-cover bg-center">
-      <div className="fixed z-0 w-screen h-screen backdrop-blur-xl bg-black/60" />
-      {children}
-    </div>
-  );
-};
-
-export default clearLayout;
diff --git a/app/(auth)/log-in/page.tsx b/app/(auth)/log-in/page.tsx
deleted file mode 100644
index bdb90a5..0000000
--- a/app/(auth)/log-in/page.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { buildMeta } from "@/shared/config/meta";
-import LoginCard from "@/widgets/authentication/login/LoginCard";
-import React from "react";
-
-export const generateMetadata = () => {
-  return buildMeta({
-    title: "Log in",
-  });
-};
-
-const page = () => {
-  return (
-    <div className="fixed z-10 w-screen h-screen flex justify-center items-center -mt-12">
-      <LoginCard />
-    </div>
-  );
-};
-
-export default page;
diff --git a/app/(auth)/sign-up/page.tsx b/app/(auth)/sign-up/page.tsx
deleted file mode 100644
index 57a7c08..0000000
--- a/app/(auth)/sign-up/page.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { buildMeta } from "@/shared/config/meta";
-import SignupCard from "@/widgets/authentication/signup/SignupCard";
-import React from "react";
-
-export const generateMetadata = () => {
-  return buildMeta({
-    title: "Sign in",
-  });
-};
-
-const page = () => {
-  return (
-    <div className="fixed z-10 w-screen h-screen flex justify-center items-center -mt-12">
-      <SignupCard />
-    </div>
-  );
-};
-
-export default page;
diff --git a/app/(main)/layout.tsx b/app/(main)/layout.tsx
index aa34048..84daa17 100644
--- a/app/(main)/layout.tsx
+++ b/app/(main)/layout.tsx
@@ -1,4 +1,4 @@
-import NavbarUI from "@/shared/ui/navbar";
+import NavbarUI from "@/widgets/navbar/ui/Navbar";
 import React from "react";
 
 const mainLayout = ({ children }: Readonly<{ children: React.ReactNode }>) => {
diff --git a/features/login/ui/EmailForm.tsx b/features/login/ui/EmailForm.tsx
deleted file mode 100644
index d97df1a..0000000
--- a/features/login/ui/EmailForm.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-"use client";
-
-import { Button, Form, Input } from "@heroui/react";
-import React from "react";
-
-const EmailForm = () => {
-  return (
-    // Form component to handle email input
-    <Form className="mt-12 sm:mt-8">
-      <Input
-        className="w-full "
-        label="Email"
-        type="email"
-        variant="bordered"
-        classNames={{
-          input: "text-md font-light pt-4",
-          inputWrapper: "flex gap-10",
-        }}
-      />
-      <Button className="mt-2 w-full" color="primary">
-        Continue
-      </Button>
-    </Form>
-  );
-};
-
-export default EmailForm;
diff --git a/features/signup/ui/EmailForm.tsx b/features/signup/ui/EmailForm.tsx
deleted file mode 100644
index 64d53c9..0000000
--- a/features/signup/ui/EmailForm.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Button, Form, Input } from "@heroui/react";
-import React from "react";
-
-const EmailForm = () => {
-  return (
-    // Form component to handle email input
-    <Form className="mt-12 sm:mt-8">
-      <Input
-        className="w-full "
-        label="Email"
-        type="email"
-        variant="bordered"
-        classNames={{
-          input: "text-md font-light pt-4",
-          inputWrapper: "flex gap-10",
-        }}
-      />
-      <Button className="mt-2 w-full" color="primary">
-        Continue
-      </Button>
-    </Form>
-  );
-};
-
-export default EmailForm;
diff --git a/package.json b/package.json
index 4f3311a..e3d7b32 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,7 @@
   "name": "frontend",
   "version": "0.1.0",
   "private": true,
+  "type": "module",
   "scripts": {
     "dev": "next dev --turbopack",
     "build": "next build",
diff --git a/widgets/navbar/accountCenter.tsx b/widgets/navbar/accountCenter.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/widgets/navbar/mobileSidebar.tsx b/widgets/navbar/mobileSidebar.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/widgets/navbar/ui/LoginAndSignup.tsx b/widgets/navbar/ui/LoginAndSignup.tsx
new file mode 100644
index 0000000..ee602b4
--- /dev/null
+++ b/widgets/navbar/ui/LoginAndSignup.tsx
@@ -0,0 +1,30 @@
+"use client";
+
+import { routes } from "@/shared/config/routes";
+import { Button, Link, NavbarItem } from "@heroui/react";
+import React from "react";
+
+const LoginAndSignup = () => {
+  return (
+    <>
+      <NavbarItem className="hidden lg:flex">
+        <Link href={routes.login} className="font-medium">
+          Login
+        </Link>
+      </NavbarItem>
+      <NavbarItem>
+        <Button
+          color="primary"
+          variant="solid"
+          radius="sm"
+          as={Link}
+          href={routes.signup}
+        >
+          Sign Up
+        </Button>
+      </NavbarItem>
+    </>
+  );
+};
+
+export default LoginAndSignup;
diff --git a/shared/ui/navbar.tsx b/widgets/navbar/ui/Navbar.tsx
similarity index 80%
rename from shared/ui/navbar.tsx
rename to widgets/navbar/ui/Navbar.tsx
index d872a00..6aa61c6 100644
--- a/shared/ui/navbar.tsx
+++ b/widgets/navbar/ui/Navbar.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import {
-  Button,
   Link,
   Navbar,
   NavbarBrand,
@@ -11,10 +10,10 @@ import {
   NavbarMenuItem,
   NavbarMenuToggle,
 } from "@heroui/react";
-import { usePathname, useRouter } from "next/navigation";
+import { usePathname } from "next/navigation";
 import React, { useState } from "react";
-import { delayButtonClick } from "../lib/delayButtonClick";
-import { routes } from "../config/routes";
+import { routes } from "../../../shared/config/routes";
+import LoginAndSignup from "./LoginAndSignup";
 
 export const AcmeLogo = () => {
   return (
@@ -86,24 +85,11 @@ const NavbarUI = () => {
           );
         })}
       </NavbarContent>
+
       <NavbarContent justify="end">
-        <NavbarItem className="hidden lg:flex">
-          <Link href={routes.login} className="font-medium">
-            Login
-          </Link>
-        </NavbarItem>
-        <NavbarItem>
-          <Button
-            color="primary"
-            variant="solid"
-            radius="sm"
-            as={Link}
-            href={routes.signup}
-          >
-            Sign Up
-          </Button>
-        </NavbarItem>
+        <LoginAndSignup />
       </NavbarContent>
+
       <NavbarMenu>
         {navbarItems.map((item, index) => (
           <NavbarMenuItem key={`${item}-${index}`}>