diff --git a/client/components/forms/admin/SigninForm.tsx b/client/components/forms/admin/SigninForm.tsx
index b8f38047..4971ddea 100644
--- a/client/components/forms/admin/SigninForm.tsx
+++ b/client/components/forms/admin/SigninForm.tsx
@@ -6,7 +6,7 @@ import { z } from "zod";
 import { Form } from "@/components/ui/form";
 import CustomFormField from "@/components/common/CustomFormField";
 import SubmitButton from "@/components/button/SubmitButton";
-import { signinFormSchema } from "@/components/forms/schema/adminSchema";
+import { signinFormSchema } from "@/lib/form-schema/adminSchema";
 import { FormFieldType } from "@/types/enum";
 import { useSigninAdmin } from "@/lib/hooks/admin/useAdminAuth";
 import { toast } from "@/components/ui/use-toast";
diff --git a/client/components/forms/doctor/SigninForm.tsx b/client/components/forms/doctor/SigninForm.tsx
index 1012a630..290ad5fe 100644
--- a/client/components/forms/doctor/SigninForm.tsx
+++ b/client/components/forms/doctor/SigninForm.tsx
@@ -6,7 +6,7 @@ import { z } from "zod";
 import { Form, FormMessage } from "@/components/ui/form";
 import CustomFormField from "@/components/common/CustomFormField";
 import SubmitButton from "@/components/button/SubmitButton";
-import { signinFormSchema } from "@/components/forms/schema/adminSchema";
+import { signinFormSchema } from "@/lib/form-schema/adminSchema";
 import { FormFieldType } from "@/types/enum";
 import Link from "next/link";
 import { useSignInDoctor } from "@/lib/hooks/doctor/useDoctorAuth";
diff --git a/client/components/forms/patient/AppointmentForm.tsx b/client/components/forms/patient/AppointmentForm.tsx
index 9937b3f9..d3895f8c 100644
--- a/client/components/forms/patient/AppointmentForm.tsx
+++ b/client/components/forms/patient/AppointmentForm.tsx
@@ -6,7 +6,7 @@ import { z } from "zod";
 import { Form } from "@/components/ui/form";
 import CustomFormField from "@/components/common/CustomFormField";
 import SubmitButton from "@/components/button/SubmitButton";
-import { appointFormSchema } from "@/components/forms/schema/patientSchema";
+import { appointFormSchema } from "@/lib/form-schema/patientSchema";
 import { SelectItem } from "@/components/ui/select";
 import Image from "next/image";
 import { AppointmentTypes } from "@/constants";
diff --git a/client/components/forms/patient/RegistrationForm.tsx b/client/components/forms/patient/RegistrationForm.tsx
index 3ba043ee..ef852f8b 100644
--- a/client/components/forms/patient/RegistrationForm.tsx
+++ b/client/components/forms/patient/RegistrationForm.tsx
@@ -7,7 +7,7 @@ import { z } from "zod";
 import { Form, FormControl } from "@/components/ui/form";
 import CustomFormField from "@/components/common/CustomFormField";
 import SubmitButton from "@/components/button/SubmitButton";
-import { registerFormSchema } from "@/components/forms/schema/patientSchema";
+import { registerFormSchema } from "@/lib/form-schema/patientSchema";
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 import { Label } from "@radix-ui/react-label";
 import { BloodGroups, GenderOptions } from "@/constants";
diff --git a/client/components/forms/patient/SigninForm.tsx b/client/components/forms/patient/SigninForm.tsx
index 0f5ca401..f3c062f8 100644
--- a/client/components/forms/patient/SigninForm.tsx
+++ b/client/components/forms/patient/SigninForm.tsx
@@ -7,7 +7,7 @@ import { z } from "zod";
 import { Form } from "@/components/ui/form";
 import CustomFormField from "@/components/common/CustomFormField";
 import SubmitButton from "@/components/button/SubmitButton";
-import { signinFormSchema } from "@/components/forms/schema/patientSchema";
+import { signinFormSchema } from "@/lib/form-schema/patientSchema";
 import Link from "next/link";
 import { FormFieldType } from "@/types/enum";
 import { useToast } from "@/components/ui/use-toast";
diff --git a/client/components/forms/patient/SignupForm.tsx b/client/components/forms/patient/SignupForm.tsx
index e87ff820..8bd2c637 100644
--- a/client/components/forms/patient/SignupForm.tsx
+++ b/client/components/forms/patient/SignupForm.tsx
@@ -7,7 +7,7 @@ import { z } from "zod";
 import { Form } from "@/components/ui/form";
 import CustomFormField from "@/components/common/CustomFormField";
 import SubmitButton from "@/components/button/SubmitButton";
-import { signupFormSchema } from "@/components/forms/schema/patientSchema";
+import { signupFormSchema } from "@/lib/form-schema/patientSchema";
 import { FormFieldType } from "@/types/enum";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
diff --git a/client/components/models/doctor/PrescriptionModel.tsx b/client/components/models/doctor/PrescriptionModel.tsx
index d5a48dae..a25bb707 100644
--- a/client/components/models/doctor/PrescriptionModel.tsx
+++ b/client/components/models/doctor/PrescriptionModel.tsx
@@ -14,7 +14,7 @@ import { FormFieldType } from "@/types/enum"
 import { PlusIcon } from "lucide-react"
 import CustomFormField from "@/components/common/CustomFormField"
 import { ScrollArea } from "@/components/ui/scroll-area"
-import { prescriptionSchema } from "@/components/forms/schema/doctorSchema"
+import { prescriptionSchema } from "@/lib/form-schema/doctorSchema"
 import SubmitButton from "@/components/button/SubmitButton"
 import { useCreatePrescription } from "@/lib/hooks/prescription/usePrescription"
 import { toast } from "@/components/ui/use-toast"
diff --git a/client/components/models/patient/UpdateProfilePatient.tsx b/client/components/models/patient/UpdateProfilePatient.tsx
index 5a6084cf..b352d31c 100644
--- a/client/components/models/patient/UpdateProfilePatient.tsx
+++ b/client/components/models/patient/UpdateProfilePatient.tsx
@@ -5,7 +5,7 @@ import { AlertDialog, AlertDialogContent, AlertDialogHeader, AlertDialogTitle }
 import { Form, FormControl } from "../../ui/form";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
-import { updateProfileFormSchema } from "@/components/forms/schema/patientSchema";
+import { updateProfileFormSchema } from "@/lib/form-schema/patientSchema";
 import { zodResolver } from "@hookform/resolvers/zod";
 import SubmitButton from "../../button/SubmitButton";
 import { IPatient } from "@/types/entities";
diff --git a/client/components/forms/schema/adminSchema.ts b/client/lib/form-schema/adminSchema.ts
similarity index 100%
rename from client/components/forms/schema/adminSchema.ts
rename to client/lib/form-schema/adminSchema.ts
diff --git a/client/components/forms/schema/doctorSchema.ts b/client/lib/form-schema/doctorSchema.ts
similarity index 100%
rename from client/components/forms/schema/doctorSchema.ts
rename to client/lib/form-schema/doctorSchema.ts
diff --git a/client/components/forms/schema/patientSchema.ts b/client/lib/form-schema/patientSchema.ts
similarity index 100%
rename from client/components/forms/schema/patientSchema.ts
rename to client/lib/form-schema/patientSchema.ts