From 7c4c8678539a2577e5f5fb41bea64803186acb11 Mon Sep 17 00:00:00 2001
From: mib-iqbal <mib.iqbaal@gmail.com>
Date: Wed, 8 Nov 2017 10:12:26 +0800
Subject: [PATCH] MI | refactoring package and class #6

Signed-off-by: mib-iqbal <mib.iqbaal@gmail.com>
---
 opensrp-gizi/build.gradle                     |    2 +-
 opensrp-gizi/src/main/AndroidManifest.xml     |   14 +-
 .../www/form/kartu_ibu_registration/form.json | 1117 +++++++++++++++++
 .../www/form/kartu_ibu_registration/form.xml  |  467 +++++++
 .../form_definition.json                      |  193 +++
 .../www/form/kartu_ibu_registration/model.xml |   63 +
 .../GiziDetailActivity.java                   |    2 +-
 .../GiziGrowthChartActivity.java              |    2 +-
 .../gizi/{ => activity}/GiziHomeActivity.java |    8 +-
 .../GiziSmartRegisterActivity.java            |    4 +-
 .../GiziZScoreChartActivity.java              |    2 +-
 .../gizi/{ => activity}/LoginActivity.java    |    3 +-
 .../gizi/{ => activity}/SettingsActivity.java |    3 +-
 .../gizi/application/GiziApplication.java     |    4 +-
 .../GiziNavigationController.java             |    5 +-
 .../fragment/GiziSmartRegisterFragment.java   |   14 +-
 .../{child => libs}/ErrorReportingFacade.java |    2 +-
 .../gizi/{child => libs}/FlurryFacade.java    |    2 +-
 .../CommonObjectFilterOption.java             |    2 +-
 .../{child => option}/GiziSearchOption.java   |    2 +-
 .../GiziServiceModeOption.java                |    2 +-
 .../KICommonObjectFilterOption.java           |    2 +-
 .../GiziSmartClientsProvider.java             |    2 +-
 .../gizi/{child => utils}/GiziDateSort.java   |    2 +-
 .../gizi/{child => utils}/KmsHandler.java     |    2 +-
 .../src/main/res/xml/captured_images_path.xml |    4 +
 opensrp-gizi/src/main/res/xml/preferences.xml |   15 +
 27 files changed, 1902 insertions(+), 38 deletions(-)
 create mode 100644 opensrp-gizi/src/main/assets/www/form/kartu_ibu_registration/form.json
 create mode 100644 opensrp-gizi/src/main/assets/www/form/kartu_ibu_registration/form.xml
 create mode 100644 opensrp-gizi/src/main/assets/www/form/kartu_ibu_registration/form_definition.json
 create mode 100644 opensrp-gizi/src/main/assets/www/form/kartu_ibu_registration/model.xml
 rename opensrp-gizi/src/main/java/org/smartregister/gizi/{child => activity}/GiziDetailActivity.java (99%)
 rename opensrp-gizi/src/main/java/org/smartregister/gizi/{child => activity}/GiziGrowthChartActivity.java (99%)
 rename opensrp-gizi/src/main/java/org/smartregister/gizi/{ => activity}/GiziHomeActivity.java (98%)
 rename opensrp-gizi/src/main/java/org/smartregister/gizi/{child => activity}/GiziSmartRegisterActivity.java (99%)
 rename opensrp-gizi/src/main/java/org/smartregister/gizi/{child => activity}/GiziZScoreChartActivity.java (99%)
 rename opensrp-gizi/src/main/java/org/smartregister/gizi/{ => activity}/LoginActivity.java (99%)
 rename opensrp-gizi/src/main/java/org/smartregister/gizi/{ => activity}/SettingsActivity.java (97%)
 rename opensrp-gizi/src/main/java/org/smartregister/gizi/{ => controller}/GiziNavigationController.java (94%)
 rename opensrp-gizi/src/main/java/org/smartregister/gizi/{child => libs}/ErrorReportingFacade.java (90%)
 rename opensrp-gizi/src/main/java/org/smartregister/gizi/{child => libs}/FlurryFacade.java (96%)
 rename opensrp-gizi/src/main/java/org/smartregister/gizi/{child => option}/CommonObjectFilterOption.java (97%)
 rename opensrp-gizi/src/main/java/org/smartregister/gizi/{child => option}/GiziSearchOption.java (98%)
 rename opensrp-gizi/src/main/java/org/smartregister/gizi/{child => option}/GiziServiceModeOption.java (98%)
 rename opensrp-gizi/src/main/java/org/smartregister/gizi/{child => option}/KICommonObjectFilterOption.java (95%)
 rename opensrp-gizi/src/main/java/org/smartregister/gizi/{child => provider}/GiziSmartClientsProvider.java (99%)
 rename opensrp-gizi/src/main/java/org/smartregister/gizi/{child => utils}/GiziDateSort.java (98%)
 rename opensrp-gizi/src/main/java/org/smartregister/gizi/{child => utils}/KmsHandler.java (99%)
 create mode 100644 opensrp-gizi/src/main/res/xml/captured_images_path.xml
 create mode 100644 opensrp-gizi/src/main/res/xml/preferences.xml

