diff --git a/app/src/main/java/com/example/hpos/data/model/Address.kt b/app/src/main/java/com/example/hpos/data/model/Address.kt
deleted file mode 100644
index 7d2415a..0000000
--- a/app/src/main/java/com/example/hpos/data/model/Address.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.example.hpos.data.model
-
-data class Address(
-    val house: String?,
-    val street: String?,
-    val location: String?,
-    val landMark: String?,
-    val postOffice: String?,
-    val district: String,
-    val subDistrict: String,
-    val state: String,
-    val vtc: String?,
-    val pinCode: Int,
-)
diff --git a/app/src/main/java/com/example/hpos/data/model/BloodGroup.kt b/app/src/main/java/com/example/hpos/data/model/BloodGroup.kt
deleted file mode 100644
index 9ca04d9..0000000
--- a/app/src/main/java/com/example/hpos/data/model/BloodGroup.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.example.hpos.data.model
-
-enum class BloodGroup {
-    O_POSITIVE, O_NEGATIVE,
-    A_POSITIVE, A_NEGATIVE,
-    B_POSITIVE, B_NEGATIVE,
-    AB_POSITIVE, AB_NEGATIVE,
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpos/data/model/Gender.kt b/app/src/main/java/com/example/hpos/data/model/Gender.kt
deleted file mode 100644
index 47466cf..0000000
--- a/app/src/main/java/com/example/hpos/data/model/Gender.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.example.hpos.data.model
-
-enum class Gender {
-    MALE,
-    FEMALE,
-    OTHER
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpos/data/model/PatientAadhaarData.kt b/app/src/main/java/com/example/hpos/data/model/PatientAadhaarData.kt
index e19fcfe..6162d05 100644
--- a/app/src/main/java/com/example/hpos/data/model/PatientAadhaarData.kt
+++ b/app/src/main/java/com/example/hpos/data/model/PatientAadhaarData.kt
@@ -12,4 +12,30 @@ data class PatientAadhaarData(
 
     val isMarried: Boolean?,
     val bloodGroup: BloodGroup?,
-)
+) {
+    enum class Gender {
+        MALE,
+        FEMALE,
+        OTHER
+    }
+
+    enum class BloodGroup {
+        O_POSITIVE, O_NEGATIVE,
+        A_POSITIVE, A_NEGATIVE,
+        B_POSITIVE, B_NEGATIVE,
+        AB_POSITIVE, AB_NEGATIVE,
+    }
+
+    data class Address(
+        val house: String?,
+        val street: String?,
+        val location: String?,
+        val landMark: String?,
+        val postOffice: String?,
+        val district: String,
+        val subDistrict: String,
+        val state: String,
+        val vtc: String?,
+        val pinCode: Int,
+    )
+}