diff --git a/client/app/layout.tsx b/client/app/layout.tsx
index 8d067065..f246541e 100644
--- a/client/app/layout.tsx
+++ b/client/app/layout.tsx
@@ -3,7 +3,7 @@ import { Plus_Jakarta_Sans } from "next/font/google";
 import "./globals.css";
 
 import { cn } from "@/lib/utils";
-import { ThemeProvider } from "@/components/utils/theme-provider";
+import { ThemeProvider } from "@/components/theme-provider";
 import StoreProvider from "./StoreProvider";
 
 const inter = Plus_Jakarta_Sans({
diff --git a/client/components/utils/CustomFormField.tsx b/client/components/CustomFormField.tsx
similarity index 96%
rename from client/components/utils/CustomFormField.tsx
rename to client/components/CustomFormField.tsx
index 9660923b..edba6daf 100644
--- a/client/components/utils/CustomFormField.tsx
+++ b/client/components/CustomFormField.tsx
@@ -14,9 +14,9 @@ import Image from "next/image";
 import PhoneInput from "react-phone-number-input";
 import ReactDatePicker from "react-datepicker";
 import { Select } from "@radix-ui/react-select";
-import { SelectContent, SelectTrigger, SelectValue } from "../ui/select";
-import { Checkbox } from "../ui/checkbox";
-import { Textarea } from "../ui/textarea";
+import { SelectContent, SelectTrigger, SelectValue } from "./ui/select";
+import { Checkbox } from "./ui/checkbox";
+import { Textarea } from "./ui/textarea";
 
 const RenderField = ({ field, props }: { field: any; props: CustomProps }) => {
   const {
diff --git a/client/components/utils/SubmitButton.tsx b/client/components/SubmitButton.tsx
similarity index 100%
rename from client/components/utils/SubmitButton.tsx
rename to client/components/SubmitButton.tsx
diff --git a/client/components/forms/AppointmentForm.tsx b/client/components/forms/AppointmentForm.tsx
index befe1456..bfb6d954 100644
--- a/client/components/forms/AppointmentForm.tsx
+++ b/client/components/forms/AppointmentForm.tsx
@@ -5,8 +5,8 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
 import { Form } from "@/components/ui/form";
-import CustomFormField from "@/components/utils/CustomFormField";
-import SubmitButton from "@/components/utils/SubmitButton";
+import CustomFormField from "@/components/CustomFormField";
+import SubmitButton from "@/components/SubmitButton";
 import { appointmentFormValidation } from "@/lib/userValidation";
 import { SelectItem } from "../ui/select";
 import Image from "next/image";
diff --git a/client/components/forms/RegistrationForm.tsx b/client/components/forms/RegistrationForm.tsx
index aafb32f4..e3ce85a0 100644
--- a/client/components/forms/RegistrationForm.tsx
+++ b/client/components/forms/RegistrationForm.tsx
@@ -6,8 +6,8 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
 import { Form, FormControl } from "@/components/ui/form";
-import CustomFormField from "@/components/utils/CustomFormField";
-import SubmitButton from "@/components/utils/SubmitButton";
+import CustomFormField from "@/components/CustomFormField";
+import SubmitButton from "@/components/SubmitButton";
 import { registerFormValidation } from "@/lib/userValidation";
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 import { Label } from "@radix-ui/react-label";
diff --git a/client/components/forms/SignupForm.tsx b/client/components/forms/SignupForm.tsx
index b652eb00..33e57510 100644
--- a/client/components/forms/SignupForm.tsx
+++ b/client/components/forms/SignupForm.tsx
@@ -5,8 +5,8 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
 import { Form, FormControl } from "@/components/ui/form";
-import CustomFormField from "@/components/utils/CustomFormField";
-import SubmitButton from "@/components/utils/SubmitButton";
+import CustomFormField from "@/components/CustomFormField";
+import SubmitButton from "@/components/SubmitButton";
 import { signupFormValidation } from "@/lib/userValidation";
 // import { useLoginMutation } from "@/lib/features/api/authApi";
 import { FormFieldType } from "@/types/fromTypes";
diff --git a/client/components/forms/SiigninForm.tsx b/client/components/forms/SiigninForm.tsx
index 45c06ed3..2036fc3b 100644
--- a/client/components/forms/SiigninForm.tsx
+++ b/client/components/forms/SiigninForm.tsx
@@ -5,8 +5,8 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
 import { Form } from "@/components/ui/form";
-import CustomFormField from "@/components/utils/CustomFormField";
-import SubmitButton from "@/components/utils/SubmitButton";
+import CustomFormField from "@/components/CustomFormField";
+import SubmitButton from "@/components/SubmitButton";
 import { signinFormValidation } from "@/lib/userValidation";
 import { useLoginMutation } from "@/lib/features/api/authApi";
 import Link from "next/link";
diff --git a/client/components/utils/theme-provider.tsx b/client/components/theme-provider.tsx
similarity index 100%
rename from client/components/utils/theme-provider.tsx
rename to client/components/theme-provider.tsx