diff --git a/opensrp-gizi/build.gradle b/opensrp-gizi/build.gradle
index 310ea13..50a9b66 100644
--- a/opensrp-gizi/build.gradle
+++ b/opensrp-gizi/build.gradle
@@ -33,7 +33,7 @@ android {
         multiDexEnabled true
         buildConfigField "long", "MAX_SERVER_TIME_DIFFERENCE", "1800000l"
         buildConfigField "boolean", "TIME_CHECK", "false"
-        resValue "string", 'opensrp_url', '"http://46.101.51.199:8181/opensrp"'
+        resValue "string", 'opensrp_url', '"http://192.168.1.253:8080/opensrp"'
     }
 
     dexOptions {
diff --git a/opensrp-gizi/src/main/AndroidManifest.xml b/opensrp-gizi/src/main/AndroidManifest.xml
index 5f474a6..0c05afa 100644
--- a/opensrp-gizi/src/main/AndroidManifest.xml
+++ b/opensrp-gizi/src/main/AndroidManifest.xml
@@ -20,7 +20,7 @@
             android:value="b74c58c94d8965151212e8ecf1f4fdfbf5b7f4e4" />
 
         <activity
-            android:name=".LoginActivity"
+            android:name=".activity.LoginActivity"
             android:theme="@android:style/Theme.Holo"
             android:windowSoftInputMode="adjustResize|stateHidden"
             android:screenOrientation="landscape"
@@ -31,25 +31,25 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".GiziHomeActivity"
+        <activity android:name=".activity.GiziHomeActivity"
             android:theme="@style/AppTheme"
             android:screenOrientation="landscape"/>
-        <activity android:name=".child.GiziSmartRegisterActivity"
+        <activity android:name=".activity.GiziSmartRegisterActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@style/AppThemeNoActionBarAndTitle"
             android:windowSoftInputMode="adjustResize"
             android:screenOrientation="landscape"/>
-        <activity android:name=".child.GiziDetailActivity"
+        <activity android:name=".activity.GiziDetailActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@style/AppThemeNoActionBarAndTitle"
             android:windowSoftInputMode="adjustResize"
             android:screenOrientation="landscape"/>
-        <activity android:name=".child.GiziGrowthChartActivity"
+        <activity android:name=".activity.GiziGrowthChartActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@style/AppThemeNoActionBarAndTitle"
             android:windowSoftInputMode="adjustResize"
             android:screenOrientation="landscape"/>
-        <activity android:name=".child.GiziZScoreChartActivity"
+        <activity android:name=".activity.GiziZScoreChartActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@style/AppThemeNoActionBarAndTitle"
             android:windowSoftInputMode="adjustResize"
@@ -60,7 +60,7 @@
             android:windowSoftInputMode="adjustResize"
             android:screenOrientation="landscape"/>
 -->
-        <activity android:name=".SettingsActivity" android:label="@string/action_settings"/>
+        <activity android:name=".activity.SettingsActivity" android:label="@string/action_settings"/>
       <!--  <activity android:name=".face.camera.SmartShutterActivity" android:noHistory="true" />
         <activity android:name=".face.camera.ImageConfirmation" android:noHistory="true" />
 
diff --git a/opensrp-gizi/src/main/assets/www/form/kartu_ibu_registration/form.json b/opensrp-gizi/src/main/assets/www/form/kartu_ibu_registration/form.json
new file mode 100644
index 0000000..b961175
--- /dev/null
+++ b/opensrp-gizi/src/main/assets/www/form/kartu_ibu_registration/form.json
@@ -0,0 +1,1117 @@
+{
+  "name": "Kartu_ibu",
+  "title": "Identitas Ibu",
+  "sms_keyword": "Kartu_ibu",
+  "default_language": "Bahasa",
+  "instance": {
+    "encounter_type": "Identitas Ibu"
+  },
+  "version": "201702121028",
+  "id_string": "Kartu_ibu",
+  "type": "survey",
+  "children": [
+    {
+      "instance": {
+        "openmrs_entity_id": "encounter_start",
+        "openmrs_entity": "encounter"
+      },
+      "type": "start",
+      "name": "start"
+    },
+    {
+      "instance": {
+        "openmrs_entity_id": "encounter_date",
+        "openmrs_entity": "encounter"
+      },
+      "type": "today",
+      "name": "today"
+    },
+    {
+      "type": "deviceid",
+      "name": "deviceid"
+    },
+    {
+      "type": "simserial",
+      "name": "simserial"
+    },
+    {
+      "type": "phonenumber",
+      "name": "phonenumber"
+    },
+    {
+      "type": "hidden",
+      "name": "Province"
+    },
+    {
+      "type": "hidden",
+      "name": "District",
+      "hint": {
+        "Bahasa": "Inject from app"
+      }
+    },
+    {
+      "type": "hidden",
+      "name": "Sub-district",
+      "hint": {
+        "Bahasa": "Inject from app"
+      }
+    },
+    {
+      "type": "hidden",
+      "name": "Village",
+      "hint": {
+        "Bahasa": "Inject from app"
+      }
+    },
+    {
+      "type": "hidden",
+      "name": "Sub-village",
+      "hint": {
+        "Bahasa": "Inject from app"
+      }
+    },
+    {
+      "type": "note",
+      "name": "generated_note_name_13",
+      "label": {
+        "Bahasa": "Desa : ${Village}"
+      }
+    },
+    {
+      "type": "note",
+      "name": "generated_note_name_14",
+      "label": {
+        "Bahasa": "Dusun : ${Sub-village}"
+      }
+    },
+    {
+      "bind": {
+        "calculate": "${Village}"
+      },
+      "type": "hidden",
+      "name": "existing_location",
+      "instance": {
+        "openmrs_entity_id": "location_id",
+        "openmrs_entity": "encounter"
+      }
+    },
+    {
+      "bind": {
+        "calculate": "${Province}"
+      },
+      "type": "calculate",
+      "name": "provinsi",
+      "instance": {
+        "openmrs_entity_parent": "usual_residence",
+        "openmrs_entity_id": "stateProvince",
+        "openmrs_entity": "person_address"
+      }
+    },
+    {
+      "bind": {
+        "calculate": "${District}"
+      },
+      "type": "calculate",
+      "name": "kabupaten",
+      "instance": {
+        "openmrs_entity_parent": "usual_residence",
+        "openmrs_entity_id": "countyDistrict",
+        "openmrs_entity": "person_address"
+      }
+    },
+    {
+      "bind": {
+        "calculate": "${Village}"
+      },
+      "type": "calculate",
+      "name": "desa",
+      "instance": {
+        "openmrs_entity_parent": "usual_residence",
+        "openmrs_entity_id": "cityVillage",
+        "openmrs_entity": "person_address"
+      }
+    },
+    {
+      "bind": {
+        "calculate": "${Sub-village}"
+      },
+      "type": "calculate",
+      "name": "dusun",
+      "instance": {
+        "openmrs_entity_parent": "usual_residence",
+        "openmrs_entity_id": "address1",
+        "openmrs_entity": "person_address"
+      }
+    },
+    {
+      "bind": {
+        "calculate": "${Sub-district}"
+      },
+      "type": "calculate",
+      "name": "kecamatan",
+      "instance": {
+        "openmrs_entity_parent": "usual_residence",
+        "openmrs_entity_id": "address2",
+        "openmrs_entity": "person_address"
+      }
+    },
+    {
+      "name": "pasien_wilayah",
+      "bind": {
+        "required": "yes"
+      },
+      "label": {
+        "Bahasa": "Apakah ibu adalah pasien wilayah Anda?",
+        "English": "Is the mother living in your catchment area?"
+      },
+      "instance": {
+        "openmrs_entity_id": "160637AAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity": "concept"
+      },
+      "type": "select one",
+      "children": [
+        {
+          "instance": {
+            "openmrs_code": "160635AAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "pasien_wilayah_desa",
+          "label": {
+            "Bahasa": "Ya",
+            "English": "Yes"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "160636AAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "pasien_luar_wilayah",
+          "label": {
+            "Bahasa": "Tidak",
+            "English": "No"
+          }
+        }
+      ]
+    },
+    {
+      "name": "pasien_pindahan",
+      "bind": {
+        "required": "yes"
+      },
+      "label": {
+        "Bahasa": "Apakah ibu adalah warga pindahan dari desa lain?",
+        "English": "Is the mother moving in to this village?"
+      },
+      "instance": {
+        "openmrs_entity_id": "160563AAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity": "concept"
+      },
+      "type": "select one",
+      "children": [
+        {
+          "instance": {
+            "openmrs_code": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Yes",
+          "label": {
+            "Bahasa": "Ya",
+            "English": "Yes"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "No",
+          "label": {
+            "Bahasa": "Tidak",
+            "English": "No"
+          }
+        }
+      ]
+    },
+    {
+      "name": "tgl_pindah",
+      "hint": {
+        "Bahasa": "Tuliskan tanggal ibu pindah ke desa ini",
+        "English": "Write the date when the mother moved into this village"
+      },
+      "bind": {
+        "relevant": "${pasien_pindahan}='Yes'",
+        "required": "yes",
+        "constraint": ".<${today}"
+      },
+      "label": {
+        "Bahasa": "Sejak kapan ibu pindah ke sini?",
+        "English": "Since when did she move this village?"
+      },
+      "instance": {
+        "openmrs_entity_id": "160534AAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity": "concept"
+      },
+      "type": "date"
+    },
+    {
+      "bind": {
+        "required": "yes",
+        "constraint": ".<=${today}"
+      },
+      "type": "date",
+      "instance": {
+        "openmrs_entity_id": "160753AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity": "concept"
+      },
+      "name": "tanggal_periksa",
+      "label": {
+        "Bahasa": "Tanggal Registrasi",
+        "English": "Date of Registration"
+      }
+    },
+    {
+      "name": "lokasi_periksa",
+      "bind": {
+        "required": "yes"
+      },
+      "label": {
+        "Bahasa": "Lokasi Periksa",
+        "English": "Location of Service"
+      },
+      "instance": {
+        "openmrs_entity_id": "161010AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity": "concept"
+      },
+      "type": "select one",
+      "children": [
+        {
+          "instance": {
+            "openmrs_code": "163121AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Posyandu",
+          "label": {
+            "Bahasa": "Posyandu",
+            "English": "Village Outreach Post"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "1588AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Polindes",
+          "label": {
+            "Bahasa": "Polindes",
+            "English": "Health Clinic Post"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "1537AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Puskesmas",
+          "label": {
+            "Bahasa": "Puskesmas",
+            "English": "Health Facility"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "1536AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Rumah_Ibu",
+          "label": {
+            "Bahasa": "Rumah Ibu",
+            "English": "Mother House"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "1589AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Rumah_Sakit",
+          "label": {
+            "Bahasa": "Rumah Sakit",
+            "English": "Hospital"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Lainnya",
+          "label": {
+            "Bahasa": "Lainnya",
+            "English": "Other"
+          }
+        }
+      ]
+    },
+    {
+      "name": "lokasi_periksa_other",
+      "hint": {
+        "Bahasa": "Lainnya",
+        "English": "Write other location"
+      },
+      "bind": {
+        "relevant": "${lokasi_periksa}='Lainnya'"
+      },
+      "label": {
+        "Bahasa": "Lainnya",
+        "English": "Other"
+      },
+      "instance": {
+        "openmrs_entity_parent": "161010AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity_id": "160632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity": "concept"
+      },
+      "type": "text"
+    },
+    {
+      "instance": {
+        "openmrs_entity_id": "UniqueId",
+        "openmrs_entity": "person_attribute"
+      },
+      "type": "hidden",
+      "name": "unique_id",
+      "hint": {
+        "Bahasa": "Injected from client app",
+        "English": "Injected from client app"
+      }
+    },
+    {
+      "type": "note",
+      "name": "generated_note_name_32",
+      "label": {
+        "Bahasa": "Unique ID: ${unique_id}",
+        "English": "Unique ID: ${unique_id}"
+      }
+    },
+    {
+      "name": "puskesmas",
+      "hint": {
+        "Bahasa": "Nama puskesmas tempat ibu melakukan pemeriksaan",
+        "English": "Name of primary health center where mother does a check-up"
+      },
+      "bind": {
+        "required": "yes"
+      },
+      "label": {
+        "Bahasa": "Puskesmas",
+        "English": "Primary Health Center (PHC)"
+      },
+      "instance": {
+        "openmrs_entity_id": "162724AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity": "concept"
+      },
+      "type": "text"
+    },
+    {
+      "instance": {
+        "openmrs_entity_id": "NoIbu",
+        "openmrs_entity": "person_attribute"
+      },
+      "type": "integer",
+      "name": "no_ibu",
+      "label": {
+        "Bahasa": "No. Ibu",
+        "English": "Mother's Number"
+      }
+    },
+    {
+      "instance": {
+        "openmrs_entity_id": "nik",
+        "openmrs_entity": "person_attribute"
+      },
+      "type": "integer",
+      "name": "nik",
+      "label": {
+        "Bahasa": "NIK",
+        "English": "National Id Number"
+      }
+    },
+    {
+      "name": "nama_lengkap",
+      "hint": {
+        "Bahasa": "Nama lengkap Ibu",
+        "English": "Mother's full name"
+      },
+      "bind": {
+        "required": "yes"
+      },
+      "label": {
+        "Bahasa": "Nama lengkap",
+        "English": "Full name"
+      },
+      "instance": {
+        "openmrs_entity_id": "first_name",
+        "openmrs_entity": "person"
+      },
+      "type": "text"
+    },
+    {
+      "name": "nama_suami",
+      "hint": {
+        "Bahasa": "Nama lengkap suami",
+        "English": "Husband's full name"
+      },
+      "bind": {
+        "required": "yes"
+      },
+      "label": {
+        "Bahasa": "Nama suami",
+        "English": "Name of husband"
+      },
+      "instance": {
+        "openmrs_entity_id": "last_name",
+        "openmrs_entity": "person"
+      },
+      "type": "text"
+    },
+    {
+      "name": "tanggal_lahir_ibu",
+      "hint": {
+        "Bahasa": "Tanggal lahir Ibu",
+        "English": "Mother's date of birth"
+      },
+      "bind": {
+        "required": "yes"
+      },
+      "label": {
+        "Bahasa": "Tanggal lahir",
+        "English": "DOB"
+      },
+      "instance": {
+        "openmrs_entity_id": "birthdate",
+        "openmrs_entity": "person"
+      },
+      "type": "date"
+    },
+    {
+      "bind": {
+        "calculate": "int((${today} - ${tanggal_lahir_ibu}) div 365.25)"
+      },
+      "type": "calculate",
+      "name": "umur",
+      "instance": {
+        "openmrs_entity_id": "1532AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity": "concept"
+      }
+    },
+    {
+      "type": "note",
+      "name": "generated_note_name_40",
+      "label": {
+        "Bahasa": "Umur: ${umur}",
+        "English": "Age"
+      }
+    },
+    {
+      "instance": {
+        "openmrs_entity_parent": "usual_residence",
+        "openmrs_entity_id": "address3",
+        "openmrs_entity": "person_address"
+      },
+      "label": {
+        "Bahasa": "Alamat domisili",
+        "English": "Address"
+      },
+      "type": "text",
+      "name": "alamat_domisili",
+      "hint": {
+        "Bahasa": "Alamat tempat tinggal (rumah) Ibu",
+        "English": "Mother's address"
+      }
+    },
+    {
+      "control": {
+        "appearance": "minimal"
+      },
+      "name": "pendidikan",
+      "hint": {
+        "Bahasa": "Pendidikan Terakhir Ibu",
+        "English": "Mother's highest education"
+      },
+      "label": {
+        "Bahasa": "Pendidikan",
+        "English": "Education"
+      },
+      "instance": {
+        "openmrs_entity_id": "1712AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity": "concept"
+      },
+      "type": "select one",
+      "children": [
+        {
+          "instance": {
+            "openmrs_code": "1713AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Sekolah_Dasar",
+          "label": {
+            "Bahasa": "Sekolah Dasar (SD)",
+            "English": "Primary School"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "163122AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Sekolah_Menengah_Pertama",
+          "label": {
+            "Bahasa": "Sekolah Menengah Pertama (SMP)",
+            "English": "Junior High School"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "163123AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Sekolah_Menengah_Atas",
+          "label": {
+            "Bahasa": "Sekolah Menengah Atas (SMA)",
+            "English": "Senior High School"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "159785AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Perguruan_Tinggi",
+          "label": {
+            "Bahasa": "Perguruan Tinggi",
+            "English": "College/University"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "160294AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Tidak_sekolah",
+          "label": {
+            "Bahasa": "Tidak sekolah",
+            "English": "No Formal Education"
+          }
+        }
+      ]
+    },
+    {
+      "control": {
+        "appearance": "minimal"
+      },
+      "name": "agama",
+      "hint": {
+        "Bahasa": "Agama Ibu",
+        "English": "Mother's religion"
+      },
+      "label": {
+        "Bahasa": "Agama",
+        "English": "Religion"
+      },
+      "instance": {
+        "openmrs_entity_id": "162929AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity": "concept"
+      },
+      "type": "select one",
+      "children": [
+        {
+          "instance": {
+            "openmrs_code": "162933AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Islam",
+          "label": {
+            "Bahasa": "Islam",
+            "English": "Islam (I)"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "163124AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Hindu",
+          "label": {
+            "Bahasa": "Hindu",
+            "English": "Hinduism (H);"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "163125AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Kristen",
+          "label": {
+            "Bahasa": "Kristen",
+            "English": "Christianity (K)"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "162931AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Katolik",
+          "label": {
+            "Bahasa": "Katolik",
+            "English": "Catholic"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "163098AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Budha",
+          "label": {
+            "Bahasa": "Budha",
+            "English": "Buddhism (B)"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Lainnya",
+          "label": {
+            "Bahasa": "Lainnya",
+            "English": "Other"
+          }
+        }
+      ]
+    },
+    {
+      "control": {
+        "appearance": "minimal"
+      },
+      "name": "pekerjaan",
+      "hint": {
+        "Bahasa": "Pekerjaan Ibu",
+        "English": "Mother's occupation"
+      },
+      "default": "Ibu rumah tangga",
+      "label": {
+        "Bahasa": "Pekerjaan",
+        "English": "Occupation"
+      },
+      "instance": {
+        "openmrs_entity_id": "1542AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity": "concept"
+      },
+      "type": "select one",
+      "children": [
+        {
+          "instance": {
+            "openmrs_code": "159464AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Ibu_Rumah_Tangga",
+          "label": {
+            "Bahasa": "Ibu rumah tangga",
+            "English": "Housewife"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "1538AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Petani",
+          "label": {
+            "Bahasa": "Petani",
+            "English": "Farmer"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "159674AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Nelayan",
+          "label": {
+            "Bahasa": "Nelayan",
+            "English": "Fisherman"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "1539AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Pedagang",
+          "label": {
+            "Bahasa": "Pedagang",
+            "English": "Merchant"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "162944AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "PNS",
+          "label": {
+            "Bahasa": "PNS",
+            "English": "Civil Servant"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "163127AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Swasta",
+          "label": {
+            "Bahasa": "Swasta",
+            "English": "Private Employee"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Lainnya",
+          "label": {
+            "Bahasa": "Lainnya",
+            "English": "Other"
+          }
+        }
+      ]
+    },
+    {
+      "name": "pekerjaan_other",
+      "hint": {
+        "Bahasa": "Lainya",
+        "English": "Write other location"
+      },
+      "bind": {
+        "relevant": "${pekerjaan}='Lainnya'"
+      },
+      "label": {
+        "Bahasa": "Lainnya",
+        "English": "Other"
+      },
+      "instance": {
+        "openmrs_entity_parent": "1542AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity_id": "160632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity": "concept"
+      },
+      "type": "text"
+    },
+    {
+      "name": "gakin_tidak",
+      "hint": {
+        "Bahasa": "Apakah Ibu termasuk keluarga miskin atau tidak",
+        "English": "Does mother belong to poor family or not? (Low-Income Population / Financially poor)"
+      },
+      "label": {
+        "Bahasa": "Gakin/ Tidak",
+        "English": "Poor Family/not"
+      },
+      "instance": {
+        "openmrs_entity_id": "162956AAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity": "concept"
+      },
+      "type": "select one",
+      "children": [
+        {
+          "instance": {
+            "openmrs_code": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Yes",
+          "label": {
+            "Bahasa": "Ya",
+            "English": "Yes"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "No",
+          "label": {
+            "Bahasa": "Tidak",
+            "English": "No"
+          }
+        }
+      ]
+    },
+    {
+      "name": "posyandu",
+      "hint": {
+        "Bahasa": "Nama Posyandu tempat Ibu menerima pelayanan kesehatan",
+        "English": "Name of Health Post where mother receives health care"
+      },
+      "bind": {
+        "required": "yes"
+      },
+      "label": {
+        "Bahasa": "Posyandu",
+        "English": "Name of Outreach Post"
+      },
+      "instance": {
+        "openmrs_entity_id": "162724AAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity": "concept"
+      },
+      "type": "text"
+    },
+    {
+      "instance": {
+        "openmrs_entity_id": "Nama Kader",
+        "openmrs_entity": "person_identifier"
+      },
+      "label": {
+        "Bahasa": "Nama Kader",
+        "English": "Name of Community Volunteer"
+      },
+      "type": "text",
+      "name": "nama_kader",
+      "hint": {
+        "Bahasa": "Nama kader Posyandu yang memberi Ibu pelayanan kesehatan",
+        "English": "Name of community health worker that gives health service"
+      }
+    },
+    {
+      "instance": {
+        "openmrs_entity_id": "Nama Dukun",
+        "openmrs_entity": "person_identifier"
+      },
+      "label": {
+        "Bahasa": "Nama Dukun",
+        "English": "Name of Traditional Birth Attendant"
+      },
+      "type": "text",
+      "name": "nama_dukun",
+      "hint": {
+        "Bahasa": "Nama dukun yang menemani Ibu pada saat menerima pelayanan kesehatan",
+        "English": "Name of traditional birth attendant that accompany mother during health care service"
+      }
+    },
+    {
+      "control": {
+        "appearance": "minimal"
+      },
+      "name": "asuransi_jiwa",
+      "hint": {
+        "Bahasa": "Jenis asuransi yang dimiliki Ibu",
+        "English": "Type insurance that mother has"
+      },
+      "label": {
+        "Bahasa": "Asuransi Jiwa",
+        "English": "Insurance"
+      },
+      "instance": {
+        "openmrs_entity_id": "159356AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity": "concept"
+      },
+      "type": "select one",
+      "children": [
+        {
+          "instance": {
+            "openmrs_code": "1917AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Jaminan_Kesehatan_Masyarakat",
+          "label": {
+            "Bahasa": "Jaminan Kesehatan Masyarakat (Jamkesmas)",
+            "English": "National Health Insurance for the Poor"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "163128AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Jamsostek",
+          "label": {
+            "Bahasa": "Jaminan Sosial dan Ketenagakerjaan (Jamsostek)",
+            "English": "Social Insurance for Private Sector Workers"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "163129AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Jaminan_Kesehatan_Daerah",
+          "label": {
+            "Bahasa": "Jaminan Kesehatan Daerah (Jamkesda)",
+            "English": "Regional Health Insurance for the Poor"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "163130AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Asuransi_Kesehatan",
+          "label": {
+            "Bahasa": "Asuransi Kesehatan (Askes)",
+            "English": "Health Insurance for Civil Servants and Retired Armed Forces Personnel"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "163131AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Jaminan_Persalinan",
+          "label": {
+            "Bahasa": "Jaminan Persalinan (Jampersal)",
+            "English": "Health Insurance for Pregnant Women and Newborns"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "1107AAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "Tidak_Ada_Asuransi",
+          "label": {
+            "Bahasa": "Tidak memiliki asuransi/pembiayaan",
+            "English": "No Insurance"
+          }
+        }
+      ]
+    },
+    {
+      "control": {
+        "appearance": "minimal"
+      },
+      "name": "golongan_darah",
+      "hint": {
+        "Bahasa": "Menunjukan golongan darah Ibu",
+        "English": "Mother's blood type"
+      },
+      "bind": {
+        "required": "yes"
+      },
+      "label": {
+        "Bahasa": "Golongan Darah",
+        "English": "Blood Type"
+      },
+      "instance": {
+        "openmrs_entity_id": "300AAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity": "concept"
+      },
+      "type": "select one",
+      "children": [
+        {
+          "instance": {
+            "openmrs_code": "163115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "A",
+          "label": {
+            "Bahasa": "A",
+            "English": "A"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "163116AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "B",
+          "label": {
+            "Bahasa": "B",
+            "English": "B"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "163117AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "AB",
+          "label": {
+            "Bahasa": "AB",
+            "English": "AB"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "163118AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "O",
+          "label": {
+            "Bahasa": "O",
+            "English": "O"
+          }
+        },
+        {
+          "instance": {
+            "openmrs_code": "1067AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          "name": "NA",
+          "label": {
+            "Bahasa": "Belum diketahui",
+            "English": "Unknown"
+          }
+        }
+      ]
+    },
+    {
+      "name": "nomor_telpon_hp",
+      "hint": {
+        "Bahasa": "Nomor telpon/Hp yang dimiliki oleh Ibu atau No telpon Keluarga",
+        "English": "Mother's contact number"
+      },
+      "bind": {
+        "jr:constraintMsg": {
+          "Bahasa": "Nomer teelpon tidak boleh lebih dari 12 digit",
+          "English": "Contact number should be no more than 12 digits"
+        },
+        "constraint": ".>0 and .<100000000000"
+      },
+      "label": {
+        "Bahasa": "Nomor Telpon/Hp",
+        "English": "Landline/Cell Phone Number"
+      },
+      "instance": {
+        "openmrs_entity_id": "159635AAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity": "concept"
+      },
+      "type": "text"
+    },
+    {
+      "default": "0",
+      "instance": {
+        "openmrs_entity_id": "374AAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity": "concept"
+      },
+      "type": "hidden",
+      "name": "jenis_kontrasepsi"
+    },
+    {
+      "bind": {
+        "calculate": "if(${umur} <20, 'yes','no')"
+      },
+      "type": "calculate",
+      "name": "high_risk_pregnancy_young_maternal_age",
+      "instance": {
+        "openmrs_entity_id": "163119AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity": "concept"
+      }
+    },
+    {
+      "bind": {
+        "calculate": "if(${umur} >35, 'yes','no')"
+      },
+      "type": "calculate",
+      "name": "high_risk_pregnancy_old_maternal_age",
+      "instance": {
+        "openmrs_entity_id": "163120AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_entity": "concept"
+      }
+    },
+    {
+      "bind": {
+        "calculate": "${today}"
+      },
+      "type": "calculate",
+      "name": "reg_date"
+    },
+    {
+      "instance": {
+        "openmrs_entity_id": "encounter_end",
+        "openmrs_entity": "encounter"
+      },
+      "type": "end",
+      "name": "end"
+    },
+    {
+      "control": {
+        "bodyless": true
+      },
+      "type": "group",
+      "children": [
+        {
+          "bind": {
+            "readonly": "true()",
+            "calculate": "concat('uuid:', uuid())"
+          },
+          "type": "calculate",
+          "name": "instanceID"
+        }
+      ],
+      "name": "meta"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/opensrp-gizi/src/main/assets/www/form/kartu_ibu_registration/form.xml b/opensrp-gizi/src/main/assets/www/form/kartu_ibu_registration/form.xml
new file mode 100644
index 0000000..a8f7f42
--- /dev/null
+++ b/opensrp-gizi/src/main/assets/www/form/kartu_ibu_registration/form.xml
@@ -0,0 +1,467 @@
+<form autocomplete="off" novalidate="novalidate" class="or clearfix" dir="ltr" id="Kartu_ibu">
+    <!--This form was created by transforming a OpenRosa-flavored (X)Form using an XSL stylesheet created by Enketo LLC.-->
+    <section class="form-logo"></section>
+    <h3 dir="auto" id="form-title">Identitas Ibu</h3>
+    <select id="form-languages" data-default-lang="Bahasa">
+        <option value="Bahasa" data-dir="ltr">Bahasa</option>
+        <option value="en" data-dir="ltr">English</option>
+    </select>
+    <label class="question note non-select ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/generated_note_name_13:label">Desa :
+            <span class="or-output" data-value=" /Kartu_ibu/Village "></span>
+        </span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/generated_note_name_13:label">-</span>
+        <input type="text" name="/Kartu_ibu/generated_note_name_13" data-type-xml="string" readonly="readonly"/>
+    </label>
+    <label class="question note non-select ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/generated_note_name_14:label">Dusun :
+            <span class="or-output" data-value=" /Kartu_ibu/Sub-village "></span>
+        </span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/generated_note_name_14:label">-</span>
+        <input type="text" name="/Kartu_ibu/generated_note_name_14" data-type-xml="string" readonly="readonly"/>
+    </label>
+    <fieldset class="question simple-select ">
+        <fieldset>
+            <legend>
+                <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/pasien_wilayah:label">Apakah ibu adalah pasien wilayah Anda?</span>
+                <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/pasien_wilayah:label">Is the mother living in your catchment area?</span>
+                <span class="required">*</span>
+            </legend>
+            <div class="option-wrapper">
+                <label class="">
+                    <input type="radio" name="/Kartu_ibu/pasien_wilayah" data-name="/Kartu_ibu/pasien_wilayah" value="pasien_wilayah_desa" required="required" data-type-xml="select1"/>
+                    <span lang="Bahasa" class="option-label active" data-itext-id="/Kartu_ibu/pasien_wilayah/pasien_wilayah_desa:label">Ya</span>
+                    <span lang="en" class="option-label " data-itext-id="/Kartu_ibu/pasien_wilayah/pasien_wilayah_desa:label">Yes</span>
+                </label>
+                <label class="">
+                    <input type="radio" name="/Kartu_ibu/pasien_wilayah" data-name="/Kartu_ibu/pasien_wilayah" value="pasien_luar_wilayah" required="required" data-type-xml="select1"/>
+                    <span lang="Bahasa" class="option-label active" data-itext-id="/Kartu_ibu/pasien_wilayah/pasien_luar_wilayah:label">Tidak</span>
+                    <span lang="en" class="option-label " data-itext-id="/Kartu_ibu/pasien_wilayah/pasien_luar_wilayah:label">No</span>
+                </label>
+            </div>
+        </fieldset>
+        <span class="or-required-msg active" lang="" data-i18n="constraint.required">This field is required</span>
+    </fieldset>
+    <fieldset class="question simple-select ">
+        <fieldset>
+            <legend>
+                <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/pasien_pindahan:label">Apakah ibu adalah warga pindahan dari desa lain?</span>
+                <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/pasien_pindahan:label">Is the mother moving in to this village?</span>
+                <span class="required">*</span>
+            </legend>
+            <div class="option-wrapper">
+                <label class="">
+                    <input type="radio" name="/Kartu_ibu/pasien_pindahan" data-name="/Kartu_ibu/pasien_pindahan" value="Yes" required="required" data-type-xml="select1"/>
+                    <span lang="Bahasa" class="option-label active" data-itext-id="/Kartu_ibu/pasien_pindahan/Yes:label">Ya</span>
+                    <span lang="en" class="option-label " data-itext-id="/Kartu_ibu/pasien_pindahan/Yes:label">Yes</span>
+                </label>
+                <label class="">
+                    <input type="radio" name="/Kartu_ibu/pasien_pindahan" data-name="/Kartu_ibu/pasien_pindahan" value="No" required="required" data-type-xml="select1"/>
+                    <span lang="Bahasa" class="option-label active" data-itext-id="/Kartu_ibu/pasien_pindahan/No:label">Tidak</span>
+                    <span lang="en" class="option-label " data-itext-id="/Kartu_ibu/pasien_pindahan/No:label">No</span>
+                </label>
+            </div>
+        </fieldset>
+        <span class="or-required-msg active" lang="" data-i18n="constraint.required">This field is required</span>
+    </fieldset>
+    <label class="question or-branch pre-init non-select ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/tgl_pindah:label">Sejak kapan ibu pindah ke sini?</span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/tgl_pindah:label">Since when did she move this village?</span>
+        <span class="required">*</span>
+        <span lang="Bahasa" class="or-hint active" data-itext-id="/Kartu_ibu/tgl_pindah:hint">Tuliskan tanggal ibu pindah ke desa ini</span>
+        <span lang="en" class="or-hint " data-itext-id="/Kartu_ibu/tgl_pindah:hint">Write the date when the mother moved into this village</span>
+        <input type="date" name="/Kartu_ibu/tgl_pindah" required="required" data-constraint=".&lt; /Kartu_ibu/today " data-relevant=" /Kartu_ibu/pasien_pindahan ='Yes'" data-type-xml="date"/>
+        <span class="or-constraint-msg active" lang="" data-i18n="constraint.invalid">Value not allowed</span>
+        <span class="or-required-msg active" lang="" data-i18n="constraint.required">This field is required</span>
+    </label>
+    <label class="question non-select ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/tanggal_periksa:label">Tanggal Registrasi</span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/tanggal_periksa:label">Date of Registration</span>
+        <span class="required">*</span>
+        <input type="date" name="/Kartu_ibu/tanggal_periksa" required="required" data-constraint=".&lt;= /Kartu_ibu/today " data-type-xml="date"/>
+        <span class="or-constraint-msg active" lang="" data-i18n="constraint.invalid">Value not allowed</span>
+        <span class="or-required-msg active" lang="" data-i18n="constraint.required">This field is required</span>
+    </label>
+    <fieldset class="question simple-select ">
+        <fieldset>
+            <legend>
+                <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/lokasi_periksa:label">Lokasi Periksa</span>
+                <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/lokasi_periksa:label">Location of Service</span>
+
+            </legend>
+            <div class="option-wrapper">
+                <label class="">
+                    <input type="radio" name="/Kartu_ibu/lokasi_periksa" data-name="/Kartu_ibu/lokasi_periksa" value="Posyandu" required="required" data-type-xml="select1"/>
+                    <span lang="Bahasa" class="option-label active" data-itext-id="/Kartu_ibu/lokasi_periksa/Posyandu:label">Posyandu</span>
+                    <span lang="en" class="option-label " data-itext-id="/Kartu_ibu/lokasi_periksa/Posyandu:label">Village Outreach Post</span>
+                </label>
+                <label class="">
+                    <input type="radio" name="/Kartu_ibu/lokasi_periksa" data-name="/Kartu_ibu/lokasi_periksa" value="Polindes"  data-type-xml="select1"/>
+                    <span lang="Bahasa" class="option-label active" data-itext-id="/Kartu_ibu/lokasi_periksa/Polindes:label">Polindes</span>
+                    <span lang="en" class="option-label " data-itext-id="/Kartu_ibu/lokasi_periksa/Polindes:label">Health Clinic Post</span>
+                </label>
+                <label class="">
+                    <input type="radio" name="/Kartu_ibu/lokasi_periksa" data-name="/Kartu_ibu/lokasi_periksa" value="Puskesmas"  data-type-xml="select1"/>
+                    <span lang="Bahasa" class="option-label active" data-itext-id="/Kartu_ibu/lokasi_periksa/Puskesmas:label">Puskesmas</span>
+                    <span lang="en" class="option-label " data-itext-id="/Kartu_ibu/lokasi_periksa/Puskesmas:label">Health Facility</span>
+                </label>
+                <label class="">
+                    <input type="radio" name="/Kartu_ibu/lokasi_periksa" data-name="/Kartu_ibu/lokasi_periksa" value="Rumah_Ibu"  data-type-xml="select1"/>
+                    <span lang="Bahasa" class="option-label active" data-itext-id="/Kartu_ibu/lokasi_periksa/Rumah_Ibu:label">Rumah Ibu</span>
+                    <span lang="en" class="option-label " data-itext-id="/Kartu_ibu/lokasi_periksa/Rumah_Ibu:label">Mother House</span>
+                </label>
+                <label class="">
+                    <input type="radio" name="/Kartu_ibu/lokasi_periksa" data-name="/Kartu_ibu/lokasi_periksa" value="Rumah_Sakit"  data-type-xml="select1"/>
+                    <span lang="Bahasa" class="option-label active" data-itext-id="/Kartu_ibu/lokasi_periksa/Rumah_Sakit:label">Rumah Sakit</span>
+                    <span lang="en" class="option-label " data-itext-id="/Kartu_ibu/lokasi_periksa/Rumah_Sakit:label">Hospital</span>
+                </label>
+                <label class="">
+                    <input type="radio" name="/Kartu_ibu/lokasi_periksa" data-name="/Kartu_ibu/lokasi_periksa" value="Lainnya"  data-type-xml="select1"/>
+                    <span lang="Bahasa" class="option-label active" data-itext-id="/Kartu_ibu/lokasi_periksa/Lainnya:label">Lainnya</span>
+                    <span lang="en" class="option-label " data-itext-id="/Kartu_ibu/lokasi_periksa/Lainnya:label">Other</span>
+                </label>
+            </div>
+        </fieldset>
+        <span class="or-required-msg active" lang="" data-i18n="constraint.required">This field is required</span>
+    </fieldset>
+    <label class="question or-branch pre-init non-select ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/lokasi_periksa_other:label">Lainnya</span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/lokasi_periksa_other:label">Other</span>
+        <span lang="Bahasa" class="or-hint active" data-itext-id="/Kartu_ibu/lokasi_periksa_other:hint">Lainnya</span>
+        <span lang="en" class="or-hint " data-itext-id="/Kartu_ibu/lokasi_periksa_other:hint">Write other location</span>
+        <input type="text" name="/Kartu_ibu/lokasi_periksa_other" data-relevant=" /Kartu_ibu/lokasi_periksa ='Lainnya'" data-type-xml="string"/>
+    </label>
+    <label class="question note non-select ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/generated_note_name_32:label">Unique ID:
+            <span class="or-output" data-value=" /Kartu_ibu/unique_id "></span>
+        </span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/generated_note_name_32:label">Unique ID:
+            <span class="or-output" data-value=" /Kartu_ibu/unique_id "></span>
+        </span>
+        <input type="text" name="/Kartu_ibu/generated_note_name_32" data-type-xml="string" readonly="readonly"/>
+    </label>
+    <label class="question non-select ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/puskesmas:label">Puskesmas</span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/puskesmas:label">Primary Health Center (PHC)</span>
+        <span class="required">*</span>
+        <span lang="Bahasa" class="or-hint active" data-itext-id="/Kartu_ibu/puskesmas:hint">Nama puskesmas tempat ibu melakukan pemeriksaan</span>
+        <span lang="en" class="or-hint " data-itext-id="/Kartu_ibu/puskesmas:hint">Name of primary health center where mother does a check-up</span>
+        <input type="text" name="/Kartu_ibu/puskesmas" required="required" data-type-xml="string"/>
+        <span class="or-required-msg active" lang="" data-i18n="constraint.required">This field is required</span>
+    </label>
+    <label class="question non-select ">
+        <span class="required">*</span>
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/no_ibu:label">No. Ibu</span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/no_ibu:label">Mother's Number</span>
+        <input type="number" name="/Kartu_ibu/no_ibu" data-type-xml="int"/>
+    </label>
+    <label class="question non-select ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/nik:label">NIK</span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/nik:label">National Id Number</span>
+        <input type="number" name="/Kartu_ibu/nik" data-type-xml="int"/>
+    </label>
+    <label class="question non-select ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/nama_lengkap:label">Nama lengkap</span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/nama_lengkap:label">Full name</span>
+        <span class="required">*</span>
+        <span lang="Bahasa" class="or-hint active" data-itext-id="/Kartu_ibu/nama_lengkap:hint">Nama lengkap Ibu</span>
+        <span lang="en" class="or-hint " data-itext-id="/Kartu_ibu/nama_lengkap:hint">Mother's full name</span>
+        <input type="text" name="/Kartu_ibu/nama_lengkap" required="required" data-type-xml="string"/>
+        <span class="or-required-msg active" lang="" data-i18n="constraint.required">This field is required</span>
+    </label>
+    <label class="question non-select ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/nama_suami:label">Nama suami</span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/nama_suami:label">Name of husband</span>
+        <span class="required">*</span>
+        <span lang="Bahasa" class="or-hint active" data-itext-id="/Kartu_ibu/nama_suami:hint">Nama lengkap suami</span>
+        <span lang="en" class="or-hint " data-itext-id="/Kartu_ibu/nama_suami:hint">Husband's full name</span>
+        <input type="text" name="/Kartu_ibu/nama_suami" required="required" data-type-xml="string"/>
+        <span class="or-required-msg active" lang="" data-i18n="constraint.required">This field is required</span>
+    </label>
+    <label class="question non-select ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/tanggal_lahir_ibu:label">Tanggal lahir</span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/tanggal_lahir_ibu:label">DOB</span>
+        <span class="required">*</span>
+        <span lang="Bahasa" class="or-hint active" data-itext-id="/Kartu_ibu/tanggal_lahir_ibu:hint">Tanggal lahir Ibu</span>
+        <span lang="en" class="or-hint " data-itext-id="/Kartu_ibu/tanggal_lahir_ibu:hint">Mother's date of birth</span>
+        <input type="date" name="/Kartu_ibu/tanggal_lahir_ibu" required="required" data-type-xml="date"/>
+        <span class="or-required-msg active" lang="" data-i18n="constraint.required">This field is required</span>
+    </label>
+    <label class="question note non-select ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/generated_note_name_40:label">Umur:
+            <span class="or-output" data-value=" /Kartu_ibu/umur "></span>
+        </span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/generated_note_name_40:label">Age</span>
+        <input type="text" name="/Kartu_ibu/generated_note_name_40" data-type-xml="string" readonly="readonly"/>
+    </label>
+    <label class="question non-select ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/alamat_domisili:label">Alamat domisili</span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/alamat_domisili:label">Address</span>
+        <span lang="Bahasa" class="or-hint active" data-itext-id="/Kartu_ibu/alamat_domisili:hint">Alamat tempat tinggal (rumah) Ibu</span>
+        <span lang="en" class="or-hint " data-itext-id="/Kartu_ibu/alamat_domisili:hint">Mother's address</span>
+        <input type="text" name="/Kartu_ibu/alamat_domisili" data-type-xml="string"/>
+    </label>
+    <label class="question or-appearance-minimal ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/pendidikan:label">Pendidikan</span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/pendidikan:label">Education</span>
+        <span lang="Bahasa" class="or-hint active" data-itext-id="/Kartu_ibu/pendidikan:hint">Pendidikan Terakhir Ibu</span>
+        <span lang="en" class="or-hint " data-itext-id="/Kartu_ibu/pendidikan:hint">Mother's highest education</span>
+        <select name="/Kartu_ibu/pendidikan" data-name="/Kartu_ibu/pendidikan" data-type-xml="select1">
+            <option value="">...</option>
+            <option value="Sekolah_Dasar">Sekolah Dasar (SD)</option>
+            <option value="Sekolah_Menengah_Pertama">Sekolah Menengah Pertama (SMP)</option>
+            <option value="Sekolah_Menengah_Atas">Sekolah Menengah Atas (SMA)</option>
+            <option value="Perguruan_Tinggi">Perguruan Tinggi</option>
+            <option value="Tidak_sekolah">Tidak sekolah</option>
+        </select>
+        <span class="or-option-translations" style="display:none;">
+            <span data-option-value="Sekolah_Dasar" lang="Bahasa">Sekolah Dasar (SD)</span>
+            <span data-option-value="Sekolah_Dasar" lang="en">Primary School</span>
+            <span data-option-value="Sekolah_Menengah_Pertama" lang="Bahasa">Sekolah Menengah Pertama (SMP)</span>
+            <span data-option-value="Sekolah_Menengah_Pertama" lang="en">Junior High School</span>
+            <span data-option-value="Sekolah_Menengah_Atas" lang="Bahasa">Sekolah Menengah Atas (SMA)</span>
+            <span data-option-value="Sekolah_Menengah_Atas" lang="en">Senior High School</span>
+            <span data-option-value="Perguruan_Tinggi" lang="Bahasa">Perguruan Tinggi</span>
+            <span data-option-value="Perguruan_Tinggi" lang="en">College/University</span>
+            <span data-option-value="Tidak_sekolah" lang="Bahasa">Tidak sekolah</span>
+            <span data-option-value="Tidak_sekolah" lang="en">No Formal Education</span>
+        </span>
+    </label>
+    <label class="question or-appearance-minimal ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/agama:label">Agama</span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/agama:label">Religion</span>
+        <span lang="Bahasa" class="or-hint active" data-itext-id="/Kartu_ibu/agama:hint">Agama Ibu</span>
+        <span lang="en" class="or-hint " data-itext-id="/Kartu_ibu/agama:hint">Mother's religion</span>
+        <select name="/Kartu_ibu/agama" data-name="/Kartu_ibu/agama" data-type-xml="select1">
+            <option value="">...</option>
+            <option value="Islam">Islam</option>
+            <option value="Hindu">Hindu</option>
+            <option value="Kristen">Kristen</option>
+            <option value="Katolik">Katolik</option>
+            <option value="Budha">Budha</option>
+            <option value="Lainnya">Lainnya</option>
+        </select>
+        <span class="or-option-translations" style="display:none;">
+            <span data-option-value="Islam" lang="Bahasa">Islam</span>
+            <span data-option-value="Islam" lang="en">Islam (I)</span>
+            <span data-option-value="Hindu" lang="Bahasa">Hindu</span>
+            <span data-option-value="Hindu" lang="en">Hinduism (H);</span>
+            <span data-option-value="Kristen" lang="Bahasa">Kristen</span>
+            <span data-option-value="Kristen" lang="en">Christianity (K)</span>
+            <span data-option-value="Katolik" lang="Bahasa">Katolik</span>
+            <span data-option-value="Katolik" lang="en">Catholic</span>
+            <span data-option-value="Budha" lang="Bahasa">Budha</span>
+            <span data-option-value="Budha" lang="en">Buddhism (B)</span>
+            <span data-option-value="Lainnya" lang="Bahasa">Lainnya</span>
+            <span data-option-value="Lainnya" lang="en">Other</span>
+        </span>
+    </label>
+    <label class="question or-appearance-minimal ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/pekerjaan:label">Pekerjaan</span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/pekerjaan:label">Occupation</span>
+        <span lang="Bahasa" class="or-hint active" data-itext-id="/Kartu_ibu/pekerjaan:hint">Pekerjaan Ibu</span>
+        <span lang="en" class="or-hint " data-itext-id="/Kartu_ibu/pekerjaan:hint">Mother's occupation</span>
+        <select name="/Kartu_ibu/pekerjaan" data-name="/Kartu_ibu/pekerjaan" data-type-xml="select1">
+            <option value="">...</option>
+            <option value="Ibu_Rumah_Tangga">Ibu rumah tangga</option>
+            <option value="Petani">Petani</option>
+            <option value="Nelayan">Nelayan</option>
+            <option value="Pedagang">Pedagang</option>
+            <option value="PNS">PNS</option>
+            <option value="Swasta">Swasta</option>
+            <option value="Lainnya">Lainnya</option>
+        </select>
+        <span class="or-option-translations" style="display:none;">
+            <span data-option-value="Ibu_Rumah_Tangga" lang="Bahasa">Ibu rumah tangga</span>
+            <span data-option-value="Ibu_Rumah_Tangga" lang="en">Housewife</span>
+            <span data-option-value="Petani" lang="Bahasa">Petani</span>
+            <span data-option-value="Petani" lang="en">Farmer</span>
+            <span data-option-value="Nelayan" lang="Bahasa">Nelayan</span>
+            <span data-option-value="Nelayan" lang="en">Fisherman</span>
+            <span data-option-value="Pedagang" lang="Bahasa">Pedagang</span>
+            <span data-option-value="Pedagang" lang="en">Merchant</span>
+            <span data-option-value="PNS" lang="Bahasa">PNS</span>
+            <span data-option-value="PNS" lang="en">Civil Servant</span>
+            <span data-option-value="Swasta" lang="Bahasa">Swasta</span>
+            <span data-option-value="Swasta" lang="en">Private Employee</span>
+            <span data-option-value="Lainnya" lang="Bahasa">Lainnya</span>
+            <span data-option-value="Lainnya" lang="en">Other</span>
+        </span>
+    </label>
+    <label class="question or-branch pre-init non-select ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/pekerjaan_other:label">Lainnya</span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/pekerjaan_other:label">Other</span>
+        <span lang="Bahasa" class="or-hint active" data-itext-id="/Kartu_ibu/pekerjaan_other:hint">Lainya</span>
+        <span lang="en" class="or-hint " data-itext-id="/Kartu_ibu/pekerjaan_other:hint">Write other location</span>
+        <input type="text" name="/Kartu_ibu/pekerjaan_other" data-relevant=" /Kartu_ibu/pekerjaan ='Lainnya'" data-type-xml="string"/>
+    </label>
+    <fieldset class="question simple-select ">
+        <fieldset>
+            <legend>
+                <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/gakin_tidak:label">Gakin/ Tidak</span>
+                <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/gakin_tidak:label">Poor Family/not</span>
+                <span lang="Bahasa" class="or-hint active" data-itext-id="/Kartu_ibu/gakin_tidak:hint">Apakah Ibu termasuk keluarga miskin atau tidak</span>
+                <span lang="en" class="or-hint " data-itext-id="/Kartu_ibu/gakin_tidak:hint">Does mother belong to poor family or not? (Low-Income Population / Financially poor)</span>
+            </legend>
+            <div class="option-wrapper">
+                <label class="">
+                    <input type="radio" name="/Kartu_ibu/gakin_tidak" data-name="/Kartu_ibu/gakin_tidak" value="Yes" data-type-xml="select1"/>
+                    <span lang="Bahasa" class="option-label active" data-itext-id="/Kartu_ibu/gakin_tidak/Yes:label">Ya</span>
+                    <span lang="en" class="option-label " data-itext-id="/Kartu_ibu/gakin_tidak/Yes:label">Yes</span>
+                </label>
+                <label class="">
+                    <input type="radio" name="/Kartu_ibu/gakin_tidak" data-name="/Kartu_ibu/gakin_tidak" value="No" data-type-xml="select1"/>
+                    <span lang="Bahasa" class="option-label active" data-itext-id="/Kartu_ibu/gakin_tidak/No:label">Tidak</span>
+                    <span lang="en" class="option-label " data-itext-id="/Kartu_ibu/gakin_tidak/No:label">No</span>
+                </label>
+            </div>
+        </fieldset>
+    </fieldset>
+    <label class="question non-select ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/posyandu:label">Posyandu</span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/posyandu:label">Name of Outreach Post</span>
+        <span class="required">*</span>
+        <span lang="Bahasa" class="or-hint active" data-itext-id="/Kartu_ibu/posyandu:hint">Nama Posyandu tempat Ibu menerima pelayanan kesehatan</span>
+        <span lang="en" class="or-hint " data-itext-id="/Kartu_ibu/posyandu:hint">Name of Health Post where mother receives health care</span>
+        <input type="text" name="/Kartu_ibu/posyandu" required="required" data-type-xml="string"/>
+        <span class="or-required-msg active" lang="" data-i18n="constraint.required">This field is required</span>
+    </label>
+    <label class="question non-select ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/nama_kader:label">Nama Kader</span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/nama_kader:label">Name of Community Volunteer</span>
+        <span lang="Bahasa" class="or-hint active" data-itext-id="/Kartu_ibu/nama_kader:hint">Nama kader Posyandu yang memberi Ibu pelayanan kesehatan</span>
+        <span lang="en" class="or-hint " data-itext-id="/Kartu_ibu/nama_kader:hint">Name of community health worker that gives health service</span>
+        <input type="text" name="/Kartu_ibu/nama_kader" data-type-xml="string"/>
+    </label>
+    <label class="question non-select ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/nama_dukun:label">Nama Dukun</span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/nama_dukun:label">Name of Traditional Birth Attendant</span>
+        <span lang="Bahasa" class="or-hint active" data-itext-id="/Kartu_ibu/nama_dukun:hint">Nama dukun yang menemani Ibu pada saat menerima pelayanan kesehatan</span>
+        <span lang="en" class="or-hint " data-itext-id="/Kartu_ibu/nama_dukun:hint">Name of traditional birth attendant that accompany mother during health care service</span>
+        <input type="text" name="/Kartu_ibu/nama_dukun" data-type-xml="string"/>
+    </label>
+    <label class="question or-appearance-minimal ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/asuransi_jiwa:label">Asuransi Jiwa</span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/asuransi_jiwa:label">Insurance</span>
+        <span lang="Bahasa" class="or-hint active" data-itext-id="/Kartu_ibu/asuransi_jiwa:hint">Jenis asuransi yang dimiliki Ibu</span>
+        <span lang="en" class="or-hint " data-itext-id="/Kartu_ibu/asuransi_jiwa:hint">Type insurance that mother has</span>
+        <select name="/Kartu_ibu/asuransi_jiwa" data-name="/Kartu_ibu/asuransi_jiwa" data-type-xml="select1">
+            <option value="">...</option>
+            <option value="Jaminan_Kesehatan_Masyarakat">Jaminan Kesehatan Masyarakat (Jamkesmas)</option>
+            <option value="Jamsostek">Jaminan Sosial dan Ketenagakerjaan (Jamsostek)</option>
+            <option value="Jaminan_Kesehatan_Daerah">Jaminan Kesehatan Daerah (Jamkesda)</option>
+            <option value="Asuransi_Kesehatan">Asuransi Kesehatan (Askes)</option>
+            <option value="Jaminan_Persalinan">Jaminan Persalinan (Jampersal)</option>
+            <option value="Tidak_Ada_Asuransi">Tidak memiliki asuransi/pembiayaan</option>
+        </select>
+        <span class="or-option-translations" style="display:none;">
+            <span data-option-value="Jaminan_Kesehatan_Masyarakat" lang="Bahasa">Jaminan Kesehatan Masyarakat (Jamkesmas)</span>
+            <span data-option-value="Jaminan_Kesehatan_Masyarakat" lang="en">National Health Insurance for the Poor</span>
+            <span data-option-value="Jamsostek" lang="Bahasa">Jaminan Sosial dan Ketenagakerjaan (Jamsostek)</span>
+            <span data-option-value="Jamsostek" lang="en">Social Insurance for Private Sector Workers</span>
+            <span data-option-value="Jaminan_Kesehatan_Daerah" lang="Bahasa">Jaminan Kesehatan Daerah (Jamkesda)</span>
+            <span data-option-value="Jaminan_Kesehatan_Daerah" lang="en">Regional Health Insurance for the Poor</span>
+            <span data-option-value="Asuransi_Kesehatan" lang="Bahasa">Asuransi Kesehatan (Askes)</span>
+            <span data-option-value="Asuransi_Kesehatan" lang="en">Health Insurance for Civil Servants and Retired Armed Forces Personnel</span>
+            <span data-option-value="Jaminan_Persalinan" lang="Bahasa">Jaminan Persalinan (Jampersal)</span>
+            <span data-option-value="Jaminan_Persalinan" lang="en">Health Insurance for Pregnant Women and Newborns</span>
+            <span data-option-value="Tidak_Ada_Asuransi" lang="Bahasa">Tidak memiliki asuransi/pembiayaan</span>
+            <span data-option-value="Tidak_Ada_Asuransi" lang="en">No Insurance</span>
+        </span>
+    </label>
+    <label class="question or-appearance-minimal ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/golongan_darah:label">Golongan Darah</span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/golongan_darah:label">Blood Type</span>
+        <span class="required">*</span>
+        <span lang="Bahasa" class="or-hint active" data-itext-id="/Kartu_ibu/golongan_darah:hint">Menunjukan golongan darah Ibu</span>
+        <span lang="en" class="or-hint " data-itext-id="/Kartu_ibu/golongan_darah:hint">Mother's blood type</span>
+        <select name="/Kartu_ibu/golongan_darah" data-name="/Kartu_ibu/golongan_darah" required="required" data-type-xml="select1">
+            <option value="">...</option>
+            <option value="A">A</option>
+            <option value="B">B</option>
+            <option value="AB">AB</option>
+            <option value="O">O</option>
+            <option value="NA">Belum diketahui</option>
+        </select>
+        <span class="or-option-translations" style="display:none;">
+            <span data-option-value="A" lang="Bahasa">A</span>
+            <span data-option-value="A" lang="en">A</span>
+            <span data-option-value="B" lang="Bahasa">B</span>
+            <span data-option-value="B" lang="en">B</span>
+            <span data-option-value="AB" lang="Bahasa">AB</span>
+            <span data-option-value="AB" lang="en">AB</span>
+            <span data-option-value="O" lang="Bahasa">O</span>
+            <span data-option-value="O" lang="en">O</span>
+            <span data-option-value="NA" lang="Bahasa">Belum diketahui</span>
+            <span data-option-value="NA" lang="en">Unknown</span>
+        </span>
+        <span class="or-required-msg active" lang="" data-i18n="constraint.required">This field is required</span>
+    </label>
+    <label class="question non-select ">
+        <span lang="Bahasa" class="question-label active" data-itext-id="/Kartu_ibu/nomor_telpon_hp:label">Nomor Telpon/Hp</span>
+        <span lang="en" class="question-label " data-itext-id="/Kartu_ibu/nomor_telpon_hp:label">Landline/Cell Phone Number</span>
+        <span lang="Bahasa" class="or-hint active" data-itext-id="/Kartu_ibu/nomor_telpon_hp:hint">Nomor telpon/Hp yang dimiliki oleh Ibu atau No telpon Keluarga</span>
+        <span lang="en" class="or-hint " data-itext-id="/Kartu_ibu/nomor_telpon_hp:hint">Mother's contact number</span>
+        <input type="text" name="/Kartu_ibu/nomor_telpon_hp" data-constraint=".&gt;0 and .&lt;100000000000" data-type-xml="string"/>
+        <span lang="Bahasa" class="or-constraint-msg active" data-itext-id="/Kartu_ibu/nomor_telpon_hp:jr:constraintMsg">Nomer teelpon tidak boleh lebih dari 12 digit</span>
+        <span lang="en" class="or-constraint-msg " data-itext-id="/Kartu_ibu/nomor_telpon_hp:jr:constraintMsg">Contact number should be no more than 12 digits</span>
+    </label>
+    <fieldset id="or-preload-items" style="display:none;">
+        <label class="calculation non-select ">
+            <input type="hidden" name="/Kartu_ibu/start" data-preload="timestamp" data-preload-params="start" data-type-xml="dateTime"/>
+        </label>
+        <label class="calculation non-select ">
+            <input type="hidden" name="/Kartu_ibu/today" data-preload="date" data-preload-params="today" data-type-xml="date"/>
+        </label>
+        <label class="calculation non-select ">
+            <input type="hidden" name="/Kartu_ibu/deviceid" data-preload="property" data-preload-params="deviceid" data-type-xml="string"/>
+        </label>
+        <label class="calculation non-select ">
+            <input type="hidden" name="/Kartu_ibu/simserial" data-preload="property" data-preload-params="simserial" data-type-xml="string"/>
+        </label>
+        <label class="calculation non-select ">
+            <input type="hidden" name="/Kartu_ibu/phonenumber" data-preload="property" data-preload-params="phonenumber" data-type-xml="string"/>
+        </label>
+        <label class="calculation non-select ">
+            <input type="hidden" name="/Kartu_ibu/end" data-preload="timestamp" data-preload-params="end" data-type-xml="dateTime"/>
+        </label>
+    </fieldset>
+    <fieldset id="or-calculated-items" style="display:none;">
+        <label class="calculation non-select ">
+            <input type="hidden" name="/Kartu_ibu/existing_location" data-calculate=" /Kartu_ibu/Village " data-type-xml="string"/>
+        </label>
+        <label class="calculation non-select ">
+            <input type="hidden" name="/Kartu_ibu/provinsi" data-calculate=" /Kartu_ibu/Province " data-type-xml="string"/>
+        </label>
+        <label class="calculation non-select ">
+            <input type="hidden" name="/Kartu_ibu/kabupaten" data-calculate=" /Kartu_ibu/District " data-type-xml="string"/>
+        </label>
+        <label class="calculation non-select ">
+            <input type="hidden" name="/Kartu_ibu/desa" data-calculate=" /Kartu_ibu/Village " data-type-xml="string"/>
+        </label>
+        <label class="calculation non-select ">
+            <input type="hidden" name="/Kartu_ibu/dusun" data-calculate=" /Kartu_ibu/Sub-village " data-type-xml="string"/>
+        </label>
+        <label class="calculation non-select ">
+            <input type="hidden" name="/Kartu_ibu/kecamatan" data-calculate=" /Kartu_ibu/Sub-district " data-type-xml="string"/>
+        </label>
+        <label class="calculation non-select ">
+            <input type="hidden" name="/Kartu_ibu/umur" data-calculate="int(( /Kartu_ibu/today  -  /Kartu_ibu/tanggal_lahir_ibu ) div 365.25)" data-type-xml="string"/>
+        </label>
+        <label class="calculation non-select ">
+            <input type="hidden" name="/Kartu_ibu/high_risk_pregnancy_young_maternal_age" data-calculate="if( /Kartu_ibu/umur  &lt;20, 'yes','no')" data-type-xml="string"/>
+        </label>
+        <label class="calculation non-select ">
+            <input type="hidden" name="/Kartu_ibu/high_risk_pregnancy_old_maternal_age" data-calculate="if( /Kartu_ibu/umur  &gt;35, 'yes','no')" data-type-xml="string"/>
+        </label>
+        <label class="calculation non-select ">
+            <input type="hidden" name="/Kartu_ibu/reg_date" data-calculate=" /Kartu_ibu/today " data-type-xml="string"/>
+        </label>
+        <label class="calculation non-select ">
+            <input type="hidden" name="/Kartu_ibu/meta/instanceID" data-calculate="concat('uuid:', uuid())" data-type-xml="string"/>
+        </label>
+        <label class="calculation non-select ">
+            <input type="hidden" name="/Kartu_ibu/formhub/uuid" data-calculate="'4a931daf447d4ba2b6391436ef77e33d'" data-type-xml="string"/>
+        </label>
+    </fieldset>
+</form>
\ No newline at end of file
diff --git a/opensrp-gizi/src/main/assets/www/form/kartu_ibu_registration/form_definition.json b/opensrp-gizi/src/main/assets/www/form/kartu_ibu_registration/form_definition.json
new file mode 100644
index 0000000..b640a52
--- /dev/null
+++ b/opensrp-gizi/src/main/assets/www/form/kartu_ibu_registration/form_definition.json
@@ -0,0 +1,193 @@
+{
+  "form_data_definition_version": "3",
+  "form": {
+    "bind_type": "kartu_ibu",
+    "ec_bind_type": "ec_kartu_ibu",
+    "default_bind_path": "/model/instance/Kartu_ibu/",
+    "fields": [
+      {
+        "name": "id",
+        "shouldLoadValue": true
+      },
+      {
+        "name": "start",
+        "bind": "/model/instance/Kartu_ibu/start"
+      },
+      {
+        "name": "end",
+        "bind": "/model/instance/Kartu_ibu/end"
+      },
+      {
+        "name": "existing_location",
+        "bind": "/model/instance/Kartu_ibu/existing_location",
+        "shouldLoadValue": true
+      },
+      {
+        "name": "lokasiPeriksa",
+        "bind": "/model/instance/Kartu_ibu/Lokasi_periksa"
+      },
+      {
+        "name": "pasienWilayah",
+        "bind": "/model/instance/Kartu_ibu/pasien_wilayah"
+      },
+      {
+        "name": "pasienPindahan",
+        "bind": "/model/instance/Kartu_ibu/pasien_pindahan"
+      },
+      {
+        "name": "tglPindah",
+        "bind": "/model/instance/Kartu_ibu/tgl_pindah"
+      },
+      {
+        "name": "unique_id",
+        "bind": "/model/instance/Kartu_ibu/unique_id",
+        "shouldLoadValue" : true
+      },
+      {
+        "name": "Village",
+        "bind": "/model/instance/Kartu_ibu/Village",
+        "shouldLoadValue" : true
+      },
+      {
+        "name": "Province",
+        "bind": "/model/instance/Kartu_ibu/Province",
+        "shouldLoadValue" : true
+      },
+      {
+        "name": "nik",
+        "bind": "/model/instance/Kartu_ibu/nik"
+      },
+      {
+        "name": "Sub-district",
+        "bind": "/model/instance/Kartu_ibu/Sub-district",
+        "shouldLoadValue" : true
+      },
+      {
+        "name": "District",
+        "bind": "/model/instance/Kartu_ibu/District",
+        "shouldLoadValue" : true
+      },
+      {
+        "name": "Sub-village",
+        "bind": "/model/instance/Kartu_ibu/Sub-village",
+        "shouldLoadValue" : true
+      },
+      {
+        "name": "dusun",
+        "bind": "/model/instance/Kartu_ibu/dusun"
+      },
+      {
+        "name": "provinsi",
+        "bind": "/model/instance/Kartu_ibu/provinsi"
+      },
+      {
+        "name": "kabupaten",
+        "bind": "/model/instance/Kartu_ibu/kabupaten"
+      },
+      {
+        "name": "kecamatan",
+        "bind": "/model/instance/Kartu_ibu/kecamatan"
+      },
+      {
+        "name": "desa",
+        "bind": "/model/instance/Kartu_ibu/desa"
+      },
+      {
+        "name": "puskesmas",
+        "bind": "/model/instance/Kartu_ibu/puskesmas"
+      },
+      {
+        "name": "noIbu",
+        "bind": "/model/instance/Kartu_ibu/no_ibu"
+      },
+      {
+        "name": "namalengkap",
+        "bind": "/model/instance/Kartu_ibu/nama_lengkap"
+      },
+      {
+        "name": "namaSuami",
+        "bind": "/model/instance/Kartu_ibu/nama_suami"
+      },
+      {
+        "name": "tanggalLahir",
+        "bind": "/model/instance/Kartu_ibu/tanggal_lahir_ibu"
+      },
+      {
+        "name": "umur",
+        "bind": "/model/instance/Kartu_ibu/umur"
+      },
+      {
+        "name": "alamatDomisili",
+        "bind": "/model/instance/Kartu_ibu/alamat_domisili"
+      },
+      {
+        "name": "pendidikan",
+        "bind": "/model/instance/Kartu_ibu/pendidikan"
+      },
+      {
+        "name": "agama",
+        "bind": "/model/instance/Kartu_ibu/agama"
+      },
+      {
+        "name": "pekerjaan",
+        "bind": "/model/instance/Kartu_ibu/pekerjaan"
+      },
+      {
+        "name": "gakinTidak",
+        "bind": "/model/instance/Kartu_ibu/gakin_tidak"
+      },
+      {
+        "name": "posyandu",
+        "bind": "/model/instance/Kartu_ibu/posyandu"
+      },
+      {
+        "name": "namaKader",
+        "bind": "/model/instance/Kartu_ibu/nama_kader"
+      },
+      {
+        "name": "namaDukun",
+        "bind": "/model/instance/Kartu_ibu/nama_dukun"
+      },
+      {
+        "name": "asuransiJiwa",
+        "bind": "/model/instance/Kartu_ibu/asuransi_jiwa"
+      },
+      {
+        "name": "golonganDarah",
+        "bind": "/model/instance/Kartu_ibu/golongan_darah"
+      },
+      {
+        "name": "NomorTelponHp",
+        "bind": "/model/instance/Kartu_ibu/nomor_telpon_hp"
+      },
+      {
+        "name": "highRiskPregnancyYoungMaternalAge",
+        "bind": "/model/instance/Kartu_ibu/High_Risk_Pregnancy_Young_maternal_age"
+      },
+      {
+        "name": "highRiskPregnancyOldMaternalAge",
+        "bind": "/model/instance/Kartu_ibu/High_Risk_Pregnancy_Old_maternal_age"
+      },
+      {
+        "name": "jenisKontrasepsi",
+        "bind": "/model/instance/Kartu_ibu/jenis_kontrasepsi"
+      },
+      {
+        "name": "isOutOfArea",
+        "value": "false"
+      },
+      {
+        "name": "isClosed",
+        "value": "false"
+      },
+      {
+        "name": "submissionDate",
+        "bind": "/model/instance/Kartu_ibu/today"
+      },
+      {
+        "name": "registrationDate",
+        "bind": "/model/instance/Kartu_ibu/reg_date"
+      }
+    ]
+  }
+}
diff --git a/opensrp-gizi/src/main/assets/www/form/kartu_ibu_registration/model.xml b/opensrp-gizi/src/main/assets/www/form/kartu_ibu_registration/model.xml
new file mode 100644
index 0000000..81a65a8
--- /dev/null
+++ b/opensrp-gizi/src/main/assets/www/form/kartu_ibu_registration/model.xml
@@ -0,0 +1,63 @@
+<model>
+    <instance>
+        <Kartu_ibu  encounter_type="Identitas Ibu" id="Kartu_ibu" version="201702121028">
+            <formhub>
+                <uuid/>
+            </formhub>
+            <start openmrs_entity="encounter" openmrs_entity_id="encounter_start"/>
+            <today openmrs_entity="encounter" openmrs_entity_id="encounter_date"/>
+            <deviceid/>
+            <simserial/>
+            <phonenumber/>
+            <Province/>
+            <District/>
+            <Sub-district/>
+            <Village/>
+            <Sub-village/>
+            <generated_note_name_13/>
+            <generated_note_name_14/>
+            <existing_location openmrs_entity="encounter" openmrs_entity_id="location_id"/>
+            <provinsi openmrs_entity="person_address" openmrs_entity_id="stateProvince" openmrs_entity_parent="usual_residence"/>
+            <kabupaten openmrs_entity="person_address" openmrs_entity_id="countyDistrict" openmrs_entity_parent="usual_residence"/>
+            <desa openmrs_entity="person_address" openmrs_entity_id="cityVillage" openmrs_entity_parent="usual_residence"/>
+            <dusun openmrs_entity="person_address" openmrs_entity_id="address1" openmrs_entity_parent="usual_residence"/>
+            <kecamatan openmrs_entity="person_address" openmrs_entity_id="address2" openmrs_entity_parent="usual_residence"/>
+            <pasien_wilayah openmrs_entity="concept" openmrs_entity_id="160637AAAAAAAAAAAAAAAAAAAAAAAAAA"/>
+            <pasien_pindahan openmrs_entity="concept" openmrs_entity_id="160563AAAAAAAAAAAAAAAAAAAAAAAAAA"/>
+            <tgl_pindah openmrs_entity="concept" openmrs_entity_id="160534AAAAAAAAAAAAAAAAAAAAAAAAAA"/>
+            <tanggal_periksa openmrs_entity="concept" openmrs_entity_id="160753AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
+            <lokasi_periksa openmrs_entity="concept" openmrs_entity_id="161010AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
+            <lokasi_periksa_other openmrs_entity="concept" openmrs_entity_id="160632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" openmrs_entity_parent="161010AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
+            <unique_id openmrs_entity="person_attribute" openmrs_entity_id="UniqueId"/>
+            <generated_note_name_32/>
+            <puskesmas openmrs_entity="concept" openmrs_entity_id="162724AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
+            <no_ibu openmrs_entity="person_attribute" openmrs_entity_id="NoIbu"/>
+            <nik openmrs_entity="person_attribute" openmrs_entity_id="nik"/>
+            <nama_lengkap openmrs_entity="person" openmrs_entity_id="first_name"/>
+            <nama_suami openmrs_entity="person" openmrs_entity_id="last_name"/>
+            <tanggal_lahir_ibu openmrs_entity="person" openmrs_entity_id="birthdate"/>
+            <umur openmrs_entity="concept" openmrs_entity_id="1532AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
+            <generated_note_name_40/>
+            <alamat_domisili openmrs_entity="person_address" openmrs_entity_id="address3" openmrs_entity_parent="usual_residence"/>
+            <pendidikan openmrs_entity="concept" openmrs_entity_id="1712AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
+            <agama openmrs_entity="concept" openmrs_entity_id="162929AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
+            <pekerjaan openmrs_entity="concept" openmrs_entity_id="1542AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA">Ibu rumah tangga</pekerjaan>
+            <pekerjaan_other openmrs_entity="concept" openmrs_entity_id="160632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" openmrs_entity_parent="1542AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
+            <gakin_tidak openmrs_entity="concept" openmrs_entity_id="162956AAAAAAAAAAAAAAAAAAAAAAAAAA"/>
+            <posyandu openmrs_entity="concept" openmrs_entity_id="162724AAAAAAAAAAAAAAAAAAAAAAAAAA"/>
+            <nama_kader openmrs_entity="person_identifier" openmrs_entity_id="Nama Kader"/>
+            <nama_dukun openmrs_entity="person_identifier" openmrs_entity_id="Nama Dukun"/>
+            <asuransi_jiwa openmrs_entity="concept" openmrs_entity_id="159356AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
+            <golongan_darah openmrs_entity="concept" openmrs_entity_id="300AAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
+            <nomor_telpon_hp openmrs_entity="concept" openmrs_entity_id="159635AAAAAAAAAAAAAAAAAAAAAAAAAA"/>
+            <jenis_kontrasepsi openmrs_entity="concept" openmrs_entity_id="374AAAAAAAAAAAAAAAAAAAAAAAAAAAAA">0</jenis_kontrasepsi>
+            <high_risk_pregnancy_young_maternal_age openmrs_entity="concept" openmrs_entity_id="163119AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
+            <high_risk_pregnancy_old_maternal_age openmrs_entity="concept" openmrs_entity_id="163120AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
+            <reg_date/>
+            <end openmrs_entity="encounter" openmrs_entity_id="encounter_end"/>
+            <meta>
+                <instanceID/>
+            </meta>
+        </Kartu_ibu>
+    </instance>
+</model>
\ No newline at end of file
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziDetailActivity.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/activity/GiziDetailActivity.java
similarity index 99%
rename from opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziDetailActivity.java
rename to opensrp-gizi/src/main/java/org/smartregister/gizi/activity/GiziDetailActivity.java
index cb6f237..678cadf 100644
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziDetailActivity.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/activity/GiziDetailActivity.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi.child;
+package org.smartregister.gizi.activity;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziGrowthChartActivity.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/activity/GiziGrowthChartActivity.java
similarity index 99%
rename from opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziGrowthChartActivity.java
rename to opensrp-gizi/src/main/java/org/smartregister/gizi/activity/GiziGrowthChartActivity.java
index 38707a3..dd16904 100644
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziGrowthChartActivity.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/activity/GiziGrowthChartActivity.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi.child;
+package org.smartregister.gizi.activity;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/GiziHomeActivity.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/activity/GiziHomeActivity.java
similarity index 98%
rename from opensrp-gizi/src/main/java/org/smartregister/gizi/GiziHomeActivity.java
rename to opensrp-gizi/src/main/java/org/smartregister/gizi/activity/GiziHomeActivity.java
index dd64a1e..6ea894d 100644
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/GiziHomeActivity.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/activity/GiziHomeActivity.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi;
+package org.smartregister.gizi.activity;
 
 import android.database.Cursor;
 import android.os.StrictMode;
@@ -16,11 +16,13 @@
 import org.smartregister.cursoradapter.SmartRegisterQueryBuilder;
 import org.smartregister.event.Listener;
 
+import org.smartregister.gizi.R;
+import org.smartregister.gizi.controller.GiziNavigationController;
 import org.smartregister.service.PendingFormSubmissionService;
 import org.smartregister.sync.SyncAfterFetchListener;
 import org.smartregister.sync.SyncProgressIndicator;
 import org.smartregister.sync.UpdateActionsTask;
-import org.smartregister.gizi.child.FlurryFacade;
+import org.smartregister.gizi.libs.FlurryFacade;
 import org.smartregister.view.activity.SecuredActivity;
 import org.smartregister.view.contract.HomeContext;
 import org.smartregister.view.controller.NativeAfterANMDetailsFetchListener;
@@ -129,7 +131,7 @@ protected void onCreation() {
         //home dashboard
         setContentView(R.layout.smart_registers_gizi_home);
         //  FlurryFacade.logEvent("gizi_home_dashboard");
-        navigationController = new org.smartregister.gizi.GiziNavigationController(this,anmController,context());
+        navigationController = new GiziNavigationController(this,anmController,context());
         setupViews();
         initialize();
         DisplayFormFragment.formInputErrorMessage = getResources().getString(R.string.forminputerror);
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziSmartRegisterActivity.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/activity/GiziSmartRegisterActivity.java
similarity index 99%
rename from opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziSmartRegisterActivity.java
rename to opensrp-gizi/src/main/java/org/smartregister/gizi/activity/GiziSmartRegisterActivity.java
index 0aeba80..6bbd783 100755
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziSmartRegisterActivity.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/activity/GiziSmartRegisterActivity.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi.child;
+package org.smartregister.gizi.activity;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -16,7 +16,7 @@
 import org.smartregister.cursoradapter.SmartRegisterQueryBuilder;
 import org.smartregister.domain.form.FieldOverrides;
 import org.smartregister.domain.form.FormSubmission;
-import org.smartregister.gizi.LoginActivity;
+import org.smartregister.gizi.utils.KmsHandler;
 import org.smartregister.gizi.fragment.GiziSmartRegisterFragment;
 import org.smartregister.gizi.pageradapter.BaseRegisterActivityPagerAdapter;
 import org.smartregister.provider.SmartRegisterClientsProvider;
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziZScoreChartActivity.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/activity/GiziZScoreChartActivity.java
similarity index 99%
rename from opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziZScoreChartActivity.java
rename to opensrp-gizi/src/main/java/org/smartregister/gizi/activity/GiziZScoreChartActivity.java
index dac696a..798556b 100644
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziZScoreChartActivity.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/activity/GiziZScoreChartActivity.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi.child;
+package org.smartregister.gizi.activity;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/LoginActivity.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/activity/LoginActivity.java
similarity index 99%
rename from opensrp-gizi/src/main/java/org/smartregister/gizi/LoginActivity.java
rename to opensrp-gizi/src/main/java/org/smartregister/gizi/activity/LoginActivity.java
index addacdf..5b37c0b 100644
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/LoginActivity.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/activity/LoginActivity.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi;
+package org.smartregister.gizi.activity;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -25,6 +25,7 @@
 
 import com.flurry.android.FlurryAgent;
 
+import org.smartregister.gizi.R;
 import org.smartregister.gizi.application.GiziApplication;
 import org.smartregister.Context;
 import org.smartregister.domain.LoginResponse;
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/SettingsActivity.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/activity/SettingsActivity.java
similarity index 97%
rename from opensrp-gizi/src/main/java/org/smartregister/gizi/SettingsActivity.java
rename to opensrp-gizi/src/main/java/org/smartregister/gizi/activity/SettingsActivity.java
index eaf7a86..9f40cb9 100644
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/SettingsActivity.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/activity/SettingsActivity.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi;
+package org.smartregister.gizi.activity;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -8,6 +8,7 @@
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 
+import org.smartregister.gizi.R;
 import org.smartregister.repository.AllSharedPreferences;
 
 import java.net.MalformedURLException;
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/application/GiziApplication.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/application/GiziApplication.java
index cd823e0..3fcfffa 100644
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/application/GiziApplication.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/application/GiziApplication.java
@@ -7,8 +7,8 @@
 import org.smartregister.Context;
 import org.smartregister.CoreLibrary;
 import org.smartregister.commonregistry.CommonFtsObject;
-import org.smartregister.gizi.LoginActivity;
-import org.smartregister.gizi.child.FlurryFacade;
+import org.smartregister.gizi.activity.LoginActivity;
+import org.smartregister.gizi.libs.FlurryFacade;
 import org.smartregister.repository.Repository;
 import org.smartregister.sync.DrishtiSyncScheduler;
 import org.smartregister.view.activity.DrishtiApplication;
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/GiziNavigationController.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/controller/GiziNavigationController.java
similarity index 94%
rename from opensrp-gizi/src/main/java/org/smartregister/gizi/GiziNavigationController.java
rename to opensrp-gizi/src/main/java/org/smartregister/gizi/controller/GiziNavigationController.java
index fca9c61..d4b1dec 100644
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/GiziNavigationController.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/controller/GiziNavigationController.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi;
+package org.smartregister.gizi.controller;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -7,7 +7,8 @@
 
 
 //import org.ei.opensrp.gizi.test.TestSmartRegisterActivity;
-import org.smartregister.gizi.child.GiziSmartRegisterActivity;
+import org.smartregister.gizi.R;
+import org.smartregister.gizi.activity.GiziSmartRegisterActivity;
 import org.smartregister.view.controller.ANMController;
 import org.json.JSONObject;
 
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/fragment/GiziSmartRegisterFragment.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/fragment/GiziSmartRegisterFragment.java
index c76b7cd..5b5b299 100644
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/fragment/GiziSmartRegisterFragment.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/fragment/GiziSmartRegisterFragment.java
@@ -23,13 +23,13 @@
 import org.smartregister.cursoradapter.SecuredNativeSmartRegisterCursorAdapterFragment;
 import org.smartregister.cursoradapter.SmartRegisterPaginatedCursorAdapter;
 import org.smartregister.cursoradapter.SmartRegisterQueryBuilder;
-import org.smartregister.gizi.LoginActivity;
-import org.smartregister.gizi.child.GiziDetailActivity;
-import org.smartregister.gizi.child.GiziGrowthChartActivity;
-import org.smartregister.gizi.child.GiziServiceModeOption;
-import org.smartregister.gizi.child.GiziSmartClientsProvider;
-import org.smartregister.gizi.child.GiziSmartRegisterActivity;
-import org.smartregister.gizi.child.KICommonObjectFilterOption;
+import org.smartregister.gizi.activity.LoginActivity;
+import org.smartregister.gizi.activity.GiziDetailActivity;
+import org.smartregister.gizi.activity.GiziGrowthChartActivity;
+import org.smartregister.gizi.option.GiziServiceModeOption;
+import org.smartregister.gizi.provider.GiziSmartClientsProvider;
+import org.smartregister.gizi.activity.GiziSmartRegisterActivity;
+import org.smartregister.gizi.option.KICommonObjectFilterOption;
 import org.smartregister.provider.SmartRegisterClientsProvider;
 import org.smartregister.gizi.R;
 
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/ErrorReportingFacade.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/libs/ErrorReportingFacade.java
similarity index 90%
rename from opensrp-gizi/src/main/java/org/smartregister/gizi/child/ErrorReportingFacade.java
rename to opensrp-gizi/src/main/java/org/smartregister/gizi/libs/ErrorReportingFacade.java
index 1f9ced1..fe83ff4 100644
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/ErrorReportingFacade.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/libs/ErrorReportingFacade.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi.child;
+package org.smartregister.gizi.libs;
 
 /**
   * Created by Dimas on 9/22/2015.
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/FlurryFacade.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/libs/FlurryFacade.java
similarity index 96%
rename from opensrp-gizi/src/main/java/org/smartregister/gizi/child/FlurryFacade.java
rename to opensrp-gizi/src/main/java/org/smartregister/gizi/libs/FlurryFacade.java
index c827134..2a19add 100644
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/FlurryFacade.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/libs/FlurryFacade.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi.child;
+package org.smartregister.gizi.libs;
 
 
 import android.content.Context;
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/CommonObjectFilterOption.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/option/CommonObjectFilterOption.java
similarity index 97%
rename from opensrp-gizi/src/main/java/org/smartregister/gizi/child/CommonObjectFilterOption.java
rename to opensrp-gizi/src/main/java/org/smartregister/gizi/option/CommonObjectFilterOption.java
index 5f8435c..c968f36 100644
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/CommonObjectFilterOption.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/option/CommonObjectFilterOption.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi.child;
+package org.smartregister.gizi.option;
 
 import org.smartregister.commonregistry.CommonPersonObjectClient;
 import org.smartregister.view.contract.SmartRegisterClient;
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziSearchOption.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/option/GiziSearchOption.java
similarity index 98%
rename from opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziSearchOption.java
rename to opensrp-gizi/src/main/java/org/smartregister/gizi/option/GiziSearchOption.java
index bc10b56..5f02727 100644
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziSearchOption.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/option/GiziSearchOption.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi.child;
+package org.smartregister.gizi.option;
 
 import org.smartregister.Context;
 import org.smartregister.commonregistry.CommonPersonObjectClient;
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziServiceModeOption.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/option/GiziServiceModeOption.java
similarity index 98%
rename from opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziServiceModeOption.java
rename to opensrp-gizi/src/main/java/org/smartregister/gizi/option/GiziServiceModeOption.java
index 7857ddd..a2100cd 100755
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziServiceModeOption.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/option/GiziServiceModeOption.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi.child;
+package org.smartregister.gizi.option;
 
 import android.view.View;
 
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/KICommonObjectFilterOption.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/option/KICommonObjectFilterOption.java
similarity index 95%
rename from opensrp-gizi/src/main/java/org/smartregister/gizi/child/KICommonObjectFilterOption.java
rename to opensrp-gizi/src/main/java/org/smartregister/gizi/option/KICommonObjectFilterOption.java
index cb01b69..69943ec 100644
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/KICommonObjectFilterOption.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/option/KICommonObjectFilterOption.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi.child;
+package org.smartregister.gizi.option;
 
 import org.smartregister.cursoradapter.CursorFilterOption;
 import org.smartregister.view.contract.SmartRegisterClient;
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziSmartClientsProvider.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/provider/GiziSmartClientsProvider.java
similarity index 99%
rename from opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziSmartClientsProvider.java
rename to opensrp-gizi/src/main/java/org/smartregister/gizi/provider/GiziSmartClientsProvider.java
index 9e718bb..7135486 100755
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziSmartClientsProvider.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/provider/GiziSmartClientsProvider.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi.child;
+package org.smartregister.gizi.provider;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziDateSort.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/utils/GiziDateSort.java
similarity index 98%
rename from opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziDateSort.java
rename to opensrp-gizi/src/main/java/org/smartregister/gizi/utils/GiziDateSort.java
index 8bad1f3..7aea0f8 100644
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/GiziDateSort.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/utils/GiziDateSort.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi.child;
+package org.smartregister.gizi.utils;
 
 import org.smartregister.commonregistry.CommonPersonObjectClient;
 import org.smartregister.view.contract.SmartRegisterClient;
diff --git a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/KmsHandler.java b/opensrp-gizi/src/main/java/org/smartregister/gizi/utils/KmsHandler.java
similarity index 99%
rename from opensrp-gizi/src/main/java/org/smartregister/gizi/child/KmsHandler.java
rename to opensrp-gizi/src/main/java/org/smartregister/gizi/utils/KmsHandler.java
index ec6311e..5a1279c 100644
--- a/opensrp-gizi/src/main/java/org/smartregister/gizi/child/KmsHandler.java
+++ b/opensrp-gizi/src/main/java/org/smartregister/gizi/utils/KmsHandler.java
@@ -1,4 +1,4 @@
-package org.smartregister.gizi.child;
+package org.smartregister.gizi.utils;
 
 import org.smartregister.commonregistry.AllCommonsRepository;
 import org.smartregister.commonregistry.CommonPersonObject;
diff --git a/opensrp-gizi/src/main/res/xml/captured_images_path.xml b/opensrp-gizi/src/main/res/xml/captured_images_path.xml
new file mode 100644
index 0000000..1a64744
--- /dev/null
+++ b/opensrp-gizi/src/main/res/xml/captured_images_path.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <external-path name="captured_photos" path="Android/data/org.smartregister.path/files/Pictures" />
+</paths>
\ No newline at end of file
diff --git a/opensrp-gizi/src/main/res/xml/preferences.xml b/opensrp-gizi/src/main/res/xml/preferences.xml
new file mode 100644
index 0000000..ce3198e
--- /dev/null
+++ b/opensrp-gizi/src/main/res/xml/preferences.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory android:title="Server">
+
+        <EditTextPreference
+            android:defaultValue="@string/opensrp_url"
+            android:dialogMessage="Enter Base Server Url"
+            android:dialogTitle="OpenSRP base URL"
+            android:key="DRISHTI_BASE_URL"
+            android:persistent="true"
+            android:summary="Defines the base server url that handles requests"
+            android:title="OpenSRP base URL" />
+
+    </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file